diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp
index ffa3ed21c..ee3af7917 100644
--- a/aegisub/src/aegisublocale.cpp
+++ b/aegisub/src/aegisublocale.cpp
@@ -39,15 +39,18 @@
 // Headers
 #include "config.h"
 
-#include <wx/intl.h>
+#ifndef AGI_PRE
 #include <locale.h>
+
+#include <wx/choicdlg.h>
 #include <wx/dir.h>
 #include <wx/filename.h>
-#include <wx/choicdlg.h>
+#include <wx/intl.h>
+#include <wx/stdpaths.h>
+#endif
+
 #include "aegisublocale.h"
 #include "standard_paths.h"
-#include <wx/stdpaths.h>
-
 
 /// @brief Constructor 
 ///
diff --git a/aegisub/src/agi_pre.cpp b/aegisub/src/agi_pre.cpp
index 4e7214f62..50cab11b2 100644
--- a/aegisub/src/agi_pre.cpp
+++ b/aegisub/src/agi_pre.cpp
@@ -49,4 +49,3 @@
 #include "config.h"
 
 #include "agi_pre.h"
-
diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index c90be4217..4e316907b 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -96,12 +96,22 @@
 #include <wchar.h>
 
 #ifdef __WINDOWS__
+#include <Mmreg.h>
+#include <dsound.h>
 #include <process.h>
 #include <mmsystem.h>
 #include <objbase.h>
+#include <shlobj.h>
 #include <tchar.h>
+#include <vfw.h>
 #include <windef.h>
 #include <windows.h>
+
+#else
+
+#include <sys/fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
 #endif
 
 /////////////////////
diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 0e9672638..364471281 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -41,16 +41,15 @@
 
 #ifndef AGI_PRE
 #include <fstream>
+
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
 #endif
 
 #include "ass_dialogue.h"
 #include "ass_override.h"
-#include "vfr.h"
 #include "utils.h"
-
-
+#include "vfr.h"
 
 /// @brief Constructs AssDialogue AssDialogue //////////////////////
 ///
diff --git a/aegisub/src/ass_entry.cpp b/aegisub/src/ass_entry.cpp
index bc384d3ae..69151bf13 100644
--- a/aegisub/src/ass_entry.cpp
+++ b/aegisub/src/ass_entry.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
-#include "ass_dialogue.h"
-#include "ass_style.h"
 #include "ass_attachment.h"
+#include "ass_dialogue.h"
 #include "ass_entry.h"
-
+#include "ass_style.h"
 
 
 /// @brief Constructs AssEntry  AssEntry //////////////////////
diff --git a/aegisub/src/ass_export_filter.cpp b/aegisub/src/ass_export_filter.cpp
index 6da82eefb..afbf65799 100644
--- a/aegisub/src/ass_export_filter.cpp
+++ b/aegisub/src/ass_export_filter.cpp
@@ -43,7 +43,6 @@
 #include "ass_file.h"
 
 
