diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp
index bb8a6c929..88a94eb03 100644
--- a/aegisub/libaegisub/common/log.cpp
+++ b/aegisub/libaegisub/common/log.cpp
@@ -24,6 +24,7 @@
 #include <cstring>
 #include <functional>
 #include <memory>
+#include <sstream>
 #endif
 
 #include "libaegisub/cajun/elements.h"
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.h b/aegisub/libaegisub/include/libaegisub/cajun/elements.h
index 1e263dce4..7caa58019 100644
--- a/aegisub/libaegisub/include/libaegisub/cajun/elements.h
+++ b/aegisub/libaegisub/include/libaegisub/cajun/elements.h
@@ -10,6 +10,7 @@ Author: Terry Caton
 
 #include <deque>
 #include <list>
+#include <map>
 #include <string>
 #include <stdexcept>
 
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h b/aegisub/libaegisub/include/libaegisub/mru.h
index 9f8fa5857..eb16d18a8 100644
--- a/aegisub/libaegisub/include/libaegisub/mru.h
+++ b/aegisub/libaegisub/include/libaegisub/mru.h
@@ -19,6 +19,7 @@
 /// @ingroup libaegisub
 
 #ifndef LAGI_PRE
+#include <deque>
 #include <fstream>
 #include <list>
 #include <map>
diff --git a/aegisub/src/preferences_base.cpp b/aegisub/src/preferences_base.cpp
index 014aad213..978856a81 100644
--- a/aegisub/src/preferences_base.cpp
+++ b/aegisub/src/preferences_base.cpp
@@ -23,6 +23,7 @@
 #include <wx/any.h>
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
+#include <wx/dirdlg.h>
 #include <wx/event.h>
 #include <wx/filefn.h>
 #include <wx/fontdlg.h>
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index 9258fd0af..70b1950bb 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -42,6 +42,7 @@
 #else
 #include <tr1/functional>
 #endif
+#include <wx/clipbrd.h>
 #include <wx/intl.h>
 #endif
 
diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
index 2639634c3..bb2846409 100644
--- a/aegisub/src/utils.cpp
+++ b/aegisub/src/utils.cpp
@@ -48,6 +48,7 @@
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/stdpaths.h>
+#include <wx/window.h>
 #endif
 
 #include <libaegisub/log.h>
diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h
index 0b1b4e1f8..09a4b4bf1 100644
--- a/aegisub/src/utils.h
+++ b/aegisub/src/utils.h
@@ -48,6 +48,9 @@
 #include <wx/menuitem.h>
 #endif
 
+class wxMouseEvent;
+class wxWindow;
+
 /// DOCME
 typedef std::vector<std::pair<int,int> > IntPairVector;