diff --git a/reactos/drivers/usb/miniport/linux/pci_hal.c b/reactos/drivers/usb/miniport/linux/pci_hal.c
index 10338eaff60..70ff1acddee 100644
--- a/reactos/drivers/usb/miniport/linux/pci_hal.c
+++ b/reactos/drivers/usb/miniport/linux/pci_hal.c
@@ -2,7 +2,7 @@
 // this file is part of linux_wrapper.h
 
 //FIXME: Move this file, make its definitions more general
-#include "../host/ohci_main.h"
+#include "../usbohci/ohci_main.h"
 
 /*
   Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory.
diff --git a/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c b/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
index ef1a8b5cad7..310217c2594 100644
--- a/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
+++ b/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
@@ -97,7 +97,7 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>  /* for in_interrupt () */
 #include <linux/usb.h>
-#include "../core/hcd.h"
+#include "hcd.h"
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -108,7 +108,7 @@
 #include "ohci_config.h"
 
 #include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
 
 //#define OHCI_VERBOSE_DEBUG
 #endif
diff --git a/reactos/drivers/usb/miniport/usbohci/ohci_main.c b/reactos/drivers/usb/miniport/usbohci/ohci_main.c
index d3167c4a5c6..f8c8a0c12bf 100644
--- a/reactos/drivers/usb/miniport/usbohci/ohci_main.c
+++ b/reactos/drivers/usb/miniport/usbohci/ohci_main.c
@@ -10,7 +10,7 @@
 
 #include <debug.h>
 #include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
 #include "ohci_main.h"
 
 // declare basic init funcs
diff --git a/reactos/drivers/usb/miniport/usbohci/usbohci.xml b/reactos/drivers/usb/miniport/usbohci/usbohci.xml
index 0fb9193bcfa..06946986107 100644
--- a/reactos/drivers/usb/miniport/usbohci/usbohci.xml
+++ b/reactos/drivers/usb/miniport/usbohci/usbohci.xml
@@ -1,13 +1,12 @@
-<module name="ohci" type="kernelmodedriver" installbase="system32/drivers" installname="ohci.sys" warnings="true">
-        <importlibrary definition="ohci.def" />
+<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
-	<include base="ntoskrnl">include</include>
 	<include>../linux</include>
+	<include base="usbport"></include>
 	<library>sys_base</library>
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<library>usbcore</library>
+	<library>usbport</library>
 	<file>ohci-hcd.c</file>
 	<file>ohci_main.c</file>
 	<file>ohci.rc</file>
diff --git a/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c b/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
index c5f010ad421..78327450394 100644
--- a/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
+++ b/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
@@ -61,7 +61,7 @@
 
 #include "uhci_config.h"
 #include "../usb_wrapper.h"
-#include "../core/hcd.h"
+#include "hcd.h"
 #include "uhci-hcd.h"
 
 #if 0
diff --git a/reactos/drivers/usb/miniport/usbuhci/uhci.h b/reactos/drivers/usb/miniport/usbuhci/uhci.h
index a30c2cea99d..adb7569f909 100644
--- a/reactos/drivers/usb/miniport/usbuhci/uhci.h
+++ b/reactos/drivers/usb/miniport/usbuhci/uhci.h
@@ -6,9 +6,9 @@
 #include <ddk/usbiodef.h>
 #include <initguid.h>
 
-#include "../core/hcd.h"
+#include "hcd.h"
 
-#include "../host/ohci_main.h"
+#include "../usbohci/ohci_main.h"
 
 #define USB_UHCI_TAG TAG('u','s','b','u')
 
diff --git a/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml b/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
index 21f857c09c6..15c3f14375f 100644
--- a/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
+++ b/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
@@ -1,12 +1,12 @@
-<module name="uhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys" warnings="true">
+<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
-	<include base="ntoskrnl">include</include>
 	<include>../linux</include>
+	<include base="usbport"></include>
 	<library>sys_base</library>
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<library>usbcore</library>
+	<library>usbport</library>
 	<file>cleanup.c</file>
 	<file>close.c</file>
 	<file>create.c</file>
