Fix all the headers in *.cpp, this includes:

* Wrapping all headers that are in agi_pre.h with AGI_PRE.
 * Sorting alphabetically.

Originally committed to SVN as r3515.

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 
 ///

aegisub/src/agi_pre.cpp

@@ -49,4 +49,3 @@
 #include "config.h"
 
 #include "agi_pre.h"
-

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
 
 /////////////////////

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 //////////////////////
 ///

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 //////////////////////

aegisub/src/ass_export_filter.cpp

@@ -43,7 +43,6 @@
 #include "ass_file.h"
 
 
-
 /// @brief Constructor 
 ///
 AssExportFilter::AssExportFilter() {

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 
 ///

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 //////////////////////
 ///

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 //////////////////////

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 //////////////////////////

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 

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 //////////////////////

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 

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__

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 

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"
 
 
 

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 

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 

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

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>

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 

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 

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"
+
 
 
 

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 

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 

aegisub/src/audio_provider_downmix.cpp

@@ -42,7 +42,6 @@
 #include "audio_provider_downmix.h"
 
 
-
 /// @brief Constructor 
 /// @param source 
 ///

aegisub/src/audio_provider_dummy.cpp

@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// @brief Constructor 
 /// @param dur_ms 
 /// @param _noise 

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 

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 

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

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 

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

aegisub/src/audio_provider_stream.cpp

@@ -43,7 +43,6 @@
 #include "utils.h"
 
 
-
 /// DOCME
 #define BUFSIZE 65536
 

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)

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

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 {

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 {

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 {

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 {

aegisub/src/auto4_lua_scriptreader.cpp

@@ -34,6 +34,7 @@
 /// @ingroup scripting
 ///
 
+
 #include "config.h"
 
 #ifdef WITH_AUTO4_LUA

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;

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 

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 

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);
 

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"
 
 
 

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 

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 

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

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 

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 

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

aegisub/src/dialog_colorpicker.cpp

@@ -36,29 +36,31 @@
 
 #include "config.h"
 
-#include <wx/image.h>
-#include <wx/statbox.h>
-#include <wx/stattext.h>
-