diff --git a/reactos/dll/win32/msctf/categorymgr.c b/reactos/dll/win32/msctf/categorymgr.c
index 5cce446929c..01f94201f3a 100644
--- a/reactos/dll/win32/msctf/categorymgr.c
+++ b/reactos/dll/win32/msctf/categorymgr.c
@@ -18,32 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-#include <wine/unicode.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
 typedef struct tagCategoryMgr {
     ITfCategoryMgr ITfCategoryMgr_iface;
     LONG refCount;
diff --git a/reactos/dll/win32/msctf/compartmentmgr.c b/reactos/dll/win32/msctf/compartmentmgr.c
index ee5d687511e..e356bb68ee0 100644
--- a/reactos/dll/win32/msctf/compartmentmgr.c
+++ b/reactos/dll/win32/msctf/compartmentmgr.c
@@ -18,34 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <oleauto.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include <oleauto.h>
 
 typedef struct tagCompartmentValue {
     struct list entry;
diff --git a/reactos/dll/win32/msctf/context.c b/reactos/dll/win32/msctf/context.c
index 9266d81fe5d..d9cd1429186 100644
--- a/reactos/dll/win32/msctf/context.c
+++ b/reactos/dll/win32/msctf/context.c
@@ -18,34 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
 typedef struct tagContextSink {
     struct list         entry;
     union {
diff --git a/reactos/dll/win32/msctf/displayattributemgr.c b/reactos/dll/win32/msctf/displayattributemgr.c
index 614e004aaf1..0a0f32dce48 100644
--- a/reactos/dll/win32/msctf/displayattributemgr.c
+++ b/reactos/dll/win32/msctf/displayattributemgr.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagDisplayAttributeMgr {
     ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface;
diff --git a/reactos/dll/win32/msctf/documentmgr.c b/reactos/dll/win32/msctf/documentmgr.c
index db97a417429..9033a2daf79 100644
--- a/reactos/dll/win32/msctf/documentmgr.c
+++ b/reactos/dll/win32/msctf/documentmgr.c
@@ -18,32 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-//#include "wine/unicode.h"
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
 typedef struct tagDocumentMgr {
     ITfDocumentMgr ITfDocumentMgr_iface;
     ITfSource ITfSource_iface;
diff --git a/reactos/dll/win32/msctf/inputprocessor.c b/reactos/dll/win32/msctf/inputprocessor.c
index fd0260cdb4e..91c9b74baa0 100644
--- a/reactos/dll/win32/msctf/inputprocessor.c
+++ b/reactos/dll/win32/msctf/inputprocessor.c
@@ -18,34 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-#include <wine/unicode.h>
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
 static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0};
 static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0};
 static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0};
diff --git a/reactos/dll/win32/msctf/langbarmgr.c b/reactos/dll/win32/msctf/langbarmgr.c
index b73ff120d0d..a18be8d59d8 100644
--- a/reactos/dll/win32/msctf/langbarmgr.c
+++ b/reactos/dll/win32/msctf/langbarmgr.c
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagLangBarMgr {
     ITfLangBarMgr ITfLangBarMgr_iface;
diff --git a/reactos/dll/win32/msctf/msctf.c b/reactos/dll/win32/msctf/msctf.c
index e7acabdcec1..61f4c843764 100644
--- a/reactos/dll/win32/msctf/msctf.c
+++ b/reactos/dll/win32/msctf/msctf.c
@@ -18,32 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <wine/list.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "shlguid.h"
-//#include "comcat.h"
-#include <rpcproxy.h>
-#include <msctf.h>
-#include <inputscope.h>
-
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include <rpcproxy.h>
+#include <inputscope.h>
 
 static LONG MSCTF_refCount;
 
diff --git a/reactos/dll/win32/msctf/msctf_internal.h b/reactos/dll/win32/msctf/msctf_internal.h
index 5dd823fe33e..c6b26436f66 100644
--- a/reactos/dll/win32/msctf/msctf_internal.h
+++ b/reactos/dll/win32/msctf/msctf_internal.h
@@ -21,6 +21,30 @@
 #ifndef __WINE_MSCTF_I_H
 #define __WINE_MSCTF_I_H
 
+#include <wine/config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <olectl.h>
+#include <msctf.h>
+#include <shlwapi.h>
+
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+
 #define COOKIE_MAGIC_TMSINK  0x0010
 #define COOKIE_MAGIC_CONTEXTSINK 0x0020
 #define COOKIE_MAGIC_GUIDATOM 0x0030
@@ -67,4 +91,5 @@ extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink
 
 extern const WCHAR szwSystemTIPKey[];
 extern const WCHAR szwSystemCTFKey[];
+
 #endif /* __WINE_MSCTF_I_H */
diff --git a/reactos/dll/win32/msctf/range.c b/reactos/dll/win32/msctf/range.c
index 9e0ac1cb1c0..76926aaaf0d 100644
--- a/reactos/dll/win32/msctf/range.c
+++ b/reactos/dll/win32/msctf/range.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-//#include "wine/unicode.h"
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagRange {
     ITfRange ITfRange_iface;
diff --git a/reactos/dll/win32/msctf/threadmgr.c b/reactos/dll/win32/msctf/threadmgr.c
index 9993c9cc739..9858ef8cdcd 100644
--- a/reactos/dll/win32/msctf/threadmgr.c
+++ b/reactos/dll/win32/msctf/threadmgr.c
@@ -18,34 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
 typedef struct tagThreadMgrSink {
     struct list         entry;
     union {