diff --git a/reactos/dll/win32/localspl/lang/spl_Cy.rc b/reactos/dll/win32/localspl/lang/spl_Cy.rc
index cbbe9446b0a..ecae6003291 100644
--- a/reactos/dll/win32/localspl/lang/spl_Cy.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Cy.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Da.rc b/reactos/dll/win32/localspl/lang/spl_Da.rc
index b28fa089325..74b43ce84b8 100644
--- a/reactos/dll/win32/localspl/lang/spl_Da.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_De.rc b/reactos/dll/win32/localspl/lang/spl_De.rc
index b0328f362d9..4ad1148b0e7 100644
--- a/reactos/dll/win32/localspl/lang/spl_De.rc
+++ b/reactos/dll/win32/localspl/lang/spl_De.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
diff --git a/reactos/dll/win32/localspl/lang/spl_En.rc b/reactos/dll/win32/localspl/lang/spl_En.rc
index 13b8bf0d2cb..4052cb732cd 100644
--- a/reactos/dll/win32/localspl/lang/spl_En.rc
+++ b/reactos/dll/win32/localspl/lang/spl_En.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Es.rc b/reactos/dll/win32/localspl/lang/spl_Es.rc
index 18d93b6c2c7..3ae4b22c5c1 100644
--- a/reactos/dll/win32/localspl/lang/spl_Es.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Fr.rc b/reactos/dll/win32/localspl/lang/spl_Fr.rc
index efc5ed1d1fd..5aee2211edf 100644
--- a/reactos/dll/win32/localspl/lang/spl_Fr.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Fr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_He.rc b/reactos/dll/win32/localspl/lang/spl_He.rc
index f119fbe3289..a93e293a4a2 100644
--- a/reactos/dll/win32/localspl/lang/spl_He.rc
+++ b/reactos/dll/win32/localspl/lang/spl_He.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Hu.rc b/reactos/dll/win32/localspl/lang/spl_Hu.rc
index 5dcf04c0f6a..5bb442273e2 100644
--- a/reactos/dll/win32/localspl/lang/spl_Hu.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_It.rc b/reactos/dll/win32/localspl/lang/spl_It.rc
index 64221268a75..80fad149b5f 100644
--- a/reactos/dll/win32/localspl/lang/spl_It.rc
+++ b/reactos/dll/win32/localspl/lang/spl_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Ja.rc b/reactos/dll/win32/localspl/lang/spl_Ja.rc
index 660d03a1adb..2e4ecf7dbab 100644
--- a/reactos/dll/win32/localspl/lang/spl_Ja.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ja.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Ko.rc b/reactos/dll/win32/localspl/lang/spl_Ko.rc
index 89c46c35026..c7303ae4c93 100644
--- a/reactos/dll/win32/localspl/lang/spl_Ko.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ko.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Lt.rc b/reactos/dll/win32/localspl/lang/spl_Lt.rc
index 692e47bd192..2b242cd591d 100644
--- a/reactos/dll/win32/localspl/lang/spl_Lt.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Nl.rc b/reactos/dll/win32/localspl/lang/spl_Nl.rc
index ac1cdf02b55..ae4642458b7 100644
--- a/reactos/dll/win32/localspl/lang/spl_Nl.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_No.rc b/reactos/dll/win32/localspl/lang/spl_No.rc
index aefb4238c01..40660a6eb6e 100644
--- a/reactos/dll/win32/localspl/lang/spl_No.rc
+++ b/reactos/dll/win32/localspl/lang/spl_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Pl.rc b/reactos/dll/win32/localspl/lang/spl_Pl.rc
index 243d2c0e84f..bd7908c9433 100644
--- a/reactos/dll/win32/localspl/lang/spl_Pl.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Pl.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Pt.rc b/reactos/dll/win32/localspl/lang/spl_Pt.rc
index 0bf08a31d45..2675843becd 100644
--- a/reactos/dll/win32/localspl/lang/spl_Pt.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Pt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Ro.rc b/reactos/dll/win32/localspl/lang/spl_Ro.rc
index 364f0284617..31098717319 100644
--- a/reactos/dll/win32/localspl/lang/spl_Ro.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ro.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
diff --git a/reactos/dll/win32/localspl/lang/spl_Ru.rc b/reactos/dll/win32/localspl/lang/spl_Ru.rc
index bd97f113d9c..50b3d7b147f 100644
--- a/reactos/dll/win32/localspl/lang/spl_Ru.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Si.rc b/reactos/dll/win32/localspl/lang/spl_Si.rc
index 5c0d25d728b..32d7aff9b7b 100644
--- a/reactos/dll/win32/localspl/lang/spl_Si.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/localspl/lang/spl_Sv.rc b/reactos/dll/win32/localspl/lang/spl_Sv.rc
index bb32b6c241e..7c60d30a7b2 100644
--- a/reactos/dll/win32/localspl/lang/spl_Sv.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/localspl/lang/spl_Uk.rc b/reactos/dll/win32/localspl/lang/spl_Uk.rc
index c1ea3cfd254..4b0ea3fee7f 100644
--- a/reactos/dll/win32/localspl/lang/spl_Uk.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Uk.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/lang/spl_Zh.rc b/reactos/dll/win32/localspl/lang/spl_Zh.rc
index faaa4541f27..2e2f54f4177 100644
--- a/reactos/dll/win32/localspl/lang/spl_Zh.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/localspl/localmon.c b/reactos/dll/win32/localspl/localmon.c
index ae43c6b3809..3e243bfcbdd 100644
--- a/reactos/dll/win32/localspl/localmon.c
+++ b/reactos/dll/win32/localspl/localmon.c
@@ -18,30 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-
-#include <winspool.h>
-#include <ddk/winsplp.h>
 #include "localspl_private.h"
 
