diff --git a/SConstruct b/SConstruct
index 87b4a4793c..28fafa39f1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ dirs = [
     'Source/Plugins/Plugin_PadSimpleEvnt/Src',
     'Source/Plugins/Plugin_nJoy_SDL/Src',
     'Source/Plugins/Plugin_nJoy_Testing/Src',
-#    'Source/Plugins/Plugin_Wiimote/Src',
+    'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Core/DolphinWX/Src',
     'Source/Core/DebuggerWX/Src',
     ]
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp
index 33350437f6..af9e27df62 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp
@@ -32,10 +32,10 @@ void AOSound::SoundLoop()
 		
     device = ao_open_live(default_driver, &format, NULL /* no options */);
     if (device == NULL) {
-	PanicAlert("DSP_HLE: Error opening AO device.\n");
-	ao_shutdown();
-	Stop();
-	return;
+		PanicAlert("DSP_HLE: Error opening AO device.\n");
+		ao_shutdown();
+		Stop();
+		return;
     }   
 
     buf_size = format.bits/8 * format.channels * format.rate;
@@ -57,11 +57,14 @@ void *soundThread(void *args) {
 }
 
 bool AOSound::Start() {
-    memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
-    soundCriticalSection = new Common::CriticalSection(1);
-    thread = new Common::Thread(soundThread, (void *)this);
+	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
+
     soundSyncEvent = new Common::Event();
     soundSyncEvent->Init();
+
+    soundCriticalSection = new Common::CriticalSection(1);
+
+    thread = new Common::Thread(soundThread, (void *)this);
     return true;
 }
 
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
index 9281b9d311..ccdf1fd47e 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
@@ -867,7 +867,7 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event)
 			DoExtensionConnectedDisconnected();
 			/* It doesn't seem to be needed but shouldn't it at least take 25 ms to
 			   reconnect an extension after we disconnected another? */
-			if(g_EmulatorRunning) Sleep(25);
+			if(g_EmulatorRunning) sleep(25);
 		}
 
 		// Update status
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ReadWiimote.cpp b/Source/Plugins/Plugin_Wiimote/Src/ReadWiimote.cpp
index d59347a5b3..07a0dde88a 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ReadWiimote.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ReadWiimote.cpp
@@ -16,9 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
 // Includes
-// ŻŻŻŻŻŻŻŻŻŻ
 #include <iostream> // System
 
 #include "wiiuse.h" // Externals
@@ -188,10 +186,10 @@ void handle_event(struct wiimote_t* wm)
 				frame->m_GaugeAccel[2]->SetValue(AccelZ);
 
 				frame->m_TextIR->SetLabel(wxString::Format(
-					"Cursor: %03u %03u\nDistance:%4.0f", wm->ir.x, wm->ir.y, wm->ir.z));
+														   wxT("Cursor: %03u %03u\nDistance:%4.0f"), wm->ir.x, wm->ir.y, wm->ir.z));
 
 				frame->m_TextAccNeutralCurrent->SetLabel(wxString::Format(
-					"Current: %03u %03u %03u", AccelX, AccelY, AccelZ));
+																		  wxT("Current: %03u %03u %03u"), AccelX, AccelY, AccelZ));
 
 				if(frame->m_bRecording)
 					Console::Print("Wiiuse Recorded accel x, y, z: %03i %03i %03i\n", wm->accel.x, wm->accel.y, wm->accel.z);
diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
index 9e0952e1cf..9116a6140d 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
@@ -16,9 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
 // Includes
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻ
 #include "Common.h" // Common
 #include "StringUtil.h"
 #include "ConsoleWindow.h" // For Start, Print, GetHwnd
@@ -298,7 +296,7 @@ extern "C" void Wiimote_Update()
 		GetUpdateRate();
 		if (g_UpdateWriteScreen > g_UpdateRate)
 		{
-			frame->m_TextUpdateRate->SetLabel(wxString::Format("Update rate: %03i times/s", g_UpdateRate));
+			frame->m_TextUpdateRate->SetLabel(wxString::Format(wxT("Update rate: %03i times/s"), g_UpdateRate));
 			g_UpdateWriteScreen = 0;
 		}
 		g_UpdateWriteScreen++;
diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.h b/Source/Plugins/Plugin_Wiimote/Src/main.h
index cc91acc6f0..fa260ab9fa 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/main.h
+++ b/Source/Plugins/Plugin_Wiimote/Src/main.h
@@ -18,25 +18,14 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Includes
-// ŻŻŻŻŻŻŻŻŻŻ
 #include <iostream> // System
-////////////////////////////////
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Definitions
-// ŻŻŻŻŻŻŻŻŻ
-#ifndef _WIN32
-	#define Sleep(x) usleep(x*1000)
+#ifdef _WIN32
+#define sleep(x) Sleep(x)
+#else
+#define sleep(x) usleep(x/1000)
 #endif
-////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
 // Declarations
-// ŻŻŻŻŻŻŻŻŻ
 void DoInitialize();
 double GetDoubleTime();
 int GetUpdateRate();
@@ -98,4 +87,4 @@ struct SRecordingAll
 ////////////////////////////////
 
 
-#endif // MAIN_H
\ No newline at end of file
+#endif // MAIN_H
diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
index 0833279ee0..a3f4a7c14c 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
@@ -16,9 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
 // Includes
-// ŻŻŻŻŻŻŻŻŻŻ
 #include <iostream> // System
 #include "pluginspecs_wiimote.h"
 
@@ -412,7 +410,7 @@ void FlashLights(bool Connect)
 {
 	if(Connect) wiiuse_rumble(WiiMoteReal::g_WiiMotesFromWiiUse[0], 1);
 	wiiuse_set_leds(WiiMoteReal::g_WiiMotesFromWiiUse[0], WIIMOTE_LED_1 | WIIMOTE_LED_2 | WIIMOTE_LED_3 | WIIMOTE_LED_4);
-	Sleep(100);
+	sleep(100);
 	if(Connect) wiiuse_rumble(WiiMoteReal::g_WiiMotesFromWiiUse[0], 0);
 
 	// End with light 1 or 4