5 files changed, 12 insertions, 5 deletions
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 787c68d97a18..074d3a5ffc3a 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -50,7 +50,8 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 //=============================================================================
 
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 744a6436bda6..cd618cffd8a6 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -65,7 +65,8 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 namespace comphelper
 {
diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx
index 5c39ef684dc7..1228e9278db9 100644
--- a/comphelper/source/misc/regpathhelper.cxx
+++ b/comphelper/source/misc/regpathhelper.cxx
@@ -39,7 +39,10 @@
 #include <rtl/uri.hxx>
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
 
 #define PATH_DELEMITTER '/'
 
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index ff7fc5210448..99df5958200c 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.cxx
@@ -60,9 +60,10 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 namespace
 {
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index 012df7f4fe03..2c956623fcb7 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -33,10 +33,11 @@
 
 #include <vector>
 
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+
 namespace comphelper {
 
 struct TagAttribute_Impl