Move some headers for UI stuff, and the alert_box.c UI-specific file, to

the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

svn path=/trunk/; revision=40529

119 files changed, 824 insertions, 171 deletions

diff --git a/ui/alert_box.c b/ui/alert_box.c
new file mode 100644
index 0000000000..666759df0f
--- /dev/null
+++ b/ui/alert_box.c
@@ -0,0 +1,134 @@
+/* alert_box.c
+ * Routines to put up various "standard" alert boxes used in multiple
+ * places
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <string.h>
+
+#include <glib.h>
+
+#include <epan/filesystem.h>
+#include <epan/dfilter/dfilter.h>
+
+#include "alert_box.h"
+
+#include "simple_dialog.h"
+
+/*
+ * Alert box for general errors.
+ */
+void
+failure_alert_box(const char *msg_format, va_list ap)
+{
+  vsimple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, msg_format, ap);
+}
+
+/*
+ * Alert box for a failed attempt to open or create a file.
+ * "err" is assumed to be a UNIX-style errno; "for_writing" is TRUE if
+ * the file is being opened for writing and FALSE if it's being opened
+ * for reading.
+ *
+ * XXX - add explanatory secondary text for at least some of the errors;
+ * various HIGs suggest that you should, for example, suggest that the
+ * user remove files if the file system is full.  Perhaps that's because
+ * they're providing guidelines for people less sophisticated than the
+ * typical Wireshark user is, but....
+ */
+void
+open_failure_alert_box(const char *filename, int err, gboolean for_writing)
+{
+  simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                file_open_error_message(err, for_writing), filename);
+}
+
+/*
+ * Alert box for a failed attempt to read a file.
+ * "err" is assumed to be a UNIX-style errno.
+ */
+void
+read_failure_alert_box(const char *filename, int err)
+{
+  simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                "An error occurred while reading from the file \"%s\": %s.",
+                filename, g_strerror(err));
+}
+
+/*
+ * Alert box for a failed attempt to write to a file.
+ * "err" is assumed to be a UNIX-style errno if positive and a
+ * Wiretap error if negative.
+ *
+ * XXX - add explanatory secondary text for at least some of the errors;
+ * various HIGs suggest that you should, for example, suggest that the
+ * user remove files if the file system is full.  Perhaps that's because
+ * they're providing guidelines for people less sophisticated than the
+ * typical Wireshark user is, but....
+ */
+void
+write_failure_alert_box(const char *filename, int err)
+{
+  if (err < 0) {
+    switch (err) {
+
+    case WTAP_ERR_SHORT_WRITE:
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                    "A full write couldn't be done to the file \"%s\".",
+                    filename);
+      break;
+    
+    default:
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                    "An error occurred while writing to the file \"%s\": %s.",
+                    filename, wtap_strerror(err));
+      break;
+    }
+  } else {
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                  file_write_error_message(err), filename);
+  }
+}
+
+/*
+ * Alert box for an invalid display filter expression.
+ * Assumes "dfilter_error_msg" has been set by "dfilter_compile()" to the
+ * error message for the filter.
+ *
+ * XXX - should this have a "Help" button that pops up the display filter
+ * help?
+ */
+void
+bad_dfilter_alert_box(const char *dftext)
+{
+  simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, 
+                "%s%s%s\n"
+                "\n"
+                "The filter expression \"%s\" isn't a valid display filter.\n"
+                "See the help for a description of the display filter syntax.",
+                simple_dialog_primary_start(), dfilter_error_msg,
+                simple_dialog_primary_end(), dftext);
+}
diff --git a/ui/alert_box.h b/ui/alert_box.h
new file mode 100644
index 0000000000..53531e8455
--- /dev/null
+++ b/ui/alert_box.h
@@ -0,0 +1,70 @@
+/* alert_box.h
+ * Routines to put up various "standard" alert boxes used in multiple
+ * places
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __ALERT_BOX_H__
+#define __ALERT_BOX_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * Alert box for general errors.
+ */
+extern void failure_alert_box(const char *msg_format, va_list ap);
+
+/*
+ * Alert box for a failed attempt to open or create a file.
+ * "err" is assumed to be a UNIX-style errno; "for_writing" is TRUE if
+ * the file is being opened for writing and FALSE if it's being opened
+ * for reading.
+ */
+extern void open_failure_alert_box(const char *filename, int err,
+                                   gboolean for_writing);
+
+/*
+ * Alert box for a failed attempt to read a file.
+ * "err" is assumed to be a UNIX-style errno.
+ */
+extern void read_failure_alert_box(const char *filename, int err);
+
+/*
+ * Alert box for a failed attempt to write to a file.
+ * "err" is assumed to be a UNIX-style errno.
+ */
+extern void write_failure_alert_box(const char *filename, int err);
+
+/*
+ * Alert box for an invalid display filter expression.
+ * Assumes "dfilter_error_msg" has been set by "dfilter_compile()" to the
+ * error message for the filter.
+ */
+extern void bad_dfilter_alert_box(const char *dftext);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __ALERT_BOX_H__ */
diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index f0da6e1d6e..4548b07aa6 100644
--- a/ui/gtk/afp_stat.c
+++ b/ui/gtk/afp_stat.c
@@ -42,10 +42,11 @@
 #include <epan/dissectors/packet-afp.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index 0ab3d717fb..892374f610 100644
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -44,7 +44,7 @@
 
 #include <pcap.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index 9e2902fb8d..a31322f14a 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -41,7 +41,7 @@
 #include <epan/frequency-utils.h>
 #include <epan/crypt/airpdcap_ws.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c
index 8b1eccd9e8..926b4b7499 100644
--- a/ui/gtk/ansi_a_stat.c
+++ b/ui/gtk/ansi_a_stat.c
@@ -46,7 +46,8 @@
 #include <epan/dissectors/packet-ansi_a.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
