diff --git a/src/gba/GBALink.cpp b/src/gba/GBALink.cpp
index b37db7c8..060af320 100644
--- a/src/gba/GBALink.cpp
+++ b/src/gba/GBALink.cpp
@@ -1,11 +1,13 @@
 // This file was written by denopqrihg
 
+#include "../win32/stdafx.h"
+#include "../win32/VBA.h"
+
+#include "GBALink.h"
+
 #include "GBA.h"
 #include <stdio.h>
-#include "../win32/stdafx.h"
 #include "../common/port.h"
-#include "GBALink.h"
-#include "../win32/vba.h"
 #include "../win32/MainWnd.h"
 #include "../win32/LinkOptions.h"
 #include "../win32/Reg.h"
diff --git a/src/win32/AcceleratorManager.cpp b/src/win32/AcceleratorManager.cpp
index e83e339f..a3ae0ce1 100644
--- a/src/win32/AcceleratorManager.cpp
+++ b/src/win32/AcceleratorManager.cpp
@@ -27,8 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-//#include "resource.h"
-#include "../System.h"
+#include "VBA.h"
 
 #include "AcceleratorManager.h"
 #include "Reg.h"
diff --git a/src/win32/AudioCoreSettingsDlg.cpp b/src/win32/AudioCoreSettingsDlg.cpp
index 222f8322..5f719190 100644
--- a/src/win32/AudioCoreSettingsDlg.cpp
+++ b/src/win32/AudioCoreSettingsDlg.cpp
@@ -1,3 +1,6 @@
+#include "stdafx.h"
+#include "VBA.h"
+
 #include "AudioCoreSettingsDlg.h"
 
 #define MIN_VOLUME 0.0f
diff --git a/src/win32/AudioCoreSettingsDlg.h b/src/win32/AudioCoreSettingsDlg.h
index 14962911..992ae759 100644
--- a/src/win32/AudioCoreSettingsDlg.h
+++ b/src/win32/AudioCoreSettingsDlg.h
@@ -1,10 +1,5 @@
 #pragma once
 
-#include "stdafx.h"
-#include "afxwin.h"
-#include "afxcmn.h"
-
-
 // AudioCoreSettingsDlg dialog
 
 class AudioCoreSettingsDlg : public CDialog
diff --git a/src/win32/BIOSDialog.cpp b/src/win32/BIOSDialog.cpp
index 512c73d2..f3fc23f3 100644
--- a/src/win32/BIOSDialog.cpp
+++ b/src/win32/BIOSDialog.cpp
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+#include "VBA.h"
+
 #include "BIOSDialog.h"
 
 
diff --git a/src/win32/BIOSDialog.h b/src/win32/BIOSDialog.h
index d9e69d14..704cf1e5 100644
--- a/src/win32/BIOSDialog.h
+++ b/src/win32/BIOSDialog.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "afxwin.h"
 
 
 // BIOSDialog dialog
diff --git a/src/win32/DirectSound.cpp b/src/win32/DirectSound.cpp
index ef2812b4..2aacfc33 100644
--- a/src/win32/DirectSound.cpp
+++ b/src/win32/DirectSound.cpp
@@ -1,6 +1,9 @@
 // MFC
 #include "stdafx.h"
 
+// Application
+#include "VBA.h"
+
 // Tools
 #include "AVIWrite.h"
 #include "WavWriter.h"
diff --git a/src/win32/FullscreenSettings.cpp b/src/win32/FullscreenSettings.cpp
index 0288b863..1bd7b1d6 100644
--- a/src/win32/FullscreenSettings.cpp
+++ b/src/win32/FullscreenSettings.cpp
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+#include "VBA.h"
+
 #include "FullscreenSettings.h"
 
 
diff --git a/src/win32/FullscreenSettings.h b/src/win32/FullscreenSettings.h
index a68de67b..ef63c1c4 100644
--- a/src/win32/FullscreenSettings.h
+++ b/src/win32/FullscreenSettings.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "afxwin.h"
 #include "Display.h"
 
 
diff --git a/src/win32/LangSelect.cpp b/src/win32/LangSelect.cpp
index 1ef2b726..bacbac71 100644
--- a/src/win32/LangSelect.cpp
+++ b/src/win32/LangSelect.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "vba.h"
+#include "VBA.h"
 #include "LangSelect.h"
 
 #ifdef _DEBUG
diff --git a/src/win32/MainWnd.h b/src/win32/MainWnd.h
index b1fa8d8d..a06f929a 100644
--- a/src/win32/MainWnd.h
+++ b/src/win32/MainWnd.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "stdafx.h"
+#include "VBA.h"
 
 
 class MainWnd : public CWnd
