-#include "msg-ui.h"
-
-#include <data/file-name.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <language/prompt.h>
-
-#include "xalloc.h"
+#include "data/file-name.h"
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/prompt.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/driver.h"
+#include "output/journal.h"
+#include "ui/terminal/msg-ui.h"
+#include "ui/terminal/terminal.h"
+
+#include "gl/xalloc.h"