diff --git a/pcsx2/USB/USB.h b/pcsx2/USB/USB.h
index 3e977fc2b0..e43f070def 100644
--- a/pcsx2/USB/USB.h
+++ b/pcsx2/USB/USB.h
@@ -60,9 +60,4 @@ s64 get_clock();
 /* usb-pad-raw.cpp */
 #if _WIN32
 extern HWND gsWnd;
-#if defined(BUILD_RAW)
-extern HWND msgWindow;
-int InitWindow(HWND);
-void UninitWindow();
-#endif
 #endif
diff --git a/pcsx2/USB/platcompat.h b/pcsx2/USB/platcompat.h
index 98c358dd4b..ee7e7db9a1 100644
--- a/pcsx2/USB/platcompat.h
+++ b/pcsx2/USB/platcompat.h
@@ -25,14 +25,6 @@
 #endif
 #endif
 
-#ifdef _WIN32
-#define CALLBACK __stdcall
-#elif defined(__i386__)
-#define CALLBACK __attribute__((stdcall))
-#else
-#define CALLBACK
-#endif
-
 #ifndef EXPORT_C_
 #ifdef _MSC_VER
 #define EXPORT_C_(type) extern "C" type CALLBACK
diff --git a/pcsx2/USB/shared/shared_usb.cpp b/pcsx2/USB/shared/shared_usb.cpp
index 8806235014..dda6e1d032 100644
--- a/pcsx2/USB/shared/shared_usb.cpp
+++ b/pcsx2/USB/shared/shared_usb.cpp
@@ -17,7 +17,7 @@
 #include "shared_usb.h"
 #include <stdexcept>
 
-#if defined(BUILD_RAW)
+#ifdef _WIN32
 #include "rawinput_usb.h"
 #endif
 
@@ -26,8 +26,7 @@ namespace shared
 
 	void Initialize(void* ptr)
 	{
-// Keeping it simple, for now
-#if defined(BUILD_RAW)
+#ifdef _WIN32
 		if (!shared::rawinput::Initialize(ptr))
 			throw std::runtime_error("Failed to initialize raw input!");
 #endif
@@ -35,7 +34,7 @@ namespace shared
 
 	void Uninitialize(/*void *ptr*/)
 	{
-#if defined(BUILD_RAW)
+#ifdef _WIN32
 		shared::rawinput::Uninitialize(/*ptr*/);
 #endif
 	}