#include <config.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
-#include "minmax.h"
+#include "gl/minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#else
+#include "data/gnumeric-reader.h"
+
#include <assert.h>
#include <stdbool.h>
#include <errno.h>
-
-#include <xalloc.h>
-
#include <libxml/xmlreader.h>
#include <zlib.h>
-#include <data/case.h>
-#include <data/casereader-provider.h>
-#include <data/dictionary.h>
-#include <data/identifier.h>
-#include <data/variable.h>
-#include <data/value.h>
-
-#include <libpspp/i18n.h>
-#include <libpspp/str.h>
+#include "data/case.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/identifier.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/i18n.h"
+#include "libpspp/str.h"
-#include "gnumeric-reader.h"
+#include "gl/xalloc.h"
/* Default width of string variables. */
#define GNUMERIC_DEFAULT_WIDTH 8