#include "funcrequest.h"
#include "bufferlist.h"
-#include "buffer_funcs.h"
#include "support/filetools.h"
#include "frontends/Alert.h"
#include "gettext.h"
#include "BufferView.h"
-#include <algorithm>
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::MakeDisplayPath;
-using namespace lyx::support;
-
-using std::vector;
using std::find;
+using std::string;
+using std::vector;
extern BufferList bufferlist;