diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 66ceb92b5f..9cef859181 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -619,12 +619,10 @@ void Host_SetDebugMode(bool)
 void Host_SetWaitCursor(bool enable)
 {
 #ifdef _WIN32
-	if (enable)
+	if(enable)
 	{
 		SetCursor(LoadCursor(NULL, IDC_WAIT));
-	}
-	else
-	{
+	} else {
 		SetCursor(LoadCursor(NULL, IDC_ARROW));
 	}
 #endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
index f4b0540b8f..fb632476e3 100644
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
+++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Plugin_VideoDX9"
 	ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
 	RootNamespace="Plugin_VideoDX9"
@@ -211,6 +211,7 @@
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
+				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
index 3335cc6822..e57b9600f8 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
@@ -54,7 +54,7 @@ struct TabDirect3D : public W32Util::Tab
 		ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_ANTIALIASMODE), g_Config.iMultisampleMode);
 		if (adapter.aa_levels.size() == 1) 
 		{
-			EnableWindow(GetDlgItem(hDlg, IDC_ANTIALIASMODE), FALSE);
+			ComboBox_Enable(GetDlgItem(hDlg, IDC_ANTIALIASMODE), FALSE);
 		}
 
 		for (int i = 0; i < (int)adapter.resolutions.size(); i++)
@@ -71,14 +71,14 @@ struct TabDirect3D : public W32Util::Tab
 		for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i];		
 		ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr);
 
-		CheckDlgButton(hDlg, IDC_FULLSCREENENABLE, g_Config.bFullscreen ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_VSYNC, g_Config.bVSync ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_RENDER_TO_MAINWINDOW, g_Config.RenderToMainframe ? TRUE : FALSE);		
-		CheckDlgButton(hDlg, IDC_ASPECT_16_9, g_Config.bKeepAR169 ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_ASPECT_4_3, g_Config.bKeepAR43 ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_WIDESCREEN_HACK, g_Config.bWidescreenHack ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_SAFE_TEXTURE_CACHE, g_Config.bSafeTextureCache ? TRUE : FALSE);
-		CheckDlgButton(hDlg, IDC_EFB_ACCESS_ENABLE, g_Config.bEFBAccessEnable ? TRUE : FALSE);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_FULLSCREENENABLE), g_Config.bFullscreen);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_VSYNC), g_Config.bVSync);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_RENDER_TO_MAINWINDOW), g_Config.RenderToMainframe);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_ASPECT_16_9), g_Config.bKeepAR169);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_ASPECT_4_3), g_Config.bKeepAR43);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_WIDESCREEN_HACK), g_Config.bWidescreenHack);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_SAFE_TEXTURE_CACHE), g_Config.bSafeTextureCache);
+		Button_SetCheck(GetDlgItem(hDlg, IDC_EFB_ACCESS_ENABLE), g_Config.bEFBAccessEnable);
 		Button_GetCheck(GetDlgItem(hDlg,IDC_RENDER_TO_MAINWINDOW)) ? Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), false) : Button_Enable(GetDlgItem(hDlg,IDC_FULLSCREENENABLE), true);
 	}
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
index 3182f5cabf..ab8385b8c6 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
@@ -99,25 +99,6 @@ namespace W32Util
 		sheet.hwndParent = hParent;
 		sheet.pszbmWatermark = watermark;
 		sheet.pszbmHeader = header;
-		
-		if (icon)
-			sheet.hIcon = icon;
-
-		if (wizard)
-			sheet.dwFlags = PSH_USECALLBACK | PSH_WIZARD97 | (watermark?PSH_WATERMARK:0) | (header?PSH_HEADER:0);
-		else
-			sheet.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
-
-		sheet.dwFlags |= PSH_NOCONTEXTHELP;
-
-		if (floating)
-			sheet.dwFlags |= PSH_MODELESS;
-		//else
-		//	sheet.dwFlags |= PSH_NOAPPLYNOW;
-
-		if (icon) 
-			sheet.dwFlags |= PSH_USEHICON;
-
 		sheet.pszCaption = title;
 		sheet.nPages = (UINT)list.size();
 		sheet.phpage = pages;
@@ -131,6 +112,7 @@ namespace W32Util
 		
 		if (wizard)
 		{
+			sheet.dwFlags = PSH_USECALLBACK | PSH_WIZARD97 | (watermark?PSH_WATERMARK:0) | (header?PSH_HEADER:0);
 
 			//Create the intro/end title font
 			LOGFONT TitleLogFont = ncm.lfMessageFont;
@@ -143,9 +125,22 @@ namespace W32Util
 			TitleLogFont.lfHeight = 0 - GetDeviceCaps(hdc, LOGPIXELSY) * FontSize / 72;
 			hTitleFont = CreateFontIndirect(&TitleLogFont);
 			ReleaseDC(NULL, hdc);
-		}
-		else
+		} else {
+			sheet.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
 			hTitleFont = 0;
+		}
+
+		if (icon) {
+			sheet.dwFlags |= PSH_USEHICON;
+			sheet.hIcon = icon;
+		}
+
+		sheet.dwFlags |= PSH_NOCONTEXTHELP;
+
+		if (floating)
+			sheet.dwFlags |= PSH_MODELESS;
+		//else
+		//	sheet.dwFlags |= PSH_NOAPPLYNOW;
 
 		centered=false;
 		PropertySheet(&sheet);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/resource.rc b/Source/Plugins/Plugin_VideoDX9/Src/resource.rc
index 75d98c7f2a..fe0789e399 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/resource.rc
+++ b/Source/Plugins/Plugin_VideoDX9/Src/resource.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <windows.h>
+#include "afxres.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -185,7 +185,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include <windows.h\0"
+    "#include ""afxres.h\0"
 END
 
 3 TEXTINCLUDE 
@@ -199,13 +199,3 @@ END
 /////////////////////////////////////////////////////////////////////////////
 
 
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include <windows.h>
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 8d419c0916..b8b99fbec8 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -302,7 +302,9 @@ int GetMapKeyState(int _MapKey)
 	const int Page = 0;
 
 	if (_MapKey < 256)
+#ifdef WIN32
 		return GetAsyncKeyState(_MapKey);	// Keyboard
+#endif
 	else if (_MapKey < 0x1100)
 		return SDL_JoystickGetButton(PadState[Page].joy, _MapKey - 0x1000);	// Pad button
 	else	// Pad hat
@@ -320,7 +322,7 @@ int GetMapKeyState(int _MapKey)
 // Multi System Input Status Check
 int IsKey(int Key)
 {
-#ifdef _WIN32
+#ifdef WIN32
 	if (g_Wiimote_kbd.A <= Key && Key <= g_Wiimote_kbd.PITCH_R)
 	{
 		return GetMapKeyState(PadMapping[0].Wm.keyForControls[Key - g_Wiimote_kbd.A]);