diff --git a/source/utils/CarlaPluginUI.cpp b/source/utils/CarlaPluginUI.cpp
index d3c6fc697..f529d9261 100644
--- a/source/utils/CarlaPluginUI.cpp
+++ b/source/utils/CarlaPluginUI.cpp
@@ -364,9 +364,9 @@ private:
 #ifdef CARLA_OS_MAC
 
 #ifdef BUILD_BRIDGE
-# define CarlaPluginWindow CarlaPluginWindowBridged ## CARLA_PLUGIN_UI_CLASS_PREFIX ## CARLA_VERSION_HEX
+# define CarlaPluginWindow CARLA_JOIN_MACRO(CarlaPluginWindowBridged, CARLA_PLUGIN_UI_CLASS_PREFIX)
 #else
-# define CarlaPluginWindow CarlaPluginWindow ## CARLA_PLUGIN_UI_CLASS_PREFIX ## CARLA_VERSION_HEX
+# define CarlaPluginWindow CARLA_JOIN_MACRO(CarlaPluginWindow, CARLA_PLUGIN_UI_CLASS_PREFIX)
 #endif
 
 @interface CarlaPluginWindow : NSWindow