diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 216b1e98d..bf6546ff0 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -37,6 +37,8 @@
 
 #ifndef AGI_PRE
 #include <fstream>
+#include <list>
+#include <vector>
 
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index 9b76b9847..f6680aad6 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -41,19 +41,20 @@
 
 #include <wx/bitmap.h>
 #include <wx/scrolbar.h>
+#include <wx/timer.h>
 #include <wx/window.h>
 #endif
 
 #include "audio_renderer_spectrum.h"
 
+class AudioBox;
+class AudioKaraoke;
 class AudioPlayer;
 class AudioProvider;
 class AssDialogue;
-class SubtitlesGrid;
-class AudioBox;
-class AudioKaraoke;
-class VideoProvider;
 class FrameMain;
+class SubtitlesGrid;
+class VideoProvider;
 
 /// DOCME
 /// @class AudioDisplay
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index 448aaeb34..45e738999 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -39,6 +39,9 @@
 #ifndef AGI_PRE
 #include <algorithm>
 #include <iterator>
+
+#include <wx/dcclient.h>
+#include <wx/dcmemory.h>
 #include <wx/sizer.h>
 #endif
 
diff --git a/aegisub/src/base_grid.h b/aegisub/src/base_grid.h
index 7c527972e..27b8c79d4 100644
--- a/aegisub/src/base_grid.h
+++ b/aegisub/src/base_grid.h
@@ -39,6 +39,7 @@
 
 #ifndef AGI_PRE
 #include <list>
+#include <map>
 #include <vector>
 
 #include <wx/grid.h>
diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp
index fadc9b889..7edaafd33 100644
--- a/aegisub/src/dialog_video_details.cpp
+++ b/aegisub/src/dialog_video_details.cpp
@@ -37,7 +37,9 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/textctrl.h>
 #endif
 
 #include "dialog_video_details.h"
diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h
index 57b86bb73..94d3e945c 100644
--- a/aegisub/src/factory_manager.h
+++ b/aegisub/src/factory_manager.h
@@ -37,6 +37,7 @@
 #pragma once
 
 #ifndef AGI_PRE
+#include <algorithm>
 #include <cctype>
 #include <map>
 #include <vector>
diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h
index 11931c31a..7ecd11b43 100644
--- a/aegisub/src/mkv_wrap.h
+++ b/aegisub/src/mkv_wrap.h
@@ -40,6 +40,8 @@
 
 #include <list>
 #include <vector>
+
+#include <wx/dynarray.h>
 #endif
 
 #include "MatroskaParser.h"
diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h
index b6bf20edb..71cd9b44b 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -54,7 +54,7 @@ class wxRadioButton;
 class wxSizer;
 class wxSpinCtrl;
 class wxStyledTextCtrl;
-class wxStyleTextEvent;
+class wxStyledTextEvent;
 class wxTextCtrl;
 
 /// DOCME
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 93b08d03a..9c3602b7f 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -42,6 +42,7 @@
 
 #include <wx/clipbrd.h>
 #include <wx/filename.h>
+#include <wx/regex.h>
 #include <wx/tokenzr.h>
 #endif
 
diff --git a/aegisub/src/text_file_reader.cpp b/aegisub/src/text_file_reader.cpp
index 13b1dee34..4a291ab20 100644
--- a/aegisub/src/text_file_reader.cpp
+++ b/aegisub/src/text_file_reader.cpp
@@ -42,6 +42,8 @@
 
 #include <algorithm>
 #include <string>
+
+#include <wx/string.h>
 #endif
 
 #include <libaegisub/io.h>
diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h
index 88b3b3745..897705800 100644
--- a/aegisub/src/utils.h
+++ b/aegisub/src/utils.h
@@ -40,6 +40,7 @@
 #ifndef AGI_PRE
 #include <stdint.h>
 
+#include <algorithm>
 #include <utility>
 #include <vector>
 
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 0fbfb5516..b16b2aae2 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -38,6 +38,8 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
+
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
 #include <wx/dcclient.h>
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index 56ea80d73..cb234492e 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -33,6 +33,8 @@
 /// @brief Vector clipping visual typesetting tool
 /// @ingroup visual_ts
 
+#include "visual_tool_vector_clip.h"
+
 #ifndef AGI_PRE
 #include <wx/toolbar.h>
 
@@ -51,7 +53,6 @@
 #include "libresrc/libresrc.h"
 #include "utils.h"
 #include "video_display.h"
-#include "visual_tool_vector_clip.h"
 
 /// Button IDs
 enum {