diff --git a/source/Makefile.mk b/source/Makefile.mk
index 24915c23a..c93840453 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -182,8 +182,11 @@ BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
 endif
 endif
 
-ifneq ($(USING_CUSTOM_DPF),true)
+ifeq ($(USING_CUSTOM_DPF),true)
+BASE_FLAGS += -I$(CUSTOM_DPF_PATH)/distrho
+else
 BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES
+BASE_FLAGS += -I$(CWD)/modules/distrho
 endif
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
diff --git a/source/backend/CarlaHostImpl.hpp b/source/backend/CarlaHostImpl.hpp
index 449e84746..210a7a03f 100644
--- a/source/backend/CarlaHostImpl.hpp
+++ b/source/backend/CarlaHostImpl.hpp
@@ -28,7 +28,7 @@
 # define CARLA_CAN_USE_LOG_THREAD
 # include "CarlaLogThread.hpp"
 #else
-# include "distrho/extra/String.hpp"
+# include "extra/String.hpp"
 #endif
 
 namespace CB = CARLA_BACKEND_NAMESPACE;
diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp
index 6a96894e1..ac5b0bb04 100644
--- a/source/backend/CarlaStandalone.cpp
+++ b/source/backend/CarlaStandalone.cpp
@@ -13,8 +13,8 @@
 #include "CarlaBackendUtils.hpp"
 #include "ThreadSafeFFTW.hpp"
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/Base64.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include "water/files/File.h"
 
diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp
index fef5f09ed..3cbcceb2e 100644
--- a/source/backend/engine/CarlaEngineBridge.cpp
+++ b/source/backend/engine/CarlaEngineBridge.cpp
@@ -23,8 +23,8 @@
 # include <xmmintrin.h>
 #endif
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"
diff --git a/source/backend/engine/CarlaEngineDummy.cpp b/source/backend/engine/CarlaEngineDummy.cpp
index 8e1faf538..03ded4173 100644
--- a/source/backend/engine/CarlaEngineDummy.cpp
+++ b/source/backend/engine/CarlaEngineDummy.cpp
@@ -5,7 +5,7 @@
 #include "CarlaEngineInit.hpp"
 #include "CarlaEngineInternal.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 
diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp
index 0534b82a6..18987a7bf 100644
--- a/source/backend/engine/CarlaEngineNative.cpp
+++ b/source/backend/engine/CarlaEngineNative.cpp
@@ -25,7 +25,7 @@
 #include "CarlaNative.hpp"
 #include "CarlaNativePlugin.h"
 
-#include "distrho/extra/Base64.hpp"
+#include "extra/Base64.hpp"
 
 #include "water/files/File.h"
 #include "water/streams/MemoryOutputStream.h"
diff --git a/source/backend/engine/CarlaEngineOsc.hpp b/source/backend/engine/CarlaEngineOsc.hpp
index 4677f1ec3..2ca3b1889 100644
--- a/source/backend/engine/CarlaEngineOsc.hpp
+++ b/source/backend/engine/CarlaEngineOsc.hpp
@@ -13,7 +13,7 @@
 #include "CarlaJuceUtils.hpp"
 #include "CarlaOscUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #define CARLA_ENGINE_OSC_HANDLE_ARGS const CarlaPluginPtr& plugin, \
   const int argc, const lo_arg* const* const argv, const char* const types
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index afc7d108b..b65dfb508 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -13,8 +13,8 @@
 
 #include <ctime>
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/Base64.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include "water/files/File.h"
 #include "water/streams/MemoryOutputStream.h"
diff --git a/source/backend/plugin/CarlaPluginBridge.cpp b/source/backend/plugin/CarlaPluginBridge.cpp
index 979862971..4ca33784f 100644
--- a/source/backend/plugin/CarlaPluginBridge.cpp
+++ b/source/backend/plugin/CarlaPluginBridge.cpp
@@ -16,8 +16,8 @@
 
 #include <ctime>
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"
diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp
index 8a420caf3..94e7f2d42 100644
--- a/source/backend/plugin/CarlaPluginInternal.hpp
+++ b/source/backend/plugin/CarlaPluginInternal.hpp
@@ -14,7 +14,7 @@
 #include "CarlaMutex.hpp"
 #include "RtLinkedList.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 
diff --git a/source/backend/plugin/CarlaPluginLV2.cpp b/source/backend/plugin/CarlaPluginLV2.cpp
index 6d84dc40f..2ecfc1130 100644
--- a/source/backend/plugin/CarlaPluginLV2.cpp
+++ b/source/backend/plugin/CarlaPluginLV2.cpp
@@ -17,7 +17,7 @@
 #include "CarlaScopeUtils.hpp"
 #include "Lv2AtomRingBuffer.hpp"
 
-#include "distrho/extra/Base64.hpp"
+#include "extra/Base64.hpp"
 
 #include "../modules/lilv/config/lilv_config.h"
 
