diff --git a/libaegisub/ass/uuencode.cpp b/libaegisub/ass/uuencode.cpp
index 893268d077..b2e0df60f2 100644
--- a/libaegisub/ass/uuencode.cpp
+++ b/libaegisub/ass/uuencode.cpp
@@ -17,6 +17,7 @@
 #include <libaegisub/ass/uuencode.h>
 
 #include <algorithm>
+#include <cstring>
 
 // Despite being called uuencoding by ass_specs.doc, the format is actually
 // somewhat different from real uuencoding.  Each 3-byte chunk is split into 4
diff --git a/libaegisub/audio/provider_dummy.cpp b/libaegisub/audio/provider_dummy.cpp
index 3e7f104ef0..bcb383bff1 100644
--- a/libaegisub/audio/provider_dummy.cpp
+++ b/libaegisub/audio/provider_dummy.cpp
@@ -19,6 +19,7 @@
 #include "libaegisub/fs.h"
 
 #include <random>
+#include <cstring>
 
 /*
  * scheme            ::= "dummy-audio" ":" signal-specifier "?" signal-parameters
diff --git a/libaegisub/common/cajun/reader.cpp b/libaegisub/common/cajun/reader.cpp
index 6f32d2ff45..3c0fa9222c 100644
--- a/libaegisub/common/cajun/reader.cpp
+++ b/libaegisub/common/cajun/reader.cpp
@@ -10,6 +10,7 @@ Author: Terry Caton
 
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <cassert>
+#include <algorithm>
 
 /*
 
diff --git a/libaegisub/common/calltip_provider.cpp b/libaegisub/common/calltip_provider.cpp
index de693e6377..d0188cbbb9 100644
--- a/libaegisub/common/calltip_provider.cpp
+++ b/libaegisub/common/calltip_provider.cpp
@@ -19,6 +19,7 @@
 #include "libaegisub/ass/dialogue_parser.h"
 
 #include <algorithm>
+#include <cstring>
 
 namespace {
 struct proto_lit {
diff --git a/libaegisub/common/mru.cpp b/libaegisub/common/mru.cpp
index 81db2715ab..04ca60a305 100644
--- a/libaegisub/common/mru.cpp
+++ b/libaegisub/common/mru.cpp
@@ -22,6 +22,8 @@
 #include "libaegisub/option.h"
 #include "libaegisub/option_value.h"
 
+#include <algorithm>
+
 namespace {
 std::string_view mru_names[] = {
 	"Audio",
diff --git a/libaegisub/common/option.cpp b/libaegisub/common/option.cpp
index 13e93a3a03..aa398227d5 100644
--- a/libaegisub/common/option.cpp
+++ b/libaegisub/common/option.cpp
@@ -28,6 +28,7 @@
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <cassert>
 #include <memory>
+#include <algorithm>
 
 namespace {
 using namespace agi;
diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp
index 23366e82c5..6626316d9a 100644
--- a/libaegisub/common/thesaurus.cpp
+++ b/libaegisub/common/thesaurus.cpp
@@ -20,6 +20,7 @@
 #include "libaegisub/split.h"
 
 #include <boost/interprocess/streams/bufferstream.hpp>
+#include <algorithm>
 
 namespace agi {
 
diff --git a/libaegisub/include/libaegisub/lua/ffi.h b/libaegisub/include/libaegisub/lua/ffi.h
index 17cf0088d7..29902f77ad 100644
--- a/libaegisub/include/libaegisub/lua/ffi.h
+++ b/libaegisub/include/libaegisub/lua/ffi.h
@@ -17,6 +17,7 @@
 #include <libaegisub/type_name.h>
 
 #include <cstdlib>
+#include <cstring>
 #include <lua.hpp>
 
 namespace agi::lua {
diff --git a/libaegisub/unix/path.cpp b/libaegisub/unix/path.cpp
index a171bc2a43..56b7d5b49d 100644
--- a/libaegisub/unix/path.cpp
+++ b/libaegisub/unix/path.cpp
@@ -14,6 +14,8 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
+#include "../acconf.h"
+
 #include <libaegisub/path.h>
 
 #include <libaegisub/exception.h>
diff --git a/src/aegisublocale.cpp b/src/aegisublocale.cpp
index cc5f4e10db..de036dbd0e 100644
--- a/src/aegisublocale.cpp
+++ b/src/aegisublocale.cpp
@@ -32,6 +32,8 @@
 /// @ingroup utility
 ///
 
+#include "acconf.h"
+
 #include "aegisublocale.h"
 
 #include "compat.h"
diff --git a/src/ass_style.cpp b/src/ass_style.cpp
index 33c93b8f31..7e3fbd5c85 100644
--- a/src/ass_style.cpp
+++ b/src/ass_style.cpp
@@ -42,6 +42,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <wx/intl.h>
+#include <algorithm>
 
 AssStyle::AssStyle() {
 	std::fill(Margin.begin(), Margin.end(), 10);
diff --git a/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp
index fd15582b15..edb8280909 100644
--- a/src/audio_timing_dialogue.cpp
+++ b/src/audio_timing_dialogue.cpp
@@ -42,6 +42,7 @@
 #include <libaegisub/ass/time.h>
 
 #include <boost/range/algorithm.hpp>
+#include <list>
 #include <wx/pen.h>
 
 namespace {
diff --git a/src/base_grid.h b/src/base_grid.h
index 2f28a21dcf..37b9061da1 100644
--- a/src/base_grid.h
+++ b/src/base_grid.h
@@ -33,6 +33,8 @@
 #include <string>
 #include <vector>
 #include <wx/window.h>
+#include <wx/scrolbar.h>
+#include <wx/brush.h>
 
 namespace agi {
 	struct Context;
diff --git a/src/command/command.h b/src/command/command.h
index c90b230a05..81d56d2881 100644
--- a/src/command/command.h
+++ b/src/command/command.h
@@ -19,6 +19,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <memory>
 
 #include <wx/bitmap.h>
 #include <wx/intl.h>
diff --git a/src/dialog_colorpicker.cpp b/src/dialog_colorpicker.cpp
index e0d8882de7..3f805f88b6 100644
--- a/src/dialog_colorpicker.cpp
+++ b/src/dialog_colorpicker.cpp
@@ -40,6 +40,7 @@
 
 #include <memory>
 #include <vector>
+#include <algorithm>
 
 #include <wx/bitmap.h>
 #include <wx/button.h>
diff --git a/src/frame_main.cpp b/src/frame_main.cpp
index 24ef314d74..557aa91603 100644
--- a/src/frame_main.cpp
+++ b/src/frame_main.cpp
@@ -67,6 +67,7 @@
 #include <wx/sizer.h>
 #include <wx/statline.h>
 #include <wx/sysopt.h>
+#include <wx/toolbar.h>
 
 enum {
 	ID_APP_TIMER_STATUSCLEAR = 12002
diff --git a/src/main.h b/src/main.h
index de65b65da0..35b7be1c96 100644
--- a/src/main.h
+++ b/src/main.h
@@ -31,6 +31,8 @@
 
 #include "aegisublocale.h"
 
+#include <vector>
+
 #ifndef wxUSE_EXCEPTIONS
 #error wxWidgets is compiled without exceptions support. Aegisub requires exceptions support in wxWidgets to run safely.
 #endif
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 1b0033b057..ccc52a9056 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -47,6 +47,7 @@
 
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
+#include <wx/dc.h>
 #include <wx/event.h>
 #include <wx/listctrl.h>
 #include <wx/msgdlg.h>
diff --git a/src/spline_curve.cpp b/src/spline_curve.cpp
index b1a799a0f5..e10a804584 100644
--- a/src/spline_curve.cpp
+++ b/src/spline_curve.cpp
@@ -36,6 +36,7 @@
 #include "utils.h"
 
 #include <limits>
+#include <algorithm>
 
 SplineCurve::SplineCurve(Vector2D p1) : p1(p1), type(POINT) { }
 SplineCurve::SplineCurve(Vector2D p1, Vector2D p2) : p1(p1), p2(p2), type(LINE) { }
diff --git a/src/utils.cpp b/src/utils.cpp
index b596682d21..41a4006812 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -41,6 +41,7 @@
 #ifdef __UNIX__
 #include <unistd.h>
 #endif
+#include <algorithm>
 #include <map>
 #include <unicode/locid.h>
 #include <unicode/unistr.h>