From cd426e2a739e1a2cc97dc8cdfa7d22d184a4457e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 3 Jan 2014 18:33:25 +0000
Subject: [PATCH] [USBOHCI] * Remove inclusions that already exist in the main
 header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61504
---
 reactos/drivers/usb/usbohci/CMakeLists.txt |  3 +-
 reactos/drivers/usb/usbohci/guid.cpp       |  6 ++++
 reactos/drivers/usb/usbohci/hardware.h     |  2 --
 reactos/drivers/usb/usbohci/interfaces.h   |  5 +---
 reactos/drivers/usb/usbohci/usbohci.h      | 32 ++--------------------
 5 files changed, 11 insertions(+), 37 deletions(-)
 create mode 100644 reactos/drivers/usb/usbohci/guid.cpp

diff --git a/reactos/drivers/usb/usbohci/CMakeLists.txt b/reactos/drivers/usb/usbohci/CMakeLists.txt
index eab4dc0a0d0..dcacd91b322 100644
--- a/reactos/drivers/usb/usbohci/CMakeLists.txt
+++ b/reactos/drivers/usb/usbohci/CMakeLists.txt
@@ -10,7 +10,8 @@ list(APPEND SOURCE
     usbohci.cpp
     usb_request.cpp
     usb_queue.cpp
-    hardware.cpp)
+    hardware.cpp
+    guid.cpp)
 
 add_library(usbohci SHARED
     ${SOURCE}
diff --git a/reactos/drivers/usb/usbohci/guid.cpp b/reactos/drivers/usb/usbohci/guid.cpp
new file mode 100644
index 00000000000..8ea477c936f
--- /dev/null
+++ b/reactos/drivers/usb/usbohci/guid.cpp
@@ -0,0 +1,6 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <libusb.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/drivers/usb/usbohci/hardware.h b/reactos/drivers/usb/usbohci/hardware.h
index e37b635fba9..38f6620b3c7 100644
--- a/reactos/drivers/usb/usbohci/hardware.h
+++ b/reactos/drivers/usb/usbohci/hardware.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <ntddk.h>
-
 //
 // OHCI Operational Registers
 //
diff --git a/reactos/drivers/usb/usbohci/interfaces.h b/reactos/drivers/usb/usbohci/interfaces.h
index d05773bb118..ac77ae4b8fb 100644
--- a/reactos/drivers/usb/usbohci/interfaces.h
+++ b/reactos/drivers/usb/usbohci/interfaces.h
@@ -1,4 +1,3 @@
-
 #ifndef INTERFACES_HPP
 #define INTERFACES_HPP
 
@@ -6,8 +5,6 @@ struct _OHCI_ENDPOINT_DESCRIPTOR;
 struct IDMAMemoryManager;
 struct IUSBQueue;
 
-#include "libusb.h"
-
 //=========================================================================================
 //
 // class IUSBHardwareDevice
@@ -134,4 +131,4 @@ DECLARE_INTERFACE_(IOHCIQueue, IUSBQueue)
 
 typedef IOHCIQueue *POHCIQUEUE;
 
-#endif
+#endif /* INTERFACES_HPP */
diff --git a/reactos/drivers/usb/usbohci/usbohci.h b/reactos/drivers/usb/usbohci/usbohci.h
index 61fef27e2b5..fcc3a80586b 100644
--- a/reactos/drivers/usb/usbohci/usbohci.h
+++ b/reactos/drivers/usb/usbohci/usbohci.h
@@ -1,35 +1,7 @@
 #ifndef USBOHCI_H__
 #define USBOHCI_H__
 
-#define INITGUID
-
-#include <ntddk.h>
-#include <hubbusif.h>
-#include <usbbusif.h>
-#include <usbioctl.h>
-#include <usb100.h>
-
-extern
-"C"
-{
-#include <usbdlib.h>
-}
-
-//
-// FIXME: 
-// #include <usbprotocoldefs.h>
-//
-#include <usb.h>
-#include <stdio.h>
-#include <wdmguid.h>
-
-//
-// FIXME:
-// the following includes are required to get kcom to compile
-//
-#include <portcls.h>
-#include <dmusicks.h>
-#include <kcom.h>
+#include <libusb.h>
 
 #include "hardware.h"
 #include "interfaces.h"
@@ -79,4 +51,4 @@ NTSTATUS NTAPI CreateUSBQueue(PUSBQUEUE *OutUsbQueue);
 NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest);
 }
 
-#endif
+#endif /* USBOHCI_H__ */