diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 25efdca73d..9fb78e3b3e 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -29,6 +29,7 @@ set(WIRESHARK_WIDGET_HEADERS
 	widgets/clickable_label.h
 	widgets/display_filter_combo.h
 	widgets/display_filter_edit.h
+	widgets/drag_drop_toolbar.h
 	widgets/elided_label.h
 	widgets/field_filter_edit.h
 	widgets/find_line_edit.h
@@ -36,9 +37,18 @@ set(WIRESHARK_WIDGET_HEADERS
 	widgets/interface_toolbar_lineedit.h
 	widgets/label_stack.h
 	widgets/overlay_scroll_bar.h
+	widgets/qcustomplot.h
+	widgets/stock_icon_tool_button.h
 	widgets/syntax_line_edit.h
 	widgets/tabnav_tree_view.h
-	widgets/drag_drop_toolbar.h
+)
+
+set(WIRESHARK_UTILS_HEADERS
+	utils/color_utils.h
+	utils/stock_icon.h
+	utils/qt_ui_utils.h
+	utils/variant_pointer.h
+	uat_delegate.h
 )
 
 # All .h files which inherit from QObject aka which use the Q_OBJECT macro
@@ -62,7 +72,6 @@ set(WIRESHARK_QT_HEADERS
 	capture_info_dialog.h
 	capture_interfaces_dialog.h
 	capture_preferences_frame.h
-	color_utils.h
 	coloring_rules_dialog.h
 	column_preferences_frame.h
 	column_editor_frame.h
@@ -135,7 +144,6 @@ set(WIRESHARK_QT_HEADERS
 	proto_tree.h
 	protocol_hierarchy_dialog.h
 	protocol_preferences_menu.h
-	qcustomplot.h
 	recent_file_status.h
 	related_packet_delegate.h
 	resolved_addresses_dialog.h
@@ -159,7 +167,6 @@ set(WIRESHARK_QT_HEADERS
 	stats_tree_dialog.h
 	service_response_time_dialog.h
 	simple_statistics_dialog.h
-	stock_icon_tool_button.h
 	supported_protocols_dialog.h
 	tabnav_tree_widget.h
 	tap_parameter_dialog.h
@@ -201,9 +208,9 @@ endif()
 
 file(GLOB EXTRA_QT_HEADERS
 	packet_list_record.h
-	qt_ui_utils.h
+	utils/qt_ui_utils.h
 	sparkline_delegate.h
-	stock_icon.h
+	utils/stock_icon.h
 )
 
 set(WIRESHARK_WIDGET_SRCS
@@ -214,6 +221,7 @@ set(WIRESHARK_WIDGET_SRCS
 	widgets/clickable_label.cpp
 	widgets/display_filter_combo.cpp
 	widgets/display_filter_edit.cpp
+	widgets/drag_drop_toolbar.cpp
 	widgets/elided_label.cpp
 	widgets/field_filter_edit.cpp
 	widgets/find_line_edit.cpp
@@ -221,9 +229,16 @@ set(WIRESHARK_WIDGET_SRCS
 	widgets/interface_toolbar_lineedit.cpp
 	widgets/label_stack.cpp
 	widgets/overlay_scroll_bar.cpp
+	widgets/qcustomplot.cpp
+	widgets/stock_icon_tool_button.cpp
 	widgets/syntax_line_edit.cpp
 	widgets/tabnav_tree_view.cpp
-	widgets/drag_drop_toolbar.cpp
+)
+
+set(WIRESHARK_UTILS_SRCS
+	utils/color_utils.cpp
+	utils/stock_icon.cpp
+	utils/qt_ui_utils.cpp
 )
 
 set(WIRESHARK_QT_SRC
@@ -244,7 +259,6 @@ set(WIRESHARK_QT_SRC
 	capture_info_dialog.cpp
 	capture_interfaces_dialog.cpp
 	capture_preferences_frame.cpp
-	color_utils.cpp
 	coloring_rules_dialog.cpp
 	column_preferences_frame.cpp
 	column_editor_frame.cpp
@@ -312,8 +326,6 @@ set(WIRESHARK_QT_SRC
 	proto_tree.cpp
 	protocol_hierarchy_dialog.cpp
 	protocol_preferences_menu.cpp
-	qcustomplot.cpp
-	qt_ui_utils.cpp
 	recent_file_status.cpp
 	related_packet_delegate.cpp
 	resolved_addresses_dialog.cpp
@@ -338,8 +350,6 @@ set(WIRESHARK_QT_SRC
 	simple_statistics_dialog.cpp
 	sparkline_delegate.cpp
 	splash_overlay.cpp
-	stock_icon.cpp
-	stock_icon_tool_button.cpp
 	supported_protocols_dialog.cpp
 	tabnav_tree_widget.cpp
 	tap_parameter_dialog.cpp
@@ -522,28 +532,16 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+SET(CMAKE_AUTOMOC TRUE)
+
 if (QT_VERSION EQUAL 5)
 	QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
 	QT5_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
 	QT5_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
-	# For now, do the moc stuff manually
-	QT5_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} ${WIRESHARK_WIDGET_HEADERS}
-		OPTIONS ${MOC_OPTIONS})
-	# Starting with cmake 2.8.6, we may also use
-	# set(CMAKE_AUTOMOC TRUE)
-	# or
-	# set_target_properties(${some-source-files} PROPERTIES AUTOMOC TRUE)
 else()
 	QT4_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
 	QT4_ADD_RESOURCES(WIRESHARK_QT_QRC_SRC ${WIRESHARK_QT_QRC})
 	QT4_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI})
-	# For now, do the moc stuff manually
-	QT4_WRAP_CPP(WIRESHARK_QT_MOC_SRC ${WIRESHARK_QT_HEADERS} ${WIRESHARK_WIDGET_HEADERS}
-		OPTIONS ${MOC_OPTIONS})
-	# Starting with cmake 2.8.6, we may also use
-	# set(CMAKE_AUTOMOC TRUE)
-	# or
-	# set_target_properties(${some-source-files} PROPERTIES AUTOMOC TRUE)
 endif()
 
 foreach(_file ${WIRESHARK_QT_QM})
@@ -580,14 +578,18 @@ source_group("qrc Files" FILES ${WIRESHARK_QT_QRC_SRC} ${WIRESHARK_QT_QRC})
 source_group("Header Files" FILES ${WIRESHARK_QT_HEADERS})
 source_group("Widget Header Files" FILES ${WIRESHARK_WIDGET_HEADERS})
 source_group("Widget Source Files" FILES ${WIRESHARK_WIDGET_SRCS})
+source_group("Utils Header Files" FILES ${WIRESHARK_UTILS_HEADERS})
+source_group("Utils Source Files" FILES ${WIRESHARK_UTILS_SRCS})
 
 add_library(qtui STATIC
 	#Included so that Visual Studio can properly put header files in solution
 	${WIRESHARK_QT_HEADERS}
 	${WIRESHARK_WIDGET_HEADERS}
+	${WIRESHARK_UTILS_HEADERS}
 
 	${WIRESHARK_QT_SRC}
 	${WIRESHARK_WIDGET_SRCS}
+	${WIRESHARK_UTILS_SRCS}
 	${WIRESHARK_QT_TAP_SRC}
 	${WIRESHARK_QT_UI_SRC}
 	${WIRESHARK_QT_MOC_SRC}
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index b044fb8057..16fa08708a 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -150,6 +150,7 @@ NODIST_GENERATED_FILES = \
 # Files that generate compileable files
 GENERATOR_FILES =
 
+# Files that are basic widgets for every tool to be used
 MOC_WIDGET_HDRS = \
 	widgets/additional_toolbar.h			\
 	widgets/apply_line_edit.h			\
@@ -166,8 +167,16 @@ MOC_WIDGET_HDRS = \
 	widgets/label_stack.h				\
 	widgets/overlay_scroll_bar.h			\
 	widgets/syntax_line_edit.h			\
+	widgets/stock_icon_tool_button.h		\
 	widgets/tabnav_tree_view.h			\
-	widgets/drag_drop_toolbar.h
+	widgets/drag_drop_toolbar.h			\
+	widgets/qcustomplot.h
+# Files that are utility classes with multi-purpose, but no widgets
+MOC_UTILS_HDRS = \
+	utils/color_utils.h				\
+	utils/stock_icon.h				\
+	utils/qt_ui_utils.h				\
+	utils/variant_pointer.h
 
 #
 # Headers that have to be run through moc.
@@ -191,7 +200,6 @@ MOC_HDRS = \
 	capture_interfaces_dialog.h			\
 	capture_preferences_frame.h			\
 	coloring_rules_dialog.h				\
-	color_utils.h					\
 	column_preferences_frame.h			\
 	column_editor_frame.h				\
 	compiled_filter_output.h			\
@@ -262,7 +270,6 @@ MOC_HDRS = \
 	proto_tree.h					\
 	protocol_hierarchy_dialog.h			\
 	protocol_preferences_menu.h			\
-	qcustomplot.h					\
 	recent_file_status.h				\
 	related_packet_delegate.h			\
 	remote_capture_dialog.h				\
@@ -290,7 +297,6 @@ MOC_HDRS = \
 	sparkline_delegate.h				\
 	splash_overlay.h				\
 	stats_tree_dialog.h				\
-	stock_icon_tool_button.h			\
 	supported_protocols_dialog.h			\
 	tabnav_tree_widget.h				\
 	tap_parameter_dialog.h				\
@@ -309,7 +315,8 @@ MOC_HDRS = \
 	wireshark_application.h				\
 	wireshark_dialog.h				\
 	wlan_statistics_dialog.h			\
-	$(MOC_WIDGET_HDRS)
+	$(MOC_WIDGET_HDRS)				\
+	$(MOC_UTILS_HDRS)
 
 #
 # .ui files.
@@ -457,17 +464,23 @@ WIRESHARK_QT_WIDGET_SRC = \
 	widgets/clickable_label.cpp			\
 	widgets/display_filter_combo.cpp		\
 	widgets/display_filter_edit.cpp			\
-	widgets/elided_label.cpp				\
+	widgets/elided_label.cpp			\
 	widgets/field_filter_edit.cpp			\
 	widgets/find_line_edit.cpp			\
 	widgets/follow_stream_text.cpp			\
 	widgets/interface_toolbar_lineedit.cpp		\
 	widgets/label_stack.cpp				\
 	widgets/overlay_scroll_bar.cpp			\
+	widgets/stock_icon_tool_button.cpp		\
 	widgets/syntax_line_edit.cpp			\
 	widgets/tabnav_tree_view.cpp			\
-	widgets/drag_drop_toolbar.cpp
+	widgets/drag_drop_toolbar.cpp			\
+	widgets/qcustomplot.cpp
 
+WIRESHARK_QT_UTILS_SRC = \
+	utils/color_utils.cpp				\
+	utils/stock_icon.cpp				\
+	utils/qt_ui_utils.cpp				\
 
 WIRESHARK_QT_SRC = \
 	about_dialog.cpp				\
@@ -487,7 +500,6 @@ WIRESHARK_QT_SRC = \
 	capture_info_dialog.cpp				\
 	capture_interfaces_dialog.cpp			\
 	capture_preferences_frame.cpp			\
-	color_utils.cpp					\
 	coloring_rules_dialog.cpp			\
 	column_preferences_frame.cpp			\
 	column_editor_frame.cpp				\
@@ -555,8 +567,6 @@ WIRESHARK_QT_SRC = \
 	proto_tree.cpp					\
 	protocol_hierarchy_dialog.cpp			\
 	protocol_preferences_menu.cpp			\
-	qcustomplot.cpp					\
-	qt_ui_utils.cpp					\
 	recent_file_status.cpp				\
 	related_packet_delegate.cpp			\
 	remote_capture_dialog.cpp			\
@@ -583,8 +593,6 @@ WIRESHARK_QT_SRC = \
 	simple_statistics_dialog.cpp			\
 	sparkline_delegate.cpp				\
 	splash_overlay.cpp				\
-	stock_icon.cpp					\
-	stock_icon_tool_button.cpp			\
 	supported_protocols_dialog.cpp			\
 	tabnav_tree_widget.cpp				\
 	tap_parameter_dialog.cpp			\
@@ -602,7 +610,8 @@ WIRESHARK_QT_SRC = \
 	wireless_timeline.cpp				\
 	wireshark_application.cpp			\
 	wireshark_dialog.cpp				\
-	$(WIRESHARK_QT_WIDGET_SRC)
+	$(WIRESHARK_QT_WIDGET_SRC)			\
+	$(WIRESHARK_QT_UTILS_SRC)
 
 WIRESHARK_QT_TAP_SRC = \
 	expert_info_dialog.cpp			\
@@ -620,14 +629,14 @@ WIRESHARK_QT_TAP_SRC = \
 	wlan_statistics_dialog.cpp
 
 noinst_HEADERS = \
-	$(MOC_HDRS)		\
-	packet_list_record.h	\
-	qcustomplot.h		\
-	qt_ui_utils.h		\
-	simple_dialog.h		\
-	stock_icon.h		\
-	tango_colors.h		\
-	variant_pointer.h
+	$(MOC_HDRS)			\
+	packet_list_record.h		\
+	simple_dialog.h			\
+	widgets/qcustomplot.h		\
+	utils/qt_ui_utils.h		\
+	utils/stock_icon.h		\
+	utils/tango_colors.h		\
+	utils/variant_pointer.h
 
 if HAVE_EXTCAP
 NODIST_GENERATED_HEADER_FILES += \
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index ecbd0660d5..6fa0e41c67 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -57,7 +57,7 @@
 #include "extcap.h"
 #endif
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QFontMetrics>
 #include <QKeySequence>
diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index 49e3fa1217..d340afa9e4 100644
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -35,7 +35,7 @@
 
 #include <QPushButton>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 // To do:
 // - Fill in currently resolved address.
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index 09aeacc74a..daef9d5fec 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -22,7 +22,7 @@
 #include "bluetooth_att_server_attributes_dialog.h"
 #include <ui_bluetooth_att_server_attributes_dialog.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include "epan/epan.h"
 #include "epan/to_str.h"
diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp
index d9a425a382..3d4b5c92f8 100644
--- a/ui/qt/bluetooth_device_dialog.cpp
+++ b/ui/qt/bluetooth_device_dialog.cpp
@@ -22,7 +22,7 @@
 #include "bluetooth_device_dialog.h"
 #include <ui_bluetooth_device_dialog.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include "epan/epan.h"
 #include "epan/addr_resolv.h"
@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QClipboard>
 #include <QContextMenuEvent>
diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index ada4099e0d..a63a0ae804 100644
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -24,7 +24,7 @@
 
 #include "bluetooth_device_dialog.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include "epan/epan.h"
 #include "epan/addr_resolv.h"
@@ -34,7 +34,7 @@
 #include "epan/dissectors/packet-bluetooth.h"
 #include "epan/dissectors/packet-bthci_evt.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index 4c877c6a6d..27b492214e 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -24,7 +24,7 @@
 
 #include "bluetooth_device_dialog.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include "epan/epan.h"
 #include "epan/addr_resolv.h"
@@ -35,7 +35,7 @@
 #include "epan/dissectors/packet-bthci_cmd.h"
 #include "epan/dissectors/packet-bthci_evt.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 1398bc5d99..afc7aa834e 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -28,7 +28,7 @@
 #include <QTabBar>
 #include <QTreeWidgetItem>
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 // To do:
 // - We might want to add a callback to free_data_sources in so that we
diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp
index bf565a728e..47595c763e 100644
--- a/ui/qt/byte_view_text.cpp
+++ b/ui/qt/byte_view_text.cpp
@@ -28,11 +28,11 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "wireshark_application.h"
 #include "ui/recent.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QActionGroup>
 #include <QMouseEvent>
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index 1d6bff7525..22ff4eae73 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -53,7 +53,7 @@
 
 #include <QPushButton>
 #include "epan/prefs.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include <wireshark_application.h>
 
 CaptureFileDialog::CaptureFileDialog(QWidget *parent, capture_file *cf, QString &display_filter) :
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h
index ef7ac2f839..06b5243224 100644
--- a/ui/qt/capture_file_dialog.h
+++ b/ui/qt/capture_file_dialog.h
@@ -28,6 +28,8 @@
 #include "ui/help_url.h"
 #endif // Q_OS_WIN
 
+#include <ui/packet_range.h>
+
 #include "packet_list_record.h"
 #include "cfile.h"
 
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index 7d5ae82369..e7c0aad6fa 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -30,7 +30,7 @@
 #include "wsutil/utf8_entities.h"
 #include "ws_version_info.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QPushButton>
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index 944e0f359a..efafd6d99a 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -57,8 +57,8 @@
 
 #include <wiretap/wtap.h>
 
-#include "qt_ui_utils.h"
-#include "sparkline_delegate.h"
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/sparkline_delegate.h>
 
 // To do:
 // - Set a size hint for item delegates.
diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index cb48a4b82e..a29dbfb68d 100644
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -39,7 +39,7 @@
 
 #include "wsutil/filesystem.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "ui/ui_util.h"
 #include <ui/qt/widgets/display_filter_combo.h>
 #include <ui/qt/widgets/syntax_line_edit.h>
diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index e7fd1d6cdd..f839e43c4c 100644
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -30,7 +30,7 @@
 
 #include <ui/preference_utils.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "column_preferences_frame.h"
 #include <ui_column_preferences_frame.h>
 #include <ui/qt/widgets/syntax_line_edit.h>
diff --git a/ui/qt/conversation_colorize_action.cpp b/ui/qt/conversation_colorize_action.cpp
index a051f444b2..93d2886d5d 100644
--- a/ui/qt/conversation_colorize_action.cpp
+++ b/ui/qt/conversation_colorize_action.cpp
@@ -29,7 +29,7 @@
 
 #include <QMenu>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 ConversationAction::ConversationAction(QObject *parent, conversation_filter_s *conv_filter) :
     QAction(parent),
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index cf712f9f0d..fe3a35582c 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -30,8 +30,8 @@
 
 #include "wsutil/str_util.h"
 
-#include "qt_ui_utils.h"
-#include "timeline_delegate.h"
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/timeline_delegate.h>
 #include "wireshark_application.h"
 
 #include <QCheckBox>
diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp
index a0f2566da5..86cb89073b 100644
--- a/ui/qt/conversation_hash_tables_dialog.cpp
+++ b/ui/qt/conversation_hash_tables_dialog.cpp
@@ -29,7 +29,7 @@
 #include <epan/conversation.h>
 #include <epan/conversation_debug.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 ConversationHashTablesDialog::ConversationHashTablesDialog(QWidget *parent) :
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index e492fc1ca2..e79530cf8d 100644
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -32,10 +32,10 @@
 #include "ui/simple_dialog.h"
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QComboBox>
 #include <QFont>
diff --git a/ui/qt/display_filter_expression_dialog.cpp b/ui/qt/display_filter_expression_dialog.cpp
index b5e7f2ce72..c63aba0432 100644
--- a/ui/qt/display_filter_expression_dialog.cpp
+++ b/ui/qt/display_filter_expression_dialog.cpp
@@ -31,10 +31,10 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QPushButton>
 #include <QDialogButtonBox>
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index efdbe3bee0..2d4871f2b1 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -34,7 +34,7 @@
 
 #include "wsutil/str_util.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QCheckBox>
diff --git a/ui/qt/expert_info_dialog.cpp b/ui/qt/expert_info_dialog.cpp
index 28e4fe7d72..5d95840fc8 100644
--- a/ui/qt/expert_info_dialog.cpp
+++ b/ui/qt/expert_info_dialog.cpp
@@ -29,7 +29,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "wireshark_application.h"
 
 #include <QAction>
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 8dd70dd1c7..95fd3e7379 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -34,7 +34,7 @@
 #include <epan/print.h>
 #include <wsutil/filesystem.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 
 #include <QDialogButtonBox>
diff --git a/ui/qt/export_object_action.cpp b/ui/qt/export_object_action.cpp
index 7b9363ba72..c681ae9189 100644
--- a/ui/qt/export_object_action.cpp
+++ b/ui/qt/export_object_action.cpp
@@ -30,7 +30,7 @@
 
 #include <QMenu>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 ExportObjectAction::ExportObjectAction(QObject *parent, register_eo_t *eo) :
     QAction(parent),
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index 9e15950f1b..d5b60afbb2 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -28,7 +28,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/str_util.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QDialogButtonBox>
diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp
index 944eeff244..6a74cc7e07 100644
--- a/ui/qt/extcap_argument.cpp
+++ b/ui/qt/extcap_argument.cpp
@@ -49,7 +49,7 @@
 #include <extcap.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
-#include <color_utils.h>
+#include <ui/qt/utils/color_utils.h>
 
 #include <extcap_parser.h>
 #include <extcap_argument_file.h>
diff --git a/ui/qt/extcap_argument_file.cpp b/ui/qt/extcap_argument_file.cpp
index bff5ea0ea5..dbc251741d 100644
--- a/ui/qt/extcap_argument_file.cpp
+++ b/ui/qt/extcap_argument_file.cpp
@@ -36,7 +36,7 @@
 #include <QVariant>
 
 #include <epan/prefs.h>
-#include <color_utils.h>
+#include <ui/qt/utils/color_utils.h>
 
 #include <ui/all_files_wildcard.h>
 
diff --git a/ui/qt/extcap_argument_multiselect.cpp b/ui/qt/extcap_argument_multiselect.cpp
index 6a9ab03298..e79671c639 100644
--- a/ui/qt/extcap_argument_multiselect.cpp
+++ b/ui/qt/extcap_argument_multiselect.cpp
@@ -33,7 +33,7 @@
 #include <QVariant>
 
 #include <epan/prefs.h>
-#include <color_utils.h>
+#include <ui/qt/utils/color_utils.h>
 
 #include <extcap_parser.h>
 #include <extcap_argument_multiselect.h>
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index 56f82fb7ab..99e9b5743c 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -54,13 +54,13 @@
 #include <extcap.h>
 #include <extcap_parser.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <epan/prefs.h>
 #include <ui/preference_utils.h>
 
 #include <ui/qt/wireshark_application.h>
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <ui/qt/extcap_argument.h>
 #include <ui/qt/extcap_argument_file.h>
diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index e96591e273..808163a1b0 100644
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -28,7 +28,7 @@
 
 #include "ui/help_url.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <wsutil/str_util.h>
 
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 562845b2bf..c200d724e2 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -44,10 +44,10 @@
 
 #include "ws_symbol_export.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include "progress_frame.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QElapsedTimer>
 #include <QKeyEvent>
diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp
index 84529d1849..cbfe0bf3cd 100644
--- a/ui/qt/font_color_preferences_frame.cpp
+++ b/ui/qt/font_color_preferences_frame.cpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include "font_color_preferences_frame.h"
 #include <ui_font_color_preferences_frame.h>
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "wireshark_application.h"
 
 #include <QFontDialog>
diff --git a/ui/qt/funnel_string_dialog.cpp b/ui/qt/funnel_string_dialog.cpp
index 37b3ed6314..233b2a9da8 100644
--- a/ui/qt/funnel_string_dialog.cpp
+++ b/ui/qt/funnel_string_dialog.cpp
@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QLineEdit>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 // Helper object used for sending close signal to open dialogs from a C function
diff --git a/ui/qt/funnel_text_dialog.cpp b/ui/qt/funnel_text_dialog.cpp
index 8be47b032c..cbe001d512 100644
--- a/ui/qt/funnel_text_dialog.cpp
+++ b/ui/qt/funnel_text_dialog.cpp
@@ -27,7 +27,7 @@
 #include <QTextCharFormat>
 #include <QTextCursor>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 // To do:
diff --git a/ui/qt/geometry_state_dialog.cpp b/ui/qt/geometry_state_dialog.cpp
index a934a4e10f..4938b81a37 100644
--- a/ui/qt/geometry_state_dialog.cpp
+++ b/ui/qt/geometry_state_dialog.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "geometry_state_dialog.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/recent.h"
 #include "ui/ui_util.h"
 
diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index a13b116047..e32ee545f4 100644
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -43,7 +43,7 @@
 #include "ui/capture_globals.h"
 #include "ui/simple_dialog.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QTextStream>
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index ee4e5fdfe0..c8a4f94ff8 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -46,9 +46,9 @@
 #include <QPushButton>
 #include <QTemporaryFile>
 
-#include "color_utils.h"
-#include "qt_ui_utils.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
 
 /*
diff --git a/ui/qt/iax2_analysis_dialog.ui b/ui/qt/iax2_analysis_dialog.ui
index 27ece5c31c..9a3c442853 100644
--- a/ui/qt/iax2_analysis_dialog.ui
+++ b/ui/qt/iax2_analysis_dialog.ui
@@ -343,7 +343,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp
index 0c3ef3587f..d950fd793c 100644
--- a/ui/qt/import_text_dialog.cpp
+++ b/ui/qt/import_text_dialog.cpp
@@ -41,7 +41,7 @@
 
 #include <ui_import_text_dialog.h>
 #include "wireshark_application.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QFileDialog>
 #include <QDebug>
diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
index f009f4105d..f2cc2e7530 100644
--- a/ui/qt/interface_frame.cpp
+++ b/ui/qt/interface_frame.cpp
@@ -27,7 +27,7 @@
 #include "ui/qt/interface_frame.h"
 #include "ui/qt/interface_tree_model.h"
 
-#include "sparkline_delegate.h"
+#include <ui/qt/sparkline_delegate.h>
 #include "wireshark_application.h"
 
 #ifdef HAVE_EXTCAP
diff --git a/ui/qt/interface_sort_filter_model.cpp b/ui/qt/interface_sort_filter_model.cpp
index 597ff66e12..2a75e53590 100644
--- a/ui/qt/interface_sort_filter_model.cpp
+++ b/ui/qt/interface_sort_filter_model.cpp
@@ -28,7 +28,7 @@
 
 #include <epan/prefs.h>
 #include <ui/preference_utils.h>
-#include <ui/qt/qt_ui_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include "wireshark_application.h"
 
diff --git a/ui/qt/interface_tree_cache_model.cpp b/ui/qt/interface_tree_cache_model.cpp
index 3b9f6d56b6..46e95bd525 100644
--- a/ui/qt/interface_tree_cache_model.cpp
+++ b/ui/qt/interface_tree_cache_model.cpp
@@ -27,7 +27,7 @@
 
 #include "epan/prefs.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/capture_globals.h"
 #include "wsutil/utf8_entities.h"
 
diff --git a/ui/qt/interface_tree_model.cpp b/ui/qt/interface_tree_model.cpp
index a6904182e1..8b23daead0 100644
--- a/ui/qt/interface_tree_model.cpp
+++ b/ui/qt/interface_tree_model.cpp
@@ -34,12 +34,12 @@
 
 #include "wsutil/filesystem.h"
 
-#include "qt_ui_utils.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
 
 /* Needed for the meta type declaration of QList<int>* */
-#include "sparkline_delegate.h"
+#include <ui/qt/sparkline_delegate.h>
 
 #ifdef HAVE_EXTCAP
 #include "extcap.h"
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index f652d564d8..b940e93bf4 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -30,14 +30,14 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
-#include "color_utils.h"
-#include "qcustomplot.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/widgets/qcustomplot.h>
 #include "progress_frame.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include <ui/qt/widgets/syntax_line_edit.h>
 #include <ui/qt/widgets/display_filter_edit.h>
 #include <ui/qt/widgets/field_filter_edit.h>
diff --git a/ui/qt/io_graph_dialog.ui b/ui/qt/io_graph_dialog.ui
index 6a3d4f4c3c..b2a69235b1 100644
--- a/ui/qt/io_graph_dialog.ui
+++ b/ui/qt/io_graph_dialog.ui
@@ -505,7 +505,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index 5b2a17427e..c4e39c55cb 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -26,7 +26,7 @@
 
 #include "file.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 52fff9ae96..0d6c9a89ab 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -26,7 +26,7 @@
 
 #include "file.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index e61c00287c..d5b2a6ff7f 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -28,7 +28,7 @@
 
 #include "file.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp
index 98fd108926..c355afa031 100644
--- a/ui/qt/lbm_uimflow_dialog.cpp
+++ b/ui/qt/lbm_uimflow_dialog.cpp
@@ -37,7 +37,7 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "sequence_diagram.h"
 #include "wireshark_application.h"
 
diff --git a/ui/qt/lbm_uimflow_dialog.ui b/ui/qt/lbm_uimflow_dialog.ui
index 66b378bdb6..7224b9eb9b 100644
--- a/ui/qt/lbm_uimflow_dialog.ui
+++ b/ui/qt/lbm_uimflow_dialog.ui
@@ -287,7 +287,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp
index 72abdd9ae3..f00f420470 100644
--- a/ui/qt/lte_mac_statistics_dialog.cpp
+++ b/ui/qt/lte_mac_statistics_dialog.cpp
@@ -31,8 +31,8 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
-#include "percent_bar_delegate.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/percent_bar_delegate.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 
diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp
index f3260395a5..f24ba4fb23 100644
--- a/ui/qt/lte_rlc_graph_dialog.cpp
+++ b/ui/qt/lte_rlc_graph_dialog.cpp
@@ -31,12 +31,12 @@
 #include <epan/tvbuff.h>
 #include <frame_tvbuff.h>
 
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 #include <QMenu>
 #include <QRubberBand>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 #include "simple_dialog.h"
 
diff --git a/ui/qt/lte_rlc_graph_dialog.h b/ui/qt/lte_rlc_graph_dialog.h
index 5ba5524072..51a004a3b3 100644
--- a/ui/qt/lte_rlc_graph_dialog.h
+++ b/ui/qt/lte_rlc_graph_dialog.h
@@ -25,7 +25,7 @@
 #include "wireshark_dialog.h"
 #include <ui/tap-rlc-graph.h>
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 
 class QMenu;
 class QRubberBand;
diff --git a/ui/qt/lte_rlc_graph_dialog.ui b/ui/qt/lte_rlc_graph_dialog.ui
index 9599916a65..eba63ae848 100644
--- a/ui/qt/lte_rlc_graph_dialog.ui
+++ b/ui/qt/lte_rlc_graph_dialog.ui
@@ -351,7 +351,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp
index 2f5176866a..32dfb51268 100644
--- a/ui/qt/lte_rlc_statistics_dialog.cpp
+++ b/ui/qt/lte_rlc_statistics_dialog.cpp
@@ -33,7 +33,7 @@
 #include <QPushButton>
 
 #include "lte_rlc_graph_dialog.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include "ui/recent.h"
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index a095f3909b..0e2bdd7479 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -32,14 +32,14 @@
 
 #include "ui/main_statusbar.h"
 #include "ui/profile.h"
-#include "ui/qt/qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 
 #include "capture_file.h"
 #include "main_status_bar.h"
 #include "profile_dialog.h"
-#include "stock_icon.h"
-#include "tango_colors.h"
+#include <ui/qt/utils/stock_icon.h>
+#include <ui/qt/utils/tango_colors.h>
 
 #include <QAction>
 #include <QHBoxLayout>
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 747d12acd0..0da1105e41 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -32,10 +32,9 @@
 
 #include "main_welcome.h"
 #include <ui_main_welcome.h>
-#include "tango_colors.h"
-
-#include "color_utils.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/tango_colors.h>
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index e306c95a5f..50c7cbc991 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -74,15 +74,15 @@ DIAG_ON(frame-larger-than=)
 #include "wireless_timeline.h"
 #include "proto_tree.h"
 #include "simple_dialog.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include "tap_parameter_dialog.h"
 #include "wireless_frame.h"
 #include "wireshark_application.h"
 
 #include <ui/qt/widgets/additional_toolbar.h>
-#include "variant_pointer.h"
+#include <ui/qt/utils/variant_pointer.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <ui/qt/widgets/drag_drop_toolbar.h>
 
diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp
index abc77f73f7..3a40e7033c 100644
--- a/ui/qt/main_window_preferences_frame.cpp
+++ b/ui/qt/main_window_preferences_frame.cpp
@@ -21,7 +21,7 @@
 
 #include "wireshark_application.h"
 #include "main_window_preferences_frame.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <ui_main_window_preferences_frame.h>
 #include "ui/language.h"
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 9eff2b3e1a..0c6dcbf710 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -87,7 +87,7 @@ DIAG_ON(frame-larger-than=)
 #include "ui/all_files_wildcard.h"
 #include "ui/qt/simple_dialog.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 #include <ui/qt/widgets/drag_drop_toolbar.h>
 
 #ifdef HAVE_SOFTWARE_UPDATE
@@ -103,7 +103,7 @@ DIAG_ON(frame-larger-than=)
 #ifdef HAVE_LIBPCAP
 #include "capture_interfaces_dialog.h"
 #endif
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "coloring_rules_dialog.h"
 #include "conversation_dialog.h"
 #include "conversation_colorize_action.h"
@@ -147,7 +147,7 @@ DIAG_ON(frame-larger-than=)
 #include "print_dialog.h"
 #include "profile_dialog.h"
 #include "protocol_hierarchy_dialog.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "resolved_addresses_dialog.h"
 #include "rpc_service_response_time_dialog.h"
 #include "rtp_stream_dialog.h"
@@ -158,7 +158,7 @@ DIAG_ON(frame-larger-than=)
 #include "sequence_dialog.h"
 #include "show_packet_bytes_dialog.h"
 #include "stats_tree_dialog.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include "supported_protocols_dialog.h"
 #include "tap_parameter_dialog.h"
 #include "tcp_stream_dialog.h"
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 19b0d312d9..c92d0a5b25 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -39,7 +39,7 @@
 #include "ui/ui_util.h"
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include "wireshark_application.h"
 
@@ -49,7 +49,7 @@
 
 #include "ui/capture_ui_utils.h"
 
-#include "ui/qt/path_chooser_delegate.h"
+#include <ui/qt/path_chooser_delegate.h>
 
 #include <QCheckBox>
 #include <QFileDialog>
diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 7b0fc88066..f7022e1246 100644
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -22,11 +22,11 @@
 #include "module_preferences_scroll_area.h"
 #include <ui_module_preferences_scroll_area.h>
 #include <ui/qt/widgets/syntax_line_edit.h>
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "uat_dialog.h"
 #include "wireshark_application.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <epan/prefs-int.h>
 
diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index 3affcc94b2..b97294f78e 100644
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -42,7 +42,7 @@
 #include "ui/capture_globals.h"
 #include "ui/simple_dialog.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QTextStream>
 
diff --git a/ui/qt/multicast_statistics_dialog.cpp b/ui/qt/multicast_statistics_dialog.cpp
index bfa689417b..9cea63db8a 100644
--- a/ui/qt/multicast_statistics_dialog.cpp
+++ b/ui/qt/multicast_statistics_dialog.cpp
@@ -26,7 +26,7 @@
 #include <QPushButton>
 #include <QTreeWidget>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include <ui/qt/widgets/syntax_line_edit.h>
 #include "wireshark_application.h"
 
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index e3e1e145a0..a05fe67b18 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -51,10 +51,10 @@
 #include <epan/color_filters.h>
 #include "frame_tvbuff.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include <ui/qt/widgets/overlay_scroll_bar.h>
 #include "proto_tree.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QAction>
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index 6d416d33bd..8907dffb9f 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -27,7 +27,7 @@
 #include "preferences_dialog.h"
 #include "proto_tree.h"
 #include "protocol_preferences_menu.h"
-#include "related_packet_delegate.h"
+#include <ui/qt/related_packet_delegate.h>
 
 #include <QMenu>
 #include <QTime>
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index 89928bb6f4..d2d5b2f15a 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -35,7 +35,7 @@
 #include <epan/color_filters.h>
 #include "frame_tvbuff.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "wireshark_application.h"
 
 #include <QColor>
diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index d3295af273..4268e3753b 100644
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include "ui/packet_range.h"
+#include <ui/packet_range.h>
 
 #include <ui/qt/widgets/syntax_line_edit.h>
 #include <QGroupBox>
diff --git a/ui/qt/percent_bar_delegate.cpp b/ui/qt/percent_bar_delegate.cpp
index 358650ee5d..5894060b9e 100644
--- a/ui/qt/percent_bar_delegate.cpp
+++ b/ui/qt/percent_bar_delegate.cpp
@@ -21,7 +21,7 @@
 
 #include "percent_bar_delegate.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QApplication>
 #include <QPainter>
diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp
index 3bdc552b6b..1b40adf1df 100644
--- a/ui/qt/preference_editor_frame.cpp
+++ b/ui/qt/preference_editor_frame.cpp
@@ -33,7 +33,7 @@
 #include "preference_editor_frame.h"
 #include <ui_preference_editor_frame.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include <wsutil/utf8_entities.h>
 
 #include "wireshark_application.h"
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 725f9d58dd..3592ca2e68 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -39,11 +39,11 @@
 #include <main_window.h>
 
 #include <ui/qt/widgets/syntax_line_edit.h>
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "uat_dialog.h"
 #include "wireshark_application.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QColorDialog>
 #include <QComboBox>
diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index 52132bd952..e586e9fa31 100644
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -25,16 +25,16 @@
 #include "wsutil/filesystem.h"
 #include "epan/prefs.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include "ui/profile.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include "profile_dialog.h"
 #include <ui_profile_dialog.h>
 #include "wireshark_application.h"
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QBrush>
 #include <QDir>
diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp
index a72c462d36..7b1184be86 100644
--- a/ui/qt/progress_frame.cpp
+++ b/ui/qt/progress_frame.cpp
@@ -31,7 +31,7 @@
 #include <QBoxLayout>
 #include <QPropertyAnimation>
 
-#include "stock_icon_tool_button.h"
+#include <ui/qt/widgets/stock_icon_tool_button.h>
 #include "wireshark_application.h"
 
 // To do:
diff --git a/ui/qt/progress_frame.ui b/ui/qt/progress_frame.ui
index f82e0d4ea6..d064cb0420 100644
--- a/ui/qt/progress_frame.ui
+++ b/ui/qt/progress_frame.ui
@@ -58,7 +58,7 @@
   <customwidget>
    <class>StockIconToolButton</class>
    <extends>QToolButton</extends>
-   <header>stock_icon_tool_button.h</header>
+   <header>widgets/stock_icon_tool_button.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index 177383d616..f30d1e83dd 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -26,9 +26,9 @@
 #include <epan/ftypes/ftypes.h>
 #include <epan/prefs.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QApplication>
 #include <QContextMenuEvent>
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index 2570508eb7..0db3b6f800 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -26,11 +26,11 @@
 
 #include "ui/proto_hier_stats.h"
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/protocol_hierarchy_dialog.h b/ui/qt/protocol_hierarchy_dialog.h
index 6814e59041..34d6304537 100644
--- a/ui/qt/protocol_hierarchy_dialog.h
+++ b/ui/qt/protocol_hierarchy_dialog.h
@@ -25,7 +25,7 @@
 #include <QMenu>
 
 #include "filter_action.h"
-#include "percent_bar_delegate.h"
+#include <ui/qt/percent_bar_delegate.h>
 #include "wireshark_dialog.h"
 
 class QPushButton;
diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp
index cd708bbcf9..7e67a986cc 100644
--- a/ui/qt/protocol_preferences_menu.cpp
+++ b/ui/qt/protocol_preferences_menu.cpp
@@ -33,7 +33,7 @@
 #include "protocol_preferences_menu.h"
 
 #include "enabled_protocols_dialog.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "uat_dialog.h"
 #include "wireshark_application.h"
 
diff --git a/ui/qt/related_packet_delegate.cpp b/ui/qt/related_packet_delegate.cpp
index 0107ea2264..042fe10cb8 100644
--- a/ui/qt/related_packet_delegate.cpp
+++ b/ui/qt/related_packet_delegate.cpp
@@ -22,7 +22,7 @@
 #include "related_packet_delegate.h"
 #include "packet_list_record.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QApplication>
 #include <QPainter>
diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
index 820c542879..0f90ae9321 100644
--- a/ui/qt/remote_capture_dialog.cpp
+++ b/ui/qt/remote_capture_dialog.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 #ifdef HAVE_PCAP_REMOTE
 #include <glib.h>
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/capture_globals.h"
 #include "remote_capture_dialog.h"
 #include <ui_remote_capture_dialog.h>
diff --git a/ui/qt/response_time_delay_dialog.cpp b/ui/qt/response_time_delay_dialog.cpp
index 4a381fc74f..bf8a014b59 100644
--- a/ui/qt/response_time_delay_dialog.cpp
+++ b/ui/qt/response_time_delay_dialog.cpp
@@ -28,7 +28,7 @@
 
 #include <QTreeWidget>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 static QHash<const QString, register_rtd_t *> cfg_str_to_rtd_;
diff --git a/ui/qt/rpc_service_response_time_dialog.cpp b/ui/qt/rpc_service_response_time_dialog.cpp
index 2a83be883c..2c33351af7 100644
--- a/ui/qt/rpc_service_response_time_dialog.cpp
+++ b/ui/qt/rpc_service_response_time_dialog.cpp
@@ -35,7 +35,7 @@
 #include <epan/guid-utils.h>
 #include <epan/srt_table.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QComboBox>
 #include <QHBoxLayout>
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 5d82e46772..486c67d620 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -43,10 +43,10 @@
 #include <QPushButton>
 #include <QTemporaryFile>
 
-#include "color_utils.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "rtp_player_dialog.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
 
 /*
diff --git a/ui/qt/rtp_analysis_dialog.ui b/ui/qt/rtp_analysis_dialog.ui
index 37066f22ac..e1f5c3fcee 100644
--- a/ui/qt/rtp_analysis_dialog.ui
+++ b/ui/qt/rtp_analysis_dialog.ui
@@ -459,7 +459,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index a4beb688d8..aa413b9cad 100644
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -28,11 +28,11 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "color_utils.h"
-#include "qcustomplot.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/widgets/qcustomplot.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "rtp_audio_stream.h"
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 #include <QAudio>
 #include <QAudioDeviceInfo>
@@ -44,7 +44,7 @@
 
 #include <QPushButton>
 
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
 
 // To do:
diff --git a/ui/qt/rtp_player_dialog.ui b/ui/qt/rtp_player_dialog.ui
index d0a5005336..56864e2c13 100644
--- a/ui/qt/rtp_player_dialog.ui
+++ b/ui/qt/rtp_player_dialog.ui
@@ -436,7 +436,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp
index 3933cf401e..ca6afaccbc 100644
--- a/ui/qt/rtp_stream_dialog.cpp
+++ b/ui/qt/rtp_stream_dialog.cpp
@@ -29,7 +29,7 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "rtp_analysis_dialog.h"
 #include "wireshark_application.h"
 
@@ -42,7 +42,7 @@
 #include <QTreeWidgetItem>
 #include <QTreeWidgetItemIterator>
 
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 /*
  * @file RTP stream dialog
diff --git a/ui/qt/sctp_all_assocs_dialog.cpp b/ui/qt/sctp_all_assocs_dialog.cpp
index 618f9d3d2b..f1182772b9 100644
--- a/ui/qt/sctp_all_assocs_dialog.cpp
+++ b/ui/qt/sctp_all_assocs_dialog.cpp
@@ -23,7 +23,7 @@
 #include <ui_sctp_all_assocs_dialog.h>
 #include "sctp_assoc_analyse_dialog.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 //#include "wireshark_application.h"
 #include "file.h"
 #include "ui/qt/main_window.h"
diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index 00f2e7097b..f1fe800cb8 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -24,7 +24,7 @@
 #include "sctp_assoc_analyse_dialog.h"
 #include <ui_sctp_assoc_analyse_dialog.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "sctp_graph_dialog.h"
 #include "sctp_graph_arwnd_dialog.h"
 #include "sctp_graph_byte_dialog.h"
diff --git a/ui/qt/sctp_graph_arwnd_dialog.cpp b/ui/qt/sctp_graph_arwnd_dialog.cpp
index 6487207854..a701934192 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.cpp
+++ b/ui/qt/sctp_graph_arwnd_dialog.cpp
@@ -30,7 +30,7 @@
 
 #include "ui/tap-sctp-analysis.h"
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 #include "sctp_graph_dialog.h"
 
 SCTPGraphArwndDialog::SCTPGraphArwndDialog(QWidget *parent, sctp_assoc_info_t *assoc, _capture_file *cf, int dir) :
diff --git a/ui/qt/sctp_graph_arwnd_dialog.ui b/ui/qt/sctp_graph_arwnd_dialog.ui
index e7a2ef0392..e077e1ac75 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.ui
+++ b/ui/qt/sctp_graph_arwnd_dialog.ui
@@ -99,7 +99,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/sctp_graph_byte_dialog.cpp b/ui/qt/sctp_graph_byte_dialog.cpp
index bbad1ccb72..39e4eb927e 100644
--- a/ui/qt/sctp_graph_byte_dialog.cpp
+++ b/ui/qt/sctp_graph_byte_dialog.cpp
@@ -29,7 +29,7 @@
 
 #include "ui/tap-sctp-analysis.h"
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 #include "sctp_graph_dialog.h"
 #include "sctp_assoc_analyse_dialog.h"
 
diff --git a/ui/qt/sctp_graph_byte_dialog.ui b/ui/qt/sctp_graph_byte_dialog.ui
index 4e0b78e087..0dfc1bd176 100644
--- a/ui/qt/sctp_graph_byte_dialog.ui
+++ b/ui/qt/sctp_graph_byte_dialog.ui
@@ -99,7 +99,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp
index 0e8c0f0c77..f1d35e36ef 100644
--- a/ui/qt/sctp_graph_dialog.cpp
+++ b/ui/qt/sctp_graph_dialog.cpp
@@ -35,7 +35,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 #include "wireshark_application.h"
 
 SCTPGraphDialog::SCTPGraphDialog(QWidget *parent, sctp_assoc_info_t *assoc, capture_file *cf, int dir) :
diff --git a/ui/qt/sctp_graph_dialog.ui b/ui/qt/sctp_graph_dialog.ui
index 2c2bd0dbbe..fff2eb6de0 100644
--- a/ui/qt/sctp_graph_dialog.ui
+++ b/ui/qt/sctp_graph_dialog.ui
@@ -129,7 +129,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp
index 0d85f9dc5c..0dd52c59b1 100644
--- a/ui/qt/sequence_diagram.cpp
+++ b/ui/qt/sequence_diagram.cpp
@@ -25,8 +25,8 @@
 
 #include "ui/tap-sequence-analysis.h"
 
-#include "color_utils.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QFont>
 #include <QFontMetrics>
diff --git a/ui/qt/sequence_diagram.h b/ui/qt/sequence_diagram.h
index 7a5a45f0c9..80b542a618 100644
--- a/ui/qt/sequence_diagram.h
+++ b/ui/qt/sequence_diagram.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QMultiMap>
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 
 struct _seq_analysis_info;
 struct _seq_analysis_item;
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 4033a14c2a..0d058fe556 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -28,9 +28,9 @@
 #include "wsutil/nstime.h"
 #include "wsutil/utf8_entities.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 #include "progress_frame.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "sequence_diagram.h"
 #include "wireshark_application.h"
 
diff --git a/ui/qt/sequence_dialog.h b/ui/qt/sequence_dialog.h
index 91abf40ff7..e6f0afef11 100644
--- a/ui/qt/sequence_dialog.h
+++ b/ui/qt/sequence_dialog.h
@@ -32,7 +32,7 @@
 
 #include "ui/tap-sequence-analysis.h"
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 #include "wireshark_dialog.h"
 
 #include <QMenu>
diff --git a/ui/qt/sequence_dialog.ui b/ui/qt/sequence_dialog.ui
index 223f6f833c..b726daa1d9 100644
--- a/ui/qt/sequence_dialog.ui
+++ b/ui/qt/sequence_dialog.ui
@@ -400,7 +400,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp
index 167a2b245e..7256666acc 100644
--- a/ui/qt/simple_dialog.cpp
+++ b/ui/qt/simple_dialog.cpp
@@ -25,7 +25,7 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QMessageBox>
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index a5d55b3f59..af1a76503e 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -27,7 +27,7 @@
 
 #include "ui/util.h"
 #include <wsutil/utf8_entities.h>
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 #ifdef HAVE_LUA
 #include "epan/wslua/init_wslua.h"
diff --git a/ui/qt/stats_tree_dialog.cpp b/ui/qt/stats_tree_dialog.cpp
index 3ac27a0a7e..e56d51cc84 100644
--- a/ui/qt/stats_tree_dialog.cpp
+++ b/ui/qt/stats_tree_dialog.cpp
@@ -25,9 +25,9 @@
 
 #include "epan/stats_tree_priv.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QHeaderView>
 #include <QMessageBox>
diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp
index 6b4888fc88..1ff231facd 100644
--- a/ui/qt/tap_parameter_dialog.cpp
+++ b/ui/qt/tap_parameter_dialog.cpp
@@ -46,7 +46,7 @@
 #include "wsutil/file_util.h"
 
 #include "progress_frame.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 #include <QClipboard>
diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp
index b57ef2b04f..baa50ed1b9 100644
--- a/ui/qt/tcp_stream_dialog.cpp
+++ b/ui/qt/tcp_stream_dialog.cpp
@@ -32,8 +32,8 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "tango_colors.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/tango_colors.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "progress_frame.h"
 #include "wireshark_application.h"
 
diff --git a/ui/qt/tcp_stream_dialog.h b/ui/qt/tcp_stream_dialog.h
index c36d536dec..328f922450 100644
--- a/ui/qt/tcp_stream_dialog.h
+++ b/ui/qt/tcp_stream_dialog.h
@@ -32,7 +32,7 @@
 
 #include "ui/tap-tcp-stream.h"
 
-#include "qcustomplot.h"
+#include <ui/qt/widgets/qcustomplot.h>
 #include <QDialog>
 #include <QMenu>
 #include <QRubberBand>
diff --git a/ui/qt/tcp_stream_dialog.ui b/ui/qt/tcp_stream_dialog.ui
index 6934c3447f..464eb179e1 100644
--- a/ui/qt/tcp_stream_dialog.ui
+++ b/ui/qt/tcp_stream_dialog.ui
@@ -643,7 +643,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>qcustomplot.h</header>
+   <header>widgets/qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
index b5f87ec4e3..ccd664a6f7 100644
--- a/ui/qt/time_shift_dialog.cpp
+++ b/ui/qt/time_shift_dialog.cpp
@@ -25,7 +25,7 @@
 #include "wireshark_application.h"
 
 #include <ui/time_shift.h>
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 
 TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
diff --git a/ui/qt/timeline_delegate.cpp b/ui/qt/timeline_delegate.cpp
index 2162da1030..887eff5645 100644
--- a/ui/qt/timeline_delegate.cpp
+++ b/ui/qt/timeline_delegate.cpp
@@ -21,7 +21,7 @@
 
 #include "timeline_delegate.h"
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QApplication>
 #include <QPainter>
diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp
index 06439a6096..eeaf7ed3f6 100644
--- a/ui/qt/uat_dialog.cpp
+++ b/ui/qt/uat_dialog.cpp
@@ -28,7 +28,7 @@
 #include "ui/help_url.h"
 #include <wsutil/report_message.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QDesktopServices>
 #include <QPushButton>
diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index 3faf542311..6f2fbfec67 100644
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.h
@@ -28,7 +28,7 @@
 
 #include "geometry_state_dialog.h"
 #include "uat_model.h"
-#include "uat_delegate.h"
+#include <ui/qt/uat_delegate.h>
 
 class QComboBox;
 class QPushButton;
diff --git a/ui/qt/uat_frame.cpp b/ui/qt/uat_frame.cpp
index ca330082fd..699af26aa5 100644
--- a/ui/qt/uat_frame.cpp
+++ b/ui/qt/uat_frame.cpp
@@ -30,7 +30,7 @@
 #include <ui/qt/widgets/display_filter_edit.h>
 #include "wireshark_application.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include <wsutil/report_message.h>
 
 #include <QLineEdit>
diff --git a/ui/qt/color_utils.cpp b/ui/qt/utils/color_utils.cpp
similarity index 96%
rename from ui/qt/color_utils.cpp
rename to ui/qt/utils/color_utils.cpp
index e63512fb65..907adc8afe 100644
--- a/ui/qt/color_utils.cpp
+++ b/ui/qt/utils/color_utils.cpp
@@ -19,9 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "color_utils.h"
-
-#include "tango_colors.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/tango_colors.h>
 
 // Colors we use in various parts of the UI.
 //
@@ -47,6 +46,11 @@ ColorUtils::ColorUtils(QObject *parent) :
 {
 }
 
+QColor ColorUtils::byteViewHoverColor(bool background)
+{
+	return QColor(background ? byte_view_hover_bg_ : byte_view_hover_fg_);
+}
+
 //
 // A color_t has RGB values in [0,65535].
 // Qt RGB colors have RGB values in [0,255].
diff --git a/ui/qt/color_utils.h b/ui/qt/utils/color_utils.h
similarity index 95%
rename from ui/qt/color_utils.h
rename to ui/qt/utils/color_utils.h
index 69a904d2f1..356c963539 100644
--- a/ui/qt/color_utils.h
+++ b/ui/qt/utils/color_utils.h
@@ -56,7 +56,7 @@ public:
     static const QList<QRgb> graphColors();
     static QRgb graphColor(int item);
     static QRgb sequenceColor(int item);
-    static QColor byteViewHoverColor(bool background) { return QColor(background ? byte_view_hover_bg_ : byte_view_hover_fg_); }
+    static QColor byteViewHoverColor(bool background);
 
 signals:
 
diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp
similarity index 99%
rename from ui/qt/qt_ui_utils.cpp
rename to ui/qt/utils/qt_ui_utils.cpp
index 023fc26816..46debbcd14 100644
--- a/ui/qt/qt_ui_utils.cpp
+++ b/ui/qt/utils/qt_ui_utils.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/range.h>
diff --git a/ui/qt/qt_ui_utils.h b/ui/qt/utils/qt_ui_utils.h
similarity index 100%
rename from ui/qt/qt_ui_utils.h
rename to ui/qt/utils/qt_ui_utils.h
diff --git a/ui/qt/stock_icon.cpp b/ui/qt/utils/stock_icon.cpp
similarity index 99%
rename from ui/qt/stock_icon.cpp
rename to ui/qt/utils/stock_icon.cpp
index 44f94d46c0..985c60b2ec 100644
--- a/ui/qt/stock_icon.cpp
+++ b/ui/qt/utils/stock_icon.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 
 // Stock icons. Based on gtk/stock_icons.h
 
diff --git a/ui/qt/stock_icon.h b/ui/qt/utils/stock_icon.h
similarity index 100%
rename from ui/qt/stock_icon.h
rename to ui/qt/utils/stock_icon.h
diff --git a/ui/qt/tango_colors.h b/ui/qt/utils/tango_colors.h
similarity index 100%
rename from ui/qt/tango_colors.h
rename to ui/qt/utils/tango_colors.h
diff --git a/ui/qt/variant_pointer.h b/ui/qt/utils/variant_pointer.h
similarity index 100%
rename from ui/qt/variant_pointer.h
rename to ui/qt/utils/variant_pointer.h
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index aa989eb8c4..ae57bcbb3e 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -29,10 +29,10 @@
 
 #include "ui/rtp_stream.h"
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "rtp_player_dialog.h"
 #include "sequence_dialog.h"
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 #include "wireshark_application.h"
 #include "voip_calls_info_model.h"
 
diff --git a/ui/qt/voip_calls_info_model.cpp b/ui/qt/voip_calls_info_model.cpp
index 144829411d..dbb691fe8b 100644
--- a/ui/qt/voip_calls_info_model.cpp
+++ b/ui/qt/voip_calls_info_model.cpp
@@ -21,7 +21,7 @@
 
 #include "voip_calls_info_model.h"
 #include <wsutil/utf8_entities.h>
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 #include <QDateTime>
 
diff --git a/ui/qt/voip_calls_info_model.h b/ui/qt/voip_calls_info_model.h
index 0f1e831565..835d38e76a 100644
--- a/ui/qt/voip_calls_info_model.h
+++ b/ui/qt/voip_calls_info_model.h
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "ui/voip_calls.h"
-#include "variant_pointer.h"
+#include <ui/qt/utils/variant_pointer.h>
 
 #include <QAbstractTableModel>
 #include <QSortFilterProxyModel>
diff --git a/ui/qt/widgets/additional_toolbar.cpp b/ui/qt/widgets/additional_toolbar.cpp
index c0abea68f7..3778d9542b 100644
--- a/ui/qt/widgets/additional_toolbar.cpp
+++ b/ui/qt/widgets/additional_toolbar.cpp
@@ -25,8 +25,8 @@
 
 #include <ui/qt/widgets/additional_toolbar.h>
 #include <ui/qt/widgets/apply_line_edit.h>
-#include <ui/qt/qt_ui_utils.h>
-#include <ui/qt/variant_pointer.h>
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/utils/variant_pointer.h>
 #include <ui/qt/wireshark_application.h>
 
 #include <QLabel>
diff --git a/ui/qt/widgets/apply_line_edit.cpp b/ui/qt/widgets/apply_line_edit.cpp
index 0dc1ea023b..12d64d7dfe 100644
--- a/ui/qt/widgets/apply_line_edit.cpp
+++ b/ui/qt/widgets/apply_line_edit.cpp
@@ -23,7 +23,7 @@
 
 #include <epan/prefs.h>
 
-#include <ui/qt/color_utils.h>
+#include <ui/qt/utils/color_utils.h>
 
 #include <QRegExp>
 #include <QRegExpValidator>
diff --git a/ui/qt/widgets/apply_line_edit.h b/ui/qt/widgets/apply_line_edit.h
index 7a983a657f..db73f89f6d 100644
--- a/ui/qt/widgets/apply_line_edit.h
+++ b/ui/qt/widgets/apply_line_edit.h
@@ -25,7 +25,7 @@
 #include <QLineEdit>
 #include <QString>
 
-#include <ui/qt/stock_icon_tool_button.h>
+#include <ui/qt/widgets/stock_icon_tool_button.h>
 
 class ApplyLineEdit : public QLineEdit
 {
diff --git a/ui/qt/widgets/capture_filter_combo.cpp b/ui/qt/widgets/capture_filter_combo.cpp
index 2f8ba301e8..e8c3bc41fc 100644
--- a/ui/qt/widgets/capture_filter_combo.cpp
+++ b/ui/qt/widgets/capture_filter_combo.cpp
@@ -21,13 +21,13 @@
 
 #include <stdio.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/recent_utils.h"
 #include "ui/recent.h"
 
 #include <epan/prefs.h>
 
-#include "capture_filter_combo.h"
+#include <ui/qt/widgets/capture_filter_combo.h>
 #include "wireshark_application.h"
 
 CaptureFilterCombo::CaptureFilterCombo(QWidget *parent, bool plain) :
diff --git a/ui/qt/widgets/capture_filter_combo.h b/ui/qt/widgets/capture_filter_combo.h
index cc90a534f8..def486b0ec 100644
--- a/ui/qt/widgets/capture_filter_combo.h
+++ b/ui/qt/widgets/capture_filter_combo.h
@@ -22,7 +22,7 @@
 #ifndef CAPTURE_FILTER_COMBO_H
 #define CAPTURE_FILTER_COMBO_H
 
-#include "capture_filter_edit.h"
+#include <ui/qt/widgets/capture_filter_edit.h>
 
 #include <QComboBox>
 #include <QList>
diff --git a/ui/qt/widgets/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp
index 41bc695865..a771e38809 100644
--- a/ui/qt/widgets/capture_filter_edit.cpp
+++ b/ui/qt/widgets/capture_filter_edit.cpp
@@ -31,10 +31,10 @@
 #include <ui/filter_files.h>
 #include <wsutil/utf8_entities.h>
 
-#include "capture_filter_edit.h"
+#include <ui/qt/widgets/capture_filter_edit.h>
 #include "capture_filter_syntax_worker.h"
 #include "filter_dialog.h"
-#include "stock_icon_tool_button.h"
+#include <ui/qt/widgets/stock_icon_tool_button.h>
 #include "wireshark_application.h"
 
 #include <QComboBox>
@@ -45,48 +45,12 @@
 #include <QStringListModel>
 #include <QStyleOptionFrame>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 
 // To do:
 // - This duplicates some DisplayFilterEdit code.
 // - We need simplified (button- and dropdown-free) versions for use in dialogs and field-only checking.
 
-
-#if defined(Q_OS_MAC) && 0
-// http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSImage_Class/Reference/Reference.html
-// http://www.virtualbox.org/svn/vbox/trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm
-
-class UIMiniCancelButton: public QAbstractButton
-{
-    Q_OBJECT;
-
-public:
-    UIMiniCancelButton(QWidget *pParent = 0);
-
-    void setText(const QString &strText) { m_pButton->setText(strText); }
-    void setToolTip(const QString &strTip) { m_pButton->setToolTip(strTip); }
-    void removeBorder() {}
-
-protected:
-    void paintEvent(QPaintEvent * /* pEvent */) {}
-    void resizeEvent(QResizeEvent *pEvent);
-
-private:
-    UICocoaButton *m_pButton;
-};
-
-UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */)
-  : QAbstractButton(pParent)
-{
-    setShortcut(QKeySequence(Qt::Key_Escape));
-    m_pButton = new UICocoaButton(UICocoaButton::CancelButton, this);
-    connect(m_pButton, SIGNAL(clicked()),
-            this, SIGNAL(clicked()));
-    setFixedSize(m_pButton->size());
-}
-
-#endif
-
 static const QString libpcap_primitive_chars_ = "-0123456789abcdefghijklmnopqrstuvwxyz";
 
 // grep '^[a-z].*return [A-Z].*;$' scanner.l | awk '{gsub(/\|/, "\n") ; print "    << \"" $1 "\""}' | sort
diff --git a/ui/qt/widgets/capture_filter_edit.h b/ui/qt/widgets/capture_filter_edit.h
index df3c1eb362..c917a9a748 100644
--- a/ui/qt/widgets/capture_filter_edit.h
+++ b/ui/qt/widgets/capture_filter_edit.h
@@ -24,7 +24,7 @@
 
 #include <QThread>
 #include <QToolButton>
-#include "syntax_line_edit.h"
+#include <ui/qt/widgets/syntax_line_edit.h>
 
 class CaptureFilterSyntaxWorker;
 class StockIconToolButton;
diff --git a/ui/qt/widgets/display_filter_combo.cpp b/ui/qt/widgets/display_filter_combo.cpp
index 52323756de..3e726cd5fd 100644
--- a/ui/qt/widgets/display_filter_combo.cpp
+++ b/ui/qt/widgets/display_filter_combo.cpp
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/recent_utils.h"
 #include "ui/recent.h"
 
@@ -30,8 +30,8 @@
 #include <QHelpEvent>
 #include <QStyleOptionComboBox>
 
-#include "display_filter_edit.h"
-#include "display_filter_combo.h"
+#include <ui/qt/widgets/display_filter_edit.h>
+#include <ui/qt/widgets/display_filter_combo.h>
 #include "wireshark_application.h"
 
 // If we ever add support for multiple windows this will need to be replaced.
diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp
index b590cb2ebd..22033087b0 100644
--- a/ui/qt/widgets/display_filter_edit.cpp
+++ b/ui/qt/widgets/display_filter_edit.cpp
@@ -29,10 +29,10 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "display_filter_edit.h"
+#include <ui/qt/widgets/display_filter_edit.h>
 #include "filter_dialog.h"
-#include "stock_icon_tool_button.h"
-#include "syntax_line_edit.h"
+#include <ui/qt/widgets/stock_icon_tool_button.h>
+#include <ui/qt/widgets/syntax_line_edit.h>
 
 #include <QAction>
 #include <QAbstractItemView>
@@ -52,41 +52,6 @@
 // - Add a separator or otherwise distinguish between recent items and fields
 //   in the completion dropdown.
 
-#if defined(Q_OS_MAC) && 0
-// http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSImage_Class/Reference/Reference.html
-// http://www.virtualbox.org/svn/vbox/trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm
-
-class UIMiniCancelButton: public QAbstractButton
-{
-    Q_OBJECT;
-
-public:
-    UIMiniCancelButton(QWidget *pParent = 0);
-
-    void setText(const QString &strText) { m_pButton->setText(strText); }
-    void setToolTip(const QString &strTip) { m_pButton->setToolTip(strTip); }
-    void removeBorder() {}
-
-protected:
-    void paintEvent(QPaintEvent * /* pEvent */) {}
-    void resizeEvent(QResizeEvent *pEvent);
-
-private:
-    UICocoaButton *m_pButton;
-};
-
-UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */)
-  : QAbstractButton(pParent)
-{
-    setShortcut(QKeySequence(Qt::Key_Escape));
-    m_pButton = new UICocoaButton(UICocoaButton::CancelButton, this);
-    connect(m_pButton, SIGNAL(clicked()),
-            this, SIGNAL(clicked()));
-    setFixedSize(m_pButton->size());
-}
-
-#endif
-
 #ifdef __APPLE__
 #define DEFAULT_MODIFIER UTF8_PLACE_OF_INTEREST_SIGN
 #else
diff --git a/ui/qt/widgets/elided_label.cpp b/ui/qt/widgets/elided_label.cpp
index eb33cbccac..aebc0e8fb0 100644
--- a/ui/qt/widgets/elided_label.cpp
+++ b/ui/qt/widgets/elided_label.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "elided_label.h"
+#include <ui/qt/widgets/elided_label.h>
 
 #include <QFontMetrics>
 #include <QResizeEvent>
diff --git a/ui/qt/widgets/field_filter_edit.cpp b/ui/qt/widgets/field_filter_edit.cpp
index 201e625a08..e8a8986fc0 100644
--- a/ui/qt/widgets/field_filter_edit.cpp
+++ b/ui/qt/widgets/field_filter_edit.cpp
@@ -29,10 +29,10 @@
 
 #include <wsutil/utf8_entities.h>
 
-#include "field_filter_edit.h"
+#include <ui/qt/widgets/field_filter_edit.h>
 #include "filter_dialog.h"
-#include "stock_icon_tool_button.h"
-#include "syntax_line_edit.h"
+#include <ui/qt/widgets/stock_icon_tool_button.h>
+#include <ui/qt/widgets/syntax_line_edit.h>
 
 #include <QAction>
 #include <QCompleter>
diff --git a/ui/qt/widgets/field_filter_edit.h b/ui/qt/widgets/field_filter_edit.h
index 072e7b23d9..a7afd77862 100644
--- a/ui/qt/widgets/field_filter_edit.h
+++ b/ui/qt/widgets/field_filter_edit.h
@@ -22,7 +22,7 @@
 #ifndef FIELDFILTEREDIT_H
 #define FIELDFILTEREDIT_H
 
-#include "syntax_line_edit.h"
+#include <ui/qt/widgets/syntax_line_edit.h>
 
 class QEvent;
 class StockIconToolButton;
diff --git a/ui/qt/widgets/find_line_edit.cpp b/ui/qt/widgets/find_line_edit.cpp
index 9ecf0235d7..c22fe2732b 100644
--- a/ui/qt/widgets/find_line_edit.cpp
+++ b/ui/qt/widgets/find_line_edit.cpp
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "find_line_edit.h"
-#include "color_utils.h"
+#include <ui/qt/widgets/find_line_edit.h>
+#include <ui/qt/utils/color_utils.h>
 #include "epan/prefs.h"
 
 #include <QAction>
diff --git a/ui/qt/widgets/follow_stream_text.cpp b/ui/qt/widgets/follow_stream_text.cpp
index e10cf9343f..be41a16bbc 100644
--- a/ui/qt/widgets/follow_stream_text.cpp
+++ b/ui/qt/widgets/follow_stream_text.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "follow_stream_text.h"
+#include <ui/qt/widgets/follow_stream_text.h>
 
 #include <wireshark_application.h>
 
diff --git a/ui/qt/widgets/interface_toolbar_lineedit.cpp b/ui/qt/widgets/interface_toolbar_lineedit.cpp
index 181bcb3be5..b8ed7bd337 100644
--- a/ui/qt/widgets/interface_toolbar_lineedit.cpp
+++ b/ui/qt/widgets/interface_toolbar_lineedit.cpp
@@ -21,10 +21,10 @@
 
 #include "config.h"
 
-#include "interface_toolbar_lineedit.h"
-#include "stock_icon_tool_button.h"
+#include <ui/qt/widgets/interface_toolbar_lineedit.h>
+#include <ui/qt/widgets/stock_icon_tool_button.h>
 #include "epan/prefs.h"
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QStyle>
 
diff --git a/ui/qt/widgets/label_stack.cpp b/ui/qt/widgets/label_stack.cpp
index 731a6f2ff5..66a688d627 100644
--- a/ui/qt/widgets/label_stack.cpp
+++ b/ui/qt/widgets/label_stack.cpp
@@ -19,14 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "label_stack.h"
+#include <ui/qt/widgets/label_stack.h>
 
 #include <QContextMenuEvent>
 #include <QPainter>
 #include <QMouseEvent>
 #include <QStyleOption>
 
-#include "tango_colors.h"
+#include <ui/qt/utils/tango_colors.h>
 
 /* Temporary message timeouts */
 const int temporary_interval_ = 1000;
diff --git a/ui/qt/widgets/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp
index b8b277d1ef..68f1ba0f56 100644
--- a/ui/qt/widgets/overlay_scroll_bar.cpp
+++ b/ui/qt/widgets/overlay_scroll_bar.cpp
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "overlay_scroll_bar.h"
+#include <ui/qt/widgets/overlay_scroll_bar.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QMouseEvent>
 #include <QPainter>
diff --git a/ui/qt/qcustomplot.cpp b/ui/qt/widgets/qcustomplot.cpp
similarity index 100%
rename from ui/qt/qcustomplot.cpp
rename to ui/qt/widgets/qcustomplot.cpp
diff --git a/ui/qt/qcustomplot.h b/ui/qt/widgets/qcustomplot.h
similarity index 100%
rename from ui/qt/qcustomplot.h
rename to ui/qt/widgets/qcustomplot.h
diff --git a/ui/qt/stock_icon_tool_button.cpp b/ui/qt/widgets/stock_icon_tool_button.cpp
similarity index 97%
rename from ui/qt/stock_icon_tool_button.cpp
rename to ui/qt/widgets/stock_icon_tool_button.cpp
index 71b365aa4a..d7c9166b50 100644
--- a/ui/qt/stock_icon_tool_button.cpp
+++ b/ui/qt/widgets/stock_icon_tool_button.cpp
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "stock_icon_tool_button.h"
+#include <ui/qt/widgets/stock_icon_tool_button.h>
 
-#include "stock_icon.h"
+#include <ui/qt/utils/stock_icon.h>
 
 #include <QApplication>
 #include <QEvent>
diff --git a/ui/qt/stock_icon_tool_button.h b/ui/qt/widgets/stock_icon_tool_button.h
similarity index 100%
rename from ui/qt/stock_icon_tool_button.h
rename to ui/qt/widgets/stock_icon_tool_button.h
diff --git a/ui/qt/widgets/syntax_line_edit.cpp b/ui/qt/widgets/syntax_line_edit.cpp
index 432ad3dc49..7a5e31ddd4 100644
--- a/ui/qt/widgets/syntax_line_edit.cpp
+++ b/ui/qt/widgets/syntax_line_edit.cpp
@@ -28,9 +28,9 @@
 #include <epan/dfilter/dfilter.h>
 #include <epan/column-info.h>
 
-#include "syntax_line_edit.h"
+#include <ui/qt/widgets/syntax_line_edit.h>
 
-#include "color_utils.h"
+#include <ui/qt/utils/color_utils.h>
 
 #include <QAbstractItemView>
 #include <QCompleter>
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index 67b40f2be8..74834f3e25 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -35,15 +35,14 @@
 #include <cmath>
 
 #include "globals.h"
-#include "color_utils.h"
 #include "../../log.h"
 #include <epan/dissectors/packet-ieee80211-radio.h>
 
 #include <epan/color_filters.h>
 #include "frame_tvbuff.h"
 
-#include "color_utils.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/color_utils.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 #include "wsutil/utf8_entities.h"
 
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 8414cb4502..5ad617f477 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -49,8 +49,8 @@
 #include "ui/simple_dialog.h"
 #include "ui/util.h"
 
-#include "qt_ui_utils.h"
-#include "color_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
+#include <ui/qt/utils/color_utils.h>
 #include "coloring_rules_dialog.h"
 
 #include "epan/color_filters.h"
diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index c7d8d5a5f2..53e62eab47 100644
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -30,7 +30,7 @@
 
 #include "wireshark_application.h"
 #include "wireshark_dialog.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "ui/recent.h"
 #include "ui/ui_util.h"
 
diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp
index 7a08b05c94..9ace1ee178 100644
--- a/ui/qt/wlan_statistics_dialog.cpp
+++ b/ui/qt/wlan_statistics_dialog.cpp
@@ -31,8 +31,8 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
-#include "percent_bar_delegate.h"
-#include "qt_ui_utils.h"
+#include <ui/qt/percent_bar_delegate.h>
+#include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
 
 // To do:
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 9ad4305686..333240b072 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -94,7 +94,7 @@
 #include "ui/capture_ui_utils.h"
 
 #include "ui/qt/conversation_dialog.h"
-#include "ui/qt/color_utils.h"
+#include "ui/qt/utils/color_utils.h"
 #include "ui/qt/coloring_rules_dialog.h"
 #include "ui/qt/endpoint_dialog.h"
 #include "ui/qt/main_window.h"