-#include <libpspp/alloc.h>
-#include "msg-locator.h"
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-#include "getl.h"
+
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/getl.h"
+
+#include "gl/xalloc.h"