diff --git a/Source/RSP/Main.cpp b/Source/RSP/Main.cpp
index 1e6ca43ce..263d05f63 100644
--- a/Source/RSP/Main.cpp
+++ b/Source/RSP/Main.cpp
@@ -159,7 +159,7 @@ void DisplayError(char* Message, ...)
 	vsprintf( Msg, Message, ap );
 	va_end( ap );
 #ifdef _WIN32
-    MessageBoxA(NULL, Msg, "Error", MB_OK | MB_ICONERROR);
+    MessageBox(NULL, Msg, "Error", MB_OK | MB_ICONERROR);
 #else
     fputs(&Msg[0], stderr);
 #endif
diff --git a/Source/RSP/Profiling.cpp b/Source/RSP/Profiling.cpp
index e6830b5f6..294a3cd02 100644
--- a/Source/RSP/Profiling.cpp
+++ b/Source/RSP/Profiling.cpp
@@ -184,7 +184,7 @@ public:
 			}
 		}
 
-		ShellExecuteA(NULL,"open",LogFileName.c_str(),NULL,NULL,SW_SHOW);
+		ShellExecute(NULL,"open",LogFileName.c_str(),NULL,NULL,SW_SHOW);
 		ResetCounters();
 	}
 };
diff --git a/Source/RSP/RSP Command.c b/Source/RSP/RSP Command.c
index ab18b430f..c1c1b361e 100644
--- a/Source/RSP/RSP Command.c	
+++ b/Source/RSP/RSP Command.c	
@@ -99,7 +99,7 @@ void Create_RSP_Commands_Window ( int Child )
 		else
 		{
             if (IsIconic((HWND)RSPCommandshWnd)) {
-                SendMessage(RSPCommandshWnd, WM_SYSCOMMAND, SC_RESTORE, NULL);
+                SendMessage(RSPCommandshWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
             }
 			SetForegroundWindow(RSPCommandshWnd);
 		}	
diff --git a/Source/RSP/RSP Register.c b/Source/RSP/RSP Register.c
index c4fee18dd..b7129965a 100644
--- a/Source/RSP/RSP Register.c	
+++ b/Source/RSP/RSP Register.c	
@@ -60,7 +60,7 @@ LRESULT CALLBACK RSP_Registers_Proc ( HWND, UINT, WPARAM, LPARAM );
 HWND RSP_Registers_hDlg, hTab, hStatic, hGPR[32], hCP0[16], hHIDDEN[12],
 	hVECT1[16], hVECT2[16];
 int InRSPRegisterWindow = FALSE;
-FARPROC RefreshProc;
+WNDPROC RefreshProc;
 
 /*** RSP Registers ***/
 UWORD32   RSP_GPR[32], RSP_Flags[4];
@@ -86,7 +86,7 @@ void Create_RSP_Register_Window ( int Child ) {
 				(LPVOID)TRUE,0, &ThreadID);
 		} else {
             if (IsIconic((HWND)RSP_Registers_hDlg)) {
-                SendMessage(RSP_Registers_hDlg, WM_SYSCOMMAND, SC_RESTORE, NULL);
+                SendMessage(RSP_Registers_hDlg, WM_SYSCOMMAND, SC_RESTORE, 0);
             }
 			SetForegroundWindow(RSP_Registers_hDlg);
 		}	
@@ -515,7 +515,7 @@ void SetupRSP_RegistersMain (HWND hDlg) {
 
 	hStatic = CreateWindowEx(0,"STATIC","", WS_CHILD|WS_VISIBLE, 5,6,616,290,hDlg,0,hinstDLL,NULL );
 #ifdef _M_IX86
-	RefreshProc = (FARPROC)SetWindowLong(hStatic, GWL_WNDPROC, (long)RefreshRSP_RegProc);
+	RefreshProc = (WNDPROC)SetWindowLong(hStatic, GWL_WNDPROC, (long)RefreshRSP_RegProc);
 #else
 	DebugBreak();
 #endif
diff --git a/Source/RSP/RSP.vcxproj b/Source/RSP/RSP.vcxproj
index 7ec39d7c6..cfc9aca7a 100644
--- a/Source/RSP/RSP.vcxproj
+++ b/Source/RSP/RSP.vcxproj
@@ -40,6 +40,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader />
+      <UndefinePreprocessorDefinitions>UNICODE;_UNICODE</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link />
     <Bscmake>