[USBHUB]

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

svn path=/trunk/; revision=61330

reactos/drivers/usb/usbhub/fdo.c

@@ -8,9 +8,11 @@
  *                  Johannes Anderwald ([email protected])
  */
 
-#define INITGUID
 #include "usbhub.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 QueryStatusChangeEndpoint(
     IN PDEVICE_OBJECT DeviceObject);

reactos/drivers/usb/usbhub/hub_fdo.c

@@ -7,8 +7,12 @@
  *                  Michael Martin ([email protected])
  *                  Johannes Anderwald ([email protected])
  */
+
 #include "usbhub.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/usb/usbhub/misc.c

@@ -7,8 +7,11 @@
  *                  Michael Martin ([email protected])
  *                  Johannes Anderwald ([email protected])
  */
+
 #include "usbhub.h"
-#include <stdarg.h>
+
+#define NDEBUG
+#include <debug.h>
 
 VOID
 DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)

reactos/drivers/usb/usbhub/pdo.c

@@ -11,6 +11,9 @@
 
 #include "usbhub.h"
 
+#define NDEBUG
+#include <debug.h>
+
 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 NTSTATUS

reactos/drivers/usb/usbhub/usbhub.c

@@ -11,6 +11,9 @@
 
 #include "usbhub.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS NTAPI
 USBHUB_Create(
     IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/usb/usbhub/usbhub.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#define NDEBUG
+#define INITGUID
+
 #include <ntifs.h>
 #include <ntddk.h>
 #include <wdmguid.h>
@@ -8,9 +9,10 @@
 #include <usbbusif.h>
 #include <usbioctl.h>
 #include <usb.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <usbdlib.h>
-#include <debug.h>
+
 //BROKEN: #include <usbprotocoldefs.h>
 #include <pseh/pseh2.h>
 
@@ -193,4 +195,4 @@ GetPortStatusAndChange(
 NTSTATUS
 USBHUB_ParentFDOStartDevice(
     IN PDEVICE_OBJECT DeviceObject,
-    IN PIRP Irp);
+    IN PIRP Irp);