From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 21 Dec 2013 14:19:14 +0000 (+0000)
Subject: [USBEHCI]
X-Git-Tag: ReactOS-0.3.16~515
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a29379fc7cf7d7fe3e4275482e25e0aef73cb991

[USBEHCI]
* Move hardware.h inclusion to the main header.
* Define INITGUID in the main header.
CORE-7716

svn path=/trunk/; revision=61320
---

diff --git a/reactos/drivers/usb/usbehci/hardware.cpp b/reactos/drivers/usb/usbehci/hardware.cpp
index e230da208b5..9979190626d 100644
--- a/reactos/drivers/usb/usbehci/hardware.cpp
+++ b/reactos/drivers/usb/usbehci/hardware.cpp
@@ -8,9 +8,7 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
 #include "usbehci.h"
-#include "hardware.h"
 
 typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext);
 
diff --git a/reactos/drivers/usb/usbehci/usb_queue.cpp b/reactos/drivers/usb/usbehci/usb_queue.cpp
index 8b501b699a4..9f2361f4c34 100644
--- a/reactos/drivers/usb/usbehci/usb_queue.cpp
+++ b/reactos/drivers/usb/usbehci/usb_queue.cpp
@@ -9,7 +9,6 @@
  */
 
 #include "usbehci.h"
-#include "hardware.h"
 
 class CUSBQueue : public IEHCIQueue
 {
diff --git a/reactos/drivers/usb/usbehci/usb_request.cpp b/reactos/drivers/usb/usbehci/usb_request.cpp
index ba12783b2a1..b076e79bdde 100644
--- a/reactos/drivers/usb/usbehci/usb_request.cpp
+++ b/reactos/drivers/usb/usbehci/usb_request.cpp
@@ -8,10 +8,7 @@
  *              Johannes Anderwald (johannes.anderwald@reactos.org)
  */
 
-#define INITGUID
-
 #include "usbehci.h"
-#include "hardware.h"
 
 class CUSBRequest : public IEHCIRequest
 {
diff --git a/reactos/drivers/usb/usbehci/usbehci.h b/reactos/drivers/usb/usbehci/usbehci.h
index 3a6ec0aa8fb..83dbb5f94f2 100644
--- a/reactos/drivers/usb/usbehci/usbehci.h
+++ b/reactos/drivers/usb/usbehci/usbehci.h
@@ -1,6 +1,8 @@
 #ifndef USBEHCI_H__
 #define USBEHCI_H__
 
+#define INITGUID
+
 #include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
@@ -31,6 +33,7 @@ extern "C"
 #include <dmusicks.h>
 #include <kcom.h>
 
+#include "hardware.h"
 #include "interfaces.h"
 
 //