diff --git a/reactos/drivers/usb/usbhub/usbhub.h b/reactos/drivers/usb/usbhub/usbhub.h
index 23c74226695..59da4f566d5 100644
--- a/reactos/drivers/usb/usbhub/usbhub.h
+++ b/reactos/drivers/usb/usbhub/usbhub.h
@@ -3,8 +3,8 @@
 #include <ddk/ntddk.h>
 #include <ddk/usbioctl.h>
 
-#include "../usb_wrapper.h"
-#include "../core/hub.h"
+#include "../miniport/usb_wrapper.h"
+#include "../usbport/hub.h"
 
 #define USB_HUB_TAG TAG('u','s','b','h')
 
diff --git a/reactos/drivers/usb/usbhub/usbhub.xml b/reactos/drivers/usb/usbhub/usbhub.xml
index 1d67b40ae25..1d234a61ffa 100644
--- a/reactos/drivers/usb/usbhub/usbhub.xml
+++ b/reactos/drivers/usb/usbhub/usbhub.xml
@@ -1,12 +1,11 @@
-<module name="hub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys" warnings="true">
+<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
-	<include base="ntoskrnl">include</include>
-	<include>../linux</include>
+	<include>../miniport/linux</include>
 	<library>sys_base</library>
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<library>usbcore</library>
+	<library>usbport</library>
 	<file>createclose.c</file>
 	<file>fdo.c</file>
 	<file>misc.c</file>
diff --git a/reactos/drivers/usb/usbport/buffer_simple.c b/reactos/drivers/usb/usbport/buffer_simple.c
index b0c0470235d..c69586ff5c0 100644
--- a/reactos/drivers/usb/usbport/buffer_simple.c
+++ b/reactos/drivers/usb/usbport/buffer_simple.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #define __KERNEL__
 #define CONFIG_PCI
 #include "hcd.h"
diff --git a/reactos/drivers/usb/usbport/config.c b/reactos/drivers/usb/usbport/config.c
index 65b50c13818..0ba8415e743 100644
--- a/reactos/drivers/usb/usbport/config.c
+++ b/reactos/drivers/usb/usbport/config.c
@@ -5,7 +5,7 @@
 #include <linux/slab.h>
 #include <asm/byteorder.h>
 #else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #endif
 
 #define USB_MAXALTSETTING		128	/* Hard limit */
diff --git a/reactos/drivers/usb/usbport/core_drivers/usbkey.c b/reactos/drivers/usb/usbport/core_drivers/usbkey.c
index a37ffb63828..a6e4c2beb5f 100644
--- a/reactos/drivers/usb/usbport/core_drivers/usbkey.c
+++ b/reactos/drivers/usb/usbport/core_drivers/usbkey.c
@@ -4,7 +4,7 @@
 */
 
 #define NDEBUG
-#include "../../usb_wrapper.h"
+#include "../../miniport/usb_wrapper.h"
 
 #define keyboarddebug  0
 
diff --git a/reactos/drivers/usb/usbport/core_drivers/usbmouse.c b/reactos/drivers/usb/usbport/core_drivers/usbmouse.c
index bef9a12d29c..3e8ed4eabaf 100644
--- a/reactos/drivers/usb/usbport/core_drivers/usbmouse.c
+++ b/reactos/drivers/usb/usbport/core_drivers/usbmouse.c
@@ -3,7 +3,7 @@
 */
 
 #define NDEBUG
-#include "../../usb_wrapper.h"
+#include "../../miniport/usb_wrapper.h"
 
 extern USBPORT_INTERFACE UsbPortInterface;
 
diff --git a/reactos/drivers/usb/usbport/hcd-pci.c b/reactos/drivers/usb/usbport/hcd-pci.c
index 459759fc6a9..5e666551406 100644
--- a/reactos/drivers/usb/usbport/hcd-pci.c
+++ b/reactos/drivers/usb/usbport/hcd-pci.c
@@ -34,7 +34,7 @@
 #include "hcd.h"
 #else
 
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #include "hcd.h"
 #endif
 
diff --git a/reactos/drivers/usb/usbport/hcd.c b/reactos/drivers/usb/usbport/hcd.c
index eeba929df20..4a5c731b836 100644
--- a/reactos/drivers/usb/usbport/hcd.c
+++ b/reactos/drivers/usb/usbport/hcd.c
@@ -41,7 +41,7 @@
 
 #include <linux/usb.h>
 #else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 //#define DEBUG
 #endif
 
