diff --git a/cl_dll/in_defs.h b/cl_dll/in_defs.h
index 9f30b17a..ddd7bf9d 100644
--- a/cl_dll/in_defs.h
+++ b/cl_dll/in_defs.h
@@ -17,7 +17,10 @@
 #define	ROLL	2 
 
 #ifdef _WIN32
+#define HSPRITE HSPRITE_win32
 #include <windows.h>
+#undef HSPRITE
+
 #else
 typedef struct point_s{
 	int x;
diff --git a/dlls/extdll.h b/dlls/extdll.h
index 3ffd5833..a2aa0168 100644
--- a/dlls/extdll.h
+++ b/dlls/extdll.h
@@ -39,7 +39,17 @@
 #define NOSERVICE
 #define NOMCX
 #define NOIME
+#define HSPRITE HSPRITE_w32
 #include "windows.h"
+#undef HSPRITE
+#ifdef __amd64__
+#ifndef min
+#define min(a,b)  (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)  (((a) > (b)) ? (a) : (b))
+#endif
+#endif
 #else // _WIN32
 #define FALSE 0
 #define TRUE (!FALSE)