4 files changed, 7 insertions, 6 deletions
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index b2037471a5..145ba707f4 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -43,7 +43,8 @@
 #include "AquaFilePickerDelegate.hxx"
 
 using namespace com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 class ControlHelper {
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 26b1ffeaa0..cc08f96581 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -59,8 +59,7 @@
 //----------------------------------------------------------
 // forward declarations
 //----------------------------------------------------------
-
-using namespace rtl;
+using ::rtl::OUString;
 
 //----------------------------------------------------------
 // class declaration
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index d280585000..2ad10d4131 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -58,8 +58,8 @@
 // forward declarations
 //----------------------------------------------------------
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 struct FilterEntry;
 struct ElementEntry_Impl;
 
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 54fe996316..3776cea2d5 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -34,7 +34,8 @@
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 //-------------------------------
 //