-using lyx::docstring;
-using lyx::pos_type;
-using lyx::pit_type;
-
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::cmd_ret;
-using lyx::support::createBufferTmpDir;
-using lyx::support::destroyDir;
-using lyx::support::getFormatFromContents;
-using lyx::support::isDirWriteable;
-using lyx::support::libFileSearch;
-using lyx::support::latex_path;
-using lyx::support::ltrim;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::makeLatexName;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::quoteName;
-using lyx::support::removeAutosaveFile;
-using lyx::support::rename;
-using lyx::support::runCommand;
-using lyx::support::split;
-using lyx::support::subst;
-using lyx::support::tempName;
-using lyx::support::trim;
-
-namespace Alert = lyx::frontend::Alert;
-namespace os = lyx::support::os;
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::cmd_ret;
+using support::createBufferTmpDir;
+using support::destroyDir;
+using support::FileName;
+using support::getFormatFromContents;
+using support::isDirWriteable;
+using support::libFileSearch;
+using support::latex_path;
+using support::ltrim;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::makeLatexName;
+using support::onlyFilename;
+using support::onlyPath;
+using support::quoteName;
+using support::removeAutosaveFile;
+using support::rename;
+using support::runCommand;
+using support::split;
+using support::subst;
+using support::tempName;
+using support::trim;
+
+namespace Alert = frontend::Alert;
+namespace os = support::os;