Restructure the recent file code so that recent.c is GUI-independent;

move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

svn path=/trunk/; revision=40561

41 files changed, 124 insertions, 209 deletions

diff --git a/Makefile.common b/Makefile.common
index e403085549..5fc71f32fb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -158,6 +158,7 @@ wireshark_SOURCES =	\
 	g711.c \
 	merge.c	\
 	proto_hier_stats.c	\
+	recent.c	\
 	summary.c	\
 	tempfile.c	\
 	u3.c
@@ -178,6 +179,8 @@ wireshark_INCLUDES =	\
 	ui/main_statusbar.h	\
 	merge.h	\
 	ui/progress_dlg.h	\
+	ui/recent.h	\
+	ui/recent_utils.h	\
 	proto_hier_stats.h	\
 	ui/simple_dialog.h	\
 	stat_menu.h	\
diff --git a/ui/gtk/recent.c b/recent.c
index c1b62a72f6..02e6216ab7 100644
--- a/ui/gtk/recent.c
+++ b/recent.c
@@ -26,13 +26,11 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-
-#ifndef QT_GUI_LIB
-#include <gtk/gtk.h>
-#endif
+#include <errno.h>
 
 #include <epan/epan.h>
 #include <epan/filesystem.h>
@@ -40,27 +38,17 @@
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 #include <epan/column.h>
+#include <epan/timestamp.h>
 
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
-#include "../u3.h"
-#include <wsutil/file_util.h>
+#include "ui/ui_util.h"
 
-#include "ui/gtk/recent.h"
-#ifndef QT_GUI_LIB
-#include "ui/gtk/main.h"
-#include "ui/gtk/menus.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/new_packet_list.h"
-#include "ui/gtk/file_dlg.h"
-#include "ui/gtk/cfilter_combo_utils.h"
+#include "u3.h"
 
-#ifdef HAVE_PCAP_REMOTE
-#include "ui/gtk/capture_dlg.h"
-#endif
-#else /* QT_GUI_LIB */
-#include "qt_ui_utils.h"
-#include "../file.h"
-#endif /* QT_GUI_LIB */
+#include <wsutil/file_util.h>
 
 #define RECENT_KEY_MAIN_TOOLBAR_SHOW        "gui.toolbar_main_show"
 #define RECENT_KEY_FILTER_TOOLBAR_SHOW      "gui.filter_toolbar_show"
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index 3e19ee8eea..d50c7d3a74 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -131,7 +131,6 @@ WIRESHARK_GTK_SRC = \
 	proto_help.c	\
 	proto_hier_stats_dlg.c	\
 	range_utils.c	\
-	recent.c	\
 	rtp_player.c	\
 	rtp_stream.c	\
 	sctp_byte_graph_dlg.c	\
@@ -324,7 +323,6 @@ noinst_HEADERS = \
 	proto_help.h	\
 	proto_hier_stats_dlg.h	\
 	range_utils.h \
-	recent.h	\
 	remote_icons.h	\
 	rtp_analysis.h	\
 	rtp_player.h 	\
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 379d54599e..a7b7197abd 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -43,6 +43,8 @@
 #include "../log.h"
 #include "../version_info.h"
 
+#include "ui/last_open_dir.h"
+
 #include "ui/gtk/about_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index f34abf48dd..cb5ece2f51 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -49,6 +49,7 @@
 #include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h
index c782596504..70478a3cfd 100644
--- a/ui/gtk/capture_dlg.h
+++ b/ui/gtk/capture_dlg.h
@@ -179,25 +179,6 @@ void
 activate_monitor (GtkTreeViewColumn *tree_column, GtkCellRenderer *renderer,
                   GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);
 
