#include "Buffer.h"
#include "BufferParams.h"
#include "DispatchResult.h"
-#include "debug.h"
+#include "support/debug.h"
#include "Encoding.h"
#include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "LaTeXFeatures.h"
#include "MetricsInfo.h"
#include "OutputParams.h"