diff --git a/data/macos/build.sh b/data/macos/build.sh
index 2dfd1f9a6..8867ccd9e 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -30,7 +30,7 @@ export LDFLAGS="-m64"
 export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
-make HAVE_DGL=false $JOBS
+make $JOBS
 
 ##############################################################################################
 # Build 32bit bridges
@@ -42,7 +42,7 @@ export LDFLAGS="-m32"
 export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
 
-make HAVE_DGL=false posix32 $JOBS
+make posix32 $JOBS
 
 ##############################################################################################
 # Build Mac App
diff --git a/source/modules/dgl/src/Window.cpp b/source/modules/dgl/src/Window.cpp
index c44f7c487..626264400 100644
--- a/source/modules/dgl/src/Window.cpp
+++ b/source/modules/dgl/src/Window.cpp
@@ -17,7 +17,7 @@
 // we need this for now
 //#define PUGL_GRAB_FOCUS 1
 
-#include "../../distrho/src/DistrhoDefines.h"
+#include "../Base.hpp"
 
 #undef PUGL_HAVE_CAIRO
 #undef PUGL_HAVE_GL
diff --git a/source/modules/distrho/DistrhoUtils.hpp b/source/modules/distrho/DistrhoUtils.hpp
index 97eab9ef0..967821d1f 100644
--- a/source/modules/distrho/DistrhoUtils.hpp
+++ b/source/modules/distrho/DistrhoUtils.hpp
@@ -33,7 +33,7 @@
 # include <stdint.h>
 #endif
 
-#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(DISTRHO_PROPER_CPP11_SUPPORT)
+#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(__clang__)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/source/utils/CarlaMathUtils.hpp b/source/utils/CarlaMathUtils.hpp
index 14bf37b64..58c5b1da9 100644
--- a/source/utils/CarlaMathUtils.hpp
+++ b/source/utils/CarlaMathUtils.hpp
@@ -203,7 +203,7 @@ void carla_zeroFloats(float floats[], const std::size_t count) noexcept
 // --------------------------------------------------------------------------------------------------------------------
 // Missing functions in old OSX versions.
 
-#if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) && ! defined(CARLA_PROPER_CPP11_SUPPORT)
+#if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) && ! defined(__clang__)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }