diff --git a/cl_dll/in_defs.h b/cl_dll/in_defs.h
index c48cf373..e04cc18c 100644
--- a/cl_dll/in_defs.h
+++ b/cl_dll/in_defs.h
@@ -17,7 +17,9 @@
 #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 659f9a0a..0f5f33c2 100644
--- a/dlls/extdll.h
+++ b/dlls/extdll.h
@@ -39,7 +39,9 @@
 #define NOSERVICE
 #define NOMCX
 #define NOIME
+#define HSPRITE HSPRITE_win32
 #include "windows.h"
+#undef HSPRITE
 #else // _WIN32
 #define FALSE 0
 #define TRUE (!FALSE)
diff --git a/dlls/util.h b/dlls/util.h
index b478b781..39e281b5 100644
--- a/dlls/util.h
+++ b/dlls/util.h
@@ -38,7 +38,7 @@ extern globalvars_t				*gpGlobals;
 #define STRING(offset)		(const char *)(gpGlobals->pStringBase + (int)offset)
 
 #if !defined __amd64__ || defined(CLIENT_DLL)
-#define MAKE_STRING(str)	((int)str - (int)STRING(0))
+#define MAKE_STRING(str)	((int)(size_t)str - (int)(size_t)STRING(0))
 #else
 #define MAKE_STRING ALLOC_STRING
 #endif