diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index e149176782..29e036e298 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -64,22 +64,23 @@
 #include "color.h"
 #include "color_filters.h"
 #include "print.h"
-#include "simple_dialog.h"
-#include "main_statusbar.h"
 #include "register.h"
 #include "ringbuffer.h"
-#include "ui_util.h"
 #include "util.h"
 #include "clopts_common.h"
 #include "console_io.h"
 #include "cmdarg_err.h"
 #include "version_info.h"
 #include "merge.h"
-#include "alert_box.h"
 #include "log.h"
 #include "u3.h"
 #include <wsutil/file_util.h>
 
+#include "ui/alert_box.h"
+#include "ui/main_statusbar.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
 #include "ui/gtk/recent.h"
 
 #ifdef HAVE_LIBPCAP
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 656492134c..58972d1de5 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -31,9 +31,10 @@
 
 #include "wireshark_application.h"
 
-#include "main_statusbar.h"
 #include "globals.h"
 
+#include "ui/main_statusbar.h"
+
 #include <QSplitter>
 
 #ifdef HAVE_LIBPCAP
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 56cfa832ea..b1a560d750 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -29,7 +29,7 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 
-#include "main_statusbar.h"
+#include "ui/main_statusbar.h"
 
 #include "wireshark_application.h"
 #include "packet_list.h"
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 91cbb4cb82..12a84e9557 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -38,10 +38,11 @@
 #include "monospace_font.h"
 #include "proto_tree.h"
 
-#include "ui_util.h"
 #include "globals.h"
 #include "qt_ui_utils.h"
-#include "main_statusbar.h"
+
+#include "ui/main_statusbar.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/recent.h"
 
diff --git a/ui/qt/progress_dialog.cpp b/ui/qt/progress_dialog.cpp
index 4ad1a50d7f..3058e76d8f 100644
--- a/ui/qt/progress_dialog.cpp
+++ b/ui/qt/progress_dialog.cpp
@@ -29,7 +29,7 @@
 
 #include "progress_dialog.h"
 
-#include "progress_dlg.h"
+#include "ui/progress_dlg.h"
 
 progdlg_t *
 delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
diff --git a/ui/qt/simple_dialog_qt.cpp b/ui/qt/simple_dialog_qt.cpp
index fc7754f6b3..5b1198958c 100644
--- a/ui/qt/simple_dialog_qt.cpp
+++ b/ui/qt/simple_dialog_qt.cpp
@@ -31,8 +31,9 @@
 
 #include <epan/strutil.h>
 
+#include "ui/simple_dialog.h"
+
 #include "simple_dialog_qt.h"
-#include "simple_dialog.h"
 
 /* Simple dialog function - Displays a dialog box with the supplied message
  * text.