diff --git a/cl_dll/cl_dll.h b/cl_dll/cl_dll.h
index fda4b812..24d1874b 100644
--- a/cl_dll/cl_dll.h
+++ b/cl_dll/cl_dll.h
@@ -41,6 +41,10 @@ typedef int ( *pfnUserMsgHook )( const char *pszName, int iSize, void *pbuf );
 #include "exportdef.h"
 #include <string.h>
 
+#if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
+  #define XASH_64BIT
+#endif
+
 extern cl_enginefunc_t gEngfuncs;
 #include "../engine/mobility_int.h"
 extern mobile_engfuncs_t *gMobileEngfuncs;
diff --git a/dlls/extdll.h b/dlls/extdll.h
index cbc7ebb9..dda1cec5 100644
--- a/dlls/extdll.h
+++ b/dlls/extdll.h
@@ -57,6 +57,10 @@ typedef int BOOL;
 #include "stdlib.h"
 #include "math.h"
 
+#if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
+  #define XASH_64BIT
+#endif
+
 // Header file containing definition of globalvars_t and entvars_t
 typedef unsigned int func_t;
 typedef unsigned int string_t;				// from engine's pr_comp.h;
diff --git a/dlls/nodes.h b/dlls/nodes.h
index cbf1e2a6..c959dd2e 100644
--- a/dlls/nodes.h
+++ b/dlls/nodes.h
@@ -103,7 +103,7 @@ typedef struct
 //=========================================================
 // CGraph 
 //=========================================================
-#ifdef __amd64
+#ifdef XASH_64BIT
 #define	GRAPH_VERSION	(int)16 * 10
 #else
 #define	GRAPH_VERSION	(int)16// !!!increment this whever graph/node/link classes change, to obsolesce older disk files.
diff --git a/dlls/util.h b/dlls/util.h
index 5b00fe94..a61240fd 100644
--- a/dlls/util.h
+++ b/dlls/util.h
@@ -36,7 +36,7 @@ extern globalvars_t				*gpGlobals;
 // Use this instead of ALLOC_STRING on constant strings
 #define STRING(offset)		(const char *)(gpGlobals->pStringBase + (int)offset)
 
-#if !defined __amd64__ || defined(CLIENT_DLL)
+#if !defined XASH_64BIT || defined(CLIENT_DLL)
 #define MAKE_STRING(str)	((int)(size_t)str - (int)(size_t)STRING(0))
 #else
 static inline int MAKE_STRING(const char *szValue)
diff --git a/engine/studio.h b/engine/studio.h
index b5b709bb..5e5ec26c 100644
--- a/engine/studio.h
+++ b/engine/studio.h
@@ -215,7 +215,7 @@ typedef struct
 	char		label[32];	// textual name
 	char		name[64];		// file name
 	cache_user_t	cache;		// cache index pointer
-#ifndef __amd64
+#ifndef XASH_64BIT
 	int		data;		// hack for group 0
 #endif
 } mstudioseqgroup_t;