diff --git a/reactos/lib/richedit/Makefile b/reactos/lib/richedit/Makefile
index 706efbc955c..f7c4ec6b64b 100644
--- a/reactos/lib/richedit/Makefile
+++ b/reactos/lib/richedit/Makefile
@@ -7,9 +7,9 @@ TARGET_NAME = riched32
 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_CFLAGS += -DWM_ALTTABACTIVE=0x0029 -D_DISABLE_TIDENTS -D__USE_W32API
 
-TARGET_SDKLIBS = ntdll.a
+TARGET_SDKLIBS = ntdll.a winedbgc.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 39221092fc2..e8524ae69dc 100644
--- a/reactos/lib/richedit/charlist.c
+++ b/reactos/lib/richedit/charlist.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
@@ -28,17 +29,9 @@
 #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 1f0ff0078da..13e98c83e22 100644
--- a/reactos/lib/richedit/reader.c
+++ b/reactos/lib/richedit/reader.c
@@ -64,17 +64,9 @@
 #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;
 
@@ -2769,7 +2761,7 @@ FILE *RTFOpenLibFile (char *file, char *mode)
 
 static void DefaultMsgProc(char *s)
 {
-    DPRINT( "%s", s);
+    MESSAGE( "%s", s);
 }
 
 
@@ -2806,7 +2798,7 @@ char	buf[rtfBufSiz];
 
 static void DefaultPanicProc(char *s)
 {
-    DPRINT( "%s", s);
+    MESSAGE( "%s", s);
 	/*exit (1);*/
 }
 
diff --git a/reactos/lib/richedit/riched32.h b/reactos/lib/richedit/riched32.h
index 63d865ae333..a4ff9f59432 100644
--- a/reactos/lib/richedit/riched32.h
+++ b/reactos/lib/richedit/riched32.h
@@ -22,12 +22,13 @@
 #ifndef __WINE_RICHED32_H
 #define __WINE_RICHED32_H
 
+#include <stdarg.h>
+
 #include "windef.h"
+#include "winbase.h"
 #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 058c030afc2..3cf8edc5f85 100644
--- a/reactos/lib/richedit/richedit.c
+++ b/reactos/lib/richedit/richedit.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdarg.h>
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
@@ -36,23 +37,15 @@
 
 #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"\
@@ -810,7 +803,7 @@ VOID RICHED32_Register(void)
     wndClass.lpfnWndProc = (WNDPROC)RICHED32_WindowProc;
     wndClass.cbClsExtra = 0;
     wndClass.cbWndExtra = 0; /*(sizeof(RICHED32_INFO *);*/
-    wndClass.hCursor = LoadCursorA(0, IDC_ARROWA);
+    wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */
 
diff --git a/reactos/lib/richedit/rtf.h b/reactos/lib/richedit/rtf.h
index cece77b8d15..208fbcdba8b 100644
--- a/reactos/lib/richedit/rtf.h
+++ b/reactos/lib/richedit/rtf.h
@@ -1,6 +1,7 @@
 #ifndef _RTF
 #define _RTF
 
+#include <stdarg.h>
 #include <stdio.h>
 
 #include "windef.h"
diff --git a/reactos/lib/richedit/text-writer.c b/reactos/lib/richedit/text-writer.c
index a0c93e8a1d5..cad8a919b60 100644
--- a/reactos/lib/richedit/text-writer.c
+++ b/reactos/lib/richedit/text-writer.c
@@ -41,17 +41,9 @@
 #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 ();