diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h
index a249c108f..38ac50af8 100644
--- a/source/includes/CarlaDefines.h
+++ b/source/includes/CarlaDefines.h
@@ -57,7 +57,7 @@
 #endif
 
 #if defined (__LP64__) || defined (_LP64) || defined (__arm64__) || defined(CARLA_OS_WIN64)
-# define CARLA_64BIT
+# define CARLA_OS_64BIT
 #endif
 
 /* Check for C++11 support */
diff --git a/source/modules/water/memory/Atomic.h b/source/modules/water/memory/Atomic.h
index b154f52e9..ad235c97a 100644
--- a/source/modules/water/memory/Atomic.h
+++ b/source/modules/water/memory/Atomic.h
@@ -146,7 +146,7 @@ public:
         This is exposed publicly in case you need to manipulate it directly
         for performance reasons.
     */
-   #ifdef CARLA_64BIT
+   #ifdef CARLA_OS_64BIT
     __attribute__ ((aligned (8)))
    #else
     __attribute__ ((aligned (4)))
diff --git a/source/modules/water/water.h b/source/modules/water/water.h
index 9ab043348..939b8db62 100644
--- a/source/modules/water/water.h
+++ b/source/modules/water/water.h
@@ -107,7 +107,7 @@ typedef long long                   int64;
 /** A platform-independent 64-bit unsigned integer type. */
 typedef unsigned long long          uint64;
 
-#ifdef CARLA_64BIT
+#ifdef CARLA_OS_64BIT
   /** A signed integer type that's guaranteed to be large enough to hold a pointer without truncating it. */
   typedef int64                     pointer_sized_int;
   /** An unsigned integer type that's guaranteed to be large enough to hold a pointer without truncating it. */