Remove unneeded includes from ui folder

Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a
Reviewed-on: https://code.wireshark.org/review/6128
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

ui/alert_box.c

@@ -25,11 +25,9 @@
 
 #include <string.h>
 
-#include <glib.h>
 
 #include <wiretap/wtap.h>
 #include <wsutil/filesystem.h>
-#include <epan/dfilter/dfilter.h>
 
 #include "ui/alert_box.h"
 

ui/cli/tap-camelcounter.c

@@ -30,11 +30,9 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "epan/packet_info.h"
 #include "epan/tap.h"
 #include "epan/value_string.h"
 #include "epan/stat_tap_ui.h"
-#include "epan/asn1.h"
 #include "epan/dissectors/packet-camel.h"
 
 void register_tap_listener_camelcounter(void);

ui/cli/tap-camelsrt.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "epan/packet_info.h"
 #include <epan/tap.h>
 #include "epan/value_string.h"
 #include "epan/asn1.h"

ui/cli/tap-comparestat.c

@@ -41,7 +41,6 @@
 #include <epan/in_cksum.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-ip.h>
 #include "epan/timestats.h"

ui/cli/tap-diameter-avp.c

@@ -45,7 +45,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
-#include "epan/ftypes/ftypes.h"
 #include "epan/to_str.h"
 #include "epan/dissectors/packet-diameter.h"
 

ui/cli/tap-expert.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/expert.h>

ui/cli/tap-follow.c

@@ -26,7 +26,6 @@
  */
 
 #include "config.h"
-#include "ws_symbol_export.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

ui/cli/tap-funnel.c

@@ -26,13 +26,9 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <wiretap/wtap.h>
-#include <epan/proto.h>
 
 #include <epan/funnel.h>
 #include <stdio.h>
-#include <epan/stat_tap_ui.h>
 
 void register_tap_listener_funnel(void);
 

ui/cli/tap-h225counter.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"

ui/cli/tap-h225rassrt.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"

ui/cli/tap-hosts.c

@@ -23,15 +23,12 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "globals.h"
 
 #include <epan/packet.h>
-#include <cfile.h>
-#include <epan/proto.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>

ui/cli/tap-iostat.c

@@ -22,16 +22,12 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <epan/epan_dissect.h>
-#include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/strutil.h>
 #include "globals.h"
 
 #define CALC_TYPE_FRAMES 0

ui/cli/tap-iousers.c

@@ -26,13 +26,8 @@
 #include <stdlib.h>
 
 #include <string.h>
-#include <epan/packet_info.h>
 #include <epan/packet.h>
-#include <epan/tap.h>
 #include <epan/timestamp.h>
-#include <epan/stat_tap_ui.h>
-#include <ui/traffic_table_ui.h>
-#include <epan/conversation_table.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _io_users_t {

ui/cli/tap-macltestat.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-mac-lte.h>

ui/cli/tap-megacostat.c

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

ui/cli/tap-protocolinfo.c

@@ -30,10 +30,8 @@
 
 #include "epan/epan_dissect.h"
 #include "epan/column-utils.h"
-#include "epan/proto.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/strutil.h>
 
 void register_tap_listener_protocolinfo(void);
 

ui/cli/tap-protohierstat.c

@@ -28,9 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
 #include "epan/epan_dissect.h"
-#include "epan/proto.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 

ui/cli/tap-rlcltestat.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rlc-lte.h>

ui/cli/tap-rtp.c

@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>

ui/cli/tap-rtspstat.c

@@ -33,7 +33,6 @@
 #include "epan/value_string.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include "register.h"
 #include <epan/dissectors/packet-rtsp.h>
 
 void register_tap_listener_rtspstat(void);

ui/cli/tap-scsistat.c

@@ -25,12 +25,10 @@
 
 #include <string.h>
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-scsi.h>
-#include <epan/dissectors/packet-fc.h>
 #include <epan/dissectors/packet-scsi-sbc.h>
 #include <epan/dissectors/packet-scsi-ssc.h>
 #include <epan/dissectors/packet-scsi-smc.h>

ui/cli/tap-sctpchunkstat.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "epan/packet_info.h"
-#include "epan/addr_resolv.h"
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"

ui/console.c

@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 
-#include <glib.h>
 
 #include "epan/prefs.h"
 

ui/decode_as_utils.c

@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 
-#include <stdio.h>
 #include <errno.h>
 
 #include "epan/decode_as.h"

