-#include "psppire-dialog-action-var-info.h"
-
-#include <data/variable.h>
-#include <data/format.h>
-#include <data/value-labels.h>
-#include <libpspp/i18n.h>
-
-#include "var-display.h"
-#include "helper.h"
-#include "psppire-var-view.h"
-#include "psppire-dictview.h"
-
-#include "psppire-dialog.h"
-#include "builder-wrapper.h"
-#include "psppire-data-window.h"
+#include "ui/gui/psppire-dialog-action-var-info.h"
+
+#include <gtk/gtk.h>
+
+#include "data/format.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "libpspp/i18n.h"
+#include "ui/gui/builder-wrapper.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-dialog.h"
+#include "ui/gui/psppire-dictview.h"
+#include "ui/gui/psppire-var-store.h"
+#include "ui/gui/var-display.h"