#include <assert.h>
#include <stdlib.h>
#include <limits.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "settings.h"
+#include <libpspp/alloc.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <data/settings.h>
#include "sort-criteria.h"
-#include "sort.h"
-#include "variable.h"
+#include <math/sort.h>
+#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)