diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index 4d0fb7fd8e4..a32704198d6 100644
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -119,7 +119,7 @@
   <property name="BASEADDRESS_OLE32" value="0x77a50000" />
   <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
   <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
-  <property name="BASEADDRESS_USER32" value="0x77e50000" />
+  <property name="BASEADDRESS_USER32" value="0x77e40000" />
   <property name="BASEADDRESS_GDI32" value="0x77f10000" />
   <property name="BASEADDRESS_DNSAPI" value="0x77f30000" />
   <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
diff --git a/reactos/dll/win32/user32/controls/button.c b/reactos/dll/win32/user32/controls/button.c
index 40c1d5b95e5..fee95368baf 100644
--- a/reactos/dll/win32/user32/controls/button.c
+++ b/reactos/dll/win32/user32/controls/button.c
@@ -63,9 +63,10 @@
  *  - Button_SetImageList
  *  - Button_SetTextMargin
  */
-#define NDEBUG // turn off TRACEs
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* GetWindowLong offsets for window extra information */
 #define STATE_GWL_OFFSET  0
 #define HFONT_GWL_OFFSET  (sizeof(LONG))
diff --git a/reactos/dll/win32/user32/controls/combo.c b/reactos/dll/win32/user32/controls/combo.c
index 8568eb12973..d99dfabb60e 100644
--- a/reactos/dll/win32/user32/controls/combo.c
+++ b/reactos/dll/win32/user32/controls/combo.c
@@ -33,9 +33,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
 
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(combo);
 
   /* bits in the dwKeyData */
diff --git a/reactos/dll/win32/user32/controls/edit.c b/reactos/dll/win32/user32/controls/edit.c
index 2ac0b2e6381..e3eca53de09 100644
--- a/reactos/dll/win32/user32/controls/edit.c
+++ b/reactos/dll/win32/user32/controls/edit.c
@@ -43,8 +43,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(edit);
 WINE_DECLARE_DEBUG_CHANNEL(combo);
diff --git a/reactos/dll/win32/user32/controls/icontitle.c b/reactos/dll/win32/user32/controls/icontitle.c
index 595f21c0463..12af0b161b9 100644
--- a/reactos/dll/win32/user32/controls/icontitle.c
+++ b/reactos/dll/win32/user32/controls/icontitle.c
@@ -20,6 +20,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 #ifdef __REACTOS__
 #define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
 #define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772)
diff --git a/reactos/dll/win32/user32/controls/listbox.c b/reactos/dll/win32/user32/controls/listbox.c
index cad4c53866a..2309ae50fdc 100644
--- a/reactos/dll/win32/user32/controls/listbox.c
+++ b/reactos/dll/win32/user32/controls/listbox.c
@@ -19,8 +19,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* Start of hack section -------------------------------- */
 
diff --git a/reactos/dll/win32/user32/controls/regcontrol.c b/reactos/dll/win32/user32/controls/regcontrol.c
index 2760b579e98..d6f528e798c 100644
--- a/reactos/dll/win32/user32/controls/regcontrol.c
+++ b/reactos/dll/win32/user32/controls/regcontrol.c
@@ -11,6 +11,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
 {
    WNDCLASSEXW wc;
diff --git a/reactos/dll/win32/user32/controls/scrollbar.c b/reactos/dll/win32/user32/controls/scrollbar.c
index c4513c9a518..abc05e7b77c 100644
--- a/reactos/dll/win32/user32/controls/scrollbar.c
+++ b/reactos/dll/win32/user32/controls/scrollbar.c
@@ -31,8 +31,8 @@
 /* INCLUDES *******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 
 /* GLOBAL VARIABLES ***********************************************************/
diff --git a/reactos/dll/win32/user32/controls/static.c b/reactos/dll/win32/user32/controls/static.c
index aac4660c9ce..8957ca7ed76 100644
--- a/reactos/dll/win32/user32/controls/static.c
+++ b/reactos/dll/win32/user32/controls/static.c
@@ -44,6 +44,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(static);
 
 static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );
diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h
index e7c83ecc236..b7d2378350f 100644
--- a/reactos/dll/win32/user32/include/user32.h
+++ b/reactos/dll/win32/user32/include/user32.h
@@ -32,7 +32,6 @@
 #include <win32k/callback.h>
 
 /* WINE Headers */
-#include <wine/debug.h>
 #include <wine/unicode.h>
 
 /* Internal User32 Headers */
diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c
index 33dbe92e2c4..2b892ab5610 100644
--- a/reactos/dll/win32/user32/misc/dde.c
+++ b/reactos/dll/win32/user32/misc/dde.c
@@ -24,8 +24,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
diff --git a/reactos/dll/win32/user32/misc/ddeclient.c b/reactos/dll/win32/user32/misc/ddeclient.c
index 265777e730c..1d88637a492 100644
--- a/reactos/dll/win32/user32/misc/ddeclient.c
+++ b/reactos/dll/win32/user32/misc/ddeclient.c
@@ -24,8 +24,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
diff --git a/reactos/dll/win32/user32/misc/ddeserver.c b/reactos/dll/win32/user32/misc/ddeserver.c
index dfd772cf390..55227a022ec 100644
--- a/reactos/dll/win32/user32/misc/ddeserver.c
+++ b/reactos/dll/win32/user32/misc/ddeserver.c
@@ -24,8 +24,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c
index 14a130a96f0..e8942ea8763 100644
--- a/reactos/dll/win32/user32/misc/desktop.c
+++ b/reactos/dll/win32/user32/misc/desktop.c
@@ -11,6 +11,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 #define DESKTOP_CLASS_ATOM   MAKEINTATOMA(32769)  /* Desktop */
 static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
 
diff --git a/reactos/dll/win32/user32/misc/display.c b/reactos/dll/win32/user32/misc/display.c
index b17fea95480..6cb9194b5fb 100644
--- a/reactos/dll/win32/user32/misc/display.c
+++ b/reactos/dll/win32/user32/misc/display.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 #define SIZEOF_DEVMODEA_300 124
 #define SIZEOF_DEVMODEA_400 148
diff --git a/reactos/dll/win32/user32/misc/dllmain.c b/reactos/dll/win32/user32/misc/dllmain.c
index a1d8a6f2550..6c412fdd964 100644
--- a/reactos/dll/win32/user32/misc/dllmain.c
+++ b/reactos/dll/win32/user32/misc/dllmain.c
@@ -1,6 +1,6 @@
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 static ULONG User32TlsIndex;
 HINSTANCE User32Instance;
diff --git a/reactos/dll/win32/user32/misc/exit.c b/reactos/dll/win32/user32/misc/exit.c
index e8a0ed96c4f..3665351f97d 100644
--- a/reactos/dll/win32/user32/misc/exit.c
+++ b/reactos/dll/win32/user32/misc/exit.c
@@ -9,6 +9,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /*
  * Sequence of events:
  *
diff --git a/reactos/dll/win32/user32/misc/exticon.c b/reactos/dll/win32/user32/misc/exticon.c
index b0a69af1274..95b83645f4d 100644
--- a/reactos/dll/win32/user32/misc/exticon.c
+++ b/reactos/dll/win32/user32/misc/exticon.c
@@ -23,8 +23,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* Start of Hack section */
 
diff --git a/reactos/dll/win32/user32/misc/misc.c b/reactos/dll/win32/user32/misc/misc.c
index 0b81da60aed..482f91bedb5 100644
--- a/reactos/dll/win32/user32/misc/misc.c
+++ b/reactos/dll/win32/user32/misc/misc.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/user32/misc/object.c b/reactos/dll/win32/user32/misc/object.c
index 75162d31d47..039ecb28b3a 100644
--- a/reactos/dll/win32/user32/misc/object.c
+++ b/reactos/dll/win32/user32/misc/object.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/user32/misc/resources.c b/reactos/dll/win32/user32/misc/resources.c
index fc3a55a7065..a4ee237cadb 100644
--- a/reactos/dll/win32/user32/misc/resources.c
+++ b/reactos/dll/win32/user32/misc/resources.c
@@ -1,5 +1,7 @@
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
           does not seem to work properly for stack address space. */
 /* kill `left-hand operand of comma expression has no effect' warning */
