diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
index 39b1073ad3..5b7217827a 100644
--- a/Common/ConsoleListener.cpp
+++ b/Common/ConsoleListener.cpp
@@ -17,6 +17,7 @@
 
 #include <atomic>
 #include <algorithm>  // min
+#include <cstring>
 #include <string> // System: To be able to add strings with "+"
 #include <math.h>
 #ifdef _WIN32
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
index d1ad8a5b72..d18ccecad4 100644
--- a/Common/FileUtil.cpp
+++ b/Common/FileUtil.cpp
@@ -24,6 +24,7 @@
 
 #include "ppsspp_config.h"
 
+#include <cstring>
 #include <memory>
 #include "FileUtil.h"
 #include "StringUtils.h"
diff --git a/Common/FileUtil.h b/Common/FileUtil.h
index e088ceda4c..f9f86433a7 100644
--- a/Common/FileUtil.h
+++ b/Common/FileUtil.h
@@ -35,16 +35,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
 
 namespace File {
 
-// FileSystem tree node/ 
-struct FSTEntry
-{
-	bool isDirectory;
-	u64 size;						// file length or number of entries from children
-	std::string physicalName;		// name on disk
-	std::string virtualName;		// name in FST names table
-	std::vector<FSTEntry> children;
-};
-
 struct FileDetails {
 	bool isDirectory;
 	u64 size;
diff --git a/Common/LogManager.h b/Common/LogManager.h
index 1e8e39547d..e05711a19c 100644
--- a/Common/LogManager.h
+++ b/Common/LogManager.h
@@ -19,13 +19,13 @@
 
 #include "ppsspp_config.h"
 
-#include <vector>
+#include <fstream>
 #include <mutex>
+#include <vector>
 
 #include "file/ini_file.h"
 #include "Log.h"
 #include "StringUtils.h"
-#include "FileUtil.h"
 
 #define	MAX_MESSAGES 8000   
 
diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp
index c1289720b0..0bd5da6962 100644
--- a/Common/StringUtils.cpp
+++ b/Common/StringUtils.cpp
@@ -15,6 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include <cstring>
 #include "Common.h"
 #include "StringUtils.h"
 
diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
index 1d8c9d513a..547ebb5925 100644
--- a/Core/Compatibility.cpp
+++ b/Core/Compatibility.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <cstring>
 #include "file/ini_file.h"
 #include "Core/Compatibility.h"
 #include "Core/System.h"
diff --git a/Core/Util/DisArm64.cpp b/Core/Util/DisArm64.cpp
index e6c983be55..651ffe35c9 100644
--- a/Core/Util/DisArm64.cpp
+++ b/Core/Util/DisArm64.cpp
@@ -21,7 +21,8 @@
 // Does enough to understand what's going on without having to resort to an
 // external disassembler all the time...
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "Common/Arm64Emitter.h"
 #include "Common/StringUtils.h"
diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp
index d91e4fb428..f1ed937836 100644
--- a/Core/Util/PortManager.cpp
+++ b/Core/Util/PortManager.cpp
@@ -25,18 +25,19 @@
 // All credit goes to him and the official miniupnp project! http://miniupnp.free.fr/
 
 
-#include <string>
 #include <algorithm>
-#include <Core/System.h>
-#include <Core/Host.h>
-#include <Core/ELF/ParamSFO.h>
-#include "Core/Util/PortManager.h"
-#include <Common/Log.h>
+#include <cstring>
+#include <string>
 #include <thread>
+#include "base/timeutil.h"
 #include "i18n/i18n.h"
 #include "net/resolve.h"
 #include "thread/threadutil.h"
-#include "base/timeutil.h"
+#include "Common/Log.h"
+#include "Core/System.h"
+#include "Core/Host.h"
+#include "Core/ELF/ParamSFO.h"
+#include "Core/Util/PortManager.h"
 
 
 PortManager g_PortManager;
diff --git a/ext/native/base/stringutil.h b/ext/native/base/stringutil.h
index 6a06a739db..c16602946f 100644
--- a/ext/native/base/stringutil.h
+++ b/ext/native/base/stringutil.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
 #include <string>
 #include <sstream>
-#include <stdarg.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -67,26 +63,6 @@ inline void StringToHexString(const std::string &data, std::string *output) {
 // highly unsafe and not recommended.
 unsigned int parseHex(const char* _szValue);
 
-
-// Suitable for inserting into maps, unlike char*, and cheaper than std::string.
-// Strings must be constant and preferably be stored in the read-only part 
-// of the binary.
-class ConstString {
-public:
-  ConstString(const char *ptr) {
-    ptr_ = ptr;
-  }
-  bool operator <(const ConstString &other) const {
-    return strcmp(ptr_, other.ptr_) < 0;
-  }
-  bool operator ==(const ConstString &other) const {
-    return ptr_ == other.ptr_ || !strcmp(ptr_, other.ptr_);
-  }
-	const char *get() const { return ptr_; }
-private:
-  const char *ptr_;
-};
-
 std::string StringFromFormat(const char* format, ...);
 std::string StringFromInt(int value);
 std::string StringFromBool(bool value);
diff --git a/ext/native/file/path.cpp b/ext/native/file/path.cpp
index ec62c179b5..6aa562dbbc 100644
--- a/ext/native/file/path.cpp
+++ b/ext/native/file/path.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cstring>
 #include <set>
 #include "base/stringutil.h"
 #include "base/timeutil.h"
diff --git a/ext/native/i18n/i18n.h b/ext/native/i18n/i18n.h
index bc4e3ca4bf..75d8ddd776 100644
--- a/ext/native/i18n/i18n.h
+++ b/ext/native/i18n/i18n.h
@@ -14,7 +14,6 @@
 #include <string>
 #include <vector>
 
-#include "base/stringutil.h"
 #include "file/ini_file.h"
 
 // Reasonably thread safe.