diff --git a/reactos/lib/ntdll/csr/capture.c b/reactos/lib/ntdll/csr/capture.c
index f45723ae69b..7760b63d62f 100644
--- a/reactos/lib/ntdll/csr/capture.c
+++ b/reactos/lib/ntdll/csr/capture.c
@@ -8,8 +8,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/lib/ntdll/csr/lpc.c b/reactos/lib/ntdll/csr/lpc.c
index a27562ce288..b4084bfe0ae 100644
--- a/reactos/lib/ntdll/csr/lpc.c
+++ b/reactos/lib/ntdll/csr/lpc.c
@@ -13,8 +13,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/lib/ntdll/csr/probe.c b/reactos/lib/ntdll/csr/probe.c
index 348f89d5cc7..50208122305 100644
--- a/reactos/lib/ntdll/csr/probe.c
+++ b/reactos/lib/ntdll/csr/probe.c
@@ -8,8 +8,9 @@
  * DATE:            2001-06-17
  */
  
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /*
  * @implemented
diff --git a/reactos/lib/ntdll/csr/thread.c b/reactos/lib/ntdll/csr/thread.c
index dfe12a46248..71951d9074a 100644
--- a/reactos/lib/ntdll/csr/thread.c
+++ b/reactos/lib/ntdll/csr/thread.c
@@ -6,8 +6,9 @@
  * PURPOSE:         CSRSS threads API
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /*
  * @implemented
diff --git a/reactos/lib/ntdll/dbg/brkpoint.c b/reactos/lib/ntdll/dbg/brkpoint.c
index 930205aecc7..88dfaf06252 100644
--- a/reactos/lib/ntdll/dbg/brkpoint.c
+++ b/reactos/lib/ntdll/dbg/brkpoint.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/ntdll/dbg/debug.c b/reactos/lib/ntdll/dbg/debug.c
index a138146acae..c1cda24627f 100644
--- a/reactos/lib/ntdll/dbg/debug.c
+++ b/reactos/lib/ntdll/dbg/debug.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <rosrtl/thread.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/ntdll/dbg/print.c b/reactos/lib/ntdll/dbg/print.c
index ab82fd0f523..5e4a281099b 100644
--- a/reactos/lib/ntdll/dbg/print.c
+++ b/reactos/lib/ntdll/dbg/print.c
@@ -9,8 +9,9 @@
  *                  Created 28/12/1999
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/ntdll/inc/ntdll.h b/reactos/lib/ntdll/inc/ntdll.h
index e03524340ec..dc2ca452d17 100644
--- a/reactos/lib/ntdll/inc/ntdll.h
+++ b/reactos/lib/ntdll/inc/ntdll.h
@@ -21,6 +21,5 @@
 #include <ntdll/rtl.h>
 #include <ntdll/ldr.h>
 #include <ntdll/ntdll.h>
-#include <debug.h> /* FIXME REMOVE THIS */
 
 /* EOF */
diff --git a/reactos/lib/ntdll/ldr/elf.c b/reactos/lib/ntdll/ldr/elf.c
index 98eb0f1474e..0996481c22e 100644
--- a/reactos/lib/ntdll/ldr/elf.c
+++ b/reactos/lib/ntdll/ldr/elf.c
@@ -42,8 +42,9 @@
  * John Polstra <jdp@polstra.com>.
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 #if 0
 
diff --git a/reactos/lib/ntdll/ldr/res.c b/reactos/lib/ntdll/ldr/res.c
index 4dfd4ad6ac0..1ca20792193 100644
--- a/reactos/lib/ntdll/ldr/res.c
+++ b/reactos/lib/ntdll/ldr/res.c
@@ -23,8 +23,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* PROTOTYPES ****************************************************************/
 
diff --git a/reactos/lib/ntdll/ldr/startup.c b/reactos/lib/ntdll/ldr/startup.c
index 8770ef23390..493be6bb0e4 100644
--- a/reactos/lib/ntdll/ldr/startup.c
+++ b/reactos/lib/ntdll/ldr/startup.c
@@ -10,8 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <win32k/callback.h>
 
 VOID RtlInitializeHeapManager (VOID);
diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index a61d9784001..4443e367773 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -19,8 +19,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 #define LDRP_PROCESS_CREATION_TIME 0x8000000
 
diff --git a/reactos/lib/ntdll/main/dllmain.c b/reactos/lib/ntdll/main/dllmain.c
index dc4b0c99ee6..1ff23a6a2f2 100644
--- a/reactos/lib/ntdll/main/dllmain.c
+++ b/reactos/lib/ntdll/main/dllmain.c
@@ -7,8 +7,9 @@
  * PROGRAMMER:
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll,
 			      DWORD fdwReason,
