diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
index 1d491c47ee..d5654cc5e0 100644
--- a/plugins/spu2-x/src/CMakeLists.txt
+++ b/plugins/spu2-x/src/CMakeLists.txt
@@ -34,7 +34,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
 # spu2x sources
 set(spu2xSources
     ADSR.cpp
-    ConvertUTF.cpp
     Debug.cpp
     Decoder.cpp
     Dma.cpp
@@ -59,7 +58,6 @@ set(spu2xSources
 # spu2x headers
 set(spu2xHeaders
     Config.h
-    ConvertUTF.h
     Debug.h
     defs.h
     Dma.h
diff --git a/plugins/spu2-x/src/Linux/CfgHelpers.cpp b/plugins/spu2-x/src/Linux/CfgHelpers.cpp
index 705579508c..450337bd39 100644
--- a/plugins/spu2-x/src/Linux/CfgHelpers.cpp
+++ b/plugins/spu2-x/src/Linux/CfgHelpers.cpp
@@ -84,16 +84,8 @@ void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wchar_t* Data, int
 	wcscpy(Data, spuConfig->Read(Name, Default));
 }
 
-void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, int DataSize, const wchar_t* Default)
+void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, const wchar_t* Default)
 {
 	setIni(Section);
 	Data = spuConfig->Read(Name, Default);
 }
-
-void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, int DataSize, const wchar_t* Default)
-{
-	wxString temp;
-	CfgReadStr(Section, Name, temp, DataSize, Default);
-	Data = temp.c_str();
-}
-
diff --git a/plugins/spu2-x/src/Linux/Config.h b/plugins/spu2-x/src/Linux/Config.h
index 01e226eb6c..7c739e1cfc 100644
--- a/plugins/spu2-x/src/Linux/Config.h
+++ b/plugins/spu2-x/src/Linux/Config.h
@@ -58,13 +58,13 @@ static __forceinline bool MemDump() { return _MemDump & DebugEnabled; }
 static __forceinline bool RegDump() { return _RegDump & DebugEnabled; }*/
 
 
-extern wchar_t AccessLogFileName[255];
-extern wchar_t WaveLogFileName[255];
-extern wchar_t DMA4LogFileName[255];
-extern wchar_t DMA7LogFileName[255];
-extern wchar_t CoresDumpFileName[255];
-extern wchar_t MemDumpFileName[255];
-extern wchar_t RegDumpFileName[255];
+//extern wchar_t AccessLogFileName[255];
+//extern wchar_t WaveLogFileName[255];
+//extern wchar_t DMA4LogFileName[255];
+//extern wchar_t DMA7LogFileName[255];
+//extern wchar_t CoresDumpFileName[255];
+//extern wchar_t MemDumpFileName[255];
+//extern wchar_t RegDumpFileName[255];
 
 extern int Interpolation;
 extern int ReverbBoost;
diff --git a/plugins/spu2-x/src/Linux/ConfigDebug.cpp b/plugins/spu2-x/src/Linux/ConfigDebug.cpp
index 0abf4bb64b..d2ba14fb99 100644
--- a/plugins/spu2-x/src/Linux/ConfigDebug.cpp
+++ b/plugins/spu2-x/src/Linux/ConfigDebug.cpp
@@ -18,6 +18,7 @@
 #include "Global.h"
 #include "Dialogs.h"
 #include "Config.h"
+#include "Utilities/Path.h"
 
 bool DebugEnabled=false;
 bool _MsgToConsole=false;
@@ -44,6 +45,7 @@ static wxDirName LogsFolder;
 static wxDirName DumpsFolder;
 
 wxString AccessLogFileName;
+wxString WaveLogFileName;
 wxString DMA4LogFileName;
 wxString DMA7LogFileName;
 
@@ -51,8 +53,6 @@ wxString CoresDumpFileName;
 wxString MemDumpFileName;
 wxString RegDumpFileName;
 
-namespace DebugConfig {
-
 void CfgSetLogDir( const char* dir )
 {
 	LogsFolder	= (dir==NULL) ? wxString(L"logs") : fromUTF8(dir);
@@ -75,6 +75,7 @@ FILE* OpenDump( const wxString& logfile )
 	return wxFopen( Path::Combine(DumpsFolder, logfile), L"w" );
 }
 
+namespace DebugConfig {
 static const wchar_t* Section = L"DEBUG";
 
 static void set_default_filenames()
diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp
index eab6590b63..d78a38c04e 100644
--- a/plugins/spu2-x/src/Linux/SPU2-X.cbp
+++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp
@@ -92,8 +92,6 @@
 		<Unit filename="../3rdparty/liba52/tendra.h" />
 		<Unit filename="../ADSR.cpp" />
 		<Unit filename="../Config.h" />
-		<Unit filename="../ConvertUTF.cpp" />
-		<Unit filename="../ConvertUTF.h" />
 		<Unit filename="../DPLII.h" />
 		<Unit filename="../Debug.cpp" />
 		<Unit filename="../Debug.h" />
diff --git a/plugins/spu2-x/src/Windows/Dialogs.h b/plugins/spu2-x/src/Windows/Dialogs.h
index ea98d410ee..93b6b94017 100644
--- a/plugins/spu2-x/src/Windows/Dialogs.h
+++ b/plugins/spu2-x/src/Windows/Dialogs.h
@@ -58,7 +58,6 @@ extern void		CfgWriteStr(const TCHAR* Section, const TCHAR* Name, const wxString
 
 extern bool		CfgReadBool(const TCHAR *Section,const TCHAR* Name, bool Default);
 extern void		CfgReadStr(const TCHAR* Section, const TCHAR* Name, wxString& Data, const TCHAR* Default);
-extern void		CfgReadStr(const TCHAR* Section, const TCHAR* Name, TCHAR* Data, int DataSize, const TCHAR* Default);
 extern int		CfgReadInt(const TCHAR* Section, const TCHAR* Name,int Default);
 
 // Items Specific to DirectSound