From 3c2eccf6525fbf06eae1dedc33be7c0a3b6f9407 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 24 Dec 2013 20:42:53 +0000
Subject: [PATCH] [USBOHCI] * Move some inclusions and definitions to the main
 header. * Do not include debug.h into the main header. CORE-7716

svn path=/trunk/; revision=61377
---
 reactos/drivers/usb/usbohci/hardware.cpp    | 5 +++--
 reactos/drivers/usb/usbohci/usb_queue.cpp   | 4 +++-
 reactos/drivers/usb/usbohci/usb_request.cpp | 6 +++---
 reactos/drivers/usb/usbohci/usbohci.cpp     | 3 +++
 reactos/drivers/usb/usbohci/usbohci.h       | 5 +++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/reactos/drivers/usb/usbohci/hardware.cpp b/reactos/drivers/usb/usbohci/hardware.cpp
index ad49006eb92..9900cfe33c6 100644
--- a/reactos/drivers/usb/usbohci/hardware.cpp
+++ b/reactos/drivers/usb/usbohci/hardware.cpp
@@ -8,9 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);
 
diff --git a/reactos/drivers/usb/usbohci/usb_queue.cpp b/reactos/drivers/usb/usbohci/usb_queue.cpp
index c6156299f0a..f757c4beb8f 100644
--- a/reactos/drivers/usb/usbohci/usb_queue.cpp
+++ b/reactos/drivers/usb/usbohci/usb_queue.cpp
@@ -9,7 +9,9 @@
  */
 
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBQueue : public IOHCIQueue
 {
diff --git a/reactos/drivers/usb/usbohci/usb_request.cpp b/reactos/drivers/usb/usbohci/usb_request.cpp
index ae5a53c05ca..0983089761a 100644
--- a/reactos/drivers/usb/usbohci/usb_request.cpp
+++ b/reactos/drivers/usb/usbohci/usb_request.cpp
@@ -8,10 +8,10 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
-
 #include "usbohci.h"
-#include "hardware.h"
+
+#define NDEBUG
+#include <debug.h>
 
 class CUSBRequest : public IOHCIRequest
 {
diff --git a/reactos/drivers/usb/usbohci/usbohci.cpp b/reactos/drivers/usb/usbohci/usbohci.cpp
index 9077210ac61..b5e6f0efbad 100644
--- a/reactos/drivers/usb/usbohci/usbohci.cpp
+++ b/reactos/drivers/usb/usbohci/usbohci.cpp
@@ -10,6 +10,9 @@
 
 #include "usbohci.h"
 
+#define NDEBUG
+#include <debug.h>
+
 extern
 "C"
 NTSTATUS
diff --git a/reactos/drivers/usb/usbohci/usbohci.h b/reactos/drivers/usb/usbohci/usbohci.h
index 4a1b1313c77..61fef27e2b5 100644
--- a/reactos/drivers/usb/usbohci/usbohci.h
+++ b/reactos/drivers/usb/usbohci/usbohci.h
@@ -1,9 +1,9 @@
 #ifndef USBOHCI_H__
 #define USBOHCI_H__
 
+#define INITGUID
+
 #include <ntddk.h>
-#define NDEBUG
-#include <debug.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbioctl.h>
@@ -31,6 +31,7 @@ extern
 #include <dmusicks.h>
 #include <kcom.h>
 
+#include "hardware.h"
 #include "interfaces.h"
 
 //