diff --git a/src/win32/OALConfig.cpp b/src/win32/OALConfig.cpp
index 1c317d2a..99dac10d 100644
--- a/src/win32/OALConfig.cpp
+++ b/src/win32/OALConfig.cpp
@@ -1,6 +1,6 @@
-#include "stdafx.h"
-
 #ifndef NO_OAL
+#include "stdafx.h"
+#include "VBA.h"
 
 #include "OALConfig.h"
 
diff --git a/src/win32/OALConfig.h b/src/win32/OALConfig.h
index 0d21d3d9..4cdea3db 100644
--- a/src/win32/OALConfig.h
+++ b/src/win32/OALConfig.h
@@ -1,13 +1,11 @@
 #ifndef NO_OAL
 
 #pragma once
-#include "afxwin.h"
 
 // OpenAL
 #include <al.h>
 #include <alc.h>
 #include "LoadOAL.h"
-#include "afxcmn.h"
 
 
 // OALConfig dialog
diff --git a/src/win32/OpenAL.cpp b/src/win32/OpenAL.cpp
index c2b06bc2..08107c22 100644
--- a/src/win32/OpenAL.cpp
+++ b/src/win32/OpenAL.cpp
@@ -1,8 +1,8 @@
 // === LOGALL writes very detailed informations to vba-trace.log ===
 //#define LOGALL
 
-
-#include "stdafx.h" // includes VBA.h for 'theApp.throttle'
+#include "stdafx.h"
+#include "VBA.h" // for 'theApp.throttle'
 
 #ifndef NO_OAL
 
diff --git a/src/win32/Reg.cpp b/src/win32/Reg.cpp
index bfb48510..d9af81bb 100644
--- a/src/win32/Reg.cpp
+++ b/src/win32/Reg.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "VBA.h"
 #include "..\gba\GBALink.h"
 
 static char buffer[2048];
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index d4b7a845..02527433 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -5,6 +5,8 @@
 #endif
 
 #include "stdafx.h"
+#include "VBA.h"
+
 #include <intrin.h>
 
 #include "AVIWrite.h"
diff --git a/src/win32/VBA.h b/src/win32/VBA.h
index 60a507a8..1170495f 100644
--- a/src/win32/VBA.h
+++ b/src/win32/VBA.h
@@ -4,7 +4,6 @@
 #error include 'stdafx.h' before including this file for PCH
 #endif
 
-#include "stdafx.h"
 #include "resource.h"
 
 #include "AcceleratorManager.h"
diff --git a/src/win32/XAudio2.cpp b/src/win32/XAudio2.cpp
index 978cf0d2..2a4013bc 100644
--- a/src/win32/XAudio2.cpp
+++ b/src/win32/XAudio2.cpp
@@ -3,6 +3,9 @@
 // MFC
 #include "stdafx.h"
 
+// Application
+#include "VBA.h"
+
 // Interface
 #include "../common/SoundDriver.h"
 
diff --git a/src/win32/XAudio2_Config.cpp b/src/win32/XAudio2_Config.cpp
index 331915c3..335f087f 100644
--- a/src/win32/XAudio2_Config.cpp
+++ b/src/win32/XAudio2_Config.cpp
@@ -1,6 +1,8 @@
 #ifndef NO_XAUDIO2
 
 #include "stdafx.h"
+#include "VBA.h"
+
 #include "XAudio2_Config.h"
 
 #include <xaudio2.h>
diff --git a/src/win32/XAudio2_Config.h b/src/win32/XAudio2_Config.h
index 2bd3830f..ee0bcf5c 100644
--- a/src/win32/XAudio2_Config.h
+++ b/src/win32/XAudio2_Config.h
@@ -1,8 +1,6 @@
 #ifndef NO_XAUDIO2
 
 #pragma once
-#include "afxwin.h"
-#include "afxcmn.h"
 
 
 class XAudio2_Config : public CDialog
diff --git a/src/win32/rpi.cpp b/src/win32/rpi.cpp
index 7372141c..73ad0600 100644
--- a/src/win32/rpi.cpp
+++ b/src/win32/rpi.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "VBA.h"
 #include "rpi.h"
 
 extern void SuperEagle(u8*,u32,u8*,u8*,u32,int,int);
diff --git a/src/win32/stdafx.h b/src/win32/stdafx.h
index 7a2caae2..ece2ecaf 100644
--- a/src/win32/stdafx.h
+++ b/src/win32/stdafx.h
@@ -25,5 +25,3 @@
 #ifndef _AFX_NO_AFXCMN_SUPPORT
 #include <afxcmn.h>             // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include "VBA.h" // It would be cleaner if we could leave this out