-#include <unistd.h>
-#include "alloc.h"
-#include "case.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "hash.h"
-#include "magic.h"
-#include "misc.h"
-#include "stat-macros.h"
-#include "str.h"
-#include "value-labels.h"
-#include "variable.h"
-#include "version.h"
+
+#include <data/case.h>
+#include <data/casewriter-provider.h>
+#include <data/casewriter.h>
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <data/file-name.h>
+#include <data/format.h>
+#include <data/make-file.h>
+#include <data/missing-values.h>
+#include <data/short-names.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+
+#include <libpspp/hash.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <libpspp/version.h>
+
+#include "minmax.h"
+#include "xalloc.h"