diff --git a/reactos/drivers/ksfilter/ks/allocators.c b/reactos/drivers/ksfilter/ks/allocators.c
index b3fbbbe20d5..5c7457ff791 100644
--- a/reactos/drivers/ksfilter/ks/allocators.c
+++ b/reactos/drivers/ksfilter/ks/allocators.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef enum
 {
     ALLOCATOR_NPAGED_LOOKASIDE,
diff --git a/reactos/drivers/ksfilter/ks/api.c b/reactos/drivers/ksfilter/ks/api.c
index 5b50fcf20a3..504b60570f7 100644
--- a/reactos/drivers/ksfilter/ks/api.c
+++ b/reactos/drivers/ksfilter/ks/api.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 const GUID GUID_NULL              = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
 const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
 
diff --git a/reactos/drivers/ksfilter/ks/bag.c b/reactos/drivers/ksfilter/ks/bag.c
index 87f7a2bbef0..ec8beb07afa 100644
--- a/reactos/drivers/ksfilter/ks/bag.c
+++ b/reactos/drivers/ksfilter/ks/bag.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
     LIST_ENTRY Entry;
diff --git a/reactos/drivers/ksfilter/ks/clocks.c b/reactos/drivers/ksfilter/ks/clocks.c
index 2e3f03f0b55..15a567d1081 100644
--- a/reactos/drivers/ksfilter/ks/clocks.c
+++ b/reactos/drivers/ksfilter/ks/clocks.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
     LONGLONG Time;
diff --git a/reactos/drivers/ksfilter/ks/connectivity.c b/reactos/drivers/ksfilter/ks/connectivity.c
index 7cd0fabb740..1d995263bc8 100644
--- a/reactos/drivers/ksfilter/ks/connectivity.c
+++ b/reactos/drivers/ksfilter/ks/connectivity.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 KSPIN_INTERFACE StandardPinInterface = 
 {
     {STATIC_KSINTERFACESETID_Standard},
diff --git a/reactos/drivers/ksfilter/ks/device.c b/reactos/drivers/ksfilter/ks/device.c
index c93b0b9ac49..7b974ddf7a7 100644
--- a/reactos/drivers/ksfilter/ks/device.c
+++ b/reactos/drivers/ksfilter/ks/device.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 IKsDevice_fnQueryInterface(
diff --git a/reactos/drivers/ksfilter/ks/deviceinterface.c b/reactos/drivers/ksfilter/ks/deviceinterface.c
index c1fdff8470b..4c981932d6b 100644
--- a/reactos/drivers/ksfilter/ks/deviceinterface.c
+++ b/reactos/drivers/ksfilter/ks/deviceinterface.c
@@ -1,5 +1,8 @@
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 KspSetDeviceInterfacesState(
     IN PLIST_ENTRY ListHead,
diff --git a/reactos/drivers/ksfilter/ks/driver.c b/reactos/drivers/ksfilter/ks/driver.c
index c6ef2c99389..ed43717e219 100644
--- a/reactos/drivers/ksfilter/ks/driver.c
+++ b/reactos/drivers/ksfilter/ks/driver.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     @implemented
 */
diff --git a/reactos/drivers/ksfilter/ks/event.c b/reactos/drivers/ksfilter/ks/event.c
index 460f995f6c3..367148488e4 100644
--- a/reactos/drivers/ksfilter/ks/event.c
+++ b/reactos/drivers/ksfilter/ks/event.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 BOOLEAN
 KspSynchronizedEventRoutine(
     IN KSEVENTS_LOCKTYPE EventsFlags,
diff --git a/reactos/drivers/ksfilter/ks/filter.c b/reactos/drivers/ksfilter/ks/filter.c
index 384a00c4031..30ef76cc049 100644
--- a/reactos/drivers/ksfilter/ks/filter.c
+++ b/reactos/drivers/ksfilter/ks/filter.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
     KSBASIC_HEADER Header;
diff --git a/reactos/drivers/ksfilter/ks/filterfactory.c b/reactos/drivers/ksfilter/ks/filterfactory.c
index 51c9a65d273..c2b4e25d8d0 100644
--- a/reactos/drivers/ksfilter/ks/filterfactory.c
+++ b/reactos/drivers/ksfilter/ks/filterfactory.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
     KSBASIC_HEADER Header;
diff --git a/reactos/drivers/ksfilter/ks/image.c b/reactos/drivers/ksfilter/ks/image.c
index 55828b8b3e4..3cfa72f5521 100644
--- a/reactos/drivers/ksfilter/ks/image.c
+++ b/reactos/drivers/ksfilter/ks/image.c
@@ -8,6 +8,12 @@
 
 #include "priv.h"
 
+#include <ntimage.h>
+#include <ndk/ldrfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /*
     @implemented
 */
diff --git a/reactos/drivers/ksfilter/ks/irp.c b/reactos/drivers/ksfilter/ks/irp.c
index 0c493eead7e..4ec985ff277 100644
--- a/reactos/drivers/ksfilter/ks/irp.c
+++ b/reactos/drivers/ksfilter/ks/irp.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     @implemented
 */
diff --git a/reactos/drivers/ksfilter/ks/kcom.c b/reactos/drivers/ksfilter/ks/kcom.c
index 8921caf1268..be38e1a8021 100644
--- a/reactos/drivers/ksfilter/ks/kcom.c
+++ b/reactos/drivers/ksfilter/ks/kcom.c
@@ -9,6 +9,9 @@
 
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}};
 
 /* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */
diff --git a/reactos/drivers/ksfilter/ks/ksfunc.h b/reactos/drivers/ksfilter/ks/ksfunc.h
index fc039f13fe1..83d57b2bef8 100644
--- a/reactos/drivers/ksfilter/ks/ksfunc.h
+++ b/reactos/drivers/ksfilter/ks/ksfunc.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include "ksiface.h"
-#include "kstypes.h"
-
 #define TAG_KSDEVICE 'DESK'
 #define TAG_KSOBJECT_TAG 'HOSK'
 
diff --git a/reactos/drivers/ksfilter/ks/ksiface.h b/reactos/drivers/ksfilter/ks/ksiface.h
index f5e388887ba..a7c3f01b9c8 100644
--- a/reactos/drivers/ksfilter/ks/ksiface.h
+++ b/reactos/drivers/ksfilter/ks/ksiface.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <ntddk.h>
-#include <ks.h>
-
 #if !defined(DEFINE_ABSTRACT_UNKNOWN)
 
 #define DEFINE_ABSTRACT_UNKNOWN()                               \
diff --git a/reactos/drivers/ksfilter/ks/kstypes.h b/reactos/drivers/ksfilter/ks/kstypes.h
index 0be5956264c..cd4aaca3707 100644
--- a/reactos/drivers/ksfilter/ks/kstypes.h
+++ b/reactos/drivers/ksfilter/ks/kstypes.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <ntddk.h>
-#include <ks.h>
-
 typedef struct
 {
     KoCreateObjectHandler CreateObjectHandler;
diff --git a/reactos/drivers/ksfilter/ks/methods.c b/reactos/drivers/ksfilter/ks/methods.c
index 6263ce0b7bb..96369788e31 100644
--- a/reactos/drivers/ksfilter/ks/methods.c
+++ b/reactos/drivers/ksfilter/ks/methods.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 FindMethodHandler(
     IN PIO_STATUS_BLOCK IoStatus,
diff --git a/reactos/drivers/ksfilter/ks/misc.c b/reactos/drivers/ksfilter/ks/misc.c
index 9ba4b2611b5..fd867263b67 100644
--- a/reactos/drivers/ksfilter/ks/misc.c
+++ b/reactos/drivers/ksfilter/ks/misc.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VOID
 CompleteRequest(
     PIRP Irp,
diff --git a/reactos/drivers/ksfilter/ks/pin.c b/reactos/drivers/ksfilter/ks/pin.c
index 883f098b43d..4a57476e95a 100644
--- a/reactos/drivers/ksfilter/ks/pin.c
+++ b/reactos/drivers/ksfilter/ks/pin.c
@@ -6,9 +6,13 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#include <bdamedia.h>
+
+#define NDEBUG
+#include <debug.h>
+
 typedef struct _KSISTREAM_POINTER
 {
     PFNKSSTREAMPOINTER Callback;
diff --git a/reactos/drivers/ksfilter/ks/priv.h b/reactos/drivers/ksfilter/ks/priv.h
index eec30e2a38b..43d859fcd75 100644
--- a/reactos/drivers/ksfilter/ks/priv.h
+++ b/reactos/drivers/ksfilter/ks/priv.h
@@ -1,21 +1,13 @@
 #define _KSDDK_
 
-#include <stdio.h>
-
 #include <ntifs.h>
-#define NDEBUG
-//#define YDEBUG
-#include <debug.h>
 #include <portcls.h>
 #include <kcom.h>
 #include <pseh/pseh2.h>
 
-#include <ntimage.h>
-#include <ndk/ldrfuncs.h>
-
+#include "ksiface.h"
+#include "kstypes.h"
 #include "ksfunc.h"
-#include "bdamedia.h"
-#include <swenum.h>
 
 #define TAG_DEVICE_HEADER 'KSDH'
 #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */
diff --git a/reactos/drivers/ksfilter/ks/property.c b/reactos/drivers/ksfilter/ks/property.c
index 757b393deee..b6b191198bc 100644
--- a/reactos/drivers/ksfilter/ks/property.c
+++ b/reactos/drivers/ksfilter/ks/property.c
@@ -8,6 +8,9 @@
 
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
 
 NTSTATUS
diff --git a/reactos/drivers/ksfilter/ks/swenum.c b/reactos/drivers/ksfilter/ks/swenum.c
index f389f2dcda0..d65fa1e5935 100644
--- a/reactos/drivers/ksfilter/ks/swenum.c
+++ b/reactos/drivers/ksfilter/ks/swenum.c
@@ -6,9 +6,14 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#include <stdio.h>
+#include <swenum.h>
+
+#define NDEBUG
+#include <debug.h>
+
 LONG KsDeviceCount = 0;
 
 typedef NTSTATUS (NTAPI *PKSP_BUS_ENUM_CALLBACK)(
diff --git a/reactos/drivers/ksfilter/ks/topology.c b/reactos/drivers/ksfilter/ks/topology.c
index 49ae6599a7a..7a9b447b662 100644
--- a/reactos/drivers/ksfilter/ks/topology.c
+++ b/reactos/drivers/ksfilter/ks/topology.c
@@ -6,9 +6,10 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
 
 NTSTATUS
 NTAPI
diff --git a/reactos/drivers/ksfilter/ks/unknown.c b/reactos/drivers/ksfilter/ks/unknown.c
index d33ffdb3dcc..6af2adf54f8 100644
--- a/reactos/drivers/ksfilter/ks/unknown.c
+++ b/reactos/drivers/ksfilter/ks/unknown.c
@@ -7,9 +7,11 @@
  *                  KJK::Hyperion
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 #ifdef _X86_
 #define KS_DECL_CXX(RET_) extern RET_ __fastcall
 #define KS_THIS(CLASS_)   CLASS_ * This, void * dummy_
diff --git a/reactos/drivers/ksfilter/ks/worker.c b/reactos/drivers/ksfilter/ks/worker.c
index 639f9cd7835..f544d633f67 100644
--- a/reactos/drivers/ksfilter/ks/worker.c
+++ b/reactos/drivers/ksfilter/ks/worker.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:      Johannes Anderwald
  */
 
-
 #include "priv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* ===============================================================
     Worker Management Functions
 */