diff --git a/src/Main.cpp b/src/Main.cpp
index b68eeff0..3717de99 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -22,23 +22,6 @@
 #include "Sound.h"
 #include "Triangle.h"
 
-// Visual Studio 6 is missing these, so define them here just in case
-#ifndef VK_OEM_PLUS
-#define VK_OEM_PLUS 0xBB
-#endif
-
-#ifndef VK_OEM_COMMA
-#define VK_OEM_COMMA 0xBC
-#endif
-
-#ifndef VK_OEM_PERIOD
-#define VK_OEM_PERIOD 0xBE
-#endif
-
-#ifndef VK_OEM_2
-#define VK_OEM_2 0xBF
-#endif
-
 LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
 
 char gModulePath[MAX_PATH];
diff --git a/src/Organya.cpp b/src/Organya.cpp
index bbcc52a2..51070b16 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -22,13 +22,6 @@
 
 #include "Sound.h"
 
-// Visual Studio 6 is missing this
-#ifdef _MSC_VER
-#ifndef DWORD_PTR
-#define DWORD_PTR DWORD
-#endif
-#endif
-
 #define PANDUMMY 0xFF
 #define VOLDUMMY 0xFF
 #define KEYDUMMY 0xFF
diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h
index 40235a3d..920ca2cd 100644
--- a/src/WindowsWrapper.h
+++ b/src/WindowsWrapper.h
@@ -1,3 +1,26 @@
 #pragma once
 
+// Visual Studio 6 is missing these, so define them here
+#ifdef _MSC_VER
+	#ifndef VK_OEM_PLUS
+	#define VK_OEM_PLUS 0xBB
+	#endif
+
+	#ifndef VK_OEM_COMMA
+	#define VK_OEM_COMMA 0xBC
+	#endif
+
+	#ifndef VK_OEM_PERIOD
+	#define VK_OEM_PERIOD 0xBE
+	#endif
+
+	#ifndef VK_OEM_2
+	#define VK_OEM_2 0xBF
+	#endif
+
+	#ifndef DWORD_PTR
+	#define DWORD_PTR DWORD
+	#endif
+#endif
+
 #include <windows.h>