diff --git a/common/winquake.h b/common/winquake.h
index fac1fc5..7325a14 100644
--- a/common/winquake.h
+++ b/common/winquake.h
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #pragma warning( disable : 4229 )  // mgraph gets this
 
 #include <windows.h>
-#define WM_MOUSEWHEEL                   0x020A
 
 #ifndef SERVERONLY
 #include <ddraw.h>
@@ -33,6 +32,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 #endif
 
+#ifndef  WM_MOUSEWHEEL
+# define WM_MOUSEWHEEL                   0x020A
+#endif
+
 extern	HINSTANCE	global_hInstance;
 extern	int			global_nCmdShow;
 
diff --git a/qw_client/cl_main.c b/qw_client/cl_main.c
index 0723c74..41b4fe7 100644
--- a/qw_client/cl_main.c
+++ b/qw_client/cl_main.c
@@ -1043,7 +1043,7 @@ void CL_Download_f (void)
 	SZ_Print (&cls.netchan.message, va("download %s\n",Cmd_Argv(1)));
 }
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 /*
 =================
@@ -1189,7 +1189,7 @@ void CL_Init (void)
 //
 //  Windows commands
 //
-#ifdef _WINDOWS
+#ifdef _WIN32
 	Cmd_AddCommand ("windows", CL_Windows_f);
 #endif
 }
diff --git a/qw_client/keys.c b/qw_client/keys.c
index c9e48ed..1383d14 100644
--- a/qw_client/keys.c
+++ b/qw_client/keys.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "quakedef.h"
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #endif
 /*