diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 5b870d939..20a6e42ec 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -1010,16 +1010,10 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons
 
     if (bridgeBinary.isNotEmpty())
     {
-# ifdef CARLA_OS_LINUX
-        // test for local build
-        if (bridgeBinary.endsWith("/source/backend/"))
-            bridgeBinary += "../bridges/";
-# endif
-
 # ifndef CARLA_OS_WIN
         if (btype == BINARY_NATIVE)
         {
-            bridgeBinary += "carla-bridge-native";
+            bridgeBinary += OS_SEP_STR "carla-bridge-native";
         }
         else
 # endif
@@ -1027,16 +1021,16 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons
             switch (btype)
             {
             case BINARY_POSIX32:
-                bridgeBinary += "carla-bridge-posix32";
+                bridgeBinary += OS_SEP_STR "carla-bridge-posix32";
                 break;
             case BINARY_POSIX64:
-                bridgeBinary += "carla-bridge-posix64";
+                bridgeBinary += OS_SEP_STR "carla-bridge-posix64";
                 break;
             case BINARY_WIN32:
-                bridgeBinary += "carla-bridge-win32.exe";
+                bridgeBinary += OS_SEP_STR "carla-bridge-win32.exe";
                 break;
             case BINARY_WIN64:
-                bridgeBinary += "carla-bridge-win64.exe";
+                bridgeBinary += OS_SEP_STR "carla-bridge-win64.exe";
                 break;
             default:
                 bridgeBinary.clear();
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 534134c3d..5b619b226 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -421,7 +421,7 @@ OBJS_PLUGIN = \
 	../backend/plugin/JucePlugin__native.o \
 	../backend/plugin/FluidSynthPlugin__native.o \
 	../backend/plugin/LinuxSamplerPlugin__native.o \
-	../standalone/CarlaStandalone__native.o
+	../backend/CarlaStandalone__native.o
 
 LIBS_PLUGIN = \
 	../modules/jackbridge.a \
@@ -567,7 +567,7 @@ OBJS_POSIX32 += \
 
 # carla-standalone
 OBJS_POSIX32 += \
-	../standalone/CarlaStandalone__posix32.o
+	../backend/CarlaStandalone__posix32.o
 
 # libs
 LIBS_POSIX32 = \
@@ -627,7 +627,7 @@ OBJS_POSIX64 += \
 
 # carla-standalone
 OBJS_POSIX64 += \
-	../standalone/CarlaStandalone__posix64.o
+	../backend/CarlaStandalone__posix64.o
 
 # libs
 LIBS_POSIX64 = \
@@ -687,7 +687,7 @@ OBJS_WIN32 += \
 
 # carla-standalone
 OBJS_WIN32 += \
-	../standalone/CarlaStandalone__win32.o
+	../backend/CarlaStandalone__win32.o
 
 # libs
 LIBS_WIN32 = \
@@ -747,7 +747,7 @@ OBJS_WIN64 += \
 
 # carla-standalone
 OBJS_WIN64 += \
-	../standalone/CarlaStandalone__win64.o
+	../backend/CarlaStandalone__win64.o
 
 # libs
 LIBS_WIN64 = \