diff --git a/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt b/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt
index 182b0045b33..3dfae1332f6 100644
--- a/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt
+++ b/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt
@@ -7,6 +7,7 @@ list(APPEND SOURCE
     container.c
     dxdiag_main.c
     provider.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
 
 add_idl_headers(dxdiagn_idlheader fil_data.idl)
diff --git a/reactos/dll/directx/wine/dxdiagn/container.c b/reactos/dll/directx/wine/dxdiagn/container.c
index 9b7591a00a0..dd587c382b6 100644
--- a/reactos/dll/directx/wine/dxdiagn/container.c
+++ b/reactos/dll/directx/wine/dxdiagn/container.c
@@ -19,14 +19,7 @@
  *
  */
 
-#include <config.h>
-
-#define COBJMACROS
 #include "dxdiag_private.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
 
 static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface)
 {
diff --git a/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c b/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
index 58f89179737..874a784e14a 100644
--- a/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
+++ b/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
@@ -19,22 +19,9 @@
  *
  */
 
-#define COBJMACROS
-
-#include <config.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <oleauto.h>
-#include <oleidl.h>
-#include <rpcproxy.h>
-#include <initguid.h>
 #include "dxdiag_private.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
+#include <rpcproxy.h>
 
 HINSTANCE dxdiagn_instance = 0;
 
diff --git a/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h b/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h
index ae73a0f6372..c17505a2f8b 100644
--- a/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h
+++ b/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h
@@ -21,21 +21,31 @@
 #ifndef __WINE_DXDIAG_PRIVATE_H
 #define __WINE_DXDIAG_PRIVATE_H
 
+#include <wine/config.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
 
-#include <wine/list.h>
+#include <wine/debug.h>
 #include <wine/dxdiag.h>
+#include <wine/list.h>
+#include <wine/unicode.h>
 
 #include "resource.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
+
 /* DXDiag Interfaces: */
 typedef struct IDxDiagProviderImpl  IDxDiagProviderImpl;
 typedef struct IDxDiagContainerImpl IDxDiagContainerImpl;
diff --git a/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc b/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc
index 2661737f25c..61e1e05d5f5 100644
--- a/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc
+++ b/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
diff --git a/reactos/dll/directx/wine/dxdiagn/guid.c b/reactos/dll/directx/wine/dxdiagn/guid.c
new file mode 100644
index 00000000000..d72e84cb7cf
--- /dev/null
+++ b/reactos/dll/directx/wine/dxdiagn/guid.c
@@ -0,0 +1,18 @@
+/* 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 <wingdi.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <fil_data.h>
+#include <wbemcli.h>
+#include <wine/dxdiag.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/dll/directx/wine/dxdiagn/provider.c b/reactos/dll/directx/wine/dxdiagn/provider.c
index cb4efff6e71..093a34d3365 100644
--- a/reactos/dll/directx/wine/dxdiagn/provider.c
+++ b/reactos/dll/directx/wine/dxdiagn/provider.c
@@ -20,30 +20,15 @@
  *
  */
 
-#include <config.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include "dxdiag_private.h"
-#include <wine/unicode.h>
+
 #include <winver.h>
-#include <wingdi.h>
-#include <objidl.h>
 #include <uuids.h>
-#include <vfw.h>
-#include <mmddk.h>
 #include <d3d9.h>
-#include <strmif.h>
-#include <initguid.h>
 #include <fil_data.h>
 #include <psapi.h>
 #include <wbemcli.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
-
 static const WCHAR szEmpty[] = {0};
 
 static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root);
diff --git a/reactos/dll/directx/wine/dxdiagn/resource.h b/reactos/dll/directx/wine/dxdiagn/resource.h
index dd6c1a3bd03..2627a18a66c 100644
--- a/reactos/dll/directx/wine/dxdiagn/resource.h
+++ b/reactos/dll/directx/wine/dxdiagn/resource.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
+#pragma once
 
 #define IDS_REGIONAL_SETTING 1
 #define IDS_PAGE_FILE_FORMAT 2