02110-1301, USA. */
#include <config.h>
+
#include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "file-handle-def.h"
-#include "command.h"
-#include "lexer.h"
-#include "variable.h"
-/* (headers) */
-#include "debug-print.h"
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+
+/* (headers) */
struct cor_set
{