From d4645183ce5837d68c88259650f2a96522a3c368 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 2 Jan 2014 14:25:01 +0000
Subject: [PATCH] [USBCCGP] * Remove some inclusions from the main header. *
 Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61492
---
 reactos/drivers/usb/usbccgp/CMakeLists.txt | 2 +-
 reactos/drivers/usb/usbccgp/guid.c         | 8 ++++++++
 reactos/drivers/usb/usbccgp/usbccgp.h      | 4 ----
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 reactos/drivers/usb/usbccgp/guid.c

diff --git a/reactos/drivers/usb/usbccgp/CMakeLists.txt b/reactos/drivers/usb/usbccgp/CMakeLists.txt
index f3da240ef0c..9f852acad49 100644
--- a/reactos/drivers/usb/usbccgp/CMakeLists.txt
+++ b/reactos/drivers/usb/usbccgp/CMakeLists.txt
@@ -6,7 +6,7 @@ add_definitions(-DDEBUG_MODE)
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c usbccgp.rc)
+add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c guid.c usbccgp.rc)
 
 target_link_libraries(usbccgp ${PSEH_LIB})
 
diff --git a/reactos/drivers/usb/usbccgp/guid.c b/reactos/drivers/usb/usbccgp/guid.c
new file mode 100644
index 00000000000..39f3a90b884
--- /dev/null
+++ b/reactos/drivers/usb/usbccgp/guid.c
@@ -0,0 +1,8 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <wdm.h>
+#include <hubbusif.h>
+#include <initguid.h>
+#include <usbbusif.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/drivers/usb/usbccgp/usbccgp.h b/reactos/drivers/usb/usbccgp/usbccgp.h
index 9f36df9ac72..d722b471ef1 100644
--- a/reactos/drivers/usb/usbccgp/usbccgp.h
+++ b/reactos/drivers/usb/usbccgp/usbccgp.h
@@ -2,18 +2,14 @@
 #define USBEHCI_H__
 
 #include <ntddk.h>
-#include <initguid.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
-#include <usbioctl.h>
 #include <usbdlib.h>
 
 /* FIXME:
 #include <usbprotocoldefs.h> */
 
-#include <usb.h>
 #include <stdio.h>
-#include <wdmguid.h>
 
 typedef struct
 {