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>

diff --git a/ui/alert_box.c b/ui/alert_box.c
index a5b78e1182757485e775957772c7ade28a5e3329..aac268558d09f3bccdf1278de9a19031cfdb3278 100644 (file)
--- 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 961d61db89ecdc8c88c5208cdc6669e3e7adf44f..d6e31d5f6553d6af271a6f5ae411cea804db97b0 100644 (file)
--- 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 bdc235f5e97aefcfc28d806d10883076fa8afb9a..20e67954cb1030bcd5ce41b231717892a7b7acf3 100644 (file)
--- 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 95495eaa16aae856e60ab3e37fb9a2fc900e9709..674508aab6b2762d245b2af0de570afe352fb829 100644 (file)
--- 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 257c210b36676e0f43ca77f03042c3e513c80e1d..1c6aff2bc4f24ccbed32f7aecaa26604e8cb38e2 100644 (file)
--- 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 b6e5cc80e2514e61e4147050e37a41cad30a9d5b..8ae358beaa6d1645b6daad56f0d08d8d8735b0a2 100644 (file)
--- 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 6be940fe7baace1acc3ac833d95d5dcc2858723a..9646cc79236adaa0ba38239c7359dd2e45ebc089 100644 (file)
--- 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 23497406aaade9e6366fe61529406bcffe0220f6..1d0ed303bef9e163bd04833706610f1a7641418f 100644 (file)
--- 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 29555a9e9c4ac55a1b863c375fd9660d52bccfed..064dbebe3fc06ec3e52d84968f9fcbf712c0609f 100644 (file)
--- 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 2c61e8ee3d9caf3ccf7e53e262f4745a35be4f7a..08badeb686ddd5774648bbb8d5f6b586971913a9 100644 (file)
--- 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 aa53ec0048ae8f7dc4e1236e12c45b4853f2f498..a4c2360f7c82ac75796f6752cda0d6943be7586a 100644 (file)
--- 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 9677d4570afc910f9d9fa86deaffedd255acd6e7..6b72c3a833f35437ffa75a3b19f30d418c1fdd51 100644 (file)
--- 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 9f07ebdb9d878b5e0e28f1401a9d90b2c359e1f6..971dead5df34a680aec62001404cf5bfa5257c9b 100644 (file)
--- 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 0eb397ee4c2c1ea37acbdfd5929845043660735b..9e929f6c57aa1d324be7e23a616dc2ee2f4be63b 100644 (file)
--- 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 7b14260a9fca4242e895157ccefa5b7a2070b794..63107bae6bc092f4012571afb396edec655975ff 100644 (file)
--- 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 3b574c22ef3c790096c4d5ba59773c680b446e3c..de5c42ec60b24f921b27616c7f9c3abffb634f24 100644 (file)
--- 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 71b67472c0f3384e9f436bb5cec0d57d7a3a693e..178892ccdb0b13bc2ab252feaa20948737c64ed0 100644 (file)
--- 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 cd37793d5ce635807ef4e9830c938da071162cd8..de0b3169708c36c31d703510f69f1fc910f95129 100644 (file)
--- 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 6c0a598760dc64f1d2c5c15e44cb3adc3f3eb72b..97a86dc2b12079899be7439b77900cbf7d88c618 100644 (file)
--- 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 24e516be25a8e44f1a3b41bc157f640a9c500b03..90a198f3775b117e6033549e160d8e2c13b5bf6a 100644 (file)
--- 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 ac6421946347e1892652e6757d54b665f9de39b4..8684861340cd810442c0cee0449eea39285d4d6a 100644 (file)
--- 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 2adaa42c54fb67ecf28c41548b49cc7a44b85d78..571b9f4a403d0bf62fca398ad89c68cbae987968 100644 (file)
--- 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 6ca783030d0612b5ac8ca48925819df97d7d4f8f..f36a0ec6043decf5a31c4fe5e850ebc267fd43c6 100644 (file)
--- 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 3cc1943738eb15be957c47bf1d34cb6e93e4bc13..93e165bb5814418fbd3ac6c3376abac6e2644cd2 100644 (file)
--- 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 49807600c46ceac40a13065fb5a898eff38dfaf2..d92ec97660f7fb63b98abb3720b067d8c28f6c74 100644 (file)
--- 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 de866916dc346bd08e5df049b8c25abacfe9aaf8..a0343c669233147509594daf35f83a815fb55a2b 100644 (file)
--- 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 34055e0d226b006f9c84951948be6780f7e9625d..18eda94b0973fe618531b83a1a63e232885b7fd1 100644 (file)
--- 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 23eee4529732b726abddeb632991386675ffeb66..8fc6f852d1883d45b281ffd84ced34cf9dda4b07 100644 (file)
--- 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 6f100c03564597205d698d5ab52acdfce9ea1a3e..b032dc9aa6b8e0f58d7776accfda00d127b6188d 100644 (file)
--- 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 71129e1aaaeda0690421a7fae9013731dad65972..f9dd677392c093c5aecb05553b5af5f8d7e71640 100644 (file)
--- 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 bc59809d58626775f812a080187cb10da0fe7846..c87cf6559c1540b67355beee1608257a84f3ac5d 100644 (file)
--- 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 d885ec732ebaa9c58bd18dec541cd34eb983a9a0..956020e3d0edb2ce050b86a540714357805e4804 100644 (file)
--- 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 a2362dcee92a242e07747952c1c6630b2ba30452..bada3c1ce33e73115d93490e493dbb5565cf5496 100644 (file)
--- 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 da140c9267135b20a090337cd8f1b6c2294cd62c..19fe10eef210ff5939ec9a79ea90d30a64b13ef9 100644 (file)
--- 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 0c26112fc676c893ba185f55e9a53c8b2d70f85e..0a49f091c7829248a41e440834956de0f33101b6 100644 (file)
--- 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 08d6b721c9ea4fd63cc795f2ae18532b2cd1cd8c..d4376ac6274d28375ecf9e58e063f3b3833c14d1 100644 (file)
--- 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 39330ae5fe2751ceda51994373cb8299105c57d4..7bf31814a063a175fbe778ee6e8b6aad98b8bff8 100644 (file)
--- 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 ea6582fc9ddb3b16ed92d060bca48758c3dbbe07..0bbf695a80b6f4c3f3194ab20f86d618dc4fef1b 100644 (file)
--- 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 5f9edb3f60ac38ca2a4e64c39d1bd0c0d044529a..dfbe60d773ddd580a18df315b2c0e678b4586762 100644 (file)
--- 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 481f4e51edbd9a53bcb95a6a17acd349081ebc9a..d9c2354f6038e93bd15e376022d2df43a6a01205 100644 (file)
--- 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 af09919e0f202ba8cf520e56a52a779ba9c51403..ab762be64b9e89cf139326e31557b7c372b52088 100644 (file)
--- 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 ffdee6c8fb2aa1f26c71aa5fbdd6d6c410b0f4fb..d764c5566c29c97e1ab32c78fa5f98a75c863c7a 100644 (file)
--- 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 6cb8c8f77503049019af12a6381b9871d567092b..9c90694eceab59300463ed69a4266b6dfd7d96df 100644 (file)
--- 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 cd28017b0973caa5c11134a4ac8dc1b9e1b014c3..5f9998667f9f5bed2ace6361bd7c71d9008d6d64 100644 (file)
--- 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 e1fff8a1794537cb52fd9e908f5cd4fa50d75658..ef56614cc2172112bc4d02c3553d5f04019db7a4 100644 (file)
--- 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 381d13bbdcd57b2ec5b50424d316ba7d0207d222..affc7f806c1fdbdf80f96395a8837defec125a5b 100644 (file)
--- 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 1dd26e594fd8ba8e69037e3935e0f3835e4d059f..f00ba17fdf3dc1970d8bca1626c2fe25cb955e8c 100644 (file)
--- 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 49e573ef9b054240c5dc9f7e1f0a34efea277f3c..28eae3f3d94066a9c191049b4bc5d15dc25803a4 100644 (file)
--- 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 28a2875a8131f7bc2c532c0b9fc3a8fc86358890..7522caa3ffa7063cc908385fd8ca074f4e96b8f6 100644 (file)
--- 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 5bc1e82191715f5c9163209e3259b8007d48c54f..8eb27ebf541bee28dec44733860d84ca8658f17c 100644 (file)
--- 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 0c721b15e2d78027da8df0dcb37b0dd5160b5d56..01f14d1bba6700ce37ce5a307f3bc01e3416782e 100644 (file)
--- 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 2202e8818fb120dbf402adecb3f39718a8296da8..7b22a0562072fe9671565a5d8a3e7787a0834db7 100644 (file)
--- 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 b82d6c4b3cc40878cf86d5e16d7dfbdc39b0a1c3..3a5fce7b109b8d4f61e24dcf0aeb916de9e51102 100644 (file)
--- 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 2b72edbcc2746b2fd72ac080f37889f2eb849101..c29bdcdd492fc6809551eb6f027b83056025c564 100644 (file)
--- 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 5c288810bfcd83cca90d122248fc064add4f573f..492f7100bb03ca670102b7444a5b6e1b9e749aa6 100644 (file)
--- 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 5fbd29a8172fd6666a2977b0c075ff3522be837c..acd0b07b20eb598d2b8d4b7c817f0f423db4edcb 100644 (file)
--- 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 402d2a297ec7a50e9bbd18f9fe6028e9362dc817..4d11fb435f499c33f9183e0a8c9e19a523030993 100644 (file)
--- 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 fc0c4ec384a5101cde1bf3d506a2a5368caf244f..f861f7c81ff4cab5fd2743bde27174f3522f0bb4 100644 (file)
--- 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 c17a48c7ff488aa7c2e88579818d1e87b7ef74bf..f5a68b579e792f846cd3ad408bd27fc7cf6b9cb5 100644 (file)
--- 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 b3dac7aa789b9ee49a803a11eac2fa6260939c95..80f0489d79a30fe23bde87d78afde7e83fdf188f 100644 (file)
--- 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 87b437ea120b45e06143b4fdfbbbe20e2543eb3c..e97d7d68807ca43228b80afa6612012034b52ea8 100644 (file)
--- 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 dd8b8ee7656783baf7be42a3305daa92aef2403b..2f4d665f7cb350c986e33a37a6876e84ba071c16 100644 (file)
--- 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 f8945b055428c072bee1104721cffb55ccf959d9..20195660e9b2720d26168c2d2da42c992c559056 100644 (file)
--- 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 c974ef575208469b03fa08f4858f0f0ceea925f1..42b1fce03a9918bdf59695eef51f57a571cc31a8 100644 (file)
--- 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 df25d56108bce5d4d532065d125ed76a2a7416a1..a35076556a8692ba498ca641c5f50564908e45cf 100644 (file)
--- 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 29d383d736464247e3bc3d1739df5d6c407e8b71..22565036ade7d1325d070bb561f3a118ee08ce0e 100644 (file)
--- 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 5f911a04e27a98fd7814135f0503f437d774d8cb..8af7972a375c4dca5d533be811d43f51d96f5805 100644 (file)
--- 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 aeb7d518cdbca0e844b3be7eace5f5f9f2a40696..fbef04856161c8ffdd426218c3bd9c3ce277b71c 100644 (file)
--- 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 133b41af29fe4f2fcb38270a6239d46563d6af11..13bf97a3e6b515dfb51cb279c009d9ce2ed08ed3 100644 (file)
--- 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 a73666a3a899925152638a187bb344903988feab..641cd716c39b8918c7152a28672a6c62dfa82c73 100644 (file)
--- 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 1fc739e9730af12c55342bf78fbef8c5cbb5703c..eebaef016d74b968b83478d7ebb287456bf50774 100644 (file)
--- 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 cdf093550b96c6ff54fde939cdbdef0b86497dbf..b694c8a1c70573320d2f0f1adc597ae752d4620a 100644 (file)
--- 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 2f38e63e2c3ba6719b22a13eca4f76145050eb18..5b363c17c164dc5e3a24743d7308ddb1cca865da 100644 (file)
--- 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 ef16df241e59795b5477b4ee37d84341f9bb4c6b..a16317e8a9b7149888e8544b887493b74101a3fd 100644 (file)
--- 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 2e9c8ca33a5ec168b79d260725d367372f042d22..31d247417f6b1e8b480430f3a985ad7f5ad5f087 100644 (file)
--- 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 a4a806713a6e4bb7ee2341fd39c8825486ac1024..0b3f9c5c15afdd3aea84257b42478ea65ae1d5c5 100644 (file)
--- 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 794f1074b2651cb1f1f4ff1026a352abb3220cef..b3e6dab3249db11c277bfbb3500fa3763dc146d2 100644 (file)
--- 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 b02f767aef35d77f91f277e21927ce2e8f086f94..50bfc072aa9aeab10c370efe972c9a47f017feec 100644 (file)
--- 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 9f066bf3acb6241da64ba235d38d33836ac16aa4..fa31d6910800d09739c3061e8707391c1797c86f 100644 (file)
--- 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 ab4b79d26d4de022b9f50e8d46337cbf9d38fa8f..98eb2f8ac7aa900ba322d43e2d1a85a6513dd73e 100644 (file)
--- 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 69c97c964336c3460f6d2b38593d882a7e034e17..53d1e4da500465cc010b3421fa489d99935074b3 100644 (file)
--- 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 1723f643696c2bb8f6269b5184b304a09d7eccd8..9a354b6356470b1b49e51527e2853e68e8a39d6f 100644 (file)
--- 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 b3266ec6d595042680780f1293fdae4d79db2f69..a8cb00763efa0d4c53403c9b0c910194fd6a9c48 100644 (file)
--- 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 bdb141e4d0483f02e1f607a4eed103bb82f9472a..6473477441d6b5f9fa31f8a4e584158ac93ca133 100644 (file)
--- 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 86ef837efd8819c6ae95f2608765607a51d69693..3b08532dfb89104c9d474bc3db4e05d6883ce59a 100644 (file)
--- 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 0e66a5e849d509eb0254b417a9cefc2a67c1ed09..f572bafc5b6d80bb26577722295736c71540f365 100644 (file)
--- 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 17bb8c34c1a77f0c40f50bf76c116cf4b84c5160..c4dbcce6a4d828a27968177589b30fbcd53845b2 100644 (file)
--- 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 8374f610d9cc4def9d87dd996e1ca478a6aebafe..685b3f597dcbf223c5898863e593270b7b47e24f 100644 (file)
--- 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 2afd5a6e17487368f7d3c4902257e37c49f34d72..0c43918ae2ccae0f2df0ddab3135a6996c979877 100644 (file)
--- 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 caf70ece9f15c31b7deeb349d446aad8e05d6427..48a30f145e5f0d1e6b35f36c9884b3a40721a419 100644 (file)
--- 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 5ed634dfe778b53e69188df6124505a769802bd9..1b74a570322cbce5415c4f6079a0faf12b805bde 100644 (file)
--- 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 0828d16cbe568fbc78c8a584620940e02f668bd6..fdf021c260a86527160adb519d6e9772ea209a1e 100644 (file)
--- 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 a55899017bdc0ee8f92857b79ab5a5fea9a74144..673a8e791331a94cb9f176ef4b9e6d17f77664b4 100644 (file)
--- 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 7b1754ce1735d1b80ec857fba17899215dfbae67..71ea3d3270d2613569aec0efa49cc210d1765324 100644 (file)
--- 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 128c76ab422e6f1e51a7a0a0fbdd985e7ebff65d..939e8d11f3e3563326f9752f6bc473dc1b39de2a 100644 (file)
--- 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 b4bb2430de3c44e7d1d3e93b66a41bd7ad44054a..b2a312e26564f968faf326684407837b22ded466 100644 (file)
--- 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 9e2a9d28a48ef9ba3ed92f58ea8c9f5d72bcb016..e79ae1b4e89eb25135c3eea0c2afbc43435b288a 100644 (file)
--- 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 4b934bf1af1605b4d6ac7f41997d9e8c2355a058..8708196fdc8fdd1c7e1a807be48630e3ea9bcac5 100644 (file)
--- 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 3e3c3649465355e886be2f7a89a18ba87ee386c0..af7adf8379e2bef30310b1e2e748a97ea22718ce 100644 (file)
--- 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 bc3c0ce84b6f2e77f9501b12a80ed73157909870..65a3fee8ae135f24ad7292d902c9280ee408f1ba 100644 (file)
--- 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 60305b9e6a02acdcb1ef547c7520e7518c421f48..17ac2273f2d37e1ab82e7b958af5a72050bec51e 100644 (file)
--- 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 230cb8fbfb13e23c9a91c36bef706096d2d6494d..01117aed9758d88f5d554a80f753864d47bb0944 100644 (file)
--- 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 862275bc3f65da035a4443377eb2ccaa5fc9e7eb..10ff3a820a045926db8523ca0bc8802963aae0f5 100644 (file)
--- 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 7e7018209ff7ad327ba5bdfe16c9a7feff592f2f..62646edd243ecb7097e0cda5ae65c51d0d3b6752 100644 (file)
--- 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 8e6f4f69f0fed38344a4e1b3ecc092322b6a5e1e..63ea1de16a0fcbc9245a7101443459b25eb6d706 100644 (file)
--- 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 8bd72f06e06afe9ca54d8ea125c1eda60ddfd496..5770086dcbbc05010d4cab516574d8dd1ad36262 100644 (file)
--- 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 eda5481577e120adb9e93a0b0561344f23043b92..5441d12b945a865ffc96cc7761a43eda0e7b0475 100644 (file)
--- 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 739c390e90c5d304d472dd89abda29619f1f7c8f..bc6f01d903b89212ce558de24f6eba465fc9b94a 100644 (file)
--- 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 e433f797dfd6acd7d840cb9eaff2aeebe1186ab1..7ba21e5406cebfa70a4f86a1909c82b72d42e727 100644 (file)
--- 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 f6736583b34a4b9016fc1e6c84b185fb9adba23d..0ce4a36f681f0826349a55effa9d45b21c1f92e7 100644 (file)
--- 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 0b639f0db13a4ae5bab3cc1ab699ca074ed3001f..5a1327e5ceef00e991c8034a04cd9e42885101c2 100644 (file)
--- 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 e9c2ac1b1d42a73cc2ace75e06a2a6d1b90ce964..ff63ce24c38e528f2777b347e8292e70d36c58e2 100644 (file)
--- 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 6de7daa2967017fcbcc4b35087ccfa56fceaade4..71a0d3777f6ebaec12f5da745642d1ff475078c7 100644 (file)
--- 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 06eca2807b70ba2af702b23a13b2c5cd6c7af3d5..87892e472dc593a20b95da3bca02d3f06aeabda1 100644 (file)
--- 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 5ba701f82fec23e8bfb451b713ca4d9522449ba6..c13d9c3575e14fb5027fc2f29690dc296ce3503e 100644 (file)
--- 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 71a79352c3a02be1e178ca481835d5da2358417b..9f3813243727f97c3a46b7d605cfd722a742369e 100644 (file)
--- 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 5f4cb1dbdae237e68ced061544e25638c851fc0f..cf93f01379eb6ba08cdfc52d221d6464ceecd5dd 100644 (file)
--- 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 66f4d4f7658c0318d32fc93b33124bcababdd3aa..aa5b1f514c235cede9559b1b5d7853434cdcab36 100644 (file)
--- 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 da26d7e6b2745cb6feb2dd9f0369dd640a258bd1..43163d2a54ab514c64b3f437be2cfc11fa16788f 100644 (file)
--- 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 264c0bf3f07181556ab9613c031f8ef5f4765842..8ed9591066284a12922c169a299a53ea292fe42a 100644 (file)
--- 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 feb15809ee379549e74bbb6793dded4c3686752d..24992bf8febac05afc16ece000bbe972c3765596 100644 (file)
--- 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 2210121bdaf12aa16dc2ab96981dbec9b3e9e68e..eb46fc312340a459940d28d434a7a231eeb46924 100644 (file)
--- 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 602c20971ebf311e63bc28457b635dc6bbbc9a40..c0b7606b0131e6a6250393db783e0ba96b4debb9 100644 (file)
--- 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 3b47b87eaed6cf0494478bbac3791be2e453539e..4df1879170e130f104fff00d0afb8e664767d535 100644 (file)
--- 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 3af1a83a06ea3f2143b8dde6b03ed5cd556efd51..953d5cd4ae14686dd302010c9114240a89afa1d3 100644 (file)
--- 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 35509810d031c9431846353269ed69d946e14733..3ca666675c69531a199dc67c8c8979579c1394bc 100644 (file)
--- 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 9b67a70dc8779409c942d9fa910060a6c636a95f..41456dd8bc55d46b130f59613fee1b79860d84d0 100644 (file)
--- 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 020f0348a71d4afe95647dbfb6b46035ad8ed15d..7581afe0888017a1f1e05d32654e4d2f3e870449 100644 (file)
--- 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 57aa38f4c9443d75d22bce6f5d7b95491068b1c5..1e6d4f9819f139ec41e934f5734eba74846995d9 100644 (file)
--- 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 3ccb86022bada3e8d39dbedcff4eedfba861fe48..dd79b5d95eb2cdebe6555c08fbc28da17c116c9c 100644 (file)
--- 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 e7278668edf492b80faf3866278f68a87b26b31f..4ba1b6a36c87718535fab3e52ca58c73d4f79cb5 100644 (file)
--- 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 37f00bd05be5486ffc5bf6b2d8199377aad8b6b7..26c0daf8a35c5278ff700e513fd80c12fc26980c 100644 (file)
--- 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 c5a9717c7dabf043892d2cfcfef8f702c34bd1e7..64196e92c09b5622d5442352c89de9e0e3b7d70c 100644 (file)
--- 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 a2f61522eaa7f2330129397a3052be0b50f690ff..90b9254563167730663569520af6d7cb8e0e90d7 100644 (file)
--- 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 50bc3987957b3d443144bea1390249dcc8f6428e..acfd42b99b87a660252b53542320da8067eef179 100644 (file)
--- 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 ab6c5669eb506e63cf554912bc119e19f9ecdc49..a3bf8a5812070abcf7556e7ab546d7a230494c43 100644 (file)
--- 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 2d3606d6df05555b8ca5eb20fb63157f14085a51..6abd6a5d7f1c3e0b1e45b0a54f50f36c9297fc86 100644 (file)
--- 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 f5228f4df348c1d760101aca9f6ae71dee949889..ba32057eb3a0d1b226f54e318e3e709f1eac2566 100644 (file)
--- 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 2db54696f310f4b2cd9134329bbf8f8800694ccc..a76b2caf6757ad3177a049c321f2b3d47e176610 100644 (file)
--- 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 8a6ea164399f8aee2928f23383f523ff1058ea1c..122e6aa0a172ffd096a9df8e221b401fd80bedde 100644 (file)
--- 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 4609bd1e919102b7ba04fb03cdadbc7296e453c5..6d008596c79b7c3dce5d2b1028b5855c6cb9f946 100644 (file)
--- 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 624d1215661423713b0afee3e24daf259966c3b7..c078ee959a3776edb03f8c8353429df33d0219c2 100644 (file)
--- 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 5ff8e97fe95f7be9dc52280a72bb48a2b76d08ca..3c2bf9f30a23f4a88ceb53a38643a312e9d45e4c 100644 (file)
--- 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 cc25c1bcf9b8a8821ffba83e6e37bd7a0e1a67da..22c706b5852c592b3d9d1aec4fcef4cad1deb09c 100644 (file)
--- 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 fdba1159930db23833f48e3826a7f09d8fee899c..90dc8f71b85a66e163802ba061f90c5ce4fbbdaa 100644 (file)
--- 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 9dd57caf1727ef84861c8dee1182d89f01310407..497b0e041aa9bbc237d9eeb912ea448bae19a371 100644 (file)
--- 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 5f5c7ace03c7aa7e4fd4b70a02eed9ccea66955a..d8895fb1f099db17e909aff2cdeea81995cf0384 100644 (file)
--- 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 5452481966da3091bb7873c0e67126074f1c792b..5b1d3b95c11d7c19836603ce569372cc472f445e 100644 (file)
--- 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 91f5c6932ba3584eadedd84cf8db1838dc774785..38d547dfdd51f9124e77eaa9a537c107d40792f5 100644 (file)
--- 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 f32c8929a3c160b176d731dc5b5705b8d4641e18..910db664113b35912688b18b66c1a28261d18fa0 100644 (file)
--- 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 ae9bc0d3ce22a7e6d240dc17c12da8dbb1ecabcc..9c686d962f5c66cb33d10f6730891b949b9f3fc8 100644 (file)
--- 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 9e6af04f72ebbb67a9e3cb1eb9fdacaa2638c79c..75a716298ddfc4e9298fd3ce63b548d4d17a0fd0 100644 (file)
--- 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 57d6aadd621d439e960db3c3cf05e52f54ec040a..0f8ab2b775bc0884e246984209fb2f0e2fd55d8f 100644 (file)
--- 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 77a46d9d16027bd12bd6500e5d18d40161701239..1bed39bd2f9f26fbfdeac3e29be26c0f98c31fc3 100644 (file)
--- 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 3118ac3c44cd0b93cffb0f2efa3f4904e25a8c7d..0aed43e06f65bd4ca0fcb8944247ba46c82b6812 100644 (file)
--- 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 115501d019dc33f4f2b199cad7c7a00d1ba5ebce..56376426a30bc0a8097866651ec76b8e4b3a4204 100644 (file)
--- 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 b8eeda637fcc57a9eb3e2a35a01449009ce84dc7..d0c99ce07469556d5c61b0e676854223d8570cfc 100644 (file)
--- 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 b958e16bc4860114f3c1d2431b27cf17dd3503d6..0374fae708fc863ece56f664701b69974d0c01a7 100644 (file)
--- 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 3ed3186537f4cff395da08cad6f5421b2e377ab4..1959ea1c70f9304e96a10c05469f963108818a13 100644 (file)
--- 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 eceafc99053df04c2124915ac93869fdb18670a3..0cc73a8afef7f262c223f611ff3d0577f44bb29f 100644 (file)
--- 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 a30ee53eda2a0808549ad2d2f2931dc8c903d41a..6a15c18338a1f2a6cc003de7daadb811796e7d89 100644 (file)
--- 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 3315292d4adca0f157dfea7a233863041e8d7bd7..370cdfd76d2ebc90407e4a55ab0cf33d966c63ae 100644 (file)
--- 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 2b9b64e113fd9ce957091a546c04febefb9862d5..e724cd5cbe9ef6d2cf912b3f840c475cc70cfa0d 100644 (file)
--- 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 ea5522690e688e723ba77b0691463bc57c3190c1..fccdffa8ccf9ca80d54cf22516ab34a9d0854cb4 100644 (file)
--- 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"
 

diff --git a/ui/util.c b/ui/util.c
index 9f7ba6e65bb1ea91f6dee6dd090534833a45a282..f58abac20af05dee8ce5e8851fe24b679de84798 100644 (file)
--- a/ui/util.c
+++ b/ui/util.c
@@ -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 a9d2cff76c8e0d861c63ca123f68fada2b816468..8b4488383fb7fbe9538aae36ded06d18b412a1a7 100644 (file)
--- 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 9a2eed528ce2b9efe974b5914d079cb26f54d124..11aecaabb6a5ca13582c99ba2cf103ce7059bf79 100644 (file)
--- 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 aeb4de0fae2dc7ed7f7c1e0352aefe4b8a6d8480..d58bedcec3122362643aab3fffed2d8878432ade 100644 (file)
--- 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"