GS: Remove windows includes from GS.h

pcsx2/GS/GS.h

@@ -20,18 +20,6 @@
 #include "SaveState.h"
 #include "Host.h"
 
-#ifdef _WIN32
-
-#include <windows.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <shellapi.h>
-#include <d3dcompiler.h>
-#include <d3d11_1.h>
-#include <dxgi1_3.h>
-
-#endif
-
 #include <map>
 
 #ifdef None

pcsx2/GS/GSUtil.h

@@ -17,6 +17,10 @@
 
 #include "GS.h"
 #include "GSRegs.h"
+#ifdef _WIN32
+#include <d3dcommon.h>
+#include <dxgi.h>
+#endif
 
 #include <xbyak/xbyak_util.h>
 

pcsx2/GS/Renderers/DX11/GSDevice11.cpp

@@ -23,6 +23,7 @@
 #include <fstream>
 #include <sstream>
 #include <VersionHelpers.h>
+#include <d3dcompiler.h>
 
 GSDevice11::GSDevice11()
 {

pcsx2/GS/Renderers/DX11/GSDevice11.h

@@ -20,6 +20,7 @@
 #include "GS/Renderers/Common/GSDevice.h"
 #include <unordered_map>
 #include <wil/com.h>
+#include <dxgi1_3.h>
 
 struct GSVertexShader11
 {

pcsx2/GS/Renderers/DX11/GSTexture11.h

@@ -18,6 +18,7 @@
 #include "GS.h"
 #include "GS/Renderers/Common/GSTexture.h"
 #include <wil/com.h>
+#include <d3d11.h>
 
 class GSTexture11 : public GSTexture
 {

pcsx2/GS/Window/GSCaptureDlg.cpp

@@ -17,6 +17,7 @@
 #include "GS.h"
 #include "GSCaptureDlg.h"
 #include "GS/GSExtra.h"
+#include <commdlg.h>
 
 // Ideally this belongs in WIL, but CAUUID is used by a *single* COM function in WinAPI.
 // That's presumably why it's omitted and is unlikely to make it to upstream WIL.

pcsx2/GS/Window/GSDialog.cpp

@@ -16,6 +16,7 @@
 #include "PrecompiledHeader.h"
 #include <Shlwapi.h>
 #include <CommCtrl.h>
+#include <commdlg.h>
 #include "GS.h"
 #include "GSDialog.h"
 #include "GS/GSVector.h"