-
 /// @brief Constructor 
 ///
 AssExportFilter::AssExportFilter() {
diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp
index f13883a92..8d7588c02 100644
--- a/aegisub/src/ass_exporter.cpp
+++ b/aegisub/src/ass_exporter.cpp
@@ -39,13 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "ass_exporter.h"
 #include "ass_export_filter.h"
+#include "ass_exporter.h"
 #include "ass_file.h"
 #include "frame_main.h"
 
 
-
 /// @brief Constructor 
 /// @param subs 
 ///
diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index 1eda19fc4..41566ea5d 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -39,25 +39,27 @@
 // Includes
 #include "config.h"
 
-#include <list>
+#ifndef AGI_PRE
 #include <fstream>
+#include <list>
+
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
-#include "ass_file.h"
-#include "ass_dialogue.h"
-#include "ass_style.h"
+#endif
+
 #include "ass_attachment.h"
-#include "ass_override.h"
+#include "ass_dialogue.h"
 #include "ass_exporter.h"
-#include "vfr.h"
+#include "ass_file.h"
+#include "ass_override.h"
+#include "ass_style.h"
 #include "options.h"
+#include "subtitle_format.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
 #include "version.h"
-#include "subtitle_format.h"
-
-
+#include "vfr.h"
 
 /// @brief AssFile constructor  AssFile //////////////////////
 ///
diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp
index 43ec94d3f..7236c4c92 100644
--- a/aegisub/src/ass_override.cpp
+++ b/aegisub/src/ass_override.cpp
@@ -39,11 +39,13 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <wx/log.h>
+#include <wx/tokenzr.h>
+#endif
+
 #include "ass_dialogue.h"
 #include "ass_override.h"
-#include <wx/tokenzr.h>
-#include <wx/log.h>
-
 
 
 /// @brief Constructor  AssOverrideParameter //////////////////////
diff --git a/aegisub/src/ass_style.cpp b/aegisub/src/ass_style.cpp
index db9a3ac66..5dc2ca074 100644
--- a/aegisub/src/ass_style.cpp
+++ b/aegisub/src/ass_style.cpp
@@ -38,11 +38,15 @@
 // Includes
 #include "config.h"
 
-#include <wx/tokenzr.h>
+#ifndef AGI_PRE
+#include <ctype.h>
+
 #include <wx/intl.h>
+#include <wx/tokenzr.h>
+#endif
+
 #include "ass_style.h"
 #include "utils.h"
-#include <ctype.h>
 
 
 /// @brief Constructors  AssColor //////////////////////////
diff --git a/aegisub/src/ass_style_storage.cpp b/aegisub/src/ass_style_storage.cpp
index 90ea4473a..4a918e76b 100644
--- a/aegisub/src/ass_style_storage.cpp
+++ b/aegisub/src/ass_style_storage.cpp
@@ -39,14 +39,16 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <fstream>
-#include "ass_style_storage.h"
-#include "ass_style.h"
+#endif
+
 #include "ass_file.h"
+#include "ass_style.h"
+#include "ass_style_storage.h"
+#include "standard_paths.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "standard_paths.h"
-
 
 
 /// @brief Save styles to disk 
diff --git a/aegisub/src/ass_time.cpp b/aegisub/src/ass_time.cpp
index 511432c73..5e3dd0981 100644
--- a/aegisub/src/ass_time.cpp
+++ b/aegisub/src/ass_time.cpp
@@ -37,17 +37,18 @@
 
 ////////////
 // Includes
-#include "config.h"
+#ifndef AGI_PRE
+#include <math.h>
+
+#include <algorithm>
+#include <fstream>
 
 #include <wx/regex.h>
-#include <math.h>
-#include <fstream>
-#include <algorithm>
+#endif
+
 #include "ass_time.h"
-#include "vfr.h"
 #include "utils.h"
-
-
+#include "vfr.h"
 
 
 /// @brief AssTime constructors AssTime //////////////////////
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index dbaabae55..de58f1f74 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -39,21 +39,24 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <math.h>
-#include <wx/tglbtn.h>
-#include <wx/statline.h>
+
 #include <wx/laywin.h>
 #include <wx/recguard.h>
+#include <wx/statline.h>
+#include <wx/tglbtn.h>
+#endif
+
 #include "audio_box.h"
 #include "audio_display.h"
 #include "audio_karaoke.h"
 #include "frame_main.h"
+#include "hotkeys.h"
+#include "libresrc/libresrc.h"
 #include "options.h"
 #include "toggle_bitmap.h"
-#include "hotkeys.h"
 #include "tooltip_manager.h"
-#include "libresrc/libresrc.h"
-
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index 496e7e5f5..9c81822f5 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -39,30 +39,35 @@
 // Headers
 #include "config.h"
 
-#include <wx/tglbtn.h>
-#include <wx/filename.h>
+#ifndef AGI_PRE
 #include <math.h>
+
 #include <vector>
-#include "audio_display.h"
-#include "audio_provider_stream.h"
-//#include "ass_dialogue.h"
-#include "subs_grid.h"
+
+#include <wx/filename.h>
+#include <wx/tglbtn.h>
+#endif
+
 #include "ass_file.h"
-#include "subs_edit_box.h"
-#include "options.h"
-#include "audio_karaoke.h"
 #include "audio_box.h"
-#include "fft.h"
-#include "video_context.h"
-#include "vfr.h"
-#include "colorspace.h"
-#include "hotkeys.h"
-#include "utils.h"
-#include "timeedit_ctrl.h"
-#include "standard_paths.h"
+#include "audio_display.h"
+#include "audio_karaoke.h"
 #ifdef _DEBUG
 #include "audio_provider_dummy.h"
 #endif
+#include "audio_provider_stream.h"
+#include "colorspace.h"
+#include "fft.h"
+#include "hotkeys.h"
+#include "options.h"
+#include "standard_paths.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "timeedit_ctrl.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_context.h"
+
 
 
 #ifdef __WXMAC__
diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp
index 62cd795c2..9ad7b7160 100644
--- a/aegisub/src/audio_karaoke.cpp
+++ b/aegisub/src/audio_karaoke.cpp
@@ -39,17 +39,20 @@
 // Headers
 #include "config.h"
 
-#include "audio_karaoke.h"
-#include "audio_display.h"
-#include "audio_box.h"
-#include "ass_override.h"
-#include <wx/tokenzr.h>
-#include <wx/menu.h>
-#include <wx/log.h>
-#include <wx/dcclient.h>
-#include <wx/settings.h>
+#ifndef AGI_PRE
 #include <algorithm>
 
+#include <wx/dcclient.h>
+#include <wx/log.h>
+#include <wx/menu.h>
+#include <wx/settings.h>
+#include <wx/tokenzr.h>
+#endif
+
+#include "ass_override.h"
+#include "audio_box.h"
+#include "audio_display.h"
+#include "audio_karaoke.h"
 
 
 /// @brief Empty constructor 
diff --git a/aegisub/src/audio_player.cpp b/aegisub/src/audio_player.cpp
index d9718fea9..ea822dc8e 100644
--- a/aegisub/src/audio_player.cpp
+++ b/aegisub/src/audio_player.cpp
@@ -39,8 +39,6 @@
 // Headers
 #include "config.h"
 
-#include "audio_player_manager.h"
-#include "options.h"
 #ifdef WITH_ALSA
 #include "audio_player_alsa.h"
 #endif
@@ -48,18 +46,20 @@
 #include "audio_player_dsound.h"
 #include "audio_player_dsound2.h"
 #endif
+#include "audio_player_manager.h"
 #ifdef WITH_OPENAL
 #include "audio_player_openal.h"
 #endif
+#ifdef WITH_OSS
+#include "audio_player_oss.h"
+#endif
 #ifdef WITH_PORTAUDIO
 #include "audio_player_portaudio.h"
 #endif
 #ifdef WITH_PULSEAUDIO
 #include "audio_player_pulse.h"
 #endif
-#ifdef WITH_OSS
-#include "audio_player_oss.h"
-#endif
+#include "options.h"
 
 
 
diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp
index 51a951e67..6bc1eb4c2 100644
--- a/aegisub/src/audio_player_alsa.cpp
+++ b/aegisub/src/audio_player_alsa.cpp
@@ -42,13 +42,12 @@
 
 ///////////
 // Headers
+#include "audio_player_alsa.h"
 #include "audio_player_manager.h"
 #include "audio_provider_manager.h"
-#include "utils.h"
 #include "frame_main.h"
-#include "audio_player_alsa.h"
 #include "options.h"
-
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_player_dsound.cpp b/aegisub/src/audio_player_dsound.cpp
index de870a472..af0919519 100644
--- a/aegisub/src/audio_player_dsound.cpp
+++ b/aegisub/src/audio_player_dsound.cpp
@@ -41,11 +41,11 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#include "utils.h"
-#include "main.h"
-#include "frame_main.h"
-#include "audio_player_dsound.h"
 
+#include "audio_player_dsound.h"
+#include "frame_main.h"
+#include "main.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_player_dsound2.cpp b/aegisub/src/audio_player_dsound2.cpp
index 0ed81da35..17a68c7a0 100644
--- a/aegisub/src/audio_player_dsound2.cpp
+++ b/aegisub/src/audio_player_dsound2.cpp
@@ -41,16 +41,18 @@
 
 #ifdef WITH_DIRECTSOUND
 
-#include <mmsystem.h>
+#ifndef AGI_PRE
 #include <dsound.h>
+#include <mmsystem.h>
 #include <process.h>
-#include "include/aegisub/audio_provider.h"
-#include "utils.h"
-#include "main.h"
-#include "frame_main.h"
-#include "options.h"
-#include "audio_player_dsound2.h"
+#endif
 
+#include "audio_player_dsound2.h"
+#include "frame_main.h"
+#include "include/aegisub/audio_provider.h"
+#include "main.h"
+#include "options.h"
+#include "utils.h"
 
 
 /// DOCME
diff --git a/aegisub/src/audio_player_openal.cpp b/aegisub/src/audio_player_openal.cpp
index 5715bf645..243bfadab 100644
--- a/aegisub/src/audio_player_openal.cpp
+++ b/aegisub/src/audio_player_openal.cpp
@@ -43,11 +43,11 @@
 ///////////
 // Headers
 #include "audio_player_manager.h"
-#include "audio_provider_manager.h"
-#include "utils.h"
-#include "frame_main.h"
 #include "audio_player_openal.h"
+#include "audio_provider_manager.h"
+#include "frame_main.h"
 #include "options.h"
+#include "utils.h"
 
 #ifdef __WINDOWS__
 #include <al.h>
diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp
index ac5466b2e..49c464779 100644
--- a/aegisub/src/audio_player_oss.cpp
+++ b/aegisub/src/audio_player_oss.cpp
@@ -40,12 +40,11 @@
 ///////////
 // Headers
 #include "audio_player_manager.h"
-#include "audio_provider_manager.h"
-#include "utils.h"
-#include "frame_main.h"
 #include "audio_player_oss.h"
+#include "audio_provider_manager.h"
+#include "frame_main.h"
 #include "options.h"
-
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_player_pulse.cpp b/aegisub/src/audio_player_pulse.cpp
index b36ca728e..2ea749005 100644
--- a/aegisub/src/audio_player_pulse.cpp
+++ b/aegisub/src/audio_player_pulse.cpp
@@ -42,12 +42,14 @@
 
 ///////////
 // Headers
+#ifndef AGI_PRE
 #include <stdio.h>
+#endif
+
 #include "audio_player_pulse.h"
 #include "audio_provider_manager.h"
-#include "utils.h"
 #include "options.h"
-
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp
index 7a009ba62..71c7a2c61 100644
--- a/aegisub/src/audio_provider.cpp
+++ b/aegisub/src/audio_provider.cpp
@@ -39,22 +39,26 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/thread.h>
-#include "audio_provider_ram.h"
-#include "audio_provider_hd.h"
-#include "audio_provider_pcm.h"
-#include "audio_provider_convert.h"
+#endif
+
+#include "audio_display.h"
 #ifdef WITH_AVISYNTH
 #include "audio_provider_avs.h"
 #endif
+#include "audio_provider_convert.h"
 #ifdef WITH_FFMPEGSOURCE
 #include "audio_provider_ffmpegsource.h"
 #endif
+#include "audio_provider_hd.h"
+#include "audio_provider_pcm.h"
 #ifdef WITH_QUICKTIME
 #include "audio_provider_quicktime.h"
 #endif
+#include "audio_provider_ram.h"
 #include "options.h"
-#include "audio_display.h"
+
 
 
 
diff --git a/aegisub/src/audio_provider_avs.cpp b/aegisub/src/audio_provider_avs.cpp
index ac21182a3..04e6d6466 100644
--- a/aegisub/src/audio_provider_avs.cpp
+++ b/aegisub/src/audio_provider_avs.cpp
@@ -40,15 +40,20 @@
 #include "config.h"
 
 #ifdef WITH_AVISYNTH
-#include <wx/filename.h>
+
+
+#ifndef AGI_PRE
 #include <Mmreg.h>
 #include <time.h>
+
+#include <wx/filename.h>
+#endif
+
 #include "audio_provider_avs.h"
-#include "utils.h"
+#include "charset_conv.h"
 #include "options.h"
 #include "standard_paths.h"
-#include "charset_conv.h"
-
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider_convert.cpp b/aegisub/src/audio_provider_convert.cpp
index 59a982006..a7180dc1c 100644
--- a/aegisub/src/audio_provider_convert.cpp
+++ b/aegisub/src/audio_provider_convert.cpp
@@ -39,10 +39,9 @@
 // Headers
 #include "config.h"
 
+#include "aegisub_endian.h"
 #include "audio_provider_convert.h"
 #include "audio_provider_downmix.h"
-#include "aegisub_endian.h"
-
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider_downmix.cpp b/aegisub/src/audio_provider_downmix.cpp
index 05d681a69..9f89b808c 100644
--- a/aegisub/src/audio_provider_downmix.cpp
+++ b/aegisub/src/audio_provider_downmix.cpp
@@ -42,7 +42,6 @@
 #include "audio_provider_downmix.h"
 
 
-
 /// @brief Constructor 
 /// @param source 
 ///
diff --git a/aegisub/src/audio_provider_dummy.cpp b/aegisub/src/audio_provider_dummy.cpp
index 1be56195a..c08bf1db5 100644
--- a/aegisub/src/audio_provider_dummy.cpp
+++ b/aegisub/src/audio_provider_dummy.cpp
@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// @brief Constructor 
 /// @param dur_ms 
 /// @param _noise 
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 34d6cc192..da866383e 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -40,14 +40,17 @@
 
 ///////////
 // Headers
-#include "include/aegisub/aegisub.h"
-#include "audio_provider_ffmpegsource.h"
-#include "options.h"
-#include <map>
+#ifndef AGI_PRE
 #ifdef WIN32
 #include <objbase.h>
 #endif
 
+#include <map>
+#endif
+
+#include "audio_provider_ffmpegsource.h"
+#include "include/aegisub/aegisub.h"
+#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp
index 2ac191643..edb982fca 100644
--- a/aegisub/src/audio_provider_hd.cpp
+++ b/aegisub/src/audio_provider_hd.cpp
@@ -39,17 +39,20 @@
 // Headers
 #include "config.h"
 
-#include <wx/filename.h>
+
+#ifndef AGI_PRE
 #include <wx/file.h>
 #include <wx/filefn.h>
-#include "dialog_progress.h"
+#include <wx/filename.h>
+#endif
+
 #include "audio_provider_hd.h"
-#include "standard_paths.h"
-#include "options.h"
-#include "utils.h"
+#include "dialog_progress.h"
 #include "frame_main.h"
 #include "main.h"
-
+#include "options.h"
+#include "standard_paths.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider_pcm.cpp b/aegisub/src/audio_provider_pcm.cpp
index e5d0c457e..f3c479759 100644
--- a/aegisub/src/audio_provider_pcm.cpp
+++ b/aegisub/src/audio_provider_pcm.cpp
@@ -37,22 +37,23 @@
 
 #include "config.h"
 
-#include <wx/filename.h>
-#include <wx/file.h>
-#include "audio_provider_pcm.h"
-#include "utils.h"
-#include "aegisub_endian.h"
-#include <stdint.h>
+#ifndef AGI_PRE
 #include <assert.h>
-#include <wx/log.h>
-
-#ifndef _WINDOWS
-#include <sys/mman.h>
+#include <stdint.h>
+#ifndef __WINDOWS__
 #include <sys/fcntl.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #endif
 
+#include <wx/file.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+#endif
 
+#include "aegisub_endian.h"
+#include "audio_provider_pcm.h"
+#include "utils.h"
 
 
 /// @brief DOCME
diff --git a/aegisub/src/audio_provider_quicktime.cpp b/aegisub/src/audio_provider_quicktime.cpp
index 7df196b85..4d50b0262 100644
--- a/aegisub/src/audio_provider_quicktime.cpp
+++ b/aegisub/src/audio_provider_quicktime.cpp
@@ -35,10 +35,10 @@
 ///
 
 
-#include "audio_provider_quicktime.h"
-
 #ifdef WITH_QUICKTIME
 
+#include "audio_provider_quicktime.h"
+
 
 /// @brief DOCME
 /// @param filename 
diff --git a/aegisub/src/audio_provider_ram.cpp b/aegisub/src/audio_provider_ram.cpp
index 0830760f4..3bdce5b36 100644
--- a/aegisub/src/audio_provider_ram.cpp
+++ b/aegisub/src/audio_provider_ram.cpp
@@ -39,12 +39,11 @@
 // Headers
 #include "config.h"
 
-#include "dialog_progress.h"
 #include "audio_provider_ram.h"
-#include "utils.h"
+#include "dialog_progress.h"
 #include "frame_main.h"
 #include "main.h"
-
+#include "utils.h"
 
 
 /// DOCME
diff --git a/aegisub/src/audio_provider_stream.cpp b/aegisub/src/audio_provider_stream.cpp
index b605f1c7c..c6a09ed95 100644
--- a/aegisub/src/audio_provider_stream.cpp
+++ b/aegisub/src/audio_provider_stream.cpp
@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// DOCME
 #define BUFSIZE 65536
 
diff --git a/aegisub/src/audio_renderer.cpp b/aegisub/src/audio_renderer.cpp
index 614eb1736..c3b9f5e7d 100644
--- a/aegisub/src/audio_renderer.cpp
+++ b/aegisub/src/audio_renderer.cpp
@@ -34,11 +34,14 @@
 /// @ingroup audio_ui
 
 
-#include "audio_renderer.h"
-#include "include/aegisub/audio_provider.h"
+// Headers
+#ifndef AGI_PRE
 #include <wx/bitmap.h>
 #include <wx/dcmemory.h>
+#endif
 
+#include "audio_renderer.h"
+#include "include/aegisub/audio_provider.h"
 
 
 AudioRendererBitmapCacheBitmapFactory::AudioRendererBitmapCacheBitmapFactory(AudioRenderer *_renderer)
diff --git a/aegisub/src/audio_renderer_spectrum.cpp b/aegisub/src/audio_renderer_spectrum.cpp
index 378724732..a37a76b75 100644
--- a/aegisub/src/audio_renderer_spectrum.cpp
+++ b/aegisub/src/audio_renderer_spectrum.cpp
@@ -37,20 +37,25 @@
 
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <assert.h>
-#include <vector>
-#include <list>
-#include <utility>
-#include <algorithm>
 #ifdef _OPENMP
 #include <omp.h>
 #endif
+
+#include <algorithm>
+#include <list>
+#include <utility>
+#include <vector>
+
+#include <wx/log.h>
+#endif
+
 #include "audio_renderer_spectrum.h"
-#include "fft.h"
 #include "colorspace.h"
+#include "fft.h"
 #include "options.h"
 #include "utils.h"
-#include <wx/log.h>
 
 
 /// @class AudioSpectrumCache
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index e32d228a8..a8254b2ff 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -39,35 +39,40 @@
 
 #ifdef WITH_AUTOMATION
 
-#include "auto4_base.h"
-#include "ass_style.h"
-#include "options.h"
-#include "string_codec.h"
-#include "ass_file.h"
-#include "standard_paths.h"
-#include <wx/filename.h>
-#include <wx/dir.h>
-#include <wx/dialog.h>
-#include <wx/gauge.h>
+#ifndef AGI_PRE
+#ifdef __WINDOWS__
+#include <tchar.h>
+#include <windows.h>
+#endif
+
 #include <wx/button.h>
+#include <wx/dcmemory.h>
+#include <wx/dialog.h>
+#include <wx/dir.h>
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/gauge.h>
+#include <wx/log.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/thread.h>
-#include <wx/sizer.h>
-#include <wx/filefn.h>
 #include <wx/tokenzr.h>
-#include <wx/dcmemory.h>
-#include <wx/msgdlg.h>
-#include <wx/log.h>
+#endif
 
-
-#ifdef WIN32
-#include <windows.h>
-#include <tchar.h>
-#else
+#ifndef __WINDOWS__
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #endif
 
+#include "ass_file.h"
+#include "ass_style.h"
+#include "auto4_base.h"
+#include "options.h"
+#include "standard_paths.h"
+#include "string_codec.h"
+
+
 
 /// DOCME
 namespace Automation4 {
diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp
index acbf0988c..4daf6f1b6 100644
--- a/aegisub/src/auto4_lua.cpp
+++ b/aegisub/src/auto4_lua.cpp
@@ -38,35 +38,39 @@
 
 #ifdef WITH_AUTO4_LUA
 
+#ifndef AGI_PRE
+#include <assert.h>
+
+#include <algorithm>
+
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+#include <wx/msgdlg.h>
+#include <wx/window.h>
+#endif
+
+#include "ass_dialogue.h"
+#include "ass_file.h"
+#include "ass_override.h"
+#include "ass_style.h"
 #include "auto4_lua.h"
 #include "auto4_lua_factory.h"
 #include "auto4_lua_scriptreader.h"
-#include "ass_dialogue.h"
-#include "ass_style.h"
-#include "ass_file.h"
-#include "ass_override.h"
-#include "text_file_reader.h"
 #include "options.h"
-
+#include "text_file_reader.h"
 #include "vfr.h"
 #include "video_context.h"
 
+// This must be below the headers above.
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lualib.h"
 #include "../../contrib/lua51/src/lauxlib.h"
 #else
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lualib.h>
+#include <lauxlib.h>
 #endif
 
-#include <wx/msgdlg.h>
-#include <wx/filename.h>
-#include <wx/filefn.h>
-#include <wx/window.h>
-#include <wx/log.h>
-#include <assert.h>
-#include <algorithm>
-
 
 /// DOCME
 namespace Automation4 {
diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp
index 8725b3b4d..2223fa162 100644
--- a/aegisub/src/auto4_lua_assfile.cpp
+++ b/aegisub/src/auto4_lua_assfile.cpp
@@ -38,25 +38,30 @@
 
 #ifdef WITH_AUTO4_LUA
 
-#include "auto4_lua.h"
+#ifndef AGI_PRE
+#include <assert.h>
+
+#include <algorithm>
+
+#include <wx/log.h>
+#endif
+
 #include "ass_dialogue.h"
-#include "ass_style.h"
 #include "ass_file.h"
 #include "ass_override.h"
+#include "ass_style.h"
+#include "auto4_lua.h"
 #include "utils.h"
 
+// This must be below the headers above.
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lualib.h"
 #include "../../contrib/lua51/src/lauxlib.h"
 #else
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lualib.h>
+#include <lauxlib.h>
 #endif
 
-#include <wx/log.h>
-#include <assert.h>
-#include <algorithm>
-
 
 /// DOCME
 namespace Automation4 {
diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp
index 8c4b5902e..3881a2825 100644
--- a/aegisub/src/auto4_lua_dialog.cpp
+++ b/aegisub/src/auto4_lua_dialog.cpp
@@ -39,33 +39,36 @@
 
 #ifdef WITH_AUTO4_LUA
 
-#include "auto4_lua.h"
+#ifndef AGI_PRE
+#include <assert.h>
 
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/gbsizer.h>
+#include <wx/log.h>
+#include <wx/panel.h>
+#include <wx/spinctrl.h>
+#include <wx/tokenzr.h>
+#include <wx/validate.h>
+#include <wx/window.h>
+#endif
+
+#include "ass_style.h"
+#include "auto4_lua.h"
+#include "colour_button.h"
+#include "string_codec.h"
+#include "utils.h"
+
+// These must be after the headers above.
 #ifdef __WINDOWS__
 #include "../../contrib/lua51/src/lualib.h"
 #include "../../contrib/lua51/src/lauxlib.h"
 #else
-#include "lualib.h"
-#include "lauxlib.h"
+#include <lualib.h>
+#include <lauxlib.h>
 #endif
 
-#include "string_codec.h"
-#include "utils.h"
-#include <wx/window.h>
-#include <wx/spinctrl.h>
-#include <wx/gbsizer.h>
-#include <wx/button.h>
-#include <wx/validate.h>
-#include <wx/tokenzr.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/log.h>
-#include <wx/panel.h>
-
-#include <assert.h>
-#include "colour_button.h"
-#include "ass_style.h"
-
 
 /// DOCME
 namespace Automation4 {
diff --git a/aegisub/src/auto4_lua_scriptreader.cpp b/aegisub/src/auto4_lua_scriptreader.cpp
index 9bc765bff..b55dffc5c 100644
--- a/aegisub/src/auto4_lua_scriptreader.cpp
+++ b/aegisub/src/auto4_lua_scriptreader.cpp
@@ -34,6 +34,7 @@
 /// @ingroup scripting
 ///
 
+
 #include "config.h"
 
 #ifdef WITH_AUTO4_LUA
diff --git a/aegisub/src/avisynth_wrap.cpp b/aegisub/src/avisynth_wrap.cpp
index 0591a28ae..6f5f74a04 100644
--- a/aegisub/src/avisynth_wrap.cpp
+++ b/aegisub/src/avisynth_wrap.cpp
@@ -45,8 +45,10 @@
 #include "options.h"
 
 #ifdef DEBUG_AVISYNTH_CODE
-#include "main.h"
+#ifndef AGI_PRE
 #include <wx/textfile.h>
+#endif
+#include "main.h"
 
 /// DOCME
 wxTextFile avs_trace_file;
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index f8122df1d..d612790bb 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -39,21 +39,23 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/sizer.h>
-#include "base_grid.h"
-#include "utils.h"
-#include "ass_file.h"
-#include "ass_dialogue.h"
-#include "ass_style.h"
-#include "options.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "frame_main.h"
-#include "video_box.h"
-#include "video_slider.h"
-#include "video_context.h"
-#include "audio_display.h"
+#endif
 
+#include "ass_dialogue.h"
+#include "ass_file.h"
+#include "ass_style.h"
+#include "audio_display.h"
+#include "base_grid.h"
+#include "frame_main.h"
+#include "options.h"
+#include "subs_edit_box.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_slider.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/browse_button.cpp b/aegisub/src/browse_button.cpp
index 8486cd92a..5795cafbe 100644
--- a/aegisub/src/browse_button.cpp
+++ b/aegisub/src/browse_button.cpp
@@ -39,13 +39,15 @@
 // Headers
 #include "config.h"
 
-#include <wx/filedlg.h>
+#ifndef AGI_PRE
 #include <wx/dirdlg.h>
+#include <wx/filedlg.h>
 #include <wx/fontdlg.h>
-#include "browse_button.h"
-#include "utils.h"
-#include "standard_paths.h"
+#endif
 
+#include "browse_button.h"
+#include "standard_paths.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/charset_conv.cpp b/aegisub/src/charset_conv.cpp
index c26b6bb5c..e4034200f 100644
--- a/aegisub/src/charset_conv.cpp
+++ b/aegisub/src/charset_conv.cpp
@@ -36,10 +36,13 @@
 
 #include "charset_conv.h"
 
-#include <stdint.h>
+#ifndef AGI_PRE
 #include <errno.h>
+#include <stdint.h>
+
 #include <wx/hashmap.h>
 #include <wx/intl.h>
+#endif
 
 WX_DECLARE_STRING_HASH_MAP(wxString, PrettyNamesHash);
 
diff --git a/aegisub/src/charset_detect.cpp b/aegisub/src/charset_detect.cpp
index 89de5ad6b..6def21b97 100644
--- a/aegisub/src/charset_detect.cpp
+++ b/aegisub/src/charset_detect.cpp
@@ -40,13 +40,16 @@
 #include "config.h"
 
 #ifdef WITH_UNIVCHARDET
+#ifndef AGI_PRE
 #include <list>
-#include <wx/intl.h>
-#include <wx/choicdlg.h>
 
-#include "text_file_reader.h"
-#include "charset_detect.h"
+#include <wx/choicdlg.h>
+#include <wx/intl.h>
+#endif
+
 #include "../universalchardet/nsCharSetProber.h"
+#include "charset_detect.h"
+#include "text_file_reader.h"
 
 
 
diff --git a/aegisub/src/colorspace.cpp b/aegisub/src/colorspace.cpp
index b78e02b0f..894ef1125 100644
--- a/aegisub/src/colorspace.cpp
+++ b/aegisub/src/colorspace.cpp
@@ -40,7 +40,6 @@
 #include "utils.h"
 
 
-
 /// @brief matrix from http://forum.doom9.org/showthread.php?p=684080#post684080
 /// @param Y 
 /// @param U 
diff --git a/aegisub/src/colour_button.cpp b/aegisub/src/colour_button.cpp
index fdc7f86f8..d77dc46a3 100644
--- a/aegisub/src/colour_button.cpp
+++ b/aegisub/src/colour_button.cpp
@@ -39,10 +39,13 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/dcmemory.h>
-#include "colour_button.h"
-#include "dialog_colorpicker.h"
+#endif
 
+#include "colour_button.h"
+#include "config.h"
+#include "dialog_colorpicker.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp
index de2b72030..d108d667c 100644
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@@ -39,18 +39,19 @@
 // Includes
 #include "config.h"
 
-#include <wx/statline.h>
-#include <wx/stattext.h>
-#include <wx/sizer.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
+#include <wx/statline.h>
+#include <wx/stattext.h>
 #include <wx/textctrl.h>
+#endif
+
 #include "dialog_about.h"
-#include "version.h"
-#include "options.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "version.h"
 
 
 /// @brief Constructor
diff --git a/aegisub/src/dialog_associations.cpp b/aegisub/src/dialog_associations.cpp
index 33abd2720..4930aed44 100644
--- a/aegisub/src/dialog_associations.cpp
+++ b/aegisub/src/dialog_associations.cpp
@@ -39,11 +39,13 @@
 // Headers
 #include "config.h"
 
-#include <wx/sizer.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/config.h>
-#include "dialog_associations.h"
+#include <wx/sizer.h>
+#endif
 
+#include "dialog_associations.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
index dfc8c135a..c1b357ac4 100644
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@@ -39,21 +39,22 @@
 // Headers
 #include "config.h"
 
-#include <wx/listctrl.h>
+#ifndef AGI_PRE
+#include <wx/button.h>
 #include <wx/dirdlg.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
-#include <wx/button.h>
+#include <wx/listctrl.h>
 #include <wx/sizer.h>
-#include "dialog_attachments.h"
-#include "ass_file.h"
+#endif
+
 #include "ass_attachment.h"
-#include "utils.h"
-#include "options.h"
+#include "ass_file.h"
+#include "dialog_attachments.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index be86eb015..290ec7d93 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -39,19 +39,20 @@
 
 #ifdef WITH_AUTOMATION
 
-#include "main.h"
-#include "dialog_automation.h"
-#include "auto4_base.h"
-#include "options.h"
-#include "utils.h"
-#include "help_button.h"
-#include <wx/filename.h>
+#ifndef AGI_PRE
 #include <wx/filedlg.h>
+#include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
+#endif
+
+#include "auto4_base.h"
+#include "dialog_automation.h"
+#include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
+#include "main.h"
+#include "options.h"
+#include "utils.h"
 
 
 /// @brief DOCME
diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index e0917b4f4..3e1b14397 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -36,29 +36,31 @@
 
 #include "config.h"
 
-#include <wx/image.h>
-#include <wx/statbox.h>
-#include <wx/stattext.h>
-#include <wx/sizer.h>
-#include <wx/gbsizer.h>
-#include <wx/event.h>
-#include <wx/tokenzr.h>
+#ifndef AGI_PRE
+#include <stdio.h>
+
+#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/dcscreen.h>
+#include <wx/event.h>
+#include <wx/gbsizer.h>
+#include <wx/image.h>
 #include <wx/settings.h>
-#include <wx/clipbrd.h>
-#include <wx/dataobj.h>
-#include "dialog_colorpicker.h"
-#include "colorspace.h"
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/tokenzr.h>
+#endif
+
 #include "ass_style.h"
-#include "options.h"
+#include "colorspace.h"
+#include "dialog_colorpicker.h"
 #include "help_button.h"
-#include "utils.h"
 #include "libresrc/libresrc.h"
-
-
-#include <stdio.h>
+#include "options.h"
+#include "utils.h"
 
 
 #ifdef WIN32
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index 9bd938229..27427faba 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -39,15 +39,17 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/filename.h>
+#endif
+
 #include "dialog_detached_video.h"
-#include "video_box.h"
-#include "video_slider.h"
-#include "video_context.h"
-#include "video_display.h"
 #include "frame_main.h"
 #include "options.h"
-
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_slider.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp
index 06f922e40..37b002da1 100644
--- a/aegisub/src/dialog_dummy_video.cpp
+++ b/aegisub/src/dialog_dummy_video.cpp
@@ -37,14 +37,16 @@
 
 #include "config.h"
 
-#include "dialog_dummy_video.h"
+#ifndef AGI_PRE
 #include <wx/datetime.h>
-#include <wx/sizer.h>
 #include <wx/log.h>
+#include <wx/sizer.h>
 #include <wx/statline.h>
-#include "options.h"
-#include "help_button.h"
+#endif
 
+#include "dialog_dummy_video.h"
+#include "help_button.h"
+#include "options.h"
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp
index 7d600c564..c6ee51a11 100644
--- a/aegisub/src/dialog_export.cpp
+++ b/aegisub/src/dialog_export.cpp
@@ -39,17 +39,19 @@
 // Headers
 #include "config.h"
 
-#include <wx/tokenzr.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
-#include <wx/stattext.h>
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
-#include "dialog_export.h"
-#include "ass_file.h"
-#include "ass_exporter.h"
-#include "charset_conv.h"
-#include "help_button.h"
+#include <wx/stattext.h>
+#include <wx/tokenzr.h>
+#endif
 
+#include "ass_exporter.h"
+#include "ass_file.h"
+#include "charset_conv.h"
+#include "dialog_export.h"
+#include "help_button.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index fbc890e72..259d18d22 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -39,27 +39,27 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/config.h>
 #include <wx/filename.h>
+#include <wx/fontenum.h>
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
-#include <wx/fontenum.h>
-#include "ass_override.h"
-#include "ass_file.h"
+#endif
+
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "ass_override.h"
 #include "ass_style.h"
 #include "dialog_fonts_collector.h"
-#include "utils.h"
-#include "options.h"
-#include "frame_main.h"
-#include "subs_grid.h"
 #include "font_file_lister.h"
-#include "utils.h"
+#include "frame_main.h"
 #include "help_button.h"
-#include "scintilla_text_ctrl.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "scintilla_text_ctrl.h"
+#include "subs_grid.h"
+#include "utils.h"
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_jumpto.cpp b/aegisub/src/dialog_jumpto.cpp
index c1778442e..83afc0d84 100644
--- a/aegisub/src/dialog_jumpto.cpp
+++ b/aegisub/src/dialog_jumpto.cpp
@@ -39,17 +39,19 @@
 // Headers
 #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>
-#include <wx/sizer.h>
-#include <wx/button.h>
+#endif
+
 #include "dialog_jumpto.h"
+#include "libresrc/libresrc.h"
+#include "utils.h"
 #include "vfr.h"
 #include "video_context.h"
-#include "utils.h"
-#include "libresrc/libresrc.h"
-
 
 
 ///////
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 118f00979..410286896 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -40,23 +40,24 @@
 // Headers
 #include "config.h"
 
-#include <vector>
+#ifndef AGI_PRE
 #include <deque>
-#include "dialog_kara_timing_copy.h"
+#include <vector>
+
+#include <wx/string.h>
+#endif
+
 #include "ass_file.h"
-#include "ass_style.h"
+#include "ass_karaoke.h"
 #include "ass_override.h"
+#include "ass_style.h"
+#include "dialog_kara_timing_copy.h"
+#include "help_button.h"
+#include "libresrc/libresrc.h"
 #include "subs_grid.h"
+#include "utils.h"
 #include "validators.h"
 #include "video_context.h"
-#include "utils.h"
-#include "help_button.h"
-#include "ass_karaoke.h"
-#include <wx/string.h>
-#include "libresrc/libresrc.h"
-
-
-
 
 
 /// DOCME
diff --git a/aegisub/src/dialog_options.cpp b/aegisub/src/dialog_options.cpp
index 827706ebc..1494b2142 100644
--- a/aegisub/src/dialog_options.cpp
+++ b/aegisub/src/dialog_options.cpp
@@ -39,39 +39,42 @@
 // Headers
 #include "config.h"
 
-#include "dialog_options.h"
-#if wxUSE_TREEBOOK
-#include <wx/treebook.h>
-#else
-
-/// DOCME
-#define AddSubPage(page,text,select) AddPage(page,wxString::Format(_T("\t%s"),text),select)
-#endif
-#include "options.h"
+#ifndef AGI_PRE
+#include <wx/filefn.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
-#include <wx/filefn.h>
-#include "frame_main.h"
-#include "standard_paths.h"
-#include "validators.h"
+#if wxUSE_TREEBOOK
+#include <wx/treebook.h>
+#endif
+#endif
+
+#include "audio_box.h"
+#include "audio_display.h"
+#include "browse_button.h"
 #include "colour_button.h"
+#include "dialog_options.h"
+#include "frame_main.h"
+#include "help_button.h"
+#include "libresrc/libresrc.h"
+#include "options.h"
+#include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_edit_ctrl.h"
 #include "subs_grid.h"
-#include "video_box.h"
-#include "video_slider.h"
-#include "video_provider_manager.h"
 #include "subtitles_provider_manager.h"
-#include "audio_box.h"
-#include "audio_display.h"
-#include "video_context.h"
-#include "browse_button.h"
 #include "tooltip_manager.h"
 #include "utils.h"
-#include "help_button.h"
-#include "libresrc/libresrc.h"
+#include "validators.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_provider_manager.h"
+#include "video_slider.h"
 
 
+#if wxUSE_TREEBOOK
+/// DOCME
+#define AddSubPage(page,text,select) AddPage(page,wxString::Format(_T("\t%s"),text),select)
+#endif
 
 ///////
 // IDs
diff --git a/aegisub/src/dialog_paste_over.cpp b/aegisub/src/dialog_paste_over.cpp
index 8934aa74a..e746d332c 100644
--- a/aegisub/src/dialog_paste_over.cpp
+++ b/aegisub/src/dialog_paste_over.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
-#include <wx/config.h>
-#include <wx/stattext.h>
-#include <wx/sizer.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
-#include "dialog_paste_over.h"
-#include "options.h"
-#include "help_button.h"
+#include <wx/config.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#endif
 
+#include "dialog_paste_over.h"
+#include "help_button.h"
+#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_progress.cpp b/aegisub/src/dialog_progress.cpp
index ce715cd2e..359778e0b 100644
--- a/aegisub/src/dialog_progress.cpp
+++ b/aegisub/src/dialog_progress.cpp
@@ -39,8 +39,11 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/sizer.h>
+#endif
+
 #include "dialog_progress.h"
 #include "utils.h"
 
@@ -48,7 +51,6 @@
 DEFINE_EVENT_TYPE(wxEVT_PROGRESS_UPDATE)
 
 
-
 /// @brief Constructor 
 /// @param parent  
 /// @param title   
diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp
index 8602bbd88..07e2ccafa 100644
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@@ -39,22 +39,23 @@
 // Headers
 #include "config.h"
 
-#include <wx/dialog.h>
-#include <wx/stattext.h>
-#include <wx/sizer.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
-#include "dialog_properties.h"
-#include "options.h"
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#endif
+
 #include "ass_file.h"
-#include "video_display.h"
-#include "validators.h"
-#include "video_provider_manager.h"
-#include "utils.h"
+#include "dialog_properties.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
+#include "options.h"
+#include "utils.h"
+#include "validators.h"
 #include "video_context.h"
-
-
+#include "video_display.h"
+#include "video_provider_manager.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp
index 23a4ee449..3457c117a 100644
--- a/aegisub/src/dialog_resample.cpp
+++ b/aegisub/src/dialog_resample.cpp
@@ -39,20 +39,18 @@
 // Headers
 #include "config.h"
 
-#include "dialog_resample.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
-#include "ass_style.h"
+#include "ass_file.h"
 #include "ass_override.h"
-#include "subs_grid.h"
-#include "validators.h"
-#include "video_context.h"
-#include "utils.h"
-#include "subs_edit_box.h"
+#include "ass_style.h"
+#include "dialog_resample.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "validators.h"
+#include "video_context.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index 8065d3f85..ae68a3e1e 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -39,18 +39,20 @@
 // Headers
 #include "config.h"
 
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <wx/regex.h>
-#include "dialog_search_replace.h"
-#include "ass_file.h"
+#include <wx/string.h>
+#endif
+
 #include "ass_dialogue.h"
-#include "subs_grid.h"
-#include "options.h"
-#include "subs_edit_box.h"
-#include "video_display.h"
+#include "ass_file.h"
+#include "dialog_search_replace.h"
 #include "frame_main.h"
 #include "main.h"
-
+#include "options.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 714022208..70f0bc86a 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <wx/regex.h>
-#include "dialog_selection.h"
-#include "subs_grid.h"
-#include "ass_dialogue.h"
-#include "options.h"
-#include "help_button.h"
+#include <wx/string.h>
+#endif
 
+#include "ass_dialogue.h"
+#include "dialog_selection.h"
+#include "help_button.h"
+#include "options.h"
+#include "subs_grid.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index f3b6a7878..ad2ac3035 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -39,27 +39,29 @@
 // Headers
 #include "config.h"
 
-#include <fstream>
+#ifndef AGI_PRE
 #include <algorithm>
+#include <fstream>
 #include <string>
-#include <wx/filename.h>
+
 #include <wx/filefn.h>
-#include "dialog_shift_times.h"
-#include "video_display.h"
-#include "vfr.h"
-#include "subs_grid.h"
-#include "options.h"
-#include "standard_paths.h"
+#include <wx/filename.h>
+#endif
+
+#include "ass_dialogue.h"
 #include "ass_file.h"
 #include "ass_time.h"
-#include "ass_dialogue.h"
-#include "subs_edit_box.h"
-#include "utils.h"
-#include "help_button.h"
 #include "charset_conv.h"
+#include "dialog_shift_times.h"
+#include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "standard_paths.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index a47b2a987..b634065ca 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -38,19 +38,21 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/intl.h>
-#include "dialog_spellchecker.h"
-#include "spellchecker_manager.h"
-#include "subs_grid.h"
-#include "frame_main.h"
-#include "ass_file.h"
+#endif
+
 #include "ass_dialogue.h"
-#include "utils.h"
-#include "subs_edit_box.h"
-#include "options.h"
+#include "ass_file.h"
+#include "dialog_spellchecker.h"
+#include "frame_main.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
+#include "options.h"
+#include "spellchecker_manager.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
 
 
 ///////
diff --git a/aegisub/src/dialog_splash.cpp b/aegisub/src/dialog_splash.cpp
index 758a58892..08c85c04b 100644
--- a/aegisub/src/dialog_splash.cpp
+++ b/aegisub/src/dialog_splash.cpp
@@ -39,15 +39,16 @@
 // Includes
 #include "config.h"
 
-#include <wx/string.h>
-#include <wx/display.h>
+#ifndef AGI_PRE
 #include <wx/dcclient.h>
+#include <wx/display.h>
+#include <wx/string.h>
+#endif
+
 #include "dialog_splash.h"
-#include "options.h"
 #include "dialog_tip.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index da01c4898..26f11c851 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -39,26 +39,28 @@
 // Includes
 #include "config.h"
 
-#include <wx/fontdlg.h>
+#ifndef AGI_PRE
 #include <wx/colordlg.h>
+#include <wx/fontdlg.h>
 #include <wx/fontenum.h>
-#include "dialog_style_editor.h"
+#endif
+
 #include "ass_dialogue.h"
-#include "ass_style.h"
 #include "ass_file.h"
 #include "ass_override.h"
-#include "validators.h"
-#include "subs_grid.h"
-#include "utils.h"
-#include "dialog_colorpicker.h"
-#include "colour_button.h"
-#include "subs_preview.h"
-#include "options.h"
-#include "subtitles_provider_manager.h"
+#include "ass_style.h"
 #include "ass_style_storage.h"
+#include "colour_button.h"
+#include "dialog_colorpicker.h"
+#include "dialog_style_editor.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
+#include "options.h"
+#include "subs_grid.h"
+#include "subs_preview.h"
+#include "subtitles_provider_manager.h"
+#include "utils.h"
+#include "validators.h"
 
 
 ///////
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 42b21150d..8c2fb9b7d 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -39,26 +39,26 @@
 // Includes
 #include "config.h"
 
-#include <wx/filename.h>
-#include <wx/filedlg.h>
+#ifndef AGI_PRE
 #include <wx/choicdlg.h>
-#include <wx/intl.h>
 #include <wx/clipbrd.h>
+#include <wx/filedlg.h>
+#include <wx/filename.h>
+#include <wx/intl.h>
 #include <wx/tokenzr.h>
-#include "dialog_style_manager.h"
-#include "dialog_style_editor.h"
-#include "ass_style.h"
-#include "ass_file.h"
+#endif
+
 #include "ass_dialogue.h"
-#include "standard_paths.h"
-#include "options.h"
-#include "subs_grid.h"
-#include "utils.h"
+#include "ass_file.h"
+#include "ass_style.h"
+#include "dialog_style_editor.h"
+#include "dialog_style_manager.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
-
+#include "options.h"
+#include "standard_paths.h"
+#include "subs_grid.h"
+#include "utils.h"
 
 /// @brief Constructor 
 /// @param parent 
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index 547ade627..400cded63 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -39,25 +39,26 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/recguard.h>
-#include "dialog_styling_assistant.h"
-#include "subs_grid.h"
+#endif
+
+#include "ass_dialogue.h"
 #include "ass_file.h"
 #include "ass_style.h"
-#include "ass_dialogue.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "vfr.h"
-#include "frame_main.h"
-#include "audio_display.h"
 #include "audio_box.h"
-#include "hotkeys.h"
-#include "utils.h"
+#include "audio_display.h"
+#include "dialog_styling_assistant.h"
+#include "frame_main.h"
 #include "help_button.h"
-#include "subs_edit_box.h"
+#include "hotkeys.h"
 #include "libresrc/libresrc.h"
-
-
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_context.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp
index 92ae65bce..eddc6840d 100644
--- a/aegisub/src/dialog_text_import.cpp
+++ b/aegisub/src/dialog_text_import.cpp
@@ -39,11 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "dialog_text_import.h"
+#ifndef AGI_PRE
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include "options.h"
+#endif
 
+#include "dialog_text_import.h"
+#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 805066f3a..4479d1387 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -38,22 +38,20 @@
 // Includes
 #include "config.h"
 
-#include "dialog_timing_processor.h"
-#include "subs_grid.h"
-#include "ass_file.h"
-#include "options.h"
-#include "validators.h"
-#include "video_display.h"
-#include "video_box.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
 #include "ass_time.h"
-#include "vfr.h"
-#include "utils.h"
+#include "dialog_timing_processor.h"
 #include "help_button.h"
-#include "video_context.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "validators.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_tip.cpp b/aegisub/src/dialog_tip.cpp
index dd3105138..478b40084 100644
--- a/aegisub/src/dialog_tip.cpp
+++ b/aegisub/src/dialog_tip.cpp
@@ -39,13 +39,15 @@
 // Headers
 #include "config.h"
 
-#include <wx/window.h>
+#ifndef AGI_PRE
 #include <wx/msgdlg.h>
+#include <wx/window.h>
+#endif
+
 #include "dialog_tip.h"
 #include "options.h"
 
 
-
 /// @brief Constructor 
 /// @param currentTip 
 ///
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index 327b58272..cfbc9be53 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -39,23 +39,24 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/settings.h>
-#include "dialog_translation.h"
+#endif
+
 #include "ass_dialogue.h"
 #include "ass_file.h"
-#include "subs_grid.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "subs_edit_box.h"
-#include "options.h"
 #include "audio_display.h"
+#include "dialog_translation.h"
 #include "frame_main.h"
-#include "hotkeys.h"
-#include "utils.h"
 #include "help_button.h"
+#include "hotkeys.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "video_context.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_version_check.cpp b/aegisub/src/dialog_version_check.cpp
index bbe34e499..242bdd12c 100644
--- a/aegisub/src/dialog_version_check.cpp
+++ b/aegisub/src/dialog_version_check.cpp
@@ -39,23 +39,24 @@
 // Headers
 #include "config.h"
 
-#include <wx/filesys.h>
-#include <wx/fs_inet.h>
-#include <wx/txtstrm.h>
-#include <wx/tokenzr.h>
+#ifndef AGI_PRE
 #include <wx/button.h>
 #include <wx/event.h>
-#include "dialog_version_check.h"
-#include "version.h"
-#include "main.h"
+#include <wx/filesys.h>
+#include <wx/fs_inet.h>
+#include <wx/tokenzr.h>
+#include <wx/txtstrm.h>
+#endif
 
+#include "dialog_version_check.h"
+#include "main.h"
+#include "version.h"
 
 
 /// DOCME
 bool DialogVersionCheck::dialogRunning = false;
 
 
-
 /// @brief Constructor 
 /// @param parent 
 /// @param hidden 
diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp
index 00728500a..24d79dedd 100644
--- a/aegisub/src/dialog_video_details.cpp
+++ b/aegisub/src/dialog_video_details.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/stattext.h>
+#endif
+
+#include "audio_box.h"
+#include "audio_provider_manager.h"
 #include "dialog_video_details.h"
+#include "utils.h"
 #include "video_context.h"
 #include "video_provider_manager.h"
-#include "audio_provider_manager.h"
-#include "audio_box.h"
-#include "utils.h"
-
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/drop.cpp b/aegisub/src/drop.cpp
index 526ef3de4..a7cebb7c4 100644
--- a/aegisub/src/drop.cpp
+++ b/aegisub/src/drop.cpp
@@ -39,10 +39,12 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <wx/filename.h>
+#endif
+
 #include "drop.h"
 #include "frame_main.h"
-#include <wx/filename.h>
-
 
 
 /// @brief Constructor
diff --git a/aegisub/src/export_clean_info.cpp b/aegisub/src/export_clean_info.cpp
index 00bb4c062..4d96faa96 100644
--- a/aegisub/src/export_clean_info.cpp
+++ b/aegisub/src/export_clean_info.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
-#include "export_clean_info.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
 #include "ass_override.h"
-
+#include "export_clean_info.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/export_fixstyle.cpp b/aegisub/src/export_fixstyle.cpp
index 95683f077..cfc7cd75c 100644
--- a/aegisub/src/export_fixstyle.cpp
+++ b/aegisub/src/export_fixstyle.cpp
@@ -45,7 +45,6 @@
 #include "ass_style.h"
 
 
-
 /// @brief Constructor 
 ///
 AssFixStylesFilter::AssFixStylesFilter() {
diff --git a/aegisub/src/export_framerate.cpp b/aegisub/src/export_framerate.cpp
index f187129ec..b2885d998 100644
--- a/aegisub/src/export_framerate.cpp
+++ b/aegisub/src/export_framerate.cpp
@@ -39,12 +39,11 @@
 // Headers
 #include "config.h"
 
+#include "ass_dialogue.h"
+#include "ass_file.h"
+#include "ass_override.h"
 #include "export_framerate.h"
 #include "vfr.h"
-#include "ass_file.h"
-#include "ass_dialogue.h"
-#include "ass_override.h"
-
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/export_visible_lines.cpp b/aegisub/src/export_visible_lines.cpp
index ab4577571..292d0e125 100644
--- a/aegisub/src/export_visible_lines.cpp
+++ b/aegisub/src/export_visible_lines.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "export_visible_lines.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
 #include "ass_override.h"
+#include "export_visible_lines.h"
 #include "vfr.h"
 
 
-
 /// @brief Constructor 
 ///
 AssLimitToVisibleFilter::AssLimitToVisibleFilter() {
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 05a0559e6..60eb1d4fd 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -40,16 +40,20 @@
 
 ///////////
 // Headers
-#include <wx/dir.h>
-#include <wx/choicdlg.h>
-#include "ffmpegsource_common.h"
-#include "md5.h"
-#include "standard_paths.h"
-#include "main.h"
-#include "frame_main.h"
-#include "options.h"
+#ifndef AGI_PRE
 #include <map>
 
+#include <wx/choicdlg.h>
+#include <wx/dir.h>
+#endif
+
+#include "ffmpegsource_common.h"
+#include "frame_main.h"
+#include "main.h"
+#include "md5.h"
+#include "options.h"
+#include "standard_paths.h"
+
 
 wxMutex FFmpegSourceProvider::CleaningInProgress;
 
diff --git a/aegisub/src/fft.cpp b/aegisub/src/fft.cpp
index f70ed866c..85498e1f0 100644
--- a/aegisub/src/fft.cpp
+++ b/aegisub/src/fft.cpp
@@ -41,9 +41,11 @@
 // Headers
 #include "config.h"
 
-#include "fft.h"
+#ifndef AGI_PRE
 #include <math.h>
+#endif
 
+#include "fft.h"
 
 
 /// @brief Transform 
diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp
index 81960903a..2130d21f6 100644
--- a/aegisub/src/font_file_lister.cpp
+++ b/aegisub/src/font_file_lister.cpp
@@ -40,32 +40,31 @@
 
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/tokenzr.h>
-#include "font_file_lister.h"
-#include "text_file_writer.h"
-#include "text_file_reader.h"
-#include "standard_paths.h"
+#endif
+
 #if defined(__WINDOWS__) || defined(__APPLE__)
 #ifdef WITH_FREETYPE2
 #include "font_file_lister_freetype.h"
-
 /// DOCME
 #define FontListerClass FreetypeFontFileLister
-#endif
+#endif // WITH_FREETYPE2
 #else
 #include "font_file_lister_fontconfig.h"
-
 /// DOCME
 #define FontListerClass FontConfigFontFileLister
 #endif
 
+#include "font_file_lister.h"
+#include "standard_paths.h"
+#include "text_file_reader.h"
+#include "text_file_writer.h"
 
 
 /// DOCME
 FontFileLister *FontFileLister::instance = NULL;
 
-
-
 /// @brief Constructor 
 ///
 FontFileLister::FontFileLister() {
diff --git a/aegisub/src/font_file_lister_freetype.cpp b/aegisub/src/font_file_lister_freetype.cpp
index 0202c9414..0932eee5f 100644
--- a/aegisub/src/font_file_lister_freetype.cpp
+++ b/aegisub/src/font_file_lister_freetype.cpp
@@ -41,17 +41,22 @@
 #include "config.h"
 
 #ifdef WITH_FREETYPE2
-#include "font_file_lister_freetype.h"
+
+#ifndef AGI_PRE
+#ifdef __WINDOWS__
+#include <shlobj.h>
+#endif
+
+#include <wx/dir.h>
+#endif
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 #include FT_SFNT_NAMES_H
-#ifdef WIN32
-# include <shlobj.h>
-#endif
-#include <wx/dir.h>
-#include "charset_conv.h"
 
+#include "charset_conv.h"
+#include "font_file_lister_freetype.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 7780dddb7..73819929c 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -39,55 +39,56 @@
 // Include headers
 #include "config.h"
 
-#include <wx/sysopt.h>
-#include <wx/mimetype.h>
+#ifndef AGI_PRE
 #include <wx/filename.h>
-#include <wx/tokenzr.h>
 #include <wx/image.h>
+#include <wx/mimetype.h>
 #include <wx/statline.h>
+#include <wx/sysopt.h>
+#include <wx/tokenzr.h>
+#endif
 
-#include "subs_grid.h"
-#include "frame_main.h"
-#ifdef WITH_AVISYNTH
-#include "avisynth_wrap.h"
-#endif
-#include "video_display.h"
-#include "video_context.h"
-#include "video_provider_manager.h"
-#include "video_slider.h"
-#include "ass_file.h"
-#include "dialog_search_replace.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "options.h"
-#include "main.h"
-#include "version.h"
-#include "dialog_splash.h"
-#include "dialog_tip.h"
-#include "audio_box.h"
-#include "audio_display.h"
-#include "video_box.h"
-#include "drop.h"
-#include "hotkeys.h"
-#include "utils.h"
-#include "text_file_reader.h"
-#include "text_file_writer.h"
-#include "dialog_version_check.h"
-#include "dialog_detached_video.h"
-#include "standard_paths.h"
-#include "keyframe.h"
-#include "help_button.h"
-#include "dialog_styling_assistant.h"
-#ifdef WITH_AUTOMATION
-#include "auto4_base.h"
-#endif
-#include "charset_conv.h"
-#include "libresrc/libresrc.h"
 #ifdef __WXMAC__
 #include <Carbon/Carbon.h>
 #endif
 
-
+#include "ass_file.h"
+#include "audio_box.h"
+#include "audio_display.h"
+#ifdef WITH_AUTOMATION
+#include "auto4_base.h"
+#endif
+#ifdef WITH_AVISYNTH
+#include "avisynth_wrap.h"
+#endif
+#include "charset_conv.h"
+#include "dialog_detached_video.h"
+#include "dialog_search_replace.h"
+#include "dialog_splash.h"
+#include "dialog_styling_assistant.h"
+#include "dialog_tip.h"
+#include "dialog_version_check.h"
+#include "drop.h"
+#include "frame_main.h"
+#include "help_button.h"
+#include "hotkeys.h"
+#include "keyframe.h"
+#include "libresrc/libresrc.h"
+#include "main.h"
+#include "options.h"
+#include "standard_paths.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "text_file_reader.h"
+#include "text_file_writer.h"
+#include "utils.h"
+#include "version.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_provider_manager.h"
+#include "video_slider.h"
 
 
 #ifdef WITH_STARTUPLOG
diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp
index 8a57aafaa..c2e431d1f 100644
--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@@ -39,60 +39,62 @@
 // Include headers
 #include "config.h"
 
-#include <wx/mimetype.h>
+#ifndef AGI_PRE
+#include <wx/clipbrd.h>
 #include <wx/filename.h>
-#include <wx/tglbtn.h>
+#include <wx/mimetype.h>
 #include <wx/rawbmp.h>
 #include <wx/stdpaths.h>
 #include <wx/sysopt.h>
-#include <wx/clipbrd.h>
-#include "subs_grid.h"
-#include "frame_main.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "video_slider.h"
-#include "video_box.h"
-#include "ass_file.h"
+#include <wx/tglbtn.h>
+#endif
+
 #include "ass_dialogue.h"
-#include "dialog_style_manager.h"
-#include "dialog_translation.h"
-#include "dialog_jumpto.h"
-#include "dialog_shift_times.h"
-#include "dialog_search_replace.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "options.h"
-#include "dialog_properties.h"
-#include "dialog_attachments.h"
-#include "main.h"
-#include "dialog_fonts_collector.h"
-#include "dialog_about.h"
-#include "dialog_export.h"
+#include "ass_file.h"
 #include "audio_box.h"
-#include "dialog_selection.h"
-#include "dialog_styling_assistant.h"
-#include "dialog_resample.h"
-#include "dialog_kara_timing_copy.h"
 #include "audio_display.h"
-#include "toggle_bitmap.h"
-#include "dialog_timing_processor.h"
-#include "dialog_progress.h"
-#include "dialog_options.h"
-#include "utils.h"
 #ifdef WITH_AUTOMATION
 #include "auto4_base.h"
 #endif
-#include "dialog_automation.h"
-#include "dialog_version_check.h"
-#include "dialog_dummy_video.h"
-#include "dialog_spellchecker.h"
-#include "dialog_associations.h"
-#include "standard_paths.h"
-#include "dialog_video_details.h"
-#include "keyframe.h"
 #include "charset_conv.h"
+#include "dialog_about.h"
+#include "dialog_associations.h"
+#include "dialog_attachments.h"
+#include "dialog_automation.h"
+#include "dialog_dummy_video.h"
+#include "dialog_export.h"
+#include "dialog_fonts_collector.h"
+#include "dialog_jumpto.h"
+#include "dialog_kara_timing_copy.h"
+#include "dialog_options.h"
+#include "dialog_progress.h"
+#include "dialog_properties.h"
+#include "dialog_resample.h"
+#include "dialog_search_replace.h"
+#include "dialog_selection.h"
+#include "dialog_shift_times.h"
+#include "dialog_spellchecker.h"
+#include "dialog_style_manager.h"
+#include "dialog_styling_assistant.h"
+#include "dialog_timing_processor.h"
+#include "dialog_translation.h"
+#include "dialog_version_check.h"
+#include "dialog_video_details.h"
+#include "frame_main.h"
+#include "keyframe.h"
 #include "libresrc/libresrc.h"
-
+#include "main.h"
+#include "options.h"
+#include "standard_paths.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "toggle_bitmap.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_slider.h"
 
 
 ////////////////////
diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp
index 281035dba..81d096315 100644
--- a/aegisub/src/gl_text.cpp
+++ b/aegisub/src/gl_text.cpp
@@ -39,13 +39,15 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/dcmemory.h>
 #include <wx/image.h>
+#endif
+
 #include "gl_text.h"
 #include "utils.h"
 
 
-
 /// @brief Constructor 
 ///
 OpenGLText::OpenGLText() {
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index 255a70c1d..f805d2ac1 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -39,7 +39,13 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/msgdlg.h>
+#endif
+
+#include "gl_wrap.h"
+#include "options.h"
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/glext.h>
@@ -47,8 +53,6 @@
 #include <GL/gl.h>
 #include "gl/glext.h"
 #endif
-#include "gl_wrap.h"
-#include "options.h"
 
 
 //////////////////////////
diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp
index 2a2b97202..105aab616 100644
--- a/aegisub/src/help_button.cpp
+++ b/aegisub/src/help_button.cpp
@@ -39,14 +39,17 @@
 // Headers
 #include "config.h"
 
-#include <wx/mimetype.h>
-#include <wx/log.h>
-#include <wx/filename.h>
+#ifndef AGI_PRE
 #include <map>
-#include "help_button.h"
-#include "utils.h"
-#include "standard_paths.h"
 
+#include <wx/filename.h>
+#include <wx/log.h>
+#include <wx/mimetype.h>
+#endif
+
+#include "help_button.h"
+#include "standard_paths.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/hilimod_textctrl.cpp b/aegisub/src/hilimod_textctrl.cpp
index a6cf75792..b2fcf8f65 100644
--- a/aegisub/src/hilimod_textctrl.cpp
+++ b/aegisub/src/hilimod_textctrl.cpp
@@ -43,7 +43,6 @@
 #include "options.h"
 
 
-
 /// @brief Constructor 
 /// @param parent    
 /// @param id        
diff --git a/aegisub/src/hotkeys.cpp b/aegisub/src/hotkeys.cpp
index fb422b27c..b8e5390a4 100644
--- a/aegisub/src/hotkeys.cpp
+++ b/aegisub/src/hotkeys.cpp
@@ -39,15 +39,17 @@
 // Headers
 #include "config.h"
 
-#include "hotkeys.h"
+#ifndef AGI_PRE
 #include <fstream>
+
+#include <wx/accel.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+#endif
+
+#include "hotkeys.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include <wx/filename.h>
-#include <wx/accel.h>
-#include <wx/log.h>
-
-
 
 
 /// @brief Constructors  HotkeyType //////////////////////////////////
diff --git a/aegisub/src/idle_field_event.cpp b/aegisub/src/idle_field_event.cpp
index d7f303cf6..5f865fd98 100644
--- a/aegisub/src/idle_field_event.cpp
+++ b/aegisub/src/idle_field_event.cpp
@@ -39,10 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "idle_field_event.h"
+#ifndef AGI_PRE
 #include <wx/event.h>
 #include <wx/settings.h>
+#endif
 
+#include "idle_field_event.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/kana_table.cpp b/aegisub/src/kana_table.cpp
index 6e03387b2..5cfc55419 100644
--- a/aegisub/src/kana_table.cpp
+++ b/aegisub/src/kana_table.cpp
@@ -40,7 +40,6 @@
 #include "kana_table.h"
 
 
-
 /// @brief Constructor
 KanaTable::KanaTable()
 {
diff --git a/aegisub/src/keyframe.cpp b/aegisub/src/keyframe.cpp
index 7bb80244e..f4f4d2f27 100644
--- a/aegisub/src/keyframe.cpp
+++ b/aegisub/src/keyframe.cpp
@@ -38,14 +38,16 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/msgdlg.h>
-#include "video_context.h"
+#endif
+
 #include "keyframe.h"
+#include "options.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "options.h"
 #include "vfr.h"
-
+#include "video_context.h"
 
 
 /// @brief Load Keyframes 
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index 1c0b59e8b..e792cfdce 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -50,28 +50,28 @@
 #include <wx/utils.h>
 #endif
 
-#include "main.h"
-#include "frame_main.h"
-#include "options.h"
-#include "hotkeys.h"
-#include "dialog_associations.h"
+#include "ass_dialogue.h"
+#include "ass_export_filter.h"
 #include "ass_file.h"
+#include "ass_time.h"
 #include "audio_box.h"
 #include "audio_display.h"
-#include "export_framerate.h"
-#include "ass_export_filter.h"
-#include "ass_time.h"
-#include "ass_dialogue.h"
-#include "subs_grid.h"
-#include "subtitle_format.h"
-#include "video_context.h"
-#include "standard_paths.h"
 #ifdef WITH_AUTOMATION
 #include "auto4_base.h"
 #endif
-#include "version.h"
-#include "plugin_manager.h"
 #include "charset_conv.h"
+#include "dialog_associations.h"
+#include "export_framerate.h"
+#include "frame_main.h"
+#include "hotkeys.h"
+#include "main.h"
+#include "options.h"
+#include "plugin_manager.h"
+#include "standard_paths.h"
+#include "subs_grid.h"
+#include "subtitle_format.h"
+#include "version.h"
+#include "video_context.h"
 
 
 ///////////////////
diff --git a/aegisub/src/mkv_wrap.cpp b/aegisub/src/mkv_wrap.cpp
index a4275baee..fb6687460 100644
--- a/aegisub/src/mkv_wrap.cpp
+++ b/aegisub/src/mkv_wrap.cpp
@@ -39,17 +39,21 @@
 // Headers
 #include "config.h"
 
-#include <algorithm>
+#ifndef AGI_PRE
 #include <errno.h>
 #include <stdint.h>
-#include <wx/tokenzr.h>
+
+#include <algorithm>
+
 #include <wx/choicdlg.h>
 #include <wx/filename.h>
-#include "mkv_wrap.h"
-#include "dialog_progress.h"
+#include <wx/tokenzr.h>
+#endif
+
 #include "ass_file.h"
 #include "ass_time.h"
-
+#include "dialog_progress.h"
+#include "mkv_wrap.h"
 
 
 /// DOCME
diff --git a/aegisub/src/options.cpp b/aegisub/src/options.cpp
index fe80c4325..0fda9fd76 100644
--- a/aegisub/src/options.cpp
+++ b/aegisub/src/options.cpp
@@ -39,24 +39,26 @@
 // Includes
 #include "config.h"
 
-#include <string>
-#include <wx/filename.h>
+#ifndef AGI_PRE
 #include <fstream>
-#include <wx/intl.h>
-#include <wx/settings.h>
-#include <wx/filefn.h>
-#include <wx/utils.h>
-#include <wx/msgdlg.h>
-#include <wx/stopwatch.h>
+#include <string>
 
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/intl.h>
+#include <wx/msgdlg.h>
+#include <wx/settings.h>
+#include <wx/stopwatch.h>
+#include <wx/utils.h>
+#endif
+
+#include "colorspace.h"
 #include "options.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "colorspace.h"
 #include "utils.h"
 
 
-
 /// @brief Constructor 
 ///
 OptionsManager::OptionsManager() {
diff --git a/aegisub/src/plugin_manager.cpp b/aegisub/src/plugin_manager.cpp
index c35539a51..3344cf16c 100644
--- a/aegisub/src/plugin_manager.cpp
+++ b/aegisub/src/plugin_manager.cpp
@@ -39,13 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "plugin_manager.h"
-#include "video_provider_manager.h"
-#include "audio_provider_manager.h"
 #include "audio_player_manager.h"
-#include "subtitles_provider_manager.h"
+#include "audio_provider_manager.h"
+#include "plugin_manager.h"
 #include "spellchecker_manager.h"
-
+#include "subtitles_provider_manager.h"
+#include "video_provider_manager.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/quicktime_common.cpp b/aegisub/src/quicktime_common.cpp
index fc59e91f4..4d1af172d 100644
--- a/aegisub/src/quicktime_common.cpp
+++ b/aegisub/src/quicktime_common.cpp
@@ -35,10 +35,8 @@
 ///
 
 
-#include "quicktime_common.h"
-
 #ifdef WITH_QUICKTIME
-
+#include "quicktime_common.h"
 
 
 /// DOCME
diff --git a/aegisub/src/scintilla_text_ctrl.cpp b/aegisub/src/scintilla_text_ctrl.cpp
index 85048e115..3824da2dc 100644
--- a/aegisub/src/scintilla_text_ctrl.cpp
+++ b/aegisub/src/scintilla_text_ctrl.cpp
@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// @brief Constructor 
 /// @param parent    
 /// @param id        
diff --git a/aegisub/src/setup.cpp b/aegisub/src/setup.cpp
index 0929bdec8..1f147ab29 100644
--- a/aegisub/src/setup.cpp
+++ b/aegisub/src/setup.cpp
@@ -40,8 +40,6 @@
 #include "config.h"
 
 
-
-
 //////////////////////////////////
 ///////// MSVC Libraries /////////
 //////////////////////////////////
diff --git a/aegisub/src/spellchecker.cpp b/aegisub/src/spellchecker.cpp
index 079759797..898072657 100644
--- a/aegisub/src/spellchecker.cpp
+++ b/aegisub/src/spellchecker.cpp
@@ -39,11 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "spellchecker_manager.h"
 #ifdef WITH_HUNSPELL
 #include "spellchecker_hunspell.h"
 #endif
+
 #include "options.h"
+#include "spellchecker_manager.h"
 
 
 
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp
index cf2697bb2..c74748e2a 100644
--- a/aegisub/src/spellchecker_hunspell.cpp
+++ b/aegisub/src/spellchecker_hunspell.cpp
@@ -42,17 +42,21 @@
 
 #ifdef WITH_HUNSPELL
 
+#ifndef AGI_PRE
+#include <wx/dir.h>
+#include <wx/filename.h>
+#include <wx/log.h>
+#include <wx/txtstrm.h>
+#include <wx/wfstream.h>
+#endif
+
+#include <hunspell/hunspell.hxx>
+
+#include "charset_conv.h"
+#include "options.h"
 #include "spellchecker_hunspell.h"
 #include "standard_paths.h"
 #include "utils.h"
-#include "options.h"
-#include "charset_conv.h"
-#include <hunspell/hunspell.hxx>
-#include <wx/dir.h>
-#include <wx/filename.h>
-#include <wx/wfstream.h>
-#include <wx/txtstrm.h>
-#include <wx/log.h>
 
 
 /// @brief Constructor
diff --git a/aegisub/src/spline.cpp b/aegisub/src/spline.cpp
index 9e5450ad3..1a5573c0d 100644
--- a/aegisub/src/spline.cpp
+++ b/aegisub/src/spline.cpp
@@ -39,12 +39,14 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/tokenzr.h>
+#endif
+
 #include "spline.h"
 #include "utils.h"
 
 
-
 /// @brief Spline constructor 
 ///
 Spline::Spline() {
diff --git a/aegisub/src/spline_curve.cpp b/aegisub/src/spline_curve.cpp
index 9b92108f0..00e142433 100644
--- a/aegisub/src/spline_curve.cpp
+++ b/aegisub/src/spline_curve.cpp
@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// @brief Curve constructor 
 ///
 SplineCurve::SplineCurve() {
diff --git a/aegisub/src/standard_paths.cpp b/aegisub/src/standard_paths.cpp
index 76522c52d..4514452c8 100644
--- a/aegisub/src/standard_paths.cpp
+++ b/aegisub/src/standard_paths.cpp
@@ -39,10 +39,12 @@
 // Headers
 #include "config.h"
 
-#include <wx/stdpaths.h>
+#ifndef AGI_PRE
 #include <wx/filename.h>
-#include "standard_paths.h"
+#include <wx/stdpaths.h>
+#endif
 
+#include "standard_paths.h"
 
 
 /// @brief Get instance 
diff --git a/aegisub/src/static_bmp.cpp b/aegisub/src/static_bmp.cpp
index af4b77b8a..493ccaeae 100644
--- a/aegisub/src/static_bmp.cpp
+++ b/aegisub/src/static_bmp.cpp
@@ -39,9 +39,11 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/dcclient.h>
-#include "static_bmp.h"
+#endif
 
+#include "static_bmp.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/string_codec.cpp b/aegisub/src/string_codec.cpp
index 188a28f0f..00fea9304 100644
--- a/aegisub/src/string_codec.cpp
+++ b/aegisub/src/string_codec.cpp
@@ -41,7 +41,6 @@
 
 #include "string_codec.h"
 
-
 /// @brief DOCME
 /// @param input 
 /// @return 
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index f47b089f7..c8fd15d46 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -39,33 +39,34 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/colordlg.h>
 #include <wx/fontdlg.h>
+#endif
+
+#include "ass_dialogue.h"
+#include "ass_file.h"
+#include "ass_override.h"
+#include "ass_style.h"
+#include "audio_display.h"
+#include "dialog_colorpicker.h"
+#include "dialog_search_replace.h"
+#include "frame_main.h"
+#include "hilimod_textctrl.h"
+#include "idle_field_event.h"
+#include "libresrc/libresrc.h"
+#include "main.h"
+#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_edit_ctrl.h"
 #include "subs_grid.h"
-#include "ass_file.h"
-#include "ass_dialogue.h"
-#include "ass_style.h"
-#include "ass_override.h"
 #include "timeedit_ctrl.h"
-#include "vfr.h"
-#include "options.h"
-#include "audio_display.h"
-#include "hilimod_textctrl.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "validators.h"
-#include "dialog_colorpicker.h"
-#include "main.h"
-#include "frame_main.h"
-#include "utils.h"
-#include "dialog_search_replace.h"
-#include "idle_field_event.h"
 #include "tooltip_manager.h"
-#include "libresrc/libresrc.h"
-
-
+#include "utils.h"
+#include "validators.h"
+#include "vfr.h"
+#include "video_context.h"
+#include "video_display.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index c857666e2..b3f82f905 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -39,14 +39,16 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/intl.h>
-#include "subs_edit_ctrl.h"
-#include "subs_edit_box.h"
+#endif
+
+#include "ass_dialogue.h"
 #include "options.h"
+#include "subs_edit_box.h"
+#include "subs_edit_ctrl.h"
 #include "subs_grid.h"
 #include "utils.h"
-#include "ass_dialogue.h"
-
 
 
 /// @brief Edit box constructor 
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index f049c7b01..9feaa9ee2 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -39,25 +39,29 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <algorithm>
+
 #include <wx/clipbrd.h>
-#include <wx/tokenzr.h>
 #include <wx/filename.h>
-#include "subs_grid.h"
+#include <wx/tokenzr.h>
+#endif
+
 #include "ass_file.h"
+#include "ass_karaoke.h"
+#include "ass_override.h"
 #include "ass_style.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "options.h"
+#include "charset_conv.h"
+#include "dialog_paste_over.h"
 #include "frame_main.h"
 #include "hotkeys.h"
+#include "options.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
-#include "ass_override.h"
-#include "dialog_paste_over.h"
-#include "charset_conv.h"
-#include "ass_karaoke.h"
+#include "vfr.h"
+#include "video_context.h"
+#include "video_display.h"
 
 
 ///////////////
diff --git a/aegisub/src/subs_preview.cpp b/aegisub/src/subs_preview.cpp
index 7bb4483ec..320825802 100644
--- a/aegisub/src/subs_preview.cpp
+++ b/aegisub/src/subs_preview.cpp
@@ -39,15 +39,17 @@
 // Includes
 #include "config.h"
 
-#include <wx/msgdlg.h>
+#ifndef AGI_PRE
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
+#include <wx/msgdlg.h>
+#endif
+
+#include "ass_file.h"
 #include "ass_style.h"
 #include "subs_preview.h"
-#include "video_provider_dummy.h"
 #include "subtitles_provider_manager.h"
-#include "ass_file.h"
-
+#include "video_provider_dummy.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index 115478cb9..d050d7c82 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -39,23 +39,25 @@
 // Headers
 #include "config.h"
 
-#include <wx/intl.h>
+#ifndef AGI_PRE
 #include <wx/choicdlg.h>
+#include <wx/intl.h>
+#endif
+
+#include "ass_file.h"
 #include "subtitle_format.h"
 #include "subtitle_format_ass.h"
-#include "subtitle_format_srt.h"
-#include "subtitle_format_txt.h"
-#include "subtitle_format_ttxt.h"
-#include "subtitle_format_mkv.h"
-#include "subtitle_format_microdvd.h"
-#include "subtitle_format_encore.h"
-#include "subtitle_format_transtation.h"
 #include "subtitle_format_dvd.h"
-#include "ass_file.h"
+#include "subtitle_format_encore.h"
+#include "subtitle_format_microdvd.h"
+#include "subtitle_format_mkv.h"
+#include "subtitle_format_srt.h"
+#include "subtitle_format_transtation.h"
+#include "subtitle_format_ttxt.h"
+#include "subtitle_format_txt.h"
 #include "vfr.h"
 
 
-
 /// @brief Constructor 
 ///
 SubtitleFormat::SubtitleFormat() {
diff --git a/aegisub/src/subtitle_format_ass.cpp b/aegisub/src/subtitle_format_ass.cpp
index 236310996..44b7b1cb4 100644
--- a/aegisub/src/subtitle_format_ass.cpp
+++ b/aegisub/src/subtitle_format_ass.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
+#include "ass_dialogue.h"
 #include "subtitle_format_ass.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "ass_dialogue.h"
-
 
 
 /// @brief Can read? 
diff --git a/aegisub/src/subtitle_format_dvd.cpp b/aegisub/src/subtitle_format_dvd.cpp
index 22377ffc2..421f9f159 100644
--- a/aegisub/src/subtitle_format_dvd.cpp
+++ b/aegisub/src/subtitle_format_dvd.cpp
@@ -39,11 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "subtitle_format_dvd.h"
-#include "video_provider_dummy.h"
-#include "subtitles_provider_manager.h"
 #include "ass_dialogue.h"
 #include "ass_file.h"
+#include "subtitle_format_dvd.h"
+#include "subtitles_provider_manager.h"
+#include "video_provider_dummy.h"
+
 
 /// DOCME
 #undef _OPENMP
diff --git a/aegisub/src/subtitle_format_encore.cpp b/aegisub/src/subtitle_format_encore.cpp
index a2ea9b0f3..1ba50440f 100644
--- a/aegisub/src/subtitle_format_encore.cpp
+++ b/aegisub/src/subtitle_format_encore.cpp
@@ -44,7 +44,6 @@
 #include "text_file_writer.h"
 
 
-
 /// @brief Name 
 /// @return 
 ///
diff --git a/aegisub/src/subtitle_format_microdvd.cpp b/aegisub/src/subtitle_format_microdvd.cpp
index 0f759a936..1f2c42c2e 100644
--- a/aegisub/src/subtitle_format_microdvd.cpp
+++ b/aegisub/src/subtitle_format_microdvd.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
-#include "subtitle_format_microdvd.h"
+#ifndef AGI_PRE
+#include <wx/regex.h>
+#endif
+
 #include "ass_dialogue.h"
 #include "ass_time.h"
+#include "subtitle_format_microdvd.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
 #include "vfr.h"
-#include <wx/regex.h>
-
 
 
 /// @brief Get format name 
diff --git a/aegisub/src/subtitle_format_mkv.cpp b/aegisub/src/subtitle_format_mkv.cpp
index ad8a4b409..a7c68ff6a 100644
--- a/aegisub/src/subtitle_format_mkv.cpp
+++ b/aegisub/src/subtitle_format_mkv.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
-#include "subtitle_format_mkv.h"
 #include "ass_dialogue.h"
-#include "mkv_wrap.h"
 #include "ass_file.h"
-
+#include "mkv_wrap.h"
+#include "subtitle_format_mkv.h"
 
 
 /// @brief Can read? 
diff --git a/aegisub/src/subtitle_format_prs.cpp b/aegisub/src/subtitle_format_prs.cpp
index 1d4a0a834..c99809af7 100644
--- a/aegisub/src/subtitle_format_prs.cpp
+++ b/aegisub/src/subtitle_format_prs.cpp
@@ -40,27 +40,29 @@
 #include "config.h"
 
 #if USE_PRS == 1
+#ifndef AGI_PRE
+#include <wx/docview.h>
+#include <wx/filename.h>
 #include <wx/image.h>
 #include <wx/mstream.h>
-#include <wx/filename.h>
-#include <wx/docview.h>
-#include "subtitle_format_prs.h"
-#include "ass_file.h"
+#endif
+
+#include "../prs/prs.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
 #include "ass_override.h"
 #include "avisynth_wrap.h"
+#include "charset_conv.h"
+#include "dialog_progress.h"
+#include "frame_main.h"
+#include "main.h"
+#include "md5.h"
+#include "subtitle_format_prs.h"
+#include "utils.h"
+#include "vfr.h"
 #include "video_box.h"
 #include "video_display.h"
 #include "video_provider.h"
-#include "main.h"
-#include "frame_main.h"
-#include "vfr.h"
-#include "utils.h"
-#include "md5.h"
-#include "dialog_progress.h"
-#include "charset_conv.h"
-#include "../prs/prs.h"
-
 
 
 /// @brief Can write to file? 
diff --git a/aegisub/src/subtitle_format_srt.cpp b/aegisub/src/subtitle_format_srt.cpp
index 0ed92c595..2a5fbd318 100644
--- a/aegisub/src/subtitle_format_srt.cpp
+++ b/aegisub/src/subtitle_format_srt.cpp
@@ -39,12 +39,11 @@
 // Headers
 #include "config.h"
 
+#include "ass_dialogue.h"
+#include "ass_file.h"
 #include "subtitle_format_srt.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "ass_dialogue.h"
-#include "ass_file.h"
-
 
 
 /// @brief Can read? 
diff --git a/aegisub/src/subtitle_format_transtation.cpp b/aegisub/src/subtitle_format_transtation.cpp
index 173977795..78358323e 100644
--- a/aegisub/src/subtitle_format_transtation.cpp
+++ b/aegisub/src/subtitle_format_transtation.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <stdio.h>
+#endif
+
 #include "ass_dialogue.h"
 #include "ass_file.h"
 #include "ass_style.h"
 #include "ass_time.h"
 #include "subtitle_format_transtation.h"
 #include "text_file_writer.h"
-#include <stdio.h>
-
 
 
 /// @brief Name 
diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/aegisub/src/subtitle_format_ttxt.cpp
index 374043984..bdf98595b 100644
--- a/aegisub/src/subtitle_format_ttxt.cpp
+++ b/aegisub/src/subtitle_format_ttxt.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
-#include "subtitle_format_ttxt.h"
-#include "ass_time.h"
 #include "ass_file.h"
+#include "ass_time.h"
 #include "options.h"
-
+#include "subtitle_format_ttxt.h"
 
 
 /// @brief Get format name 
diff --git a/aegisub/src/subtitle_format_txt.cpp b/aegisub/src/subtitle_format_txt.cpp
index f3042c6ec..21b728df9 100644
--- a/aegisub/src/subtitle_format_txt.cpp
+++ b/aegisub/src/subtitle_format_txt.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
+#include "ass_dialogue.h"
+#include "dialog_text_import.h"
+#include "options.h"
 #include "subtitle_format_txt.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-#include "ass_dialogue.h"
-#include "options.h"
 #include "version.h"
-#include "dialog_text_import.h"
-
 
 
 /// @brief Can read? 
diff --git a/aegisub/src/subtitles_provider.cpp b/aegisub/src/subtitles_provider.cpp
index 71a32cfa8..e04861363 100644
--- a/aegisub/src/subtitles_provider.cpp
+++ b/aegisub/src/subtitles_provider.cpp
@@ -39,15 +39,14 @@
 // Headers
 #include "config.h"
 
-#include "subtitles_provider_manager.h"
+#include "options.h"
 #ifdef WITH_CSRI
 #include "subtitles_provider_csri.h"
 #endif
 #ifdef WITH_LIBASS
 #include "subtitles_provider_libass.h"
 #endif
-#include "options.h"
-
+#include "subtitles_provider_manager.h"
 
 
 /// @brief Destructor 
diff --git a/aegisub/src/subtitles_provider_csri.cpp b/aegisub/src/subtitles_provider_csri.cpp
index d0e7894ae..f18899216 100644
--- a/aegisub/src/subtitles_provider_csri.cpp
+++ b/aegisub/src/subtitles_provider_csri.cpp
@@ -42,12 +42,11 @@
 
 #ifdef WITH_CSRI
 
-#include "subtitles_provider_csri.h"
 #include "ass_file.h"
+#include "subtitles_provider_csri.h"
 #include "video_context.h"
 
 
-
 /// @brief Constructor 
 /// @param type 
 ///
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp
index b0c25d5c7..726277acf 100644
--- a/aegisub/src/subtitles_provider_libass.cpp
+++ b/aegisub/src/subtitles_provider_libass.cpp
@@ -41,20 +41,24 @@
 
 #ifdef WITH_LIBASS
 
-#include "subtitles_provider_libass.h"
-#include "ass_file.h"
-#include "video_context.h"
-#include "utils.h"
-#include "standard_paths.h"
+#ifndef AGI_PRE
 #include <wx/filefn.h>
+#endif
 
 #ifdef __APPLE__
 extern "C" {
-#include "libosxutil/libosxutil.h"
 #include <sys/param.h>
+#include "libosxutil/libosxutil.h"
 }
 #endif
 
+#include "ass_file.h"
+#include "standard_paths.h"
+#include "subtitles_provider_libass.h"
+#include "utils.h"
+#include "video_context.h"
+
+
 
 /// @brief Constructor
 ///
diff --git a/aegisub/src/text_file_reader.cpp b/aegisub/src/text_file_reader.cpp
index 166d61e55..6c0b0c726 100644
--- a/aegisub/src/text_file_reader.cpp
+++ b/aegisub/src/text_file_reader.cpp
@@ -36,18 +36,20 @@
 
 #include "config.h"
 
-#include <fstream>
-#include <algorithm>
-#include <string>
+#ifndef AGI_PRE
 #include <assert.h>
 #include <errno.h>
-#include "text_file_reader.h"
+
+#include <algorithm>
+#include <fstream>
+#include <string>
+#endif
+
 #include "charset_conv.h"
-
-
 #ifdef WITH_UNIVCHARDET
 #include "charset_detect.h"
 #endif
+#include "text_file_reader.h"
 
 
 /// @brief DOCME
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index d0985b5d1..0659ef23b 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -36,10 +36,13 @@
 
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <fstream>
-#include "text_file_writer.h"
-#include "options.h"
+#endif
+
 #include "charset_conv.h"
+#include "options.h"
+#include "text_file_writer.h"
 
 
 /// @brief DOCME
diff --git a/aegisub/src/thesaurus.cpp b/aegisub/src/thesaurus.cpp
index 00a8168ee..93deeca1b 100644
--- a/aegisub/src/thesaurus.cpp
+++ b/aegisub/src/thesaurus.cpp
@@ -43,7 +43,6 @@
 #include "thesaurus_myspell.h"
 
 
-
 /// @brief Get spell checker 
 ///
 Thesaurus *Thesaurus::GetThesaurus() {
diff --git a/aegisub/src/thesaurus_myspell.cpp b/aegisub/src/thesaurus_myspell.cpp
index 0d6eceb66..e602c5da5 100644
--- a/aegisub/src/thesaurus_myspell.cpp
+++ b/aegisub/src/thesaurus_myspell.cpp
@@ -39,14 +39,16 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/dir.h>
 #include <wx/filename.h>
-#include "thesaurus_myspell.h"
-#include "mythes.hxx"
-#include "standard_paths.h"
-#include "options.h"
-#include "utils.h"
+#endif
 
+#include "mythes.hxx"
+#include "options.h"
+#include "standard_paths.h"
+#include "thesaurus_myspell.h"
+#include "utils.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp
index f7ee4ba73..bc2830f7b 100644
--- a/aegisub/src/timeedit_ctrl.cpp
+++ b/aegisub/src/timeedit_ctrl.cpp
@@ -39,23 +39,25 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/clipbrd.h>
-#include <wx/valtext.h>
-#include <wx/menu.h>
 #include <wx/dataobj.h>
-#include "timeedit_ctrl.h"
+#include <wx/menu.h>
+#include <wx/valtext.h>
+#endif
+
 #include "ass_time.h"
-#include "vfr.h"
 #include "options.h"
+#include "timeedit_ctrl.h"
+#include "vfr.h"
+
 
-// Use the multiline style only on wxGTK to workaround some wxGTK bugs with the default singleline style
 #ifdef __WXGTK__
-
-/// DOCME
+/// Use the multiline style only on wxGTK to workaround some wxGTK bugs with the default singleline style.
 #define TimeEditWindowStyle wxTE_MULTILINE | wxTE_CENTRE
 #else
 
-/// DOCME
+/// All other platforms than wxGTK.
 #define TimeEditWindowStyle wxTE_CENTRE
 #endif
 
diff --git a/aegisub/src/toggle_bitmap.cpp b/aegisub/src/toggle_bitmap.cpp
index 50a635319..2770ed82c 100644
--- a/aegisub/src/toggle_bitmap.cpp
+++ b/aegisub/src/toggle_bitmap.cpp
@@ -39,11 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "toggle_bitmap.h"
-#include <wx/tglbtn.h>
-#include <wx/settings.h>
+#ifndef AGI_PRE
 #include <wx/dcclient.h>
+#include <wx/settings.h>
+#include <wx/tglbtn.h>
+#endif
 
+#include "toggle_bitmap.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/tooltip_manager.cpp b/aegisub/src/tooltip_manager.cpp
index 70e10b5c4..c14784e0a 100644
--- a/aegisub/src/tooltip_manager.cpp
+++ b/aegisub/src/tooltip_manager.cpp
@@ -39,9 +39,8 @@
 // Headers
 #include "config.h"
 
-#include "tooltip_manager.h"
 #include "hotkeys.h"
-
+#include "tooltip_manager.h"
 
 
 /// @brief Update all tips 
diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
index 6906f0767..f06344b34 100644
--- a/aegisub/src/utils.cpp
+++ b/aegisub/src/utils.cpp
@@ -39,20 +39,25 @@
 // Headers
 #include "config.h"
 
-#include <wx/filename.h>
-#include <wx/menu.h>
-#include <wx/dcmemory.h>
-#include <wx/stdpaths.h>
-#include "utils.h"
+#ifndef AGI_PRE
 #ifdef __UNIX__
 #include <unistd.h>
 #endif
+
+#include <wx/dcmemory.h>
+#include <wx/filename.h>
+#include <wx/menu.h>
+#include <wx/stdpaths.h>
+#endif
+
 #ifdef __APPLE__
 extern "C" {
 #include "libosxutil/libosxutil.h"
 }
 #endif
 
+#include "utils.h"
+
 
 #ifndef __LINUX__
 
diff --git a/aegisub/src/validators.cpp b/aegisub/src/validators.cpp
index 51d7787ca..2d2022855 100644
--- a/aegisub/src/validators.cpp
+++ b/aegisub/src/validators.cpp
@@ -39,10 +39,12 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/textctrl.h>
-#include "validators.h"
-#include "utils.h"
+#endif
 
+#include "utils.h"
+#include "validators.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/variable_data.cpp b/aegisub/src/variable_data.cpp
index d1ebc0dc5..b32ccc6d0 100644
--- a/aegisub/src/variable_data.cpp
+++ b/aegisub/src/variable_data.cpp
@@ -39,11 +39,10 @@
 // Includes
 #include "config.h"
 
-#include "variable_data.h"
 #include "ass_dialogue.h"
 #include "ass_style.h"
 #include "utils.h"
-
+#include "variable_data.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/vector2d.cpp b/aegisub/src/vector2d.cpp
index 14c3d3b60..b83754c8e 100644
--- a/aegisub/src/vector2d.cpp
+++ b/aegisub/src/vector2d.cpp
@@ -39,8 +39,11 @@
 // Headers
 #include "config.h"
 
-#include "vector2d.h"
+#ifndef AGI_PRE
 #include <math.h>
+#endif
+
+#include "vector2d.h"
 
 
 /// @brief Null constructor 
diff --git a/aegisub/src/version.cpp b/aegisub/src/version.cpp
index 9ebe53a0a..5ca68ce75 100644
--- a/aegisub/src/version.cpp
+++ b/aegisub/src/version.cpp
@@ -36,8 +36,11 @@
 
 #include "config.h"
 
-#include <wx/string.h>
+#ifndef AGI_PRE
 #include <wx/datetime.h>
+#include <wx/string.h>
+#endif
+
 #include "version.h"
 
 #ifdef __WINDOWS__
diff --git a/aegisub/src/vfr.cpp b/aegisub/src/vfr.cpp
index 864439ab7..812189e0d 100644
--- a/aegisub/src/vfr.cpp
+++ b/aegisub/src/vfr.cpp
@@ -39,13 +39,15 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/filename.h>
+#endif
+
 #include "options.h"
-#include "vfr.h"
-#include "utils.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
-
+#include "utils.h"
+#include "vfr.h"
 
 
 /// @brief V2 Clear function 
diff --git a/aegisub/src/vfw_wrap.cpp b/aegisub/src/vfw_wrap.cpp
index a6a64a40e..a3c5737d7 100644
--- a/aegisub/src/vfw_wrap.cpp
+++ b/aegisub/src/vfw_wrap.cpp
@@ -42,11 +42,13 @@
 // Headers
 #include "config.h"
 
-#include "vfw_wrap.h"
+#ifndef AGI_PRE
 #ifdef __WINDOWS__
 #include <vfw.h>
 #endif
+#endif
 
+#include "vfw_wrap.h"
 
 
 /// @brief Get keyframe list 
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index b9f407647..95cbc6c32 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -39,31 +39,31 @@
 // Includes
 #include "config.h"
 
-#include <wx/mimetype.h>
+#ifndef AGI_PRE
 #include <wx/filename.h>
-#include <wx/tglbtn.h>
-#include <wx/statline.h>
+#include <wx/mimetype.h>
 #include <wx/rawbmp.h>
-#include "video_box.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "video_slider.h"
-#include "frame_main.h"
-#include "toggle_bitmap.h"
-#include "options.h"
-#include "subs_grid.h"
-#include "video_provider_manager.h"
-#include "ass_file.h"
+#include <wx/statline.h>
+#include <wx/tglbtn.h>
+#endif
+
 #include "ass_dialogue.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "utils.h"
-#include "toggle_bitmap.h"
-#include "visual_tool.h"
+#include "ass_file.h"
+#include "frame_main.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-
-
+#include "options.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "toggle_bitmap.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_provider_manager.h"
+#include "video_slider.h"
+#include "visual_tool.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index 96e5176e4..75d463f9f 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -39,6 +39,15 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <string.h>
+
+#include <wx/clipbrd.h>
+#include <wx/config.h>
+#include <wx/filename.h>
+#include <wx/image.h>
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
@@ -46,32 +55,27 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif
-#include <wx/image.h>
-#include <string.h>
-#include <wx/clipbrd.h>
-#include <wx/filename.h>
-#include <wx/config.h>
-#include "utils.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "video_provider_manager.h"
-#include "visual_tool.h"
-#include "subtitles_provider_manager.h"
-#include "vfr.h"
-#include "ass_file.h"
-#include "ass_exporter.h"
-#include "ass_time.h"
+
 #include "ass_dialogue.h"
+#include "ass_exporter.h"
+#include "ass_file.h"
 #include "ass_style.h"
-#include "subs_grid.h"
-#include "options.h"
-#include "subs_edit_box.h"
+#include "ass_time.h"
 #include "audio_display.h"
-#include "video_slider.h"
-#include "video_box.h"
-#include "utils.h"
 #include "gl_wrap.h"
+#include "options.h"
 #include "standard_paths.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "subtitles_provider_manager.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_box.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_provider_manager.h"
+#include "video_slider.h"
+#include "visual_tool.h"
 
 
 ///////
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 1322d9b5d..828561e00 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -37,7 +37,14 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
+#include <wx/dcclient.h>
 #include <wx/glcanvas.h>
+#include <wx/menu.h>
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
@@ -45,28 +52,26 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif
-#include <wx/clipbrd.h>
-#include <wx/dcclient.h>
-#include <wx/menu.h>
-#include <wx/dataobj.h>
-#include "utils.h"
-#include "video_display.h"
-#include "video_provider_manager.h"
-#include "vfr.h"
+
 #include "ass_dialogue.h"
+#include "gl_wrap.h"
+#include "hotkeys.h"
 #include "options.h"
+#include "utils.h"
+#include "vfr.h"
 #include "video_box.h"
 #include "video_context.h"
-#include "gl_wrap.h"
+#include "video_display.h"
+#include "video_provider_manager.h"
 #include "visual_tool.h"
-#include "visual_tool_cross.h"
-#include "visual_tool_rotatez.h"
-#include "visual_tool_rotatexy.h"
-#include "visual_tool_scale.h"
 #include "visual_tool_clip.h"
-#include "visual_tool_vector_clip.h"
+#include "visual_tool_cross.h"
 #include "visual_tool_drag.h"
-#include "hotkeys.h"
+#include "visual_tool_rotatexy.h"
+#include "visual_tool_rotatez.h"
+#include "visual_tool_scale.h"
+#include "visual_tool_vector_clip.h"
+
 
 // Menu item IDs
 enum {
diff --git a/aegisub/src/video_frame.cpp b/aegisub/src/video_frame.cpp
index 06d9b2366..4ee9aeb75 100644
--- a/aegisub/src/video_frame.cpp
+++ b/aegisub/src/video_frame.cpp
@@ -39,9 +39,8 @@
 // Headers
 #include "config.h"
 
-#include "video_frame.h"
 #include "utils.h"
-
+#include "video_frame.h"
 
 
 /// @brief Reset 
diff --git a/aegisub/src/video_provider_avs.cpp b/aegisub/src/video_provider_avs.cpp
index ba40456df..193193b0a 100644
--- a/aegisub/src/video_provider_avs.cpp
+++ b/aegisub/src/video_provider_avs.cpp
@@ -40,19 +40,20 @@
 #include "config.h"
 
 #ifdef WITH_AVISYNTH
+#ifndef AGI_PRE
 #include <wx/filename.h>
 #include <wx/msw/registry.h>
-#include <wx/filename.h>
-#include "video_provider_avs.h"
-#include "video_context.h"
+#endif
+
+#include "charset_conv.h"
+#include "gl_wrap.h"
+#include "mkv_wrap.h"
 #include "options.h"
 #include "standard_paths.h"
 #include "vfr.h"
-#include "gl_wrap.h"
-#include "mkv_wrap.h"
 #include "vfw_wrap.h"
-#include "charset_conv.h"
-
+#include "video_context.h"
+#include "video_provider_avs.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp
index 30eab3a8c..5740897c1 100644
--- a/aegisub/src/video_provider_cache.cpp
+++ b/aegisub/src/video_provider_cache.cpp
@@ -42,7 +42,6 @@
 #include "video_provider_cache.h"
 
 
-
 /// @brief Constructor 
 /// @param parent 
 ///
diff --git a/aegisub/src/video_provider_dummy.cpp b/aegisub/src/video_provider_dummy.cpp
index e80a0cf52..87ebca71b 100644
--- a/aegisub/src/video_provider_dummy.cpp
+++ b/aegisub/src/video_provider_dummy.cpp
@@ -39,9 +39,12 @@
 // Headers
 #include "config.h"
 
-#include "video_provider_dummy.h"
-#include "colorspace.h"
+#ifndef AGI_PRE
 #include <wx/tokenzr.h>
+#endif
+
+#include "colorspace.h"
+#include "video_provider_dummy.h"
 
 
 ///////////
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index fff59c98e..722e8c549 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -40,19 +40,24 @@
 
 ///////////
 // Headers
-#include <wx/utils.h>
-#include <wx/choicdlg.h>
-#include <wx/msgdlg.h>
-#include <map>
-#include "include/aegisub/aegisub.h"
-#include "video_provider_ffmpegsource.h"
-#include "video_context.h"
-#include "options.h"
-#include "aegisub_endian.h"
-#ifdef WIN32
+#ifndef AGI_PRE
+#ifdef __WINDOWS__
 #include <objbase.h>
 #endif
 
+#include <map>
+
+#include <wx/choicdlg.h>
+#include <wx/msgdlg.h>
+#include <wx/utils.h>
+#endif
+
+#include "aegisub_endian.h"
+#include "include/aegisub/aegisub.h"
+#include "options.h"
+#include "video_context.h"
+#include "video_provider_ffmpegsource.h"
+
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/video_provider_manager.cpp b/aegisub/src/video_provider_manager.cpp
index 7fe6f223d..6c598d2f1 100644
--- a/aegisub/src/video_provider_manager.cpp
+++ b/aegisub/src/video_provider_manager.cpp
@@ -39,25 +39,23 @@
 // Headers
 #include "config.h"
 
-#include "video_provider_manager.h"
-#include "video_provider_dummy.h"
 #include "options.h"
 #include "vfr.h"
 #ifdef WITH_AVISYNTH
 #include "video_provider_avs.h"
 #endif
+#include "video_provider_cache.h"
+#include "video_provider_dummy.h"
 #ifdef WITH_FFMPEGSOURCE
 #include "video_provider_ffmpegsource.h"
 #endif
+#include "video_provider_manager.h"
 #ifdef WITH_QUICKTIME
 #include "video_provider_quicktime.h"
 #endif
-#include "video_provider_dummy.h"
-#include "video_provider_cache.h"
 #include "video_provider_yuv4mpeg.h"
 
 
-
 /// @brief Get provider 
 /// @param video 
 /// @return 
diff --git a/aegisub/src/video_provider_quicktime.cpp b/aegisub/src/video_provider_quicktime.cpp
index 22668c26e..f6f7704d2 100644
--- a/aegisub/src/video_provider_quicktime.cpp
+++ b/aegisub/src/video_provider_quicktime.cpp
@@ -34,10 +34,10 @@
 /// @ingroup video_input quicktime
 ///
 
-#include "video_provider_quicktime.h"
 
 #ifdef WITH_QUICKTIME
 #include "aegisub_endian.h"
+#include "video_provider_quicktime.h"
 
 // this function has a different name on win32 because the original name
 // conflicts with a windows api function
diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/aegisub/src/video_provider_yuv4mpeg.cpp
index e8e6bf3c5..1eb2ed1fc 100644
--- a/aegisub/src/video_provider_yuv4mpeg.cpp
+++ b/aegisub/src/video_provider_yuv4mpeg.cpp
@@ -34,7 +34,6 @@
 /// @ingroup video_input
 ///
 
-
 #include "video_provider_yuv4mpeg.h"
 
 // All of this cstdio bogus is because of one reason and one reason only:
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index 34303c5e7..b5ffe7d7a 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -39,17 +39,19 @@
 // Includes
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/settings.h>
-#include "video_slider.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "subs_grid.h"
-#include "ass_dialogue.h"
-#include "vfr.h"
-#include "subs_edit_box.h"
-#include "options.h"
-#include "utils.h"
+#endif
 
+#include "ass_dialogue.h"
+#include "options.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
+#include "utils.h"
+#include "vfr.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_slider.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_feature.cpp b/aegisub/src/visual_feature.cpp
index c83200364..347c6096d 100644
--- a/aegisub/src/visual_feature.cpp
+++ b/aegisub/src/visual_feature.cpp
@@ -39,10 +39,9 @@
 // Headers
 #include "config.h"
 
-#include "visual_feature.h"
-#include "gl_wrap.h"
 #include "ass_dialogue.h"
-
+#include "gl_wrap.h"
+#include "visual_feature.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 8139f3f3b..1bf4a0242 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -39,28 +39,31 @@
 // Headers
 #include "config.h"
 
+#ifndef AGI_PRE
 #include <wx/glcanvas.h>
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/GL.h>
 #else
 #include <GL/gl.h>
 #endif
-#include "visual_tool.h"
-#include "video_display.h"
-#include "video_context.h"
-#include "video_provider_manager.h"
-#include "vfr.h"
-#include "ass_file.h"
-#include "ass_time.h"
+
 #include "ass_dialogue.h"
+#include "ass_file.h"
 #include "ass_override.h"
 #include "ass_style.h"
-#include "subs_grid.h"
+#include "ass_time.h"
+#include "export_visible_lines.h"
 #include "options.h"
 #include "subs_edit_box.h"
-#include "export_visible_lines.h"
+#include "subs_grid.h"
 #include "utils.h"
-
+#include "vfr.h"
+#include "video_context.h"
+#include "video_display.h"
+#include "video_provider_manager.h"
+#include "visual_tool.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_clip.cpp b/aegisub/src/visual_tool_clip.cpp
index 67718e97d..e1e452478 100644
--- a/aegisub/src/visual_tool_clip.cpp
+++ b/aegisub/src/visual_tool_clip.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_clip.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
 #include "video_display.h"
-
+#include "visual_tool_clip.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_cross.cpp b/aegisub/src/visual_tool_cross.cpp
index ac3c1bc6b..a7762a7bc 100644
--- a/aegisub/src/visual_tool_cross.cpp
+++ b/aegisub/src/visual_tool_cross.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_cross.h"
-#include "gl_text.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
 #include "ass_file.h"
+#include "gl_text.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "video_context.h"
 #include "video_display.h"
-
+#include "visual_tool_cross.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_drag.cpp b/aegisub/src/visual_tool_drag.cpp
index e6cee5571..c7c895d31 100644
--- a/aegisub/src/visual_tool_drag.cpp
+++ b/aegisub/src/visual_tool_drag.cpp
@@ -39,17 +39,16 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_drag.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "libresrc/libresrc.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
 #include "vfr.h"
-#include "libresrc/libresrc.h"
 #include "video_context.h"
 #include "video_display.h"
-
+#include "visual_tool_drag.h"
 
 
 ///////
diff --git a/aegisub/src/visual_tool_rotatexy.cpp b/aegisub/src/visual_tool_rotatexy.cpp
index b87ec0596..8a6751d35 100644
--- a/aegisub/src/visual_tool_rotatexy.cpp
+++ b/aegisub/src/visual_tool_rotatexy.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_rotatexy.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
 #include "video_display.h"
-
+#include "visual_tool_rotatexy.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_rotatez.cpp b/aegisub/src/visual_tool_rotatez.cpp
index f29380ebb..77c37e934 100644
--- a/aegisub/src/visual_tool_rotatez.cpp
+++ b/aegisub/src/visual_tool_rotatez.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_rotatez.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
 #include "video_display.h"
-
+#include "visual_tool_rotatez.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp
index 78da39a08..4975d670b 100644
--- a/aegisub/src/visual_tool_scale.cpp
+++ b/aegisub/src/visual_tool_scale.cpp
@@ -39,14 +39,13 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_scale.h"
-#include "subs_grid.h"
-#include "subs_edit_box.h"
-#include "ass_file.h"
 #include "ass_dialogue.h"
+#include "ass_file.h"
+#include "subs_edit_box.h"
+#include "subs_grid.h"
 #include "utils.h"
 #include "video_display.h"
-
+#include "visual_tool_scale.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index c232e5160..e8d3ac204 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -39,11 +39,10 @@
 // Headers
 #include "config.h"
 
-#include "visual_tool_vector_clip.h"
 #include "ass_dialogue.h"
 #include "libresrc/libresrc.h"
 #include "video_display.h"
-
+#include "visual_tool_vector_clip.h"
 
 
 ///////