diff --git a/carla b/carla
index 36beab5..acc785f 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 36beab5b13b39744b7dc23a2bef57b02756b39ec
+Subproject commit acc785f9f1103ca7062e2ef7c5f5b1dd5d15a801
diff --git a/dpf b/dpf
index 114031e..7f65db5 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 114031ee99257b7c02cfc66cf01d56bef3c6d315
+Subproject commit 7f65db5dd30ffd11525c5e1e15d6b3bb3e72f85c
diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp
index 4ce501f..5e75473 100644
--- a/src/CardinalCommon.cpp
+++ b/src/CardinalCommon.cpp
@@ -139,7 +139,7 @@ void loadDialog()
         CardinalBaseUI* const ui = static_cast<CardinalBaseUI*>(pcontext->ui);
         DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,);
 
-        FileBrowserOptions opts;
+        DISTRHO_NAMESPACE::FileBrowserOptions opts;
         opts.startDir = dir.c_str();
         opts.saving = ui->saving = false;
         opts.title = "Open patch";
@@ -236,7 +236,7 @@ static void saveAsDialog(const bool uncompressed)
     CardinalBaseUI* const ui = static_cast<CardinalBaseUI*>(pcontext->ui);
     DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,);
 
-    FileBrowserOptions opts;
+    DISTRHO_NAMESPACE::FileBrowserOptions opts;
     opts.startDir = dir.c_str();
     opts.saving = ui->saving = true;
     opts.title = "Save patch";
@@ -276,7 +276,7 @@ void async_dialog_filebrowser(const bool saving,
     // only 1 dialog possible at a time
     DISTRHO_SAFE_ASSERT_RETURN(ui->filebrowserhandle == nullptr,);
 
-    FileBrowserOptions opts;
+    DISTRHO_NAMESPACE::FileBrowserOptions opts;
     opts.saving = saving;
     opts.startDir = startDir;
     opts.title = title;
diff --git a/src/PluginContext.hpp b/src/PluginContext.hpp
index 0aa9edc..27897f4 100644
--- a/src/PluginContext.hpp
+++ b/src/PluginContext.hpp
@@ -30,7 +30,6 @@
 
 #ifndef HEADLESS
 # include "DistrhoUI.hpp"
-# include "extra/FileBrowserDialog.hpp"
 #endif
 
 START_NAMESPACE_DISTRHO