diff --git a/reactos/dll/win32/scrrun/CMakeLists.txt b/reactos/dll/win32/scrrun/CMakeLists.txt
index a30bdbe74eb..b5cdc6771fe 100644
--- a/reactos/dll/win32/scrrun/CMakeLists.txt
+++ b/reactos/dll/win32/scrrun/CMakeLists.txt
@@ -10,6 +10,7 @@ list(APPEND SOURCE
     dictionary.c
     filesystem.c
     scrrun.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
 
diff --git a/reactos/dll/win32/scrrun/dictionary.c b/reactos/dll/win32/scrrun/dictionary.c
index 4fcaedd6cfc..9a5e8b9c7c7 100644
--- a/reactos/dll/win32/scrrun/dictionary.c
+++ b/reactos/dll/win32/scrrun/dictionary.c
@@ -15,22 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define COBJMACROS
 
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "ole2.h"
-#include "dispex.h"
-#include "scrrun.h"
 #include "scrrun_private.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
-
 typedef struct
 {
     IDictionary IDictionary_iface;
diff --git a/reactos/dll/win32/scrrun/filesystem.c b/reactos/dll/win32/scrrun/filesystem.c
index 2750108fb30..79c37c90684 100644
--- a/reactos/dll/win32/scrrun/filesystem.c
+++ b/reactos/dll/win32/scrrun/filesystem.c
@@ -16,25 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "config.h"
-#include <stdarg.h>
-#include <limits.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "ole2.h"
-#include "olectl.h"
-#include "dispex.h"
-#include "ntsecapi.h"
-#include "scrrun.h"
 #include "scrrun_private.h"
 
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
+#include <winver.h>
+#include <olectl.h>
+#include <ntsecapi.h>
 
 struct folder {
     IFolder IFolder_iface;
diff --git a/reactos/dll/win32/scrrun/guid.c b/reactos/dll/win32/scrrun/guid.c
new file mode 100644
index 00000000000..b753b74bfdf
--- /dev/null
+++ b/reactos/dll/win32/scrrun/guid.c
@@ -0,0 +1,15 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <scrrun.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/dll/win32/scrrun/scrrun.c b/reactos/dll/win32/scrrun/scrrun.c
index 82f494fd2e3..23b39753d71 100644
--- a/reactos/dll/win32/scrrun/scrrun.c
+++ b/reactos/dll/win32/scrrun/scrrun.c
@@ -15,23 +15,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define COBJMACROS
 
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "ole2.h"
-#include "rpcproxy.h"
-
-#include <initguid.h>
-#include "scrrun.h"
 #include "scrrun_private.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
+#include <rpcproxy.h>
 
 static HINSTANCE scrrun_instance;
 
diff --git a/reactos/dll/win32/scrrun/scrrun_private.h b/reactos/dll/win32/scrrun/scrrun_private.h
index 1a8f079de9f..7801bcf5d7e 100644
--- a/reactos/dll/win32/scrrun/scrrun_private.h
+++ b/reactos/dll/win32/scrrun/scrrun_private.h
@@ -19,6 +19,28 @@
 #ifndef _SCRRUN_PRIVATE_H_
 #define _SCRRUN_PRIVATE_H_
 
+#include <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 <objbase.h>
+#include <oleauto.h>
+#include <dispex.h>
+#include <scrrun.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(scrrun);
+
 extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;