#include "output.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "frontends/alert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::bformat;
-using support::FileName;
-
-using std::ofstream;
-using std::string;
-
namespace {
template<typename OFStream>