-using lyx::docstring;
-using lyx::support::libFileSearch;
-using lyx::support::makeDisplayPath;
-using lyx::support::quoteName;
-using lyx::support::rtrim;
-using lyx::support::subst;
-using lyx::support::addName;
+
+namespace lyx {
+
+using support::FileName;
+using support::libFileSearch;
+using support::makeDisplayPath;
+using support::quoteName;
+using support::rtrim;
+using support::subst;
+using support::addName;