diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h
index 37e997a3cf..5576f8097d 100644
--- a/plugins/xpad/stdafx.h
+++ b/plugins/xpad/stdafx.h
@@ -37,23 +37,15 @@
 #include <commdlg.h>
 #include <shellapi.h>
 #include <xinput.h>
+
 #include <assert.h>
-
-// stdc
-
-#include <math.h>
 #include <time.h>
-#include <intrin.h>
 
-#include <string>
 #include <vector>
 #include <list>
-#include <map>
 
 using namespace std;
 
-extern string format(const char* fmt, ...);
-
 // syntactic sugar
 
 // put these into vc9/common7/ide/usertype.dat to have them highlighted
@@ -83,12 +75,3 @@ typedef signed long long int64;
 		#define RESTRICT
 	#endif
 #endif
-
-#if defined(_DEBUG) && defined(_MSC_VER)
-	#define ASSERT assert
-#else
-	#define ASSERT(exp) ((void)0)
-#endif
-
-
-
diff --git a/plugins/xpad/xpad.cpp b/plugins/xpad/xpad.cpp
index 3b0d04817c..f75dd5389a 100644
--- a/plugins/xpad/xpad.cpp
+++ b/plugins/xpad/xpad.cpp
@@ -561,7 +561,7 @@ public:
 			ret = (value == 'B' || value == 'C') ? m_pad->GetId() : 0xf3;
 			break;
 		case 2:
-			ASSERT(value == 0);
+			assert(value == 0);
 			ret = 'Z';
 			break;
 		default:
diff --git a/plugins/xpad/xpad.h b/plugins/xpad/xpad.h
index ac9dbe6d64..12cfc04a45 100644
--- a/plugins/xpad/xpad.h
+++ b/plugins/xpad/xpad.h
@@ -78,7 +78,7 @@ struct KeyEvent
 class CCritSec
 {
     CCritSec(const CCritSec &refCritSec);
-    CCritSec &operator=(const CCritSec &refCritSec);
+    CCritSec &operator=(const CCritSec &refCritSec) = delete;
 
     CRITICAL_SECTION m_CritSec;
 
@@ -93,7 +93,7 @@ public:
 class CAutoLock
 {
     CAutoLock(const CAutoLock &refAutoLock);
-    CAutoLock &operator=(const CAutoLock &refAutoLock);
+    CAutoLock &operator=(const CAutoLock &refAutoLock) = delete;
 
 protected:
     CCritSec * m_pLock;
diff --git a/plugins/xpad/xpad.vcxproj b/plugins/xpad/xpad.vcxproj
index f48a9477e8..270cbf0671 100644
--- a/plugins/xpad/xpad.vcxproj
+++ b/plugins/xpad/xpad.vcxproj
@@ -28,27 +28,27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />