-#include "lyxlex.h"
-#include "support/FileInfo.h"
-#include "debug.h"
-#include "support/syscall.h"
-#include "support/syscontr.h"
-#include "support/path.h"
-#include "gettext.h"
+#include "support/lstrings.h"
+#include "support/systemcall.h"
+
+#include <boost/format.hpp>
+
+#include <fstream>
+
+using lyx::support::ChangeExtension;
+using lyx::support::OnlyFilename;
+using lyx::support::split;
+using lyx::support::Systemcall;