diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp
index ee3af7917..68a11f4b9 100644
--- a/aegisub/src/aegisublocale.cpp
+++ b/aegisub/src/aegisublocale.cpp
@@ -42,11 +42,11 @@
 #ifndef AGI_PRE
 #include <locale.h>
 
-#include <wx/choicdlg.h>
 #include <wx/dir.h>
 #include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/stdpaths.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "aegisublocale.h"
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index de58f1f74..93c6887fe 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -42,10 +42,10 @@
 #ifndef AGI_PRE
 #include <math.h>
 
-#include <wx/laywin.h>
 #include <wx/recguard.h>
 #include <wx/statline.h>
 #include <wx/tglbtn.h>
+#include <wx/laywin.h> // Keep this last so wxSW_3D is set.
 #endif
 
 #include "audio_box.h"
diff --git a/aegisub/src/audio_provider_hd.h b/aegisub/src/audio_provider_hd.h
index a5b373d84..f8ff7440a 100644
--- a/aegisub/src/audio_provider_hd.h
+++ b/aegisub/src/audio_provider_hd.h
@@ -42,6 +42,7 @@
 // Headers
 #include "include/aegisub/audio_provider.h"
 #include <wx/file.h>
+#include <wx/thread.h>
 
 
 
diff --git a/aegisub/src/browse_button.cpp b/aegisub/src/browse_button.cpp
index 5795cafbe..e99f194e2 100644
--- a/aegisub/src/browse_button.cpp
+++ b/aegisub/src/browse_button.cpp
@@ -40,9 +40,9 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/dirdlg.h>
 #include <wx/filedlg.h>
 #include <wx/fontdlg.h>
+#include <wx/dirdlg.h> // Keep this last so wxDirDialog is set.
 #endif
 
 #include "browse_button.h"
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 8c2fb9b7d..33626d20e 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -40,12 +40,12 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/choicdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/tokenzr.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_dialogue.h"
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 6f19e463c..803407ccd 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -42,12 +42,8 @@
 // Headers
 #ifndef AGI_PRE
 #include <map>
-
-/// Force wx to use Choice Dialogue
-/// @todo Find out why this is needed.
-#define wxUSE_CHOICEDLG 1
-#include <wx/choicdlg.h>
 #include <wx/dir.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ffmpegsource_common.h"
diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp
index 105aab616..0e1f33319 100644
--- a/aegisub/src/help_button.cpp
+++ b/aegisub/src/help_button.cpp
@@ -40,8 +40,6 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <map>
-
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/mimetype.h>
diff --git a/aegisub/src/help_button.h b/aegisub/src/help_button.h
index 4921692b8..a3cb073d5 100644
--- a/aegisub/src/help_button.h
+++ b/aegisub/src/help_button.h
@@ -40,6 +40,8 @@
 
 ////////////
 // Includes
+#include <map>
+
 #include <wx/button.h>
 
 
diff --git a/aegisub/src/mkv_wrap.cpp b/aegisub/src/mkv_wrap.cpp
index fb6687460..f83f70e92 100644
--- a/aegisub/src/mkv_wrap.cpp
+++ b/aegisub/src/mkv_wrap.cpp
@@ -45,9 +45,9 @@
 
 #include <algorithm>
 
-#include <wx/choicdlg.h>
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_file.h"
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index d050d7c82..ae818f866 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -40,8 +40,8 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/choicdlg.h>
 #include <wx/intl.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_file.h"