diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
index bed5d724f1..9398474d58 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -43,11 +43,7 @@ public:
 	virtual bool usesMixer() const { return true; }
 	virtual void Update();
 
-#ifdef _WIN32
-	static DWORD WINAPI ThreadFunc(void* args);
-#else
-	static void* soundThread(void* args);
-#endif
+	static THREAD_RETURN ThreadFunc(void* args);
 
 private:
 	Common::Thread *thread;
diff --git a/Source/Core/AudioCommon/Src/aldlist.h b/Source/Core/AudioCommon/Src/aldlist.h
index 187bc6c950..cea2fe41f6 100644
--- a/Source/Core/AudioCommon/Src/aldlist.h
+++ b/Source/Core/AudioCommon/Src/aldlist.h
@@ -2,8 +2,10 @@
 #define ALDEVICELIST_H
 
 #include "CommonTypes.h"
-
-#pragma warning(disable: 4786)  //disable warning "identifier was truncated to '255' characters in the browser information"
+#ifdef _WIN32
+#pragma warning(disable: 4786)  //disable warning "identifier was truncated to
+								//'255' characters in the browser information"
+#endif
 #include <vector>
 #include <string>
 
diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/debugger/Debugger.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp
similarity index 100%
rename from Source/Plugins/Plugin_DSP_LLE-testing/Src/debugger/Debugger.cpp
rename to Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.cpp
diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/debugger/Debugger.h b/Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.h
similarity index 100%
rename from Source/Plugins/Plugin_DSP_LLE-testing/Src/debugger/Debugger.h
rename to Source/Plugins/Plugin_DSP_LLE-testing/Src/Debugger/Debugger.h
diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE-testing/Src/SConscript
index ac8eb1e1c2..493678f133 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/SConscript
@@ -1,3 +1,4 @@
+
 # -*- python -*-
 
 Import('env')
@@ -10,8 +11,8 @@ if not env['HAVE_AO']:
     Return()
 
 files = [
-        "Config.cpp",
-        "DSPConfigDlgLLE.cpp",
+	"Config.cpp",
+	"DSPConfigDlgLLE.cpp",
 	"disassemble.cpp",
 	"gdsp_aram.cpp",
 	"gdsp_ext_op.cpp",
@@ -21,14 +22,15 @@ files = [
 	"gdsp_opcodes.cpp",
 	"gdsp_registers.cpp",
 	"Globals.cpp",
-        "HLE_Functions.cpp",
-        "HLE_Helper.cpp",
+	"HLE_Functions.cpp",
+	"HLE_Helper.cpp",
 	"main.cpp",
 	"opcodes.cpp",
 	"Tools.cpp",
-        "Logging/AXTask.cpp",
-        "Logging/Logging.cpp",
-        "Logging/ReadPBs.cpp",
+	"Debugger/Debugger.cpp",
+	"Logging/AXTask.cpp",
+	"Logging/Logging.cpp",
+	"Logging/ReadPBs.cpp",
 	]
 
 lleenv = env.Clone()
diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp
index 45e43a7f3d..738f6d6ff3 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp
@@ -34,7 +34,6 @@
 
 #if defined(HAVE_WX) && HAVE_WX
 #include "DSPConfigDlgLLE.h"
-#include "debugger/Debugger.h"
 #include "Debugger/Debugger.h" // For the CDebugger class
 CDebugger* m_frame = NULL;
 #endif