diff --git a/src/common/src/common.h b/src/common/src/common.h
index 0e5bf1cd3..0f2c34727 100644
--- a/src/common/src/common.h
+++ b/src/common/src/common.h
@@ -71,12 +71,12 @@ private:
 	#define CHECK_HEAP_INTEGRITY()
 
 // Alignment
-	#define GC_ALIGNED16(x) __declspec(align(16)) x
-	#define GC_ALIGNED32(x) __declspec(align(32)) x
-	#define GC_ALIGNED64(x) __declspec(align(64)) x
-	#define GC_ALIGNED128(x) __declspec(align(128)) x
-	#define GC_ALIGNED16_DECL(x) __declspec(align(16)) x
-	#define GC_ALIGNED64_DECL(x) __declspec(align(64)) x
+	#define MEMORY_ALIGNED16(x) __declspec(align(16)) x
+	#define MEMORY_ALIGNED32(x) __declspec(align(32)) x
+	#define MEMORY_ALIGNED64(x) __declspec(align(64)) x
+	#define MEMORY_ALIGNED128(x) __declspec(align(128)) x
+	#define MEMORY_ALIGNED16_DECL(x) __declspec(align(16)) x
+	#define MEMORY_ALIGNED64_DECL(x) __declspec(align(64)) x
 
 // Since they are always around on windows
 	#define HAVE_WX 1
@@ -108,12 +108,12 @@ private:
 #define _M_IX86 1
 #endif
 #define __forceinline inline __attribute__((always_inline))
-#define GC_ALIGNED16(x) __attribute__((aligned(16))) x
-#define GC_ALIGNED32(x) __attribute__((aligned(32))) x
-#define GC_ALIGNED64(x) __attribute__((aligned(64))) x
-#define GC_ALIGNED128(x) __attribute__((aligned(128))) x
-#define GC_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
-#define GC_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
+#define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x
+#define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x
+#define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x
+#define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x
+#define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
+#define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
 #endif
 
 #ifdef _MSC_VER