diff --git a/src/win32/LoadOAL.cpp b/src/win32/LoadOAL.cpp
index 8ee31d1f..d95371c3 100644
--- a/src/win32/LoadOAL.cpp
+++ b/src/win32/LoadOAL.cpp
@@ -22,6 +22,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "stdafx.h"
+
+#ifndef NO_OAL
+
 #include "windows.h"
 #include "LoadOAL.h"
 
@@ -446,3 +450,5 @@ ALvoid UnloadOAL10Library()
 		g_hOpenALDLL = NULL;
 	}
 }
+
+#endif
diff --git a/src/win32/LoadOAL.h b/src/win32/LoadOAL.h
index eac89066..59aa3044 100644
--- a/src/win32/LoadOAL.h
+++ b/src/win32/LoadOAL.h
@@ -1,3 +1,5 @@
+#ifndef NO_OAL
+
 #include <al.h>
 #include <alc.h>
 
@@ -162,3 +164,5 @@ typedef struct
 
 ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable);
 ALvoid UnloadOAL10Library();
+
+#endif
diff --git a/src/win32/OALConfig.cpp b/src/win32/OALConfig.cpp
index 5b164bf2..2ad0d11b 100644
--- a/src/win32/OALConfig.cpp
+++ b/src/win32/OALConfig.cpp
@@ -1,9 +1,10 @@
 // src/win32/OALConfig.cpp : implementation file
 //
 
+#include "stdafx.h"
+
 #ifndef NO_OAL
 
-#include "stdafx.h"
 #include "OALConfig.h"
 
 // OpenAL
diff --git a/src/win32/OpenAL.cpp b/src/win32/OpenAL.cpp
index 288bcf5d..beeb35e4 100644
--- a/src/win32/OpenAL.cpp
+++ b/src/win32/OpenAL.cpp
@@ -15,8 +15,6 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#ifndef NO_OAL
-
 
 // === LOGALL writes very detailed informations to vba-trace.log ===
 //#define LOGALL
@@ -24,6 +22,8 @@
 
 #include "stdafx.h" // includes VBA.h for 'theApp.throttle'
 
+#ifndef NO_OAL
+
 // Interface
 #include "Sound.h"
 
diff --git a/src/win32/stdafx.h b/src/win32/stdafx.h
index 83b6e750..4222bb0c 100644
--- a/src/win32/stdafx.h
+++ b/src/win32/stdafx.h
@@ -45,6 +45,4 @@
 #include <afxcmn.h>             // MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
-#include <afxcontrolbars.h>     // MFC support for ribbons and control bars
-
 #include "VBA.h" // It would be cleaner if we could leave this out