ui/export_object_http.c

@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include <epan/dissectors/packet-http.h>
 #include <epan/tap.h>

ui/export_object_smb.c

@@ -28,10 +28,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/dissectors/packet-smb.h>
 #include <epan/dissectors/packet-smb2.h>
 #include <epan/tap.h>
 

ui/export_object_tftp.c

@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/dissectors/packet-tftp.h>

ui/follow.c

@@ -25,8 +25,6 @@
 
 #include <glib.h>
 
-#include <wsutil/filesystem.h>
-#include <epan/dfilter/dfilter.h>
 
 #include "ui/follow.h"
 

ui/gtk/about_dlg.c

@@ -28,7 +28,6 @@
 #include <gtk/gtk.h>
 
 #include <wsutil/filesystem.h>
-#include <wsutil/plugins.h>
 #include <wsutil/copyright_info.h>
 #include <wsutil/ws_version_info.h>
 #ifdef HAVE_LIBSMI

ui/gtk/addr_resolution_dlg.c

@@ -28,24 +28,15 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/epan.h>
-#include <wsutil/filesystem.h>
 #include <epan/addr_resolv.h>
 
-#include "../cfile.h"
-#include "../file.h"
 
-#include "ui/main_statusbar.h"
 
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/expert_comp_dlg.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
-#include "ui/gtk/packet_list.h"
 #include "ui/gtk/addr_resolution_dlg.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 static GtkWidget *addr_resolution_dlg_w = NULL;
 

ui/gtk/afp_stat.c

@@ -28,13 +28,10 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-afp.h>
 
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
@@ -44,7 +41,6 @@
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkafpstat(void);
 

ui/gtk/ansi_a_stat.c

@@ -36,9 +36,7 @@
 #include <string.h>
 
 #include "epan/packet_info.h"
-#include "epan/epan.h"
 #include "epan/value_string.h"
-#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
@@ -47,12 +45,9 @@
 
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/gui_utils.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkansi_a_stat(void);
 

ui/gtk/ansi_map_stat.c

@@ -36,22 +36,17 @@
 #include <string.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ansi_map.h>
 
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/gui_utils.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkansi_map_stat(void);
 

ui/gtk/bootp_stat.c

@@ -27,10 +27,8 @@
 #include <string.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/tap.h>
 
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
@@ -39,7 +37,6 @@
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkdhcpstat(void);
 

ui/gtk/bytes_view.c

@@ -37,7 +37,6 @@
 #include <epan/wmem/wmem.h>
 #include <epan/charsets.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 #include "packet_panes.h"
 

ui/gtk/camel_counter.c

