diff --git a/drivers/drivers.rbuild b/drivers/drivers.rbuild
index 67ab810bca2..15b36eaeead 100644
--- a/drivers/drivers.rbuild
+++ b/drivers/drivers.rbuild
@@ -19,6 +19,9 @@
 <directory name="filesystems">
 	<xi:include href="filesystems/directory.rbuild" />
 </directory>
+<directory name="hid">
+	<xi:include href="hid/directory.rbuild" />
+</directory>
 <directory name="filters>
 	<xi:include href="filters/directory.rbuild" />
 </directory>
diff --git a/drivers/filters/mountmgr/CMakeLists.txt b/drivers/filters/mountmgr/CMakeLists.txt
index 0c67ca75b0a..4a99868931c 100644
--- a/drivers/filters/mountmgr/CMakeLists.txt
+++ b/drivers/filters/mountmgr/CMakeLists.txt
@@ -15,4 +15,4 @@ allow_warnings(mountmgr)
 set_module_type(mountmgr kernelmodedriver)
 add_importlibs(mountmgr ntoskrnl hal)
 add_pch(mountmgr mntmgr.h)
-#add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/drivers/filters/mountmgr/mountmgr.rbuild b/drivers/filters/mountmgr/mountmgr.rbuild
index cce556ef482..52aa848418f 100644
--- a/drivers/filters/mountmgr/mountmgr.rbuild
+++ b/drivers/filters/mountmgr/mountmgr.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys">
-	<bootstrap installbase="$(CDOUTPUT)" />
+<module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys" allowwarnings="true">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="NTDDI_VERSION">0x05020400</define>
 	<include base="mountmgr">.</include>
 	<library>ntoskrnl</library>
