diff --git a/Source/Core/Core/Src/LogManager.cpp b/Source/Core/Core/Src/LogManager.cpp
index 499e372ddd..bd672884c4 100644
--- a/Source/Core/Core/Src/LogManager.cpp
+++ b/Source/Core/Core/Src/LogManager.cpp
@@ -45,6 +45,7 @@ CDebugger_Log* 	LogManager::m_Log[LogTypes::NUMBER_OF_LOGS + (LogManager::VERBOS
 int LogManager::m_activeLog = LogTypes::MASTER_LOG;
 bool LogManager::m_bDirty = true;
 bool LogManager::m_bInitialized = false;
+CDebugger_LogSettings*   LogManager::m_LogSettings = NULL;
 /////////////////////////
 
 
diff --git a/Source/Core/DebuggerWX/Src/LogWindow.cpp b/Source/Core/DebuggerWX/Src/LogWindow.cpp
index c16885e4e5..252d0411fc 100644
--- a/Source/Core/DebuggerWX/Src/LogWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/LogWindow.cpp
@@ -28,9 +28,6 @@
 #include "Console.h"
 #include "IniFile.h"
 
-// declare this now to be able to use it in Load()
-CDebugger_LogSettings*	LogManager::m_LogSettings;
-
 BEGIN_EVENT_TABLE(CLogWindow, wxDialog)
 	EVT_BUTTON(IDM_SUBMITCMD, CLogWindow::OnSubmit)
 	EVT_BUTTON(IDM_UPDATELOG, CLogWindow::OnUpdateLog)
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp
index bf88c4103a..6ce09a24d5 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp
@@ -37,15 +37,6 @@
 #include "../Logging/Console.h" // open and close console
 
 
-// externals that are needed even in Release builds
-bool gSSBM = true;
-bool gSSBMremedy1 = true;
-bool gSSBMremedy2 = true;
-bool gSequenced = true;
-bool gVolume = true;
-bool gReset = false;
-
-
 // =======================================================================================
 // Declare events
 BEGIN_EVENT_TABLE(CDebugger,wxDialog)	
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Globals.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Globals.cpp
index 8e19c9fffb..f42ade67b6 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Globals.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Globals.cpp
@@ -57,6 +57,15 @@ void DebugLog(const char* _fmt, ...)
 
 extern u8* g_pMemory;
 
+// debugger externals that are needed even in Release builds
+bool gSSBM = true;
+bool gSSBMremedy1 = true;
+bool gSSBMremedy2 = true;
+bool gSequenced = true;
+bool gVolume = true;
+bool gReset = false;
+float ratioFactor; // a global to get the ratio factor from MixAdd
+
 // TODO: Wii support? Most likely audio data still must be in the old 24MB TRAM.
 #define RAM_MASK 0x1FFFFFF
 
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Globals.h b/Source/Plugins/Plugin_DSP_HLE/Src/Globals.h
index 07739a7176..aabdf72cf2 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Globals.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Globals.h
@@ -31,6 +31,14 @@ void __Log_(int v, const char *fmt, ...);
 	#define LOG_(_v_, ...)
 #endif
 
+extern bool gSSBM;
+extern bool gSSBMremedy1;
+extern bool gSSBMremedy2;
+extern bool gSequenced;
+extern bool gVolume;
+extern bool gReset;
+extern float ratioFactor; // a global to get the ratio factor from MixAdd
+
 u8 Memory_Read_U8(u32 _uAddress);
 u16 Memory_Read_U16(u32 _uAddress);
 u32 Memory_Read_U32(u32 _uAddress);
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
index d05511da38..54ecd3c718 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
@@ -45,15 +45,7 @@
 #include "../UCodes/UCode_AX_Voice.h"
 
 // Externals
-
-extern bool gSSBM;
-extern bool gSSBMremedy1;
-extern bool gSSBMremedy2;
-extern bool gSequenced;
-extern bool gVolume;
-extern bool gReset;
 extern int nFiles;
-float ratioFactor; // a global to get the ratio factor from MixAdd
 extern CDebugger* m_frame;
 //int PBSize = 128;
 
diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript
index 7d43cf153f..2041ea3357 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/SConscript
+++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript
@@ -5,8 +5,8 @@ import sys
 
 name = "Plugin_PadSimple"
 
-if not env['HAVE_X11']:
-    print name + " must have X11 to be build"
+if not (env['HAVE_X11'] or env['HAVE_WX']):
+    print name + " must have X11 or WX to be build"
     Return()
 
 if env['GLTEST']:
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
index aeae942355..e7be776b7b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
@@ -83,7 +83,7 @@ void DoDllDebugger()
 	//m_frame->Show();
 }
 #else
-void DllDebugger(HWND _hParent) { }
+void DllDebugger(HWND _hParent, bool Show) { }
 void DoDllDebugger() { }
 #endif