diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e6c1ac6..83dc9106 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,8 +80,8 @@ project(VBA-M C CXX)
 include(CTest)
 include(FetchContent)
 include(GNUInstallDirs)
-include(Options)
 include(Architecture)
+include(Options)
 include(Toolchain)
 include(Dependencies)
 
diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index 45da6a90..edee94d5 100644
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -151,7 +151,7 @@ set(ENABLE_FAUDIO_DEFAULT OFF)
 
 find_package(FAudio QUIET)
 
-if(FAudio_FOUND)
+if(FAudio_FOUND AND NOT (MINGW AND X86))
     set(ENABLE_FAUDIO_DEFAULT ON)
 endif()
 
diff --git a/src/wx/audio/internal/xaudio2.h b/src/wx/audio/internal/xaudio2.h
index e05c30d2..a3c0a759 100644
--- a/src/wx/audio/internal/xaudio2.h
+++ b/src/wx/audio/internal/xaudio2.h
@@ -1,10 +1,6 @@
 #ifndef WX_AUDIO_INTERNAL_XAUDIO2_H_
 #define WX_AUDIO_INTERNAL_XAUDIO2_H_
 
-#if !defined(VBAM_ENABLE_FAUDIO)
-#error "This file should only be included if FAudio is enabled"
-#endif
-
 #include "wx/audio/audio.h"
 
 namespace audio {