02110-1301, USA. */
#include <config.h>
-#include "command.h"
-#include "dictionary.h"
-#include "sort.h"
-#include "variable.h"
+#include <language/command.h>
+#include <libpspp/compiler.h>
+#include <data/dictionary.h>
+#include <math/sort.h>
+#include <data/variable.h>
+
+#include "sort-criteria.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)