-#include <wine/debug.h>
-#include <wine/list.h>
-#include <wine/unicode.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
-
 /*****************************************************/
 
 static CRITICAL_SECTION port_handles_cs;
diff --git a/reactos/dll/win32/localspl/localspl.rc b/reactos/dll/win32/localspl/localspl.rc
index 47901f332f4..c51e86c49ff 100644
--- a/reactos/dll/win32/localspl/localspl.rc
+++ b/reactos/dll/win32/localspl/localspl.rc
@@ -19,10 +19,7 @@
  *
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winver.h"
-//#include "localspl_private.h"
+#include "resource.h"
 
 #define WINE_FILENAME_STR "localspl.dll"
 #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component"
diff --git a/reactos/dll/win32/localspl/localspl_main.c b/reactos/dll/win32/localspl/localspl_main.c
index a555f432d2c..6e594c7ae17 100644
--- a/reactos/dll/win32/localspl/localspl_main.c
+++ b/reactos/dll/win32/localspl/localspl_main.c
@@ -18,22 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-
-#include <wine/debug.h>
 #include "localspl_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
-
-
 HINSTANCE LOCALSPL_hInstance = NULL;
 
 /*****************************************************
diff --git a/reactos/dll/win32/localspl/localspl_private.h b/reactos/dll/win32/localspl/localspl_private.h
index 4f79f3d6ae1..0fd85d32560 100644
--- a/reactos/dll/win32/localspl/localspl_private.h
+++ b/reactos/dll/win32/localspl/localspl_private.h
@@ -21,20 +21,35 @@
 #ifndef __WINE_LOCALSPL_PRIVATE__
 #define __WINE_LOCALSPL_PRIVATE__
 
-//#include <windef.h>
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winspool.h>
+
+#include <wine/list.h>
+#include <wine/unicode.h>
+#include <ddk/winsplp.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(localspl);
+
+#include "resource.h"
 
 /* ## DLL-wide Globals ## */
 extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN;
 void setup_provider(void) DECLSPEC_HIDDEN;
 
-/* ## Resource-ID ## */
-#define IDS_LOCALPORT       500
-#define IDS_LOCALMONITOR    507
-
-/* ## Reserved memorysize for the strings (in WCHAR) ## */
-#define IDS_LOCALMONITOR_MAXLEN 64
-#define IDS_LOCALPORT_MAXLEN 32
-
 /* ## Type of Ports ## */
 /* windows types */
 #define PORT_IS_UNKNOWN  0
diff --git a/reactos/dll/win32/localspl/provider.c b/reactos/dll/win32/localspl/provider.c
index 864d434752f..06ac03ff94a 100644
--- a/reactos/dll/win32/localspl/provider.c
+++ b/reactos/dll/win32/localspl/provider.c
@@ -18,28 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winreg.h>
-#include <winspool.h>
-#include <winuser.h>
-#include <ddk/winddiui.h>
-#include <ddk/winsplp.h>
-
-#include <wine/list.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "localspl_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
+#include <ddk/winddiui.h>
 
 /* ############################### */
 
diff --git a/reactos/dll/win32/localspl/resource.h b/reactos/dll/win32/localspl/resource.h
new file mode 100644
index 00000000000..6a961f9ac78
--- /dev/null
+++ b/reactos/dll/win32/localspl/resource.h
@@ -0,0 +1,9 @@
+#pragma once
+
+/* ## Resource-ID ## */
+#define IDS_LOCALPORT       500
+#define IDS_LOCALMONITOR    507
+
+/* ## Reserved memorysize for the strings (in WCHAR) ## */
+#define IDS_LOCALMONITOR_MAXLEN 64
+#define IDS_LOCALPORT_MAXLEN 32