-#ifdef HAVE_PCAP_REMOTE
-#define RECENT_KEY_REMOTE_HOST "recent.remote_host"
-
-/** Write all remote hosts to the recent file
- *
- * @param rf recent file
- */
-void
-capture_remote_combo_recent_write_all(FILE *rf);
-
-/** Add a new remote host from the recent file
- *
- * @param s string with hostname,port,auth_type
- * @return TRUE if correctly added
- */
-gboolean
-capture_remote_combo_add_recent(gchar *s);
-#endif
-
 gboolean
 dlg_window_present(void);
 
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 019aca7b4e..11b0304757 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -47,6 +47,8 @@
 #include <wsutil/file_util.h>
 
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
@@ -60,7 +62,6 @@
 #include "ui/gtk/drag_and_drop.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/new_packet_list.h"
 #ifdef HAVE_LIBPCAP
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index a6990954de..e67b57b79e 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -46,6 +46,7 @@
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #ifdef _WIN32
@@ -55,7 +56,6 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c
index 67cfcff6bf..9abed9c5c1 100644
--- a/ui/gtk/cfilter_combo_utils.c
+++ b/ui/gtk/cfilter_combo_utils.c
@@ -31,10 +31,12 @@
 
 #include <gtk/gtk.h>
 
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+
 #include "ui/gtk/main.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/cfilter_combo_utils.h"
-#include "ui/gtk/recent.h"
 
 
 /* XXX: use a preference for this setting! */
diff --git a/ui/gtk/cfilter_combo_utils.h b/ui/gtk/cfilter_combo_utils.h
index f07f770222..88cc07b007 100644
--- a/ui/gtk/cfilter_combo_utils.h
+++ b/ui/gtk/cfilter_combo_utils.h
@@ -29,11 +29,7 @@
  *  Capture filter combo box routines
  */
 
-extern void cfilter_combo_recent_write_all(FILE *rf);
-extern gboolean cfilter_combo_add_recent(gchar *s);
-
 #define E_CFILTER_CM_KEY          "capture_filter_combo"
 #define E_CFILTER_FL_KEY          "capture_filter_list"
-#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
 
 #endif /* __CFILTER_COMBO_UTILS_H__ */
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 6c8cf92172..bce668a27b 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -42,6 +42,7 @@
 #include "../capture.h"
 #endif
 
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 30e6105d7c..14c214cd16 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -57,9 +57,11 @@
 
 #include "../isprint.h"
 
-#include "ui/simple_dialog.h"
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
 
 #include "ui/gtk/keys.h"
@@ -73,7 +75,6 @@
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/export_sslkeys.h"
 
 #ifdef _WIN32
diff --git a/ui/gtk/file_dlg.h b/ui/gtk/file_dlg.h
index 87dd8d4d8d..9303f61958 100644
--- a/ui/gtk/file_dlg.h
+++ b/ui/gtk/file_dlg.h
@@ -99,12 +99,6 @@ extern void file_selection_set_extra_widget(GtkWidget *fs, GtkWidget *extra);
 extern void
 file_selection_browse(GtkWidget *file_bt, GtkWidget *file_te, const char *title, file_selection_action_t action);
 
-/** Get the latest opened directory.
- *
- * @return the dirname
- */
-extern char *get_last_open_dir(void);
-
 /** Set the latest opened directory.
  *  Will already be done when using file_selection_new().
  *
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 431a8f0aac..106094350a 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -58,7 +58,9 @@
 #include <epan/dissectors/packet-ipv6.h>
 
 #include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
 #include <ui/simple_dialog.h>
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 32c12ccbfd..5d97ff0b78 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -41,10 +41,13 @@
 #include <epan/prefs.h>
 #include <epan/charsets.h>
 
-#include <ui/alert_box.h>
 #include <../isprint.h>
 #include <../print.h>
+
+#include <ui/alert_box.h>
+#include <ui/last_open_dir.h>
 #include <ui/simple_dialog.h>
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/color_utils.h"
diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
index 4af1a8877b..b02bbd965e 100644
--- a/ui/gtk/font_utils.c
+++ b/ui/gtk/font_utils.c
@@ -40,10 +40,10 @@
 #include <wsutil/unicode-utils.h>
 #endif
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main_proto_draw.h"
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 9d749f16bf..ca890caacd 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -52,8 +52,12 @@
 #include <epan/filesystem.h>
 
 #include "../util.h"
-#include "ui/simple_dialog.h"
+
 #include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
@@ -62,7 +66,6 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/graph_analysis.h"
-#include "ui/gtk/recent.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 5a35348fa9..1c2ce3595d 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -41,13 +41,15 @@
 #include "epan/epan.h"
 
 #include <epan/packet_info.h>
+
+#include "ui/recent.h"
 #include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index 9720a2a0d6..e57b910467 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -25,6 +25,8 @@
 #ifndef __GUI_UTILS_H__
 #define __GUI_UTILS_H__
 
+#include "ui/ui_util.h"
+
 /** @defgroup windows_group Windows
  *
  * There are the following toplevel windows:
@@ -158,20 +160,6 @@ extern void window_cancel_button_cb(GtkWidget *w _U_, gpointer data);
  */
 extern gboolean window_delete_event_cb(GtkWidget *win, GdkEvent *event _U_, gpointer user_data _U_);
 
-/** geometry values for use in window_get_geometry() and window_set_geometry() */
-typedef struct window_geometry_s {
-    gchar       *key;           /**< current key in hashtable (internally used only) */
-    gboolean    set_pos;        /**< set the x and y position values */
-    gint        x;              /**< the windows x position */
-    gint        y;              /**< the windows y position */
-    gboolean    set_size;       /**< set the width and height values */
-    gint        width;          /**< the windows width */
-    gint        height;         /**< the windows height */
-
-    gboolean    set_maximized;  /**< set the maximized state (GTK2 only) */
-    gboolean    maximized;      /**< the windows maximized state (GTK2 only) */
-} window_geometry_t;
-
 /** Get the geometry of a window.
  *
  * @param win the window from window_new()
@@ -187,21 +175,6 @@ extern void window_get_geometry(GtkWidget *win, window_geometry_t *geom);
  */
 extern void window_set_geometry(GtkWidget *win, window_geometry_t *geom);
 
-/** Write all geometry values of all windows to the recent file.
- * Will call write_recent_geom() for every existing window type.
- *
- * @param rf recent file handle from caller
- */
-extern void window_geom_recent_write_all(gpointer rf);
-
-/** Read in a single geometry key value pair from the recent file.
- *
- * @param name the geom_name of the window
- * @param key the subkey of this pair (e.g. "x")
- * @param value the new value (e.g. "123")
- */
-extern void window_geom_recent_read_pair(const char *name, const char *key, const char *value);
-
 /** Raise a top-level window and de-iconify it.
  *  This routine is used if the user has done something to
  *  ask that a window of a certain type be popped up when there can be only
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 814f4673f8..a1908ad4fe 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -66,11 +66,14 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "ui/progress_dlg.h"
 #include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index f79d94a4ed..4fc410154e 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -92,20 +92,24 @@
 #include "../color.h"
 #include "../color_filters.h"
 #include "../print.h"
-#include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
 #include "../register.h"
 #include "../ringbuffer.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 "ui/alert_box.h"
 #include "../log.h"
 #include "../u3.h"
+
+#include "ui/alert_box.h"
+#include "ui/main_statusbar.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #ifdef HAVE_LIBPCAP
@@ -148,7 +152,6 @@
 #include "ui/gtk/packet_win.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/find_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/follow_tcp.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/about_dlg.h"
diff --git a/ui/gtk/main.h b/ui/gtk/main.h
index f944ab2bb6..47a6599b06 100644
--- a/ui/gtk/main.h
+++ b/ui/gtk/main.h
@@ -301,22 +301,10 @@ extern void find_next_mark_cb(GtkWidget *widget, gpointer data, int action);
  */
 extern void find_prev_mark_cb(GtkWidget *widget, gpointer data, int action);
 
-/** Add a display filter coming from the user's recent file to the dfilter combo box.
- *
- * @param dftext the filter string
- */
-extern gboolean dfilter_combo_add_recent(gchar *dftext);
-
 #if 0
 /** Empty out the combobox entry field */
 extern void dfilter_combo_add_empty(void);
 #endif
