diff --git a/Common/CommonPaths.h b/Common/CommonPaths.h
index 65788bf6fb..b7130c9cf1 100644
--- a/Common/CommonPaths.h
+++ b/Common/CommonPaths.h
@@ -66,47 +66,16 @@
 	#endif
 #endif
 
-// Dirs in both User and Sys
-#define EUR_DIR "EUR"
-#define USA_DIR "USA"
-#define JAP_DIR "JAP"
-
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
 #define CONFIG_DIR		"Config"
-#define GAMECONFIG_DIR		"GameConfig"
-#define MAPS_DIR		"Maps"
-#define CACHE_DIR		"Cache"
-#define SHADERCACHE_DIR		"ShaderCache"
-#define STATESAVES_DIR		"StateSaves"
-#define SCREENSHOTS_DIR		"ScreenShots"
-#define OPENCL_DIR		"OpenCL"
-#define LOAD_DIR 		"Load"
-#define HIRES_TEXTURES_DIR	LOAD_DIR DIR_SEP "Textures"
-#define DUMP_DIR		"Dump"
-#define DUMP_TEXTURES_DIR	DUMP_DIR DIR_SEP "Textures"
-#define DUMP_FRAMES_DIR		DUMP_DIR DIR_SEP "Frames"
-#define DUMP_AUDIO_DIR		DUMP_DIR DIR_SEP "Audio"
-#define DUMP_DSP_DIR		DUMP_DIR DIR_SEP "DSP"
+#define SCREENSHOTS_DIR	"ScreenShots"
 #define LOGS_DIR		"Logs"
-#define MAIL_LOGS_DIR		LOGS_DIR DIR_SEP "Mail"
-#define SHADERS_DIR 		"Shaders"
-#define WII_SYSCONF_DIR		"shared2" DIR_SEP "sys"
 
 // Filenames
 // Files in the directory returned by GetUserPath(D_CONFIG_IDX)
 #define CONFIG_FILE "ppsspp.ini"
-#define LOGGER_CONFIG	"Logger.ini"
 
 // Files in the directory returned by GetUserPath(D_LOGS_IDX)
 #define MAIN_LOG	"ppsspp.log"
 
-// Sys files
-#define TOTALDB		"totaldb.dsy"
-
-#define FONT_ANSI	"font_ansi.bin"
-#define FONT_SJIS	"font_sjis.bin"
-
-#define DSP_IROM	"dsp_rom.bin"
-#define DSP_COEF	"dsp_coef.bin"
-
 #endif // _COMMON_PATHS_H_
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
index ebcd6957f6..6bcf21d3d4 100644
--- a/Common/FileUtil.cpp
+++ b/Common/FileUtil.cpp
@@ -708,7 +708,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
 		paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
 		paths[D_SCREENSHOTS_IDX]	= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
 		paths[D_LOGS_IDX]			= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-    paths[F_CONFIG_IDX]		= paths[D_CONFIG_IDX] + CONFIG_FILE;
+		paths[F_CONFIG_IDX]			= paths[D_CONFIG_IDX] + CONFIG_FILE;
 		paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
 	}
 
diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp
index bb39e66c21..ff0378e31c 100644
--- a/Common/StringUtils.cpp
+++ b/Common/StringUtils.cpp
@@ -15,7 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "CommonPaths.h"
+#include "Common.h"
 #include "StringUtils.h"
 
 long parseHexLong(std::string s) {
@@ -84,16 +84,4 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
 		*_pExtension = full_path.substr(fname_end);
 
 	return true;
-}
-
-void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename)
-{
-	_CompleteFilename = _Path;
-
-	// check for seperator
-	if (!strchr(DIR_SEP_CHRS, *_CompleteFilename.rbegin()))
-		_CompleteFilename += DIR_SEP;
-
-	// add the filename
-	_CompleteFilename += _Filename;
 }
\ No newline at end of file
diff --git a/Common/StringUtils.h b/Common/StringUtils.h
index e0cbc93128..d9ef8d44b4 100644
--- a/Common/StringUtils.h
+++ b/Common/StringUtils.h
@@ -57,6 +57,4 @@ std::string TabsToSpaces(int tab_size, const std::string &in);
 // "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
 bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename, std::string* _pExtension);
 
-void BuildCompleteFilename(std::string& _CompleteFilename, const std::string& _Path, const std::string& _Filename);
-
 #endif // _STRINGUTIL_H_