diff --git a/aegisub/src/aegisub_endian.h b/aegisub/src/aegisub_endian.h
index 8e2f194d2..74e16ecb2 100644
--- a/aegisub/src/aegisub_endian.h
+++ b/aegisub/src/aegisub_endian.h
@@ -72,9 +72,9 @@
 # endif
 #endif
 
-
+#ifndef AGI_PRE
 #include <stdint.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index 7c76c3bae..2f8390b76 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -37,17 +37,18 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <vector>
+#endif
+
 #include "ass_entry.h"
 #include "boost/shared_ptr.hpp"
-#include <vector>
-
 
 
 /// DOCME
 typedef std::vector<unsigned char> DataVec;
 
 
-
 /// @class AttachData
 /// @brief DOCME
 class AttachData {
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index ba68cc643..2e227b64c 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -37,7 +37,11 @@
 
 ////////////
 // Includes
+
+#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 1bdd9138b..3fba651c9 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -40,7 +40,10 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/string.h>
+#endif
+
 #include "include/aegisub/exception.h"
 
 
diff --git a/aegisub/src/ass_export_filter.h b/aegisub/src/ass_export_filter.h
index ad5720569..cfbf9b530 100644
--- a/aegisub/src/ass_export_filter.h
+++ b/aegisub/src/ass_export_filter.h
@@ -40,9 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <list>
+
 #include <wx/string.h>
 #include <wx/window.h>
-#include <list>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/ass_exporter.h b/aegisub/src/ass_exporter.h
index d73e320fc..44522c26a 100644
--- a/aegisub/src/ass_exporter.h
+++ b/aegisub/src/ass_exporter.h
@@ -40,11 +40,14 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
-#include <wx/sizer.h>
+#ifndef AGI_PRE
 #include <wx/arrstr.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+
 #include <list>
 #include <map>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h
index 654d764a9..f9a83b463 100644
--- a/aegisub/src/ass_file.h
+++ b/aegisub/src/ass_file.h
@@ -40,10 +40,14 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <fstream>
 #include <list>
 #include <vector>
+
 #include <wx/arrstr.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/ass_karaoke.h b/aegisub/src/ass_karaoke.h
index a3da87580..c5079f103 100644
--- a/aegisub/src/ass_karaoke.h
+++ b/aegisub/src/ass_karaoke.h
@@ -36,8 +36,11 @@
 
 #pragma once
 
-#include "ass_dialogue.h"
+#ifndef AGI_PRE
 #include <vector>
+#endif
+
+#include "ass_dialogue.h"
 
 
 /// DOCME
diff --git a/aegisub/src/ass_override.h b/aegisub/src/ass_override.h
index 42da8efa6..db8d3b669 100644
--- a/aegisub/src/ass_override.h
+++ b/aegisub/src/ass_override.h
@@ -40,8 +40,11 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <list>
 #include <vector>
+#endif
+
 #include "variable_data.h"
 
 
diff --git a/aegisub/src/ass_style.h b/aegisub/src/ass_style.h
index b8738a137..84c907d25 100644
--- a/aegisub/src/ass_style.h
+++ b/aegisub/src/ass_style.h
@@ -39,7 +39,10 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/colour.h>
+#endif
+
 #include "ass_entry.h"
 
 
diff --git a/aegisub/src/ass_style_storage.h b/aegisub/src/ass_style_storage.h
index cb3eec725..24db38873 100644
--- a/aegisub/src/ass_style_storage.h
+++ b/aegisub/src/ass_style_storage.h
@@ -43,9 +43,12 @@
 
 ////////////
 // Includes
-#include <wx/arrstr.h>
+#ifndef AGI_PRE
 #include <list>
 
+#include <wx/arrstr.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/ass_time.h b/aegisub/src/ass_time.h
index a0737034e..8b9e4da4c 100644
--- a/aegisub/src/ass_time.h
+++ b/aegisub/src/ass_time.h
@@ -40,9 +40,11 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <stdint.h>
 
+#include <wx/string.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h
index 48c641e2e..4904022cd 100644
--- a/aegisub/src/audio_box.h
+++ b/aegisub/src/audio_box.h
@@ -43,17 +43,20 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
-#include <wx/panel.h>
-#include <wx/menu.h>
-#include <wx/scrolbar.h>
-#include <wx/button.h>
+#ifndef AGI_PRE
 #include <wx/bmpbuttn.h>
+#include <wx/button.h>
+#include <wx/menu.h>
+#include <wx/panel.h>
 #include <wx/sashwin.h>
-#include <wx/slider.h>
+#include <wx/scrolbar.h>
 #include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/tglbtn.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index 54a9d6684..1b69ab579 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -43,12 +43,16 @@
 
 ///////////
 // Headers
-#include <wx/window.h>
+#ifndef AGI_PRE
+#include <stdint.h>
+
 #include <wx/bitmap.h>
 #include <wx/scrolbar.h>
-#include <stdint.h>
-#include "audio_provider_manager.h"
+#include <wx/window.h>
+#endif
+
 #include "audio_player_manager.h"
+#include "audio_provider_manager.h"
 #include "audio_renderer_spectrum.h"
 
 
diff --git a/aegisub/src/audio_karaoke.h b/aegisub/src/audio_karaoke.h
index d22d256d2..f98ce204d 100644
--- a/aegisub/src/audio_karaoke.h
+++ b/aegisub/src/audio_karaoke.h
@@ -43,10 +43,14 @@
 
 ///////////
 // Headers
-#include <wx/window.h>
+#ifndef AGI_PRE
+#include <vector>
+
 #include <wx/log.h>
 #include <wx/menu.h>
-#include <vector>
+#include <wx/window.h>
+#endif
+
 #include "ass_karaoke.h"
 
 
diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h
index f6668f500..5b4bc8e3e 100644
--- a/aegisub/src/audio_player_alsa.h
+++ b/aegisub/src/audio_player_alsa.h
@@ -40,12 +40,13 @@
 
 ///////////
 // Headers
+#include <alsa/asoundlib.h>
+
+#include "frame_main.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "utils.h"
-#include "frame_main.h"
-#include <alsa/asoundlib.h>
 #include "options.h"
+#include "utils.h"
 
 
 
diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h
index 57fb5ec85..0547b8140 100644
--- a/aegisub/src/audio_player_dsound.h
+++ b/aegisub/src/audio_player_dsound.h
@@ -39,12 +39,16 @@
 // Headers
 #ifdef WITH_DIRECTSOUND
 
+#ifndef AGI_PRE
+#include <mmsystem.h>
+#endif
+
+#include <dsound.h>
+
+#include "frame_main.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "utils.h"
-#include "frame_main.h"
-#include <mmsystem.h>
-#include <dsound.h>
 
 
 //////////////
diff --git a/aegisub/src/audio_player_manager.h b/aegisub/src/audio_player_manager.h
index 464630456..bb1982af4 100644
--- a/aegisub/src/audio_player_manager.h
+++ b/aegisub/src/audio_player_manager.h
@@ -40,10 +40,14 @@
 
 ///////////
 // Headers
-#include <wx/event.h>
-#include <wx/timer.h>
-#include <wx/thread.h>
+#ifndef AGI_PRE
 #include <stdint.h>
+
+#include <wx/event.h>
+#include <wx/thread.h>
+#include <wx/timer.h>
+#endif
+
 #include "factory_manager.h"
 #include "include/aegisub/audio_player.h"
 
diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h
index c9323a1be..d40d5c047 100644
--- a/aegisub/src/audio_player_openal.h
+++ b/aegisub/src/audio_player_openal.h
@@ -40,12 +40,12 @@
 
 ///////////
 // Headers
+#include "audio_player_manager.h"
+#include "frame_main.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "utils.h"
-#include "frame_main.h"
-#include "audio_player_manager.h"
 #include "options.h"
+#include "utils.h"
 
 #ifdef __WINDOWS__
 #include <al.h>
diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h
index 80841da15..f12e70db5 100644
--- a/aegisub/src/audio_player_oss.h
+++ b/aegisub/src/audio_player_oss.h
@@ -41,8 +41,11 @@
 
 ///////////
 // Headers
-#include <fcntl.h>
+#ifndef AGI_PRE
 #include <sys/ioctl.h>
+#endif
+
+#include <fcntl.h>
 #ifdef HAVE_SOUNDCARD_H
 #   include <soundcard.h>
 #else
@@ -50,11 +53,13 @@
 #       include <sys/soundcard.h>
 #   endif
 #endif
+
+
+#include "frame_main.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "utils.h"
-#include "frame_main.h"
 #include "options.h"
+#include "utils.h"
 
 
 //////////////
diff --git a/aegisub/src/audio_player_portaudio.h b/aegisub/src/audio_player_portaudio.h
index 85d01cc00..169faa0a2 100644
--- a/aegisub/src/audio_player_portaudio.h
+++ b/aegisub/src/audio_player_portaudio.h
@@ -47,6 +47,7 @@ extern "C" {
 #include <portaudio.h>
 }
 
+
 /// @class PortAudioPlayer
 /// @brief PortAudio Player
 ///
diff --git a/aegisub/src/audio_player_pulse.h b/aegisub/src/audio_player_pulse.h
index ee8c8e88c..a7f6c9e5d 100644
--- a/aegisub/src/audio_player_pulse.h
+++ b/aegisub/src/audio_player_pulse.h
@@ -40,12 +40,16 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <stdio.h>
+#endif
+
+#include <pulse/pulseaudio.h>
+
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "utils.h"
 #include "options.h"
-#include <pulse/pulseaudio.h>
+#include "utils.h"
 
 
 //////////////
diff --git a/aegisub/src/audio_provider_avs.h b/aegisub/src/audio_provider_avs.h
index 7522ecadf..424d4b8d4 100644
--- a/aegisub/src/audio_provider_avs.h
+++ b/aegisub/src/audio_provider_avs.h
@@ -43,7 +43,6 @@
 #include "avisynth_wrap.h"
 
 
-
 /// DOCME
 /// @class AvisynthAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_convert.h b/aegisub/src/audio_provider_convert.h
index 59b290c23..c4b638914 100644
--- a/aegisub/src/audio_provider_convert.h
+++ b/aegisub/src/audio_provider_convert.h
@@ -43,7 +43,6 @@
 #include "include/aegisub/audio_provider.h"
 
 
-
 /// DOCME
 /// @class ConvertAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_downmix.h b/aegisub/src/audio_provider_downmix.h
index 51a975179..5412b8a1b 100644
--- a/aegisub/src/audio_provider_downmix.h
+++ b/aegisub/src/audio_provider_downmix.h
@@ -34,6 +34,7 @@
 /// @ingroup audio_input
 ///
 
+
 #include "include/aegisub/audio_provider.h"
 
 
diff --git a/aegisub/src/audio_provider_dummy.h b/aegisub/src/audio_provider_dummy.h
index 0bb6d40f3..4e168ee10 100644
--- a/aegisub/src/audio_provider_dummy.h
+++ b/aegisub/src/audio_provider_dummy.h
@@ -43,7 +43,6 @@
 #include "include/aegisub/audio_provider.h"
 
 
-
 /// DOCME
 /// @class DummyAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_ffmpegsource.h b/aegisub/src/audio_provider_ffmpegsource.h
index 353bb44fc..4965fb3a7 100644
--- a/aegisub/src/audio_provider_ffmpegsource.h
+++ b/aegisub/src/audio_provider_ffmpegsource.h
@@ -41,7 +41,6 @@
 #include "ffmpegsource_common.h"
 
 
-
 /// DOCME
 /// @class FFmpegSourceAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_hd.h b/aegisub/src/audio_provider_hd.h
index f8ff7440a..6e789ef8d 100644
--- a/aegisub/src/audio_provider_hd.h
+++ b/aegisub/src/audio_provider_hd.h
@@ -40,9 +40,12 @@
 
 ///////////
 // Headers
-#include "include/aegisub/audio_provider.h"
+#ifndef AGI_PRE
 #include <wx/file.h>
 #include <wx/thread.h>
+#endif
+
+#include "include/aegisub/audio_provider.h"
 
 
 
diff --git a/aegisub/src/audio_provider_manager.h b/aegisub/src/audio_provider_manager.h
index eb25cd831..44f621c58 100644
--- a/aegisub/src/audio_provider_manager.h
+++ b/aegisub/src/audio_provider_manager.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <stdint.h>
-#include "factory_manager.h"
-#include "include/aegisub/audio_provider.h"
+#endif
 
+#include "include/aegisub/audio_provider.h"
+#include "factory_manager.h"
 
 
 /// DOCME
diff --git a/aegisub/src/audio_provider_pcm.h b/aegisub/src/audio_provider_pcm.h
index b7d506886..f574a13e6 100644
--- a/aegisub/src/audio_provider_pcm.h
+++ b/aegisub/src/audio_provider_pcm.h
@@ -40,15 +40,18 @@
 
 ///////////
 // Headers
-#include "include/aegisub/audio_provider.h"
+#ifndef AGI_PRE
+#include <vector>
+
 #include <wx/file.h>
 #include <wx/thread.h>
-#include <vector>
+#endif
 
 #ifdef _WINDOWS
 #include <windows.h>
 #endif
 
+#include "include/aegisub/audio_provider.h"
 
 
 /// DOCME
diff --git a/aegisub/src/audio_provider_quicktime.h b/aegisub/src/audio_provider_quicktime.h
index e0c62f14f..f9c2aa30c 100644
--- a/aegisub/src/audio_provider_quicktime.h
+++ b/aegisub/src/audio_provider_quicktime.h
@@ -40,7 +40,10 @@
 #include "quicktime_common.h"
 
 #ifdef WITH_QUICKTIME
+#ifndef AGI_PRE
 #include <wx/log.h>
+#endif
+
 #include "include/aegisub/audio_provider.h"
 
 
diff --git a/aegisub/src/audio_provider_ram.h b/aegisub/src/audio_provider_ram.h
index 6378e8014..95f2f5682 100644
--- a/aegisub/src/audio_provider_ram.h
+++ b/aegisub/src/audio_provider_ram.h
@@ -43,7 +43,6 @@
 #include "include/aegisub/audio_provider.h"
 
 
-
 /// DOCME
 /// @class RAMAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_stream.h b/aegisub/src/audio_provider_stream.h
index 77d9a5823..2811f6f55 100644
--- a/aegisub/src/audio_provider_stream.h
+++ b/aegisub/src/audio_provider_stream.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <list>
 #include <vector>
-#include "include/aegisub/audio_provider.h"
+#endif
 
+#include "include/aegisub/audio_provider.h"
 
 
 /// DOCME
diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h
index 6161a20d3..668e9eb8b 100644
--- a/aegisub/src/audio_renderer.h
+++ b/aegisub/src/audio_renderer.h
@@ -36,9 +36,13 @@
 /// Base classes for audio renderers (spectrum, waveform, ...)
 
 
+#ifndef AGI_PRE
+#include <memory>
+
 #include <wx/dc.h>
 #include <wx/gdicmn.h>
-#include <memory>
+#endif
+
 #include "block_cache.h"
 
 
diff --git a/aegisub/src/audio_renderer_spectrum.h b/aegisub/src/audio_renderer_spectrum.h
index dfbd4b2a9..e40c4352e 100644
--- a/aegisub/src/audio_renderer_spectrum.h
+++ b/aegisub/src/audio_renderer_spectrum.h
@@ -42,7 +42,10 @@
 /// Include guard for audio_spectrum.h
 #define AUDIO_SPECTRUM_H
 
+#ifndef AGI_PRE
 #include <stdint.h>
+#endif
+
 #include "audio_provider_manager.h"
 
 
diff --git a/aegisub/src/auto4_base.h b/aegisub/src/auto4_base.h
index ad45f273f..b170d9c58 100644
--- a/aegisub/src/auto4_base.h
+++ b/aegisub/src/auto4_base.h
@@ -41,18 +41,22 @@
 /// DOCME
 #define _AUTO4_BASE_H
 
-#include <wx/string.h>
-#include <wx/sizer.h>
-#include <wx/gauge.h>
-#include <wx/timer.h>
-#include <wx/stattext.h>
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
+#ifndef AGI_PRE
 #include <vector>
 
+#include <wx/dialog.h>
+#include <wx/gauge.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/timer.h>
+#endif
+
 #include "ass_export_filter.h"
 #include "subtitle_format.h"
 
+
 class AssFile;
 class AssStyle;
 class wxWindow;
diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h
index 86486c78b..70c5e213a 100644
--- a/aegisub/src/auto4_lua.h
+++ b/aegisub/src/auto4_lua.h
@@ -41,15 +41,18 @@
 /// DOCME
 #define _AUTO4_LUA_H
 
-#include "auto4_base.h"
-#include <wx/thread.h>
+#ifndef AGI_PRE
 #include <wx/event.h>
+#include <wx/thread.h>
+#endif
+
+#include "auto4_base.h"
 
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lua.h"
 #include "../../contrib/lua51/src/lauxlib.h"
 #else
-#include "lua.hpp"
+#include <lua.hpp>
 #endif
 
 class wxWindow;
diff --git a/aegisub/src/avisynth_wrap.h b/aegisub/src/avisynth_wrap.h
index c8812597a..7b77d56fd 100644
--- a/aegisub/src/avisynth_wrap.h
+++ b/aegisub/src/avisynth_wrap.h
@@ -45,7 +45,10 @@
 // Headers
 
 #ifdef WITH_AVISYNTH
+#ifndef AGI_PRE
 #include <windows.h>
+#endif
+
 #include "avisynth.h"
 
 
diff --git a/aegisub/src/base_grid.h b/aegisub/src/base_grid.h
index 26b893cb3..ae3ffe74a 100644
--- a/aegisub/src/base_grid.h
+++ b/aegisub/src/base_grid.h
@@ -40,11 +40,14 @@
 
 ////////////
 // Includes
-#include <wx/grid.h>
-#include <wx/scrolbar.h>
+#ifndef AGI_PRE
 #include <list>
 #include <vector>
 
+#include <wx/grid.h>
+#include <wx/scrolbar.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h
index a2748f091..09014bf79 100644
--- a/aegisub/src/block_cache.h
+++ b/aegisub/src/block_cache.h
@@ -39,9 +39,10 @@
 #define BLOCK_CACHE_H
 
 
-#include <vector>
+#ifndef AGI_PRE
 #include <algorithm>
-
+#include <vector>
+#endif
 
 
 /// @class BasicDataBlockFactory
diff --git a/aegisub/src/browse_button.h b/aegisub/src/browse_button.h
index 4432d1c17..da5fcad6c 100644
--- a/aegisub/src/browse_button.h
+++ b/aegisub/src/browse_button.h
@@ -40,9 +40,10 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/textctrl.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/charset_conv.h b/aegisub/src/charset_conv.h
index bacaa9e52..4ddf1672d 100644
--- a/aegisub/src/charset_conv.h
+++ b/aegisub/src/charset_conv.h
@@ -39,15 +39,19 @@
 /// DOCME
 #define AEGISUB_CHARSET_CONV_H
 
+#ifndef AGI_PRE
 #include <iconv.h>
 #include <wchar.h>
+
 #include <wx/arrstr.h>
-#include <wx/thread.h>
 #include <wx/string.h>
 #include <wx/strconv.h>
+#include <wx/thread.h>
+#endif
 
 #include "aegisub_endian.h"
 
+
 #if !defined(_LIBICONV_VERSION) || _LIBICONV_VERSION < 0x010A || defined(LIBICONV_PLUG)
 
 /// DOCME
diff --git a/aegisub/src/charset_detect.h b/aegisub/src/charset_detect.h
index 66f690e4e..3ca224a8e 100644
--- a/aegisub/src/charset_detect.h
+++ b/aegisub/src/charset_detect.h
@@ -42,7 +42,6 @@
 #include "../universalchardet/nsUniversalDetector.h"
 
 
-
 /// DOCME
 /// @class CharSetDetect
 /// @brief DOCME
diff --git a/aegisub/src/colorspace.h b/aegisub/src/colorspace.h
index e42b7f1c0..507f7d671 100644
--- a/aegisub/src/colorspace.h
+++ b/aegisub/src/colorspace.h
@@ -39,9 +39,10 @@
 /// DOCME
 #define COLORSPACE_H
 
+#ifndef AGI_PRE
 #include <wx/colour.h>
 #include <wx/string.h>
-
+#endif
 
 
 /// @brief DOCME
diff --git a/aegisub/src/colour_button.h b/aegisub/src/colour_button.h
index 20c681ea9..85de09f11 100644
--- a/aegisub/src/colour_button.h
+++ b/aegisub/src/colour_button.h
@@ -40,8 +40,9 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/bmpbuttn.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h
index a14b4b988..8e6a1303f 100644
--- a/aegisub/src/dialog_about.h
+++ b/aegisub/src/dialog_about.h
@@ -40,9 +40,11 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/dialog.h>
-#include "static_bmp.h"
+#endif
 
+#include "static_bmp.h"
 
 
 /// @class AboutScreen
diff --git a/aegisub/src/dialog_associations.h b/aegisub/src/dialog_associations.h
index d9c427c56..0dc7ea363 100644
--- a/aegisub/src/dialog_associations.h
+++ b/aegisub/src/dialog_associations.h
@@ -40,10 +40,11 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/checklst.h>
 #include <wx/slider.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_automation.h b/aegisub/src/dialog_automation.h
index c2b212dbe..393040968 100644
--- a/aegisub/src/dialog_automation.h
+++ b/aegisub/src/dialog_automation.h
@@ -41,14 +41,17 @@
 /// DOCME
 #define DIALOG_AUTOMATION_H
 
+#ifndef AGI_PRE
+#include <vector>
+
+#include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/listctrl.h>
-#include <wx/button.h>
-#include <vector>
+#endif
 
 
 /// DOCME
-namespace Automation4 { class ScriptManager; class Script; class AutoloadScriptManager; };
+namespace Automation4 { class ScriptManager; class Script; };
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_colorpicker.h b/aegisub/src/dialog_colorpicker.h
index 87e634713..e889746e6 100644
--- a/aegisub/src/dialog_colorpicker.h
+++ b/aegisub/src/dialog_colorpicker.h
@@ -39,17 +39,18 @@
 /// DOCME
 #define DIALOG_COLORPICKER_H
 
-
-#include <wx/dialog.h>
-#include <wx/spinctrl.h>
-#include <wx/colour.h>
-#include <wx/bitmap.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/choice.h>
-#include <wx/statbmp.h>
+#ifndef AGI_PRE
 #include <vector>
 
+#include <wx/bitmap.h>
+#include <wx/button.h>
+#include <wx/choice.h>
+#include <wx/colour.h>
+#include <wx/dialog.h>
+#include <wx/spinctrl.h>
+#include <wx/statbmp.h>
+#include <wx/textctrl.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_detached_video.h b/aegisub/src/dialog_detached_video.h
index d18647407..4baf72208 100644
--- a/aegisub/src/dialog_detached_video.h
+++ b/aegisub/src/dialog_detached_video.h
@@ -38,8 +38,9 @@
 #pragma once
 
 
+#ifndef AGI_PRE
 #include <wx/dialog.h>
-
+#endif
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/dialog_dummy_video.h b/aegisub/src/dialog_dummy_video.h
index 17197b9f6..3b841e41c 100644
--- a/aegisub/src/dialog_dummy_video.h
+++ b/aegisub/src/dialog_dummy_video.h
@@ -39,15 +39,18 @@
 /// DOCME
 #define _DIALOG_DUMMY_VIDEO_H
 
-#include <wx/dialog.h>
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/spinctrl.h>
-#include <wx/combobox.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/dialog.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
 #include <wx/textctrl.h>
-#include "video_provider_dummy.h"
+#endif
+
 #include "colour_button.h"
+#include "video_provider_dummy.h"
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_export.h b/aegisub/src/dialog_export.h
index f9f03efe1..1460cfd26 100644
--- a/aegisub/src/dialog_export.h
+++ b/aegisub/src/dialog_export.h
@@ -40,15 +40,17 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <map>
+
+#include <wx/checklst.h>
+#include <wx/choice.h>
 #include <wx/dialog.h>
+#include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/checklst.h>
-#include <wx/choice.h>
-#include <wx/panel.h>
-#include <map>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h
index 28dd05ef7..e1883dc76 100644
--- a/aegisub/src/dialog_fonts_collector.h
+++ b/aegisub/src/dialog_fonts_collector.h
@@ -40,12 +40,15 @@
 
 ////////////
 // Includes
-#include <wx/stc/stc.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
 #include <wx/dialog.h>
 #include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/stc/stc.h>
+#include <wx/textctrl.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/dialog_jumpto.h b/aegisub/src/dialog_jumpto.h
index 118b569a5..696384f9c 100644
--- a/aegisub/src/dialog_jumpto.h
+++ b/aegisub/src/dialog_jumpto.h
@@ -47,7 +47,6 @@
 #include "timeedit_ctrl.h"
 
 
-
 /// DOCME
 /// @class DialogJumpTo
 /// @brief DOCME
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h
index 87094a0dc..f82eeee53 100644
--- a/aegisub/src/dialog_kara_timing_copy.h
+++ b/aegisub/src/dialog_kara_timing_copy.h
@@ -43,16 +43,20 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <vector>
+
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/dialog.h>
 #include <wx/listctrl.h>
 #include <wx/regex.h>
-#include <wx/checkbox.h>
-#include <wx/dialog.h>
-#include <wx/combobox.h>
-#include <vector>
-#include "options.h"
-#include "kana_table.h"
-#include "ass_file.h"
+#endif
+
 #include "ass_entry.h"
+#include "ass_file.h"
+#include "kana_table.h"
+#include "options.h"
 
 
 //////////////
diff --git a/aegisub/src/dialog_options.h b/aegisub/src/dialog_options.h
index f973f0f11..2c4557694 100644
--- a/aegisub/src/dialog_options.h
+++ b/aegisub/src/dialog_options.h
@@ -40,12 +40,16 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
+#include <map>
+#include <vector>
+
 #include <wx/dialog.h>
 #include <wx/listctrl.h>
-#include <vector>
-#include <map>
-#include "options.h"
+#endif
+
 #include "hotkeys.h"
+#include "options.h"
 
 
 //////////////
diff --git a/aegisub/src/dialog_paste_over.h b/aegisub/src/dialog_paste_over.h
index 5299a2274..bfb830f4b 100644
--- a/aegisub/src/dialog_paste_over.h
+++ b/aegisub/src/dialog_paste_over.h
@@ -40,9 +40,10 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/checklst.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_progress.h b/aegisub/src/dialog_progress.h
index 64f0cdb84..5f436814a 100644
--- a/aegisub/src/dialog_progress.h
+++ b/aegisub/src/dialog_progress.h
@@ -43,10 +43,11 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/gauge.h>
 #include <wx/stattext.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_properties.h b/aegisub/src/dialog_properties.h
index 063337c47..8dcdd855d 100644
--- a/aegisub/src/dialog_properties.h
+++ b/aegisub/src/dialog_properties.h
@@ -40,10 +40,11 @@
 
 ///////////
 // Headers
-#include <wx/textctrl.h>
-#include <wx/combobox.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
-
+#include <wx/combobox.h>
+#include <wx/textctrl.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_resample.h b/aegisub/src/dialog_resample.h
index 25473a1ff..7e17db77c 100644
--- a/aegisub/src/dialog_resample.h
+++ b/aegisub/src/dialog_resample.h
@@ -43,10 +43,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <wx/checkbox.h>
 #include <wx/dialog.h>
 #include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/checkbox.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_search_replace.h b/aegisub/src/dialog_search_replace.h
index 852418e3e..5df5e8a0b 100644
--- a/aegisub/src/dialog_search_replace.h
+++ b/aegisub/src/dialog_search_replace.h
@@ -40,12 +40,14 @@
 
 ///////////
 // Headers
-#include <wx/dialog.h>
-#include <wx/string.h>
-#include <wx/combobox.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
-#include <wx/textctrl.h>
+#include <wx/combobox.h>
+#include <wx/dialog.h>
 #include <wx/radiobox.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_selection.h b/aegisub/src/dialog_selection.h
index 53ac9defc..7729cc556 100644
--- a/aegisub/src/dialog_selection.h
+++ b/aegisub/src/dialog_selection.h
@@ -43,11 +43,14 @@
 
 ///////////
 // Headers
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
-#include <wx/radiobut.h>
+#include <wx/combobox.h>
+#include <wx/dialog.h>
 #include <wx/radiobox.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_shift_times.h b/aegisub/src/dialog_shift_times.h
index 0ce4f18aa..f8c617827 100644
--- a/aegisub/src/dialog_shift_times.h
+++ b/aegisub/src/dialog_shift_times.h
@@ -43,10 +43,13 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
-#include <wx/radiobut.h>
-#include <wx/radiobox.h>
 #include <wx/listbox.h>
+#include <wx/radiobox.h>
+#include <wx/radiobut.h>
+#endif
+
 #include "timeedit_ctrl.h"
 
 
diff --git a/aegisub/src/dialog_spellchecker.h b/aegisub/src/dialog_spellchecker.h
index 39d46e597..b7c492b79 100644
--- a/aegisub/src/dialog_spellchecker.h
+++ b/aegisub/src/dialog_spellchecker.h
@@ -38,12 +38,15 @@
 
 ///////////
 // Headers
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <wx/listbox.h>
-#include <wx/combobox.h>
+#ifndef AGI_PRE
 #include <map>
 
+#include <wx/dialog.h>
+#include <wx/combobox.h>
+#include <wx/listbox.h>
+#include <wx/textctrl.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/dialog_splash.h b/aegisub/src/dialog_splash.h
index 141589c8b..19e68392c 100644
--- a/aegisub/src/dialog_splash.h
+++ b/aegisub/src/dialog_splash.h
@@ -43,9 +43,10 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/frame.h>
 #include <wx/timer.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_style_editor.h b/aegisub/src/dialog_style_editor.h
index 714966d76..7637fa2a5 100644
--- a/aegisub/src/dialog_style_editor.h
+++ b/aegisub/src/dialog_style_editor.h
@@ -43,11 +43,14 @@
 
 ////////////
 // Includes
-#include <wx/spinctrl.h>
-#include <wx/combobox.h>
+#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 "colour_button.h"
 
 
diff --git a/aegisub/src/dialog_style_manager.h b/aegisub/src/dialog_style_manager.h
index d7e73c63a..c42af09e1 100644
--- a/aegisub/src/dialog_style_manager.h
+++ b/aegisub/src/dialog_style_manager.h
@@ -43,11 +43,15 @@
 
 ////////////
 // Includes
-#include <wx/dialog.h>
-#include <wx/combobox.h>
-#include <wx/listbox.h>
-#include <wx/button.h>
+#ifndef AGI_PRE
 #include <vector>
+
+#include <wx/button.h>
+#include <wx/combobox.h>
+#include <wx/dialog.h>
+#include <wx/listbox.h>
+#endif
+
 #include "ass_style_storage.h"
 
 
diff --git a/aegisub/src/dialog_styling_assistant.h b/aegisub/src/dialog_styling_assistant.h
index bbe42af4c..852406251 100644
--- a/aegisub/src/dialog_styling_assistant.h
+++ b/aegisub/src/dialog_styling_assistant.h
@@ -43,11 +43,13 @@
 
 ///////////
 // Headers
-#include <wx/dialog.h>
-#include <wx/colour.h>
-#include <wx/textctrl.h>
-#include <wx/listbox.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
+#include <wx/colour.h>
+#include <wx/dialog.h>
+#include <wx/listbox.h>
+#include <wx/textctrl.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_text_import.h b/aegisub/src/dialog_text_import.h
index 6850d4d05..fa1c6d2a9 100644
--- a/aegisub/src/dialog_text_import.h
+++ b/aegisub/src/dialog_text_import.h
@@ -41,9 +41,10 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_timing_processor.h b/aegisub/src/dialog_timing_processor.h
index ee7792759..f99f7a5da 100644
--- a/aegisub/src/dialog_timing_processor.h
+++ b/aegisub/src/dialog_timing_processor.h
@@ -42,14 +42,17 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <vector>
+
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/checklst.h>
 #include <wx/dialog.h>
 #include <wx/sizer.h>
-#include <wx/checkbox.h>
-#include <wx/textctrl.h>
 #include <wx/slider.h>
-#include <wx/checklst.h>
-#include <wx/button.h>
-#include <vector>
+#include <wx/textctrl.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_tip.h b/aegisub/src/dialog_tip.h
index 51df09dd1..b50f84f27 100644
--- a/aegisub/src/dialog_tip.h
+++ b/aegisub/src/dialog_tip.h
@@ -40,9 +40,11 @@
 
 ///////////
 // Headers
-#include <wx/tipdlg.h>
+#ifndef AGI_PRE
 #include <vector>
 
+#include <wx/tipdlg.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_translation.h b/aegisub/src/dialog_translation.h
index 9c2ccd09d..fe3c62552 100644
--- a/aegisub/src/dialog_translation.h
+++ b/aegisub/src/dialog_translation.h
@@ -43,9 +43,11 @@
 
 ///////////
 // Headers
-#include <wx/stattext.h>
+#ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
+#include <wx/stattext.h>
+#endif
 
 #include "scintilla_text_ctrl.h"
 
diff --git a/aegisub/src/dialog_version_check.h b/aegisub/src/dialog_version_check.h
index 87ca14334..49bbcf602 100644
--- a/aegisub/src/dialog_version_check.h
+++ b/aegisub/src/dialog_version_check.h
@@ -40,9 +40,11 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
-#include <wx/textctrl.h>
 #include <wx/sizer.h>
+#include <wx/textctrl.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/dialog_video_details.h b/aegisub/src/dialog_video_details.h
index fb1e992b7..ffed2f7d2 100644
--- a/aegisub/src/dialog_video_details.h
+++ b/aegisub/src/dialog_video_details.h
@@ -41,7 +41,9 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dialog.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/drop.h b/aegisub/src/drop.h
index f403c5a13..668b3d045 100644
--- a/aegisub/src/drop.h
+++ b/aegisub/src/drop.h
@@ -43,7 +43,9 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/dnd.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/export_clean_info.h b/aegisub/src/export_clean_info.h
index 4beee249e..58950b367 100644
--- a/aegisub/src/export_clean_info.h
+++ b/aegisub/src/export_clean_info.h
@@ -43,7 +43,6 @@
 #include "ass_export_filter.h"
 
 
-
 /// DOCME
 /// @class AssTransformCleanInfoFilter
 /// @brief DOCME
diff --git a/aegisub/src/export_fixstyle.h b/aegisub/src/export_fixstyle.h
index 5059b57b8..c2a51b500 100644
--- a/aegisub/src/export_fixstyle.h
+++ b/aegisub/src/export_fixstyle.h
@@ -43,7 +43,6 @@
 #include "ass_export_filter.h"
 
 
-
 /// DOCME
 /// @class AssFixStylesFilter
 /// @brief DOCME
diff --git a/aegisub/src/export_framerate.h b/aegisub/src/export_framerate.h
index bf3639058..5f7231514 100644
--- a/aegisub/src/export_framerate.h
+++ b/aegisub/src/export_framerate.h
@@ -40,13 +40,16 @@
 
 ///////////
 // Headers
-#include <wx/textctrl.h>
-#include <wx/sizer.h>
-#include <wx/radiobut.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
-#include <wx/panel.h>
-#include <wx/stattext.h>
 #include <wx/checkbox.h>
+#include <wx/panel.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#endif
+
 #include "ass_export_filter.h"
 #include "vfr.h"
 
diff --git a/aegisub/src/export_visible_lines.h b/aegisub/src/export_visible_lines.h
index 740f2f996..c659908a0 100644
--- a/aegisub/src/export_visible_lines.h
+++ b/aegisub/src/export_visible_lines.h
@@ -43,7 +43,6 @@
 #include "ass_export_filter.h"
 
 
-
 /// DOCME
 /// @class AssLimitToVisibleFilter
 /// @brief DOCME
diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h
index 2b267680f..bb717809d 100644
--- a/aegisub/src/factory_manager.h
+++ b/aegisub/src/factory_manager.h
@@ -40,9 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <map>
-#include <wx/string.h>
+
 #include <wx/arrstr.h>
+#include <wx/string.h>
+#endif
 
 
 /////////////////
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index 254103128..ec7d25ae6 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -39,12 +39,17 @@
 
 ///////////
 // Headers
-#include <wx/thread.h>
-#include "include/aegisub/aegisub.h"
-#include <ffms.h>
+#ifndef AGI_PRE
 #include <map>
+
 #include <wx/filename.h>
+#include <wx/thread.h>
+#endif
+
+#include <ffms.h>
+
 #include "dialog_progress.h"
+#include "include/aegisub/aegisub.h"
 
 
 /// Index all tracks
diff --git a/aegisub/src/fft.h b/aegisub/src/fft.h
index b3e7984b7..1316748d1 100644
--- a/aegisub/src/fft.h
+++ b/aegisub/src/fft.h
@@ -40,8 +40,9 @@
 /// DOCME
 #define FFT_H
 
-
+#ifndef AGI_PRE
 #include <stdlib.h> // size_t
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/font_file_lister.h b/aegisub/src/font_file_lister.h
index 509907e00..452b68c53 100644
--- a/aegisub/src/font_file_lister.h
+++ b/aegisub/src/font_file_lister.h
@@ -40,10 +40,13 @@
 
 ////////////
 // Includes
-#include <wx/string.h>
-#include <wx/arrstr.h>
+#ifndef AGI_PRE
 #include <map>
 
+#include <wx/arrstr.h>
+#include <wx/string.h>
+#endif
+
 
 ////////////
 // Typedefs
diff --git a/aegisub/src/font_file_lister_fontconfig.h b/aegisub/src/font_file_lister_fontconfig.h
index 1830d89f1..24f1481fa 100644
--- a/aegisub/src/font_file_lister_fontconfig.h
+++ b/aegisub/src/font_file_lister_fontconfig.h
@@ -42,8 +42,8 @@
 // Includes
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>
-#include "font_file_lister.h"
 
+#include "font_file_lister.h"
 
 
 /// DOCME
diff --git a/aegisub/src/font_file_lister_freetype.h b/aegisub/src/font_file_lister_freetype.h
index 40874849a..42bb4e352 100644
--- a/aegisub/src/font_file_lister_freetype.h
+++ b/aegisub/src/font_file_lister_freetype.h
@@ -43,7 +43,6 @@
 #include "font_file_lister.h"
 
 
-
 /// DOCME
 typedef struct FT_LibraryRec_ *FT_Library;
 
diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h
index 4e6680210..38b9f9f96 100644
--- a/aegisub/src/frame_main.h
+++ b/aegisub/src/frame_main.h
@@ -43,15 +43,17 @@
 
 ///////////////////
 // Include headers
-#include <wx/frame.h>
-#include <wx/menu.h>
-#include <wx/log.h>
-#include <wx/timer.h>
-#include <wx/combobox.h>
-#include <wx/sizer.h>
-#include <wx/panel.h>
+#ifndef AGI_PRE
 #include <vector>
 
+#include <wx/combobox.h>
+#include <wx/frame.h>
+#include <wx/log.h>
+#include <wx/menu.h>
+#include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/timer.h>
+#endif
 
 
 ////////////////////
diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h
index a51719af2..c126b676e 100644
--- a/aegisub/src/gl_text.h
+++ b/aegisub/src/gl_text.h
@@ -38,16 +38,20 @@
 
 ///////////
 // Headers
+
+#ifndef AGI_PRE
+#include <map>
+#include <vector>
+
 #include <wx/bitmap.h>
 #include <wx/font.h>
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #else
 #include <GL/gl.h>
 #endif
-#include <map>
-#include <vector>
-
 
 
 /// DOCME
diff --git a/aegisub/src/gl_wrap.h b/aegisub/src/gl_wrap.h
index 153abcd72..af6cab0e8 100644
--- a/aegisub/src/gl_wrap.h
+++ b/aegisub/src/gl_wrap.h
@@ -36,6 +36,7 @@
 
 
 #pragma once
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
@@ -46,9 +47,11 @@
 /// DOCME
 typedef GLuint GLhandleARB;
 #endif
+
+#ifndef AGI_PRE
 #include <wx/thread.h>
 #include <wx/colour.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/help_button.h b/aegisub/src/help_button.h
index a3cb073d5..51ebb6434 100644
--- a/aegisub/src/help_button.h
+++ b/aegisub/src/help_button.h
@@ -40,10 +40,11 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <map>
 
 #include <wx/button.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/hilimod_textctrl.h b/aegisub/src/hilimod_textctrl.h
index b279f1cd3..8ea7dec84 100644
--- a/aegisub/src/hilimod_textctrl.h
+++ b/aegisub/src/hilimod_textctrl.h
@@ -43,8 +43,9 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/textctrl.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/hotkeys.h b/aegisub/src/hotkeys.h
index 4416424ff..45d3be217 100644
--- a/aegisub/src/hotkeys.h
+++ b/aegisub/src/hotkeys.h
@@ -43,10 +43,13 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
-#include <wx/accel.h>
+#ifndef AGI_PRE
 #include <map>
 
+#include <wx/accel.h>
+#include <wx/string.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/idle_field_event.h b/aegisub/src/idle_field_event.h
index d1571f38e..b2a4a2f34 100644
--- a/aegisub/src/idle_field_event.h
+++ b/aegisub/src/idle_field_event.h
@@ -40,10 +40,11 @@
 
 ///////////
 // Headers
-#include <wx/event.h>
+#ifndef AGI_PRE
 #include <wx/combobox.h>
+#include <wx/event.h>
 #include <wx/textctrl.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/include/aegisub/aegisub.h b/aegisub/src/include/aegisub/aegisub.h
index b0e57eb23..230c059ab 100644
--- a/aegisub/src/include/aegisub/aegisub.h
+++ b/aegisub/src/include/aegisub/aegisub.h
@@ -37,8 +37,9 @@
 
 #pragma once
 
-
+#ifndef AGI_PRE
 #include <stdint.h>
+#endif
 
 
 /// @brief Namespace for Aegisub internals
diff --git a/aegisub/src/include/aegisub/audio_player.h b/aegisub/src/include/aegisub/audio_player.h
index 7b83b750a..fa3429df2 100644
--- a/aegisub/src/include/aegisub/audio_player.h
+++ b/aegisub/src/include/aegisub/audio_player.h
@@ -40,9 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/event.h>
-#include <wx/timer.h>
 #include <wx/thread.h>
+#include <wx/timer.h>
+#endif
+
 #include "aegisub.h"
 
 
diff --git a/aegisub/src/include/aegisub/audio_provider.h b/aegisub/src/include/aegisub/audio_provider.h
index bb6f9a79f..40a16295c 100644
--- a/aegisub/src/include/aegisub/audio_provider.h
+++ b/aegisub/src/include/aegisub/audio_provider.h
@@ -40,9 +40,13 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/string.h>
+#endif
+
 #include "aegisub.h"
 
+
 //////////////
 // Prototypes
 class VideoProvider;
diff --git a/aegisub/src/include/aegisub/exception.h b/aegisub/src/include/aegisub/exception.h
index cb0a70c34..d79d595fd 100644
--- a/aegisub/src/include/aegisub/exception.h
+++ b/aegisub/src/include/aegisub/exception.h
@@ -35,8 +35,9 @@
 ///
 
 
+#ifndef AGI_PRE
 #include <wx/string.h>
-
+#endif
 
 
 /// @see aegisub.h
diff --git a/aegisub/src/include/aegisub/spellchecker.h b/aegisub/src/include/aegisub/spellchecker.h
index 71109928a..36b736fae 100644
--- a/aegisub/src/include/aegisub/spellchecker.h
+++ b/aegisub/src/include/aegisub/spellchecker.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
-#include "aegisub.h"
-
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <wx/arrstr.h>
+#include <wx/string.h>
+#endif
+
+#include "aegisub.h"
 
 
 /// @class SpellChecker
diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h
index 8f3b5a356..18648ab4a 100644
--- a/aegisub/src/include/aegisub/video_provider.h
+++ b/aegisub/src/include/aegisub/video_provider.h
@@ -40,9 +40,9 @@
 
 //////////
 // Headers
-#include "video_frame.h"
 #include "aegisub.h"
 #include "vfr.h"
+#include "video_frame.h"
 
 
 /// @class VideoProvider
diff --git a/aegisub/src/kana_table.h b/aegisub/src/kana_table.h
index 82085ace5..c0a06cef2 100644
--- a/aegisub/src/kana_table.h
+++ b/aegisub/src/kana_table.h
@@ -37,9 +37,11 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <list>
-#include <wx/string.h>
 
+#include <wx/string.h>
+#endif
 
 
 /// @class KanaEntry
diff --git a/aegisub/src/keyframe.h b/aegisub/src/keyframe.h
index 4e4ef6c15..c8f146690 100644
--- a/aegisub/src/keyframe.h
+++ b/aegisub/src/keyframe.h
@@ -40,7 +40,6 @@
 #include "text_file_reader.h"
 
 
-
 /// DOCME
 /// @class KeyFrameFile
 /// @brief DOCME
diff --git a/aegisub/src/main.h b/aegisub/src/main.h
index 9e5fcb2c7..1dda60e50 100644
--- a/aegisub/src/main.h
+++ b/aegisub/src/main.h
@@ -37,7 +37,6 @@
 
 ///////////////////
 // Include headers
-
 #ifndef AGI_PRE
 #include <wx/app.h>
 #include <wx/file.h>
@@ -47,7 +46,6 @@
 #include "aegisublocale.h"
 
 
-
 //////////////
 // Prototypes
 class FrameMain;
diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h
index c785d8646..f0f89bcba 100644
--- a/aegisub/src/mkv_wrap.h
+++ b/aegisub/src/mkv_wrap.h
@@ -40,10 +40,14 @@
 
 ///////////
 // Headers
-#include <stdio.h>
-#include <vector>
-#include <list>
+#ifndef AGI_PRE
 #include <stdint.h>
+#include <stdio.h>
+
+#include <list>
+#include <vector>
+#endif
+
 #include "MatroskaParser.h"
 #include "vfr.h"
 
diff --git a/aegisub/src/options.h b/aegisub/src/options.h
index b8ba0d6cf..e75696bcd 100644
--- a/aegisub/src/options.h
+++ b/aegisub/src/options.h
@@ -40,11 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <map>
+#endif
+
 #include "variable_data.h"
 
-
-
 /// DOCME
 enum ModType {
 
diff --git a/aegisub/src/plugin_manager.h b/aegisub/src/plugin_manager.h
index ff3903298..6e3f7aab8 100644
--- a/aegisub/src/plugin_manager.h
+++ b/aegisub/src/plugin_manager.h
@@ -42,7 +42,6 @@
 #endif
 
 
-
 /// DOCME
 /// @class PluginManager
 /// @brief DOCME
diff --git a/aegisub/src/quicktime_common.h b/aegisub/src/quicktime_common.h
index 499f864f0..6ceb2b390 100644
--- a/aegisub/src/quicktime_common.h
+++ b/aegisub/src/quicktime_common.h
@@ -40,9 +40,14 @@
 #include "config.h"
 
 #ifdef WITH_QUICKTIME
+
+#ifndef AGI_PRE
 #include <wx/thread.h>
+#endif
+
 #include "include/aegisub/aegisub.h"
 
+
 // QT stuff
 #ifdef _MSC_VER
 
diff --git a/aegisub/src/scintilla_text_ctrl.h b/aegisub/src/scintilla_text_ctrl.h
index 208b5a51e..5e656a0b2 100644
--- a/aegisub/src/scintilla_text_ctrl.h
+++ b/aegisub/src/scintilla_text_ctrl.h
@@ -40,8 +40,9 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/stc/stc.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/spellchecker_hunspell.h b/aegisub/src/spellchecker_hunspell.h
index 19e4bafc4..c8c7341fb 100644
--- a/aegisub/src/spellchecker_hunspell.h
+++ b/aegisub/src/spellchecker_hunspell.h
@@ -40,10 +40,9 @@
 
 #ifdef WITH_HUNSPELL
 
-#include "include/aegisub/spellchecker.h"
 #include <hunspell/hunspell.hxx>
 
-
+#include "include/aegisub/spellchecker.h"
 
 
 /// @class HunspellSpellChecker
diff --git a/aegisub/src/spellchecker_manager.h b/aegisub/src/spellchecker_manager.h
index c98aae33f..93f271d9e 100644
--- a/aegisub/src/spellchecker_manager.h
+++ b/aegisub/src/spellchecker_manager.h
@@ -44,7 +44,6 @@
 #include "include/aegisub/spellchecker.h"
 
 
-
 /// DOCME
 /// @class SpellCheckerFactoryManager
 /// @brief DOCME
diff --git a/aegisub/src/spline.h b/aegisub/src/spline.h
index 776b78512..42dc1d69c 100644
--- a/aegisub/src/spline.h
+++ b/aegisub/src/spline.h
@@ -40,11 +40,14 @@
 
 ///////////
 // Headers
-#include <wx/gdicmn.h>
+#ifndef AGI_PRE
 #include <list>
 #include <vector>
-#include "spline_curve.h"
 
+#include <wx/gdicmn.h>
+#endif
+
+#include "spline_curve.h"
 
 
 /// DOCME
diff --git a/aegisub/src/spline_curve.h b/aegisub/src/spline_curve.h
index ab01928b1..cd7a4c871 100644
--- a/aegisub/src/spline_curve.h
+++ b/aegisub/src/spline_curve.h
@@ -43,7 +43,6 @@
 #include "vector2d.h"
 
 
-
 /// DOCME
 enum CurveType {
 
diff --git a/aegisub/src/standard_paths.h b/aegisub/src/standard_paths.h
index bc35820b8..802511f11 100644
--- a/aegisub/src/standard_paths.h
+++ b/aegisub/src/standard_paths.h
@@ -40,8 +40,9 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <map>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/static_bmp.h b/aegisub/src/static_bmp.h
index a7daa77d0..ba362e086 100644
--- a/aegisub/src/static_bmp.h
+++ b/aegisub/src/static_bmp.h
@@ -40,9 +40,10 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/bitmap.h>
 #include <wx/window.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/string_codec.h b/aegisub/src/string_codec.h
index 3fdb2bea5..0da51f67a 100644
--- a/aegisub/src/string_codec.h
+++ b/aegisub/src/string_codec.h
@@ -59,7 +59,9 @@
 /// DOCME
 #define _STRING_CODEC_H
 
+#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.h b/aegisub/src/subs_edit_box.h
index 8722b6443..17920bb84 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -40,14 +40,17 @@
 
 ////////////
 // Includes
-#include <wx/spinctrl.h>
-#include <wx/dcmemory.h>
-#include <wx/dcclient.h>
-#include <wx/radiobut.h>
+#ifndef AGI_PRE
+#include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
+#include <wx/dcclient.h>
+#include <wx/dcmemory.h>
 #include <wx/panel.h>
-#include <wx/button.h>
+#include <wx/radiobut.h>
+#include <wx/spinctrl.h>
+#endif
+
 #include "subs_edit_ctrl.h"
 
 
diff --git a/aegisub/src/subs_edit_ctrl.h b/aegisub/src/subs_edit_ctrl.h
index a9cae4557..20c8a6cd8 100644
--- a/aegisub/src/subs_edit_ctrl.h
+++ b/aegisub/src/subs_edit_ctrl.h
@@ -40,9 +40,9 @@
 
 ////////////
 // Includes
+#include "scintilla_text_ctrl.h"
 #include "spellchecker_manager.h"
 #include "thesaurus.h"
-#include "scintilla_text_ctrl.h"
 
 
 //////////////
diff --git a/aegisub/src/subs_grid.h b/aegisub/src/subs_grid.h
index 70d7a6c84..1b57c6677 100644
--- a/aegisub/src/subs_grid.h
+++ b/aegisub/src/subs_grid.h
@@ -40,16 +40,21 @@
 
 ////////////
 // Includes
-#include <wx/wx.h>
-#include <wx/grid.h>
-#include <vector>
+#ifndef AGI_PRE
+#include <fstream>
+#include <iostream>
 #include <list>
-#include "base_grid.h"
+#include <vector>
+
+#include <wx/grid.h>
+#include <wx/wx.h>
+#endif
+
+#include "audio_box.h"
 #include "audio_display.h"
 #include "audio_provider_manager.h"
-#include "audio_box.h"
-#include <iostream>
-#include <fstream>
+#include "base_grid.h"
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/subs_preview.h b/aegisub/src/subs_preview.h
index 157aee1d0..d6da63262 100644
--- a/aegisub/src/subs_preview.h
+++ b/aegisub/src/subs_preview.h
@@ -40,8 +40,10 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/window.h>
 #include <wx/bitmap.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/subtitle_format.h b/aegisub/src/subtitle_format.h
index 921a0e2e6..ef0ae787e 100644
--- a/aegisub/src/subtitle_format.h
+++ b/aegisub/src/subtitle_format.h
@@ -40,10 +40,13 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
-#include <wx/arrstr.h>
+#ifndef AGI_PRE
 #include <list>
 
+#include <wx/arrstr.h>
+#include <wx/string.h>
+#endif
+
 
 //////////////
 // Prototypes
diff --git a/aegisub/src/subtitle_format_dvd.h b/aegisub/src/subtitle_format_dvd.h
index 54bebdf51..ddf48b54e 100644
--- a/aegisub/src/subtitle_format_dvd.h
+++ b/aegisub/src/subtitle_format_dvd.h
@@ -40,8 +40,11 @@
 
 ///////////
 // Headers
-#include "subtitle_format.h"
+#ifndef AGI_PRE
 #include <vector>
+#endif
+
+#include "subtitle_format.h"
 
 
 /// DOCME
diff --git a/aegisub/src/subtitle_format_encore.h b/aegisub/src/subtitle_format_encore.h
index 340303078..07e4d0a3d 100644
--- a/aegisub/src/subtitle_format_encore.h
+++ b/aegisub/src/subtitle_format_encore.h
@@ -43,7 +43,6 @@
 #include "subtitle_format.h"
 
 
-
 /// DOCME
 /// @class EncoreSubtitleFormat
 /// @brief DOCME
diff --git a/aegisub/src/subtitle_format_microdvd.h b/aegisub/src/subtitle_format_microdvd.h
index 7cb270dec..1577fc382 100644
--- a/aegisub/src/subtitle_format_microdvd.h
+++ b/aegisub/src/subtitle_format_microdvd.h
@@ -43,7 +43,6 @@
 #include "subtitle_format.h"
 
 
-
 /// DOCME
 /// @class MicroDVDSubtitleFormat
 /// @brief DOCME
diff --git a/aegisub/src/subtitle_format_mkv.h b/aegisub/src/subtitle_format_mkv.h
index 28d6594e0..a129af6ed 100644
--- a/aegisub/src/subtitle_format_mkv.h
+++ b/aegisub/src/subtitle_format_mkv.h
@@ -48,7 +48,6 @@
 class AssDialogue;
 
 
-
 /// DOCME
 /// @class MKVSubtitleFormat
 /// @brief DOCME
diff --git a/aegisub/src/subtitle_format_prs.h b/aegisub/src/subtitle_format_prs.h
index d5c67cf2f..dc57aca0c 100644
--- a/aegisub/src/subtitle_format_prs.h
+++ b/aegisub/src/subtitle_format_prs.h
@@ -41,8 +41,12 @@
 ///////////
 // Headers
 #if USE_PRS == 1
-#include "subtitle_format.h"
+
+#ifndef AGI_PRE
 #include <vector>
+#endif
+
+#include "subtitle_format.h"
 
 
 //////////////
diff --git a/aegisub/src/subtitle_format_transtation.h b/aegisub/src/subtitle_format_transtation.h
index 35d14c917..63aa8724b 100644
--- a/aegisub/src/subtitle_format_transtation.h
+++ b/aegisub/src/subtitle_format_transtation.h
@@ -43,7 +43,6 @@
 #include "subtitle_format.h"
 
 
-
 /// DOCME
 /// @class TranStationSubtitleFormat
 /// @brief DOCME
diff --git a/aegisub/src/subtitle_format_ttxt.h b/aegisub/src/subtitle_format_ttxt.h
index 268f4b8d5..5c1574f43 100644
--- a/aegisub/src/subtitle_format_ttxt.h
+++ b/aegisub/src/subtitle_format_ttxt.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+#include <wx/xml/xml.h>
+#endif
+
 #include "ass_dialogue.h"
 #include "subtitle_format.h"
-#include <wx/xml/xml.h>
-
 
 
 /// DOCME
diff --git a/aegisub/src/subtitle_format_txt.h b/aegisub/src/subtitle_format_txt.h
index f7b16b1be..348c9725e 100644
--- a/aegisub/src/subtitle_format_txt.h
+++ b/aegisub/src/subtitle_format_txt.h
@@ -48,7 +48,6 @@
 class AssDialogue;
 
 
-
 /// DOCME
 /// @class TXTSubtitleFormat
 /// @brief DOCME
diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h
index 6bcbcf18d..4577a0d40 100644
--- a/aegisub/src/subtitles_provider_csri.h
+++ b/aegisub/src/subtitles_provider_csri.h
@@ -50,7 +50,7 @@
 #ifdef __WINDOWS__
 #include "../../contrib/csri/include/csri/csri.h"
 #else
-#include "csri/csri.h"
+#include <csri/csri.h>
 #endif
 
 
diff --git a/aegisub/src/subtitles_provider_manager.h b/aegisub/src/subtitles_provider_manager.h
index a4be44ca0..4369fe6e1 100644
--- a/aegisub/src/subtitles_provider_manager.h
+++ b/aegisub/src/subtitles_provider_manager.h
@@ -40,10 +40,9 @@
 
 ///////////
 // Headers
+#include "factory_manager.h"
 #include "include/aegisub/subtitles_provider.h"
 #include "video_frame.h"
-#include "factory_manager.h"
-
 
 
 /// DOCME
diff --git a/aegisub/src/text_file_reader.h b/aegisub/src/text_file_reader.h
index 8800e647e..1bdb14e63 100644
--- a/aegisub/src/text_file_reader.h
+++ b/aegisub/src/text_file_reader.h
@@ -36,10 +36,14 @@
 
 #pragma once
 
+#ifndef AGI_PRE
+#include <fstream>
+
+#include <iconv.h>
+
 #include <wx/dynarray.h>
 #include <wx/string.h>
-#include <fstream>
-#include <iconv.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/text_file_writer.h b/aegisub/src/text_file_writer.h
index d8233f6ab..e7e8b6adf 100644
--- a/aegisub/src/text_file_writer.h
+++ b/aegisub/src/text_file_writer.h
@@ -40,10 +40,14 @@
 /// DOCME
 #define TEXT_FILE_WRITER_H
 
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <fstream>
 #include <memory>
 
+#include <wx/string.h>
+#endif
+
+
 class AegisubCSConv;
 
 
diff --git a/aegisub/src/thesaurus.h b/aegisub/src/thesaurus.h
index 0ff9cee14..cc4aa9bdf 100644
--- a/aegisub/src/thesaurus.h
+++ b/aegisub/src/thesaurus.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
-#include <wx/string.h>
-#include <wx/arrstr.h>
+#ifndef AGI_PRE
 #include <vector>
 
+#include <wx/arrstr.h>
+#include <wx/string.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/thesaurus_myspell.h b/aegisub/src/thesaurus_myspell.h
index 7ea73972e..754268d9f 100644
--- a/aegisub/src/thesaurus_myspell.h
+++ b/aegisub/src/thesaurus_myspell.h
@@ -48,7 +48,6 @@
 class MyThes;
 
 
-
 /// DOCME
 /// @class MySpellThesaurus
 /// @brief DOCME
diff --git a/aegisub/src/timeedit_ctrl.h b/aegisub/src/timeedit_ctrl.h
index f74e7c325..d11d69d7c 100644
--- a/aegisub/src/timeedit_ctrl.h
+++ b/aegisub/src/timeedit_ctrl.h
@@ -40,9 +40,13 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/textctrl.h>
+#endif
+
 #include "ass_time.h"
 
+
 /// @class TimeEdit
 /// @brief DOCME
 ///
diff --git a/aegisub/src/toggle_bitmap.h b/aegisub/src/toggle_bitmap.h
index 688a693ab..c303b2c59 100644
--- a/aegisub/src/toggle_bitmap.h
+++ b/aegisub/src/toggle_bitmap.h
@@ -43,9 +43,10 @@
 
 ///////////
 // Headers
-#include <wx/control.h>
+#ifndef AGI_PRE
 #include <wx/bitmap.h>
-
+#include <wx/control.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/tooltip_manager.h b/aegisub/src/tooltip_manager.h
index 75ff0fb81..331b8a057 100644
--- a/aegisub/src/tooltip_manager.h
+++ b/aegisub/src/tooltip_manager.h
@@ -40,11 +40,13 @@
 
 ///////////
 // Headers
-#include <wx/window.h>
-#include <wx/string.h>
-#include <wx/arrstr.h>
+#ifndef AGI_PRE
 #include <list>
 
+#include <wx/arrstr.h>
+#include <wx/string.h>
+#include <wx/window.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h
index ba40f5fc9..aaac6ee2a 100644
--- a/aegisub/src/utils.h
+++ b/aegisub/src/utils.h
@@ -40,12 +40,15 @@
 
 ///////////
 // Headers
-#include <wx/menuitem.h>
-#include <wx/icon.h>
-#include <vector>
-#include <utility>
+#ifndef AGI_PRE
 #include <stdint.h>
 
+#include <utility>
+#include <vector>
+
+#include <wx/icon.h>
+#include <wx/menuitem.h>
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/validators.h b/aegisub/src/validators.h
index 97d292fcc..a4563d6f8 100644
--- a/aegisub/src/validators.h
+++ b/aegisub/src/validators.h
@@ -40,11 +40,11 @@
 /// DOCME
 #define VALIDATORS_H
 
-
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/validate.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/variable_data.h b/aegisub/src/variable_data.h
index 2d3a0bc37..6178c629d 100644
--- a/aegisub/src/variable_data.h
+++ b/aegisub/src/variable_data.h
@@ -40,8 +40,9 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/colour.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/vector2d.h b/aegisub/src/vector2d.h
index 51f7d93e0..63d20405a 100644
--- a/aegisub/src/vector2d.h
+++ b/aegisub/src/vector2d.h
@@ -38,7 +38,6 @@
 #pragma once
 
 
-
 /// DOCME
 /// @class Vector2D
 /// @brief DOCME
diff --git a/aegisub/src/vfr.h b/aegisub/src/vfr.h
index faf154041..ed76c472d 100644
--- a/aegisub/src/vfr.h
+++ b/aegisub/src/vfr.h
@@ -44,9 +44,14 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
+
 #include <list>
 #include <vector>
+
 #include <wx/dynarray.h>
+#endif
+
 #include "include/aegisub/aegisub.h"
 
 
diff --git a/aegisub/src/video_box.h b/aegisub/src/video_box.h
index 65afd6e06..a6fc668d9 100644
--- a/aegisub/src/video_box.h
+++ b/aegisub/src/video_box.h
@@ -40,11 +40,13 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/panel.h>
-#include <wx/tglbtn.h>
 #include <wx/sizer.h>
 #include <wx/textctrl.h>
+#include <wx/tglbtn.h>
 #include <wx/toolbar.h>
+#endif
 
 
 //////////////
diff --git a/aegisub/src/video_context.h b/aegisub/src/video_context.h
index 3c2c40d64..4b35b50f0 100644
--- a/aegisub/src/video_context.h
+++ b/aegisub/src/video_context.h
@@ -40,14 +40,20 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <time.h>
+
+#include <list>
+
 #include <wx/glcanvas.h>
 #include <wx/timer.h>
 #include <wx/stopwatch.h>
+#endif
+
 #if ! wxUSE_GLCANVAS
 #error "Aegisub requires wxWidgets to be compiled with OpenGL support."
 #endif
-#include <list>
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
@@ -58,6 +64,7 @@
 /// DOCME
 typedef GLuint GLhandleARB;
 #endif
+
 #include "video_frame.h"
 
 
diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h
index ece18eb15..5734659ac 100644
--- a/aegisub/src/video_display.h
+++ b/aegisub/src/video_display.h
@@ -36,9 +36,12 @@
 
 #pragma once
 
+#ifndef AGI_PRE
 #include <wx/glcanvas.h>
 #include <wx/combobox.h>
 #include <wx/textctrl.h>
+#endif
+
 
 // Prototypes
 class VideoSlider;
diff --git a/aegisub/src/video_frame.h b/aegisub/src/video_frame.h
index 81399e466..f90129c45 100644
--- a/aegisub/src/video_frame.h
+++ b/aegisub/src/video_frame.h
@@ -36,8 +36,9 @@
 
 
 #pragma once
+#ifndef AGI_PRE
 #include <wx/image.h>
-
+#endif
 
 
 /// DOCME
diff --git a/aegisub/src/video_provider_avs.h b/aegisub/src/video_provider_avs.h
index 04693420d..d969c4881 100644
--- a/aegisub/src/video_provider_avs.h
+++ b/aegisub/src/video_provider_avs.h
@@ -42,7 +42,6 @@
 #include "include/aegisub/video_provider.h"
 
 
-
 /// DOCME
 /// @class AvisynthVideoProvider
 /// @brief DOCME
diff --git a/aegisub/src/video_provider_cache.h b/aegisub/src/video_provider_cache.h
index 1153a3e29..e9b2b5980 100644
--- a/aegisub/src/video_provider_cache.h
+++ b/aegisub/src/video_provider_cache.h
@@ -40,12 +40,14 @@
 
 //////////
 // Headers
+#ifndef AGI_PRE
 #include <list>
+#endif
+
 #include "include/aegisub/video_provider.h"
 #include "vfr.h"
 
 
-
 /// DOCME
 /// @class CachedFrame
 /// @brief DOCME
diff --git a/aegisub/src/video_provider_dummy.h b/aegisub/src/video_provider_dummy.h
index ff8d6376a..d59582908 100644
--- a/aegisub/src/video_provider_dummy.h
+++ b/aegisub/src/video_provider_dummy.h
@@ -44,10 +44,12 @@
 
 ///////////
 // Headers
-#include "include/aegisub/video_provider.h"
+#ifndef AGI_PRE
 #include <wx/colour.h>
-#include "vfr.h"
+#endif
 
+#include "include/aegisub/video_provider.h"
+#include "vfr.h"
 
 
 /// DOCME
diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h
index 5fcb4a837..4ae04c9c6 100644
--- a/aegisub/src/video_provider_ffmpegsource.h
+++ b/aegisub/src/video_provider_ffmpegsource.h
@@ -37,11 +37,13 @@
 ///////////
 // Headers
 #ifdef WITH_FFMPEGSOURCE
-#include "include/aegisub/video_provider.h"
-#include "ffmpegsource_common.h"
-#include "vfr.h"
+#ifndef AGI_PRE
 #include <vector>
+#endif
 
+#include "ffmpegsource_common.h"
+#include "include/aegisub/video_provider.h"
+#include "vfr.h"
 
 
 /// DOCME
diff --git a/aegisub/src/video_provider_manager.h b/aegisub/src/video_provider_manager.h
index b6a7a5bff..80662870b 100644
--- a/aegisub/src/video_provider_manager.h
+++ b/aegisub/src/video_provider_manager.h
@@ -40,11 +40,13 @@
 
 //////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/intl.h>
+#endif
+
+#include "factory_manager.h"
 #include "include/aegisub/video_provider.h"
 #include "video_frame.h"
-#include "factory_manager.h"
-
 
 
 /// DOCME
diff --git a/aegisub/src/video_provider_quicktime.h b/aegisub/src/video_provider_quicktime.h
index 5de18ba4a..5fc52923d 100644
--- a/aegisub/src/video_provider_quicktime.h
+++ b/aegisub/src/video_provider_quicktime.h
@@ -40,15 +40,19 @@
 #include "quicktime_common.h"
 
 #ifdef WITH_QUICKTIME
+#ifndef AGI_PRE
+#include <map>
+#include <vector>
+
 #include <wx/dynarray.h>
 #include <wx/filename.h>
-#include <vector>
-#include <map>
+#endif
+
+
 #include "include/aegisub/video_provider.h"
 #include "vfr.h"
 
 
-
 /// DOCME
 /// @class QuickTimeVideoProvider
 /// @brief DOCME
diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h
index f444e5551..726a2a0a3 100644
--- a/aegisub/src/video_provider_yuv4mpeg.h
+++ b/aegisub/src/video_provider_yuv4mpeg.h
@@ -38,10 +38,14 @@
 #pragma once
 
 #include "include/aegisub/video_provider.h"
+#ifndef AGI_PRE
+#include <stdio.h>
+
+#include <vector>
+
 #include <wx/filename.h>
 #include <wx/log.h>
-#include <stdio.h>
-#include <vector>
+#endif
 
 
 /// the maximum allowed header length, in bytes
diff --git a/aegisub/src/video_slider.h b/aegisub/src/video_slider.h
index 89c3ce8a4..c50a002fd 100644
--- a/aegisub/src/video_slider.h
+++ b/aegisub/src/video_slider.h
@@ -40,7 +40,9 @@
 
 ////////////
 // Includes
+#ifndef AGI_PRE
 #include <wx/window.h>
+#endif
 
 
 ////////////////////
diff --git a/aegisub/src/visual_feature.h b/aegisub/src/visual_feature.h
index 86632c90e..c51ca2507 100644
--- a/aegisub/src/visual_feature.h
+++ b/aegisub/src/visual_feature.h
@@ -43,7 +43,6 @@ class OpenGLWrapper;
 class AssDialogue;
 
 
-
 /// DOCME
 enum DraggableFeatureType {
 
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index a303b5227..079ae81a4 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -40,10 +40,14 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <vector>
+
 #include <wx/log.h>
 #include <wx/event.h>
 #include <wx/button.h>
+#endif
+
 #include "gl_wrap.h"
 #include "visual_feature.h"
 
diff --git a/aegisub/src/visual_tool_clip.h b/aegisub/src/visual_tool_clip.h
index aee84177e..490bbc9a9 100644
--- a/aegisub/src/visual_tool_clip.h
+++ b/aegisub/src/visual_tool_clip.h
@@ -43,7 +43,6 @@
 #include "visual_tool.h"
 
 
-
 /// DOCME
 /// @class VisualToolClip
 /// @brief DOCME
diff --git a/aegisub/src/visual_tool_cross.h b/aegisub/src/visual_tool_cross.h
index e513b4534..a6e8566fe 100644
--- a/aegisub/src/visual_tool_cross.h
+++ b/aegisub/src/visual_tool_cross.h
@@ -43,7 +43,6 @@
 #include "visual_tool.h"
 
 
-
 /// DOCME
 /// @class VisualToolCross
 /// @brief DOCME
diff --git a/aegisub/src/visual_tool_drag.h b/aegisub/src/visual_tool_drag.h
index 3eb557c04..71cfd9f6d 100644
--- a/aegisub/src/visual_tool_drag.h
+++ b/aegisub/src/visual_tool_drag.h
@@ -40,10 +40,12 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/bmpbuttn.h>
 #include <wx/toolbar.h>
-#include "visual_tool.h"
+#endif
 
+#include "visual_tool.h"
 
 
 /// DOCME
diff --git a/aegisub/src/visual_tool_rotatexy.h b/aegisub/src/visual_tool_rotatexy.h
index 58acc1f50..657339e51 100644
--- a/aegisub/src/visual_tool_rotatexy.h
+++ b/aegisub/src/visual_tool_rotatexy.h
@@ -43,7 +43,6 @@
 #include "visual_tool.h"
 
 
-
 /// DOCME
 /// @class VisualToolRotateXY
 /// @brief DOCME
diff --git a/aegisub/src/visual_tool_rotatez.h b/aegisub/src/visual_tool_rotatez.h
index 211901cf0..6d10563c0 100644
--- a/aegisub/src/visual_tool_rotatez.h
+++ b/aegisub/src/visual_tool_rotatez.h
@@ -43,7 +43,6 @@
 #include "visual_tool.h"
 
 
-
 /// DOCME
 /// @class VisualToolRotateZ
 /// @brief DOCME
diff --git a/aegisub/src/visual_tool_scale.h b/aegisub/src/visual_tool_scale.h
index 8f5c8d2ea..90018dcea 100644
--- a/aegisub/src/visual_tool_scale.h
+++ b/aegisub/src/visual_tool_scale.h
@@ -43,7 +43,6 @@
 #include "visual_tool.h"
 
 
-
 /// DOCME
 /// @class VisualToolScale
 /// @brief DOCME
diff --git a/aegisub/src/visual_tool_vector_clip.h b/aegisub/src/visual_tool_vector_clip.h
index 61342188c..9e33d57be 100644
--- a/aegisub/src/visual_tool_vector_clip.h
+++ b/aegisub/src/visual_tool_vector_clip.h
@@ -40,12 +40,14 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <wx/toolbar.h>
+#endif
+
 #include "visual_tool.h"
 #include "spline.h"
 
 
-
 /// DOCME
 /// @class VisualToolVectorClip
 /// @brief DOCME