diff --git a/drivers/hid/directory.rbuild b/drivers/hid/directory.rbuild
new file mode 100644
index 00000000000..4fa5c649c5f
--- /dev/null
+++ b/drivers/hid/directory.rbuild
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="hidclass">
+		<xi:include href="hidclass/hidclass.rbuild" />
+	</directory>
+	<directory name="hidparse">
+		<xi:include href="hidparse/hidparse.rbuild" />
+	</directory>
+	<directory name="hidusb">
+		<xi:include href="hidusb/hidusb.rbuild" />
+	</directory>
+	<directory name="kbdhid">
+		<xi:include href="kbdhid/kbdhid.rbuild" />
+	</directory>
+	<directory name="mouhid">
+		<xi:include href="mouhid/mouhid.rbuild" />
+	</directory>
+</group>
diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt
index b5ae158a775..f5f69220a3a 100644
--- a/drivers/hid/hidclass/CMakeLists.txt
+++ b/drivers/hid/hidclass/CMakeLists.txt
@@ -11,7 +11,6 @@ list(APPEND SOURCE
 add_library(hidclass SHARED ${SOURCE})
 
 set_entrypoint(hidclass 0)
-set_image_base(hidclass 0x00010000)
 set_subsystem(hidclass native)
 set_target_properties(hidclass PROPERTIES SUFFIX ".sys")
 
diff --git a/drivers/hid/hidclass/hidclass.rbuild b/drivers/hid/hidclass/hidclass.rbuild
new file mode 100644
index 00000000000..c5419c63b93
--- /dev/null
+++ b/drivers/hid/hidclass/hidclass.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidclass" type="kernelmodedriver" entrypoint="0" installbase="system32/drivers" installname="hidclass.sys">
+	<importlibrary definition="hidclass.spec" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<library>ntoskrnl</library>
+	<library>hidparse</library>
+	<library>hal</library>
+	<file>fdo.c</file>
+	<file>hidclass.c</file>
+	<file>hidclass.rc</file>
+	<file>pdo.c</file>
+</module>
diff --git a/drivers/hid/hidparse/hidparse.rbuild b/drivers/hid/hidparse/hidparse.rbuild
new file mode 100644
index 00000000000..6cc8ed3677a
--- /dev/null
+++ b/drivers/hid/hidparse/hidparse.rbuild
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidparse" type="kernelmodedriver" installbase="system32/drivers" installname="hidparse.sys">
+	<importlibrary definition="hidparse.spec" />
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<include base="ReactOS">lib/drivers/hidparser</include>
+	<library>ntoskrnl</library>
+	<library>hidparser</library>
+	<file>hidparse.c</file>
+	<file>hidparse.rc</file>
+</module>
diff --git a/drivers/hid/hidusb/hidusb.rbuild b/drivers/hid/hidusb/hidusb.rbuild
new file mode 100644
index 00000000000..fd9c46de598
--- /dev/null
+++ b/drivers/hid/hidusb/hidusb.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidusb" type="kernelmodedriver" installbase="system32/drivers" installname="hidusb.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<library>ntoskrnl</library>
+	<library>hidclass</library>
+	<library>usbd</library>
+	<library>hal</library>
+	<file>hidusb.c</file>
+	<file>hidusb.rc</file>
+</module>
diff --git a/drivers/hid/kbdhid/kbdhid.h b/drivers/hid/kbdhid/kbdhid.h
index 51fd4e4ed47..bc606bb2f82 100644
--- a/drivers/hid/kbdhid/kbdhid.h
+++ b/drivers/hid/kbdhid/kbdhid.h
@@ -5,6 +5,7 @@
 #include <hidclass.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 #include <kbdmou.h>
 //#include <kbd.h>
diff --git a/drivers/hid/kbdhid/kbdhid.rbuild b/drivers/hid/kbdhid/kbdhid.rbuild
new file mode 100644
index 00000000000..904f6d2324c
--- /dev/null
+++ b/drivers/hid/kbdhid/kbdhid.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="kbdhid" type="kernelmodedriver" installbase="system32/drivers" installname="kbdhid.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>hidparse</library>
+	<file>kbdhid.c</file>
+	<file>kbdhid.rc</file>
+</module>
diff --git a/drivers/hid/mouhid/mouhid.h b/drivers/hid/mouhid/mouhid.h
index c00fcb55f88..78048fdce5d 100644
--- a/drivers/hid/mouhid/mouhid.h
+++ b/drivers/hid/mouhid/mouhid.h
@@ -5,6 +5,7 @@
 #include <hidclass.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 #include <ntddmou.h>
 #include <kbdmou.h>
diff --git a/drivers/hid/mouhid/mouhid.rbuild b/drivers/hid/mouhid/mouhid.rbuild
new file mode 100644
index 00000000000..cfb1f95bfa0
--- /dev/null
+++ b/drivers/hid/mouhid/mouhid.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="mouhid" type="kernelmodedriver" installbase="system32/drivers" installname="mouhid.sys">
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>hidparse</library>
+	<file>mouhid.c</file>
+	<file>mouhid.rc</file>
+</module>
diff --git a/drivers/usb/directory.rbuild b/drivers/usb/directory.rbuild
index 211d6d4a9e0..8640fe372b0 100644
--- a/drivers/usb/directory.rbuild
+++ b/drivers/usb/directory.rbuild
@@ -1,13 +1,22 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="usbccgp">
+		<xi:include href="usbccgp/usbccgp.rbuild" />
+	</directory>
 	<directory name="usbd">
 		<xi:include href="usbd/usbd.rbuild" />
 	</directory>
-	<!--directory name="usbhub">
+	<directory name="usbehci">
+		<xi:include href="usbehci/usbehci.rbuild" />
+	</directory>
+	<directory name="usbhub">
 		<xi:include href="usbhub/usbhub.rbuild" />
 	</directory>
+	<directory name="usbohci">
+		<xi:include href="usbohci/usbohci.rbuild" />
+	</directory>
 	<directory name="usbstor">
 		<xi:include href="usbstor/usbstor.rbuild" />
-	</directory-->
+	</directory>
 </group>
diff --git a/drivers/usb/usbccgp/usbccgp.rbuild b/drivers/usb/usbccgp/usbccgp.rbuild
new file mode 100644
index 00000000000..4b26820fbed
--- /dev/null
+++ b/drivers/usb/usbccgp/usbccgp.rbuild
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbccgp" type="kernelmodedriver" installbase="system32/drivers" installname="usbccgp.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+    <library>usbd</library>
+    <library>pseh</library>
+	<file>descriptor.c</file>
+	<file>fdo.c</file>
+	<file>function.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>usbccgp.c</file>
+	<file>usbccgp.rc</file>
+</module>
diff --git a/drivers/usb/usbd/usbd.c b/drivers/usb/usbd/usbd.c
index c7a6e4394d2..fa3735acc16 100644
--- a/drivers/usb/usbd/usbd.c
+++ b/drivers/usb/usbd/usbd.c
@@ -34,6 +34,7 @@
 
 #include <ntddk.h>
 #include <usbdi.h>
+#define NDEBUG
 #include <debug.h>
 #ifndef PLUGPLAY_REGKEY_DRIVER
 #define PLUGPLAY_REGKEY_DRIVER              2
diff --git a/drivers/usb/usbd/usbd.rbuild b/drivers/usb/usbd/usbd.rbuild
index c5900b5ff35..18ef89793e4 100644
--- a/drivers/usb/usbd/usbd.rbuild
+++ b/drivers/usb/usbd/usbd.rbuild
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<importlibrary definition="usbd.spec" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt
index de16efaeb3d..8bad4b1d840 100644
--- a/drivers/usb/usbehci/CMakeLists.txt
+++ b/drivers/usb/usbehci/CMakeLists.txt
@@ -29,6 +29,6 @@ else()
 endif(MSVC)
 
 set_module_type(usbehci kernelmodedriver)
-add_importlibs(usbehci ntoskrnl ks drmk hal)
+add_importlibs(usbehci ntoskrnl hal)
 
 add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)
