UsbDk: place all system includes into stdafx.h

This makes include policy more strict and ensures
all system includes properly wrapped with extern "C"

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>

UsbDk/Alloc.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include <ntddk.h>
-
 template <POOL_TYPE PoolType, ULONG Tag>
 class CAllocatable
 {

UsbDk/ControlDevice.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "ControlDevice.h"
 #include "trace.h"
 #include "DeviceAccess.h"

UsbDk/ControlDevice.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "WdfDevice.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"

UsbDk/DeviceAccess.cpp

@@ -21,13 +21,14 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "DeviceAccess.h"
 #include "trace.h"
 #include "Irp.h"
 #include "RegText.h"
 #include "DeviceAccess.tmh"
 
-#include "UsbIOCtl.h"
+#include "stdafx.h"
 
 #if !TARGET_OS_WIN_XP
 bool CWdmUSBD::Create()

UsbDk/DeviceAccess.h

@@ -23,14 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-#include "usb.h"
-
-extern "C"
-{
-#include "usbdlib.h"
-}
-
 #include "Alloc.h"
 #include "RegText.h"
 #include "MemoryBuffer.h"

UsbDk/Driver.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "driver.h"
 #include "ControlDevice.h"
 #include "FilterDevice.h"

UsbDk/Driver.h

@@ -21,13 +21,6 @@
 *
 **********************************************************************/
 
-extern "C"
-{
-    #include "stdafx.h"
-    #include <usb.h>
-    #include <wdfusb.h>
-}
-
 #include "trace.h"
 
 //

UsbDk/FilterDevice.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "FilterDevice.h"
 #include "trace.h"
 #include "FilterDevice.tmh"

UsbDk/FilterDevice.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "WdfDevice.h"
 #include "Alloc.h"
 #include "RegText.h"

UsbDk/FilterStrategy.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "FilterStrategy.h"
 #include "trace.h"
 #include "FilterStrategy.tmh"

UsbDk/FilterStrategy.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"
 

UsbDk/Irp.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "Irp.h"
 
 CIrp::~CIrp()

UsbDk/Irp.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "ntddk.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"
 

UsbDk/MemoryBuffer.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "MemoryBuffer.h"
 
 CMemoryBuffer* CMemoryBuffer::GetMemoryBuffer(WDFMEMORY MemObj)

UsbDk/MemoryBuffer.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 
 class CMemoryBuffer : public CAllocatable<NonPagedPool, 'BMHR'>

UsbDk/RedirectorStrategy.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "RedirectorStrategy.h"
 #include "trace.h"
 #include "RedirectorStrategy.tmh"
@@ -28,7 +29,6 @@
 #include "UsbDkNames.h"
 #include "ControlDevice.h"
 #include "WdfRequest.h"
-#include "Public.h"
 //--------------------------------------------------------------------------------------------------
 
 NTSTATUS CUsbDkRedirectorStrategy::MakeAvailable()

UsbDk/RegText.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "Trace.h"
 #include "RegText.h"
 #include "regtext.tmh"

UsbDk/UsbDkUtil.h

@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include <ntddk.h>
-#include <Ntstrsafe.h>
-
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
 
 class CWdmSpinLock

UsbDk/UsbTarget.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "UsbTarget.h"
 #include "Trace.h"
 #include "UsbTarget.tmh"

UsbDk/UsbTarget.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-#include "wdfusb.h"
 #include "Alloc.h"
 
 class CWdfUsbInterface;

UsbDk/WdfDevice.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "WdfDevice.h"
 #include "trace.h"
 #include "WdfDevice.tmh"

UsbDk/WdfDevice.h

@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 
 class CPreAllocatedDeviceInit : public CAllocatable<PagedPool, 'IDHR'>

UsbDk/WdfRequest.cpp

@@ -20,8 +20,7 @@
 * limitations under the License.
 *
 **********************************************************************/
-
-#include <ntddk.h>
+#include "stdafx.h"
 #include "WdfRequest.h"
 
 NTSTATUS CWdfRequest::SendAndForget(WDFIOTARGET Target)

UsbDk/WdfRequest.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-
 class CWdfRequest
 {
 public:

UsbDk/WdfWorkitem.cpp

@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "WdfWorkitem.h"
 
 CWdfWorkitem::~CWdfWorkitem()

UsbDk/WdfWorkitem.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-
 #include "Alloc.h"
 
 class CWdfWorkitem : public CAllocatable<NonPagedPool, 'IWHR'>

UsbDk/stdafx.h

@@ -9,6 +9,8 @@
 #pragma warning(push,3)
 #endif
 
+extern "C"
+{
 #include <ntddk.h>
 #include <wdf.h>
 #include <usb.h>
@@ -17,6 +19,12 @@
 #include <UsbSpec.h>
 #endif
 
+#include <wdfusb.h>
+#include <usbdlib.h>
+#include <ntstrsafe.h>
+#include <usbioctl.h>
+}
+
 #if TARGET_OS_WIN_XP
 #pragma warning(pop)
 #endif