#include <config.h>
-#include <cctype>
-
-#include <utility>
-#include <fstream>
-
-#include "Lsstream.h"
-
#ifdef __GNUG__
#pragma implementation "filetools.h"
#endif
-#include <cstdlib>
-#include <cstdio>
-#include <fcntl.h>
-#include <cerrno>
#include "debug.h"
#include "support/lstrings.h"
#include "support/systemcall.h"
#include "lyxlib.h"
#include "os.h"
+#include "Lsstream.h"
+
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+#include <fcntl.h>
+#include <cerrno>
+
+#include <utility>
+#include <fstream>
+
+
// Which part of this is still necessary? (JMarc).
#if HAVE_DIRENT_H
# include <dirent.h>
# endif
#endif
+#ifndef CXX_GLOBAL_CSTD
+using std::fgetc;
+using std::isalpha;
+using std::isalnum;
+using std::pclose;
+using std::popen;
+#endif
+
using std::make_pair;
using std::pair;
using std::endl;