Index: src/include/aegisub/exception.h
===================================================================
--- src/include/aegisub/exception.h	(revision 3724)
+++ src/include/aegisub/exception.h	(working copy)
@@ -34,7 +34,7 @@
 /// @ingroup main_headers
 ///
 
-
+#pragma once
 #ifndef AGI_PRE
 #include <wx/string.h>
 #endif
Index: src/audio_renderer_spectrum.cpp
===================================================================
--- src/audio_renderer_spectrum.cpp	(revision 3724)
+++ src/audio_renderer_spectrum.cpp	(working copy)
@@ -39,6 +39,7 @@
 #ifndef AGI_PRE
 #include <wx/image.h>
 #include <wx/rawbmp.h>
+#include <wx/dcmemory.h>
 #include <algorithm>
 #endif
 
Index: src/audio_player_oss.h
===================================================================
--- src/audio_player_oss.h	(revision 3724)
+++ src/audio_player_oss.h	(working copy)
@@ -54,8 +54,6 @@
 #   endif
 #endif
 
-
-#include "frame_main.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "options.h"
Index: src/audio_display.cpp
===================================================================
--- src/audio_display.cpp	(revision 3724)
+++ src/audio_display.cpp	(working copy)
@@ -37,8 +37,14 @@
 
 ///////////
 // Headers
+
 #include "config.h"
 
+#ifndef AGI_PRE
+#include <algorithm>
+#include <wx/dcclient.h>
+#endif
+
 #include "audio_controller.h"
 #include "audio_display.h"
 #include "block_cache.h"
Index: src/dialog_automation.h
===================================================================
--- src/dialog_automation.h	(revision 3724)
+++ src/dialog_automation.h	(working copy)
@@ -47,7 +47,7 @@
 
 
 /// DOCME
-namespace Automation4 { class ScriptManager; class Script; };
+namespace Automation4 { class ScriptManager; class AutoloadScriptManager; class Script; };
 
 
 /// DOCME
Index: src/audio_player_alsa.h
===================================================================
--- src/audio_player_alsa.h	(revision 3724)
+++ src/audio_player_alsa.h	(working copy)
@@ -41,8 +41,7 @@
 ///////////
 // Headers
 #include <alsa/asoundlib.h>
-
-#include "frame_main.h"
+#include "audio_controller.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "options.h"