diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index 90f37fe69..c314f3935 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -40,6 +40,7 @@
 #include <math.h>
 
 #include <wx/bmpbuttn.h>
+#include <wx/panel.h>
 #include <wx/slider.h>
 #include <wx/scrolbar.h>
 #include <wx/sizer.h>
diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h
index 94e956d05..ff91209fd 100644
--- a/aegisub/src/audio_box.h
+++ b/aegisub/src/audio_box.h
@@ -48,6 +48,7 @@ class AudioDisplay;
 class wxBitmapToggleButton;
 class wxButton;
 class wxCommandEvent;
+class wxPanel;
 class wxScrollEvent;
 class wxSizer;
 class wxSlider;
diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 6f4827b0c..915c5f183 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -40,6 +40,7 @@
 
 #ifndef AGI_PRE
 #include <wx/filedlg.h>
+#include <wx/msgdlg.h>
 #endif
 
 #include "command.h"
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index a3afd0780..16a2c924e 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -37,8 +37,9 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <tr1/algorithm>
+#include <algorithm>
 
+#include <wx/bmpbuttn.h>
 #include <wx/colordlg.h>
 #include <wx/fontdlg.h>
 #include <wx/fontenum.h>
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 525db0c47..e4495407b 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <wx/bmpbuttn.h>
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>