diff --git a/src/Dialog.cpp b/src/Dialog.cpp
index ab33b6ca..9a104089 100644
--- a/src/Dialog.cpp
+++ b/src/Dialog.cpp
@@ -17,7 +17,7 @@ static const char *version_string =
 	;
 
 // TODO - Inaccurate stack frame
-INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
 	char string_buffer[104];
 
@@ -58,7 +58,7 @@ INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPara
 	return FALSE;
 }
 
-INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
 	(void)lParam;
 
@@ -102,7 +102,7 @@ INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
 	return FALSE;
 }
 
-INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
 	char string[100];
 
@@ -135,7 +135,7 @@ INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
 	return FALSE;
 }
 
-INT_PTR __stdcall QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (Msg)
 	{
diff --git a/src/Dialog.h b/src/Dialog.h
index 6ff69e82..628d59e7 100644
--- a/src/Dialog.h
+++ b/src/Dialog.h
@@ -2,7 +2,7 @@
 
 #include "WindowsWrapper.h"
 
-INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-INT_PTR __stdcall QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
diff --git a/src/Input.cpp b/src/Input.cpp
index 65eb2e6e..4eff1bff 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -59,7 +59,7 @@ BOOL SetDeviceAquire(BOOL aquire)
 
 // It looks like Pixel declared his functions early, so he could forward-reference
 BOOL FindAndOpenDirectInputDevice(HWND hWnd);
-BOOL __stdcall EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
+BOOL CALLBACK EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
 
 BOOL InitDirectInput(HINSTANCE hinst, HWND hWnd)
 {
@@ -116,7 +116,7 @@ BOOL FindAndOpenDirectInputDevice(HWND hWnd)
 }
 
 // The original names for this function and its variables are unknown
-BOOL __stdcall EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+BOOL CALLBACK EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
 {
 	static int already_ran;
 	static DirectInputPair *directinput_objects;
diff --git a/src/Main.cpp b/src/Main.cpp
index 3717de99..806607ed 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -22,7 +22,7 @@
 #include "Sound.h"
 #include "Triangle.h"
 
-LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
 
 char gModulePath[MAX_PATH];
 char gDataPath[MAX_PATH];
@@ -97,7 +97,7 @@ unsigned long GetFramePerSecound(void)
 }
 
 // TODO - Inaccurate stack frame
-int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
 	(void)hPrevInstance;
 	(void)lpCmdLine;
@@ -441,7 +441,7 @@ BOOL DragAndDropHandler(HWND hWnd, WPARAM wParam)
 }
 
 // TODO - Inaccurate stack frame
-LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
 	BOOL window_focus;
 	HMENU hMenu;