\ No newline at end of file
diff --git a/drivers/usb/usbehci/usbehci.rbuild b/drivers/usb/usbehci/usbehci.rbuild
new file mode 100644
index 00000000000..63d39433c95
--- /dev/null
+++ b/drivers/usb/usbehci/usbehci.rbuild
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbehci" type="kernelmodedriver" installbase="system32/drivers" installname="usbehci.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+    <library>pseh</library>
+	<file>usbehci.cpp</file>
+	<file>usb_device.cpp</file>
+	<file>usb_request.cpp</file>
+	<file>usb_queue.cpp</file>
+	<file>hcd_controller.cpp</file>
+	<file>hardware.cpp</file>
+	<file>misc.cpp</file>
+	<file>purecall.cpp</file>
+	<file>hub_controller.cpp</file>
+	<file>memory_manager.cpp</file>
+	<file>usbehci.rc</file>
+	<compilerflag>-fno-rtti</compilerflag>
+	<compilerflag>-fno-exceptions</compilerflag>
+</module>
diff --git a/drivers/usb/usbhub/usbhub.rbuild b/drivers/usb/usbhub/usbhub.rbuild
new file mode 100644
index 00000000000..8b9543c7ef3
--- /dev/null
+++ b/drivers/usb/usbhub/usbhub.rbuild
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<define name="DEBUG_MODE" />
+	<include base="ntoskrnl">include</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>usbd</library>
+	<library>pseh</library>
+	<file>fdo.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>usbhub.c</file>
+	<file>usbhub.rc</file>
+</module>
diff --git a/drivers/usb/usbohci/usbohci.rbuild b/drivers/usb/usbohci/usbohci.rbuild
new file mode 100644
index 00000000000..1b96cc7fece
--- /dev/null
+++ b/drivers/usb/usbohci/usbohci.rbuild
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
+	<redefine name="_WIN32_WINNT">0x600</redefine>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>usbd</library>
+    <library>pseh</library>
+	<file>usbohci.cpp</file>
+	<file>usb_device.cpp</file>
+	<file>usb_request.cpp</file>
+	<file>usb_queue.cpp</file>
+	<file>hcd_controller.cpp</file>
+	<file>hardware.cpp</file>
+	<file>misc.cpp</file>
+	<file>purecall.cpp</file>
+	<file>hub_controller.cpp</file>
+	<file>memory_manager.cpp</file>
+	<file>usbohci.rc</file>
+	<compilerflag>-fno-rtti</compilerflag>
+	<compilerflag>-fno-exceptions</compilerflag>
+</module>
diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h
index 47dabfd5442..dbc8ef51ae7 100644
--- a/drivers/usb/usbstor/usbstor.h
+++ b/drivers/usb/usbstor/usbstor.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <ntddk.h>
-#define YDEBUG
+#define NDEBUG
 #include <debug.h>
 #include <usbdi.h>
 #include <hubbusif.h>
