#include "LaTeXFeatures.h"
#include "Buffer.h"
#include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "MathData.h"
#include "MathFactory.h"
#include "MathSupport.h"
#include <ostream>
-using std::string;
-
+using namespace std;
namespace lyx {