-namespace support = lyx::support;
-
-using lyx::support::AbsolutePath;
-using lyx::support::bformat;
-using lyx::support::ChangeExtension;
-using lyx::support::compare_timestamps;
-using lyx::support::contains;
-using lyx::support::FileName;
-using lyx::support::float_equal;
-using lyx::support::GetExtension;
-using lyx::support::IsFileReadable;
-using lyx::support::latex_path;
-using lyx::support::OnlyFilename;
-using lyx::support::rtrim;
-using lyx::support::subst;
-using lyx::support::Systemcall;
-using lyx::support::unzipFile;
-using lyx::support::unzippedFileName;
-
-namespace os = lyx::support::os;
+
+namespace lyx {
+
+using support::bformat;
+using support::changeExtension;
+using support::compare_timestamps;
+using support::contains;
+using support::DocFileName;
+using support::FileName;
+using support::float_equal;
+using support::getExtension;
+using support::isFileReadable;
+using support::latex_path;
+using support::onlyFilename;
+using support::removeExtension;
+using support::rtrim;
+using support::subst;
+using support::Systemcall;
+using support::unzipFile;
+using support::unzippedFileName;