-/** Write all non empty display filters (until maximum count)
- *  of the combo box GList to the user's recent file.
- *
- * @param rf the recent file
- */
-extern void dfilter_recent_combo_write_all(FILE *rf);
 
 /** Quit the program.
  *
diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c
index 43054bdf71..3b0531898a 100644
--- a/ui/gtk/main_filter_toolbar.c
+++ b/ui/gtk/main_filter_toolbar.c
@@ -34,6 +34,9 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+
+#include "ui/recent.h"
+
 #include "ui/gtk/old-gtk-compat.h"
 
 #include "filter_dlg.h"
@@ -44,7 +47,6 @@
 #include "keys.h"
 #include "gtkglobals.h"
 #include "stock_icons.h"
-#include "recent.h"
 
 #include "main.h"
 #include "menus.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 8a702ad0fb..c6729ab5c6 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -47,13 +47,15 @@
 #include <epan/filesystem.h>
 
 #include "../print.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"
 
+#include "ui/ui_util.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
+#include "ui/main_statusbar.h"
+
 #include "ui/gtk/about_dlg.h"
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
@@ -80,7 +82,6 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/main_proto_draw.h"
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/main_proto_draw.c b/ui/gtk/main_proto_draw.c
index 9b9b757f93..788ce29803 100644
--- a/ui/gtk/main_proto_draw.c
+++ b/ui/gtk/main_proto_draw.c
@@ -55,10 +55,14 @@
 #include <epan/filesystem.h>
 
 #include "../isprint.h"
+
 #include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
+#include "ui/last_open_dir.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/simple_dialog.h"
 #include "ui/ui_util.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/keys.h"
@@ -73,7 +77,6 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
 #include "ui/gtk/main_proto_draw.h"
-#include "ui/gtk/recent.h"
 
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 4937c3a69e..f8dbe9f50d 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -47,8 +47,8 @@
 #endif
 
 #include "ui/main_statusbar.h"
+#include "ui/recent.h"
 
-#include "ui/gtk/recent.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/main_statusbar_private.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index 1a0616a72d..a834953ca3 100644
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -38,6 +38,8 @@
 
 #include "../color_filters.h"
 
+#include "ui/recent.h"
+
 #ifdef HAVE_LIBPCAP
 #include "ui/gtk/capture_dlg.h"
 #include "ui/gtk/capture_if_dlg.h"
@@ -55,7 +57,6 @@
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/keys.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/packet_history.h"
 #include "ui/gtk/new_packet_list.h"
 
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 3b7f0aff99..1983a874b8 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -44,11 +44,11 @@
 
 #include <wsutil/file_util.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/color_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
diff --git a/ui/gtk/menus.h b/ui/gtk/menus.h
index 845cf69d7b..27940cbc06 100644
--- a/ui/gtk/menus.h
+++ b/ui/gtk/menus.h
@@ -29,10 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* Add a new recent capture filename to the "Recent Files" submenu
-   (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
-
 /* Open a file(name)
    (will not ask to close existing capture file!) */
 extern void menu_open_filename(gchar *cf_name);
@@ -42,11 +38,6 @@ extern void menu_open_filename(gchar *cf_name);
  *  @ingroup main_window_group
  */
 
-/** Write all recent capture filenames to the user's recent file.
- * @param rf recent file
- */
-extern void menu_recent_file_write_all(FILE *rf);
-
 /** User pushed a recent file submenu item.
  *
  * @param widget parent widget
diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c
index 3cea65cb54..913127957a 100644
--- a/ui/gtk/new_packet_list.c
+++ b/ui/gtk/new_packet_list.c
@@ -35,25 +35,28 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
-#include "gui_utils.h"
-#include "packet_list_store.h"
-#include "ui/gtk/new_packet_list.h"
-#include "epan/column_info.h"
-#include "epan/prefs.h"
+#include <epan/column_info.h>
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
-#include "ui/ui_util.h"
+#include <epan/column.h>
+#include <epan/strutil.h>
+#include <epan/emem.h>
+
+#include "ui/main_statusbar.h"
 #include "ui/progress_dlg.h"
+#include "ui/recent.h"
+#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
-#include "ui/main_statusbar.h"
-#include "epan/emem.h"
+#include "ui/ui_util.h"
+
+#include "gui_utils.h"
+#include "packet_list_store.h"
+#include "ui/gtk/new_packet_list.h"
 #include "globals.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/packet_history.h"
-#include "epan/column.h"
-#include "epan/strutil.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/menus.h"
 #include "color.h"
diff --git a/ui/gtk/new_packet_list.h b/ui/gtk/new_packet_list.h
index b25bdf76f9..70cf706b4b 100644
--- a/ui/gtk/new_packet_list.h
+++ b/ui/gtk/new_packet_list.h
@@ -31,8 +31,6 @@
  *  @ingroup main_window_group
  */
 
