diff --git a/UsbDk/Alloc.h b/UsbDk/Alloc.h
index 60c4c71..c7aaf88 100644
--- a/UsbDk/Alloc.h
+++ b/UsbDk/Alloc.h
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include <ntddk.h>
-
 template <POOL_TYPE PoolType, ULONG Tag>
 class CAllocatable
 {
diff --git a/UsbDk/ControlDevice.cpp b/UsbDk/ControlDevice.cpp
index cabccf7..db7836b 100644
--- a/UsbDk/ControlDevice.cpp
+++ b/UsbDk/ControlDevice.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "ControlDevice.h"
 #include "trace.h"
 #include "DeviceAccess.h"
diff --git a/UsbDk/ControlDevice.h b/UsbDk/ControlDevice.h
index a7b3d1b..a4a0786 100644
--- a/UsbDk/ControlDevice.h
+++ b/UsbDk/ControlDevice.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "WdfDevice.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"
diff --git a/UsbDk/DeviceAccess.cpp b/UsbDk/DeviceAccess.cpp
index 5bf9d8d..c3bf4b4 100644
--- a/UsbDk/DeviceAccess.cpp
+++ b/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()
diff --git a/UsbDk/DeviceAccess.h b/UsbDk/DeviceAccess.h
index b04555b..ceb594b 100644
--- a/UsbDk/DeviceAccess.h
+++ b/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"
diff --git a/UsbDk/Driver.cpp b/UsbDk/Driver.cpp
index 854918a..ad37356 100644
--- a/UsbDk/Driver.cpp
+++ b/UsbDk/Driver.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "driver.h"
 #include "ControlDevice.h"
 #include "FilterDevice.h"
diff --git a/UsbDk/Driver.h b/UsbDk/Driver.h
index 269fd2f..3742d2c 100644
--- a/UsbDk/Driver.h
+++ b/UsbDk/Driver.h
@@ -21,13 +21,6 @@
 *
 **********************************************************************/
 
-extern "C"
-{
-    #include "stdafx.h"
-    #include <usb.h>
-    #include <wdfusb.h>
-}
-
 #include "trace.h"
 
 //
diff --git a/UsbDk/FilterDevice.cpp b/UsbDk/FilterDevice.cpp
index bece399..d453ff4 100644
--- a/UsbDk/FilterDevice.cpp
+++ b/UsbDk/FilterDevice.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "FilterDevice.h"
 #include "trace.h"
 #include "FilterDevice.tmh"
diff --git a/UsbDk/FilterDevice.h b/UsbDk/FilterDevice.h
index 1735dbf..b14c7ba 100644
--- a/UsbDk/FilterDevice.h
+++ b/UsbDk/FilterDevice.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "WdfDevice.h"
 #include "Alloc.h"
 #include "RegText.h"
diff --git a/UsbDk/FilterStrategy.cpp b/UsbDk/FilterStrategy.cpp
index 40cea39..1171ddf 100644
--- a/UsbDk/FilterStrategy.cpp
+++ b/UsbDk/FilterStrategy.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "FilterStrategy.h"
 #include "trace.h"
 #include "FilterStrategy.tmh"
diff --git a/UsbDk/FilterStrategy.h b/UsbDk/FilterStrategy.h
index 0bec13e..a38f622 100644
--- a/UsbDk/FilterStrategy.h
+++ b/UsbDk/FilterStrategy.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"
 
diff --git a/UsbDk/Irp.cpp b/UsbDk/Irp.cpp
index 331276a..eab7fa8 100644
--- a/UsbDk/Irp.cpp
+++ b/UsbDk/Irp.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "Irp.h"
 
 CIrp::~CIrp()
diff --git a/UsbDk/Irp.h b/UsbDk/Irp.h
index 98527ff..3eb5029 100644
--- a/UsbDk/Irp.h
+++ b/UsbDk/Irp.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "ntddk.h"
 #include "Alloc.h"
 #include "UsbDkUtil.h"
 
diff --git a/UsbDk/MemoryBuffer.cpp b/UsbDk/MemoryBuffer.cpp
index a600c30..1bb5f06 100644
--- a/UsbDk/MemoryBuffer.cpp
+++ b/UsbDk/MemoryBuffer.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "MemoryBuffer.h"
 
 CMemoryBuffer* CMemoryBuffer::GetMemoryBuffer(WDFMEMORY MemObj)
diff --git a/UsbDk/MemoryBuffer.h b/UsbDk/MemoryBuffer.h
index 1257754..79bcf31 100644
--- a/UsbDk/MemoryBuffer.h
+++ b/UsbDk/MemoryBuffer.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 
 class CMemoryBuffer : public CAllocatable<NonPagedPool, 'BMHR'>
diff --git a/UsbDk/RedirectorStrategy.cpp b/UsbDk/RedirectorStrategy.cpp
index a72cf9d..91c92f5 100644
--- a/UsbDk/RedirectorStrategy.cpp
+++ b/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()
diff --git a/UsbDk/RegText.cpp b/UsbDk/RegText.cpp
index 86e5290..de2e2d3 100644
--- a/UsbDk/RegText.cpp
+++ b/UsbDk/RegText.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "Trace.h"
 #include "RegText.h"
 #include "regtext.tmh"
diff --git a/UsbDk/UsbDkUtil.h b/UsbDk/UsbDkUtil.h
index 7a03db2..1fd8aaa 100644
--- a/UsbDk/UsbDkUtil.h
+++ b/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
diff --git a/UsbDk/UsbTarget.cpp b/UsbDk/UsbTarget.cpp
index 2a7c72a..7c0ab5c 100644
--- a/UsbDk/UsbTarget.cpp
+++ b/UsbDk/UsbTarget.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "UsbTarget.h"
 #include "Trace.h"
 #include "UsbTarget.tmh"
diff --git a/UsbDk/UsbTarget.h b/UsbDk/UsbTarget.h
index e7eda51..340d9b7 100644
--- a/UsbDk/UsbTarget.h
+++ b/UsbDk/UsbTarget.h
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-#include "wdfusb.h"
 #include "Alloc.h"
 
 class CWdfUsbInterface;
diff --git a/UsbDk/WdfDevice.cpp b/UsbDk/WdfDevice.cpp
index 21e88b7..7e018af 100644
--- a/UsbDk/WdfDevice.cpp
+++ b/UsbDk/WdfDevice.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "WdfDevice.h"
 #include "trace.h"
 #include "WdfDevice.tmh"
diff --git a/UsbDk/WdfDevice.h b/UsbDk/WdfDevice.h
index 71ca678..20cf434 100644
--- a/UsbDk/WdfDevice.h
+++ b/UsbDk/WdfDevice.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
 #include "Alloc.h"
 
 class CPreAllocatedDeviceInit : public CAllocatable<PagedPool, 'IDHR'>
diff --git a/UsbDk/WdfRequest.cpp b/UsbDk/WdfRequest.cpp
index 260e813..52716e1 100644
--- a/UsbDk/WdfRequest.cpp
+++ b/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)
diff --git a/UsbDk/WdfRequest.h b/UsbDk/WdfRequest.h
index b3b4d91..b7d8dfd 100644
--- a/UsbDk/WdfRequest.h
+++ b/UsbDk/WdfRequest.h
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-
 class CWdfRequest
 {
 public:
diff --git a/UsbDk/WdfWorkitem.cpp b/UsbDk/WdfWorkitem.cpp
index f05e944..0881e28 100644
--- a/UsbDk/WdfWorkitem.cpp
+++ b/UsbDk/WdfWorkitem.cpp
@@ -21,6 +21,7 @@
 *
 **********************************************************************/
 
+#include "stdafx.h"
 #include "WdfWorkitem.h"
 
 CWdfWorkitem::~CWdfWorkitem()
diff --git a/UsbDk/WdfWorkitem.h b/UsbDk/WdfWorkitem.h
index 2e2dd6b..2475cfd 100644
--- a/UsbDk/WdfWorkitem.h
+++ b/UsbDk/WdfWorkitem.h
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "stdafx.h"
-
 #include "Alloc.h"
 
 class CWdfWorkitem : public CAllocatable<NonPagedPool, 'IWHR'>
diff --git a/UsbDk/stdafx.h b/UsbDk/stdafx.h
index e38c687..4e64c43 100644
--- a/UsbDk/stdafx.h
+++ b/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