diff --git a/reactos/dll/win32/user32/misc/strpool.c b/reactos/dll/win32/user32/misc/strpool.c
index 88ea190abe2..48dd8f45b81 100644
--- a/reactos/dll/win32/user32/misc/strpool.c
+++ b/reactos/dll/win32/user32/misc/strpool.c
@@ -2,6 +2,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 typedef struct tagHEAP_STRING_POOLA
 {
 	char* data;
diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c
index 9886e466466..5300c4e9af4 100644
--- a/reactos/dll/win32/user32/misc/stubs.c
+++ b/reactos/dll/win32/user32/misc/stubs.c
@@ -11,8 +11,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /*
  * @unimplemented
diff --git a/reactos/dll/win32/user32/misc/timer.c b/reactos/dll/win32/user32/misc/timer.c
index 6b88e0477b4..ddd87f761d3 100644
--- a/reactos/dll/win32/user32/misc/timer.c
+++ b/reactos/dll/win32/user32/misc/timer.c
@@ -30,6 +30,7 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
 
 
diff --git a/reactos/dll/win32/user32/misc/winhelp.c b/reactos/dll/win32/user32/misc/winhelp.c
index 8abf11b5ed0..8acdf2ebd4c 100644
--- a/reactos/dll/win32/user32/misc/winhelp.c
+++ b/reactos/dll/win32/user32/misc/winhelp.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* WinHelp internal structure */
 typedef struct
 {
diff --git a/reactos/dll/win32/user32/misc/winsta.c b/reactos/dll/win32/user32/misc/winsta.c
index 1595abdc42b..df6821095ae 100644
--- a/reactos/dll/win32/user32/misc/winsta.c
+++ b/reactos/dll/win32/user32/misc/winsta.c
@@ -11,6 +11,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /*
  * @implemented
  */
diff --git a/reactos/dll/win32/user32/misc/wsprintf.c b/reactos/dll/win32/user32/misc/wsprintf.c
index 49eb329d67a..8df035b3c39 100644
--- a/reactos/dll/win32/user32/misc/wsprintf.c
+++ b/reactos/dll/win32/user32/misc/wsprintf.c
@@ -32,6 +32,9 @@
  */
 
 #include <user32.h>
+
+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(string);
 
 
diff --git a/reactos/dll/win32/user32/windows/accel.c b/reactos/dll/win32/user32/windows/accel.c
index 4d6e93b6022..fe5409aa667 100644
--- a/reactos/dll/win32/user32/windows/accel.c
+++ b/reactos/dll/win32/user32/windows/accel.c
@@ -31,6 +31,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
 {
diff --git a/reactos/dll/win32/user32/windows/bitmap.c b/reactos/dll/win32/user32/windows/bitmap.c
index 77562b0f6f7..e748a2fbd3b 100644
--- a/reactos/dll/win32/user32/windows/bitmap.c
+++ b/reactos/dll/win32/user32/windows/bitmap.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 #include "pshpack1.h"
 
 typedef struct {
diff --git a/reactos/dll/win32/user32/windows/caret.c b/reactos/dll/win32/user32/windows/caret.c
index 95b76d05391..8788aa119de 100644
--- a/reactos/dll/win32/user32/windows/caret.c
+++ b/reactos/dll/win32/user32/windows/caret.c
@@ -30,6 +30,7 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
 
 void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo)
diff --git a/reactos/dll/win32/user32/windows/class.c b/reactos/dll/win32/user32/windows/class.c
index 2064cc97e4e..7ca2f0fd9ea 100644
--- a/reactos/dll/win32/user32/windows/class.c
+++ b/reactos/dll/win32/user32/windows/class.c
@@ -11,6 +11,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 extern BOOL ControlsInitialized;
 
 /*
diff --git a/reactos/dll/win32/user32/windows/clipboard.c b/reactos/dll/win32/user32/windows/clipboard.c
index a002563c9b4..b5615323eaf 100644
--- a/reactos/dll/win32/user32/windows/clipboard.c
+++ b/reactos/dll/win32/user32/windows/clipboard.c
@@ -29,9 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
 
+#include <wine/debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/cursor.c b/reactos/dll/win32/user32/windows/cursor.c
index f4c622c48dc..0caa6d7753b 100644
--- a/reactos/dll/win32/user32/windows/cursor.c
+++ b/reactos/dll/win32/user32/windows/cursor.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 #undef CopyCursor
 
diff --git a/reactos/dll/win32/user32/windows/dc.c b/reactos/dll/win32/user32/windows/dc.c
index 7b935850ef7..77fec91f693 100644
--- a/reactos/dll/win32/user32/windows/dc.c
+++ b/reactos/dll/win32/user32/windows/dc.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c
index d5b85155e97..63d935e42cd 100644
--- a/reactos/dll/win32/user32/windows/defwnd.c
+++ b/reactos/dll/win32/user32/windows/defwnd.c
@@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 #ifndef WM_SETVISIBLE
 #define WM_SETVISIBLE 9
diff --git a/reactos/dll/win32/user32/windows/dialog.c b/reactos/dll/win32/user32/windows/dialog.c
index 14888d5f5f4..db331eda2cb 100644
--- a/reactos/dll/win32/user32/windows/dialog.c
+++ b/reactos/dll/win32/user32/windows/dialog.c
@@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* MACROS/DEFINITIONS ********************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/draw.c b/reactos/dll/win32/user32/windows/draw.c
index c42d3b72c29..9461e295353 100644
--- a/reactos/dll/win32/user32/windows/draw.c
+++ b/reactos/dll/win32/user32/windows/draw.c
@@ -29,8 +29,8 @@
 /* INCLUDES *******************************************************************/
 
 #include <user32.h>
-//#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/font.c b/reactos/dll/win32/user32/windows/font.c
index df1010e1faa..612eb8d72a8 100644
--- a/reactos/dll/win32/user32/windows/font.c
+++ b/reactos/dll/win32/user32/windows/font.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/hook.c b/reactos/dll/win32/user32/windows/hook.c
index 107ec952d03..4e99fd34954 100644
--- a/reactos/dll/win32/user32/windows/hook.c
+++ b/reactos/dll/win32/user32/windows/hook.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/icon.c b/reactos/dll/win32/user32/windows/icon.c
index 3db757a77f0..e4aa3d3315d 100644
--- a/reactos/dll/win32/user32/windows/icon.c
+++ b/reactos/dll/win32/user32/windows/icon.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 5f30b2164d7..bc13052b0d2 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/mdi.c b/reactos/dll/win32/user32/windows/mdi.c
index 9078133de09..e62befb2427 100644
--- a/reactos/dll/win32/user32/windows/mdi.c
+++ b/reactos/dll/win32/user32/windows/mdi.c
@@ -81,8 +81,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(mdi);
diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c
index 9e37f00ffc2..5c24971e65b 100644
--- a/reactos/dll/win32/user32/windows/menu.c
+++ b/reactos/dll/win32/user32/windows/menu.c
@@ -34,8 +34,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* internal popup menu window messages */
 #define MM_SETMENUHANDLE (WM_USER + 0)
diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c
index bf08217f8f0..f4bf39cde4d 100644
--- a/reactos/dll/win32/user32/windows/message.c
+++ b/reactos/dll/win32/user32/windows/message.c
@@ -9,8 +9,8 @@
  */
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* DDE message exchange
  *
diff --git a/reactos/dll/win32/user32/windows/messagebox.c b/reactos/dll/win32/user32/windows/messagebox.c
index 3f5eda62431..85e72992959 100644
--- a/reactos/dll/win32/user32/windows/messagebox.c
+++ b/reactos/dll/win32/user32/windows/messagebox.c
@@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 /* DEFINES *******************************************************************/
 
diff --git a/reactos/dll/win32/user32/windows/nonclient.c b/reactos/dll/win32/user32/windows/nonclient.c
index 438877590fa..cfb09688993 100644
--- a/reactos/dll/win32/user32/windows/nonclient.c
+++ b/reactos/dll/win32/user32/windows/nonclient.c
@@ -23,8 +23,8 @@
 /* INCLUDES *******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 #define HAS_DLGFRAME(Style, ExStyle) \
             (((ExStyle) & WS_EX_DLGMODALFRAME) || \
diff --git a/reactos/dll/win32/user32/windows/paint.c b/reactos/dll/win32/user32/windows/paint.c
index 7ae652fd798..d4507d11460 100644
--- a/reactos/dll/win32/user32/windows/paint.c
+++ b/reactos/dll/win32/user32/windows/paint.c
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 static HBRUSH FrameBrushes[13];
 static HBITMAP hHatch;
diff --git a/reactos/dll/win32/user32/windows/prop.c b/reactos/dll/win32/user32/windows/prop.c
index ba76be48f46..70b0c2f80d6 100644
--- a/reactos/dll/win32/user32/windows/prop.c
+++ b/reactos/dll/win32/user32/windows/prop.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 typedef struct _PROPLISTITEM
 {
   ATOM Atom;
diff --git a/reactos/dll/win32/user32/windows/rect.c b/reactos/dll/win32/user32/windows/rect.c
index c4f1eb1c95f..d8ed3a3e674 100644
--- a/reactos/dll/win32/user32/windows/rect.c
+++ b/reactos/dll/win32/user32/windows/rect.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/dll/win32/user32/windows/text.c b/reactos/dll/win32/user32/windows/text.c
index 1c1fc19042c..708a3cd645f 100644
--- a/reactos/dll/win32/user32/windows/text.c
+++ b/reactos/dll/win32/user32/windows/text.c
@@ -30,6 +30,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 static WORD
diff --git a/reactos/dll/win32/user32/windows/window.c b/reactos/dll/win32/user32/windows/window.c
index dfee0db790b..7dacae8033c 100644
--- a/reactos/dll/win32/user32/windows/window.c
+++ b/reactos/dll/win32/user32/windows/window.c
@@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 
 BOOL ControlsInitialized = FALSE;
 
diff --git a/reactos/dll/win32/user32/windows/winpos.c b/reactos/dll/win32/user32/windows/winpos.c
index 60189c757f9..145d98b8362 100644
--- a/reactos/dll/win32/user32/windows/winpos.c
+++ b/reactos/dll/win32/user32/windows/winpos.c
@@ -13,6 +13,8 @@
 
 #include <user32.h>
 
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 UINT STDCALL