index 893707bcbc..3af4ca7d05 100644
--- a/ui/gtk/ansi_map_stat.c
+++ b/ui/gtk/ansi_map_stat.c
@@ -45,7 +45,8 @@
 #include <epan/dissectors/packet-ansi_map.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c
index 5b4e9f7c6a..c0e440503e 100644
--- a/ui/gtk/bootp_stat.c
+++ b/ui/gtk/bootp_stat.c
@@ -34,9 +34,10 @@
 #include <epan/epan.h>
 #include <epan/tap.h>
 
-#include "../simple_dialog.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/tap_param_dlg.h"
diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c
index 66c3dd4d95..c8081859b7 100644
--- a/ui/gtk/camel_counter.c
+++ b/ui/gtk/camel_counter.c
@@ -44,7 +44,8 @@
 
 #include "../stat_menu.h"
 #include "../timestats.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
index 6b0546e728..5d946e1374 100644
--- a/ui/gtk/camel_srt.c
+++ b/ui/gtk/camel_srt.c
@@ -43,10 +43,11 @@
 #include <epan/camel-persistentdata.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 9e3b1dd174..f34abf48dd 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -45,11 +45,12 @@
 
 #include "../capture.h"
 #include "../capture_ifinfo.h"
-#include "../simple_dialog.h"
 #include "../capture-pcap-util.h"
 #include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 4a2a6c1ed7..6b28683979 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -40,15 +40,16 @@
 #include <epan/prefs.h>
 
 #include "../globals.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
 #include "../color.h"
-#include "../ui_util.h"
 #include "../color_filters.h"
 #include "../merge.h"
 #include "../util.h"
 #include <wsutil/file_util.h>
 
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/filter_dlg.h"
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index c941d121a2..a8b3562f26 100644
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/ui/gtk/capture_if_details_dlg_win32.c
@@ -39,7 +39,8 @@
 
 #include "../file.h"
 #include "../capture.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 40a3d34d1b..a6990954de 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -40,13 +40,14 @@
 #include <epan/prefs.h>
 
 #include "../capture_ifinfo.h"
-#include "../simple_dialog.h"
 #include "../capture.h"
 #include "../capture-pcap-util.h"
 #include "../capture_ui_utils.h"
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/simple_dialog.h"
+
 #ifdef _WIN32
 #include "ui/gtk/capture_if_details_dlg_win32.h"
 #endif
diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c
index 0f3ee92558..67cb3dc46d 100644
--- a/ui/gtk/color_dlg.c
+++ b/ui/gtk/color_dlg.c
@@ -37,7 +37,8 @@
 #include "../color.h"
 #include "../color_filters.h"
 #include "../file.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c
index 77cb2fa23e..c1fca7f77a 100644
--- a/ui/gtk/color_edit_dlg.c
+++ b/ui/gtk/color_edit_dlg.c
@@ -34,7 +34,8 @@
 
 #include "../color.h"
 #include "../color_filters.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c
index 7e2d9243ed..9013e9a0d4 100644
--- a/ui/gtk/color_utils.c
+++ b/ui/gtk/color_utils.c
@@ -31,7 +31,8 @@
 #include <gtk/gtk.h>
 
 #include "../color.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/color_utils.h"
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index ea487c4964..904a14f97e 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -57,9 +57,10 @@
 #include <epan/in_cksum.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
 #include "../timestats.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/help_dlg.h"
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index 5573b8162a..46fbf340d4 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -39,9 +39,10 @@
 #include <epan/tap.h>
 #include <epan/nstime.h>
 
-#include "../simple_dialog.h"
 #include "../globals.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/sat.h"
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/filter_utils.h"
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index e44b5bc20b..73b2643e7f 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -45,7 +45,8 @@
 #include <epan/dissectors/packet-dcerpc.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c
index 13d8131ccf..a50d3c45c0 100644
--- a/ui/gtk/decode_as_ber.c
+++ b/ui/gtk/decode_as_ber.c
@@ -32,7 +32,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/dissectors/packet-ber.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/decode_as_dlg.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/decode_as_dcerpc.c b/ui/gtk/decode_as_dcerpc.c
index 202e73a8a7..5b08716181 100644
--- a/ui/gtk/decode_as_dcerpc.c
+++ b/ui/gtk/decode_as_dcerpc.c
@@ -32,7 +32,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/decode_as_dlg.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index 8f954eeb3d..c50f7ee3d8 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -41,7 +41,7 @@
 
 #include <wsutil/file_util.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/decode_as_dlg.h"
diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c
index da690b5a01..d57ef5aaaf 100644
--- a/ui/gtk/dfilter_expr_dlg.c
+++ b/ui/gtk/dfilter_expr_dlg.c
@@ -47,7 +47,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
index 3c6733f588..2d95745168 100644
--- a/ui/gtk/diameter_stat.c
+++ b/ui/gtk/diameter_stat.c
@@ -43,10 +43,11 @@
 #include <epan/dissectors/packet-diameter.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 43e2fb664c..6c8cf92172 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -38,11 +38,12 @@
 
 #include "../util.h"
 #include "../file.h"
-#include "../simple_dialog.h"
 #ifdef HAVE_LIBPCAP
 #include "../capture.h"
 #endif
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/capture_file_dlg.h"
 #include "ui/gtk/drag_and_drop.h"
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 85fb78bcc4..5f8c54082f 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -39,9 +39,10 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/expert_comp_table.h"
diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c
index 153ff83b6c..ec96b437e9 100644
--- a/ui/gtk/expert_comp_table.c
+++ b/ui/gtk/expert_comp_table.c
@@ -41,7 +41,7 @@
 
 #include <epan/expert.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/expert_comp_table.h"
 #include "ui/gtk/filter_utils.h"
diff --git a/ui/gtk/export_object.c b/ui/gtk/export_object.c
index 7d34fbbcf5..f320ca091d 100644
--- a/ui/gtk/export_object.c
+++ b/ui/gtk/export_object.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
+#include <string.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -38,14 +38,17 @@
 #include <unistd.h>
 #endif
 
