diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index 8b13ffdff..c1a83f4c2 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -35,6 +35,7 @@
 
 #ifndef AGI_PRE
 #include <list>
+#include <map>
 #include <cstdint>
 
 #include <wx/gdicmn.h>
diff --git a/aegisub/src/dialog_autosave.cpp b/aegisub/src/dialog_autosave.cpp
index 0ada2aa45..e733b690a 100644
--- a/aegisub/src/dialog_autosave.cpp
+++ b/aegisub/src/dialog_autosave.cpp
@@ -28,6 +28,11 @@
 #ifndef AGI_PRE
 #include <map>
 
+#include <wx/button.h>
+#include <wx/dir.h>
+#include <wx/filename.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
 #include <wx/statbox.h>
 #endif
 
diff --git a/aegisub/src/dialog_autosave.h b/aegisub/src/dialog_autosave.h
index 4ae1361f2..a9f8528d4 100644
--- a/aegisub/src/dialog_autosave.h
+++ b/aegisub/src/dialog_autosave.h
@@ -16,6 +16,7 @@
 
 #ifndef AGI_PRE
 #include <cstdint>
+#include <map>
 #include <string>
 #include <vector>
 
diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h
index 57b6a8566..1357fbf5d 100644
--- a/aegisub/src/mkv_wrap.h
+++ b/aegisub/src/mkv_wrap.h
@@ -33,6 +33,7 @@
 ///
 
 #ifndef AGI_PRE
+#include <map>
 #include <wx/string.h>
 #endif
 
diff --git a/aegisub/src/spellchecker_hunspell.h b/aegisub/src/spellchecker_hunspell.h
index 841e2de8b..e90d00d65 100644
--- a/aegisub/src/spellchecker_hunspell.h
+++ b/aegisub/src/spellchecker_hunspell.h
@@ -26,6 +26,10 @@
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
 
+#ifndef AGI_PRE
+#include <wx/string.h>
+#endif
+
 namespace agi { namespace charset { class IconvWrapper; } }
 class Hunspell;
 
diff --git a/aegisub/src/subtitle_format_srt.cpp b/aegisub/src/subtitle_format_srt.cpp
index c429412e0..ef0af51c2 100644
--- a/aegisub/src/subtitle_format_srt.cpp
+++ b/aegisub/src/subtitle_format_srt.cpp
@@ -36,10 +36,6 @@
 
 #include "subtitle_format_srt.h"
 
-#ifndef AGI_PRE
-#include <wx/regex.h>
-#endif
-
 #include "ass_attachment.h"
 #include "ass_dialogue.h"
 #include "ass_file.h"
@@ -53,6 +49,11 @@
 
 #include <libaegisub/of_type_adaptor.h>
 
+#ifndef AGI_PRE
+#include <map>
+#include <wx/regex.h>
+#endif
+
 DEFINE_SIMPLE_EXCEPTION(SRTParseError, SubtitleFormatParseError, "subtitle_io/parse/srt")
 
 namespace {
diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp
index e6647ed67..674cb4fb4 100644
--- a/aegisub/src/threaded_frame_source.cpp
+++ b/aegisub/src/threaded_frame_source.cpp
@@ -35,6 +35,7 @@
 #include "threaded_frame_source.h"
 
 #ifndef AGI_PRE
+#include <deque>
 #include <functional>
 
 #include <boost/range/adaptor/indirected.hpp>
diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
index 643feb177..bca002c2d 100644
--- a/aegisub/src/utils.cpp
+++ b/aegisub/src/utils.cpp
@@ -42,6 +42,7 @@
 #endif
 #include <map>
 
+#include <wx/clipbrd.h>
 #include <wx/dir.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
diff --git a/aegisub/src/variable_data.h b/aegisub/src/variable_data.h
index 9385cd6cf..46eb2ed1d 100644
--- a/aegisub/src/variable_data.h
+++ b/aegisub/src/variable_data.h
@@ -35,6 +35,7 @@
 #pragma once
 
 namespace agi { struct Color; }
+class wxString;
 
 enum VariableDataType {
 	VARDATA_NONE,
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index b7d95c56f..f052b095a 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -27,6 +27,8 @@
 #include <set>
 #include <vector>
 
+#include <boost/container/list.hpp>
+
 #include <wx/log.h>
 #include <wx/event.h>
 #include <wx/button.h>