diff --git a/src/Client/DefScript/DefScriptDefines.h b/src/Client/DefScript/DefScriptDefines.h
index a904e4a..9e663eb 100644
--- a/src/Client/DefScript/DefScriptDefines.h
+++ b/src/Client/DefScript/DefScriptDefines.h
@@ -13,7 +13,7 @@ typedef __int64 int64;
 typedef unsigned __int64 uint64;
 #else
 typedef __int64_t int64;
-typedef unsigned __int64_t uint64;
+typedef __uint64_t uint64;
 // TODO: correct ATOI64 for linux if necessary
 #endif
 
diff --git a/src/shared/tools.h b/src/shared/tools.h
index 0348a34..c104d9a 100644
--- a/src/shared/tools.h
+++ b/src/shared/tools.h
@@ -3,9 +3,9 @@
 
 #include "common.h"
 
-#define SETBIT(var,bit) ( (var)|=(1<<(bit)) )
-#define UNSETBIT(var,bit) ( (var)&=(~(1<<(bit))) )
-#define HASBIT(var,bit) ( (var)&(1<<(bit)) )
+#define M_SETBIT(var,bit) ( (var)|=(1<<(bit)) )
+#define M_UNSETBIT(var,bit) ( (var)&=(~(1<<(bit))) )
+#define M_HASBIT(var,bit) ( (var)&(1<<(bit)) )
 
 void printchex(std::string,bool);
 void printchex(char *in, uint32 len, bool);