diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07289bdf4d..8286945382 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,8 +257,8 @@ add_library(Common STATIC
 	Common/Misc.cpp
 	Common/MsgHandler.cpp
 	Common/MsgHandler.h
-	Common/StringUtil.cpp
-	Common/StringUtil.h
+	Common/StringUtils.cpp
+	Common/StringUtils.h
 	Common/Thread.cpp
 	Common/Thread.h
 	Common/ThreadPool.cpp
diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp
index eabeee915c..11d2ce7c1f 100644
--- a/Common/ArmCPUDetect.cpp
+++ b/Common/ArmCPUDetect.cpp
@@ -17,7 +17,7 @@
 
 #include "Common.h"
 #include "CPUDetect.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 // Only Linux platforms have /proc/cpuinfo
 #if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 19476c24df..b4390897ab 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SRCS
 	MemoryUtil.cpp
 	Misc.cpp
 	MsgHandler.cpp
-	StringUtil.cpp
+	StringUtils.cpp
 	Thread.cpp
 	ThreadPool.cpp
 	Timer.cpp
diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp
index 55d380123f..f6bc215514 100644
--- a/Common/CPUDetect.cpp
+++ b/Common/CPUDetect.cpp
@@ -72,7 +72,7 @@ void __cpuid(int regs[4], int cpuid_leaf)
 
 #include "Common.h"
 #include "CPUDetect.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 CPUInfo cpu_info;
 
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 9b64a6462e..f5b215f4e6 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -188,7 +188,7 @@
     <ClInclude Include="StdConditionVariable.h" />
     <ClInclude Include="StdMutex.h" />
     <ClInclude Include="StdThread.h" />
-    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="StringUtils.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="ThreadPool.h" />
@@ -225,7 +225,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="ThreadPool.cpp" />
     <ClCompile Include="Thunk.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index bac166f773..39a5dce5f0 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -34,7 +34,7 @@
     <ClInclude Include="StdConditionVariable.h" />
     <ClInclude Include="StdMutex.h" />
     <ClInclude Include="StdThread.h" />
-    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="StringUtils.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="Thunk.h" />
     <ClInclude Include="Timer.h" />
@@ -60,7 +60,7 @@
     <ClCompile Include="MemoryUtil.cpp" />
     <ClCompile Include="Misc.cpp" />
     <ClCompile Include="MsgHandler.cpp" />
-    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="Thunk.cpp" />
     <ClCompile Include="Timer.cpp" />
diff --git a/Common/FileSearch.cpp b/Common/FileSearch.cpp
index b5075c3ad2..aa836a166f 100644
--- a/Common/FileSearch.cpp
+++ b/Common/FileSearch.cpp
@@ -32,7 +32,7 @@
 
 #include "FileSearch.h"
 
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 
 CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
index d3a8b39a5e..87075d5ed4 100644
--- a/Common/FileUtil.cpp
+++ b/Common/FileUtil.cpp
@@ -18,7 +18,7 @@
 #include "Common.h"
 #include "CommonPaths.h"
 #include "FileUtil.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Common/LogManager.h b/Common/LogManager.h
index dc801043ed..bf8c940526 100644
--- a/Common/LogManager.h
+++ b/Common/LogManager.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include "Log.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 #include "Thread.h"
 #include "FileUtil.h"
 #include "file/ini_file.h" 
diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp
index d474ed633e..cebd40db07 100644
--- a/Common/MemoryUtil.cpp
+++ b/Common/MemoryUtil.cpp
@@ -17,7 +17,7 @@
 
 #include "Common.h"
 #include "MemoryUtil.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Common/MsgHandler.cpp b/Common/MsgHandler.cpp
index 5277064b06..75ebd60e3b 100644
--- a/Common/MsgHandler.cpp
+++ b/Common/MsgHandler.cpp
@@ -19,7 +19,7 @@
 #include <stdio.h> // System
 
 #include "Common.h" // Local
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
 static MsgAlertHandler msg_handler = DefaultMsgHandler;
diff --git a/Common/StringUtil.cpp b/Common/StringUtils.cpp
similarity index 99%
rename from Common/StringUtil.cpp
rename to Common/StringUtils.cpp
index ca63120278..b3b720bad1 100644
--- a/Common/StringUtil.cpp
+++ b/Common/StringUtils.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include "CommonPaths.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 // faster than sscanf
 bool AsciiToHex(const char* _szValue, u32& result)
diff --git a/Common/StringUtil.h b/Common/StringUtils.h
similarity index 100%
rename from Common/StringUtil.h
rename to Common/StringUtils.h
diff --git a/Common/Timer.cpp b/Common/Timer.cpp
index 278816e21f..c48d0812c4 100644
--- a/Common/Timer.cpp
+++ b/Common/Timer.cpp
@@ -27,7 +27,7 @@
 
 #include "Common.h"
 #include "Timer.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 namespace Common
 {
diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp
index 3f4f7e51a5..4393f406c1 100644
--- a/Core/FileSystems/MetaFileSystem.cpp
+++ b/Core/FileSystems/MetaFileSystem.cpp
@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <set>
-#include "Common/StringUtil.h"
+#include "Common/StringUtils.h"
 #include "../HLE/sceKernelThread.h"
 #include "MetaFileSystem.h"
 
diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp
index c897b8fc1e..6df5f708f0 100644
--- a/Core/PSPLoaders.cpp
+++ b/Core/PSPLoaders.cpp
@@ -27,7 +27,7 @@
 #include "MIPS/MIPSAnalyst.h"
 #include "MIPS/MIPSCodeUtils.h"
 
-#include "StringUtil.h"
+#include "StringUtils.h"
 
 #include "Host.h"
 
diff --git a/Qt/Common.pro b/Qt/Common.pro
index 1cfb07d64c..84a3ff745e 100755
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -42,7 +42,7 @@ SOURCES += ../Common/ColorUtil.cpp \
 	../Common/MemoryUtil.cpp \
 	../Common/Misc.cpp \
 	../Common/MsgHandler.cpp \
-	../Common/StringUtil.cpp \
+	../Common/StringUtils.cpp \
 	../Common/Thread.cpp \
 	../Common/ThreadPool.cpp \
 	../Common/Timer.cpp \
@@ -60,7 +60,7 @@ HEADERS += ../Common/ChunkFile.h \
 	../Common/MemArena.h \
 	../Common/MemoryUtil.h \
 	../Common/MsgHandler.h \
-	../Common/StringUtil.h \
+	../Common/StringUtils.h \
 	../Common/Thread.h \
 	../Common/ThreadPool.h \
 	../Common/Timer.h \
diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index af288883bf..3a3aebf45a 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -18,10 +18,6 @@
 #include <cmath>
 #include <string>
 #include <cstdio>
-// Hack: Harmattan will not compile without this!
-#ifdef MEEGO_EDITION_HARMATTAN
-#include "StringUtil.cpp"
-#endif
 
 #ifdef _WIN32
 namespace MainWindow {
@@ -52,7 +48,7 @@ namespace MainWindow {
 #include "util/text/utf8.h"
 #include "UIShader.h"
 
-#include "Common/StringUtil.h"
+#include "Common/StringUtils.h"
 #include "Core/System.h"
 #include "Core/CoreParameter.h"
 #include "GPU/ge_constants.h"
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index f66e7f9a10..cfea3c8269 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -4,7 +4,7 @@
 #include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "Log.h"
-#include "StringUtil.h"
+#include "StringUtils.h"
 #include "../Globals.h"
 #include "EmuThread.h"
 #include "../Core/Reporting.h"
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 597749c54c..2272a9fda5 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -134,7 +134,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/Common/MemoryUtil.cpp \
   $(SRC)/Common/MsgHandler.cpp \
   $(SRC)/Common/FileUtil.cpp \
-  $(SRC)/Common/StringUtil.cpp \
+  $(SRC)/Common/StringUtils.cpp \
   $(SRC)/Common/Thread.cpp \
   $(SRC)/Common/ThreadPool.cpp \
   $(SRC)/Common/Timer.cpp \