From d42c5357fdea73741ab8841744bafdbde1286b75 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 3 Feb 2014 10:50:41 +0000
Subject: [PATCH] [USBCCGP] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61951
---
 reactos/drivers/usb/usbccgp/descriptor.c | 1 -
 reactos/drivers/usb/usbccgp/misc.c       | 2 +-
 reactos/drivers/usb/usbccgp/pdo.c        | 2 ++
 reactos/drivers/usb/usbccgp/usbccgp.h    | 7 ++-----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/reactos/drivers/usb/usbccgp/descriptor.c b/reactos/drivers/usb/usbccgp/descriptor.c
index ba1733947cf..4a8a9c8448a 100644
--- a/reactos/drivers/usb/usbccgp/descriptor.c
+++ b/reactos/drivers/usb/usbccgp/descriptor.c
@@ -545,4 +545,3 @@ USBCCGP_SelectConfiguration(
     //
     return Status;
 }
-
diff --git a/reactos/drivers/usb/usbccgp/misc.c b/reactos/drivers/usb/usbccgp/misc.c
index e65cb3f7d5d..807be4914b2 100644
--- a/reactos/drivers/usb/usbccgp/misc.c
+++ b/reactos/drivers/usb/usbccgp/misc.c
@@ -190,4 +190,4 @@ DumpFunctionDescriptor(
             DPRINT1(" Index %lu iInterface %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/reactos/drivers/usb/usbccgp/pdo.c b/reactos/drivers/usb/usbccgp/pdo.c
index 0efcc808fa7..98103443498 100644
--- a/reactos/drivers/usb/usbccgp/pdo.c
+++ b/reactos/drivers/usb/usbccgp/pdo.c
@@ -11,6 +11,8 @@
 
 #include "usbccgp.h"
 
+#include <ntddk.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/usb/usbccgp/usbccgp.h b/reactos/drivers/usb/usbccgp/usbccgp.h
index d722b471ef1..640760f7f71 100644
--- a/reactos/drivers/usb/usbccgp/usbccgp.h
+++ b/reactos/drivers/usb/usbccgp/usbccgp.h
@@ -1,14 +1,11 @@
 #ifndef USBEHCI_H__
 #define USBEHCI_H__
 
-#include <ntddk.h>
+#include <wdm.h>
 #include <hubbusif.h>
 #include <usbbusif.h>
 #include <usbdlib.h>
 
-/* FIXME:
-#include <usbprotocoldefs.h> */
-
 #include <stdio.h>
 
 typedef struct
@@ -151,4 +148,4 @@ NTSTATUS
 USBCCGP_EnumerateFunctions(
     IN PDEVICE_OBJECT DeviceObject);
 
-#endif
+#endif /* USBEHCI_H__ */