+#include <gtk/gtk.h>
+
 #include <epan/packet_info.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
 
-#include <../alert_box.h>
-#include <../simple_dialog.h>
 #include <wsutil/file_util.h>
 
+#include <ui/alert_box.h>
+#include <ui/simple_dialog.h>
+
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/file_dlg.h"
 #include "ui/gtk/gui_utils.h"
@@ -53,7 +56,6 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/export_object.h"
-#include <string.h>
 
 enum {
 	EO_PKT_NUM_COLUMN,
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index f31b6f6d63..974013ed28 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <ctype.h>
+#include <string.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -40,15 +41,13 @@
 #include <unistd.h>
 #endif
 
+#include <wsutil/file_util.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #if GTK_CHECK_VERSION(3,0,0)
 # include <gdk/gdkkeysyms-compat.h>
 #endif
-#include <wsutil/file_util.h>
-
-#include <string.h>
-
 
 #include <epan/filesystem.h>
 #include <epan/packet.h>
@@ -58,11 +57,12 @@
 #include <epan/dissectors/packet-ssl.h>
 #include <epan/dissectors/packet-ssl-utils.h>
 
-#include "../simple_dialog.h"
 #include "../isprint.h"
-#include "../alert_box.h"
-#include "../progress_dlg.h"
-#include "../ui_util.h"
+
+#include "ui/simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/progress_dlg.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/keys.h"
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c
index 362b0e41cf..05453b57ae 100644
--- a/ui/gtk/fc_stat.c
+++ b/ui/gtk/fc_stat.c
@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-fc.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index b5a77358a6..5e1f7013f9 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -43,8 +43,9 @@
 #include <gtk/gtk.h>
 
 #include "filters.h"
-#include "simple_dialog.h"
-#include "alert_box.h"
+
+#include "ui/simple_dialog.h"
+#include "ui/alert_box.h"
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/stock_icons.h"
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index 1684190587..50ca8b841b 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -36,7 +36,7 @@
 
 #include <epan/filesystem.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../fileset.h"
 
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 1349826b06..ddbb82812d 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -35,8 +35,8 @@
 #include <epan/proto.h>
 
 #include "../filters.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/filter_dlg.h"
diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index aa9e693e63..0332bb705e 100644
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -41,9 +41,11 @@
 #include <epan/filter_expressions.h>
 
 #include "../globals.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/filter_expression_save_dlg.h"
@@ -54,7 +56,7 @@
 #include "ui/gtk/filter_autocomplete.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/help_dlg.h"
-#include "ui_util.h"
+
 #include "main.h"
 
 #include "main_filter_toolbar.h"
diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c
index c690f16dab..7ff98efdd9 100644
--- a/ui/gtk/find_dlg.c
+++ b/ui/gtk/find_dlg.c
@@ -37,9 +37,9 @@
 #include <epan/prefs.h>
 
 #include "../globals.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/find_dlg.h"
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 72ffcfa405..431a8f0aac 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -57,8 +57,8 @@
 #include <epan/filesystem.h>
 #include <epan/dissectors/packet-ipv6.h>
 
-#include <../alert_box.h>
-#include <../simple_dialog.h>
+#include <ui/alert_box.h>
+#include <ui/simple_dialog.h>
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index f8b62adeae..8f34b0c259 100644
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -41,7 +41,7 @@
 #include <epan/strutil.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index cee99305db..dfc3a49084 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -46,8 +46,8 @@
 #include <epan/filesystem.h>
 #include <epan/tap.h>
 
-#include <../alert_box.h>
-#include <../simple_dialog.h>
+#include <ui/alert_box.h>
+#include <ui/simple_dialog.h>
 #include <../util.h>
 
 #include "gtkglobals.h"
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 6e08ae280c..6f01ec3f25 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -41,10 +41,10 @@
 #include <epan/prefs.h>
 #include <epan/charsets.h>
 
-#include <../alert_box.h>
+#include <ui/alert_box.h>
 #include <../isprint.h>
 #include <../print.h>
-#include <../simple_dialog.h>
+#include <ui/simple_dialog.h>
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index ada4f65b55..5738d1e65e 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -49,8 +49,8 @@
 #include <epan/charsets.h>
 
 #include "../file.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 #include "../tempfile.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index a25f569d1d..6b26321f46 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -37,7 +37,7 @@
 #include <epan/strutil.h>
 #include <epan/tap.h>
 
-#include <../simple_dialog.h>
+#include <ui/simple_dialog.h>
 
 #include "gtkglobals.h"
 #include "ui/gtk/follow_stream.h"
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index 693087ed44..4af1a8877b 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -40,7 +40,7 @@
 #include <wsutil/unicode-utils.h>
 #endif
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/recent.h"
diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
index afc1bb9871..7d089f575e 100644
--- a/ui/gtk/funnel_stat.c
+++ b/ui/gtk/funnel_stat.c
@@ -53,10 +53,10 @@
 #include <epan/funnel.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
-#include "../progress_dlg.h"
+#include "ui/progress_dlg.h"
 #include "../color_filters.h"
 
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index a014c02895..567f535f7c 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -32,8 +32,8 @@
 #include <epan/proto.h>
 
 #include "../globals.h"
-#include "../simple_dialog.h"
-#include "../ui_util.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/goto_dlg.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 158430d22f..9d749f16bf 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -52,8 +52,8 @@
 #include <epan/filesystem.h>
 
 #include "../util.h"
-#include "../simple_dialog.h"
-#include "../alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/alert_box.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c
index 5f39e516d7..e9e503711b 100644
--- a/ui/gtk/gsm_a_stat.c
+++ b/ui/gtk/gsm_a_stat.c
@@ -46,7 +46,7 @@
 #include <epan/dissectors/packet-gsm_a_common.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c
index 4da736065b..5f272fab14 100644
--- a/ui/gtk/gsm_map_stat.c
+++ b/ui/gtk/gsm_map_stat.c
@@ -47,7 +47,7 @@
 #include <epan/dissectors/packet-gsm_map.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c
index ba095c760d..7eb6b1d37c 100644
--- a/ui/gtk/gtp_stat.c
+++ b/ui/gtk/gtp_stat.c
@@ -42,7 +42,7 @@
 #include <epan/dissectors/packet-gtp.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c
index 8ae18b69eb..db94cbf79d 100644
--- a/ui/gtk/gui_stat_util.c
+++ b/ui/gtk/gui_stat_util.c
@@ -36,7 +36,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 
 #include "ui/gtk/gui_stat_util.h"
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index f21c95b42b..5a35348fa9 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -41,7 +41,7 @@
 #include "epan/epan.h"
 
 #include <epan/packet_info.h>
-#include "../ui_util.h"
+#include "ui/ui_util.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c
index bd988947de..019db0fe6a 100644
--- a/ui/gtk/h225_counter.c
+++ b/ui/gtk/h225_counter.c
@@ -42,7 +42,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-h225.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
index 2f2974ee6e..202b3101dc 100644
--- a/ui/gtk/h225_ras_srt.c
+++ b/ui/gtk/h225_ras_srt.c
@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-h225.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c
index 43f647412b..9a8fc011a6 100644
--- a/ui/gtk/help_dlg.c
+++ b/ui/gtk/help_dlg.c
@@ -35,7 +35,7 @@
 #include "epan/filesystem.h"
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/text_page_utils.h"
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 923262777e..ae691e9438 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -49,8 +49,8 @@
 
 #include <wsutil/file_util.h>
 
-#include "../simple_dialog.h"
-#include "../alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/alert_box.h"
 #include "../tempfile.h"
 
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index cbd48671ce..814f4673f8 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -66,10 +66,10 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "../progress_dlg.h"
+#include "ui/progress_dlg.h"
 #include "../tempfile.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index a19e1f75d6..c42860af57 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -45,8 +45,8 @@
 #include <epan/strutil.h>
 
 #include "../stat_menu.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c
index ce24391b22..a31f70a647 100644
--- a/ui/gtk/ldap_stat.c
+++ b/ui/gtk/ldap_stat.c
@@ -41,7 +41,7 @@
 #include <epan/dissectors/packet-ldap.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index 0989132eac..5326f4a6c4 100644
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -47,7 +47,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-mac-lte.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
 
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 0362df3e98..f79d94a4ed 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -92,18 +92,18 @@
 #include "../color.h"
 #include "../color_filters.h"
 #include "../print.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
 #include "../register.h"
 #include "../ringbuffer.h"
-#include "../ui_util.h"
+#include "ui/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 "ui/alert_box.h"
 #include "../log.h"
 #include "../u3.h"
 #include <wsutil/file_util.h>
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index e10072f966..8a702ad0fb 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -47,9 +47,9 @@
 #include <epan/filesystem.h>
 
 #include "../print.h"
-#include "../ui_util.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+#include "ui/ui_util.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
 #include "../color_filters.h"
 #include "../stat_menu.h"
 #include "../u3.h"
diff --git a/ui/gtk/main_proto_draw.c b/ui/gtk/main_proto_draw.c
index d431b941ac..daa50f4952 100644
--- a/ui/gtk/main_proto_draw.c
+++ b/ui/gtk/main_proto_draw.c
@@ -55,10 +55,10 @@
 #include <epan/filesystem.h>
 
 #include "../isprint.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
-#include "../progress_dlg.h"
-#include "../ui_util.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/progress_dlg.h"
+#include "ui/ui_util.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/keys.h"
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index a52abfd69d..4937c3a69e 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -46,6 +46,8 @@
 #include "../capture.h"
 #endif
 
+#include "ui/main_statusbar.h"
+
 #include "ui/gtk/recent.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/main_statusbar_private.h"
@@ -58,8 +60,6 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/menus.h"
 
-#include "main_statusbar.h"
-
 /*
  * The order below defines the priority of info bar contexts.
  */
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index b80c663d7d..3b7f0aff99 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -41,9 +41,11 @@
 #include "capture_opts.h"
 #include "capture_ui_utils.h"
 #endif
-#include "simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/color_utils.h"
 #include "ui/gtk/recent.h"
diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c
index 9ac030fe3b..6003ad0c92 100644
--- a/ui/gtk/manual_addr_resolv.c
+++ b/ui/gtk/manual_addr_resolv.c
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 
 #include "epan/addr_resolv.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c
index 8a562e7959..61b67b19bc 100644
--- a/ui/gtk/mcast_stream.c
+++ b/ui/gtk/mcast_stream.c
@@ -54,8 +54,8 @@
 #include <epan/tap.h>
 #include <epan/strutil.h>
 
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/mcast_stream.h"
 #include "ui/gtk/mcast_stream_dlg.h"
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index b746cdf1ee..d242e81c8f 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -45,7 +45,7 @@
 
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/mcast_stream_dlg.h"
 #include "ui/gtk/mcast_stream.h"
diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c
index b05159b7d1..9f55c4c381 100644
--- a/ui/gtk/megaco_stat.c
+++ b/ui/gtk/megaco_stat.c
@@ -45,7 +45,7 @@
 #include <epan/prefs-int.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c
index aa1834af06..e8b370618d 100644
--- a/ui/gtk/mgcp_stat.c
+++ b/ui/gtk/mgcp_stat.c
@@ -42,7 +42,7 @@
 #include "epan/dissectors/packet-mgcp.h"
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c
index ddd1a8aa2e..9b0d4d298d 100644
--- a/ui/gtk/mtp3_stat.c
+++ b/ui/gtk/mtp3_stat.c
@@ -46,7 +46,7 @@
 #include <epan/dissectors/packet-mtp3.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c
index c83d3d0d9c..e20a579d87 100644
--- a/ui/gtk/ncp_stat.c
+++ b/ui/gtk/ncp_stat.c
@@ -41,7 +41,7 @@
 #include <epan/dissectors/packet-ncp-int.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c
index d8df054b10..3cea65cb54 100644
--- a/ui/gtk/new_packet_list.c
+++ b/ui/gtk/new_packet_list.c
@@ -42,10 +42,10 @@
 #include "epan/prefs.h"
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
-#include "../ui_util.h"
-#include "../progress_dlg.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+#include "ui/ui_util.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
 #include "epan/emem.h"
 #include "globals.h"
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 989a3ff7e1..9f3e5f6cd0 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -38,7 +38,9 @@
 #include <glib.h>
 
 #include "packet_list_store.h"
-#include "ui_util.h"
+
+#include "ui/progress_dlg.h"
+#include "ui/ui_util.h"
 
 #include <epan/epan_dissect.h>
 #include <epan/column_info.h>
@@ -50,8 +52,6 @@
 
 #include "globals.h"
 
-#include "../progress_dlg.h"
-
 static void packet_list_init(PacketList *pkg_tree);
 static void packet_list_class_init(PacketListClass *klass);
 static void packet_list_tree_model_init(GtkTreeModelIface *iface);
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 44e504e339..f07f9e0d23 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -60,9 +60,9 @@
 
 #include "../file.h"
 #include "../print.h"
-#include "../ui_util.h"
+#include "ui/ui_util.h"
 #include "../summary.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c
index 49d17df033..b4c0aca5b7 100644
--- a/ui/gtk/pixmap_save.c
+++ b/ui/gtk/pixmap_save.c
@@ -33,7 +33,7 @@
 
 #include <epan/filesystem.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/pixmap_save.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index a5a5bbd44d..07e8dbfa44 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -33,7 +33,7 @@
 
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../capture_ifinfo.h"
 #include "../capture_ui_utils.h"
 
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index e519456b57..41205f3e93 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -38,7 +38,7 @@
 
 #include "../file.h"
 #include "../print.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/prefs_column.h"
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index fd3ab2fc5d..c35dd1d09b 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -31,7 +31,7 @@
 
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/prefs_gui.h"
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c
index c8427740e7..7ed2320086 100644
--- a/ui/gtk/prefs_layout.c
+++ b/ui/gtk/prefs_layout.c
@@ -30,7 +30,7 @@
 
 #include <epan/prefs.h>
 
-#include "../ui_util.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/prefs_layout.h"
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 63f7c30a39..fe58106716 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -35,8 +35,8 @@
 #include <epan/filesystem.h>
 
 #include "../print.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 #include "../util.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index 362caa94f0..7575a43941 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -38,7 +38,7 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c
index 1d007eaf24..ac07c0403e 100644
--- a/ui/gtk/progress_dlg.c
+++ b/ui/gtk/progress_dlg.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../progress_dlg.h"
+#include "ui/progress_dlg.h"
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index 4e67e4bdef..ced69ad8d0 100644
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -38,7 +38,7 @@
 #include <epan/filesystem.h>
 
 #include "../util.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../disabled_protos.h"
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c
index 21e95790e7..34c8dfe71b 100644
--- a/ui/gtk/proto_hier_stats_dlg.c
+++ b/ui/gtk/proto_hier_stats_dlg.c
@@ -32,7 +32,7 @@
 #include <gtk/gtk.h>
 
 #include "../proto_hier_stats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/proto_hier_stats_dlg.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c
index 0c07503b4b..73f0aae8f3 100644
--- a/ui/gtk/radius_stat.c
+++ b/ui/gtk/radius_stat.c
@@ -42,7 +42,7 @@
 #include <epan/dissectors/packet-radius.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c
index f32e6061ac..ded2a9e86a 100644
--- a/ui/gtk/range_utils.c
+++ b/ui/gtk/range_utils.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 
 #include "../globals.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../packet-range.h"
 
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/recent.c b/ui/gtk/recent.c
index 0a891df25d..c1b62a72f6 100644
--- a/ui/gtk/recent.c
+++ b/ui/gtk/recent.c
@@ -41,7 +41,7 @@
 #include <epan/prefs-int.h>
 #include <epan/column.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../u3.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index fb8b8058c6..0a822be525 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -46,7 +46,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rlc-lte.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
 
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index b4b6ddfc9c..9d5ae80248 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-rpc.h>
 
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 1d647056ab..f64c069ec2 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -64,10 +64,10 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "../progress_dlg.h"
+#include "ui/progress_dlg.h"
 #include "../tempfile.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index e0f3f76da4..e7cdad7573 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -70,7 +70,7 @@
 #include <epan/prefs.h>
 
 #include "../globals.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../codecs/G711a/G711adecode.h"
 #include "../codecs/G711u/G711udecode.h"
 
diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c
index 2d96a10d93..5498e0d68d 100644
--- a/ui/gtk/rtp_stream.c
+++ b/ui/gtk/rtp_stream.c
@@ -48,8 +48,8 @@
 #include <epan/addr_resolv.h>
 
 #include "../globals.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
 #include "../tap-rtp-common.h"
 #include <wsutil/file_util.h>
 
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 977e616ae0..23217b89a3 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -41,7 +41,7 @@
 
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/rtp_stream_dlg.h"
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c
index 4e4fe8658a..e8b0caa92c 100644
--- a/ui/gtk/scsi_stat.c
+++ b/ui/gtk/scsi_stat.c
@@ -46,7 +46,7 @@
 #include <epan/dissectors/packet-scsi-smc.h>
 #include <epan/dissectors/packet-scsi-osd.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../globals.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 27e1352294..8c897744b6 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -33,7 +33,7 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 6be366fbbb..729ada15f9 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -35,8 +35,8 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../ui_util.h"
-#include "../simple_dialog.h"
+#include "ui/ui_util.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
index 6c7d86c7c0..eb93e6a771 100644
--- a/ui/gtk/sctp_chunk_stat.c
+++ b/ui/gtk/sctp_chunk_stat.c
@@ -42,7 +42,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sctp.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
index cca516785a..64c459e686 100644
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@@ -31,7 +31,7 @@
 #include "epan/filesystem.h"
 
 #include "../globals.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index 149fe9ce71..c29a7a06ef 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -36,8 +36,8 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../ui_util.h"
-#include "../simple_dialog.h"
+#include "ui/ui_util.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c
index 1f4cf849a1..1680e11f7a 100644
--- a/ui/gtk/sctp_stat.c
+++ b/ui/gtk/sctp_stat.c
@@ -36,7 +36,7 @@
 #include "epan/address.h"
 #include <epan/strutil.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/sctp_stat.h"
diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c
index 61392e9d60..eba87ca521 100644
--- a/ui/gtk/service_response_time_table.c
+++ b/ui/gtk/service_response_time_table.c
@@ -33,7 +33,7 @@
 
 #include "epan/packet_info.h"
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/filter_utils.h"
diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c
index 3504195dc1..c18028f1ad 100644
--- a/ui/gtk/simple_dialog.c
+++ b/ui/gtk/simple_dialog.c
@@ -31,7 +31,7 @@
 
 #include <epan/strutil.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c
index f8a68dd641..4b60c79ec4 100644
--- a/ui/gtk/sip_stat.c
+++ b/ui/gtk/sip_stat.c
@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sip.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../globals.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
index fa1eb626f7..eed4fc86d7 100644
--- a/ui/gtk/smb2_stat.c
+++ b/ui/gtk/smb2_stat.c
@@ -40,7 +40,7 @@
 #include <epan/dissectors/packet-smb2.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c
index 8502448308..eeded06c88 100644
--- a/ui/gtk/smb_stat.c
+++ b/ui/gtk/smb_stat.c
@@ -40,7 +40,7 @@
 #include <epan/dissectors/packet-smb.h>
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index 250db6b87f..96158c2e65 100644
--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@@ -33,7 +33,7 @@
 #include <epan/stats_tree_priv.h>
 #include <epan/report_err.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../globals.h"
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c
index 731d778fee..0b9a66ec50 100644
--- a/ui/gtk/tap_param_dlg.c
+++ b/ui/gtk/tap_param_dlg.c
@@ -38,7 +38,7 @@
 
 #include <epan/stat_cmd_args.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 4085cb31dc..584ee25344 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -52,7 +52,7 @@
 #include <epan/tap.h>
 
 #include "../globals.h"
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c
index 753e7e296d..3242244d37 100644
--- a/ui/gtk/text_page_utils.c
+++ b/ui/gtk/text_page_utils.c
@@ -35,7 +35,7 @@
 
 #include "epan/filesystem.h"
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/text_page_utils.h"
diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
index 51d8db68f6..e4f36fde70 100644
--- a/ui/gtk/time_shift_dlg.c
+++ b/ui/gtk/time_shift_dlg.c
@@ -40,9 +40,11 @@
 #include <epan/prefs.h>
 
 #include "../globals.h"
-#include "../alert_box.h"
-#include "../simple_dialog.h"
-#include "../main_statusbar.h"
+
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/time_shift_dlg.h"
@@ -51,7 +53,6 @@
 #include "ui/gtk/prefs_dlg.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/help_dlg.h"
-#include "ui_util.h"
 
 /* Capture callback data keys */
 #define E_TIMESHIFT_SELECT          "timeshift_select"
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index cec92c1d91..2cdb382f24 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -62,9 +62,9 @@
 #include <epan/dissectors/packet-iax2.h>
 #include <epan/rtp_pt.h>
 
-#include "../alert_box.h"
-#include "../simple_dialog.h"
-#include "../ui_util.h"
+#include "ui/alert_box.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/voip_calls.h"
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index d037b06d32..d7dbaef78d 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -56,6 +56,8 @@
 #include "../globals.h"
 #include "../stat_menu.h"
 
+#include "ui/simple_dialog.h"
+
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/voip_calls_dlg.h"
 #include "ui/gtk/voip_calls.h"
@@ -65,8 +67,6 @@
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/stock_icons.h"
 
-#include "simple_dialog.h"
-
 #ifdef HAVE_LIBPORTAUDIO
 #include "ui/gtk/rtp_analysis.h"
 #include "ui/gtk/rtp_player.h"
diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c
index 6ffaf61d8a..0ba94be124 100644
--- a/ui/gtk/webbrowser.c
+++ b/ui/gtk/webbrowser.c
@@ -75,7 +75,7 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 #include "ui/gtk/webbrowser.h"
 
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index ca61f793e5..eb7aa7f3ec 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -40,7 +40,7 @@
 #include <epan/dissectors/packet-ieee80211.h>
 #include <epan/strutil.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c
index edcf1cf841..620441032f 100644
--- a/ui/gtk/wsp_stat.c
+++ b/ui/gtk/wsp_stat.c
@@ -36,7 +36,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-wsp.h>
 
-#include "../simple_dialog.h"
+#include "ui/simple_dialog.h"
 #include "../globals.h"
 #include "../stat_menu.h"
 
diff --git a/ui/main_statusbar.h b/ui/main_statusbar.h
new file mode 100644
index 0000000000..9647a2ed62
--- /dev/null
+++ b/ui/main_statusbar.h
@@ -0,0 +1,71 @@
+/* main_statusbar.h
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __MAIN_STATUSBAR_H__
+#define __MAIN_STATUSBAR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+void profile_bar_update(void);
+void packets_bar_update(void);
+void status_expert_update(void);
+
+/** Push a formatted message referring to the currently-selected field
+ * onto the statusbar.
+ *
+ * @param msg_format The format string for the message
+ */
+void statusbar_push_field_msg(const gchar *msg_format, ...)
+    G_GNUC_PRINTF(1, 2);
+
+/** Pop a message referring to the currently-selected field off the statusbar.
+ */
+void statusbar_pop_field_msg(void);
+
+/** Push a formatted message referring to the current filter onto the
+ * statusbar.
+ *
+ * @param msg_format The format string for the message
+ */
+void statusbar_push_filter_msg(const gchar *msg_format, ...)
+    G_GNUC_PRINTF(1, 2);
+
+/** Pop a message referring to the current filter off the statusbar.
+ */
+void statusbar_pop_filter_msg(void);
+
+/** Push a formatted temporary message onto the statusbar. The message
+ * is automatically removed at a later interval.
+ *
+ * @param msg_format The format string for the message
+ */
+void statusbar_push_temporary_msg(const gchar *msg_format, ...)
+    G_GNUC_PRINTF(1, 2);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __MAIN_STATUSBAR_H__ */
diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h
new file mode 100644
index 0000000000..638c8a3cca
--- /dev/null
+++ b/ui/progress_dlg.h
@@ -0,0 +1,102 @@
+/* progress_dlg.h
+ * Definitions for progress dialog box routines
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __PROGRESS_DLG_H__
+#define __PROGRESS_DLG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/** @file
+ *  Progress (modal) dialog box routines.
+ *  @ingroup dialog_group
+ */
+
+/** Progress dialog data. */
+struct progdlg;
+
+/** Progress dialog data. */
+typedef struct progdlg progdlg_t;
+
+/**
+ * Create and pop up the progress dialog. Allocates a "progdlg_t"
+ * and initialize it to contain all information the implementation
+ * needs in order to manipulate the dialog, and return a pointer to
+ * it.
+ *
+ * @param task_title the task to do, e.g. "Loading"
+ * @param item_title the item to do, e.g. "capture.cap"
+ * @param terminate_is_stop TRUE if the operation can't be cancelled, just
+ *   stopped (i.e., it has a "Stop" button and clicking it doesn't undo
+ *   anything already done), FALSE if it can
+ * @param stop_flag a pointer to a Boolean variable that will be
+ *   set to TRUE if the user hits that button
+ * @return the newly created progress dialog
+ */
+progdlg_t *create_progress_dlg(const gchar *task_title, const gchar *item_title,
+    gboolean terminate_is_stop, gboolean *stop_flag);
+
+/**
+ * Create a progress dialog, but only if it's not likely to disappear
+ * immediately. This can be disconcerting for the user.
+ *
+ * @param task_title the task to do, e.g. "Loading"
+ * @param item_title the item to do, e.g. "capture.cap"
+ * @param terminate_is_stop TRUE if the operation can't be cancelled, just
+ *   stopped (i.e., it has a "Stop" button and clicking it doesn't undo
+ *   anything already done), FALSE if it can
+ * @param stop_flag a pointer to a Boolean variable that will be
+ *   set to TRUE if the user hits that button
+ * @param start_time a pointer to a GTimeVal structure which holds
+ *   the time at which the caller started to process the data
+ * @param progress the current progress (0..1)
+ * @return the newly created progress dialog
+ */
+progdlg_t *
+delayed_create_progress_dlg(const gchar *task_title, const gchar *item_title,
+    gboolean terminate_is_stop, gboolean *stop_flag,
+    const GTimeVal *start_time, gfloat progress);
+
+/**
+ * Update the progress information of the progress dialog box.
+ *
+ * @param dlg the progress dialog from create_progress_dlg()
+ * @param percentage the current percentage value (0..1)
+ * @param status the new status string to show, e.g. "3000KB of 6000KB"
+ */
+void update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status);
+
+/**
+ * Destroy the progress bar.
+ *
+ * @param dlg the progress dialog from create_progress_dlg()
+ */
+void destroy_progress_dlg(progdlg_t *dlg);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __PROGRESS_DLG_H__ */
diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h
new file mode 100644
index 0000000000..7687b4e77b
--- /dev/null
+++ b/ui/simple_dialog.h
@@ -0,0 +1,168 @@
+/* simple_dialog.h
+ * Definitions for alert box routines with toolkit-independent APIs but
+ * toolkit-dependent implementations.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __DIALOG_H__
+#define __DIALOG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/** @file
+ *  Simple dialog box.
+ *  @ingroup dialog_group
+ */
+
+
+/** Dialog types. */
+typedef enum {
+    ESD_TYPE_INFO,          /**< tells the user something they should know, but not requiring
+                                    any action; the only button should be "OK" */
+    ESD_TYPE_WARN,          /**< tells the user about a problem; the only button should be "OK" */
+    ESD_TYPE_CONFIRMATION,  /**< asks the user for confirmation; there should be more than
+                                    one button */
+    ESD_TYPE_ERROR,         /**< tells the user about a serious problem; the only button should be "OK" */
+    ESD_TYPE_STOP           /**< tells the user a stop action is in progress, there should be no button */
+} ESD_TYPE_E;
+
+/** display no buttons at all */
+#define ESD_BTN_NONE   0x00
+/** display an "Ok" button */
+#define ESD_BTN_OK     0x01
+/** display a "Cancel" button */
+#define ESD_BTN_CANCEL 0x02
+/** display a "Yes" button */
+#define ESD_BTN_YES    0x04
+/** display a "No" button */
+#define ESD_BTN_NO     0x08
+/** display a "Clear" button */
+#define ESD_BTN_CLEAR  0x10
+/** display a "Save" button */
+#define ESD_BTN_SAVE   0x20
+/** display a "Continue without Saving" button */
+#define ESD_BTN_DONT_SAVE 0x40
+/** display a "Quit without Saving" button */
+#define ESD_BTN_QUIT_DONT_SAVE 0x80
+
+/** Standard button combination "Ok" + "Cancel". */
+#define ESD_BTNS_OK_CANCEL	(ESD_BTN_OK|ESD_BTN_CANCEL)
+/** Standard button combination "Yes" + "No". */
+#define ESD_BTNS_YES_NO		(ESD_BTN_YES|ESD_BTN_NO)
+/** Standard button combination "Yes" + "No" + "Cancel". */
+#define ESD_BTNS_YES_NO_CANCEL	(ESD_BTN_YES|ESD_BTN_NO|ESD_BTN_CANCEL)
+/** Standard button combination "No" + "Cancel" + "Save". */
+#define ESD_BTNS_SAVE_DONTSAVE_CANCEL (ESD_BTN_DONT_SAVE|ESD_BTN_CANCEL|ESD_BTN_SAVE)
+/** Standard button combination "Quit without saving" + "Cancel" + "Save". */
+#define ESD_BTNS_SAVE_QUIT_DONTSAVE_CANCEL (ESD_BTN_QUIT_DONT_SAVE|ESD_BTN_CANCEL|ESD_BTN_SAVE)
+/** Standard button combination "Quit without saving" + "Cancel". */
+#define ESD_BTNS_QUIT_DONTSAVE_CANCEL (ESD_BTN_QUIT_DONT_SAVE|ESD_BTN_CANCEL)
+
+/** Create and show a simple dialog.
+ *
+ * @param type type of dialog
+ * @param btn_mask the buttons to display
+ * @param msg_format printf like message format
+ * @param ... printf like parameters
+ * @return the newly created dialog
+ */
+extern gpointer simple_dialog(ESD_TYPE_E type, gint btn_mask,
+    const gchar *msg_format, ...)
+    G_GNUC_PRINTF(3, 4);
+
+/** Create and show a simple dialog using a va_list.
+ *
+ * @param type type of dialog
+ * @param btn_mask the buttons to display
+ * @param msg_format printf like message format
+ * @param ap parameters
+ * @return the newly created dialog
+ */
+extern gpointer vsimple_dialog(ESD_TYPE_E type, gint btn_mask,
+   const gchar *msg_format, va_list ap);
+
+/** Callback function type for simple_dialog_set_cb() */
+typedef void (* simple_dialog_cb_t) (gpointer dialog, gint btn, gpointer data);
+
+/** Set the callback function for the dialog, called when a button was pressed.
+ *
+ * @param dialog the dialog from simple_dialog()
+ * @param callback_fct the callback function to set
+ * @param data data to be passed to the callback function
+ */
+extern void simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fct, gpointer data);
+
+/** Close the dialog, useful for "no button" dialogs.
+ *
+ * @param dialog the dialog to close from simple_dialog()
+ */
+extern void simple_dialog_close(gpointer dialog);
+
+/** Add a check button to the dialog (e.g. "Don't show this message again")
+ *
+ * @param dialog the dialog from simple_dialog()
+ * @param text the text to display
+ */
+extern void simple_dialog_check_set(gpointer dialog, gchar *text);
+
+/** Get the check buttons state.
+ *
+ * @param dialog the dialog from simple_dialog()
+ * @return current button state (TRUE is checked)
+ */
+extern gboolean simple_dialog_check_get(gpointer dialog);
+
+/** Surround the primary dialog message text by
+ *  simple_dialog_primary_start() and simple_dialog_primary_end().
+ *  To highlight the first sentence (will take effect on GTK2 only).
+ */
+extern char *simple_dialog_primary_start(void);
+/** Surround the primary dialog message text by
+ *  simple_dialog_primary_start() and simple_dialog_primary_end().
+ *  To highlight the first sentence (will take effect on GTK2 only).
+ */
+extern char *simple_dialog_primary_end(void);
+
+/** Escape the message text, if it probably contains Pango escape sequences.
+ *  For example html like tags starting with a <.
+ *
+ * @param msg the string to escape
+ * @return the escaped message text, must be freed with g_free() later
+ */
+extern char *simple_dialog_format_message(const char *msg);
+
+/**
+ * Display all queued messages.
+ * If a routine is called to display a dialog before there are any windows
+ * open, information to use to display the dialog is queued up.  This
+ * routine should be called once there are windows open, so that the queued
+ * up dialogs are displayed on top of those windows.
+ */
+extern void display_queued_messages(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __DIALOG_H__ */
diff --git a/ui/ui_util.h b/ui/ui_util.h
new file mode 100644
index 0000000000..cd023a32a7
--- /dev/null
+++ b/ui/ui_util.h
@@ -0,0 +1,81 @@
+/* ui_util.h
+ * Declarations of UI utility routines; these routines have GUI-independent
+ * APIs, but GUI-dependent implementations, so that they can be called by
+ * GUI-independent code to affect the GUI.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __UI_UTIL_H__
+#define __UI_UTIL_H__
+
+#include "epan/packet_info.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* gui_utils.c */
+
+/* Set the name of the top-level window and its icon. */
+void set_main_window_name(const gchar *);
+/* Update the name of the main window if the user-specified decoration
+   changed. */
+void update_main_window_title(void);
+/* update the main window */
+extern void main_window_update(void);
+/* exit the main window */
+extern void main_window_exit(void);
+/* quit a nested main window */
+extern void main_window_nested_quit(void);
+/* quit the main window */
+extern void main_window_quit(void);
+
+/* read from a pipe (callback) */
+typedef gboolean (*pipe_input_cb_t) (gint source, gpointer user_data);
+/* install callback function, called if pipe input is available */
+extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb);
+
+/* packet_list.c */
+
+void new_packet_list_clear(void);
+void new_packet_list_freeze(void);
+void new_packet_list_recreate_visible_rows(void);
+void new_packet_list_thaw(void);
+void new_packet_list_next(void);
+void new_packet_list_prev(void);
+guint new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo);
+frame_data * new_packet_list_get_row_data(gint row);
+void new_packet_list_set_selected_row(gint row);
+void new_packet_list_enable_color(gboolean enable);
+void new_packet_list_queue_draw(void);
+void new_packet_list_select_first_row(void);
+void new_packet_list_select_last_row(void);
+void new_packet_list_moveto_end(void);
+gboolean new_packet_list_check_end(void);
+gboolean new_packet_list_select_row_from_data(frame_data *fdata_needle);
+void new_packet_list_resize_column(gint col);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __UI_UTIL_H__ */