diff --git a/reactos/dll/win32/riched20/caret.c b/reactos/dll/win32/riched20/caret.c
index b39a8c7e10d..07e042b8378 100644
--- a/reactos/dll/win32/riched20/caret.c
+++ b/reactos/dll/win32/riched20/caret.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "editor.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
diff --git a/reactos/dll/win32/riched20/editor.c b/reactos/dll/win32/riched20/editor.c
index e2837adc2e3..e63b92877a5 100644
--- a/reactos/dll/win32/riched20/editor.c
+++ b/reactos/dll/win32/riched20/editor.c
@@ -225,12 +225,10 @@
  */
 
 #include "editor.h"
+
 #include <commdlg.h>
-//#include "winreg.h"
-#define NO_SHLWAPI_STREAM 
-//#include "shlwapi.h"
+
 #include "rtf.h"
-//#include "imm.h"
 #include "res.h"
 
 #define STACK_SIZE_DEFAULT  100
diff --git a/reactos/dll/win32/riched20/editor.h b/reactos/dll/win32/riched20/editor.h
index 43f7e7dc146..d129a7978cf 100644
--- a/reactos/dll/win32/riched20/editor.h
+++ b/reactos/dll/win32/riched20/editor.h
@@ -18,9 +18,39 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "editstr.h"
+#include <config.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0400
+#endif
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <richedit.h>
+#include <ole2.h>
+#include <richole.h>
+#include <imm.h>
+#include <textserv.h>
+
+#include <wine/debug.h>
+#include <wine/list.h>
 #include <wine/unicode.h>
 
+#include "editstr.h"
+
 struct _RTF_Info;
 
 extern HANDLE me_heap DECLSPEC_HIDDEN;
diff --git a/reactos/dll/win32/riched20/editstr.h b/reactos/dll/win32/riched20/editstr.h
index 627d37e7a7e..3d696822973 100644
--- a/reactos/dll/win32/riched20/editstr.h
+++ b/reactos/dll/win32/riched20/editstr.h
@@ -21,40 +21,6 @@
 #ifndef __EDITSTR_H
 #define __EDITSTR_H
 
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0400
-#endif
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <stdlib.h>
-//#include <limits.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include <winnls.h>
-//#include <winnt.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <richedit.h>
-//#include <commctrl.h>
-#include <ole2.h>
-#include <richole.h>
-#include <imm.h>
-#include <textserv.h>
-
-#include <wine/debug.h>
-#include <wine/list.h>
-
 #ifdef __i386__
 extern const struct ITextHostVtbl itextHostStdcallVtbl;
 #endif /* __i386__ */
diff --git a/reactos/dll/win32/riched20/list.c b/reactos/dll/win32/riched20/list.c
index 7722fc94e09..f71318a137f 100644
--- a/reactos/dll/win32/riched20/list.c
+++ b/reactos/dll/win32/riched20/list.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "editor.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists);
diff --git a/reactos/dll/win32/riched20/msvc-thiscall.c b/reactos/dll/win32/riched20/msvc-thiscall.c
index 4f207da484d..80f34595727 100644
--- a/reactos/dll/win32/riched20/msvc-thiscall.c
+++ b/reactos/dll/win32/riched20/msvc-thiscall.c
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "editor.h"
 
 #define DEFINE_THISCALL_WRAPPER(func,args) \
diff --git a/reactos/dll/win32/riched20/reader.c b/reactos/dll/win32/riched20/reader.c
index 524196fa1f3..f082a30c9a1 100644
--- a/reactos/dll/win32/riched20/reader.c
+++ b/reactos/dll/win32/riched20/reader.c
@@ -36,17 +36,6 @@
  * any purpose whatsoever.
  */
 
-//#include <stdio.h>
-//#include <ctype.h>
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdlib.h>
-//#include <assert.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wine/debug.h"
-
 #include "editor.h"
 #include "rtf.h"
 
diff --git a/reactos/dll/win32/riched20/res.h b/reactos/dll/win32/riched20/res.h
index aaf12221aff..72343105705 100644
--- a/reactos/dll/win32/riched20/res.h
+++ b/reactos/dll/win32/riched20/res.h
@@ -18,4 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 #define OCR_REVERSE 107
diff --git a/reactos/dll/win32/riched20/richole.c b/reactos/dll/win32/riched20/richole.c
index 97289d525b9..b9e7699f864 100644
--- a/reactos/dll/win32/riched20/richole.c
+++ b/reactos/dll/win32/riched20/richole.c
@@ -19,27 +19,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "ole2.h"
-//#include "richole.h"
 #include "editor.h"
+
 #include <tom.h>
-//#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
 /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
 
-#include "initguid.h"
+#include <initguid.h>
 DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5);
 DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);
 DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);
diff --git a/reactos/dll/win32/riched20/row.c b/reactos/dll/win32/riched20/row.c
index 1bf153f6ca9..7f48d4a4bab 100644
--- a/reactos/dll/win32/riched20/row.c
+++ b/reactos/dll/win32/riched20/row.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */ 
 
-
 #include "editor.h"
 
 /* I'm sure these functions would simplify some code in caret ops etc,
diff --git a/reactos/dll/win32/riched20/rtf.h b/reactos/dll/win32/riched20/rtf.h
index 4b2ea37f699..766a8b3b4ec 100644
--- a/reactos/dll/win32/riched20/rtf.h
+++ b/reactos/dll/win32/riched20/rtf.h
@@ -1,16 +1,6 @@
 #ifndef _RTF
 #define _RTF
 
-//#include <stdarg.h>
-//#include <stdio.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "richedit.h"
-
-
 /*
  * rtf.h - RTF document processing stuff.  Release 1.10.
  */
diff --git a/reactos/dll/win32/riched20/txthost.c b/reactos/dll/win32/riched20/txthost.c
index a17a0d02e3c..5f6862e5c41 100644
--- a/reactos/dll/win32/riched20/txthost.c
+++ b/reactos/dll/win32/riched20/txthost.c
@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-#define COBJMACROS
-
 #include "editor.h"
-//#include "ole2.h"
-//#include "richole.h"
-//#include "imm.h"
-//#include "textserv.h"
-//#include "wine/debug.h"
-//#include "editstr.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
diff --git a/reactos/dll/win32/riched20/txtsrv.c b/reactos/dll/win32/riched20/txtsrv.c
index 32032f14c20..613919da4aa 100644
--- a/reactos/dll/win32/riched20/txtsrv.c
+++ b/reactos/dll/win32/riched20/txtsrv.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-#define COBJMACROS
-
 #include "editor.h"
-//#include "ole2.h"
-//#include "oleauto.h"
-//#include "richole.h"
-//#include "imm.h"
-//#include "textserv.h"
-//#include "wine/debug.h"
-//#include "editstr.h"
 
 #ifdef __i386__  /* thiscall functions are i386-specific */
 
diff --git a/reactos/dll/win32/riched20/wrap.c b/reactos/dll/win32/riched20/wrap.c
index 52722dbf403..4509a54b955 100644
--- a/reactos/dll/win32/riched20/wrap.c
+++ b/reactos/dll/win32/riched20/wrap.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "editor.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
diff --git a/reactos/dll/win32/riched20/writer.c b/reactos/dll/win32/riched20/writer.c
index 0ac2decd8e9..c67d1921da5 100644
--- a/reactos/dll/win32/riched20/writer.c
+++ b/reactos/dll/win32/riched20/writer.c
@@ -18,15 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "editor.h"
 #include "rtf.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 
-
 static BOOL
 ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars);