02110-1301, USA. */
#include "config.h"
-#include "message.h"
+#include <libpspp/message.h>
#include <ctype.h>
#include <errno.h>
#include <float.h>
#include <limits.h>
#include <stdlib.h>
-#include "array.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
#include "intprops.h"
-#include "lexer.h"
-#include "misc.h"
-#include "pool.h"
-#include "settings.h"
-#include "str.h"
-#include "value.h"
-#include "variable.h"
-#include "procedure.h"
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <procedure.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>