diff --git a/source/backend/utils/Information.cpp b/source/backend/utils/Information.cpp
index c0d6e4688..ff7f3b0e6 100644
--- a/source/backend/utils/Information.cpp
+++ b/source/backend/utils/Information.cpp
@@ -25,7 +25,7 @@
 # pragma GCC diagnostic pop
 #endif
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 // -------------------------------------------------------------------------------------------------------------------
diff --git a/source/backend/utils/PluginDiscovery.cpp b/source/backend/utils/PluginDiscovery.cpp
index 5b94d44da..07c57a34a 100644
--- a/source/backend/utils/PluginDiscovery.cpp
+++ b/source/backend/utils/PluginDiscovery.cpp
@@ -10,7 +10,7 @@
 #include "CarlaScopeUtils.hpp"
 #include "CarlaSha1Utils.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/files/FileInputStream.h"
diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp
index 0b137af62..fa8344ff2 100644
--- a/source/bridges-plugin/CarlaBridgePlugin.cpp
+++ b/source/bridges-plugin/CarlaBridgePlugin.cpp
@@ -37,7 +37,7 @@
 # include <X11/Xlib.h>
 #endif
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"
diff --git a/source/bridges-ui/CarlaBridgeFormat.cpp b/source/bridges-ui/CarlaBridgeFormat.cpp
index f70379387..58f11623b 100644
--- a/source/bridges-ui/CarlaBridgeFormat.cpp
+++ b/source/bridges-ui/CarlaBridgeFormat.cpp
@@ -8,8 +8,8 @@
 
 #include "CarlaMIDI.h"
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Sleep.hpp"
 
 // needed for atom-util
 #ifndef nullptr
diff --git a/source/bridges-ui/CarlaBridgeFormat.hpp b/source/bridges-ui/CarlaBridgeFormat.hpp
index 664967011..d978d95a6 100644
--- a/source/bridges-ui/CarlaBridgeFormat.hpp
+++ b/source/bridges-ui/CarlaBridgeFormat.hpp
@@ -9,7 +9,7 @@
 #include "CarlaLibUtils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include "lv2/atom.h"
 #include "lv2/urid.h"
diff --git a/source/bridges-ui/CarlaBridgeToolkitNative.cpp b/source/bridges-ui/CarlaBridgeToolkitNative.cpp
index 7b00973e9..06b33b7db 100644
--- a/source/bridges-ui/CarlaBridgeToolkitNative.cpp
+++ b/source/bridges-ui/CarlaBridgeToolkitNative.cpp
@@ -12,7 +12,7 @@
 # include "CarlaMacUtils.hpp"
 #endif
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 #if defined(HAVE_X11) && defined(BRIDGE_X11)
 # include <X11/Xlib.h>
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
index d93b28cb3..ed2b16ec1 100644
--- a/source/discovery/carla-discovery.cpp
+++ b/source/discovery/carla-discovery.cpp
@@ -16,7 +16,7 @@
 #include "CarlaVst3Utils.hpp"
 #include "CarlaClapUtils.hpp"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #ifndef BUILDING_CARLA_FOR_WINE
 # include "CarlaPipeUtils.cpp"
