diff --git a/reactos/lib/richedit/Makefile b/reactos/lib/richedit/Makefile
index d469aaf6ab2..706efbc955c 100644
--- a/reactos/lib/richedit/Makefile
+++ b/reactos/lib/richedit/Makefile
@@ -9,7 +9,7 @@ TARGET_BASE = 0x76340000
 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -include "windows.h" -DIDC_ARROWA=IDC_ARROW -DWM_ALTTABACTIVE=0x0029 -D_DISABLE_TIDENTS -D__USE_W32API
 
-TARGET_SDKLIBS = winedbgc.a
+TARGET_SDKLIBS = ntdll.a
 
 TARGET_OBJECTS = charlist.o reader.o richedit.o text-writer.o
 
diff --git a/reactos/lib/richedit/charlist.c b/reactos/lib/richedit/charlist.c
index 26d1e99e51d..39221092fc2 100644
--- a/reactos/lib/richedit/charlist.c
+++ b/reactos/lib/richedit/charlist.c
@@ -28,9 +28,17 @@
 #include "charlist.h"
 #include "windef.h"
 #include "winbase.h"
+#include "debug.h"
+
+#if 0
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+#else
+  #define TRACE DPRINT
+  #define WARN DPRINT
+  #define FIXME DPRINT
+#endif
 
 extern HANDLE RICHED32_hHeap;
 
diff --git a/reactos/lib/richedit/reader.c b/reactos/lib/richedit/reader.c
index 13e98c83e22..1f0ff0078da 100644
--- a/reactos/lib/richedit/reader.c
+++ b/reactos/lib/richedit/reader.c
@@ -64,9 +64,17 @@
 #include "charlist.h"
 #include "windef.h"
 #include "winbase.h"
+#include "debug.h"
+
+#if 0
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+#else
+  #define TRACE DPRINT
+  #define WARN DPRINT
+  #define FIXME DPRINT
+#endif
 
 extern HANDLE RICHED32_hHeap;
 
@@ -2761,7 +2769,7 @@ FILE *RTFOpenLibFile (char *file, char *mode)
 
 static void DefaultMsgProc(char *s)
 {
-    MESSAGE( "%s", s);
+    DPRINT( "%s", s);
 }
 
 
@@ -2798,7 +2806,7 @@ char	buf[rtfBufSiz];
 
 static void DefaultPanicProc(char *s)
 {
-    MESSAGE( "%s", s);
+    DPRINT( "%s", s);
 	/*exit (1);*/
 }
 
diff --git a/reactos/lib/richedit/riched32.h b/reactos/lib/richedit/riched32.h
index 9753fc01ad3..63d865ae333 100644
--- a/reactos/lib/richedit/riched32.h
+++ b/reactos/lib/richedit/riched32.h
@@ -26,6 +26,8 @@
 #include "winuser.h"
 #include "richedit.h"
 
+#define NOWINEDEBUG 1
+
 extern VOID RICHED32_Register (VOID);
 extern VOID RICHED32_Unregister (VOID);
 
diff --git a/reactos/lib/richedit/richedit.c b/reactos/lib/richedit/richedit.c
index e3525d14a60..058c030afc2 100644
--- a/reactos/lib/richedit/richedit.c
+++ b/reactos/lib/richedit/richedit.c
@@ -36,15 +36,23 @@
 
 #include "rtf.h"
 #include "rtf2text.h"
+#include "debug.h"
+
+#if 0
 #include "wine/debug.h"
 
-#define ID_EDIT      1
-
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+#else
+  #define TRACE DPRINT
+  #define WARN DPRINT
+  #define FIXME DPRINT
+#endif
 
 HANDLE RICHED32_hHeap = NULL;
 /* LPSTR  RICHED32_aSubclass = NULL; */
 
+#define ID_EDIT      1
+
 #define TRACE_EDIT_MSG32(str) \
         TRACE(\
                      "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
diff --git a/reactos/lib/richedit/text-writer.c b/reactos/lib/richedit/text-writer.c
index cad8a919b60..a0c93e8a1d5 100644
--- a/reactos/lib/richedit/text-writer.c
+++ b/reactos/lib/richedit/text-writer.c
@@ -41,9 +41,17 @@
 #include "rtf.h"
 #include "rtf2text.h"
 #include "charlist.h"
+#include "debug.h"
+
+#if 0
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+#else
+  #define TRACE DPRINT
+  #define WARN DPRINT
+  #define FIXME DPRINT
+#endif
 
 static void	TextClass ();
 static void	ControlClass ();