diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/aegisub/libaegisub/include/libaegisub/hotkey.h
index 724482570..99b3a8ae0 100644
--- a/aegisub/libaegisub/include/libaegisub/hotkey.h
+++ b/aegisub/libaegisub/include/libaegisub/hotkey.h
@@ -21,6 +21,7 @@
 #ifndef LAGI_PRE
 #include <math.h>
 
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/aegisub/libaegisub/include/libaegisub/option.h
index 3c60814ee..d8853b5c6 100644
--- a/aegisub/libaegisub/include/libaegisub/option.h
+++ b/aegisub/libaegisub/include/libaegisub/option.h
@@ -22,6 +22,7 @@
 
 #ifndef LAGI_PRE
 #include <fstream>
+#include <map>
 #endif
 
 #include <libaegisub/exception.h>
diff --git a/aegisub/reporter/aegisub.cpp b/aegisub/reporter/aegisub.cpp
index 57777a888..db930c33c 100644
--- a/aegisub/reporter/aegisub.cpp
+++ b/aegisub/reporter/aegisub.cpp
@@ -24,6 +24,8 @@
 #include "aegisub.h"
 #include "util.h"
 
+#include <libaegisub/option_value.h>
+
 #ifdef __WINDOWS__
 #include "../src/config.h"
 #else
diff --git a/aegisub/reporter/main.cpp b/aegisub/reporter/main.cpp
index e2e51bef1..f75e55699 100644
--- a/aegisub/reporter/main.cpp
+++ b/aegisub/reporter/main.cpp
@@ -47,7 +47,7 @@ bool Reporter::OnInit() {
 //	if ( !wxApp::OnInit() )
 //		return false;
 
-	wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, _("Reporter"));
+	wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, _("Reporter").c_str());
 
 
 	static const wxCmdLineEntryDesc cmdLineDesc[] = {