@@ -27,15 +27,12 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/packet.h>
-#include <epan/asn1.h>
 #include <epan/dissectors/packet-camel.h>
 
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
@@ -45,7 +42,6 @@
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/tap_param_dlg.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 static void gtk_camelcounter_reset(void *phs);
 static int gtk_camelcounter_packet(void *phs,

ui/gtk/camel_srt.c

@@ -27,26 +27,20 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/packet.h>
-#include <epan/asn1.h>
 #include <epan/dissectors/packet-camel.h>
 
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/service_response_time_table.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 /* used to keep track of the statistics for an entire program interface */
 struct camelsrt_t {

ui/gtk/capture_if_dlg.c

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 
 #ifdef HAVE_LIBPCAP
 

ui/gtk/color_dlg.c

@@ -27,12 +27,9 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet.h>
-#include <epan/dfilter/dfilter.h>
 #include <epan/prefs.h>
 
-#include "../color.h"
 #include "../color_filters.h"
-#include "../file.h"
 
 #include "simple_dialog.h"
 
@@ -40,12 +37,8 @@
 #include "ui/gtk/color_utils.h"
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/dfilter_expr_dlg.h"
 #include "ui/gtk/stock_icons.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/capture_file_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/color_edit_dlg.h"
 #include "ui/gtk/packet_list.h"

ui/gtk/color_edit_dlg.c

@@ -34,14 +34,12 @@
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/color_utils.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/dfilter_expr_dlg.h"
 #include "ui/gtk/color_edit_dlg.h"
 #include "ui/gtk/filter_autocomplete.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 
 /* Essentially:

ui/gtk/color_utils.c

@@ -28,11 +28,8 @@
 
 #include "../color.h"
 
-#include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/color_utils.h"
-#include "ui/gtk/gtkglobals.h"
 #if 0
 static GdkColormap*	sys_cmap;
 static GdkColormap*	our_cmap = NULL;

ui/gtk/compare_stat.c

@@ -32,41 +32,30 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <wsutil/report_err.h>
 
-#include <epan/packet_info.h>
-#include <epan/epan.h>
-#include <epan/epan_dissect.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/to_str.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/dissectors/packet-ip.h>
 #include <epan/in_cksum.h>
 
-#include <epan/stat_groups.h>
-#include "epan/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"
 #include "ui/gtk/filter_autocomplete.h"
 
 #include "gui_utils.h"
 #include "dlg_utils.h"
-#include "register.h"
-#include "main.h"
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
@@ -75,10 +64,8 @@
 /* Color settings */
 #include "color.h"
 #include "color_filters.h"
-#include "color_dlg.h"
 #include "packet_list.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkcomparestat(void);
 

ui/gtk/conversation_hastables_dlg.c

@@ -28,21 +28,13 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/epan.h>
-#include <wsutil/filesystem.h>
 #include <epan/conversation.h>
 
-#include "ui/main_statusbar.h"
 
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/expert_comp_dlg.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/help_dlg.h"
-#include "ui/gtk/main.h"
-#include "ui/gtk/packet_list.h"
 #include "ui/gtk/conversation_hastables_dlg.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 static GtkWidget *conversation_hastables_dlg_w = NULL;
 

ui/gtk/conversations_table.c

@@ -24,16 +24,11 @@
 #include "config.h"
 
 #include <string.h>
-#include <locale.h>
 
 #include <gtk/gtk.h>
 
-#include <epan/packet_info.h>
-#include <epan/to_str.h>
 #include <epan/addr_resolv.h>
-#include <epan/tap.h>
 
-#include "globals.h"
 
 #include <epan/stat_groups.h>
 
@@ -53,7 +48,6 @@
 #include "ui/gtk/follow_udp.h"
 #include "ui/gtk/keys.h"
 
-#include "old-gtk-compat.h"
 
 #define COL_STR_LEN 16
 #define CONV_PTR_KEY "conversations-pointer"

ui/gtk/dcerpc_stat.c

@@ -29,23 +29,19 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/filter_dlg.h"
@@ -55,7 +51,6 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/filter_autocomplete.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkdcerpcstat(void);
 

ui/gtk/dfilter_expr_dlg.c

@@ -43,19 +43,14 @@
 #include <gtk/gtk.h>
 
 #include <epan/ftypes/ftypes-int.h>
-#include <epan/to_str.h>
 
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/main.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/proto_dlg.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/dfilter_expr_dlg.h"
 #include "ui/gtk/proto_hier_tree_model.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 #define E_DFILTER_EXPR_TREE_KEY			"dfilter_expr_tree"
 #define E_DFILTER_EXPR_CURRENT_VAR_KEY		"dfilter_expr_current_var"

ui/gtk/diameter_stat.c

@@ -30,12 +30,9 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-diameter.h>
 
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
@@ -43,10 +40,8 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkdiameterstat(void);
 

ui/gtk/dissector_tables_dlg.c

@@ -24,7 +24,6 @@
 
 #include <string.h>
 
-#include <glib.h>
 
 #include <epan/packet.h>
 

ui/gtk/dlg_utils.c

@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include <string.h>
-#include <stdarg.h>
 
 #include <gtk/gtk.h>
 
@@ -30,7 +29,6 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/stock_icons.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 #include "wsutil/filesystem.h"
 

ui/gtk/drag_and_drop.c

@@ -23,13 +23,10 @@
 #include "config.h"
 
 #include <string.h>
-#include <stdio.h>
 
 #include <gtk/gtk.h>
 
-#include <epan/prefs.h>
 
-#include "ui/util.h"
 #include "../file.h"
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"

ui/gtk/edit_packet_comment_dlg.c

@@ -27,20 +27,15 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/epan.h>
-#include <wsutil/filesystem.h>
 
 #include "ui/main_statusbar.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/expert_comp_dlg.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/packet_list.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
-#include "ui/gtk/old-gtk-compat.h"
-#include "ui/gtk/summary_dlg.h"
 
 static GtkWidget *edit_or_add_pkt_comment_dlg = NULL;
 static GtkWidget *edit_or_add_capture_comment_dlg = NULL;

ui/gtk/expert_comp_dlg.c

@@ -31,21 +31,17 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <epan/stat_groups.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"
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/expert_comp_dlg.h"
-#include "ui/gtk/stock_icons.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/expert_indicators.h"
 #include "ui/gtk/packet_panes.h"
-#include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
 #include "ui/gtk/capture_comment_icons.h"
 #include "ui/gtk/gtkglobals.h"

ui/gtk/expert_comp_table.c

@@ -27,15 +27,12 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 
-#include <gtk/gtk.h>
 
 #include "epan/packet_info.h"
 #include "epan/strutil.h"
 
-#include <epan/expert.h>
 
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
@@ -50,7 +47,6 @@
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/stock_icons.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 const char  *packet = "Packet:";
 

ui/gtk/export_object_dlg.c

@@ -30,7 +30,6 @@
 #include <epan/prefs.h>
 #include <epan/tap.h>
 
-#include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
 
 #include <ui/export_object.h>

ui/gtk/export_pdu_dlg.c

@@ -27,7 +27,6 @@
 #include "globals.h"
 #include "pcap-encap.h"
 
-#include <epan/tap.h>
 #include <epan/exported_pdu.h>
 
 
@@ -39,7 +38,6 @@
 #include "ui/gtk/filter_autocomplete.h"
 #include "ui/gtk/stock_icons.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 #include "ui/tap_export_pdu.h"
 #include "ui/gtk/export_pdu_dlg.h"

ui/gtk/extcap_gtk.c

@@ -21,16 +21,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <ui/gtk/gui_utils.h>
 #include <wsutil/filesystem.h>
 
-#include <extcap_parser.h>
 #include "extcap_gtk.h"
 
 #include "log.h"

ui/gtk/fc_stat.c

@@ -27,24 +27,18 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
-#include <epan/conversation.h>
 #include <epan/dissectors/packet-fc.h>
 
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkfcstat(void);
 

ui/gtk/file_import_dlg.c

@@ -24,12 +24,10 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 
 #include <stdlib.h>
 
 #include "globals.h"
-#include "wtap.h"
 #include "pcap-encap.h"
 
 #include "ui/simple_dialog.h"
@@ -46,7 +44,6 @@
 #include "ui/text_import.h"
 #include "ui/text_import_scanner.h"
 
-#include "file.h"
 #include "wsutil/file_util.h"
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"

ui/gtk/filter_dlg.c

@@ -28,7 +28,6 @@
 
 #include <wsutil/filesystem.h>
 #include <epan/prefs.h>
-#include <epan/proto.h>
 
 #include "ui/filters.h"
 #include "ui/simple_dialog.h"
@@ -44,7 +43,6 @@
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/filter_autocomplete.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 #define E_FILT_DIALOG_PTR_KEY       "filter_dialog_ptr"
 #define E_FILT_BUTTON_PTR_KEY       "filter_button_ptr"

ui/gtk/filter_expression_save_dlg.c

@@ -28,32 +28,20 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/proto.h>
-#include <epan/dfilter/dfilter.h>
-#include <epan/strutil.h>
 #include <epan/prefs.h>
-#include <epan/filter_expressions.h>
 
-#include "../globals.h"
 
-#include "ui/alert_box.h"
-#include "ui/main_statusbar.h"
 #include "ui/preference_utils.h"
-#include "ui/ui_util.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/filter_expression_save_dlg.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/stock_icons.h"
-#include "ui/gtk/prefs_dlg.h"
 #include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/filter_autocomplete.h"
-#include "ui/gtk/keys.h"
 #include "ui/gtk/help_dlg.h"
 
 #include "main.h"
 
-#include "main_filter_toolbar.h"
 
 /* Capture callback data keys */
 #define E_FILTER_SAVE_EXPR_KEY     "filter_save_offset_expression"

ui/gtk/filter_utils.c

@@ -30,7 +30,6 @@
 #include "ui/gtk/color_dlg.h"
 #include "ui/gtk/filter_utils.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void
 apply_selected_filter (guint callback_action, const char *filter)

ui/gtk/find_dlg.c

@@ -26,13 +26,10 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/proto.h>
-#include <epan/dfilter/dfilter.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 
 #include "../globals.h"
-#include "ui/alert_box.h"
 #include "ui/main_statusbar.h"
 
 #include "ui/gtk/gui_utils.h"
@@ -40,11 +37,8 @@
 #include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/stock_icons.h"
-#include "ui/gtk/prefs_dlg.h"
-#include "ui/gtk/keys.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/filter_autocomplete.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 /* Capture callback data keys */
 #define E_FIND_FILT_KEY       "find_filter_te"

ui/gtk/firewall_dlg.c

@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_FCNTL_H

ui/gtk/flow_graph.c

@@ -26,25 +26,16 @@
 #include "config.h"
 #include <string.h>
 
-#include <gtk/gtk.h>
 
-#include <epan/epan.h>
 #include <epan/packet.h>
-#include <wsutil/filesystem.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/to_str.h>
-#include <epan/strutil.h>
 
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/graph_analysis.h"
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/stock_icons.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_flow_graph(void);
 

ui/gtk/follow_ssl.c

@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_UNISTD_H

ui/gtk/follow_tcp.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_UNISTD_H

ui/gtk/follow_udp.c

@@ -29,14 +29,12 @@
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
 #include <epan/follow.h>
-#include <epan/strutil.h>
 #include <epan/tap.h>
 
 #include <ui/simple_dialog.h>
 #include <ui/utf8_entities.h>
 
 #include "gtkglobals.h"
-#include "ui/follow.h"
 #include "ui/gtk/follow_stream.h"
 #include "ui/gtk/keys.h"
 #include "ui/gtk/main.h"

ui/gtk/font_utils.c

@@ -23,7 +23,6 @@
 #include "config.h"
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <gtk/gtk.h>
 

ui/gtk/funnel_stat.c

@@ -36,7 +36,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
@@ -44,21 +43,16 @@
 #include <epan/prefs.h>
 #include <epan/funnel.h>
 
-#include "../file.h"
-#include <epan/stat_groups.h>
 #include "ui/progress_dlg.h"
 #include "../color_filters.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/font_utils.h"
 #include "ui/gtk/gui_stat_menu.h"
-#include "ui/gtk/prefs_dlg.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/webbrowser.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkfunnel(void);
 

ui/gtk/goto_dlg.c

@@ -27,11 +27,9 @@
 
 #include <stdlib.h>
 
-#include <epan/proto.h>
 
 #include "../globals.h"
 #include "ui/simple_dialog.h"
-#include "ui/ui_util.h"
 
 #include "ui/gtk/goto_dlg.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/graph_analysis.c

@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 #include <math.h>
 

ui/gtk/gsm_a_stat.c

@@ -36,22 +36,17 @@
 #include <gtk/gtk.h>
 
 #include "epan/packet_info.h"
-#include "epan/epan.h"
 #include "epan/value_string.h"
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a_common.h>
 
-#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/gui_utils.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkgsm_a_stat(void);
 

ui/gtk/gsm_map_stat.c

@@ -35,25 +35,19 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/epan.h>
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/value_string.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
-#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/gsm_map_stat.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkgsm_map_stat(void);
 

ui/gtk/gsm_map_summary.c

@@ -29,22 +29,16 @@
 
 #include <gtk/gtk.h>
 
-#include <wiretap/wtap.h>
 
-#include <epan/epan.h>
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/value_string.h>
-#include <epan/tap.h>
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
 #include <epan/stat_groups.h>
 #include "../globals.h"
-#include "../file.h"
 #include "../summary.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/gsm_map_stat.h"

ui/gtk/gtp_stat.c

@@ -28,23 +28,18 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-gtp.h>
 
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkgtpstat(void);
 

ui/gtk/gui_stat_util.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 
-#include "../file.h"
 
 #include "ui/gtk/gui_stat_util.h"
 

ui/gtk/h225_counter.c

@@ -25,18 +25,13 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-h225.h>
 
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
@@ -44,7 +39,6 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtk_h225counter(void);
 static void gtk_h225counter_init(const char *opt_arg, void *userdata);

ui/gtk/h225_ras_srt.c

@@ -25,19 +25,14 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-h225.h>
 
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
@@ -45,7 +40,6 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtk_h225rassrt(void);
 static void gtk_h225rassrt_init(const char *opt_arg, void *userdata);

ui/gtk/help_dlg.c

@@ -22,18 +22,13 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <errno.h>
 
 #include <gtk/gtk.h>
 
-#include <epan/prefs.h>
 
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/text_page_utils.h"
-#include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/webbrowser.h"
 
 

ui/gtk/hostlist_table.c

@@ -30,11 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/packet_info.h>
-#include <epan/to_str.h>
 #include <epan/addr_resolv.h>
-#include <epan/tap.h>
-#include <epan/strutil.h>
 #ifdef HAVE_GEOIP
 #include <GeoIP.h>
 #include "epan/geoip_db.h"

ui/gtk/iax2_analysis.c

@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <locale.h>

ui/gtk/io_stat.c

@@ -23,25 +23,18 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include <gtk/gtk.h>
 
 #include <epan/epan_dissect.h>
-#include <epan/packet_info.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
-#include <epan/strutil.h>
 
-#include <epan/stat_groups.h>
-#include "ui/alert_box.h"
 #include "ui/io_graph_item.h"
 #include "ui/simple_dialog.h"
 
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/gui_utils.h"
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/filter_dlg.h"
@@ -51,7 +44,6 @@
 #include "ui/gtk/filter_autocomplete.h"
 #include "ui/main_statusbar.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtk_iostat(void);
 

ui/gtk/lbm_stream_dlg.c

@@ -23,17 +23,12 @@
  */
 
 #include "config.h"
-#include <glib.h>
 #include <epan/to_str.h>
-#include <epan/funnel.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/wmem/wmem.h>
 #include <gtk/gtk.h>
-#include <epan/stat_groups.h>
 #include <ui/gtk/gui_utils.h>
 #include <ui/gtk/dlg_utils.h>
-#include <cfile.h>
 #include <globals.h>
 #include <epan/dissectors/packet-lbm.h>
 #include "lbm_stream_dlg.h"

ui/gtk/lbm_uimflow_dlg.c

@@ -23,16 +23,12 @@
  */
 
 #include "config.h"
-#include <glib.h>
 #include <epan/to_str.h>
-#include <epan/funnel.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/stat_groups.h>
 #include <gtk/gtk.h>
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
-#include <cfile.h>
 #include <globals.h>
 #include "ui/gtk/graph_analysis.h"
 #include <epan/dissectors/packet-lbm.h>

ui/gtk/ldap_stat.c

@@ -27,23 +27,18 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkldapstat(void);
 

ui/gtk/mac_lte_stat_dlg.c

@@ -30,7 +30,6 @@
 #include "ui/gtk/gtkglobals.h"
 
 #include <epan/packet.h>
-#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-mac-lte.h>
 
@@ -38,13 +37,11 @@
 #include <epan/stat_groups.h>
 
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/tap_param_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_mac_lte_stat(void);
 

ui/gtk/main_80211_toolbar.c

@@ -26,22 +26,15 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 
-#include "epan/prefs.h"
 
-#include "gtkglobals.h"
-#include "stock_icons.h"
 
-#include "main.h"
 #include "main_toolbar.h"
 
-#include "ui/recent.h"
-#include "ui/gtk/old-gtk-compat.h"
 #include "ui/ui_util.h"
 #include "ui/gtk/main_80211_toolbar.h"
 

ui/gtk/main_filter_toolbar.c

@@ -26,15 +26,12 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 
 #include "ui/recent.h"
-#include "ui/recent_utils.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 #include "filter_dlg.h"
 #include "filter_autocomplete.h"

ui/gtk/main_menubar.c

@@ -23,41 +23,28 @@
 
 #include <gtk/gtk.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <wsutil/u3.h>
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
-#include <epan/tap.h>
-#include <epan/timestamp.h>
-#include <epan/etypes.h>
 #include <epan/dissector_filters.h>
 #include <epan/color_dissector_filters.h>
-#include <epan/strutil.h>
 #include <epan/epan_dissect.h>
 #include <epan/column.h>
 #include <epan/stats_tree_priv.h>
-#include <wsutil/filesystem.h>
-#include <epan/print.h>
 
-#include "cfile.h"
 #include "globals.h"
 #include "color_filters.h"
 
-#include <epan/stat_groups.h>
-#include "ui/iface_lists.h"
 #include "ui/main_statusbar.h"
 #include "ui/preference_utils.h"
 #include "ui/recent.h"
-#include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 #include "ui/software_update.h"
-#include "ui/ui_util.h"
 #include "ui/utf8_entities.h"
 
 #include "ui/gtk/about_dlg.h"
@@ -91,22 +78,18 @@
 #include "ui/gtk/conversations_table.h"
 #include "ui/gtk/hostlist_table.h"
 #include "ui/gtk/packet_history.h"
-#include "ui/tap-sctp-analysis.h"
 #include "ui/gtk/sctp_stat_gtk.h"
 #include "ui/gtk/firewall_dlg.h"
 #include "ui/gtk/macros_dlg.h"
-#include "epan/dissectors/packet-ssl-utils.h"
 #include "ui/gtk/export_sslkeys.h"
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
 #include "ui/gtk/main_menubar_private.h"
-#include "ui/gtk/main_toolbar.h"
 #include "ui/gtk/main_welcome.h"
 #include "ui/gtk/uat_gui.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/manual_addr_resolv.h"
-#include "ui/gtk/proto_help.h"
 #include "ui/gtk/dissector_tables_dlg.h"
 #include "ui/gtk/expert_comp_dlg.h"
 #include "ui/gtk/time_shift_dlg.h"

ui/gtk/main_titlebar.c

@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 
-#include "cfile.h"
 #include "file.h"
 
 #include "gtkglobals.h"

ui/gtk/main_toolbar.c

@@ -27,15 +27,11 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 
 #include <epan/prefs.h>
-#include <epan/dfilter/dfilter.h>
 
 #include "../cfile.h"
-#include "../color_filters.h"
 
-#include "ui/recent.h"
 
 #ifdef HAVE_LIBPCAP
 #include "ui/gtk/capture_dlg.h"

ui/gtk/main_welcome.c

@@ -21,13 +21,11 @@
 
 #include "config.h"
 
-#include <time.h>
 
 #include <gtk/gtk.h>
 
 #include <epan/prefs.h>
 
-#include "../color.h"
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
 #include "capture_opts.h"

ui/gtk/manual_addr_resolv.c

@@ -35,7 +35,6 @@
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
 #include "ui/gtk/manual_addr_resolv.h"
-#include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/packet_win.h"
 #include "simple_dialog.h"
 

ui/gtk/mcast_stream_dlg.c

@@ -35,10 +35,7 @@
 
 #include <gtk/gtk.h>
 
-#include "wsutil/filesystem.h"
-#include <epan/address.h>
 #include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 
 #include "../globals.h"
 #include <epan/stat_groups.h>
@@ -46,11 +43,9 @@
 
 #include "ui/gtk/mcast_stream_dlg.h"
 #include "ui/gtk/mcast_stream.h"
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/gtkglobals.h"
-#include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/stock_icons.h"
 
 void register_tap_listener_mcast_stream_dlg(void);

ui/gtk/megaco_stat.c

@@ -27,10 +27,8 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include "epan/gcp.h"
@@ -38,8 +36,6 @@
 
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
@@ -49,7 +45,6 @@
 
 #include "ui/tap-megaco-common.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkmegacostat(void);
 

ui/gtk/mgcp_stat.c

@@ -25,18 +25,14 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include "epan/dissectors/packet-mgcp.h"
 
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
@@ -44,7 +40,6 @@
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkmgcpstat(void);
 

ui/gtk/mtp3_stat.c

@@ -36,23 +36,18 @@
 #include <gtk/gtk.h>
 
 #include "epan/packet_info.h"
-#include "epan/epan.h"
 #include "epan/value_string.h"
 #include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-mtp3.h>
 
-#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/filter_dlg.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/mtp3_stat.h"
 
-#include "ui/gtk/old-gtk-compat.h"
 
 void register_tap_listener_gtkmtp3_stat(void);
 

ui/gtk/mtp3_summary.c

@@ -32,17 +32,13 @@
 #include <gtk/gtk.h>
 
 #include "epan/packet_info.h"
-#include "epan/epan.h"
 #include "epan/value_string.h"
-#include <epan/tap.h>
 #include <epan/dissectors/packet-mtp3.h>
 
 #include <epan/stat_groups.h>
 #include "../globals.h"
-#include "../file.h"
 #include "../summary.h"
 
-#include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/mtp3_stat.h"

ui/gtk/ncp_stat.c

@@ -27,20 +27,16 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet_info.h>
-#include <epan/epan.h>
 #include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ncp-int.h>
 
 #include "ui/simple_dialog.h"
-#include "../file.h"
-#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/service_response_time_table.h"
 #include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 
 void register_tap_listener_gtkncpstat(void);

ui/gtk/packet_history.c

@@ -22,12 +22,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
 
 #include <gtk/gtk.h>
 
-#include "../file.h"
-#include "../globals.h"
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/packet_history.h"