diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp
index 5418ab617..da53d9f1c 100644
--- a/aegisub/libaegisub/common/charset_conv.cpp
+++ b/aegisub/libaegisub/common/charset_conv.cpp
@@ -20,6 +20,8 @@
 
 #ifndef LAGI_PRE
 #include <assert.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include <map>
 #endif
diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h
index c6eca87ca..5257f5ec3 100644
--- a/aegisub/libaegisub/include/libaegisub/log.h
+++ b/aegisub/libaegisub/include/libaegisub/log.h
@@ -20,6 +20,7 @@
 
 #ifndef LAGI_PRE
 #include <stdio.h>
+#include <stdint.h>
 #include <time.h>
 
 #include <deque>
diff --git a/aegisub/libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h
index 5396536ba..921f9dcd1 100644
--- a/aegisub/libaegisub/lagi_pre.h
+++ b/aegisub/libaegisub/lagi_pre.h
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
+#include <sys/time.h>
 
 // Windows C
 #ifdef _WIN32
diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h
index 5c6fdcd32..55091fc41 100644
--- a/aegisub/src/gl_text.h
+++ b/aegisub/src/gl_text.h
@@ -39,6 +39,7 @@
 #include <vector>
 #include "boost/shared_ptr.hpp"
 
+#include <wx/colour.h>
 #include <wx/font.h>
 #endif
 
diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 0de26ec28..63afb58ef 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -20,8 +20,12 @@
 
 
 #ifndef AGI_PRE
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
 #include <wx/filefn.h>
+#include <wx/sizer.h>
 #include <wx/spinctrl.h>
+#include <wx/stattext.h>
 #include <wx/stdpaths.h>
 #include <wx/treebook.h>
 #endif
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 480ecddf0..7cd3ea8b6 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -43,6 +43,7 @@
 #include <wx/dcclient.h>
 #include <wx/glcanvas.h>
 #include <wx/menu.h>
+#include <wx/toolbar.h>
 #endif
 
 #ifdef __APPLE__
diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h
index ce8f4300b..f112b9da7 100644
--- a/aegisub/src/video_display.h
+++ b/aegisub/src/video_display.h
@@ -47,6 +47,7 @@ class VideoSlider;
 class VideoBox;
 class VideoOutGL;
 class IVisualTool;
+class wxToolBar;
 namespace agi {
 	class OptionValue;
 }
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 1385a8b9b..6a9efbbf1 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
 #include <wx/glcanvas.h>
 #endif
 
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index 2276ea4f8..4684c9fcf 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -36,8 +36,9 @@
 #pragma once
 
 #ifndef AGI_PRE
-#include <vector>
+#include <map>
 #include <set>
+#include <vector>
 
 #include <wx/log.h>
 #include <wx/event.h>
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index db11368fe..f49899a21 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -35,9 +35,19 @@
 
 #ifndef AGI_PRE
 #include <wx/toolbar.h>
+
+#ifdef HAVE_APPLE_OPENGL_FRAMEWORK
+#include <OpenGL/GL.h>
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include "gl/glext.h"
 #endif
 
+#endif
+
 #include "config.h"
 
 #include "ass_dialogue.h"
diff --git a/aegisub/tools/common-respack.cpp b/aegisub/tools/common-respack.cpp
index 46fb08c3f..20a64916c 100644
--- a/aegisub/tools/common-respack.cpp
+++ b/aegisub/tools/common-respack.cpp
@@ -119,6 +119,7 @@ int main(int argc, const char *argv[]) {
 	wxString filename;
 	FileIterator iter(argc, argv);
 
+		outC << "#include \"libresrc.h\"" << endl;
 	while (iter.Next(&filename)) {
 		ifstream infile(filename.char_str(), ios::binary);
 		infile.seekg(0, ios::end);