diff --git a/aegisub/src/dialog_log.cpp b/aegisub/src/dialog_log.cpp
index 0c390f0a6..89602c953 100644
--- a/aegisub/src/dialog_log.cpp
+++ b/aegisub/src/dialog_log.cpp
@@ -40,7 +40,7 @@
 
 #ifndef AGI_PRE
 #include <ctime>
-#include <functional>
+#include <tr1/functional>
 #include <string>
 
 #include <wx/button.h>
diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp
index b96e2a198..5375389bd 100644
--- a/aegisub/src/help_button.cpp
+++ b/aegisub/src/help_button.cpp
@@ -41,9 +41,11 @@
 #ifndef AGI_PRE
 #include <algorithm>
 #include <map>
+#include <tr1/functional>
 
 #include <wx/filename.h>
 #include <wx/mimetype.h>
+#include <wx/msgdlg.h>
 #endif
 
 #include <libaegisub/exception.h>