diff --git a/aegisub/libaegisub/common/charset_ucd.cpp b/aegisub/libaegisub/common/charset_ucd.cpp
index e70753bb4..70832b8cd 100644
--- a/aegisub/libaegisub/common/charset_ucd.cpp
+++ b/aegisub/libaegisub/common/charset_ucd.cpp
@@ -22,12 +22,13 @@
 
 #ifndef LAGI_PRE
 #include <memory>
-
-#include "../../universalchardet/nsCharSetProber.h"
 #endif
 
 #include "libaegisub/io.h"
 
+#include "../../universalchardet/nsCharSetProber.h"
+
+
 namespace agi {
 	namespace charset {
 
diff --git a/aegisub/libaegisub/common/charset_ucd.h b/aegisub/libaegisub/common/charset_ucd.h
index a9d59323b..98e1ed832 100644
--- a/aegisub/libaegisub/common/charset_ucd.h
+++ b/aegisub/libaegisub/common/charset_ucd.h
@@ -22,6 +22,7 @@
 
 #ifndef LAGI_PRE
 #include <string>
+#endif
 
 #ifndef _WIN32
 #define _X86_ 1
@@ -30,8 +31,6 @@
 #include "../../universalchardet/nscore.h"
 #include "../../universalchardet/nsUniversalDetector.h"
 #include "../../universalchardet/nsMBCSGroupProber.h"
-#endif
-
 
 namespace agi {
 	namespace charset {
diff --git a/aegisub/libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h
index 57c1b1c27..545cfe945 100644
--- a/aegisub/libaegisub/lagi_pre.h
+++ b/aegisub/libaegisub/lagi_pre.h
@@ -55,12 +55,3 @@
 #include "libaegisub/cajun/visitor.h"
 #include "libaegisub/cajun/writer.h"
 
-// Universalchardet
-#ifndef _WIN32
-#define _X86_ 1
-#endif
-#include "../universalchardet/nscore.h"
-#include "../universalchardet/nsUniversalDetector.h"
-#include "../universalchardet/nsMBCSGroupProber.h"
-#include "../universalchardet/nsCharSetProber.h"
-