diff --git a/sourcemm/oslink.h b/sourcemm/oslink.h
index ab297dc..72d4791 100644
--- a/sourcemm/oslink.h
+++ b/sourcemm/oslink.h
@@ -21,12 +21,13 @@
 	#define OS_WIN32
 	#if defined _MSC_VER && _MSC_VER >= 1400
 		#undef ARRAYSIZE
-	#else
-		#define mkdir _mkdir
 	#endif
 	#include <windows.h>
 	#include <io.h>
 	#include <direct.h>
+	#ifndef mkdir
+		#define mkdir(a) _mkdir(a)
+	#endif
 	#define		dlmount(x)		LoadLibrary(x)
 	#define		dlsym(x, s)		GetProcAddress(x, s)
 	#define		dlclose(x)		FreeLibrary(x)
diff --git a/sourcemm/sample_mm/oslink.h b/sourcemm/sample_mm/oslink.h
index d2ee424..817fb24 100644
--- a/sourcemm/sample_mm/oslink.h
+++ b/sourcemm/sample_mm/oslink.h
@@ -21,12 +21,13 @@
 	#define OS_WIN32
 	#if defined _MSC_VER && _MSC_VER >= 1400
 		#undef ARRAYSIZE
-	#else
-		#define mkdir _mkdir
 	#endif
 	#include <windows.h>
 	#include <io.h>
 	#include <direct.h>
+	#ifndef mkdir
+		#define mkdir(a) _mkdir(a)
+	#endif
 	#define		dlmount(x)		LoadLibrary(x)
 	#define		dlsym(x, s)		GetProcAddress(x, s)
 	#define		dlclose(x)		FreeLibrary(x)
@@ -56,11 +57,12 @@
 	typedef __int64				int64_t;
 	typedef unsigned __int64	uint64_t;
 #elif defined __GNUC__
-# if !__GLIBC_HAVE_LONG_LONG
+#include <stdint.h>
+#if !__GLIBC_HAVE_LONG_LONG
 	typedef long long			int64_t;
-# endif
 	typedef unsigned long long	uint64_t;
 #endif
+#endif
 
 #ifndef __linux__
 	#define snprintf	_snprintf