diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2015-01-01 23:09:08 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2015-01-01 23:11:10 +0000 |
| commit | 43f09e67b4fcf83be61725c76755926500d5d9c3 (patch) | |
| tree | 4a8ef497e53487a002f9c67c72dc7976226b651b /ui | |
| parent | 5981dab95b87ffd629d6ab6a45289af60c3d3b27 (diff) | |
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>
Diffstat (limited to 'ui')
168 files changed, 1 insertions, 612 deletions
diff --git a/ui/alert_box.c b/ui/alert_box.c index a5b78e1182..aac268558d 100644 --- a/ui/alert_box.c +++ b/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" diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c index 961d61db89..d6e31d5f65 100644 --- a/ui/cli/tap-camelcounter.c +++ b/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); diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index bdc235f5e9..20e67954cb 100644 --- a/ui/cli/tap-camelsrt.c +++ b/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" diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 95495eaa16..674508aab6 100644 --- a/ui/cli/tap-comparestat.c +++ b/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" diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 257c210b36..1c6aff2bc4 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/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" diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index b6e5cc80e2..8ae358beaa 100644 --- a/ui/cli/tap-expert.c +++ b/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> diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c index 6be940fe7b..9646cc7923 100644 --- a/ui/cli/tap-follow.c +++ b/ui/cli/tap-follow.c @@ -26,7 +26,6 @@ */ #include "config.h" -#include "ws_symbol_export.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index 23497406aa..1d0ed303be 100644 --- a/ui/cli/tap-funnel.c +++ b/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); diff --git a/ui/cli/tap-h225counter.c b/ui/cli/tap-h225counter.c index 29555a9e9c..064dbebe3f 100644 --- a/ui/cli/tap-h225counter.c +++ b/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" diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c index 2c61e8ee3d..08badeb686 100644 --- a/ui/cli/tap-h225rassrt.c +++ b/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" diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c index aa53ec0048..a4c2360f7c 100644 --- a/ui/cli/tap-hosts.c +++ b/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> diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 9677d4570a..6b72c3a833 100644 --- a/ui/cli/tap-iostat.c +++ b/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 diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index 9f07ebdb9d..971dead5df 100644 --- a/ui/cli/tap-iousers.c +++ b/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 { diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index 0eb397ee4c..9e929f6c57 100644 --- a/ui/cli/tap-macltestat.c +++ b/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> diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index 7b14260a9f..63107bae6b 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -24,7 +24,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 3b574c22ef..de5c42ec60 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/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); diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index 71b67472c0..178892ccdb 100644 --- a/ui/cli/tap-protohierstat.c +++ b/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> diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index cd37793d5c..de0b316970 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/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> diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index 6c0a598760..97a86dc2b1 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -33,7 +33,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <locale.h> diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 24e516be25..90a198f377 100644 --- a/ui/cli/tap-rtspstat.c +++ b/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); diff --git a/ui/cli/tap-scsistat.c b/ui/cli/tap-scsistat.c index ac64219463..8684861340 100644 --- a/ui/cli/tap-scsistat.c +++ b/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> diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 2adaa42c54..571b9f4a40 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/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" diff --git a/ui/console.c b/ui/console.c index 6ca783030d..f36a0ec604 100644 --- a/ui/console.c +++ b/ui/console.c @@ -24,7 +24,6 @@ #include <stdio.h> -#include <glib.h> #include "epan/prefs.h" diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index 3cc1943738..93e165bb58 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -23,7 +23,6 @@ #include <stdlib.h> -#include <stdio.h> #include <errno.h> #include "epan/decode_as.h" diff --git a/ui/export_object_http.c b/ui/export_object_http.c index 49807600c4..d92ec97660 100644 --- a/ui/export_object_http.c +++ b/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> diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c index de866916dc..a0343c6692 100644 --- a/ui/export_object_smb.c +++ b/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> diff --git a/ui/export_object_tftp.c b/ui/export_object_tftp.c index 34055e0d22..18eda94b09 100644 --- a/ui/export_object_tftp.c +++ b/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> diff --git a/ui/follow.c b/ui/follow.c index 23eee45297..8fc6f852d1 100644 --- a/ui/follow.c +++ b/ui/follow.c @@ -25,8 +25,6 @@ #include <glib.h> -#include <wsutil/filesystem.h> -#include <epan/dfilter/dfilter.h> #include "ui/follow.h" diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 6f100c0356..b032dc9aa6 100644 --- a/ui/gtk/about_dlg.c +++ b/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 diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c index 71129e1aaa..f9dd677392 100644 --- a/ui/gtk/addr_resolution_dlg.c +++ b/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; diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index bc59809d58..c87cf6559c 100644 --- a/ui/gtk/afp_stat.c +++ b/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); diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index d885ec732e..956020e3d0 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/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); diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index a2362dcee9..bada3c1ce3 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/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); diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index da140c9267..19fe10eef2 100644 --- a/ui/gtk/bootp_stat.c +++ b/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); diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 0c26112fc6..0a49f091c7 100644 --- a/ui/gtk/bytes_view.c +++ b/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" diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index 08d6b721c9..d4376ac627 100644 --- a/ui/gtk/camel_counter.c +++ b/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, diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index 39330ae5fe..7bf31814a0 100644 --- a/ui/gtk/camel_srt.c +++ b/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 { diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index ea6582fc9d..0bbf695a80 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -22,7 +22,6 @@ #include "config.h" -#include <gtk/gtk.h> #ifdef HAVE_LIBPCAP diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c index 5f9edb3f60..dfbe60d773 100644 --- a/ui/gtk/color_dlg.c +++ b/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" diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index 481f4e51ed..d9c2354f60 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/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: diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c index af09919e0f..ab762be64b 100644 --- a/ui/gtk/color_utils.c +++ b/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; diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index ffdee6c8fb..d764c5566c 100644 --- a/ui/gtk/compare_stat.c +++ b/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); diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c index 6cb8c8f775..9c90694ece 100644 --- a/ui/gtk/conversation_hastables_dlg.c +++ b/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; diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index cd28017b09..5f9998667f 100644 --- a/ui/gtk/conversations_table.c +++ b/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" diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index e1fff8a179..ef56614cc2 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/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); diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index 381d13bbdc..affc7f806c 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/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" diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 1dd26e594f..f00ba17fdf 100644 --- a/ui/gtk/diameter_stat.c +++ b/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); diff --git a/ui/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c index 49e573ef9b..28eae3f3d9 100644 --- a/ui/gtk/dissector_tables_dlg.c +++ b/ui/gtk/dissector_tables_dlg.c @@ -24,7 +24,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 28a2875a81..7522caa3ff 100644 --- a/ui/gtk/dlg_utils.c +++ b/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" diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 5bc1e82191..8eb27ebf54 100644 --- a/ui/gtk/drag_and_drop.c +++ b/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" diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c index 0c721b15e2..01f14d1bba 100644 --- a/ui/gtk/edit_packet_comment_dlg.c +++ b/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; diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 2202e8818f..7b22a05620 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/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" diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index b82d6c4b3c..3a5fce7b10 100644 --- a/ui/gtk/expert_comp_table.c +++ b/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:"; diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c index 2b72edbcc2..c29bdcdd49 100644 --- a/ui/gtk/export_object_dlg.c +++ b/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> diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c index 5c288810bf..492f7100bb 100644 --- a/ui/gtk/export_pdu_dlg.c +++ b/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" diff --git a/ui/gtk/extcap_gtk.c b/ui/gtk/extcap_gtk.c index 5fbd29a817..acd0b07b20 100644 --- a/ui/gtk/extcap_gtk.c +++ b/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" diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 402d2a297e..4d11fb435f 100644 --- a/ui/gtk/fc_stat.c +++ b/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); diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index fc0c4ec384..f861f7c81f 100644 --- a/ui/gtk/file_import_dlg.c +++ b/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" diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index c17a48c7ff..f5a68b579e 100644 --- a/ui/gtk/filter_dlg.c +++ b/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" diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index b3dac7aa78..80f0489d79 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/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" diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c index 87b437ea12..e97d7d6880 100644 --- a/ui/gtk/filter_utils.c +++ b/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) diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index dd8b8ee765..2f4d665f7c 100644 --- a/ui/gtk/find_dlg.c +++ b/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" diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index f8945b0554..20195660e9 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -34,7 +34,6 @@ #include "config.h" -#include <stdio.h> #include <string.h> #ifdef HAVE_FCNTL_H diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index c974ef5752..42b1fce03a 100644 --- a/ui/gtk/flow_graph.c +++ b/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); diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index df25d56108..a35076556a 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include <stdio.h> #include <string.h> #ifdef HAVE_UNISTD_H diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index 29d383d736..22565036ad 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <stdio.h> #include <string.h> #ifdef HAVE_UNISTD_H diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c index 5f911a04e2..8af7972a37 100644 --- a/ui/gtk/follow_udp.c +++ b/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" diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c index aeb7d518cd..fbef048561 100644 --- a/ui/gtk/font_utils.c +++ b/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> diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 133b41af29..13bf97a3e6 100644 --- a/ui/gtk/funnel_stat.c +++ b/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); diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index a73666a3a8..641cd716c3 100644 --- a/ui/gtk/goto_dlg.c +++ b/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" diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 1fc739e973..eebaef016d 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -28,7 +28,6 @@ #include "config.h" -#include <stdio.h> #include <string.h> #include <math.h> diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index cdf093550b..b694c8a1c7 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/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); diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 2f38e63e2c..5b363c17c1 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/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); diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index ef16df241e..a16317e8a9 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/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" diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index 2e9c8ca33a..31d247417f 100644 --- a/ui/gtk/gtp_stat.c +++ b/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); diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c index a4a806713a..0b3f9c5c15 100644 --- a/ui/gtk/gui_stat_util.c +++ b/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" diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index 794f1074b2..b3e6dab324 100644 --- a/ui/gtk/h225_counter.c +++ b/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); diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index b02f767aef..50bfc072aa 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/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); diff --git a/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c index 9f066bf3ac..fa31d69108 100644 --- a/ui/gtk/help_dlg.c +++ b/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" diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index ab4b79d26d..98eb2f8ac7 100644 --- a/ui/gtk/hostlist_table.c +++ b/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" diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 69c97c9643..53d1e4da50 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -34,7 +34,6 @@ #include "config.h" -#include <stdio.h> #include <math.h> #include <string.h> #include <locale.h> diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 1723f64369..9a354b6356 100644 --- a/ui/gtk/io_stat.c +++ b/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); diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c index b3266ec6d5..a8cb00763e 100644 --- a/ui/gtk/lbm_stream_dlg.c +++ b/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" diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c index bdb141e4d0..6473477441 100644 --- a/ui/gtk/lbm_uimflow_dlg.c +++ b/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> diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index 86ef837efd..3b08532dfb 100644 --- a/ui/gtk/ldap_stat.c +++ b/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); diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 0e66a5e849..f572bafc5b 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/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); diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index 17bb8c34c1..c4dbcce6a4 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/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" diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c index 8374f610d9..685b3f597d 100644 --- a/ui/gtk/main_filter_toolbar.c +++ b/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" diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 2afd5a6e17..0c43918ae2 100644 --- a/ui/gtk/main_menubar.c +++ b/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" diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index caf70ece9f..48a30f145e 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.c @@ -26,7 +26,6 @@ #include <gtk/gtk.h> -#include "cfile.h" #include "file.h" #include "gtkglobals.h" diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index 5ed634dfe7..1b74a57032 100644 --- a/ui/gtk/main_toolbar.c +++ b/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" diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index 0828d16cbe..fdf021c260 100644 --- a/ui/gtk/main_welcome.c +++ b/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" diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index a55899017b..673a8e7913 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/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" diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index 7b1754ce17..71ea3d3270 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/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); diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index 128c76ab42..939e8d11f3 100644 --- a/ui/gtk/megaco_stat.c +++ b/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); diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index b4bb2430de..b2a312e265 100644 --- a/ui/gtk/mgcp_stat.c +++ b/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); diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 9e2a9d28a4..e79ae1b4e8 100644 --- a/ui/gtk/mtp3_stat.c +++ b/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); diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 4b934bf1af..8708196fdc 100644 --- a/ui/gtk/mtp3_summary.c +++ b/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" diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index 3e3c364946..af7adf8379 100644 --- a/ui/gtk/ncp_stat.c +++ b/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); diff --git a/ui/gtk/packet_history.c b/ui/gtk/packet_history.c index bc3c0ce84b..65a3fee8ae 100644 --- a/ui/gtk/packet_history.c +++ b/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" diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 60305b9e6a..17ac2273f2 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -25,46 +25,32 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <gtk/gtk.h> -#include <glib.h> -#include <epan/column-info.h> #include <epan/prefs.h> #include <epan/packet.h> -#include <epan/epan_dissect.h> #include <epan/column.h> #include <epan/strutil.h> -#include <epan/emem.h> #include "ui/main_statusbar.h" #include "ui/packet_list_utils.h" #include "ui/preference_utils.h" -#include "ui/progress_dlg.h" #include "ui/recent.h" -#include "ui/recent_utils.h" -#include "ui/ui_util.h" -#include "gui_utils.h" #include "packet_list_store.h" #include "ui/gtk/packet_list.h" -#include "globals.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/font_utils.h" #include "ui/gtk/packet_history.h" #include "ui/gtk/keys.h" #include "ui/gtk/menus.h" -#include "color.h" #include "color_filters.h" #include "ui/gtk/color_utils.h" -#include "ui/gtk/capture_file_dlg.h" #include "ui/gtk/packet_win.h" #include "ui/gtk/main.h" -#include "ui/gtk/prefs_column.h" -#include "ui/gtk/prefs_dlg.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/filter_dlg.h" #include "ui/gtk/filter_autocomplete.h" diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 230cb8fbfb..01117aed97 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -32,17 +32,14 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib.h> #include "packet_list_store.h" #include "ui/progress_dlg.h" #include "ui/ui_util.h" -#include "ui/gtk/old-gtk-compat.h" #include <epan/epan_dissect.h> -#include <epan/column-info.h> #include <epan/column.h> #include "color.h" diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 862275bc3f..10ff3a820a 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -35,9 +35,7 @@ #include "ui/gtk/pixmap_save.h" #include "ui/gtk/file_dlg.h" -#include "ui/gtk/gui_utils.h" -#include "ui/gtk/old-gtk-compat.h" #if GTK_CHECK_VERSION(2,22,0) #if !GTK_CHECK_VERSION(3,0,0) #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 7e7018209f..62646edd24 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -28,21 +28,17 @@ #include <gtk/gtk.h> #include <epan/prefs.h> -#include <epan/column-info.h> #include <epan/column.h> -#include <epan/strutil.h> #include "globals.h" #include "ui/preference_utils.h" #include "ui/gtk/prefs_column.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/packet_list.h" #include "ui/gtk/filter_dlg.h" #include "ui/gtk/filter_autocomplete.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/stock_icons.h" static GtkWidget *remove_bt, *field_te, *field_lb, *occurrence_te, *occurrence_lb, *fmt_cmb; diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 8e6f4f69f0..63ea1de16a 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -29,12 +29,9 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/strutil.h> #include <epan/prefs-int.h> #include <epan/epan_dissect.h> -#include <epan/print.h> -#include "file.h" #include "ui/preference_utils.h" #include "ui/gtk/main.h" @@ -51,7 +48,6 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/keys.h" #include "ui/gtk/uat_gui.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/file_dlg.h" #include "ui/gtk/packet_win.h" #include "simple_dialog.h" diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index 8bd72f06e0..5770086dcb 100644 --- a/ui/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -26,22 +26,11 @@ #include <gtk/gtk.h> -#include <epan/prefs.h> -#include <epan/column-info.h> -#include <epan/column.h> -#include <epan/strutil.h> -#include <epan/filter_expressions.h> -#include "../globals.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/gui_utils.h" -#include "ui/gtk/packet_list.h" -#include "ui/gtk/filter_dlg.h" -#include "ui/gtk/filter_autocomplete.h" #include "ui/gtk/filter_expression_save_dlg.h" #include "ui/gtk/prefs_filter_expressions.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/stock_icons.h" static void filter_expressions_list_new_cb(GtkWidget *, gpointer); diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c index eda5481577..5441d12b94 100644 --- a/ui/gtk/prefs_font_color.c +++ b/ui/gtk/prefs_font_color.c @@ -29,7 +29,6 @@ #include <epan/proto.h> #include <epan/prefs.h> -#include <color.h> #include <ui/recent.h> #include <ui/simple_dialog.h> @@ -37,9 +36,6 @@ #include "color_utils.h" #include "follow_tcp.h" #include "font_utils.h" -#include "gui_utils.h" -#include "keys.h" -#include "old-gtk-compat.h" #include "packet_panes.h" #include "prefs_font_color.h" diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 739c390e90..bc6f01d903 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -31,21 +31,15 @@ #include "cfile.h" -#include "ui/recent.h" #include "ui/gtk/prefs_gui.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/help_dlg.h" #include "ui/gtk/supported_protos_dlg.h" #include "ui/gtk/prefs_dlg.h" #include "ui/gtk/main_titlebar.h" #include "ui/gtk/gui_utils.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" -#include "ui/gtk/packet_list.h" -#include "ui/gtk/packet_panes.h" #include "ui/gtk/main_toolbar.h" -#include "ui/gtk/font_utils.h" #include "ui/gtk/webbrowser.h" #include "ui/gtk/main_welcome.h" diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index e433f797df..7ba21e5406 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -28,15 +28,12 @@ #include "cfile.h" -#include "ui/ui_util.h" #include "ui/gtk/prefs_layout.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/prefs_dlg.h" #include "ui/gtk/main_titlebar.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/gtk/dlg_utils.h" #include "layouts.h" diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index f6736583b3..0ce4a36f68 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -27,9 +27,7 @@ #include <gtk/gtk.h> #include <epan/prefs.h> -#include <epan/epan_dissect.h> #include <wsutil/filesystem.h> -#include <epan/print.h> #include "ui/alert_box.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 0b639f0db1..5a1327e5ce 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -28,7 +28,6 @@ #include "ui/progress_dlg.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index e9c2ac1b1d..ff63ce24c3 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -25,7 +25,6 @@ #include <string.h> #include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #if GTK_CHECK_VERSION(3,0,0) # include <gdk/gdkkeysyms-compat.h> #endif diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c index 6de7daa296..71a0d3777f 100644 --- a/ui/gtk/proto_help.c +++ b/ui/gtk/proto_help.c @@ -33,14 +33,9 @@ #include <string.h> #include <gtk/gtk.h> -#include "ui/gtk/webbrowser.h" #include "../file.h" -#include <epan/prefs.h> -#include <wsutil/filesystem.h> -#include <epan/strutil.h> -#include <epan/proto.h> #include "ui/gtk/proto_help.h" diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 06eca2807b..87892e472d 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -22,7 +22,6 @@ #include "config.h" -#include <stdio.h> #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index 5ba701f82f..c13d9c3575 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -28,7 +28,6 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib.h> #include "proto_hier_tree_model.h" diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index 71a79352c3..9f38132437 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -28,7 +28,6 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib.h> #include <epan/addr_resolv.h> #include <epan/proto.h> diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 5f4cb1dbda..cf93f01379 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_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-radius.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_gtkradiusstat(void); diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index 66f4d4f765..aa5b1f514c 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -28,10 +28,8 @@ #include "../globals.h" #include "ui/simple_dialog.h" -#include "epan/packet-range.h" #include "ui/gtk/gui_utils.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/range_utils.h" diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index da26d7e6b2..43163d2a54 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -35,7 +35,6 @@ #include "ui/gtk/gtkglobals.h" #include <epan/packet.h> -#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/dissectors/packet-rlc-lte.h> @@ -49,7 +48,6 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" void register_tap_listener_rlc_lte_stat(void); diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 264c0bf3f0..8ed9591066 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -28,26 +28,20 @@ #include "config.h" -#include <stdio.h> #include <stdlib.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-rpc.h> -#include <epan/stat_groups.h> -#include "../globals.h" -#include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" #define NANOSECS_PER_SEC 1000000000 diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index feb15809ee..24992bf8fe 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -28,21 +28,17 @@ #include "config.h" -#include <stdio.h> #include <stdlib.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-rpc.h> -#include <epan/stat_groups.h> #include "ui/simple_dialog.h" -#include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" @@ -52,7 +48,6 @@ #include "ui/gtk/gtkglobals.h" #include "ui/gtk/filter_autocomplete.h" -#include "ui/gtk/old-gtk-compat.h" void register_tap_listener_gtkrpcstat(void); diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 2210121bda..eb46fc3123 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -33,11 +33,9 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> -#include <locale.h> #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index 602c20971e..c0b7606b01 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -25,7 +25,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 3b47b87eae..4df1879170 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -25,14 +25,11 @@ #include "config.h" -#include <stdio.h> #include <string.h> #include <locale.h> #include <epan/rtp_pt.h> -#include <epan/address.h> #include <epan/addr_resolv.h> -#include <epan/strutil.h> #include "wsutil/filesystem.h" #include "../globals.h" @@ -43,15 +40,12 @@ #include "ui/util.h" #include "ui/gtk/rtp_stream_dlg.h" -#include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/file_dlg.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/gtkglobals.h" #include "ui/rtp_stream.h" -#include "ui/rtp_analysis.h" #include "ui/gtk/stock_icons.h" -#include "ui/gtk/old-gtk-compat.h" static const gchar FWD_LABEL_TEXT[] = "Select a forward stream with left mouse button, and then"; static const gchar FWD_ONLY_LABEL_TEXT[] = "Select a forward stream with Ctrl + left mouse button"; diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index 3af1a83a06..953d5cd4ae 100644 --- a/ui/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -26,17 +26,13 @@ #include "config.h" -#include <stdio.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/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> @@ -44,18 +40,14 @@ #include <epan/dissectors/packet-scsi-mmc.h> #include "ui/simple_dialog.h" -#include "../globals.h" #include <epan/stat_groups.h> -#include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" #include "ui/gtk/service_response_time_table.h" #include "ui/gtk/tap_param_dlg.h" -#include "ui/gtk/gtkglobals.h" -#include "ui/gtk/old-gtk-compat.h" void register_tap_listener_gtkscsistat(void); diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 35509810d0..3ca666675c 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -25,19 +25,13 @@ #include <gtk/gtk.h> #include <epan/epan_dissect.h> -#include "wsutil/filesystem.h" #include <epan/to_str.h> -#include <epan/strutil.h> -#include "../globals.h" #include "ui/simple_dialog.h" #include <epan/stat_groups.h> -#include "ui/gtk/gui_stat_menu.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index 9b67a70dc8..41456dd8bc 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -22,27 +22,20 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> #include <gtk/gtk.h> -#include "wsutil/filesystem.h" -#include <epan/strutil.h> -#include "../globals.h" -#include "ui/ui_util.h" #include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/stock_icons.h" #define DEFAULT_PIXELS_PER_TICK 2 diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index 020f0348a7..7581afe088 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -27,26 +27,18 @@ #include <string.h> -#include <gtk/gtk.h> -#include <epan/packet_info.h> -#include <epan/epan.h> #include <epan/to_str.h> #include <epan/value_string.h> #include <epan/tap.h> -#include <epan/dissectors/packet-sctp.h> #include "ui/simple_dialog.h" -#include "../file.h" -#include "../globals.h" -#include <epan/stat_groups.h> #include "ui/gtk/gui_stat_util.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/tap_param_dlg.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" void register_tap_listener_sctpstat(void); diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index 57aa38f4c9..1e6d4f9819 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -26,15 +26,11 @@ #include <gtk/gtk.h> -#include "wsutil/filesystem.h" #include "epan/to_str.h" -#include "../globals.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index 3ccb86022b..dd79b5d95e 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.c @@ -24,15 +24,11 @@ #include <gtk/gtk.h> -#include "wsutil/filesystem.h" -#include "../globals.h" #include "ui/simple_dialog.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/stock_icons.h" diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index e7278668ed..4ba1b6a36c 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -23,26 +23,19 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> #include <gtk/gtk.h> -#include "wsutil/filesystem.h" -#include <epan/strutil.h> -#include "../globals.h" -#include "ui/ui_util.h" #include "ui/simple_dialog.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/gui_utils.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/stock_icons.h" #define DEFAULT_PIXELS_PER_TICK 2 diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 37f00bd05b..26c0daf8a3 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -25,21 +25,16 @@ #include <gtk/gtk.h> -#include "wsutil/filesystem.h" #include "epan/to_str.h" -#include "../globals.h" #include <epan/stat_groups.h> #include "ui/gtk/gui_stat_menu.h" -#include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/main.h" -#include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/gtkglobals.h" -#include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/stock_icons.h" static GtkWidget *sctp_stat_dlg = NULL; diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index c5a9717c7d..64196e92c0 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -24,8 +24,6 @@ #include "config.h" -#include <gtk/gtk.h> -#include <stdio.h> #include "epan/packet_info.h" diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index a2f61522ea..90b9254563 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include <stdio.h> #include <gtk/gtk.h> @@ -34,7 +33,6 @@ #include "gui_utils.h" #include "stock_icons.h" -#include "old-gtk-compat.h" static void simple_dialog_cancel_cb(GtkWidget *, gpointer); diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index 50bc398795..acfd42b99b 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.c @@ -28,20 +28,16 @@ #include <gtk/gtk.h> #include <epan/packet_info.h> -#include <epan/epan.h> #include <epan/tap.h> #include <epan/dissectors/packet-sip.h> #include "ui/simple_dialog.h" -#include "../globals.h" -#include <epan/stat_groups.h> #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/tap_param_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" #define SUM_STR_MAX 1024 diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index ab6c5669eb..a3bf8a5812 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_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/dissectors/packet-smb2.h> #include "ui/simple_dialog.h" -#include "../file.h" -#include "../globals.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_gtksmb2stat(void); diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index 2d3606d6df..6abd6a5d7f 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_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/dissectors/packet-smb.h> #include "ui/simple_dialog.h" -#include "../file.h" -#include "../globals.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_gtksmbstat(void); diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index f5228f4df3..ba32057eb3 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -40,8 +40,6 @@ #include <epan/stats_tree_priv.h> #include "ui/simple_dialog.h" -#include "../globals.h" -#include <epan/stat_groups.h> #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" @@ -49,10 +47,9 @@ #include "ui/gtk/tap_param_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" - #include "ui/gtk/gui_stat_menu.h" + #ifdef _WIN32 #define USE_WIN32_FILE_DIALOGS #endif diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index 2db54696f3..a76b2caf67 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -23,7 +23,6 @@ #include "config.h" -#include <gtk/gtk.h> #include <stdlib.h> #include <string.h> diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 8a6ea16439..122e6aa0a1 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -23,17 +23,13 @@ #include "config.h" #include <string.h> -#include <time.h> #include <gtk/gtk.h> -#include <epan/strutil.h> -#include <wiretap/wtap.h> #include <wsutil/ws_version_info.h> -#include "../globals.h" #include "../file.h" #include "../summary.h" diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 4609bd1e91..6d008596c7 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -23,7 +23,6 @@ #include "config.h" -#include <stdio.h> #include <string.h> #include <gtk/gtk.h> @@ -33,7 +32,6 @@ #include "../globals.h" #include "ui/gtk/supported_protos_dlg.h" -#include "ui/gtk/gtkglobals.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/font_utils.h" diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index 624d121566..c078ee959a 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -23,14 +23,11 @@ #include "config.h" -#include <stdio.h> #include <string.h> #include <gtk/gtk.h> -#include <epan/stat_tap_ui.h> -#include "../file.h" #include "../globals.h" #include <epan/stat_groups.h> @@ -43,7 +40,6 @@ #include "ui/gtk/gtkglobals.h" #include "ui/gtk/filter_autocomplete.h" -#include "ui/gtk/old-gtk-compat.h" typedef struct _tap_param_dlg_list_item { GtkWidget *dlg; diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 5ff8e97fe9..3c2bf9f30a 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -24,7 +24,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <math.h> #include <string.h> diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index cc25c1bcf9..22c706b585 100644 --- a/ui/gtk/text_page_utils.c +++ b/ui/gtk/text_page_utils.c @@ -24,12 +24,10 @@ #include "config.h" #include <string.h> -#include <stdio.h> #include <errno.h> #include <gtk/gtk.h> -#include "wsutil/filesystem.h" #include "ui/simple_dialog.h" #include <wsutil/file_util.h> diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index fdba115993..90dc8f71b8 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -29,22 +29,14 @@ #include <gtk/gtk.h> -#include <epan/proto.h> -#include <epan/dfilter/dfilter.h> -#include <epan/strutil.h> #include <epan/prefs.h> #include "ui/time_shift.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/time_shift_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" /* Capture callback data keys */ diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 9dd57caf17..497b0e041a 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -37,11 +37,9 @@ #include "config.h" #include <string.h> #include <stdlib.h> -#include <stdio.h> #include <math.h> #include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #if GTK_CHECK_VERSION(3,0,0) # include <gdk/gdkkeysyms-compat.h> #endif diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 5f5c7ace03..d8895fb1f0 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -33,23 +33,16 @@ #include "config.h" -#include <stdio.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/address.h> #include <epan/addr_resolv.h> #include <epan/dissectors/packet-h225.h> #include <epan/dissectors/packet-h248.h> #include "../globals.h" -#include <epan/stat_groups.h> #include "ui/voip_calls.h" diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 5452481966..5b1d3b95c1 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -107,9 +107,6 @@ #include <gtk/gtk.h> -#include <wsutil/filesystem.h> -#include <epan/prefs.h> - #include "ui/simple_dialog.h" #include "ui/help_url.h" diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 91f5c6932b..38d547dfdd 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -47,7 +47,6 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" void register_tap_listener_wlanstat(void); diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index f32c8929a3..910db66411 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -31,15 +31,12 @@ #include <epan/dissectors/packet-wsp.h> #include "ui/simple_dialog.h" -#include "../globals.h" -#include <epan/stat_groups.h> #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/tap_param_dlg.h" #include "ui/gtk/main.h" -#include "ui/gtk/old-gtk-compat.h" void register_tap_listener_gtkwspstat(void); diff --git a/ui/io_graph_item.c b/ui/io_graph_item.c index ae9bc0d3ce..9c686d962f 100644 --- a/ui/io_graph_item.c +++ b/ui/io_graph_item.c @@ -24,10 +24,8 @@ #include "config.h" -#include <glib.h> #include <epan/epan_dissect.h> -#include <epan/packet_info.h> #include "ui/io_graph_item.h" diff --git a/ui/language.c b/ui/language.c index 9e6af04f72..75a716298d 100644 --- a/ui/language.c +++ b/ui/language.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include <errno.h> -#include <epan/epan.h> #include <epan/prefs.h> #include <epan/prefs-int.h> diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c index 57d6aadd62..0f8ab2b775 100644 --- a/ui/packet_list_utils.c +++ b/ui/packet_list_utils.c @@ -24,12 +24,10 @@ #include "config.h" -#include <glib.h> #include "packet_list_utils.h" #include <epan/column.h> -#include <epan/proto.h> gboolean right_justify_column (gint col, capture_file *cf) diff --git a/ui/preference_utils.c b/ui/preference_utils.c index 77a46d9d16..1bed39bd2f 100644 --- a/ui/preference_utils.c +++ b/ui/preference_utils.c @@ -24,9 +24,7 @@ #include <errno.h> -#include <glib.h> -#include <epan/column-info.h> #include <epan/column.h> #include <wsutil/filesystem.h> #include <epan/prefs.h> diff --git a/ui/profile.c b/ui/profile.c index 3118ac3c44..0aed43e06f 100644 --- a/ui/profile.c +++ b/ui/profile.c @@ -26,15 +26,12 @@ #include <string.h> #include <errno.h> -#include <glib.h> #include <epan/emem.h> #include <wsutil/filesystem.h> -#include <epan/prefs.h> #include "profile.h" -#include "ui/recent.h" #include "ui/simple_dialog.h" #include <wsutil/file_util.h> diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c index 115501d019..56376426a3 100644 --- a/ui/proto_hier_stats.c +++ b/ui/proto_hier_stats.c @@ -22,17 +22,14 @@ #include "config.h" -#include <stdio.h> #include "globals.h" #include "frame_tvbuff.h" #include "ui/proto_hier_stats.h" #include "ui/progress_dlg.h" #include <epan/epan_dissect.h> -#include <wtap.h> #include <string.h> -#include <glib.h> /* Update the progress bar this many times when scanning the packet list. */ #define N_PROGBAR_UPDATES 100 diff --git a/ui/recent.c b/ui/recent.c index b8eeda637f..d0c99ce074 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -23,25 +23,20 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include "capture_opts.h" -#include <epan/epan.h> #include <wsutil/filesystem.h> -#include <epan/emem.h> #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 "ui/ui_util.h" #include <wsutil/u3.h> #include <wsutil/file_util.h> diff --git a/ui/tap-megaco-common.c b/ui/tap-megaco-common.c index b958e16bc4..0374fae708 100644 --- a/ui/tap-megaco-common.c +++ b/ui/tap-megaco-common.c @@ -28,15 +28,11 @@ #include <string.h> #include <epan/packet_info.h> -#include <epan/epan.h> #include <epan/value_string.h> -#include <epan/tap.h> #include "epan/gcp.h" #include "epan/timestats.h" -#include "file.h" #include "globals.h" -#include <epan/stat_groups.h> #include "tap-megaco-common.h" diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index 3ed3186537..1959ea1c70 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -29,11 +29,9 @@ #include "config.h" -#include <stdio.h> #include <math.h> #include "globals.h" -#include <epan/tap.h> #include <string.h> #include <epan/rtp_pt.h> #include <epan/addr_resolv.h> diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index eceafc9905..0cc73a8afe 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -21,14 +21,11 @@ */ #include "config.h" -#include <stdio.h> #include <string.h> #include <math.h> #include "epan/packet_info.h" #include "epan/tap.h" -#include "epan/address.h" -#include "epan/strutil.h" #include "epan/value_string.h" #include "ui/tap-sctp-analysis.h" diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index a30ee53eda..6a15c18338 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -29,7 +29,6 @@ #include "tap-sequence-analysis.h" #include "epan/addr_resolv.h" -#include "epan/column-utils.h" #include "epan/packet.h" #include "epan/tap.h" #include "epan/dissectors/packet-tcp.h" diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 3315292d4a..370cdfd76d 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -24,14 +24,12 @@ #include "config.h" -#include <glib.h> #include <stdlib.h> #include <file.h> #include <frame_tvbuff.h> -#include <epan/address.h> #include <epan/epan_dissect.h> #include <epan/packet.h> #include <epan/tap.h> diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 2b9b64e113..e724cd5cbe 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -22,10 +22,8 @@ #include "config.h" -#include <glib.h> #include "globals.h" -#include "wtap.h" #include "pcap-encap.h" #include "wsutil/tempfile.h" #include "wsutil/os_version_info.h" diff --git a/ui/time_shift.c b/ui/time_shift.c index ea5522690e..fccdffa8cc 100644 --- a/ui/time_shift.c +++ b/ui/time_shift.c @@ -27,7 +27,6 @@ #include <string.h> #include <math.h> -#include <glib.h> #include "time_shift.h" @@ -26,7 +26,6 @@ #include <stdlib.h> #include <string.h> -#include <stdio.h> #include <errno.h> #ifdef HAVE_UNISTD_H diff --git a/ui/voip_calls.c b/ui/voip_calls.c index a9d2cff76c..8b4488383f 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -36,17 +36,11 @@ #include <stdlib.h> #include <string.h> -#include "epan/epan.h" #include "epan/epan_dissect.h" #include "epan/packet.h" -#include "epan/tap.h" -#include "epan/tap-voip.h" #include "epan/dissectors/packet-sip.h" -#include "epan/dissectors/packet-mtp3.h" -#include "epan/dissectors/packet-isup.h" #include "epan/dissectors/packet-h225.h" #include "epan/dissectors/packet-h245.h" -#include "epan/dissectors/packet-q931.h" #include "epan/dissectors/packet-sdp.h" #include "epan/dissectors/packet-mgcp.h" #include "epan/dissectors/packet-actrace.h" @@ -61,10 +55,8 @@ #include "epan/dissectors/packet-iax2.h" #include "epan/rtp_pt.h" -#include "ui/alert_box.h" #include "ui/rtp_stream.h" #include "ui/simple_dialog.h" -#include "ui/tap-sequence-analysis.h" #include "ui/ui_util.h" #include "ui/voip_calls.h" diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 9a2eed528c..11aecaabb6 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -22,16 +22,11 @@ #include "config.h" -#include <stdio.h> #include <tchar.h> -#include <wchar.h> #include <stdlib.h> -#include <sys/stat.h> -#include <io.h> #include <fcntl.h> #include <windows.h> -#include <windowsx.h> #include <commdlg.h> #include <richedit.h> #include <strsafe.h> @@ -41,19 +36,15 @@ #include "wsutil/file_util.h" #include "wsutil/unicode-utils.h" -#include "wiretap/merge.h" #include "wsutil/filesystem.h" #include "epan/addr_resolv.h" #include "epan/prefs.h" -#include "epan/print.h" -#include "color.h" #include "color_filters.h" #include "ui/alert_box.h" #include "ui/help_url.h" -#include "ui/file_dialog.h" #include "ui/last_open_dir.h" #include "ui/simple_dialog.h" #include "ui/ssl_key_export.h" diff --git a/ui/win32/print_win32.c b/ui/win32/print_win32.c index aeb4de0fae..d58bedcec3 100644 --- a/ui/win32/print_win32.c +++ b/ui/win32/print_win32.c @@ -26,12 +26,10 @@ */ #include <string.h> -#include <stdio.h> #include <windows.h> #include <commdlg.h> -#include <winspool.h> #include "print_win32.h" #include "wsutil/file_util.h" |