diff --git a/reactos/lib/ntdll/rtl/apc.c b/reactos/lib/ntdll/rtl/apc.c
index 8962d32ecd1..420fce79030 100644
--- a/reactos/lib/ntdll/rtl/apc.c
+++ b/reactos/lib/ntdll/rtl/apc.c
@@ -26,8 +26,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/atom.c b/reactos/lib/ntdll/rtl/atom.c
index e20d4ff99ca..27e67da3dac 100644
--- a/reactos/lib/ntdll/rtl/atom.c
+++ b/reactos/lib/ntdll/rtl/atom.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* LOCAL TYPES ***************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/callback.c b/reactos/lib/ntdll/rtl/callback.c
index b1d80abb3c4..c9806ef58ff 100644
--- a/reactos/lib/ntdll/rtl/callback.c
+++ b/reactos/lib/ntdll/rtl/callback.c
@@ -9,8 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 /* TYPES *********************************************************************/
 
 typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument,
diff --git a/reactos/lib/ntdll/rtl/crc32.c b/reactos/lib/ntdll/rtl/crc32.c
index a42699cf99f..c23f21e0869 100644
--- a/reactos/lib/ntdll/rtl/crc32.c
+++ b/reactos/lib/ntdll/rtl/crc32.c
@@ -17,8 +17,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 /* FUNCTIONS ****************************************************************/
 
 /* CRC polynomial 0xedb88320 */
diff --git a/reactos/lib/ntdll/rtl/critical.c b/reactos/lib/ntdll/rtl/critical.c
index 22e7f505bb2..de865b2272d 100644
--- a/reactos/lib/ntdll/rtl/critical.c
+++ b/reactos/lib/ntdll/rtl/critical.c
@@ -12,8 +12,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/dbgbuffer.c b/reactos/lib/ntdll/rtl/dbgbuffer.c
index 8304703737a..d1b92a0cf46 100644
--- a/reactos/lib/ntdll/rtl/dbgbuffer.c
+++ b/reactos/lib/ntdll/rtl/dbgbuffer.c
@@ -31,8 +31,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/exception.c b/reactos/lib/ntdll/rtl/exception.c
index 5db5083d1e3..83901e2b5f6 100644
--- a/reactos/lib/ntdll/rtl/exception.c
+++ b/reactos/lib/ntdll/rtl/exception.c
@@ -14,8 +14,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock;
 static LIST_ENTRY RtlpVectoredExceptionHead;
diff --git a/reactos/lib/ntdll/rtl/handle.c b/reactos/lib/ntdll/rtl/handle.c
index 9ea8f2f28da..d3ddc34de08 100644
--- a/reactos/lib/ntdll/rtl/handle.c
+++ b/reactos/lib/ntdll/rtl/handle.c
@@ -9,8 +9,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/libsupp.c b/reactos/lib/ntdll/rtl/libsupp.c
index 71b0d8452fb..b9b64057f5b 100644
--- a/reactos/lib/ntdll/rtl/libsupp.c
+++ b/reactos/lib/ntdll/rtl/libsupp.c
@@ -9,8 +9,9 @@
  *
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/math.c b/reactos/lib/ntdll/rtl/math.c
index c09b69ca41d..85b8742799b 100644
--- a/reactos/lib/ntdll/rtl/math.c
+++ b/reactos/lib/ntdll/rtl/math.c
@@ -17,8 +17,9 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 double atan (double __x);
 double ceil (double __x);
