diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp
index 7d1f298d4..5418ab617 100644
--- a/aegisub/libaegisub/common/charset_conv.cpp
+++ b/aegisub/libaegisub/common/charset_conv.cpp
@@ -19,6 +19,9 @@
 /// @ingroup libaegisub
 
 #ifndef LAGI_PRE
+#include <assert.h>
+
+#include <map>
 #endif
 
 #include "../config.h"
diff --git a/aegisub/libaegisub/common/charset_ucd.cpp b/aegisub/libaegisub/common/charset_ucd.cpp
index aae3213d7..5bb1f91e6 100644
--- a/aegisub/libaegisub/common/charset_ucd.cpp
+++ b/aegisub/libaegisub/common/charset_ucd.cpp
@@ -20,6 +20,10 @@
 
 
 #ifndef LAGI_PRE
+#include <fstream>
+#include <string>
+#include <map>
+
 #include "../../universalchardet/nsCharSetProber.h"
 #endif
 
diff --git a/aegisub/libaegisub/common/option_value.cpp b/aegisub/libaegisub/common/option_value.cpp
index 010de9ca7..535ac2a63 100644
--- a/aegisub/libaegisub/common/option_value.cpp
+++ b/aegisub/libaegisub/common/option_value.cpp
@@ -18,6 +18,10 @@
 /// @brief Container for holding an actual option value.
 /// @ingroup libaegisub
 
+#ifndef LAGI_PRE
+#include <assert.h>
+#endif
+
 #include "libaegisub/option_value.h"
 
 namespace agi {
diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h
index 2c39f5079..7e45378c9 100644
--- a/aegisub/libaegisub/include/libaegisub/option_value.h
+++ b/aegisub/libaegisub/include/libaegisub/option_value.h
@@ -19,9 +19,11 @@
 /// @ingroup libaegisub
 
 #ifndef LAGI_PRE
+#include <stdint.h>
+
 #include <fstream>
 #include <map>
-#include <stdint.h>
+#include <vector>
 #endif
 
 #include <libaegisub/exception.h>