diff --git a/reactos/drivers/usb/usbport/hub.c b/reactos/drivers/usb/usbport/hub.c
index 16c0afa7718..e3732ff0dcc 100644
--- a/reactos/drivers/usb/usbport/hub.c
+++ b/reactos/drivers/usb/usbport/hub.c
@@ -36,7 +36,7 @@
 
 #else
 
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #include "hcd.h"
 #include "hub.h"
 
diff --git a/reactos/drivers/usb/usbport/message.c b/reactos/drivers/usb/usbport/message.c
index 512e19ccb44..ecd061d57ce 100644
--- a/reactos/drivers/usb/usbport/message.c
+++ b/reactos/drivers/usb/usbport/message.c
@@ -10,7 +10,7 @@
 #include <linux/mm.h>
 #include <asm/byteorder.h>
 #else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #endif
 
 #include "hcd.h"	/* for usbcore internals */
diff --git a/reactos/drivers/usb/usbport/urb.c b/reactos/drivers/usb/usbport/urb.c
index d4557994f39..ef945d016c0 100644
--- a/reactos/drivers/usb/usbport/urb.c
+++ b/reactos/drivers/usb/usbport/urb.c
@@ -1,4 +1,4 @@
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #include "hcd.h"
 
 /**
diff --git a/reactos/drivers/usb/usbport/usb-debug.c b/reactos/drivers/usb/usbport/usb-debug.c
index a6a6160e05a..b8742ad67dc 100644
--- a/reactos/drivers/usb/usbport/usb-debug.c
+++ b/reactos/drivers/usb/usbport/usb-debug.c
@@ -17,7 +17,7 @@
 #endif
 #include <linux/usb.h>
 #else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #endif
 
 static void usb_show_endpoint(struct usb_host_endpoint *endpoint)
diff --git a/reactos/drivers/usb/usbport/usb.c b/reactos/drivers/usb/usbport/usb.c
index f27fcf2e6b7..f53b90a05f6 100644
--- a/reactos/drivers/usb/usbport/usb.c
+++ b/reactos/drivers/usb/usbport/usb.c
@@ -50,7 +50,7 @@
 #include "hcd.h"
 #include "usb.h"
 #else
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 #include "hcd.h"
 #endif
 
diff --git a/reactos/drivers/usb/usbport/usbcore.c b/reactos/drivers/usb/usbport/usbcore.c
index 6f32d5750fb..f1fac087031 100644
--- a/reactos/drivers/usb/usbport/usbcore.c
+++ b/reactos/drivers/usb/usbport/usbcore.c
@@ -5,7 +5,7 @@
 
 #include <ddk/ntddk.h>
 #include <debug.h>
-#include "../usb_wrapper.h"
+#include "../miniport/usb_wrapper.h"
 
 USBPORT_INTERFACE UsbPortInterface;
 
diff --git a/reactos/drivers/usb/usbport/usbcore.def b/reactos/drivers/usb/usbport/usbport.def
similarity index 100%
rename from reactos/drivers/usb/usbport/usbcore.def
rename to reactos/drivers/usb/usbport/usbport.def
diff --git a/reactos/drivers/usb/usbport/usbport.xml b/reactos/drivers/usb/usbport/usbport.xml
index 22cb2801c0d..b1be49855b1 100644
--- a/reactos/drivers/usb/usbport/usbport.xml
+++ b/reactos/drivers/usb/usbport/usbport.xml
@@ -1,9 +1,8 @@
-<module name="usbcore" type="kernelmodedriver" installbase="system32/drivers" installname="usbcore.sys" warnings="true">
-        <importlibrary definition="usbcore.def" />
+<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
+	<importlibrary definition="usbport.def" />
 	<define name="__USE_W32API" />
 	<define name="DEBUG_MODE" />
 	<define name="DEBUG" />
-	<include base="ntoskrnl">include</include>
 	<library>sys_base</library> 
 	<library>ntoskrnl</library>
 	<library>hal</library>