diff --git a/reactos/lib/ntdll/rtl/message.c b/reactos/lib/ntdll/rtl/message.c
index 5a392e76c74..dd4bf3f9946 100644
--- a/reactos/lib/ntdll/rtl/message.c
+++ b/reactos/lib/ntdll/rtl/message.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <ddk/ldrfuncs.h>
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/ntdll/rtl/misc.c b/reactos/lib/ntdll/rtl/misc.c
index c29f0027597..4dceb198927 100644
--- a/reactos/lib/ntdll/rtl/misc.c
+++ b/reactos/lib/ntdll/rtl/misc.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /**********************************************************************
  * NAME							EXPORTED
diff --git a/reactos/lib/ntdll/rtl/path.c b/reactos/lib/ntdll/rtl/path.c
index 234244939da..a136ab0d5cc 100644
--- a/reactos/lib/ntdll/rtl/path.c
+++ b/reactos/lib/ntdll/rtl/path.c
@@ -10,8 +10,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* DEFINITONS and MACROS ******************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/process.c b/reactos/lib/ntdll/rtl/process.c
index d3cf73f4a6d..5f898eef235 100644
--- a/reactos/lib/ntdll/rtl/process.c
+++ b/reactos/lib/ntdll/rtl/process.c
@@ -11,8 +11,9 @@
 
 /* INCLUDES ****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/ntdll/rtl/propvar.c b/reactos/lib/ntdll/rtl/propvar.c
index e4d8ca2fe4e..38b7d595eb3 100644
--- a/reactos/lib/ntdll/rtl/propvar.c
+++ b/reactos/lib/ntdll/rtl/propvar.c
@@ -5,8 +5,9 @@
  * FILE:            lib/ntdll/csr/propvar.c
  * PURPOSE:         CSRSS properties and variants API
  */
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /*
  * @unimplemented
diff --git a/reactos/lib/ntdll/rtl/rangelist.c b/reactos/lib/ntdll/rtl/rangelist.c
index 33ea03f854a..7f7736ce583 100644
--- a/reactos/lib/ntdll/rtl/rangelist.c
+++ b/reactos/lib/ntdll/rtl/rangelist.c
@@ -26,8 +26,9 @@
 
 /* INCLUDES ****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 typedef struct _RTL_RANGE_ENTRY
 {
diff --git a/reactos/lib/ntdll/rtl/resource.c b/reactos/lib/ntdll/rtl/resource.c
index 2c268d9ccfa..f3efaaf12f0 100644
--- a/reactos/lib/ntdll/rtl/resource.c
+++ b/reactos/lib/ntdll/rtl/resource.c
@@ -18,8 +18,9 @@
  * The code is based on information published in WDJ January 1999 issue.
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/ntdll/rtl/teb.c b/reactos/lib/ntdll/rtl/teb.c
index 5147fc3ca88..cdcd2552e71 100644
--- a/reactos/lib/ntdll/rtl/teb.c
+++ b/reactos/lib/ntdll/rtl/teb.c
@@ -6,8 +6,9 @@
  * PURPOSE:
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 
 PTEB STDCALL
diff --git a/reactos/lib/ntdll/rtl/timerqueue.c b/reactos/lib/ntdll/rtl/timerqueue.c
index b25e76a2214..3e55342403b 100644
--- a/reactos/lib/ntdll/rtl/timerqueue.c
+++ b/reactos/lib/ntdll/rtl/timerqueue.c
@@ -26,8 +26,9 @@
 
 /* INCLUDES ****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
 
diff --git a/reactos/lib/ntdll/rtl/trace.c b/reactos/lib/ntdll/rtl/trace.c
index 4aba0efcc35..2ca056a2e8c 100644
--- a/reactos/lib/ntdll/rtl/trace.c
+++ b/reactos/lib/ntdll/rtl/trace.c
@@ -26,8 +26,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/lib/ntdll/stdio/sprintf.c b/reactos/lib/ntdll/stdio/sprintf.c
index 359bafd06e1..881acb0a5db 100644
--- a/reactos/lib/ntdll/stdio/sprintf.c
+++ b/reactos/lib/ntdll/stdio/sprintf.c
@@ -24,8 +24,9 @@
 #include <ctype.h>
 #include <limits.h>
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 
 #define ZEROPAD	1		/* pad with zero */
diff --git a/reactos/lib/ntdll/stdio/sscanf.c b/reactos/lib/ntdll/stdio/sscanf.c
index 424db0027cb..d98b1b205cd 100644
--- a/reactos/lib/ntdll/stdio/sscanf.c
+++ b/reactos/lib/ntdll/stdio/sscanf.c
@@ -1,7 +1,8 @@
 /**/
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <stdio.h>
 
 /* helper function for *scanf.  Returns the value of character c in the
diff --git a/reactos/lib/ntdll/stdio/swprintf.c b/reactos/lib/ntdll/stdio/swprintf.c
index 576da802510..9124cc4ad99 100644
--- a/reactos/lib/ntdll/stdio/swprintf.c
+++ b/reactos/lib/ntdll/stdio/swprintf.c
@@ -22,8 +22,9 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <wchar.h>
 #include <limits.h>
 
diff --git a/reactos/lib/ntdll/stdlib/mbstowcs.c b/reactos/lib/ntdll/stdlib/mbstowcs.c
index 99d0398094b..19d69ef6b6e 100644
--- a/reactos/lib/ntdll/stdlib/mbstowcs.c
+++ b/reactos/lib/ntdll/stdlib/mbstowcs.c
@@ -6,8 +6,9 @@
  * PURPOSE:         converts a multi byte string to a unicode string
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <stdlib.h>
 #include <string.h>
 /*
diff --git a/reactos/lib/ntdll/stdlib/wcstombs.c b/reactos/lib/ntdll/stdlib/wcstombs.c
index db5708268a4..8029c0b9305 100644
--- a/reactos/lib/ntdll/stdlib/wcstombs.c
+++ b/reactos/lib/ntdll/stdlib/wcstombs.c
@@ -6,8 +6,9 @@
  * PURPOSE:         converts a unicode string to a multi byte string
  */
 
-#define NDEBUG
 #include <ntdll.h>
+#define NDEBUG
+#include <debug.h>
 #include <stdlib.h>
 #include <string.h>