diff --git a/dgl/Window.hpp b/dgl/Window.hpp
index b70c96a9..f28b99bc 100644
--- a/dgl/Window.hpp
+++ b/dgl/Window.hpp
@@ -57,13 +57,8 @@ 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 6e9d8809..e7140828 100644
--- a/distrho/DistrhoUI.hpp
+++ b/distrho/DistrhoUI.hpp
@@ -188,14 +188,6 @@ 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.
diff --git a/distrho/extra/FileBrowserDialog.cpp b/distrho/extra/FileBrowserDialog.cpp
index 2992591f..8618474c 100644
--- a/distrho/extra/FileBrowserDialog.cpp
+++ b/distrho/extra/FileBrowserDialog.cpp
@@ -35,10 +35,6 @@
 
 START_NAMESPACE_DISTRHO
 
-#ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
-namespace DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE {
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 
 // static pointer used for signal null/none action taken
@@ -93,11 +89,11 @@ struct FileBrowserData {
         ofn.hwndOwner = (HWND)winId;
 
         ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
-        if (options.buttons.showHidden == Window::FileBrowserOptions::kButtonVisibleChecked)
+        if (options.buttons.showHidden == FileBrowserOptions::kButtonVisibleChecked)
             ofn.Flags |= OFN_FORCESHOWHIDDEN;
 
         ofn.FlagsEx = 0x0;
-        if (options.buttons.showPlaces == Window::FileBrowserOptions::kButtonInvisible)
+        if (options.buttons.showPlaces == FileBrowserOptions::kButtonInvisible)
             ofn.FlagsEx |= OFN_EX_NOPLACESBAR;
 
         startDirW.resize(std::strlen(startDir) + 1);
@@ -224,6 +220,12 @@ struct FileBrowserData {
 
 // --------------------------------------------------------------------------------------------------------------------
 
+#ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
+namespace DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE {
+#endif
+
+// --------------------------------------------------------------------------------------------------------------------
+
 FileBrowserHandle fileBrowserOpen(const bool isEmbed,
                                   const uintptr_t windowId,
                                   const double scaleFactor,
@@ -258,7 +260,7 @@ FileBrowserHandle fileBrowserOpen(const bool isEmbed,
 
     dispatch_async(dispatch_get_main_queue(), ^
     {
-        [nspanel beginSheetModalForWindow:[(NSView*)windowId) window]
+        [nspanel beginSheetModalForWindow:[(NSView*)windowId window]
                         completionHandler:^(NSModalResponse result)
         {
             DISTRHO_SAFE_ASSERT_RETURN(handle != nullptr,);
diff --git a/distrho/extra/FileBrowserDialog.hpp b/distrho/extra/FileBrowserDialog.hpp
index fa490aaa..36465864 100644
--- a/distrho/extra/FileBrowserDialog.hpp
+++ b/distrho/extra/FileBrowserDialog.hpp
@@ -21,10 +21,6 @@
 
 START_NAMESPACE_DISTRHO
 
-#ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
-namespace DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE {
-#endif
-
 // --------------------------------------------------------------------------------------------------------------------
 // File Browser Dialog stuff
 
@@ -91,6 +87,12 @@ struct FileBrowserOptions {
 
 // --------------------------------------------------------------------------------------------------------------------
 
+#ifdef DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE
+namespace DISTRHO_FILE_BROWSER_DIALOG_EXTRA_NAMESPACE {
+#endif
+
+// --------------------------------------------------------------------------------------------------------------------
+
 FileBrowserHandle fileBrowserOpen(bool isEmbed, uintptr_t windowId, double scaleFactor,
                                   const char* startDir, const char* windowTitle, const FileBrowserOptions& options);
 
@@ -115,6 +117,8 @@ const char* fileBrowserGetPath(const FileBrowserHandle handle);
 }
 #endif
 
+// --------------------------------------------------------------------------------------------------------------------
+
 END_NAMESPACE_DISTRHO
 
 #endif // DISTRHO_FILE_BROWSER_DIALOG_HPP_INCLUDED