diff --git a/include/ddk/usb.h b/include/ddk/usb.h
index 8137bb622bf..b8f5f3f541e 100644
--- a/include/ddk/usb.h
+++ b/include/ddk/usb.h
@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _USB_
-#define _USB_
+#ifndef __DDK_USB_H__
+#define __DDK_USB_H__
 
-#include <usb200.h>
+#include <ddk/usb200.h>
 
 #define URB_FUNCTION_SELECT_CONFIGURATION            0x0000
 #define URB_FUNCTION_SELECT_INTERFACE                0x0001
diff --git a/include/ddk/usb100.h b/include/ddk/usb100.h
index 7e05f632cec..534dca1da40 100644
--- a/include/ddk/usb100.h
+++ b/include/ddk/usb100.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _USB100_
-#define _USB100_
+#ifndef __DDK_USB100_H__
+#define __DDK_USB100_H__
 
 #define USB_DEVICE_DESCRIPTOR_TYPE                0x01
 #define USB_CONFIGURATION_DESCRIPTOR_TYPE         0x02
diff --git a/include/ddk/usb200.h b/include/ddk/usb200.h
index bf2460195dd..42cd27e1fa0 100644
--- a/include/ddk/usb200.h
+++ b/include/ddk/usb200.h
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _USB200_
-#define _USB200_
+#ifndef __DDK_USB200_H__
+#define __DDK_USB200_H__
 
-#include <usb100.h>
+#include <ddk/usb100.h>
 
 #endif
diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h
index 8e67faaa589..c0adc46cac0 100644
--- a/include/ddk/usbdlib.h
+++ b/include/ddk/usbdlib.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __USBDLIB_H__
-#define __USBDLIB_H__
+#ifndef __DDK_USBDLIB_H__
+#define __DDK_USBDLIB_H__
 
 typedef struct _USBD_INTERFACE_LIST_ENTRY {
     PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor;