diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 7a1087358..03491a846 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -67,7 +67,7 @@
 #endif
 
 static SDL_Scancode 
-WindowsScanCodeToSDLScanCode( int lParam, int wParam )
+WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam )
 {
 	SDL_Scancode code;
 	char bIsExtended;
diff --git a/src/video/windows/SDL_windowsmessagebox.c b/src/video/windows/SDL_windowsmessagebox.c
index 867b468b7..9865d7778 100644
--- a/src/video/windows/SDL_windowsmessagebox.c
+++ b/src/video/windows/SDL_windowsmessagebox.c
@@ -231,7 +231,8 @@ int
 WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 {
     WIN_DialogData *dialog;
-    int i, x, y, w, h, gap, which;
+    int i, x, y, w, h, gap;
+    INT_PTR which;
     const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
  
     /* FIXME: Need a better algorithm for laying out the message box */
diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
index b3b9a39a8..7339d7812 100644
--- a/src/video/windows/SDL_windowswindow.h
+++ b/src/video/windows/SDL_windowswindow.h
@@ -32,7 +32,7 @@ typedef struct
     HBITMAP hbm;
     WNDPROC wndproc;
     SDL_bool created;
-    Uint32 mouse_button_flags;
+    WPARAM mouse_button_flags;
     struct SDL_VideoData *videodata;
 } SDL_WindowData;