diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp
index 3ecdb8ed22..7d0446e9e7 100644
--- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp
+++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp
@@ -18,7 +18,7 @@
 #include "ConfigDiag.h"
 
 #define _connect_macro_(b, f, c, s)	(b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
-#define WXSTR_FROM_STR(s)	(wxString::FromAscii((s).c_str()))
+#define WXSTR_FROM_STR(s)	(wxString::From8BitData((s).c_str()))
 // ToAscii was causing probs with some extended ascii characters, To8BitData seems to work
 #define STR_FROM_WXSTR(w)	(std::string((w).To8BitData()))
 
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
index 0149a40d6a..024706d248 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
@@ -16,13 +16,22 @@ files = [
 	  'WiimoteEmu/EmuSubroutines.cpp',
 	  'WiimoteEmu/Encryption.cpp',
 	  'WiimoteEmu/Speaker.cpp',
-	  'WiimoteReal/WiimoteReal.cpp',
 	  'WiimoteNew.cpp',
 	  'WiimoteConfigDiag.cpp',
 	]
 
+libs = [ 'common', 'inputcommon', 'inputuicommon', 'SDL' ]
+
+cxxflags = [ ]
+
+if wiinewenv['HAVE_WIIUSE']:
+	cxxflags += [ '-DHAVE_WIIUSE' ]
+	files += [ "WiimoteReal/WiimoteReal.cpp" ]
+	libs += [ 'wiiuse' ]
+
 wiinewenv.Append(
-	LIBS = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ],
+	CXXFLAGS = cxxflags,
+	LIBS = libs
 	)
 
 wiinewenv.SharedLibrary(env['plugin_dir']+name, files)