-#define RECENT_KEY_COL_WIDTH                "column.width"
-
 typedef enum {
   COLUMN_SELECTED_SORT_ASCENDING,
   COLUMN_SELECTED_SORT_DESCENDING,
@@ -135,12 +133,6 @@ typedef enum {
  */
 void new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
 
-/** Write all packet list geometry values to the recent file.
- *
- *  @param rf recent file handle from caller
- */
-extern void new_packet_list_recent_write_all(FILE *rf);
-
 GtkWidget * new_packet_list_get_widget(void);
 void new_packet_list_colorize_packets(void);
 
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index f07f9e0d23..9b35d3da17 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -60,9 +60,11 @@
 
 #include "../file.h"
 #include "../print.h"
-#include "ui/ui_util.h"
 #include "../summary.h"
+
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
 
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/main.h"
@@ -71,7 +73,6 @@
 #include "ui/gtk/keys.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
 
 #define BV_SIZE 75
 #define TV_SIZE 95
diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c
index b4c0aca5b7..faaf05f43c 100644
--- a/ui/gtk/pixmap_save.c
+++ b/ui/gtk/pixmap_save.c
@@ -33,6 +33,7 @@
 
 #include <epan/filesystem.h>
 
+#include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/pixmap_save.h"
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index c35dd1d09b..953de9c684 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -31,6 +31,7 @@
 
 #include <epan/prefs.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/prefs_gui.h"
@@ -45,7 +46,6 @@
 #include "ui/gtk/main_proto_draw.h"
 #include "ui/gtk/main_toolbar.h"
 #include "ui/gtk/font_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/main_welcome.h"
 
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index 7575a43941..22766e2ab7 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -38,7 +38,9 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/main.h"
@@ -48,8 +50,8 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/help_dlg.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/old-gtk-compat.h"
+
 enum {
   NAME_COLUMN,
   GLOBAL_COLUMN,
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index f64c069ec2..3b584bb1c9 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -64,11 +64,14 @@
 
 #include "../util.h"
 #include "../g711.h"
-#include "ui/alert_box.h"
-#include "ui/simple_dialog.h"
 #include "../stat_menu.h"
-#include "ui/progress_dlg.h"
 #include "../tempfile.h"
+
+#include "ui/alert_box.h"
+#include "ui/last_open_dir.h"
+#include "ui/progress_dlg.h"
+#include "ui/simple_dialog.h"
+
 #include <wsutil/file_util.h>
 
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 23217b89a3..e3cbc3bcb6 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -41,6 +41,8 @@
 
 #include "../globals.h"
 #include "../stat_menu.h"
+
+#include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/rtp_stream_dlg.h"
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index eb7aa7f3ec..763951fb30 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -40,7 +40,9 @@
 #include <epan/dissectors/packet-ieee80211.h>
 #include <epan/strutil.h>
 
+#include "ui/recent.h"
 #include "ui/simple_dialog.h"
+
 #include "../stat_menu.h"
 
 #include "ui/gtk/gtkglobals.h"
@@ -48,7 +50,6 @@
 #include "ui/gtk/filter_utils.h"
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/recent.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/utf8_entities.h"
diff --git a/ui/qt/qt_ui_utils.h b/ui/qt/qt_ui_utils.h
index bb5ce0d21a..2d280c2905 100644
--- a/ui/qt/qt_ui_utils.h
+++ b/ui/qt/qt_ui_utils.h
@@ -40,30 +40,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 // These are defined elsewhere in ../gtk/
-#define RECENT_KEY_COL_WIDTH      "column.width"
-#define RECENT_KEY_CAPTURE_FILTER "recent.capture_filter"
 #define RECENT_KEY_CAPTURE_FILE   "recent.capture_file"
 #define RECENT_KEY_REMOTE_HOST "recent.remote_host"
 
-extern gboolean dfilter_combo_add_recent(gchar *filter);
-extern gboolean cfilter_combo_add_recent(gchar *filter);
-extern void dfilter_recent_combo_write_all(FILE *rf);
-extern void cfilter_combo_recent_write_all(FILE *rf);
-extern void new_packet_list_recent_write_all(FILE *rf);
-/** Get the latest opened directory.
- *
- * @return the dirname
- */
-extern char *get_last_open_dir(void);
-/* Add a new recent capture filename to the "Recent Files" submenu
-   (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
-/** Write all recent capture filenames to the user's recent file.
- * @param rf recent file
- */
-extern void menu_recent_file_write_all(FILE *rf);
-
-
 /* Type of capture source */
 typedef enum {
     CAPTURE_IFLOCAL,        /**< Local network interface */
@@ -112,36 +91,6 @@ capture_remote_combo_add_recent(gchar *s);
  *  @todo Move these window functions to a new file win_utils.h?
  *  @{ */
 
-
-/** geometry values for use in window_get_geometry() and window_set_geometry() */
-typedef struct window_geometry_s {
-    gchar       *key;           /**< current key in hashtable (internally used only) */
-    gboolean    set_pos;        /**< set the x and y position values */
-    gint        x;              /**< the windows x position */
-    gint        y;              /**< the windows y position */
-    gboolean    set_size;       /**< set the width and height values */
-    gint        width;          /**< the windows width */
-    gint        height;         /**< the windows height */
-
-    gboolean    set_maximized;  /**< set the maximized state (GTK2 only) */
-    gboolean    maximized;      /**< the windows maximized state (GTK2 only) */
-} window_geometry_t;
-
-/** Write all geometry values of all windows to the recent file.
- * Will call write_recent_geom() for every existing window type.
- *
- * @param rf recent file handle from caller
- */
-extern void window_geom_recent_write_all(gpointer rf);
-
-/** Read in a single geometry key value pair from the recent file.
- *
- * @param name the geom_name of the window
- * @param key the subkey of this pair (e.g. "x")
- * @param value the new value (e.g. "123")
- */
-extern void window_geom_recent_read_pair(const char *name, const char *key, const char *value);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ui/gtk/recent.h b/ui/recent.h
index d582573bbf..b58a56d6b4 100644
--- a/ui/gtk/recent.h
+++ b/ui/recent.h
@@ -43,6 +43,12 @@ extern "C" {
 /** ???. */
 #define RECENT_KEY_DISPLAY_FILTER       "recent.display_filter"
 
+#define RECENT_KEY_COL_WIDTH            "column.width"
+
+#define RECENT_KEY_CAPTURE_FILTER       "recent.capture_filter"
+
+#define RECENT_KEY_REMOTE_HOST          "recent.remote_host"
+
 typedef struct _col_width_data {
   gint   cfmt;
   gchar *cfield;
diff --git a/ui/ui_util.h b/ui/ui_util.h
index cd023a32a7..4d60727ad8 100644
--- a/ui/ui_util.h
+++ b/ui/ui_util.h
@@ -33,7 +33,19 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* gui_utils.c */
+/** geometry values for use in window_get_geometry() and window_set_geometry() */
+typedef struct window_geometry_s {
+    gchar       *key;           /**< current key in hashtable (internally used only) */
+    gboolean    set_pos;        /**< set the x and y position values */
+    gint        x;              /**< the windows x position */
+    gint        y;              /**< the windows y position */
+    gboolean    set_size;       /**< set the width and height values */
+    gint        width;          /**< the windows width */
+    gint        height;         /**< the windows height */
+
+    gboolean    set_maximized;  /**< set the maximized state (GTK2 only) */
+    gboolean    maximized;      /**< the windows maximized state (GTK2 only) */
+} window_geometry_t;
 
 /* Set the name of the top-level window and its icon. */
 void set_main_window_name(const gchar *);