#include "debug.h"
#include "buffer.h"
#include "gettext.h"
-#include "funcrequest.h"
#include "frontends/Alert.h"
-#include "frontends/LyXView.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
-#include <unistd.h>
-
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::IsFileReadable;
+using lyx::support::MakeDisplayPath;
+using lyx::support::tempName;
using std::endl;
+using std::string;
using std::pair;