diff --git a/aegisub/libaegisub/common/cajun/elements.cpp b/aegisub/libaegisub/common/cajun/elements.cpp
index a3a95fef6..7092f15af 100644
--- a/aegisub/libaegisub/common/cajun/elements.cpp
+++ b/aegisub/libaegisub/common/cajun/elements.cpp
@@ -11,10 +11,8 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/visitor.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cassert>
-#endif
 
 namespace {
 	using namespace json;
diff --git a/aegisub/libaegisub/common/cajun/reader.cpp b/aegisub/libaegisub/common/cajun/reader.cpp
index 5c3fde3ac..f6bad499f 100644
--- a/aegisub/libaegisub/common/cajun/reader.cpp
+++ b/aegisub/libaegisub/common/cajun/reader.cpp
@@ -8,11 +8,9 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/reader.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <set>
 #include <sstream>
-#endif
 
 /*
 
diff --git a/aegisub/libaegisub/common/cajun/writer.cpp b/aegisub/libaegisub/common/cajun/writer.cpp
index 940996c9c..dad3801d6 100644
--- a/aegisub/libaegisub/common/cajun/writer.cpp
+++ b/aegisub/libaegisub/common/cajun/writer.cpp
@@ -8,11 +8,9 @@ Author: Terry Caton
 
 #include "libaegisub/cajun/writer.h"
 
-#ifndef LAGI_PRE
 #include <cmath>
 #include <iostream>
 #include <iomanip>
-#endif
 
 /*
 
diff --git a/aegisub/libaegisub/common/charset_6937.cpp b/aegisub/libaegisub/common/charset_6937.cpp
index 530358de2..e85e1bbe5 100644
--- a/aegisub/libaegisub/common/charset_6937.cpp
+++ b/aegisub/libaegisub/common/charset_6937.cpp
@@ -20,10 +20,8 @@
 
 #include "charset_6937.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cerrno>
-#endif
 
 #include <iconv.h>
 
diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp
index fd87bb2bf..927f4e958 100644
--- a/aegisub/libaegisub/common/charset_conv.cpp
+++ b/aegisub/libaegisub/common/charset_conv.cpp
@@ -16,13 +16,11 @@
 /// @brief Wrapper for libiconv to present a more C++-friendly API
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <errno.h>
 #include <cstdint>
 
 #include <cassert>
 #include <map>
-#endif
 
 #include "../config.h"
 
diff --git a/aegisub/libaegisub/common/charset_ucd.h b/aegisub/libaegisub/common/charset_ucd.h
index 134d1e51d..8b144cfc0 100644
--- a/aegisub/libaegisub/common/charset_ucd.h
+++ b/aegisub/libaegisub/common/charset_ucd.h
@@ -18,9 +18,7 @@
 
 #include "libaegisub/charset.h"
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 #ifndef _WIN32
 #define _X86_ 1
diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp
index 068bb0944..efde67227 100644
--- a/aegisub/libaegisub/common/hotkey.cpp
+++ b/aegisub/libaegisub/common/hotkey.cpp
@@ -18,12 +18,10 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cmath>
 #include <memory>
 #include <tuple>
-#endif
 
 #include "libaegisub/hotkey.h"
 
diff --git a/aegisub/libaegisub/common/io.cpp b/aegisub/libaegisub/common/io.cpp
index 085eb02b8..ebd7bfe46 100644
--- a/aegisub/libaegisub/common/io.cpp
+++ b/aegisub/libaegisub/common/io.cpp
@@ -16,13 +16,11 @@
 /// @brief Windows IO methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <sys/stat.h>
 #include <errno.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <libaegisub/access.h>
 #include <libaegisub/charset_conv_win.h>
diff --git a/aegisub/libaegisub/common/json.cpp b/aegisub/libaegisub/common/json.cpp
index 8a1c27f13..8f9f725f8 100644
--- a/aegisub/libaegisub/common/json.cpp
+++ b/aegisub/libaegisub/common/json.cpp
@@ -18,10 +18,8 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <sstream>
-#endif
 
 #include "libaegisub/io.h"
 #include "libaegisub/json.h"
diff --git a/aegisub/libaegisub/common/keyframe.cpp b/aegisub/libaegisub/common/keyframe.cpp
index 1825c3989..3dbcda834 100644
--- a/aegisub/libaegisub/common/keyframe.cpp
+++ b/aegisub/libaegisub/common/keyframe.cpp
@@ -20,10 +20,8 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <fstream>
-#endif
 
 #include "libaegisub/io.h"
 #include "libaegisub/line_iterator.h"
diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp
index b6e128817..016870ed2 100644
--- a/aegisub/libaegisub/common/log.cpp
+++ b/aegisub/libaegisub/common/log.cpp
@@ -18,14 +18,12 @@
 
 #include "../config.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
 #include <functional>
 #include <memory>
 #include <sstream>
-#endif
 
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/writer.h"
diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index 22569c62e..7656813cf 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -20,13 +20,11 @@
 
 #include "libaegisub/option.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <fstream>
 #include <map>
 #include <memory>
 #include <sstream>
-#endif
 
 #include "libaegisub/cajun/reader.h"
 #include "libaegisub/cajun/writer.h"
diff --git a/aegisub/libaegisub/common/option_visit.cpp b/aegisub/libaegisub/common/option_visit.cpp
index b1d8bd82c..60bbca8f4 100644
--- a/aegisub/libaegisub/common/option_visit.cpp
+++ b/aegisub/libaegisub/common/option_visit.cpp
@@ -21,10 +21,8 @@
 
 #include "option_visit.h"
 
-#ifndef LAGI_PRE
 #include <cassert>
 #include <cmath>
-#endif
 
 #include <libaegisub/color.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/libaegisub/common/option_visit.h b/aegisub/libaegisub/common/option_visit.h
index 82d8a5693..3468c05e7 100644
--- a/aegisub/libaegisub/common/option_visit.h
+++ b/aegisub/libaegisub/common/option_visit.h
@@ -21,9 +21,7 @@
 #include "libaegisub/cajun/elements.h"
 #include "libaegisub/cajun/visitor.h"
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 namespace agi {
 
diff --git a/aegisub/libaegisub/common/parser.h b/aegisub/libaegisub/common/parser.h
index f5e07f855..d83ffb0bd 100644
--- a/aegisub/libaegisub/common/parser.h
+++ b/aegisub/libaegisub/common/parser.h
@@ -12,9 +12,7 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
 	struct Color;
diff --git a/aegisub/libaegisub/common/thesaurus.cpp b/aegisub/libaegisub/common/thesaurus.cpp
index dfbfc9020..956fb144a 100644
--- a/aegisub/libaegisub/common/thesaurus.cpp
+++ b/aegisub/libaegisub/common/thesaurus.cpp
@@ -26,9 +26,7 @@
 #include <boost/phoenix/operator/comparison.hpp>
 #include <boost/phoenix/core/argument.hpp>
 
-#ifndef LAGI_PRE
 #include <cstdlib>
-#endif
 
 using boost::phoenix::placeholders::_1;
 
diff --git a/aegisub/libaegisub/common/util.cpp b/aegisub/libaegisub/common/util.cpp
index 3a96d6452..a3beb3bd7 100644
--- a/aegisub/libaegisub/common/util.cpp
+++ b/aegisub/libaegisub/common/util.cpp
@@ -16,13 +16,11 @@
 /// @brief Unix utility methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <errno.h>
 
 #include <climits>
 #include <cstdio>
 #include <locale>
-#endif
 
 #include "libaegisub/util.h"
 
diff --git a/aegisub/libaegisub/common/vfr.cpp b/aegisub/libaegisub/common/vfr.cpp
index 9bbd041ec..897c26850 100644
--- a/aegisub/libaegisub/common/vfr.cpp
+++ b/aegisub/libaegisub/common/vfr.cpp
@@ -18,14 +18,12 @@
 
 #include "libaegisub/vfr.h"
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <cmath>
 #include <functional>
 #include <iterator>
 #include <list>
 #include <numeric>
-#endif
 
 #include "libaegisub/charset.h"
 #include "libaegisub/io.h"
diff --git a/aegisub/libaegisub/config.h b/aegisub/libaegisub/config.h
index 8783afd83..349f61158 100644
--- a/aegisub/libaegisub/config.h
+++ b/aegisub/libaegisub/config.h
@@ -1,4 +1,3 @@
-#ifndef LAGI_PRE
 
 #ifdef _WIN32 // Windows specific settings
 #define HAVE_PTHREAD 1
@@ -8,4 +7,3 @@
 #include "../acconf.h"
 
 #endif // _WIN32
-#endif // LAGI_PRE
diff --git a/aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h b/aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h
index 0a5e4e865..2e8ca7e51 100644
--- a/aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h
+++ b/aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h
@@ -14,9 +14,7 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 #undef ERROR
 
diff --git a/aegisub/libaegisub/include/libaegisub/background_runner.h b/aegisub/libaegisub/include/libaegisub/background_runner.h
index 69e942fa5..ee0298cbd 100644
--- a/aegisub/libaegisub/include/libaegisub/background_runner.h
+++ b/aegisub/libaegisub/include/libaegisub/background_runner.h
@@ -18,11 +18,9 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstdint>
 #include <functional>
 #include <string>
-#endif
 
 namespace agi {
 	/// @class ProgressSink
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.h b/aegisub/libaegisub/include/libaegisub/cajun/elements.h
index b63104032..acf79f5c9 100644
--- a/aegisub/libaegisub/include/libaegisub/cajun/elements.h
+++ b/aegisub/libaegisub/include/libaegisub/cajun/elements.h
@@ -8,14 +8,12 @@ Author: Terry Caton
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstdint>
 #include <deque>
 #include <list>
 #include <map>
 #include <string>
 #include <stdexcept>
-#endif
 
 namespace json
 {
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/reader.h b/aegisub/libaegisub/include/libaegisub/cajun/reader.h
index caa1284d1..794859870 100644
--- a/aegisub/libaegisub/include/libaegisub/cajun/reader.h
+++ b/aegisub/libaegisub/include/libaegisub/cajun/reader.h
@@ -10,10 +10,8 @@ Author: Terry Caton
 
 #include "elements.h"
 
-#ifndef LAGI_PRE
 #include <iostream>
 #include <vector>
-#endif
 
 namespace json
 {
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/writer.h b/aegisub/libaegisub/include/libaegisub/cajun/writer.h
index 156b5a73f..42e73b103 100644
--- a/aegisub/libaegisub/include/libaegisub/cajun/writer.h
+++ b/aegisub/libaegisub/include/libaegisub/cajun/writer.h
@@ -11,9 +11,7 @@ Author: Terry Caton
 #include "elements.h"
 #include "visitor.h"
 
-#ifndef LAGI_PRE
 #include <ostream>
-#endif
 
 namespace json {
 
diff --git a/aegisub/libaegisub/include/libaegisub/calltip_provider.h b/aegisub/libaegisub/include/libaegisub/calltip_provider.h
index af7ab734e..3c563cda2 100644
--- a/aegisub/libaegisub/include/libaegisub/calltip_provider.h
+++ b/aegisub/libaegisub/include/libaegisub/calltip_provider.h
@@ -14,11 +14,9 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef LAGI_PRE
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 	namespace ass { struct DialogueToken; }
diff --git a/aegisub/libaegisub/include/libaegisub/charset.h b/aegisub/libaegisub/include/libaegisub/charset.h
index 4c521538d..971a3ee08 100644
--- a/aegisub/libaegisub/include/libaegisub/charset.h
+++ b/aegisub/libaegisub/include/libaegisub/charset.h
@@ -16,12 +16,10 @@
 /// @brief Character set detection and manipulation utilities.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <functional>
 #include <string>
 #include <vector>
-#endif
 #include <libaegisub/exception.h>
 
 namespace agi {
diff --git a/aegisub/libaegisub/include/libaegisub/charset_conv.h b/aegisub/libaegisub/include/libaegisub/charset_conv.h
index b95b6aff2..e90e16a38 100644
--- a/aegisub/libaegisub/include/libaegisub/charset_conv.h
+++ b/aegisub/libaegisub/include/libaegisub/charset_conv.h
@@ -18,11 +18,9 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <cstring>
 #include <string>
 #include <vector>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>
diff --git a/aegisub/libaegisub/include/libaegisub/color.h b/aegisub/libaegisub/include/libaegisub/color.h
index c6abe6ab0..d84427e51 100644
--- a/aegisub/libaegisub/include/libaegisub/color.h
+++ b/aegisub/libaegisub/include/libaegisub/color.h
@@ -14,9 +14,7 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
 	struct Color {
diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/aegisub/libaegisub/include/libaegisub/hotkey.h
index ac1c75e4f..6fd0dcff9 100644
--- a/aegisub/libaegisub/include/libaegisub/hotkey.h
+++ b/aegisub/libaegisub/include/libaegisub/hotkey.h
@@ -16,12 +16,10 @@
 /// @brief Hotkey handler
 /// @ingroup hotkey menu event window
 
-#ifndef LAGI_PRE
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/io.h b/aegisub/libaegisub/include/libaegisub/io.h
index c7bb01ac4..ca9c5e02c 100644
--- a/aegisub/libaegisub/include/libaegisub/io.h
+++ b/aegisub/libaegisub/include/libaegisub/io.h
@@ -16,10 +16,8 @@
 /// @brief Public interface for IO methods.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <string>
 #include <fstream>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/keyframe.h b/aegisub/libaegisub/include/libaegisub/keyframe.h
index 6737ff2a6..55523e490 100644
--- a/aegisub/libaegisub/include/libaegisub/keyframe.h
+++ b/aegisub/libaegisub/include/libaegisub/keyframe.h
@@ -17,9 +17,7 @@
 /// @ingroup libaegisub
 ///
 
-#ifndef LAGI_PRE
 #include <vector>
-#endif
 
 #include "exception.h"
 
diff --git a/aegisub/libaegisub/include/libaegisub/line_iterator.h b/aegisub/libaegisub/include/libaegisub/line_iterator.h
index 21cf12ce4..f8c96aa5a 100644
--- a/aegisub/libaegisub/include/libaegisub/line_iterator.h
+++ b/aegisub/libaegisub/include/libaegisub/line_iterator.h
@@ -18,13 +18,11 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <iterator>
 #include <memory>
 #include <sstream>
 
 #include <cstdint>
-#endif
 
 #include <libaegisub/charset_conv.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/line_wrap.h b/aegisub/libaegisub/include/libaegisub/line_wrap.h
index 8d007231a..e922e0faa 100644
--- a/aegisub/libaegisub/include/libaegisub/line_wrap.h
+++ b/aegisub/libaegisub/include/libaegisub/line_wrap.h
@@ -15,12 +15,10 @@
 /// @file line_wrap.h
 /// @brief Generic paragraph formatting logic
 
-#ifndef LAGI_PRE
 #include <algorithm>
 #include <climits>
 #include <numeric>
 #include <vector>
-#endif
 
 namespace agi {
 	enum WrapMode {
diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h
index 5c5a78a35..ae5e2b602 100644
--- a/aegisub/libaegisub/include/libaegisub/log.h
+++ b/aegisub/libaegisub/include/libaegisub/log.h
@@ -16,7 +16,6 @@
 /// @brief Logging
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <cstdio>
@@ -31,7 +30,6 @@
 # include <strstream>
 #endif
 #include <vector>
-#endif
 #include <libaegisub/types.h>
 
 // These macros below aren't a perm solution, it will depend on how annoying they are through
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h b/aegisub/libaegisub/include/libaegisub/mru.h
index 3632cfc62..62a2f76e9 100644
--- a/aegisub/libaegisub/include/libaegisub/mru.h
+++ b/aegisub/libaegisub/include/libaegisub/mru.h
@@ -16,12 +16,10 @@
 /// @brief Public interface for MRU (Most Recently Used) lists.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <deque>
 #include <fstream>
 #include <list>
 #include <map>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/aegisub/libaegisub/include/libaegisub/option.h
index 678024697..245cd31b5 100644
--- a/aegisub/libaegisub/include/libaegisub/option.h
+++ b/aegisub/libaegisub/include/libaegisub/option.h
@@ -18,10 +18,8 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <fstream>
 #include <map>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h
index 45092b86b..872c2735f 100644
--- a/aegisub/libaegisub/include/libaegisub/option_value.h
+++ b/aegisub/libaegisub/include/libaegisub/option_value.h
@@ -16,12 +16,10 @@
 /// @brief Container for holding an actual option value.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <fstream>
 #include <vector>
-#endif
 
 #include <libaegisub/color.h>
 #include <libaegisub/exception.h>
diff --git a/aegisub/libaegisub/include/libaegisub/signal.h b/aegisub/libaegisub/include/libaegisub/signal.h
index 770493efb..35dd22248 100644
--- a/aegisub/libaegisub/include/libaegisub/signal.h
+++ b/aegisub/libaegisub/include/libaegisub/signal.h
@@ -18,12 +18,10 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <boost/container/map.hpp>
 
 #include <functional>
 #include <memory>
-#endif
 
 namespace agi {
 	namespace signal {
diff --git a/aegisub/libaegisub/include/libaegisub/spellchecker.h b/aegisub/libaegisub/include/libaegisub/spellchecker.h
index e3418ac29..4dbb41955 100644
--- a/aegisub/libaegisub/include/libaegisub/spellchecker.h
+++ b/aegisub/libaegisub/include/libaegisub/spellchecker.h
@@ -16,10 +16,8 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 class SpellChecker {
diff --git a/aegisub/libaegisub/include/libaegisub/thesaurus.h b/aegisub/libaegisub/include/libaegisub/thesaurus.h
index 213b743b0..5b551513c 100644
--- a/aegisub/libaegisub/include/libaegisub/thesaurus.h
+++ b/aegisub/libaegisub/include/libaegisub/thesaurus.h
@@ -18,12 +18,10 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef LAGI_PRE
 #include <iosfwd>
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 namespace agi {
 
diff --git a/aegisub/libaegisub/include/libaegisub/types.h b/aegisub/libaegisub/include/libaegisub/types.h
index edaf28c70..85ac1d9ef 100644
--- a/aegisub/libaegisub/include/libaegisub/types.h
+++ b/aegisub/libaegisub/include/libaegisub/types.h
@@ -16,14 +16,12 @@
 /// @brief Platform specific types.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #else
 #  include <time.h>
 #endif
 
-#endif // LAGI_PRE
 
 #pragma once
 
diff --git a/aegisub/libaegisub/include/libaegisub/util.h b/aegisub/libaegisub/include/libaegisub/util.h
index 27665eff6..2e3c88d5c 100644
--- a/aegisub/libaegisub/include/libaegisub/util.h
+++ b/aegisub/libaegisub/include/libaegisub/util.h
@@ -16,12 +16,10 @@
 /// @brief Public interface for general utilities.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <cstdint>
 
 #include <string>
 #include <algorithm>
-#endif // LAGI_PRE
 
 #include <libaegisub/types.h>
 
diff --git a/aegisub/libaegisub/include/libaegisub/util_osx.h b/aegisub/libaegisub/include/libaegisub/util_osx.h
index 7527ed9a5..07f34efb0 100644
--- a/aegisub/libaegisub/include/libaegisub/util_osx.h
+++ b/aegisub/libaegisub/include/libaegisub/util_osx.h
@@ -28,9 +28,7 @@
 /// When linking with this library, be sure to add '-framework CoreFoundation'
 /// to the GCC commandline.
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 namespace agi {
     namespace util {
diff --git a/aegisub/libaegisub/include/libaegisub/util_win.h b/aegisub/libaegisub/include/libaegisub/util_win.h
index 130e99af1..72837d84f 100644
--- a/aegisub/libaegisub/include/libaegisub/util_win.h
+++ b/aegisub/libaegisub/include/libaegisub/util_win.h
@@ -16,9 +16,7 @@
 /// @brief Public interface for Windows utilities.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <string>
-#endif
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/aegisub/libaegisub/include/libaegisub/vfr.h b/aegisub/libaegisub/include/libaegisub/vfr.h
index 77bd76e3f..dbe99bff7 100644
--- a/aegisub/libaegisub/include/libaegisub/vfr.h
+++ b/aegisub/libaegisub/include/libaegisub/vfr.h
@@ -18,12 +18,10 @@
 
 #pragma once
 
-#ifndef LAGI_PRE
 #include <string>
 #include <vector>
 
 #include <cstdint>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h
index 1413fc259..b7df14e89 100644
--- a/aegisub/libaegisub/lagi_pre.h
+++ b/aegisub/libaegisub/lagi_pre.h
@@ -1,7 +1,5 @@
 #include "config.h"
 
-#define LAGI_PRE
-
 // Common C
 #include <cassert>
 #include <cerrno>
diff --git a/aegisub/libaegisub/unix/access.cpp b/aegisub/libaegisub/unix/access.cpp
index f201f3cc2..f2529fcfe 100644
--- a/aegisub/libaegisub/unix/access.cpp
+++ b/aegisub/libaegisub/unix/access.cpp
@@ -20,13 +20,11 @@
 
 #include "libaegisub/access.h"
 
-#ifndef LAGI_PRE
 #include <sys/stat.h>
 #include <errno.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <unistd.h>
 
diff --git a/aegisub/libaegisub/unix/log.cpp b/aegisub/libaegisub/unix/log.cpp
index 6435653bc..5d43807b0 100644
--- a/aegisub/libaegisub/unix/log.cpp
+++ b/aegisub/libaegisub/unix/log.cpp
@@ -18,11 +18,9 @@
 
 #include "config.h"
 
-#ifndef LAGI_PRE
 #include <cstdio>
 #include <ctime>
 #include <cstring>
-#endif
 
 #include <unistd.h>
 
diff --git a/aegisub/libaegisub/unix/util.cpp b/aegisub/libaegisub/unix/util.cpp
index 8fbbbece6..230561627 100644
--- a/aegisub/libaegisub/unix/util.cpp
+++ b/aegisub/libaegisub/unix/util.cpp
@@ -22,7 +22,6 @@
 
 #include "libaegisub/access.h"
 
-#ifndef LAGI_PRE
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/statvfs.h>
@@ -34,7 +33,6 @@
 
 #include <string>
 #include <fstream>
-#endif
 
 #include <string.h>
 
diff --git a/aegisub/libaegisub/windows/access.cpp b/aegisub/libaegisub/windows/access.cpp
index d90b299bd..394eeece9 100644
--- a/aegisub/libaegisub/windows/access.cpp
+++ b/aegisub/libaegisub/windows/access.cpp
@@ -16,12 +16,10 @@
 /// @brief Windows access methods.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <windows.h>
 
 #include <iostream>
 #include <fstream>
-#endif
 
 #include <libaegisub/access.h>
 
diff --git a/aegisub/libaegisub/windows/log_win.cpp b/aegisub/libaegisub/windows/log_win.cpp
index 8243ecbae..5f0478a43 100644
--- a/aegisub/libaegisub/windows/log_win.cpp
+++ b/aegisub/libaegisub/windows/log_win.cpp
@@ -16,11 +16,9 @@
 /// @brief Windows logging
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-#endif
 
 #include "libaegisub/log.h"
 
diff --git a/aegisub/libaegisub/windows/util_win.cpp b/aegisub/libaegisub/windows/util_win.cpp
index ba70c355b..2f55b2e53 100644
--- a/aegisub/libaegisub/windows/util_win.cpp
+++ b/aegisub/libaegisub/windows/util_win.cpp
@@ -16,7 +16,6 @@
 /// @brief Windows utility methods.
 /// @ingroup libaegisub windows
 
-#ifndef LAGI_PRE
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -24,7 +23,6 @@
 #include <fstream>
 
 #include <windows.h>
-#endif
 
 #include "libaegisub/access.h"
 #include "libaegisub/charset_conv_win.h"
diff --git a/aegisub/src/aegisub_endian.h b/aegisub/src/aegisub_endian.h
index c353a3519..a1f91c87a 100644
--- a/aegisub/src/aegisub_endian.h
+++ b/aegisub/src/aegisub_endian.h
@@ -70,9 +70,7 @@
 # endif
 #endif
 
-#ifndef AGI_PRE
 #include <cstdint>
-#endif
 
 
 /// DOCME
diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp
index beece3a02..b9ad27c34 100644
--- a/aegisub/src/aegisublocale.cpp
+++ b/aegisub/src/aegisublocale.cpp
@@ -36,7 +36,6 @@
 
 #include "aegisublocale.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <clocale>
 #include <functional>
@@ -46,7 +45,6 @@
 #include <wx/intl.h>
 #include <wx/stdpaths.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include "standard_paths.h"
 
diff --git a/aegisub/src/aegisublocale.h b/aegisub/src/aegisublocale.h
index e8a64cf63..8c458729b 100644
--- a/aegisub/src/aegisublocale.h
+++ b/aegisub/src/aegisublocale.h
@@ -32,9 +32,7 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 class wxTranslations;
 
diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 2ae26a4f5..dea020aee 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -50,8 +50,6 @@
 
 #include "../libaegisub/lagi_pre.h"
 
-#define AGI_PRE
-
 // General headers
 #include <array>
 #include <clocale>
diff --git a/aegisub/src/ass_attachment.cpp b/aegisub/src/ass_attachment.cpp
index c0b9ba830..91edd812e 100644
--- a/aegisub/src/ass_attachment.cpp
+++ b/aegisub/src/ass_attachment.cpp
@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 
 #include <istream>
-#endif
 
 #include "ass_attachment.h"
 
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index c05d54696..3c6f1f573 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -32,10 +32,8 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <memory>
 #include <vector>
-#endif
 
 #include "ass_entry.h"
 
diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index f21dd7e1a..2e1a86a95 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -33,14 +33,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <fstream>
 #include <list>
 #include <vector>
 
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_override.h"
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index 06361d0f0..dfa29e725 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -32,9 +32,7 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "ass_entry.h"
 #include "ass_time.h"
diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h
index 265ed06b2..3e837bad1 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 #include <boost/intrusive/list_hook.hpp>
 
diff --git a/aegisub/src/ass_export_filter.cpp b/aegisub/src/ass_export_filter.cpp
index 7b6eaafcb..b60cee1b0 100644
--- a/aegisub/src/ass_export_filter.cpp
+++ b/aegisub/src/ass_export_filter.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "ass_export_filter.h"
 #include "utils.h"
diff --git a/aegisub/src/ass_export_filter.h b/aegisub/src/ass_export_filter.h
index 5b24a744d..54da5520e 100644
--- a/aegisub/src/ass_export_filter.h
+++ b/aegisub/src/ass_export_filter.h
@@ -34,13 +34,11 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <memory>
 #include <vector>
 
 #include <wx/string.h>
 #include <wx/window.h>
-#endif
 
 class AssFile;
 class AssExportFilter;
diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp
index e19626921..b85482f42 100644
--- a/aegisub/src/ass_exporter.cpp
+++ b/aegisub/src/ass_exporter.cpp
@@ -41,9 +41,7 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 static inline FilterList::const_iterator filter_list_begin() {
 	return AssExportFilterChain::GetFilterList()->begin();
diff --git a/aegisub/src/ass_exporter.h b/aegisub/src/ass_exporter.h
index d27b13d0a..7329216e8 100644
--- a/aegisub/src/ass_exporter.h
+++ b/aegisub/src/ass_exporter.h
@@ -32,14 +32,12 @@
 /// @ingroup export
 ///
 
-#ifndef AGI_PRE
 #include <wx/arrstr.h>
 #include <wx/sizer.h>
 #include <wx/string.h>
 
 #include <map>
 #include <vector>
-#endif
 
 class AssExportFilter;
 class AssFile;
diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index eb05f2899..276f6154c 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -35,7 +35,6 @@
 
 #include "ass_file.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <fstream>
 #include <inttypes.h>
@@ -44,7 +43,6 @@
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "ass_attachment.h"
 #include "ass_dialogue.h"
diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h
index 73275dc57..67d89768f 100644
--- a/aegisub/src/ass_file.h
+++ b/aegisub/src/ass_file.h
@@ -32,14 +32,12 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <boost/container/list.hpp>
 
 #include <set>
 #include <vector>
 
 #include <wx/arrstr.h>
-#endif
 
 #include <boost/intrusive/list.hpp>
 
diff --git a/aegisub/src/ass_karaoke.cpp b/aegisub/src/ass_karaoke.cpp
index 2a8238840..303c4caca 100644
--- a/aegisub/src/ass_karaoke.cpp
+++ b/aegisub/src/ass_karaoke.cpp
@@ -29,9 +29,7 @@
 #include "include/aegisub/context.h"
 #include "selection_controller.h"
 
-#ifndef AGI_PRE
 #include <wx/intl.h>
-#endif
 
 wxString AssKaraoke::Syllable::GetText(bool k_tag) const {
 	wxString ret;
diff --git a/aegisub/src/ass_karaoke.h b/aegisub/src/ass_karaoke.h
index 164c13d9b..acb56511e 100644
--- a/aegisub/src/ass_karaoke.h
+++ b/aegisub/src/ass_karaoke.h
@@ -20,13 +20,11 @@
 ///
 
 
-#ifndef AGI_PRE
 #include <map>
 #include <set>
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp
index af8060f7c..ea12c14c2 100644
--- a/aegisub/src/ass_override.cpp
+++ b/aegisub/src/ass_override.cpp
@@ -35,10 +35,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/log.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/ass_override.h b/aegisub/src/ass_override.h
index 2818cb978..b1461de98 100644
--- a/aegisub/src/ass_override.h
+++ b/aegisub/src/ass_override.h
@@ -32,9 +32,7 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "variable_data.h"
 
diff --git a/aegisub/src/ass_parser.cpp b/aegisub/src/ass_parser.cpp
index c687a17ef..e06b08c58 100644
--- a/aegisub/src/ass_parser.cpp
+++ b/aegisub/src/ass_parser.cpp
@@ -22,11 +22,9 @@
 #include "ass_style.h"
 #include "subtitle_format.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/log.h>
-#endif
 
 AssParser::AssParser(AssFile *target, int version)
 : target(target)
diff --git a/aegisub/src/ass_parser.h b/aegisub/src/ass_parser.h
index 6b36abb33..eabb2dbd6 100644
--- a/aegisub/src/ass_parser.h
+++ b/aegisub/src/ass_parser.h
@@ -12,13 +12,11 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef AGI_PRE
 #include <array>
 #include <map>
 #include <memory>
 
 #include <wx/string.h>
-#endif
 
 #include "ass_entry.h"
 
diff --git a/aegisub/src/ass_style.cpp b/aegisub/src/ass_style.cpp
index e38a2d129..cf0dfd2e8 100644
--- a/aegisub/src/ass_style.cpp
+++ b/aegisub/src/ass_style.cpp
@@ -34,12 +34,10 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cctype>
 
 #include <wx/intl.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "ass_style.h"
 #include "compat.h"
diff --git a/aegisub/src/ass_style.h b/aegisub/src/ass_style.h
index 48a85efb1..395bddfef 100644
--- a/aegisub/src/ass_style.h
+++ b/aegisub/src/ass_style.h
@@ -32,11 +32,9 @@
 /// @ingroup subs_storage
 ///
 
-#ifndef AGI_PRE
 #include <array>
 
 #include <wx/colour.h>
-#endif
 
 #include "ass_entry.h"
 
diff --git a/aegisub/src/ass_style_storage.cpp b/aegisub/src/ass_style_storage.cpp
index 545c859dd..94929938c 100644
--- a/aegisub/src/ass_style_storage.cpp
+++ b/aegisub/src/ass_style_storage.cpp
@@ -36,9 +36,7 @@
 
 #include "ass_style_storage.h"
 
-#ifndef AGI_PRE
 #include <functional>
-#endif
 
 #include "ass_style.h"
 #include "standard_paths.h"
diff --git a/aegisub/src/ass_style_storage.h b/aegisub/src/ass_style_storage.h
index bfddea3af..532a5e31f 100644
--- a/aegisub/src/ass_style_storage.h
+++ b/aegisub/src/ass_style_storage.h
@@ -32,11 +32,9 @@
 /// @ingroup style_editor
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/arrstr.h>
-#endif
 
 class AssStyle;
 
diff --git a/aegisub/src/ass_time.cpp b/aegisub/src/ass_time.cpp
index 2149630ee..7c38b6634 100644
--- a/aegisub/src/ass_time.cpp
+++ b/aegisub/src/ass_time.cpp
@@ -36,12 +36,10 @@
 
 #include "ass_time.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cmath>
 
 #include <wx/tokenzr.h>
-#endif
 
 #include "utils.h"
 
diff --git a/aegisub/src/ass_time.h b/aegisub/src/ass_time.h
index 972425285..6849cc594 100644
--- a/aegisub/src/ass_time.h
+++ b/aegisub/src/ass_time.h
@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/vfr.h>
 
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index 4c1b7fa51..51e8cf7f3 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
 
 #include <wx/bmpbuttn.h>
@@ -49,7 +48,6 @@
 #include <wx/tglbtn.h>
 #include <wx/toolbar.h>
 #include <wx/laywin.h> // Keep this last so wxSW_3D is set.
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h
index 341beceb9..9761b2dce 100644
--- a/aegisub/src/audio_box.h
+++ b/aegisub/src/audio_box.h
@@ -32,9 +32,7 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/sashwin.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/audio_colorscheme.cpp b/aegisub/src/audio_colorscheme.cpp
index 5c3f2227d..d849c68d9 100644
--- a/aegisub/src/audio_colorscheme.cpp
+++ b/aegisub/src/audio_colorscheme.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "audio_colorscheme.h"
 
diff --git a/aegisub/src/audio_colorscheme.h b/aegisub/src/audio_colorscheme.h
index b5339ce1b..d526a1352 100644
--- a/aegisub/src/audio_colorscheme.h
+++ b/aegisub/src/audio_colorscheme.h
@@ -34,11 +34,9 @@
 /// Manage colour schemes for the audio display
 
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/colour.h>
-#endif
 
 #include "utils.h"
 
diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp
index 7180c9a04..367d1ac8c 100644
--- a/aegisub/src/audio_controller.cpp
+++ b/aegisub/src/audio_controller.cpp
@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/filename.h>
-#endif
 
 #include <libaegisub/io.h>
 
diff --git a/aegisub/src/audio_controller.h b/aegisub/src/audio_controller.h
index de91dd25f..e63ed1814 100644
--- a/aegisub/src/audio_controller.h
+++ b/aegisub/src/audio_controller.h
@@ -33,7 +33,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <cassert>
 #include <cstdint>
 #include <memory>
@@ -45,7 +44,6 @@
 #include <wx/timer.h>
 #include <wx/pen.h>
 #include <wx/power.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index 99e4b4af5..40cf6c515 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -37,13 +37,11 @@
 
 #include "audio_display.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>
 #include <wx/mousestate.h>
-#endif
 
 #include "ass_time.h"
 #include "audio_colorscheme.h"
diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index 0a1e417e7..586e4a4b3 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -33,7 +33,6 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 #include <map>
 #include <cstdint>
@@ -42,7 +41,6 @@
 #include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp
index 830ea09ea..cb5995c28 100644
--- a/aegisub/src/audio_karaoke.cpp
+++ b/aegisub/src/audio_karaoke.cpp
@@ -23,7 +23,6 @@
 
 #include "audio_karaoke.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <numeric>
 
@@ -36,7 +35,6 @@
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "include/aegisub/context.h"
 
diff --git a/aegisub/src/audio_karaoke.h b/aegisub/src/audio_karaoke.h
index 12859c829..c4a769b30 100644
--- a/aegisub/src/audio_karaoke.h
+++ b/aegisub/src/audio_karaoke.h
@@ -19,14 +19,12 @@
 /// @ingroup audio_ui
 ///
 
-#ifndef AGI_PRE
 #include <set>
 #include <vector>
 
 #include <wx/bitmap.h>
 #include <wx/timer.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/audio_marker.cpp b/aegisub/src/audio_marker.cpp
index 92d8cb658..58d9e05e7 100644
--- a/aegisub/src/audio_marker.cpp
+++ b/aegisub/src/audio_marker.cpp
@@ -28,9 +28,7 @@
 #include "pen.h"
 #include "video_context.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 class AudioMarkerKeyframe : public AudioMarker {
 	Pen *style;
diff --git a/aegisub/src/audio_marker.h b/aegisub/src/audio_marker.h
index c21b7ae5a..de4b98483 100644
--- a/aegisub/src/audio_marker.h
+++ b/aegisub/src/audio_marker.h
@@ -24,11 +24,9 @@
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 class AudioMarkerKeyframe;
 class Pen;
diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp
index df4e139d2..95a71a89a 100644
--- a/aegisub/src/audio_player_alsa.cpp
+++ b/aegisub/src/audio_player_alsa.cpp
@@ -46,11 +46,9 @@
 #include "frame_main.h"
 #include "main.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <inttypes.h>
-#endif
 
 class PthreadMutexLocker {
 	pthread_mutex_t &mutex;
diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h
index 69d073170..59adf9d66 100644
--- a/aegisub/src/audio_player_dsound.h
+++ b/aegisub/src/audio_player_dsound.h
@@ -34,9 +34,7 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#ifndef AGI_PRE
 #include <mmsystem.h>
-#endif
 
 #include <dsound.h>
 
diff --git a/aegisub/src/audio_player_dsound2.cpp b/aegisub/src/audio_player_dsound2.cpp
index 136c70dd9..51a086ef7 100644
--- a/aegisub/src/audio_player_dsound2.cpp
+++ b/aegisub/src/audio_player_dsound2.cpp
@@ -36,9 +36,7 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#ifndef AGI_PRE
 #include <mmsystem.h>
-#endif
 #include <process.h>
 #include <dsound.h>
 
diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h
index df8f09358..8b478562b 100644
--- a/aegisub/src/audio_player_openal.h
+++ b/aegisub/src/audio_player_openal.h
@@ -47,11 +47,9 @@
 #include <AL/alc.h>
 #endif
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/timer.h>
-#endif
 
 /// DOCME
 /// @class OpenALPlayer
diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp
index 4f85ad9cf..1de357811 100644
--- a/aegisub/src/audio_player_oss.cpp
+++ b/aegisub/src/audio_player_oss.cpp
@@ -34,9 +34,7 @@
 
 #ifdef WITH_OSS
 
-#ifndef AGI_PRE
 #include <sys/param.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h
index 42cfe0e66..8673e0de7 100644
--- a/aegisub/src/audio_player_oss.h
+++ b/aegisub/src/audio_player_oss.h
@@ -33,11 +33,9 @@
 ///
 
 #ifdef WITH_OSS
-#ifndef AGI_PRE
 #include <sys/ioctl.h>
 
 #include <wx/thread.h>
-#endif
 
 #include <fcntl.h>
 #ifdef HAVE_SOUNDCARD_H
diff --git a/aegisub/src/audio_player_portaudio.h b/aegisub/src/audio_player_portaudio.h
index 4f75c35cd..3faa7ab16 100644
--- a/aegisub/src/audio_player_portaudio.h
+++ b/aegisub/src/audio_player_portaudio.h
@@ -40,11 +40,9 @@ extern "C" {
 #include <portaudio.h>
 }
 
-#ifndef AGI_PRE
 #include <map>
 #include <string>
 #include <vector>
-#endif
 
 class wxArrayString;
 
diff --git a/aegisub/src/audio_player_pulse.cpp b/aegisub/src/audio_player_pulse.cpp
index 5b8f97eba..69a036396 100644
--- a/aegisub/src/audio_player_pulse.cpp
+++ b/aegisub/src/audio_player_pulse.cpp
@@ -36,11 +36,9 @@
 
 #ifdef WITH_LIBPULSE
 
-#ifndef AGI_PRE
 #include <cstdio>
 
 #include <wx/thread.h>
-#endif
 
 #include "audio_player_pulse.h"
 
diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp
index e01c6f8a2..567a7bf28 100644
--- a/aegisub/src/audio_provider.cpp
+++ b/aegisub/src/audio_provider.cpp
@@ -35,9 +35,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/thread.h>
-#endif
 
 #include "audio_controller.h"
 #ifdef WITH_AVISYNTH
diff --git a/aegisub/src/audio_provider_avs.cpp b/aegisub/src/audio_provider_avs.cpp
index cde51e340..0a72f2a74 100644
--- a/aegisub/src/audio_provider_avs.cpp
+++ b/aegisub/src/audio_provider_avs.cpp
@@ -36,12 +36,10 @@
 
 #ifdef WITH_AVISYNTH
 
-#ifndef AGI_PRE
 #include <Mmreg.h>
 #include <ctime>
 
 #include <wx/filename.h>
-#endif
 
 #include "audio_provider_avs.h"
 
diff --git a/aegisub/src/audio_provider_convert.cpp b/aegisub/src/audio_provider_convert.cpp
index 4c945c2fa..c493982d3 100644
--- a/aegisub/src/audio_provider_convert.cpp
+++ b/aegisub/src/audio_provider_convert.cpp
@@ -29,9 +29,7 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef AGI_PRE
 #include <limits>
-#endif
 
 /// Base class for all wrapping converters
 class AudioProviderConverter : public AudioProvider {
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 53a63b13b..a2d7b46c2 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -36,13 +36,11 @@
 
 #ifdef WITH_FFMS2
 
-#ifndef AGI_PRE
 #ifdef WIN32
 #include <objbase.h>
 #endif
 
 #include <map>
-#endif
 
 #include "audio_provider_ffmpegsource.h"
 
diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp
index f1ad633a2..db0f53d8a 100644
--- a/aegisub/src/audio_provider_hd.cpp
+++ b/aegisub/src/audio_provider_hd.cpp
@@ -34,10 +34,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/filefn.h>
 #include <wx/filename.h>
-#endif
 
 #include <libaegisub/background_runner.h>
 #include <libaegisub/io.h>
diff --git a/aegisub/src/audio_provider_hd.h b/aegisub/src/audio_provider_hd.h
index 0b96c9073..f2aae912a 100644
--- a/aegisub/src/audio_provider_hd.h
+++ b/aegisub/src/audio_provider_hd.h
@@ -32,9 +32,7 @@
 /// @ingroup audio_input
 ///
 
-#ifndef AGI_PRE
 #include <iosfwd>
-#endif
 
 #include "include/aegisub/audio_provider.h"
 
diff --git a/aegisub/src/audio_provider_lock.h b/aegisub/src/audio_provider_lock.h
index d879e7a5a..3315d0d64 100644
--- a/aegisub/src/audio_provider_lock.h
+++ b/aegisub/src/audio_provider_lock.h
@@ -20,9 +20,7 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef AGI_PRE
 #include <wx/thread.h>
-#endif
 
 class LockAudioProvider : public AudioProvider {
 	agi::scoped_ptr<const AudioProvider> source;
diff --git a/aegisub/src/audio_provider_pcm.cpp b/aegisub/src/audio_provider_pcm.cpp
index 375015c6c..7f92db21f 100644
--- a/aegisub/src/audio_provider_pcm.cpp
+++ b/aegisub/src/audio_provider_pcm.cpp
@@ -35,7 +35,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cassert>
 #include <cstdint>
 #ifndef __WINDOWS__
@@ -47,7 +46,6 @@
 #include <wx/file.h>
 #include <wx/filename.h>
 #include <wx/log.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/audio_provider_pcm.h b/aegisub/src/audio_provider_pcm.h
index a4d2983b3..6c29a0aaf 100644
--- a/aegisub/src/audio_provider_pcm.h
+++ b/aegisub/src/audio_provider_pcm.h
@@ -32,12 +32,10 @@
 /// @ingroup audio_input
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/file.h>
 #include <wx/thread.h>
-#endif
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/aegisub/src/audio_renderer.cpp b/aegisub/src/audio_renderer.cpp
index a74f8d0db..9c987c694 100644
--- a/aegisub/src/audio_renderer.cpp
+++ b/aegisub/src/audio_renderer.cpp
@@ -37,13 +37,11 @@
 
 #include "audio_renderer.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 
 #include <wx/bitmap.h>
 #include <wx/dcmemory.h>
-#endif
 
 #include "include/aegisub/audio_provider.h"
 
diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h
index d5c054e5e..b1e01420a 100644
--- a/aegisub/src/audio_renderer.h
+++ b/aegisub/src/audio_renderer.h
@@ -35,13 +35,11 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <memory>
 #include <vector>
 
 #include <wx/dc.h>
 #include <wx/gdicmn.h>
-#endif
 
 #include "audio_rendering_style.h"
 #include "block_cache.h"
diff --git a/aegisub/src/audio_renderer_spectrum.cpp b/aegisub/src/audio_renderer_spectrum.cpp
index ffb032bb1..fb6b5542d 100644
--- a/aegisub/src/audio_renderer_spectrum.cpp
+++ b/aegisub/src/audio_renderer_spectrum.cpp
@@ -45,13 +45,11 @@
 
 #include <libaegisub/log.h>
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/image.h>
 #include <wx/rawbmp.h>
 #include <wx/dcmemory.h>
-#endif
 
 /// Allocates blocks of derived data for the audio spectrum
 struct AudioSpectrumCacheBlockFactory {
diff --git a/aegisub/src/audio_renderer_spectrum.h b/aegisub/src/audio_renderer_spectrum.h
index e7aed684f..b0585cdc8 100644
--- a/aegisub/src/audio_renderer_spectrum.h
+++ b/aegisub/src/audio_renderer_spectrum.h
@@ -33,10 +33,8 @@
 ///
 /// Calculate and render a frequency-power spectrum for PCM audio data.
 
-#ifndef AGI_PRE
 #include <cstdint>
 #include <vector>
-#endif
 
 #include "audio_renderer.h"
 
diff --git a/aegisub/src/audio_renderer_waveform.cpp b/aegisub/src/audio_renderer_waveform.cpp
index 6ef15df7d..736049bd4 100644
--- a/aegisub/src/audio_renderer_waveform.cpp
+++ b/aegisub/src/audio_renderer_waveform.cpp
@@ -36,11 +36,9 @@
 
 #include "audio_renderer_waveform.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/dcmemory.h>
-#endif
 
 #include "audio_colorscheme.h"
 #include "block_cache.h"
diff --git a/aegisub/src/audio_renderer_waveform.h b/aegisub/src/audio_renderer_waveform.h
index 6070a0afb..9c0f0b575 100644
--- a/aegisub/src/audio_renderer_waveform.h
+++ b/aegisub/src/audio_renderer_waveform.h
@@ -33,10 +33,8 @@
 ///
 /// Render a waveform display of PCM audio data
 
-#ifndef AGI_PRE
 #include <cstdint>
 #include <vector>
-#endif
 
 class AudioColorScheme;
 
diff --git a/aegisub/src/audio_timing_dialogue.cpp b/aegisub/src/audio_timing_dialogue.cpp
index 2a938a11b..22bd500c3 100644
--- a/aegisub/src/audio_timing_dialogue.cpp
+++ b/aegisub/src/audio_timing_dialogue.cpp
@@ -32,10 +32,8 @@
 /// @ingroup audio_ui
 
 
-#ifndef AGI_PRE
 #include <cstdint>
 #include <wx/pen.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/audio_timing_karaoke.cpp b/aegisub/src/audio_timing_karaoke.cpp
index 0da941b01..69c1c8995 100644
--- a/aegisub/src/audio_timing_karaoke.cpp
+++ b/aegisub/src/audio_timing_karaoke.cpp
@@ -34,9 +34,7 @@
 #include "pen.h"
 #include "utils.h"
 
-#ifndef AGI_PRE
 #include <deque>
-#endif
 
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/filtered.hpp>
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index 4e04a368a..e553b0f80 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -36,7 +36,6 @@
 
 #include "auto4_base.h"
 
-#ifndef AGI_PRE
 #ifdef __WINDOWS__
 #include <tchar.h>
 #define WIN32_LEAN_AND_MEAN
@@ -54,7 +53,6 @@
 #include <wx/tokenzr.h>
 
 #include <tuple>
-#endif
 
 #ifndef __WINDOWS__
 #include <ft2build.h>
diff --git a/aegisub/src/auto4_base.h b/aegisub/src/auto4_base.h
index 068de46aa..97d5a037f 100644
--- a/aegisub/src/auto4_base.h
+++ b/aegisub/src/auto4_base.h
@@ -34,7 +34,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <deque>
 #include <vector>
 
@@ -46,7 +45,6 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
-#endif
 
 #include <libaegisub/background_runner.h>
 #include <libaegisub/exception.h>
diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp
index 30f7e5376..d1c3a361a 100644
--- a/aegisub/src/auto4_lua.cpp
+++ b/aegisub/src/auto4_lua.cpp
@@ -38,7 +38,6 @@
 
 #include "auto4_lua.h"
 
-#ifndef AGI_PRE
 #include <cassert>
 #include <cstdint>
 
@@ -52,7 +51,6 @@
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/access.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h
index ba9dbac09..a53434a6a 100644
--- a/aegisub/src/auto4_lua.h
+++ b/aegisub/src/auto4_lua.h
@@ -32,12 +32,10 @@
 /// @ingroup scripting
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/event.h>
 #include <wx/thread.h>
-#endif
 
 #include "auto4_base.h"
 
diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp
index 0c5285bda..b2ac57753 100644
--- a/aegisub/src/auto4_lua_assfile.cpp
+++ b/aegisub/src/auto4_lua_assfile.cpp
@@ -36,7 +36,6 @@
 
 #ifdef WITH_AUTO4_LUA
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cassert>
 
@@ -44,7 +43,6 @@
 #include <boost/range/algorithm_ext.hpp>
 
 #include <wx/log.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp
index b583435ba..eca10d941 100644
--- a/aegisub/src/auto4_lua_dialog.cpp
+++ b/aegisub/src/auto4_lua_dialog.cpp
@@ -39,7 +39,6 @@
 
 #include "auto4_lua.h"
 
-#ifndef AGI_PRE
 #include <cassert>
 
 #include <wx/button.h>
@@ -54,7 +53,6 @@
 #include <wx/valgen.h>
 #include <wx/valnum.h>
 #include <wx/window.h>
-#endif
 
 #include <cfloat>
 
diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/aegisub/src/auto4_lua_progresssink.cpp
index 9f5923755..c9157adbf 100644
--- a/aegisub/src/auto4_lua_progresssink.cpp
+++ b/aegisub/src/auto4_lua_progresssink.cpp
@@ -38,9 +38,7 @@
 
 #include "auto4_lua.h"
 
-#ifndef AGI_PRE
 #include <wx/filedlg.h>
-#endif
 
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lua.h"
diff --git a/aegisub/src/auto4_lua_scriptreader.h b/aegisub/src/auto4_lua_scriptreader.h
index 932ccb35d..deaec1442 100644
--- a/aegisub/src/auto4_lua_scriptreader.h
+++ b/aegisub/src/auto4_lua_scriptreader.h
@@ -17,9 +17,7 @@
 /// @ingroup scripting
 ///
 
-#ifndef AGI_PRE
 #include <istream>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index 969871f10..e6607a1f2 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cmath>
 #include <iterator>
@@ -44,7 +43,6 @@
 #include <wx/kbdstate.h>
 #include <wx/menu.h>
 #include <wx/sizer.h>
-#endif
 
 #include "base_grid.h"
 
diff --git a/aegisub/src/base_grid.h b/aegisub/src/base_grid.h
index d6d1d6ce3..23c65d996 100644
--- a/aegisub/src/base_grid.h
+++ b/aegisub/src/base_grid.h
@@ -35,13 +35,11 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <map>
 #include <vector>
 
 #include <wx/grid.h>
 #include <wx/scrolbar.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h
index dbb4d11a8..6a926fb74 100644
--- a/aegisub/src/block_cache.h
+++ b/aegisub/src/block_cache.h
@@ -33,11 +33,9 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <list>
 #include <vector>
-#endif
 
 /// @class BasicDataBlockFactory
 /// @brief Simple factory for allocating blocks for DataBlockCache
diff --git a/aegisub/src/charset_conv.cpp b/aegisub/src/charset_conv.cpp
index 2fec8cca1..01a796898 100644
--- a/aegisub/src/charset_conv.cpp
+++ b/aegisub/src/charset_conv.cpp
@@ -36,12 +36,10 @@
 
 #include "charset_conv.h"
 
-#ifndef AGI_PRE
 #include <cerrno>
 #include <cstdint>
 
 #include <wx/intl.h>
-#endif
 
 class AegisubCSConvImpl : public AegisubCSConv {
 public:
diff --git a/aegisub/src/charset_conv.h b/aegisub/src/charset_conv.h
index 879c823b1..cf40b3bbb 100644
--- a/aegisub/src/charset_conv.h
+++ b/aegisub/src/charset_conv.h
@@ -32,11 +32,9 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/string.h>
 #include <wx/strconv.h>
 #include <wx/thread.h>
-#endif
 
 #include <libaegisub/charset_conv.h>
 
diff --git a/aegisub/src/charset_detect.cpp b/aegisub/src/charset_detect.cpp
index 9ecd766ec..dcf0e14d9 100644
--- a/aegisub/src/charset_detect.cpp
+++ b/aegisub/src/charset_detect.cpp
@@ -34,14 +34,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <fstream>
 #include <list>
 
 #include <wx/arrstr.h>
 #include <wx/choicdlg.h>
 #include <wx/intl.h>
-#endif
 
 #include <libaegisub/charset.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/colorspace.h b/aegisub/src/colorspace.h
index 41ddd18ea..18296490e 100644
--- a/aegisub/src/colorspace.h
+++ b/aegisub/src/colorspace.h
@@ -32,10 +32,8 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/colour.h>
 #include <wx/string.h>
-#endif
 
 inline unsigned int clip_colorval(int val)
 {
diff --git a/aegisub/src/colour_button.cpp b/aegisub/src/colour_button.cpp
index d295544c7..fd29b7fa1 100644
--- a/aegisub/src/colour_button.cpp
+++ b/aegisub/src/colour_button.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/dcmemory.h>
-#endif
 
 #include "colour_button.h"
 
diff --git a/aegisub/src/colour_button.h b/aegisub/src/colour_button.h
index e1bc50edb..4fa49a429 100644
--- a/aegisub/src/colour_button.h
+++ b/aegisub/src/colour_button.h
@@ -32,9 +32,7 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/bmpbuttn.h>
-#endif
 
 #include <libaegisub/color.h>
 
diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp
index 51de63999..5819f1a29 100644
--- a/aegisub/src/command/app.cpp
+++ b/aegisub/src/command/app.cpp
@@ -36,9 +36,7 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/msgdlg.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 611f9a2ed..c11212e05 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -36,11 +36,9 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/automation.cpp b/aegisub/src/command/automation.cpp
index 4bda9b8c3..2e4b5a840 100644
--- a/aegisub/src/command/automation.cpp
+++ b/aegisub/src/command/automation.cpp
@@ -36,8 +36,6 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/command.cpp b/aegisub/src/command/command.cpp
index ca0f1cbb8..f470d9d55 100644
--- a/aegisub/src/command/command.cpp
+++ b/aegisub/src/command/command.cpp
@@ -23,9 +23,7 @@
 
 #include <libaegisub/log.h>
 
-#ifndef AGI_PRE
 #include <wx/intl.h>
-#endif
 
 namespace cmd {
 	static std::map<std::string, Command*> cmd_map;
diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h
index 1f0046d2e..c1977d99f 100644
--- a/aegisub/src/command/command.h
+++ b/aegisub/src/command/command.h
@@ -17,14 +17,12 @@
 /// @ingroup command
 
 
-#ifndef AGI_PRE
 #include <map>
 #include <string>
 #include <vector>
 
 #include <wx/bitmap.h>
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 20b1a4a0d..65d912e29 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -36,13 +36,11 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/clipbrd.h>
 #include <wx/fontdlg.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp
index e62c97d9c..1ba03e11f 100644
--- a/aegisub/src/command/help.cpp
+++ b/aegisub/src/command/help.cpp
@@ -36,9 +36,7 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/msgdlg.h>
-#endif
 
 #include <libaegisub/util_osx.h>
 
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index 5cc1dbc70..155d5dd20 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -20,9 +20,7 @@
 
 #include "icon.h"
 
-#ifndef AGI_PRE
 #include <map>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/command/icon.h b/aegisub/src/command/icon.h
index b9ea97abb..8a3d441a6 100644
--- a/aegisub/src/command/icon.h
+++ b/aegisub/src/command/icon.h
@@ -16,9 +16,7 @@
 /// @brief Icon for commands.
 /// @ingroup command
 
-#ifndef AGI_PRE
 #include <wx/bitmap.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index a8e7c7717..51c8eee71 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -36,10 +36,8 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/filedlg.h>
 #include <wx/filename.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp
index 57fec5893..546e98e21 100644
--- a/aegisub/src/command/recent.cpp
+++ b/aegisub/src/command/recent.cpp
@@ -34,12 +34,10 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <sstream>
 
 #include <wx/event.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index 453e63897..33cce608e 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -36,11 +36,9 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 #include <wx/filedlg.h>
 #include <wx/choicdlg.h>
-#endif
 
 #include <libaegisub/charset_conv.h>
 
diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp
index e2adb1f00..534505213 100644
--- a/aegisub/src/command/time.cpp
+++ b/aegisub/src/command/time.cpp
@@ -36,9 +36,7 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp
index 5a39ae674..d838be449 100644
--- a/aegisub/src/command/timecode.cpp
+++ b/aegisub/src/command/timecode.cpp
@@ -36,10 +36,8 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/filedlg.h>
 #include <wx/filename.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index 44f714008..f1edd6b69 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -36,9 +36,7 @@
 
 #include "../config.h"
 
-#ifndef AGI_PRE
 #include <wx/utils.h>
-#endif
 
 #include "command.h"
 
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index 84eeec4b3..d7509c5cf 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -38,10 +38,8 @@
 
 #include "command.h"
 
-#ifndef AGI_PRE
 #include <wx/clipbrd.h>
 #include <wx/filename.h>
-#endif
 
 #include "../ass_dialogue.h"
 #include "../ass_time.h"
diff --git a/aegisub/src/compat.cpp b/aegisub/src/compat.cpp
index 06f1ac398..7b2c104f4 100644
--- a/aegisub/src/compat.cpp
+++ b/aegisub/src/compat.cpp
@@ -1,9 +1,7 @@
 #include "compat.h"
 #include "main.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 wxArrayString lagi_MRU_wxAS(const wxString &list) {
 	const agi::MRUManager::MRUListMap *map = config::mru->Get(STD_STR(list));
diff --git a/aegisub/src/compat.h b/aegisub/src/compat.h
index a98b47fb8..88c3f39c7 100644
--- a/aegisub/src/compat.h
+++ b/aegisub/src/compat.h
@@ -1,11 +1,9 @@
-#ifndef AGI_PRE
 #include <string>
 #include <vector>
 
 #include <wx/colour.h>
 #include <wx/arrstr.h>
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/color.h>
 
diff --git a/aegisub/src/config.h b/aegisub/src/config.h
index 6ad25af2b..9467f9cda 100644
--- a/aegisub/src/config.h
+++ b/aegisub/src/config.h
@@ -1,6 +1,4 @@
-#ifndef AGI_PRE
 #ifndef _WIN32
 // Generated by configure.in
 #include "../acconf.h"
 #endif
-#endif // AGI_PRE
diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp
index c897c0b45..7a410d597 100644
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@@ -37,7 +37,6 @@
 // Includes
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
@@ -45,7 +44,6 @@
 #include <wx/statline.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "dialog_about.h"
 #include "libresrc/libresrc.h"
diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h
index 183c6593c..00a7fab88 100644
--- a/aegisub/src/dialog_about.h
+++ b/aegisub/src/dialog_about.h
@@ -32,9 +32,7 @@
 /// @ingroup configuration_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 /// @class AboutScreen
 /// @brief About dialogue.
diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
index 1a0f7d826..7b800bd45 100644
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@@ -36,14 +36,12 @@
 
 #include "dialog_attachments.h"
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/dirdlg.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/listctrl.h>
 #include <wx/sizer.h>
-#endif
 
 #include "ass_attachment.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_attachments.h b/aegisub/src/dialog_attachments.h
index 3f6e8edde..a85959128 100644
--- a/aegisub/src/dialog_attachments.h
+++ b/aegisub/src/dialog_attachments.h
@@ -37,9 +37,7 @@ class wxFileDialog;
 class wxListView;
 class wxListEvent;
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 #include "ass_entry.h"
 
diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index 53597e34c..f3799b978 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -35,7 +35,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/button.h>
@@ -44,7 +43,6 @@
 #include <wx/listctrl.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "dialog_automation.h"
 
diff --git a/aegisub/src/dialog_automation.h b/aegisub/src/dialog_automation.h
index e14487e9b..2843cb014 100644
--- a/aegisub/src/dialog_automation.h
+++ b/aegisub/src/dialog_automation.h
@@ -32,11 +32,9 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/dialog_autosave.cpp b/aegisub/src/dialog_autosave.cpp
index e733b690a..b7b73b819 100644
--- a/aegisub/src/dialog_autosave.cpp
+++ b/aegisub/src/dialog_autosave.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/range/adaptor/map.hpp>
 
-#ifndef AGI_PRE
 #include <map>
 
 #include <wx/button.h>
@@ -34,7 +33,6 @@
 #include <wx/listbox.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
-#endif
 
 DialogAutosave::DialogAutosave(wxWindow *parent)
 : wxDialog(parent, -1, _("Open autosave file"), wxDefaultPosition, wxSize(800, 350), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
diff --git a/aegisub/src/dialog_autosave.h b/aegisub/src/dialog_autosave.h
index a9f8528d4..4e9b9d15b 100644
--- a/aegisub/src/dialog_autosave.h
+++ b/aegisub/src/dialog_autosave.h
@@ -14,7 +14,6 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef AGI_PRE
 #include <cstdint>
 #include <map>
 #include <string>
@@ -22,7 +21,6 @@
 
 #include <wx/dialog.h>
 #include <wx/string.h>
-#endif
 
 class wxListBox;
 
diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 5fac7554f..61624b855 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cstdio>
 #include <vector>
 
@@ -59,7 +58,6 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/dialog_colorpicker.h b/aegisub/src/dialog_colorpicker.h
index a64e5e37d..983ba065c 100644
--- a/aegisub/src/dialog_colorpicker.h
+++ b/aegisub/src/dialog_colorpicker.h
@@ -32,9 +32,7 @@
 /// @ingroup tools_ui
 ///
 
-#ifndef AGI_PRE
 #include <functional>
-#endif
 
 namespace agi { struct Color; }
 class wxWindow;
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index aa389c479..555ebe83e 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 #include <wx/sizer.h>
 #include <wx/display.h> /// Must be included last.
-#endif
 
 #include "dialog_detached_video.h"
 
diff --git a/aegisub/src/dialog_detached_video.h b/aegisub/src/dialog_detached_video.h
index bda612458..607833c0e 100644
--- a/aegisub/src/dialog_detached_video.h
+++ b/aegisub/src/dialog_detached_video.h
@@ -32,9 +32,7 @@
 /// @ingroup main_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp
index 5f56e6d41..427d9f4e9 100644
--- a/aegisub/src/dialog_dummy_video.cpp
+++ b/aegisub/src/dialog_dummy_video.cpp
@@ -37,7 +37,6 @@
 
 #include "dialog_dummy_video.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/checkbox.h>
@@ -50,7 +49,6 @@
 #include <wx/stattext.h>
 #include <wx/string.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "colour_button.h"
 #include "compat.h"
diff --git a/aegisub/src/dialog_dummy_video.h b/aegisub/src/dialog_dummy_video.h
index 07e9a22d3..3da9a77eb 100644
--- a/aegisub/src/dialog_dummy_video.h
+++ b/aegisub/src/dialog_dummy_video.h
@@ -32,9 +32,7 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 class ColourButton;
 class wxButton;
diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp
index 2b4666abc..718378758 100644
--- a/aegisub/src/dialog_export.cpp
+++ b/aegisub/src/dialog_export.cpp
@@ -34,13 +34,11 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
 #include <wx/stattext.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "dialog_export.h"
 
diff --git a/aegisub/src/dialog_export.h b/aegisub/src/dialog_export.h
index 8b5f5f7f9..8c92b89ee 100644
--- a/aegisub/src/dialog_export.h
+++ b/aegisub/src/dialog_export.h
@@ -32,7 +32,6 @@
 /// @ingroup export
 ///
 
-#ifndef AGI_PRE
 #include <map>
 
 #include <wx/checklst.h>
@@ -42,7 +41,6 @@
 #include <wx/sizer.h>
 #include <wx/string.h>
 #include <wx/textctrl.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/dialog_export_ebu3264.cpp b/aegisub/src/dialog_export_ebu3264.cpp
index ac3a0deb8..c85393a7c 100644
--- a/aegisub/src/dialog_export_ebu3264.cpp
+++ b/aegisub/src/dialog_export_ebu3264.cpp
@@ -28,7 +28,6 @@
 #include "main.h"
 #include "text_file_writer.h"
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/msgdlg.h>
@@ -40,7 +39,6 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/valgen.h>
-#endif
 
 namespace {
 	const char timecode_regex[] = "([[:digit:]]{2}):([[:digit:]]{2}):([[:digit:]]{2}):([[:digit:]]{2})";
diff --git a/aegisub/src/dialog_export_ebu3264.h b/aegisub/src/dialog_export_ebu3264.h
index 39da9723a..853db28eb 100644
--- a/aegisub/src/dialog_export_ebu3264.h
+++ b/aegisub/src/dialog_export_ebu3264.h
@@ -19,9 +19,7 @@
 /// @see dialog_export_ebu3264.cpp
 /// @ingroup subtitle_io export
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/vfr.h>
 
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 5c620b0ed..43ef42874 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -39,7 +39,6 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/config.h>
 #include <wx/dirdlg.h>
@@ -54,7 +53,6 @@
 #include <wx/textctrl.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
-#endif
 
 enum FcMode {
 	CheckFontsOnly = 0,
diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h
index 5b3e351d1..9b1bfd5f6 100644
--- a/aegisub/src/dialog_fonts_collector.h
+++ b/aegisub/src/dialog_fonts_collector.h
@@ -19,9 +19,7 @@
 /// @ingroup tools_ui font_collector
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 
diff --git a/aegisub/src/dialog_jumpto.cpp b/aegisub/src/dialog_jumpto.cpp
index 5568b54fd..134496e5b 100644
--- a/aegisub/src/dialog_jumpto.cpp
+++ b/aegisub/src/dialog_jumpto.cpp
@@ -34,13 +34,11 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "dialog_jumpto.h"
 
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 5caa5b0e2..382cf4de2 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -37,7 +37,6 @@
 
 #include "dialog_kara_timing_copy.h"
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/checkbox.h>
@@ -50,7 +49,6 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/string.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h
index ff435eef6..baa78272b 100644
--- a/aegisub/src/dialog_kara_timing_copy.h
+++ b/aegisub/src/dialog_kara_timing_copy.h
@@ -32,12 +32,10 @@
 /// @ingroup tools_ui kara_timing_copy
 ///
 
-#ifndef AGI_PRE
 #include <list>
 #include <vector>
 
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 class AssDialogue;
diff --git a/aegisub/src/dialog_log.cpp b/aegisub/src/dialog_log.cpp
index 98648c148..affd9ad59 100644
--- a/aegisub/src/dialog_log.cpp
+++ b/aegisub/src/dialog_log.cpp
@@ -36,7 +36,6 @@
 
 #include "dialog_log.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <ctime>
 #include <functional>
@@ -46,7 +45,6 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/dialog_log.h b/aegisub/src/dialog_log.h
index a4a5ea8e9..896be8c70 100644
--- a/aegisub/src/dialog_log.h
+++ b/aegisub/src/dialog_log.h
@@ -32,9 +32,7 @@
 /// @ingroup libaegisub
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 namespace agi {
 	namespace log { class Emitter; }
diff --git a/aegisub/src/dialog_manager.h b/aegisub/src/dialog_manager.h
index f5d28c2eb..3e3394cf9 100644
--- a/aegisub/src/dialog_manager.h
+++ b/aegisub/src/dialog_manager.h
@@ -16,12 +16,10 @@
 /// @brief Manager for dialogs
 /// @ingroup utility
 
-#ifndef AGI_PRE
 #include <map>
 #include <typeinfo>
 
 #include <wx/dialog.h>
-#endif
 
 #include "utils.h"
 
diff --git a/aegisub/src/dialog_paste_over.cpp b/aegisub/src/dialog_paste_over.cpp
index ed973efe0..d8c998032 100644
--- a/aegisub/src/dialog_paste_over.cpp
+++ b/aegisub/src/dialog_paste_over.cpp
@@ -36,14 +36,12 @@
 
 #include "dialog_paste_over.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/button.h>
 #include <wx/checklst.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#endif
 
 #include "help_button.h"
 #include "main.h"
diff --git a/aegisub/src/dialog_paste_over.h b/aegisub/src/dialog_paste_over.h
index af65a373b..e970fc5ad 100644
--- a/aegisub/src/dialog_paste_over.h
+++ b/aegisub/src/dialog_paste_over.h
@@ -32,9 +32,7 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 class wxCheckListBox;
 
diff --git a/aegisub/src/dialog_progress.cpp b/aegisub/src/dialog_progress.cpp
index a6c17b78c..4a63f3108 100644
--- a/aegisub/src/dialog_progress.cpp
+++ b/aegisub/src/dialog_progress.cpp
@@ -26,13 +26,11 @@
 #include "compat.h"
 #include "utils.h"
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/gauge.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 wxDEFINE_EVENT(EVT_TITLE, wxThreadEvent);
 wxDEFINE_EVENT(EVT_MESSAGE, wxThreadEvent);
diff --git a/aegisub/src/dialog_progress.h b/aegisub/src/dialog_progress.h
index 40dac705c..5ad17bdeb 100644
--- a/aegisub/src/dialog_progress.h
+++ b/aegisub/src/dialog_progress.h
@@ -17,10 +17,8 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/timer.h>
-#endif
 
 #include <libaegisub/background_runner.h>
 #include <libaegisub/scoped_ptr.h>
diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp
index bf5537f50..f0fb68a1a 100644
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@@ -34,14 +34,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#endif
 
 #include "dialog_properties.h"
 
diff --git a/aegisub/src/dialog_properties.h b/aegisub/src/dialog_properties.h
index ae64333d0..72f516d6b 100644
--- a/aegisub/src/dialog_properties.h
+++ b/aegisub/src/dialog_properties.h
@@ -32,13 +32,11 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/textctrl.h>
-#endif
 
 class AssFile;
 namespace agi { struct Context; }
diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp
index 72ba309b0..34dbe9274 100644
--- a/aegisub/src/dialog_resample.cpp
+++ b/aegisub/src/dialog_resample.cpp
@@ -21,7 +21,6 @@
 
 #include "dialog_resample.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 
@@ -31,7 +30,6 @@
 #include <wx/statbox.h>
 #include <wx/stattext.h>
 #include <wx/valgen.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_resample.h b/aegisub/src/dialog_resample.h
index 4116c7c36..e1f01ecb9 100644
--- a/aegisub/src/dialog_resample.h
+++ b/aegisub/src/dialog_resample.h
@@ -17,9 +17,7 @@
 /// @ingroup tools_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 class AssFile;
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index ee21e3dd9..860b595cf 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -34,12 +34,10 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/regex.h>
 #include <wx/string.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_search_replace.h b/aegisub/src/dialog_search_replace.h
index bd73cb72d..76a1cc3e5 100644
--- a/aegisub/src/dialog_search_replace.h
+++ b/aegisub/src/dialog_search_replace.h
@@ -32,14 +32,12 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/dialog.h>
 #include <wx/radiobox.h>
 #include <wx/string.h>
 #include <wx/textctrl.h>
-#endif
 
 namespace agi { struct Context; }
 
diff --git a/aegisub/src/dialog_selected_choices.h b/aegisub/src/dialog_selected_choices.h
index 6d8df3930..2dccf5acc 100644
--- a/aegisub/src/dialog_selected_choices.h
+++ b/aegisub/src/dialog_selected_choices.h
@@ -31,13 +31,11 @@
 /// @brief wxMultiChoiceDialog with Select All and Select None
 /// @ingroup
 
-#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/choicdlg.h>
 #include <wx/event.h>
 #include <wx/listbox.h>
 #include <wx/sizer.h>
-#endif
 
 /// @class SelectedChoicesDialog
 /// @brief wxMultiChoiceDialog with Select All and Select None
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 6fad9c762..1751178d8 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -23,7 +23,6 @@
 
 #include "dialog_selection.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/checkbox.h>
@@ -33,7 +32,6 @@
 #include <wx/radiobut.h>
 #include <wx/regex.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_selection.h b/aegisub/src/dialog_selection.h
index 57ad08fcb..a7e477478 100644
--- a/aegisub/src/dialog_selection.h
+++ b/aegisub/src/dialog_selection.h
@@ -19,9 +19,7 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 class AssDialogue;
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 169c0090b..54b71af63 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -23,7 +23,6 @@
 
 #include "dialog_shift_times.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <vector>
 
@@ -34,7 +33,6 @@
 #include <wx/radiobut.h>
 #include <wx/sizer.h>
 #include <wx/textctrl.h>
-#endif
 
 #include <libaegisub/io.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/dialog_shift_times.h b/aegisub/src/dialog_shift_times.h
index 652c4baac..2efc8179f 100644
--- a/aegisub/src/dialog_shift_times.h
+++ b/aegisub/src/dialog_shift_times.h
@@ -19,11 +19,9 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index af5ae0ce2..92bf60656 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/intl.h>
@@ -30,7 +29,6 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "dialog_spellchecker.h"
 
diff --git a/aegisub/src/dialog_spellchecker.h b/aegisub/src/dialog_spellchecker.h
index ca8a0a666..0d06e9100 100644
--- a/aegisub/src/dialog_spellchecker.h
+++ b/aegisub/src/dialog_spellchecker.h
@@ -19,13 +19,11 @@
 /// @ingroup spelling
 ///
 
-#ifndef AGI_PRE
 #include <map>
 #include <set>
 
 #include <wx/dialog.h>
 #include <wx/arrstr.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index 509a0a8e6..19c6b204c 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -34,14 +34,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/bmpbuttn.h>
 #include <wx/colordlg.h>
 #include <wx/fontdlg.h>
 #include <wx/fontenum.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_style_editor.h b/aegisub/src/dialog_style_editor.h
index eddf88900..797786078 100644
--- a/aegisub/src/dialog_style_editor.h
+++ b/aegisub/src/dialog_style_editor.h
@@ -32,13 +32,11 @@
 /// @ingroup style_editor
 ///
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
 #include <wx/radiobox.h>
 #include <wx/spinctrl.h>
 #include <wx/textctrl.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 10dff8fb9..680f09cb3 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -35,7 +35,6 @@
 
 #include "dialog_style_manager.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 
@@ -49,7 +48,6 @@
 #include <wx/textdlg.h>
 #include <wx/tokenzr.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_style_manager.h b/aegisub/src/dialog_style_manager.h
index b2bdfb96e..bb6e9e03c 100644
--- a/aegisub/src/dialog_style_manager.h
+++ b/aegisub/src/dialog_style_manager.h
@@ -32,14 +32,12 @@
 /// @ingroup style_editor
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/button.h>
 #include <wx/combobox.h>
 #include <wx/dialog.h>
 #include <wx/listbox.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index 4458a128b..661c4d5b5 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -37,7 +37,6 @@
 #include "persist_location.h"
 #include "video_context.h"
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/colour.h>
 #include <wx/listbox.h>
@@ -45,7 +44,6 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 static void add_hotkey(wxSizer *sizer, wxWindow *parent, const char *command, wxString const& text) {
 	sizer->Add(new wxStaticText(parent, -1, text));
diff --git a/aegisub/src/dialog_styling_assistant.h b/aegisub/src/dialog_styling_assistant.h
index d928ece33..a33d7a339 100644
--- a/aegisub/src/dialog_styling_assistant.h
+++ b/aegisub/src/dialog_styling_assistant.h
@@ -21,10 +21,8 @@
 
 #include "selection_controller.h"
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/event.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp
index 50f69d59e..99396e7e2 100644
--- a/aegisub/src/dialog_text_import.cpp
+++ b/aegisub/src/dialog_text_import.cpp
@@ -36,11 +36,9 @@
 
 #include "dialog_text_import.h"
 
-#ifndef AGI_PRE
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "compat.h"
 #include "main.h"
diff --git a/aegisub/src/dialog_text_import.h b/aegisub/src/dialog_text_import.h
index 27bbfe6ef..a69446607 100644
--- a/aegisub/src/dialog_text_import.h
+++ b/aegisub/src/dialog_text_import.h
@@ -32,9 +32,7 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 class wxTextCtrl;
 
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 5f0cd0b3c..ca6f6df06 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -36,7 +36,6 @@
 
 #include "dialog_timing_processor.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 
@@ -50,7 +49,6 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/valnum.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/dialog_timing_processor.h b/aegisub/src/dialog_timing_processor.h
index a4341a3a5..827bf4d88 100644
--- a/aegisub/src/dialog_timing_processor.h
+++ b/aegisub/src/dialog_timing_processor.h
@@ -32,11 +32,9 @@
 /// @ingroup tools_ui
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 class AssDialogue;
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index 5c27bf17c..cd5c7369c 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -39,13 +39,11 @@
 #include "utils.h"
 #include "video_context.h"
 
-#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/msgdlg.h>
 #include <wx/sizer.h>
 #include <wx/settings.h>
 #include <wx/stattext.h>
-#endif
 
 static void add_hotkey(wxSizer *sizer, wxWindow *parent, const char *command, wxString const& text) {
 	sizer->Add(new wxStaticText(parent, -1, text));
diff --git a/aegisub/src/dialog_translation.h b/aegisub/src/dialog_translation.h
index 3155fead6..625a4c8ef 100644
--- a/aegisub/src/dialog_translation.h
+++ b/aegisub/src/dialog_translation.h
@@ -18,9 +18,7 @@
 /// @see dialog_translation.cpp
 /// @ingroup tools_ui
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>
diff --git a/aegisub/src/dialog_version_check.cpp b/aegisub/src/dialog_version_check.cpp
index f8940f7f2..9d73b66bc 100644
--- a/aegisub/src/dialog_version_check.cpp
+++ b/aegisub/src/dialog_version_check.cpp
@@ -39,12 +39,6 @@
 
 #include "dialog_version_check.h"
 
-#ifndef AGI_PRE
-#ifdef WIN32
-// Congratulation wx, you forgot to include a header somewhere
-#include <winsock2.h>
-#endif
-
 #include <wx/app.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>
@@ -68,7 +62,6 @@
 #include <memory>
 #include <set>
 #include <vector>
-#endif
 
 #include <wx/sstream.h>
 
diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp
index 67077292f..0f2043dfe 100644
--- a/aegisub/src/dialog_video_details.cpp
+++ b/aegisub/src/dialog_video_details.cpp
@@ -34,11 +34,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/dialog_video_details.h b/aegisub/src/dialog_video_details.h
index 9716db10c..dedff350d 100644
--- a/aegisub/src/dialog_video_details.h
+++ b/aegisub/src/dialog_video_details.h
@@ -32,9 +32,7 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
-#endif
 
 namespace agi { struct Context; }
 
diff --git a/aegisub/src/export_fixstyle.cpp b/aegisub/src/export_fixstyle.cpp
index ca0b39fba..a8967406a 100644
--- a/aegisub/src/export_fixstyle.cpp
+++ b/aegisub/src/export_fixstyle.cpp
@@ -36,10 +36,8 @@
 
 #include "export_fixstyle.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
-#endif
 
 #include "ass_file.h"
 #include "ass_dialogue.h"
diff --git a/aegisub/src/export_framerate.cpp b/aegisub/src/export_framerate.cpp
index 14affc37a..1e9f40830 100644
--- a/aegisub/src/export_framerate.cpp
+++ b/aegisub/src/export_framerate.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <utility>
 
 #include <wx/button.h>
@@ -44,7 +43,6 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h
index 76e650946..e5f53dc6a 100644
--- a/aegisub/src/factory_manager.h
+++ b/aegisub/src/factory_manager.h
@@ -34,14 +34,12 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cctype>
 #include <map>
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 template <class func>
 class FactoryBase {
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 4ad7bff00..f89a383dc 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -36,13 +36,11 @@
 
 #ifdef WITH_FFMS2
 
-#ifndef AGI_PRE
 #include <inttypes.h>
 #include <map>
 
 #include <wx/dir.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index 74403e298..ec037e6fa 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -34,12 +34,10 @@
 
 #ifdef WITH_FFMS2
 
-#ifndef AGI_PRE
 #include <map>
 
 #include <wx/filename.h>
 #include <wx/thread.h>
-#endif
 
 #include <ffms.h>
 
diff --git a/aegisub/src/fft.cpp b/aegisub/src/fft.cpp
index cde7de0fe..73ff910ef 100644
--- a/aegisub/src/fft.cpp
+++ b/aegisub/src/fft.cpp
@@ -36,9 +36,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
-#endif
 
 #include "fft.h"
 
diff --git a/aegisub/src/fft.h b/aegisub/src/fft.h
index 812a77362..48b8462ef 100644
--- a/aegisub/src/fft.h
+++ b/aegisub/src/fft.h
@@ -35,9 +35,7 @@
 
 
 
-#ifndef AGI_PRE
 #include <stdlib.h> // size_t
-#endif
 
 
 /// DOCME
diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp
index e474b98f5..c7094fe6d 100644
--- a/aegisub/src/font_file_lister.cpp
+++ b/aegisub/src/font_file_lister.cpp
@@ -31,11 +31,9 @@
 
 #include <libaegisub/of_type_adaptor.h>
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/intl.h>
-#endif
 
 using namespace std::placeholders;
 
diff --git a/aegisub/src/font_file_lister.h b/aegisub/src/font_file_lister.h
index a378371c0..ef1c41449 100644
--- a/aegisub/src/font_file_lister.h
+++ b/aegisub/src/font_file_lister.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <list>
 #include <map>
 #include <functional>
@@ -29,7 +28,6 @@
 #include <vector>
 
 #include <wx/string.h>
-#endif
 
 class AssDialogue;
 class AssFile;
diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/aegisub/src/font_file_lister_fontconfig.cpp
index 7633371ad..b383bdf2e 100644
--- a/aegisub/src/font_file_lister_fontconfig.cpp
+++ b/aegisub/src/font_file_lister_fontconfig.cpp
@@ -37,9 +37,7 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 
-#ifndef AGI_PRE
 #include <wx/intl.h>
-#endif
 
 namespace {
 FcConfig *init_fontconfig() {
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 30bf98c0c..6e4fc6c31 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -35,7 +35,6 @@
 
 #include "frame_main.h"
 
-#ifndef AGI_PRE
 #include <wx/clipbrd.h>
 #include <wx/dnd.h>
 #include <wx/filename.h>
@@ -43,7 +42,6 @@
 #include <wx/statline.h>
 #include <wx/sysopt.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h
index 2a2b4e89d..dc38637fe 100644
--- a/aegisub/src/frame_main.h
+++ b/aegisub/src/frame_main.h
@@ -32,7 +32,6 @@
 /// @ingroup main_ui
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/combobox.h>
@@ -42,7 +41,6 @@
 #include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/timer.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp
index 5d81c06ff..1b14e37ee 100644
--- a/aegisub/src/gl_text.cpp
+++ b/aegisub/src/gl_text.cpp
@@ -34,13 +34,11 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/bitmap.h>
 #include <wx/dcmemory.h>
 #include <wx/image.h>
 
 #include <algorithm>
-#endif
 
 #include "gl_text.h"
 #include "utils.h"
diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h
index ef3e0c4cf..3ac080138 100644
--- a/aegisub/src/gl_text.h
+++ b/aegisub/src/gl_text.h
@@ -32,7 +32,6 @@
 /// @ingroup video_output
 ///
 
-#ifndef AGI_PRE
 #include <boost/container/map.hpp>
 
 #include <memory>
@@ -40,7 +39,6 @@
 
 #include <wx/colour.h>
 #include <wx/font.h>
-#endif
 
 struct OpenGLTextGlyph;
 class OpenGLTextTexture;
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index aaba6b933..9df8ee707 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -24,7 +24,6 @@
 
 #include "gl_wrap.h"
 
-#ifndef AGI_PRE
 #include <wx/msgdlg.h>
 
 #ifdef HAVE_OPENGL_GL_H
@@ -34,7 +33,6 @@
 #include <GL/gl.h>
 #include "gl/glext.h"
 #endif
-#endif
 
 static const float deg2rad = 3.1415926536f / 180.f;
 static const float rad2deg = 180.f / 3.1415926536f;
diff --git a/aegisub/src/gl_wrap.h b/aegisub/src/gl_wrap.h
index 66a8ac51b..b870f9abb 100644
--- a/aegisub/src/gl_wrap.h
+++ b/aegisub/src/gl_wrap.h
@@ -21,9 +21,7 @@
 
 #include "vector2d.h"
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 class wxColour;
 
diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp
index ed0c71045..2030e2594 100644
--- a/aegisub/src/help_button.cpp
+++ b/aegisub/src/help_button.cpp
@@ -36,14 +36,12 @@
 
 #include "help_button.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 #include <map>
 
 #include <wx/filename.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/help_button.h b/aegisub/src/help_button.h
index 1eea5e441..f1ad1239f 100644
--- a/aegisub/src/help_button.h
+++ b/aegisub/src/help_button.h
@@ -32,10 +32,8 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 
 #include <wx/button.h>
-#endif
 
 /// DOCME
 /// @class HelpButton
diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp
index 179738e25..ee21543e2 100644
--- a/aegisub/src/hotkey_data_view_model.cpp
+++ b/aegisub/src/hotkey_data_view_model.cpp
@@ -32,14 +32,12 @@
 #include "include/aegisub/hotkey.h"
 #include "preferences.h"
 
-#ifndef AGI_PRE
 #include <wx/dataview.h>
 #include <wx/regex.h>
 
 #include <algorithm>
 #include <list>
 #include <set>
-#endif
 
 using namespace agi::hotkey;
 
diff --git a/aegisub/src/hotkey_data_view_model.h b/aegisub/src/hotkey_data_view_model.h
index 179637d5d..b073ec28c 100644
--- a/aegisub/src/hotkey_data_view_model.h
+++ b/aegisub/src/hotkey_data_view_model.h
@@ -19,9 +19,7 @@
 /// @ingroup hotkey configuration_ui
 ///
 
-#ifndef AGI_PRE
 #include <wx/dataview.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/include/aegisub/audio_provider.h b/aegisub/src/include/aegisub/audio_provider.h
index 171719a51..7e401b40a 100644
--- a/aegisub/src/include/aegisub/audio_provider.h
+++ b/aegisub/src/include/aegisub/audio_provider.h
@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include "factory_manager.h"
diff --git a/aegisub/src/include/aegisub/hotkey.h b/aegisub/src/include/aegisub/hotkey.h
index 395c98a5c..2779d5757 100644
--- a/aegisub/src/include/aegisub/hotkey.h
+++ b/aegisub/src/include/aegisub/hotkey.h
@@ -16,12 +16,10 @@
 /// @brief Hotkey handler
 /// @ingroup hotkey menu event window
 
-#ifndef AGI_PRE
 #include <string>
 #include <vector>
 
 #include <wx/event.h>
-#endif
 
 namespace agi {
 	struct Context;
diff --git a/aegisub/src/include/aegisub/menu.h b/aegisub/src/include/aegisub/menu.h
index 3c7b6e61a..510a2701f 100644
--- a/aegisub/src/include/aegisub/menu.h
+++ b/aegisub/src/include/aegisub/menu.h
@@ -16,9 +16,7 @@
 /// @brief Dynamic menu and toolbar generator.
 /// @ingroup menu toolbar
 
-#ifndef AGI_PRE
 #include <string>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/include/aegisub/toolbar.h b/aegisub/src/include/aegisub/toolbar.h
index 1d3749eb9..e7a64b836 100644
--- a/aegisub/src/include/aegisub/toolbar.h
+++ b/aegisub/src/include/aegisub/toolbar.h
@@ -16,9 +16,7 @@
 /// @brief Dynamic toolbar generator.
 /// @ingroup menu toolbar
 
-#ifndef AGI_PRE
 #include <string>
-#endif
 
 namespace agi { struct Context; }
 class wxFrame;
diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h
index 9fbd0e9f9..68b648267 100644
--- a/aegisub/src/include/aegisub/video_provider.h
+++ b/aegisub/src/include/aegisub/video_provider.h
@@ -37,9 +37,7 @@
 #include <libaegisub/exception.h>
 #include <libaegisub/vfr.h>
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 class AegiVideoFrame;
 
diff --git a/aegisub/src/kana_table.h b/aegisub/src/kana_table.h
index 4aad3d1d5..20a3b3483 100644
--- a/aegisub/src/kana_table.h
+++ b/aegisub/src/kana_table.h
@@ -32,11 +32,9 @@
 /// @ingroup kara_timing_copy
 ///
 
-#ifndef AGI_PRE
 #include <list>
 
 #include <wx/string.h>
-#endif
 
 /// @class KanaEntry
 /// @brief Base class for Kana + Romaji tuples.
diff --git a/aegisub/src/libresrc/libresrc.h b/aegisub/src/libresrc/libresrc.h
index 3b6eb6770..c3a4beabb 100644
--- a/aegisub/src/libresrc/libresrc.h
+++ b/aegisub/src/libresrc/libresrc.h
@@ -12,14 +12,12 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef AGI_PRE
 #include <string>
 
 #include <wx/bitmap.h>
 #include <wx/icon.h>
 #include <wx/image.h>
 #include <wx/mstream.h>
-#endif
 
 #include "bitmap.h"
 #include "default_config.h"
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index 9615e515d..1348526cb 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <sstream>
 
 #include <wx/clipbrd.h>
@@ -45,7 +44,6 @@
 #include <wx/msgdlg.h>
 #include <wx/stdpaths.h>
 #include <wx/utils.h>
-#endif
 
 #include "include/aegisub/menu.h"
 #include "command/command.h"
diff --git a/aegisub/src/main.h b/aegisub/src/main.h
index e99f3ecca..d2c14ba99 100644
--- a/aegisub/src/main.h
+++ b/aegisub/src/main.h
@@ -32,11 +32,9 @@
 /// @ingroup main
 ///
 
-#ifndef AGI_PRE
 #include <wx/app.h>
 #include <wx/file.h>
 #include <wx/stackwalk.h>
-#endif
 
 #include "aegisublocale.h"
 #include <libaegisub/mru.h>
diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp
index 92d899e2b..873c863e9 100644
--- a/aegisub/src/menu.cpp
+++ b/aegisub/src/menu.cpp
@@ -34,7 +34,6 @@
 #include <libaegisub/json.h>
 #include <libaegisub/log.h>
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <deque>
 #include <sstream>
@@ -45,7 +44,6 @@
 #include <wx/frame.h>
 #include <wx/menu.h>
 #include <wx/menuitem.h>
-#endif
 
 namespace {
 /// Window ID of first menu item
diff --git a/aegisub/src/mkv_wrap.cpp b/aegisub/src/mkv_wrap.cpp
index 5bb1850ba..715410c8b 100644
--- a/aegisub/src/mkv_wrap.cpp
+++ b/aegisub/src/mkv_wrap.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cerrno>
 #include <cstdint>
@@ -44,7 +43,6 @@
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include "mkv_wrap.h"
 
diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h
index 1357fbf5d..8007a0953 100644
--- a/aegisub/src/mkv_wrap.h
+++ b/aegisub/src/mkv_wrap.h
@@ -32,10 +32,8 @@
 /// @ingroup video_input
 ///
 
-#ifndef AGI_PRE
 #include <map>
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/pen.h b/aegisub/src/pen.h
index 3a17c4285..530e6c9d9 100644
--- a/aegisub/src/pen.h
+++ b/aegisub/src/pen.h
@@ -14,9 +14,7 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#ifndef AGI_PRE
 #include <wx/pen.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/persist_location.cpp b/aegisub/src/persist_location.cpp
index 84d579b84..901bf63df 100644
--- a/aegisub/src/persist_location.cpp
+++ b/aegisub/src/persist_location.cpp
@@ -24,10 +24,8 @@
 
 #include "main.h"
 
-#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/display.h>
-#endif
 
 PersistLocation::PersistLocation(wxDialog *dialog, std::string options_prefix, bool size_too)
 : x_opt(OPT_SET(options_prefix + "/Last/X"))
diff --git a/aegisub/src/persist_location.h b/aegisub/src/persist_location.h
index f433f6640..cb71e57dd 100644
--- a/aegisub/src/persist_location.h
+++ b/aegisub/src/persist_location.h
@@ -23,9 +23,7 @@ class wxDialog;
 class wxMoveEvent;
 class wxSizeEvent;
 
-#ifndef AGI_PRE
 #include <string>
-#endif
 
 /// @class PersistLocation
 /// @brief Automatically save and restore the location of a dialog
diff --git a/aegisub/src/placeholder_ctrl.h b/aegisub/src/placeholder_ctrl.h
index a88ade6e0..1ca3ff62f 100644
--- a/aegisub/src/placeholder_ctrl.h
+++ b/aegisub/src/placeholder_ctrl.h
@@ -18,9 +18,7 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/settings.h>
-#endif
 
 /// @class Placeholder
 /// @brief A wrapper around a control to add placeholder text
diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 10fdbaedd..31b261f47 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <iterator>
 
 #include <wx/checkbox.h>
@@ -34,7 +33,6 @@
 #include <wx/stdpaths.h>
 #include <wx/treebook.h>
 #include <wx/treebook.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/hotkey.h>
diff --git a/aegisub/src/preferences.h b/aegisub/src/preferences.h
index 579ebb191..0e6f9109e 100644
--- a/aegisub/src/preferences.h
+++ b/aegisub/src/preferences.h
@@ -17,13 +17,11 @@
 /// @see preferences.cpp
 /// @ingroup configuration_ui
 
-#ifndef AGI_PRE
 #include <deque>
 #include <functional>
 #include <map>
 
 #include <wx/dialog.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/preferences_base.cpp b/aegisub/src/preferences_base.cpp
index 7bb292ce4..c4bedb356 100644
--- a/aegisub/src/preferences_base.cpp
+++ b/aegisub/src/preferences_base.cpp
@@ -17,7 +17,6 @@
 /// @ingroup configuration_ui
 
 
-#ifndef AGI_PRE
 #include <wx/any.h>
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
@@ -32,7 +31,6 @@
 #include <wx/stdpaths.h>
 #include <wx/treebook.h>
 #include <wx/treebook.h>
-#endif
 
 #include "preferences_base.h"
 
diff --git a/aegisub/src/scintilla_text_ctrl.h b/aegisub/src/scintilla_text_ctrl.h
index c0d627b1d..aeef47c32 100644
--- a/aegisub/src/scintilla_text_ctrl.h
+++ b/aegisub/src/scintilla_text_ctrl.h
@@ -32,11 +32,9 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/stc/stc.h>
 
 #include <string>
-#endif
 
 /// DOCME
 /// @class ScintillaTextCtrl
diff --git a/aegisub/src/selection_controller.h b/aegisub/src/selection_controller.h
index 50c7aa798..d08dc8c7c 100644
--- a/aegisub/src/selection_controller.h
+++ b/aegisub/src/selection_controller.h
@@ -33,9 +33,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <set>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp
index 05e10d5b6..8e2642028 100644
--- a/aegisub/src/spellchecker_hunspell.cpp
+++ b/aegisub/src/spellchecker_hunspell.cpp
@@ -24,14 +24,12 @@
 
 #include "spellchecker_hunspell.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <iterator>
 #include <set>
 
 #include <wx/dir.h>
 #include <wx/filename.h>
-#endif
 
 #include <hunspell/hunspell.hxx>
 
diff --git a/aegisub/src/spellchecker_hunspell.h b/aegisub/src/spellchecker_hunspell.h
index e90d00d65..97be2f02b 100644
--- a/aegisub/src/spellchecker_hunspell.h
+++ b/aegisub/src/spellchecker_hunspell.h
@@ -26,9 +26,7 @@
 #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/spline.cpp b/aegisub/src/spline.cpp
index 7ca577ba1..57dc120ea 100644
--- a/aegisub/src/spline.cpp
+++ b/aegisub/src/spline.cpp
@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <limits>
 
 #include <wx/tokenzr.h>
-#endif
 
 #include "spline.h"
 
diff --git a/aegisub/src/spline.h b/aegisub/src/spline.h
index e7e2799d4..5ea4934ca 100644
--- a/aegisub/src/spline.h
+++ b/aegisub/src/spline.h
@@ -32,12 +32,10 @@
 /// @ingroup visual_ts
 ///
 
-#ifndef AGI_PRE
 #include <list>
 #include <vector>
 
 #include <wx/gdicmn.h>
-#endif
 
 #include "spline_curve.h"
 
diff --git a/aegisub/src/spline_curve.cpp b/aegisub/src/spline_curve.cpp
index 0269583bc..4d0d5a30a 100644
--- a/aegisub/src/spline_curve.cpp
+++ b/aegisub/src/spline_curve.cpp
@@ -37,10 +37,8 @@
 #include "spline_curve.h"
 #include "utils.h"
 
-#ifndef AGI_PRE
 #include <limits>
 #include <numeric>
-#endif
 
 SplineCurve::SplineCurve(Vector2D p1) : p1(p1), type(POINT) { }
 SplineCurve::SplineCurve(Vector2D p1, Vector2D p2) : p1(p1), p2(p2), type(LINE) { }
diff --git a/aegisub/src/spline_curve.h b/aegisub/src/spline_curve.h
index 9f7caa135..1a7cb8fa4 100644
--- a/aegisub/src/spline_curve.h
+++ b/aegisub/src/spline_curve.h
@@ -34,9 +34,7 @@
 
 #include "vector2d.h"
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 /// DOCME
 /// @class SplineCurve
diff --git a/aegisub/src/standard_paths.cpp b/aegisub/src/standard_paths.cpp
index 04921aac2..f75680b37 100644
--- a/aegisub/src/standard_paths.cpp
+++ b/aegisub/src/standard_paths.cpp
@@ -34,10 +34,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
-#endif
 
 #include "standard_paths.h"
 
diff --git a/aegisub/src/standard_paths.h b/aegisub/src/standard_paths.h
index 42e89974b..609b416ca 100644
--- a/aegisub/src/standard_paths.h
+++ b/aegisub/src/standard_paths.h
@@ -32,9 +32,7 @@
 /// @ingroup utility
 ///
 
-#ifndef AGI_PRE
 #include <map>
-#endif
 
 
 /// DOCME
diff --git a/aegisub/src/string_codec.h b/aegisub/src/string_codec.h
index 79fc0fd3d..d4b61db37 100644
--- a/aegisub/src/string_codec.h
+++ b/aegisub/src/string_codec.h
@@ -53,9 +53,7 @@
 /// The encoded string should be usable in any kind of field in an ASS file.
 
 
-#ifndef AGI_PRE
 #include <wx/string.h>
-#endif
 
 wxString inline_string_encode(const wxString &input);
 wxString inline_string_decode(const wxString &input);
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index f2fa73c74..6d9781e4c 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/button.h>
@@ -46,7 +45,6 @@
 #include <wx/fontdlg.h>
 #include <wx/radiobut.h>
 #include <wx/spinctrl.h>
-#endif
 
 #include "subs_edit_box.h"
 
diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h
index 4bb2dec59..1e82c10f7 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -32,14 +32,12 @@
 /// @ingroup main_ui
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 #include <boost/container/map.hpp>
 #include <vector>
 
 #include <wx/panel.h>
 #include <wx/timer.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index 7cb11216b..c1951027a 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -34,14 +34,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/clipbrd.h>
 #include <wx/intl.h>
 #include <wx/menu.h>
 #include <wx/settings.h>
-#endif
 
 #include "subs_edit_ctrl.h"
 
diff --git a/aegisub/src/subs_edit_ctrl.h b/aegisub/src/subs_edit_ctrl.h
index 9dc4bfdd2..e0a468baa 100644
--- a/aegisub/src/subs_edit_ctrl.h
+++ b/aegisub/src/subs_edit_ctrl.h
@@ -32,10 +32,8 @@
 /// @ingroup main_ui
 ///
 
-#ifndef AGI_PRE
 #include <string>
 #include <vector>
-#endif
 
 #include "scintilla_text_ctrl.h"
 
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 327b8ebb5..936cbf267 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <utility>
 
@@ -42,7 +41,6 @@
 #include <wx/filename.h>
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
-#endif
 
 #include "subs_grid.h"
 
diff --git a/aegisub/src/subs_grid.h b/aegisub/src/subs_grid.h
index bf48fd42a..c92f3e7a4 100644
--- a/aegisub/src/subs_grid.h
+++ b/aegisub/src/subs_grid.h
@@ -32,12 +32,10 @@
 /// @ingroup main_ui
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/grid.h>
 #include <wx/wx.h>
-#endif
 
 #include "base_grid.h"
 
diff --git a/aegisub/src/subs_preview.cpp b/aegisub/src/subs_preview.cpp
index a3633f370..0f766585d 100644
--- a/aegisub/src/subs_preview.cpp
+++ b/aegisub/src/subs_preview.cpp
@@ -35,11 +35,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/subs_preview.h b/aegisub/src/subs_preview.h
index 851364c1f..11c2ed53e 100644
--- a/aegisub/src/subs_preview.h
+++ b/aegisub/src/subs_preview.h
@@ -32,10 +32,8 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/window.h>
 #include <wx/bitmap.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index 15c3210a4..924f2b27d 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -36,10 +36,8 @@
 
 #include "subtitle_format.h"
 
-#ifndef AGI_PRE
 #include <wx/intl.h>
 #include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
-#endif
 
 #include "ass_attachment.h"
 #include "ass_dialogue.h"
diff --git a/aegisub/src/subtitle_format.h b/aegisub/src/subtitle_format.h
index 0e89bafab..5ad7ed96b 100644
--- a/aegisub/src/subtitle_format.h
+++ b/aegisub/src/subtitle_format.h
@@ -34,12 +34,10 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/arrstr.h>
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/exception.h>
 
diff --git a/aegisub/src/subtitle_format_ebu3264.cpp b/aegisub/src/subtitle_format_ebu3264.cpp
index 05a5e76f4..81e7dfbe9 100644
--- a/aegisub/src/subtitle_format_ebu3264.cpp
+++ b/aegisub/src/subtitle_format_ebu3264.cpp
@@ -25,9 +25,7 @@
 
 #include "subtitle_format_ebu3264.h"
 
-#ifndef AGI_PRE
 #include <wx/regex.h>
-#endif
 
 #include <libaegisub/charset_conv.h>
 #include <libaegisub/exception.h>
diff --git a/aegisub/src/subtitle_format_microdvd.cpp b/aegisub/src/subtitle_format_microdvd.cpp
index bff4458c9..d7f27b298 100644
--- a/aegisub/src/subtitle_format_microdvd.cpp
+++ b/aegisub/src/subtitle_format_microdvd.cpp
@@ -36,9 +36,7 @@
 
 #include "subtitle_format_microdvd.h"
 
-#ifndef AGI_PRE
 #include <wx/regex.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/subtitle_format_srt.cpp b/aegisub/src/subtitle_format_srt.cpp
index ef0af51c2..502a1969c 100644
--- a/aegisub/src/subtitle_format_srt.cpp
+++ b/aegisub/src/subtitle_format_srt.cpp
@@ -49,10 +49,8 @@
 
 #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")
 
diff --git a/aegisub/src/subtitle_format_transtation.cpp b/aegisub/src/subtitle_format_transtation.cpp
index cdd7f9bc0..5513546bb 100644
--- a/aegisub/src/subtitle_format_transtation.cpp
+++ b/aegisub/src/subtitle_format_transtation.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cstdio>
-#endif
 
 #include "subtitle_format_transtation.h"
 
diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/aegisub/src/subtitle_format_ttxt.cpp
index 5574d836b..cb141a198 100644
--- a/aegisub/src/subtitle_format_ttxt.cpp
+++ b/aegisub/src/subtitle_format_ttxt.cpp
@@ -36,9 +36,7 @@
 
 #include "subtitle_format_ttxt.h"
 
-#ifndef AGI_PRE
 #include <wx/xml/xml.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/subtitles_provider_csri.cpp b/aegisub/src/subtitles_provider_csri.cpp
index b9b39e8a5..e6c6a44be 100644
--- a/aegisub/src/subtitles_provider_csri.cpp
+++ b/aegisub/src/subtitles_provider_csri.cpp
@@ -36,9 +36,7 @@
 
 #ifdef WITH_CSRI
 
-#ifndef AGI_PRE
 #include <wx/thread.h>
-#endif
 
 #include "subtitles_provider_csri.h"
 
diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h
index 34ae3e815..34507f70d 100644
--- a/aegisub/src/subtitles_provider_csri.h
+++ b/aegisub/src/subtitles_provider_csri.h
@@ -36,9 +36,7 @@
 
 #include "include/aegisub/subtitles_provider.h"
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp
index 7c0852c49..7f9d0badc 100644
--- a/aegisub/src/subtitles_provider_libass.cpp
+++ b/aegisub/src/subtitles_provider_libass.cpp
@@ -36,10 +36,8 @@
 
 #ifdef WITH_LIBASS
 
-#ifndef AGI_PRE
 #include <wx/filefn.h>
 #include <wx/utils.h>
-#endif
 
 #ifdef __APPLE__
 #include <sys/param.h>
diff --git a/aegisub/src/text_file_reader.cpp b/aegisub/src/text_file_reader.cpp
index a13aaf721..763e1ac4b 100644
--- a/aegisub/src/text_file_reader.cpp
+++ b/aegisub/src/text_file_reader.cpp
@@ -34,14 +34,12 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <cassert>
 #include <cerrno>
 #include <string>
 
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/io.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/text_file_reader.h b/aegisub/src/text_file_reader.h
index dfa3ea6b6..d20d3f313 100644
--- a/aegisub/src/text_file_reader.h
+++ b/aegisub/src/text_file_reader.h
@@ -34,13 +34,11 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <fstream>
 #include <memory>
 
 #include <wx/dynarray.h>
 #include <wx/string.h>
-#endif
 
 #include <libaegisub/line_iterator.h>
 
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index 50c75afa8..888cce31c 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <fstream>
-#endif
 
 #include <libaegisub/io.h>
 
diff --git a/aegisub/src/text_file_writer.h b/aegisub/src/text_file_writer.h
index 5f345e63c..25746abd3 100644
--- a/aegisub/src/text_file_writer.h
+++ b/aegisub/src/text_file_writer.h
@@ -34,11 +34,9 @@
 
 
 
-#ifndef AGI_PRE
 #include <fstream>
 
 #include <wx/string.h>
-#endif
 
 namespace agi {
 	namespace charset {
diff --git a/aegisub/src/thesaurus.cpp b/aegisub/src/thesaurus.cpp
index 3a0cd3720..2fd95c29f 100644
--- a/aegisub/src/thesaurus.cpp
+++ b/aegisub/src/thesaurus.cpp
@@ -23,10 +23,8 @@
 
 #include "thesaurus.h"
 
-#ifndef AGI_PRE
 #include <wx/dir.h>
 #include <wx/filename.h>
-#endif
 
 #include <libaegisub/log.h>
 #include <libaegisub/thesaurus.h>
diff --git a/aegisub/src/thesaurus.h b/aegisub/src/thesaurus.h
index 70b9f6494..6c3b6712b 100644
--- a/aegisub/src/thesaurus.h
+++ b/aegisub/src/thesaurus.h
@@ -19,10 +19,8 @@
 /// @ingroup thesaurus
 ///
 
-#ifndef AGI_PRE
 #include <string>
 #include <vector>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp
index cce3fc9a5..5cc94a292 100644
--- a/aegisub/src/threaded_frame_source.cpp
+++ b/aegisub/src/threaded_frame_source.cpp
@@ -34,13 +34,11 @@
 
 #include "threaded_frame_source.h"
 
-#ifndef AGI_PRE
 #include <deque>
 #include <functional>
 
 #include <boost/range/adaptor/indirected.hpp>
 #include <boost/range/algorithm_ext.hpp>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_exporter.h"
diff --git a/aegisub/src/threaded_frame_source.h b/aegisub/src/threaded_frame_source.h
index 6dceb05c5..d89742ee0 100644
--- a/aegisub/src/threaded_frame_source.h
+++ b/aegisub/src/threaded_frame_source.h
@@ -32,12 +32,10 @@
 /// @ingroup video
 ///
 
-#ifndef AGI_PRE
 #include <memory>
 
 #include <wx/event.h>
 #include <wx/thread.h>
-#endif
 
 #include <libaegisub/exception.h>
 #include <libaegisub/scoped_ptr.h>
diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp
index e5946d666..ef4366a84 100644
--- a/aegisub/src/timeedit_ctrl.cpp
+++ b/aegisub/src/timeedit_ctrl.cpp
@@ -36,14 +36,12 @@
 
 #include "timeedit_ctrl.h"
 
-#ifndef AGI_PRE
 #include <functional>
 
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
 #include <wx/menu.h>
 #include <wx/valtext.h>
-#endif
 
 #include "ass_time.h"
 #include "compat.h"
diff --git a/aegisub/src/timeedit_ctrl.h b/aegisub/src/timeedit_ctrl.h
index d34a4a083..1c3693ce5 100644
--- a/aegisub/src/timeedit_ctrl.h
+++ b/aegisub/src/timeedit_ctrl.h
@@ -32,9 +32,7 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/textctrl.h>
-#endif
 
 #include "ass_time.h"
 
diff --git a/aegisub/src/toggle_bitmap.cpp b/aegisub/src/toggle_bitmap.cpp
index 5911efc71..a78121471 100644
--- a/aegisub/src/toggle_bitmap.cpp
+++ b/aegisub/src/toggle_bitmap.cpp
@@ -34,11 +34,9 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/dcbuffer.h>
 #include <wx/settings.h>
 #include <wx/tglbtn.h>
-#endif
 
 #include "toggle_bitmap.h"
 
diff --git a/aegisub/src/toggle_bitmap.h b/aegisub/src/toggle_bitmap.h
index f6edac24a..c44f57de5 100644
--- a/aegisub/src/toggle_bitmap.h
+++ b/aegisub/src/toggle_bitmap.h
@@ -32,10 +32,8 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <wx/bitmap.h>
 #include <wx/control.h>
-#endif
 
 namespace agi { struct Context; }
 namespace cmd { class Command; }
diff --git a/aegisub/src/toolbar.cpp b/aegisub/src/toolbar.cpp
index 47c2c7f7d..638d73cf3 100644
--- a/aegisub/src/toolbar.cpp
+++ b/aegisub/src/toolbar.cpp
@@ -26,13 +26,11 @@
 #include "libresrc/libresrc.h"
 #include "main.h"
 
-#ifndef AGI_PRE
 #include <sstream>
 #include <vector>
 
 #include <wx/frame.h>
 #include <wx/toolbar.h>
-#endif
 
 #include <libaegisub/hotkey.h>
 #include <libaegisub/json.h>
diff --git a/aegisub/src/tooltip_manager.cpp b/aegisub/src/tooltip_manager.cpp
index ec4c08516..a739b56fd 100644
--- a/aegisub/src/tooltip_manager.cpp
+++ b/aegisub/src/tooltip_manager.cpp
@@ -40,9 +40,7 @@
 
 #include <libaegisub/hotkey.h>
 
-#ifndef AGI_PRE
 #include <wx/window.h>
-#endif
 
 #include <wx/weakref.h>
 
diff --git a/aegisub/src/tooltip_manager.h b/aegisub/src/tooltip_manager.h
index 685376d99..7f6c638cb 100644
--- a/aegisub/src/tooltip_manager.h
+++ b/aegisub/src/tooltip_manager.h
@@ -32,9 +32,7 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <boost/container/list.hpp>
-#endif
 
 struct ToolTipBinding;
 
diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
index eb4be3aea..1ae63d4d6 100644
--- a/aegisub/src/utils.cpp
+++ b/aegisub/src/utils.cpp
@@ -36,7 +36,6 @@
 
 #include "utils.h"
 
-#ifndef AGI_PRE
 #ifdef __UNIX__
 #include <unistd.h>
 #endif
@@ -47,7 +46,6 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h
index 62b67b656..c22fdd8c0 100644
--- a/aegisub/src/utils.h
+++ b/aegisub/src/utils.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <cstdint>
 
 #include <algorithm>
@@ -46,7 +45,6 @@
 #include <wx/app.h>
 #include <wx/icon.h>
 #include <wx/thread.h>
-#endif
 
 class wxMouseEvent;
 class wxWindow;
diff --git a/aegisub/src/validators.cpp b/aegisub/src/validators.cpp
index 49ec63b7b..080d2d9bf 100644
--- a/aegisub/src/validators.cpp
+++ b/aegisub/src/validators.cpp
@@ -34,9 +34,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/textctrl.h>
-#endif
 
 #include "utils.h"
 #include "validators.h"
diff --git a/aegisub/src/validators.h b/aegisub/src/validators.h
index d53ddeff6..745624aa2 100644
--- a/aegisub/src/validators.h
+++ b/aegisub/src/validators.h
@@ -32,9 +32,7 @@
 /// @ingroup custom_control utility
 ///
 
-#ifndef AGI_PRE
 #include <wx/validate.h>
-#endif
 
 
 /// DOCME
diff --git a/aegisub/src/vector2d.cpp b/aegisub/src/vector2d.cpp
index c4a8b54db..b39ea6a56 100644
--- a/aegisub/src/vector2d.cpp
+++ b/aegisub/src/vector2d.cpp
@@ -23,9 +23,7 @@
 
 #include "vector2d.h"
 
-#ifndef AGI_PRE
 #include <limits>
-#endif
 
 Vector2D::Vector2D()
 : x(std::numeric_limits<float>::min())
diff --git a/aegisub/src/vector2d.h b/aegisub/src/vector2d.h
index c91682d7c..917f9f724 100644
--- a/aegisub/src/vector2d.h
+++ b/aegisub/src/vector2d.h
@@ -21,11 +21,9 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <cmath>
 
 #include <wx/gdicmn.h>
-#endif
 
 /// DOCME
 /// @class Vector2D
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index c6b720b7f..41e857d8e 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/bmpbuttn.h>
 #include <wx/combobox.h>
 #include <wx/rawbmp.h>
@@ -44,7 +43,6 @@
 #include <wx/textctrl.h>
 #include <wx/tglbtn.h>
 #include <wx/toolbar.h>
-#endif
 
 #include "video_box.h"
 
diff --git a/aegisub/src/video_box.h b/aegisub/src/video_box.h
index e0eaf9c0e..175e36e23 100644
--- a/aegisub/src/video_box.h
+++ b/aegisub/src/video_box.h
@@ -32,11 +32,9 @@
 /// @ingroup main_ui video
 ///
 
-#ifndef AGI_PRE
 #include <deque>
 
 #include <wx/panel.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index cbdc4aa62..7ec26e3df 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cstring>
 
 #include <wx/clipbrd.h>
@@ -42,7 +41,6 @@
 #include <wx/filename.h>
 #include <wx/image.h>
 #include <wx/msgdlg.h>
-#endif
 
 #include <libaegisub/keyframe.h>
 #include <libaegisub/log.h>
diff --git a/aegisub/src/video_context.h b/aegisub/src/video_context.h
index e48bd3774..a9cd637ea 100644
--- a/aegisub/src/video_context.h
+++ b/aegisub/src/video_context.h
@@ -32,7 +32,6 @@
 /// @ingroup video
 ///
 
-#ifndef AGI_PRE
 #include <time.h>
 
 #include <list>
@@ -40,7 +39,6 @@
 
 #include <wx/timer.h>
 #include <wx/stopwatch.h>
-#endif
 
 #include <libaegisub/scoped_ptr.h>
 #include <libaegisub/signal.h>
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 1f74adf1b..982915243 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -35,7 +35,6 @@
 // Includes
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 
 #include <wx/combobox.h>
@@ -44,7 +43,6 @@
 #include <wx/menu.h>
 #include <wx/textctrl.h>
 #include <wx/toolbar.h>
-#endif
 
 #ifdef HAVE_OPENGL_GL_H
 #include <OpenGL/gl.h>
diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h
index 3e7791516..9388bfcc4 100644
--- a/aegisub/src/video_display.h
+++ b/aegisub/src/video_display.h
@@ -33,12 +33,10 @@
 ///
 
 
-#ifndef AGI_PRE
 #include <deque>
 #include <memory>
 
 #include <wx/glcanvas.h>
-#endif
 
 #include <typeinfo>
 
diff --git a/aegisub/src/video_frame.h b/aegisub/src/video_frame.h
index a127cfed8..34081b6f1 100644
--- a/aegisub/src/video_frame.h
+++ b/aegisub/src/video_frame.h
@@ -34,9 +34,7 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <wx/image.h>
-#endif
 
 /// DOCME
 /// @class AegiVideoFrame
diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp
index 922476e48..87c99c6ab 100644
--- a/aegisub/src/video_out_gl.cpp
+++ b/aegisub/src/video_out_gl.cpp
@@ -34,10 +34,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <utility>
-#endif
 
 #include <libaegisub/log.h>
 
diff --git a/aegisub/src/video_out_gl.h b/aegisub/src/video_out_gl.h
index 1d3927714..35ca3a251 100644
--- a/aegisub/src/video_out_gl.h
+++ b/aegisub/src/video_out_gl.h
@@ -34,9 +34,7 @@
 
 #include <libaegisub/exception.h>
 
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "compat.h"
 
diff --git a/aegisub/src/video_provider_avs.cpp b/aegisub/src/video_provider_avs.cpp
index 2ba5ff638..379264fa8 100644
--- a/aegisub/src/video_provider_avs.cpp
+++ b/aegisub/src/video_provider_avs.cpp
@@ -38,10 +38,8 @@
 
 #include "video_provider_avs.h"
 
-#ifndef AGI_PRE
 #include <wx/filename.h>
 #include <wx/msw/registry.h>
-#endif
 
 #ifdef _WIN32
 #include <vfw.h>
diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp
index 7f9ca04f6..9c929a27b 100644
--- a/aegisub/src/video_provider_cache.cpp
+++ b/aegisub/src/video_provider_cache.cpp
@@ -39,10 +39,8 @@
 #include "main.h"
 #include "video_frame.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
-#endif
 
 /// A video frame and its frame number
 struct CachedFrame : public AegiVideoFrame {
diff --git a/aegisub/src/video_provider_cache.h b/aegisub/src/video_provider_cache.h
index 30943d679..d72eb38bf 100644
--- a/aegisub/src/video_provider_cache.h
+++ b/aegisub/src/video_provider_cache.h
@@ -32,9 +32,7 @@
 /// @ingroup video_input
 ///
 
-#ifndef AGI_PRE
 #include <boost/container/list.hpp>
-#endif
 
 #include "include/aegisub/video_provider.h"
 
diff --git a/aegisub/src/video_provider_dummy.cpp b/aegisub/src/video_provider_dummy.cpp
index 220b7b3d9..7fc2498fd 100644
--- a/aegisub/src/video_provider_dummy.cpp
+++ b/aegisub/src/video_provider_dummy.cpp
@@ -36,9 +36,7 @@
 
 #include "video_provider_dummy.h"
 
-#ifndef AGI_PRE
 #include <wx/tokenzr.h>
-#endif
 
 #include "colorspace.h"
 #include <libaegisub/color.h>
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index 01cb00e89..ccf993be7 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -36,7 +36,6 @@
 
 #ifdef WITH_FFMS2
 
-#ifndef AGI_PRE
 #ifdef __WINDOWS__
 #include <objbase.h>
 #endif
@@ -46,7 +45,6 @@
 #include <wx/choicdlg.h>
 #include <wx/msgdlg.h>
 #include <wx/utils.h>
-#endif
 
 #include "aegisub_endian.h"
 #include "compat.h"
diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h
index 63aa1ac1e..d23559a1b 100644
--- a/aegisub/src/video_provider_ffmpegsource.h
+++ b/aegisub/src/video_provider_ffmpegsource.h
@@ -33,9 +33,7 @@
 ///
 
 #ifdef WITH_FFMS2
-#ifndef AGI_PRE
 #include <vector>
-#endif
 
 #include "ffmpegsource_common.h"
 #include "include/aegisub/video_provider.h"
diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h
index 02d91d649..dae7415fc 100644
--- a/aegisub/src/video_provider_yuv4mpeg.h
+++ b/aegisub/src/video_provider_yuv4mpeg.h
@@ -33,14 +33,12 @@
 ///
 
 #include "include/aegisub/video_provider.h"
-#ifndef AGI_PRE
 #include <cstdio>
 
 #include <vector>
 
 #include <wx/filename.h>
 #include <wx/log.h>
-#endif
 
 /// the maximum allowed header length, in bytes
 #define YUV4MPEG_HEADER_MAXLEN 128
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index 36c6060de..2162c46c1 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -34,10 +34,8 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <wx/dcbuffer.h>
 #include <wx/settings.h>
-#endif
 
 #include "include/aegisub/context.h"
 #include "include/aegisub/hotkey.h"
diff --git a/aegisub/src/video_slider.h b/aegisub/src/video_slider.h
index a5a9d1895..d37dfee2f 100644
--- a/aegisub/src/video_slider.h
+++ b/aegisub/src/video_slider.h
@@ -32,11 +32,9 @@
 /// @ingroup custom_control
 ///
 
-#ifndef AGI_PRE
 #include <vector>
 
 #include <wx/window.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 8ba5f2d8a..6ec104bb4 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
-#endif
 
 #include "visual_tool.h"
 
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index f052b095a..1efda453b 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#ifndef AGI_PRE
 #include <deque>
 #include <list>
 #include <map>
@@ -32,7 +31,6 @@
 #include <wx/log.h>
 #include <wx/event.h>
 #include <wx/button.h>
-#endif
 
 #include <libaegisub/signal.h>
 
diff --git a/aegisub/src/visual_tool_clip.cpp b/aegisub/src/visual_tool_clip.cpp
index 8e7eb2a46..ec3dd7003 100644
--- a/aegisub/src/visual_tool_clip.cpp
+++ b/aegisub/src/visual_tool_clip.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <utility>
-#endif
 
 #include "visual_tool_clip.h"
 
diff --git a/aegisub/src/visual_tool_drag.cpp b/aegisub/src/visual_tool_drag.cpp
index 51c3f81b5..2297525b7 100644
--- a/aegisub/src/visual_tool_drag.cpp
+++ b/aegisub/src/visual_tool_drag.cpp
@@ -22,13 +22,11 @@
 
 #include "visual_tool_drag.h"
 
-#ifndef AGI_PRE
 #include <algorithm>
 #include <functional>
 
 #include <wx/bmpbuttn.h>
 #include <wx/toolbar.h>
-#endif
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
diff --git a/aegisub/src/visual_tool_rotatexy.cpp b/aegisub/src/visual_tool_rotatexy.cpp
index 25a82208c..703977f46 100644
--- a/aegisub/src/visual_tool_rotatexy.cpp
+++ b/aegisub/src/visual_tool_rotatexy.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
-#endif
 
 #include "visual_tool_rotatexy.h"
 
diff --git a/aegisub/src/visual_tool_rotatez.cpp b/aegisub/src/visual_tool_rotatez.cpp
index c539f6fca..2473e9117 100644
--- a/aegisub/src/visual_tool_rotatez.cpp
+++ b/aegisub/src/visual_tool_rotatez.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
-#endif
 
 #include "visual_tool_rotatez.h"
 
diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp
index 5fe50d2f9..bb68b6c9f 100644
--- a/aegisub/src/visual_tool_scale.cpp
+++ b/aegisub/src/visual_tool_scale.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#ifndef AGI_PRE
 #include <cmath>
-#endif
 
 #include "visual_tool_scale.h"
 
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index 11427ed94..10af01afa 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -20,11 +20,9 @@
 
 #include "visual_tool_vector_clip.h"
 
-#ifndef AGI_PRE
 #include <wx/toolbar.h>
 
 #include <algorithm>
-#endif
 
 #include "config.h"