#include <boost/assert.hpp>
#if defined (_WIN32)
-# include "gettext.h"
+# include "support/gettext.h"
# include <windows.h>
# include <lmcons.h>
#else
# include <sys/types.h>
#endif
-using std::string;
+using namespace std;
namespace lyx {
namespace support {