diff --git a/source/frontend/carla_frontend.cpp b/source/frontend/carla_frontend.cpp
index b05efc2f3..31da0358f 100644
--- a/source/frontend/carla_frontend.cpp
+++ b/source/frontend/carla_frontend.cpp
@@ -25,7 +25,7 @@ void carla_frontend_createAndExecAboutDialog(QWidget* const parent,
 // jackappdialog
 
 #include "dialogs/jackappdialog.hpp"
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 const JackAppDialogResults*
 carla_frontend_createAndExecJackAppDialog(QWidget* const parent, const char* const projectFilename)
diff --git a/source/frontend/pluginlist/pluginlistdialog.cpp b/source/frontend/pluginlist/pluginlistdialog.cpp
index ec1306960..bc6ff2cc8 100644
--- a/source/frontend/pluginlist/pluginlistdialog.cpp
+++ b/source/frontend/pluginlist/pluginlistdialog.cpp
@@ -32,7 +32,7 @@
 #include "CarlaJuceUtils.hpp"
 #include "CarlaUtils.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include <cstdlib>
 
diff --git a/source/includes/CarlaNativePrograms.hpp b/source/includes/CarlaNativePrograms.hpp
index a3add22c7..1291709ab 100644
--- a/source/includes/CarlaNativePrograms.hpp
+++ b/source/includes/CarlaNativePrograms.hpp
@@ -9,7 +9,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaMutex.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include "water/files/File.h"
 #include "water/memory/SharedResourcePointer.h"
diff --git a/source/libjack/libjack.cpp b/source/libjack/libjack.cpp
index 77934a305..8196c4fca 100644
--- a/source/libjack/libjack.cpp
+++ b/source/libjack/libjack.cpp
@@ -6,7 +6,7 @@
 #include "CarlaThread.hpp"
 #include "CarlaJuceUtils.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 #include <signal.h>
 #include <sys/time.h>
diff --git a/source/modules/sfzero/sfzero/SFZSample.h b/source/modules/sfzero/sfzero/SFZSample.h
index 0f0d9ec95..31c54db74 100644
--- a/source/modules/sfzero/sfzero/SFZSample.h
+++ b/source/modules/sfzero/sfzero/SFZSample.h
@@ -9,7 +9,7 @@
 
 #include "SFZCommon.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 #include "water/buffers/AudioSampleBuffer.h"
 #include "water/files/File.h"
 
diff --git a/source/modules/water/containers/HashMap.h b/source/modules/water/containers/HashMap.h
index 5c3ea498e..847f55d6d 100644
--- a/source/modules/water/containers/HashMap.h
+++ b/source/modules/water/containers/HashMap.h
@@ -29,7 +29,7 @@
 #include "Array.h"
 #include "../text/String.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/containers/OwnedArray.h b/source/modules/water/containers/OwnedArray.h
index d6c3e2991..9c3aa4a0c 100644
--- a/source/modules/water/containers/OwnedArray.h
+++ b/source/modules/water/containers/OwnedArray.h
@@ -28,7 +28,7 @@
 
 #include "ArrayAllocationBase.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/files/DirectoryIterator.h b/source/modules/water/files/DirectoryIterator.h
index aefe6e888..27cca126e 100644
--- a/source/modules/water/files/DirectoryIterator.h
+++ b/source/modules/water/files/DirectoryIterator.h
@@ -29,7 +29,7 @@
 #include "File.h"
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/files/TemporaryFile.cpp b/source/modules/water/files/TemporaryFile.cpp
index 714fea078..b645069d2 100644
--- a/source/modules/water/files/TemporaryFile.cpp
+++ b/source/modules/water/files/TemporaryFile.cpp
@@ -26,7 +26,7 @@
 #include "TemporaryFile.h"
 #include "../maths/Random.h"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/memory/SharedResourcePointer.h b/source/modules/water/memory/SharedResourcePointer.h
index 2dac46f33..c52158461 100644
--- a/source/modules/water/memory/SharedResourcePointer.h
+++ b/source/modules/water/memory/SharedResourcePointer.h
@@ -29,7 +29,7 @@
 #include "ReferenceCountedObject.h"
 #include "../threads/SpinLock.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/threads/ChildProcess.cpp b/source/modules/water/threads/ChildProcess.cpp
index 0b654aa3e..057a20d9d 100644
--- a/source/modules/water/threads/ChildProcess.cpp
+++ b/source/modules/water/threads/ChildProcess.cpp
@@ -39,7 +39,7 @@
 
 #include "CarlaProcessUtils.hpp"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/threads/ChildProcess.h b/source/modules/water/threads/ChildProcess.h
index 0e76810e9..79857d316 100644
--- a/source/modules/water/threads/ChildProcess.h
+++ b/source/modules/water/threads/ChildProcess.h
@@ -28,7 +28,7 @@
 
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/modules/water/xml/XmlDocument.h b/source/modules/water/xml/XmlDocument.h
index d104455ad..b0dff9107 100644
--- a/source/modules/water/xml/XmlDocument.h
+++ b/source/modules/water/xml/XmlDocument.h
@@ -28,7 +28,7 @@
 
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 
diff --git a/source/native-plugins/external b/source/native-plugins/external
index d5b1e35ba..d53b62e9b 160000
--- a/source/native-plugins/external
+++ b/source/native-plugins/external
@@ -1 +1 @@
-Subproject commit d5b1e35ba585f2f8b78d0b13505894a2c233136c
+Subproject commit d53b62e9b948c26494ff9f43ce611110ce0ef4c7
diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp
index 7ee0dde70..8cd5ba759 100644
--- a/source/plugin/carla-lv2-export.cpp
+++ b/source/plugin/carla-lv2-export.cpp
@@ -22,7 +22,7 @@
 #include "lv2/lv2_external_ui.h"
 #include "lv2/lv2_programs.h"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 #include "water/text/StringArray.h"
 
diff --git a/source/plugin/carla-lv2-ui.cpp b/source/plugin/carla-lv2-ui.cpp
index 8d6e0e6aa..8508640d0 100644
--- a/source/plugin/carla-lv2-ui.cpp
+++ b/source/plugin/carla-lv2-ui.cpp
@@ -8,7 +8,7 @@
 #include "CarlaLv2Utils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/ScopedSafeLocale.hpp"
+#include "extra/ScopedSafeLocale.hpp"
 
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/plugin/carla-lv2.cpp b/source/plugin/carla-lv2.cpp
index 3ea620adf..0b95c8402 100644
--- a/source/plugin/carla-lv2.cpp
+++ b/source/plugin/carla-lv2.cpp
@@ -8,7 +8,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 static const char* const kPathForCarlaFiles = "carlafiles";
diff --git a/source/utils/CarlaBackendUtils.hpp b/source/utils/CarlaBackendUtils.hpp
index 59863367d..15de728a1 100644
--- a/source/utils/CarlaBackendUtils.hpp
+++ b/source/utils/CarlaBackendUtils.hpp
@@ -8,7 +8,7 @@
 #include "CarlaNative.h"
 #include "CarlaUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 
diff --git a/source/utils/CarlaBinaryUtils.hpp b/source/utils/CarlaBinaryUtils.hpp
index 34036f9dc..3bdff71fc 100644
--- a/source/utils/CarlaBinaryUtils.hpp
+++ b/source/utils/CarlaBinaryUtils.hpp
@@ -6,7 +6,7 @@
 
 #include "CarlaBackend.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #if defined(BUILDING_CARLA)
 # include "water/files/FileInputStream.h"
diff --git a/source/utils/CarlaBridgeUtils.cpp b/source/utils/CarlaBridgeUtils.cpp
index a10462279..5b403ff06 100644
--- a/source/utils/CarlaBridgeUtils.cpp
+++ b/source/utils/CarlaBridgeUtils.cpp
@@ -4,7 +4,7 @@
 #include "CarlaBridgeUtils.hpp"
 #include "CarlaShmUtils.hpp"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 // must be last
 #include "jackbridge/JackBridge.hpp"
diff --git a/source/utils/CarlaBridgeUtils.hpp b/source/utils/CarlaBridgeUtils.hpp
index 420250ce3..4a6ec0b39 100644
--- a/source/utils/CarlaBridgeUtils.hpp
+++ b/source/utils/CarlaBridgeUtils.hpp
@@ -8,7 +8,7 @@
 #include "CarlaMutex.hpp"
 #include "CarlaRingBuffer.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 // -------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/utils/CarlaExternalUI.hpp b/source/utils/CarlaExternalUI.hpp
index 927e3f308..edccde8b0 100644
--- a/source/utils/CarlaExternalUI.hpp
+++ b/source/utils/CarlaExternalUI.hpp
@@ -6,7 +6,7 @@
 
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 // -----------------------------------------------------------------------
 
diff --git a/source/utils/CarlaJsfxUtils.hpp b/source/utils/CarlaJsfxUtils.hpp
index 66d1ec79f..7d678f582 100644
--- a/source/utils/CarlaJsfxUtils.hpp
+++ b/source/utils/CarlaJsfxUtils.hpp
@@ -7,7 +7,7 @@
 
 #include "CarlaBackend.h"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 #ifdef YSFX_API
diff --git a/source/utils/CarlaMacUtils.cpp b/source/utils/CarlaMacUtils.cpp
index 15f633597..69eb827fb 100644
--- a/source/utils/CarlaMacUtils.cpp
+++ b/source/utils/CarlaMacUtils.cpp
@@ -7,7 +7,7 @@
 
 #include "CarlaMacUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include <sys/xattr.h>
 
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index f2d57fae1..948305f48 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -6,9 +6,9 @@
 #include "CarlaScopeUtils.hpp"
 #include "CarlaMIDI.h"
 
-#include "distrho/extra/Sleep.hpp"
-#include "distrho/extra/String.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Sleep.hpp"
+#include "extra/String.hpp"
+#include "extra/Time.hpp"
 
 // needed for atom-util
 #ifndef nullptr
diff --git a/source/utils/CarlaRunner.hpp b/source/utils/CarlaRunner.hpp
index 1f57996db..bc22ba0c7 100644
--- a/source/utils/CarlaRunner.hpp
+++ b/source/utils/CarlaRunner.hpp
@@ -9,7 +9,7 @@
 #ifndef CARLA_OS_WASM
 # include "CarlaThread.hpp"
 #else
-# include "distrho/extra/String.hpp"
+# include "extra/String.hpp"
 # include <emscripten/html5.h>
 #endif
 
diff --git a/source/utils/CarlaThread.hpp b/source/utils/CarlaThread.hpp
index 12055c7c8..7f4be67b1 100644
--- a/source/utils/CarlaThread.hpp
+++ b/source/utils/CarlaThread.hpp
@@ -6,8 +6,8 @@
 
 #include "CarlaMutex.hpp"
 #include "CarlaProcessUtils.hpp"
-#include "distrho/extra/Sleep.hpp"
-#include "distrho/extra/String.hpp"
+#include "extra/Sleep.hpp"
+#include "extra/String.hpp"
 
 #ifdef CARLA_OS_WASM
 # error Threads do not work under wasm!