diff --git a/right/usb_composite_device.h b/right/usb_composite_device.h
index 28a5607..4d86977 100644
--- a/right/usb_composite_device.h
+++ b/right/usb_composite_device.h
@@ -1,5 +1,5 @@
-#ifndef __USB_DEVICE_COMPOSITE_H__
-#define __USB_DEVICE_COMPOSITE_H__
+#ifndef __USB_COMPOSITE_DEVICE_H__
+#define __USB_COMPOSITE_DEVICE_H__
 
 // Includes:
 
diff --git a/right/usb_descriptor_device.h b/right/usb_descriptor_device.h
index d135c12..63eed3a 100644
--- a/right/usb_descriptor_device.h
+++ b/right/usb_descriptor_device.h
@@ -1,5 +1,5 @@
-#ifndef __USB_DEVICE_DESCRIPTOR_H__
-#define __USB_DEVICE_DESCRIPTOR_H__
+#ifndef __USB_DESCRIPTOR_DEVICE_H__
+#define __USB_DESCRIPTOR_DEVICE_H__
 
 // Macros:
 
diff --git a/right/usb_device_config.h b/right/usb_device_config.h
index 74d7b6f..0f690f7 100644
--- a/right/usb_device_config.h
+++ b/right/usb_device_config.h
@@ -1,5 +1,5 @@
-#ifndef _USB_DEVICE_CONFIG_H_
-#define _USB_DEVICE_CONFIG_H_
+#ifndef __USB_DEVICE_CONFIG_H__
+#define __USB_DEVICE_CONFIG_H__
 
 /*! @brief KHCI instance count */
 #define USB_DEVICE_CONFIG_KHCI (1U)
diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index 7b14fa5..5b4ac3e 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -1,5 +1,5 @@
-#ifndef __HID_GENERIC_H__
-#define __HID_GENERIC_H__
+#ifndef __USB_INTERFACE_GENERIC_HID_H__
+#define __USB_INTERFACE_GENERIC_HID_H__
 
 // Includes:
 
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index 4ecfa15..6cde876 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -1,5 +1,5 @@
-#ifndef __USB_DEVICE_HID_KEYBOARD_H__
-#define __USB_DEVICE_HID_KEYBOARD_H__
+#ifndef __USB_INTERFACE_KEYBOARD_H__
+#define __USB_INTERFACE_KEYBOARD_H__
 
 // Includes:
 
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 4f3280e..c2ab60a 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -1,5 +1,5 @@
-#ifndef __USB_DEVICE_HID_MOUSE_H__
-#define __USB_DEVICE_HID_MOUSE_H__
+#ifndef __USB_INTERFACE_MOUSE_H__
+#define __USB_INTERFACE_MOUSE_H__
 
 // Includes:
 
diff --git a/right/usb_report_item_macros.h b/right/usb_report_item_macros.h
index 395cb09..da765c3 100644
--- a/right/usb_report_item_macros.h
+++ b/right/usb_report_item_macros.h
@@ -1,5 +1,5 @@
-#ifndef __USB_REPORT_ITEM_DATA_CONST__
-#define __USB_REPORT_ITEM_DATA_CONST__
+#ifndef __USB_REPORT_ITEM_MACROS__
+#define __USB_REPORT_ITEM_MACROS__
 
 // Includes: