diff --git a/dgl/Window.hpp b/dgl/Window.hpp
index 57f474aa..b70c96a9 100644
--- a/dgl/Window.hpp
+++ b/dgl/Window.hpp
@@ -57,7 +57,13 @@ class Window
 
 public:
 #ifndef DGL_FILE_BROWSER_DISABLED
+# ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
+    using FileBrowserHandle = DISTRHO_NAMESPACE::DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE::FileBrowserHandle;
+    using FileBrowserOptions = DISTRHO_NAMESPACE::DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE::FileBrowserOptions;
+# else
+    using FileBrowserHandle = DISTRHO_NAMESPACE::FileBrowserHandle;
     using FileBrowserOptions = DISTRHO_NAMESPACE::FileBrowserOptions;
+# endif
 #endif
 
    /**
diff --git a/distrho/DistrhoUI.hpp b/distrho/DistrhoUI.hpp
index e7140828..6e9d8809 100644
--- a/distrho/DistrhoUI.hpp
+++ b/distrho/DistrhoUI.hpp
@@ -188,6 +188,14 @@ public:
 #endif
 
 #ifndef DGL_FILE_BROWSER_DISABLED
+# ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
+    using FileBrowserHandle = DISTRHO_NAMESPACE::DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE::FileBrowserHandle;
+    using FileBrowserOptions = DISTRHO_NAMESPACE::DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE::FileBrowserOptions;
+# else
+    using FileBrowserHandle = DISTRHO_NAMESPACE::FileBrowserHandle;
+    using FileBrowserOptions = DISTRHO_NAMESPACE::FileBrowserOptions;
+# endif
+
    /**
       Open a file browser dialog with this window as transient parent.@n
       A few options can be specified to setup the dialog.