[USBUHCI]

* Move some inclusions and definitions to the main header.
* Do not include debug.h into the main header.
CORE-7716

svn path=/trunk/; revision=61379

reactos/drivers/usb/usbuhci/hardware.cpp

@@ -8,9 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
 #include "usbuhci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);
 

reactos/drivers/usb/usbuhci/usb_queue.cpp

@@ -9,7 +9,9 @@
  */
 
 #include "usbuhci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBQueue : public IUHCIQueue
 {

reactos/drivers/usb/usbuhci/usb_request.cpp

@@ -8,10 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
-
 #include "usbuhci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBRequest : public IUHCIRequest
 {

reactos/drivers/usb/usbuhci/usbuhci.cpp

@@ -10,6 +10,9 @@
 
 #include "usbuhci.h"
 
+#define NDEBUG
+#include <debug.h>
+
 extern
 "C"
 NTSTATUS

reactos/drivers/usb/usbuhci/usbuhci.h

@@ -1,9 +1,9 @@
 #ifndef USBUHCI_H__
 #define USBUHCI_H__
 
+#define INITGUID
+
 #include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbioctl.h>
@@ -30,6 +30,7 @@ extern
 #include <dmusicks.h>
 #include <kcom.h>
 
+#include "hardware.h"
 #include "interfaces.h"
 
 //