#include <config.h>
-#include "userinfo.h"
-#include "filetools.h"
+#include "support/userinfo.h"
+#include "support/filetools.h"
#include <boost/assert.hpp>
#include <unistd.h>
#include <sys/types.h>
+using std::string;
+
namespace lyx {
namespace support {