diff --git a/drivers/usb/usbstor/usbstor.rbuild b/drivers/usb/usbstor/usbstor.rbuild
index d7215fc8e92..ac4f9e62f68 100644
--- a/drivers/usb/usbstor/usbstor.rbuild
+++ b/drivers/usb/usbstor/usbstor.rbuild
@@ -1,10 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="DEBUG_MODE" />
 	<include base="ntoskrnl">include</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
+	<library>usbd</library>
+	<file>descriptor.c</file>
+	<file>disk.c</file>
+	<file>fdo.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>queue.c</file>
+	<file>error.c</file>
+	<file>scsi.c</file>
 	<file>usbstor.c</file>
 	<file>usbstor.rc</file>
 </module>
diff --git a/lib/drivers/directory.rbuild b/lib/drivers/directory.rbuild
index 2c0c011058a..2dd51908b4f 100644
--- a/lib/drivers/directory.rbuild
+++ b/lib/drivers/directory.rbuild
@@ -4,6 +4,9 @@
 	<directory name="csq">
 		<xi:include href="csq/csq.rbuild" />
 	</directory>
+	<directory name="hidparser">
+		<xi:include href="hidparser/hidparser.rbuild" />
+	</directory>
 	<directory name="ip">
 		<xi:include href="ip/ip.rbuild" />
 	</directory>
diff --git a/lib/drivers/hidparser/CMakeLists.txt b/lib/drivers/hidparser/CMakeLists.txt
index 6ab1276ef59..b0b15dd22f4 100644
--- a/lib/drivers/hidparser/CMakeLists.txt
+++ b/lib/drivers/hidparser/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(
     -DUNICODE -D_UNICODE
-    -DNDEBUG=1)
+    -DNDEBUG)
 
 list(APPEND SOURCE
     context.c
diff --git a/lib/drivers/hidparser/hidparser.h b/lib/drivers/hidparser/hidparser.h
index 71eb157e6f0..e71af66f042 100644
--- a/lib/drivers/hidparser/hidparser.h
+++ b/lib/drivers/hidparser/hidparser.h
@@ -15,6 +15,7 @@
 #include <ntddk.h>
 #include <hidpddi.h>
 #include <hidpi.h>
+#define NDEBUG
 #include <debug.h>
 
 //
diff --git a/lib/drivers/hidparser/hidparser.rbuild b/lib/drivers/hidparser/hidparser.rbuild
new file mode 100644
index 00000000000..61416b5f723
--- /dev/null
+++ b/lib/drivers/hidparser/hidparser.rbuild
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="hidparser" type="staticlibrary">
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="NDEBUG" />
+	<file>hidparser.c</file>
+	<file>parser.c</file>
+	<file>context.c</file>
+	<file>api.c</file>
+</module>
\ No newline at end of file