#include "Format.h"
#include "frontends/LyXView.h"
#include "FuncRequest.h"
-#include "lyx_cb.h"
+#include "callback.h"
#include "support/filetools.h"
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
#include "gettext.h"
#include "BufferView.h"
#include "buffer_funcs.h"
+using std::find;
+using std::string;
+using std::vector;
+
namespace lyx {
using support::FileName;
using support::makeDisplayPath;
-using std::find;
-using std::string;
-using std::vector;
-
bool Importer::Import(LyXView * lv, FileName const & filename,
string const & format, ErrorList & errorList)