Wireshark · Wireshark-dev: Re: [Wireshark-dev] Add -Wdocumentation

[Joerg Mayer <jmayer@xxxxxxxxx>]

On Fri, Dec 06, 2013 at 03:38:08PM +0100, Alexis La Goutte wrote:
> I plan to add -Wdocumentation [1] by default to Wireshark (when build with
> Clang).
> I have already fix in trunk the documentation.
> 
> The major issue to add -Wdocumentation is other library (like glib/gtk...)
> It is don't use doxygen and make a lot of error.
> 
> To fix this, i use pragma to disable error for glib.h or gtk using a
> wrapper (like wsgcrypt.h)
> 
> I attach the patch for gtk.h (the patch for glib.h is to big (>500ko)...
> because modified all dissector !)
> 
> It is ok for you ?

This solution looks like overkill to me (touching lots and lots of actual
source files). Isn't there a way to handle this (at least mostly) via the
build mechanisms?

Thanks
    Jörg

> 
> 
> 
> [1] -
> http://llvm.org/releases/3.2/tools/clang/docs/ReleaseNotes.html#majorfeatures

> From 128ffbeb65f6f2baa5e6f493ca8527de85c823c2 Mon Sep 17 00:00:00 2001
> From: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
> Date: Tue, 5 Nov 2013 21:17:48 +0100
> Subject: [PATCH 3/9] Add -Wdocumentation to autotools and CMake
> 
> ---
>  CMakeLists.txt | 1 +
>  configure.ac   | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index f9c3a57..a1f8bc3 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -230,6 +230,7 @@ else()
>  		-fno-delete-null-pointer-checks
>  		# All the registration functions block these for now.
>  		-Wmissing-declarations
> +		-Wdocumentation
>  	)
>  
>  	set(WIRESHARK_EXTRA_C_ONLY_FLAGS
> diff --git a/configure.ac b/configure.ac
> index 6ad85ae..e2a284f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -839,6 +839,7 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wwrite-strings)
>  AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wno-long-long)
>  AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wc++-compat, C)
>  AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wheader-guard)
> +AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdocumentation)
>  
>  #
>  # XXX - OK for C++?
> -- 
> 1.8.3.2
> 

> From b4a8792e89bd9c0c373f1341c5db65254fd9526a Mon Sep 17 00:00:00 2001
> From: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
> Date: Wed, 6 Nov 2013 20:35:30 +0100
> Subject: [PATCH 7/9] Add also wsgtk wrapper (used for wireshark-gtk)
> 
> ---
>  wsutil/wsgtk.h | 41 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)
>  create mode 100644 wsutil/wsgtk.h
> 
> diff --git a/wsutil/wsgtk.h b/wsutil/wsgtk.h
> new file mode 100644
> index 0000000..a7f45c5
> --- /dev/null
> +++ b/wsutil/wsgtk.h
> @@ -0,0 +1,41 @@
> +/* wsgtk.h
> + *
> + * Wrapper around gtk's include file gtk.h.
> + * Try to work around these warnings to ensure a clean build with -WDocumentation.
> + *
> + * $Id$
> + *
> + * Wireshark - Network traffic analyzer
> + * By Gerald Combs <gerald@xxxxxxxxxxxxx>
> + * Copyright 2007 Gerald Combs
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + */
> +
> +#ifndef __WSGTK_H__
> +#define __WSGTK_H__
> +
> +#if defined (__clang__)
> +#pragma clang diagnostic push
> +#pragma clang diagnostic ignored "-Wdocumentation"
> +#endif
> +
> +#include <gtk/gtk.h>
> +
> +#if defined (__clang__)
> +#pragma clang diagnostic pop
> +#endif
> +
> +#endif /* __WSGTK_H__ */
> -- 
> 1.8.3.2
> 

> From a52307b589ffc10bc3172dfc9d626c2a51dd5275 Mon Sep 17 00:00:00 2001
> From: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
> Date: Mon, 2 Dec 2013 12:13:49 +0100
> Subject: [PATCH 9/9] Use wsgtk wrapper
> 
> find . -name "*.[ch]" -type f -exec sed -i 's/<gtk\/gtk.h>/<wsutil\/wsgtk.h>/g'  {} \;
> ---
>  plugins/asn1/packet-asn1.c            | 2 +-
>  ui/gtk/about_dlg.c                    | 2 +-
>  ui/gtk/addr_resolution_dlg.c          | 2 +-
>  ui/gtk/afp_stat.c                     | 2 +-
>  ui/gtk/airpcap_dlg.c                  | 2 +-
>  ui/gtk/airpcap_gui_utils.c            | 2 +-
>  ui/gtk/ansi_a_stat.c                  | 2 +-
>  ui/gtk/ansi_map_stat.c                | 2 +-
>  ui/gtk/bootp_stat.c                   | 2 +-
>  ui/gtk/bytes_view.c                   | 2 +-
>  ui/gtk/camel_counter.c                | 2 +-
>  ui/gtk/camel_srt.c                    | 2 +-
>  ui/gtk/capture_dlg.c                  | 2 +-
>  ui/gtk/capture_dlg.h                  | 2 +-
>  ui/gtk/capture_file_dlg.c             | 2 +-
>  ui/gtk/capture_if_details_dlg_win32.c | 2 +-
>  ui/gtk/capture_if_dlg.c               | 2 +-
>  ui/gtk/capture_info_dlg.c             | 2 +-
>  ui/gtk/color_dlg.c                    | 2 +-
>  ui/gtk/color_edit_dlg.c               | 2 +-
>  ui/gtk/color_utils.c                  | 2 +-
>  ui/gtk/compare_stat.c                 | 2 +-
>  ui/gtk/conversation_hastables_dlg.c   | 2 +-
>  ui/gtk/conversations_eth.c            | 2 +-
>  ui/gtk/conversations_fc.c             | 2 +-
>  ui/gtk/conversations_fddi.c           | 2 +-
>  ui/gtk/conversations_ip.c             | 2 +-
>  ui/gtk/conversations_ipv6.c           | 2 +-
>  ui/gtk/conversations_ipx.c            | 2 +-
>  ui/gtk/conversations_jxta.c           | 2 +-
>  ui/gtk/conversations_ncp.c            | 2 +-
>  ui/gtk/conversations_rsvp.c           | 2 +-
>  ui/gtk/conversations_sctp.c           | 2 +-
>  ui/gtk/conversations_table.c          | 2 +-
>  ui/gtk/conversations_tcpip.c          | 2 +-
>  ui/gtk/conversations_tr.c             | 2 +-
>  ui/gtk/conversations_udpip.c          | 2 +-
>  ui/gtk/conversations_usb.c            | 2 +-
>  ui/gtk/conversations_wlan.c           | 2 +-
>  ui/gtk/dcerpc_stat.c                  | 2 +-
>  ui/gtk/decode_as_dlg.c                | 2 +-
>  ui/gtk/dfilter_expr_dlg.c             | 2 +-
>  ui/gtk/diameter_stat.c                | 2 +-
>  ui/gtk/dissector_tables_dlg.c         | 2 +-
>  ui/gtk/dlg_utils.c                    | 2 +-
>  ui/gtk/drag_and_drop.c                | 2 +-
>  ui/gtk/edit_packet_comment_dlg.c      | 2 +-
>  ui/gtk/expert_comp_dlg.c              | 2 +-
>  ui/gtk/expert_comp_table.c            | 2 +-
>  ui/gtk/expert_comp_table.h            | 2 +-
>  ui/gtk/export_object_dlg.c            | 2 +-
>  ui/gtk/export_pdu_dlg.c               | 2 +-
>  ui/gtk/export_sslkeys.c               | 2 +-
>  ui/gtk/fc_stat.c                      | 2 +-
>  ui/gtk/file_dlg.c                     | 2 +-
>  ui/gtk/file_import_dlg.c              | 2 +-
>  ui/gtk/fileset_dlg.c                  | 2 +-
>  ui/gtk/filter_autocomplete.c          | 2 +-
>  ui/gtk/filter_dlg.c                   | 2 +-
>  ui/gtk/filter_expression_save_dlg.c   | 2 +-
>  ui/gtk/filter_utils.c                 | 2 +-
>  ui/gtk/find_dlg.c                     | 2 +-
>  ui/gtk/firewall_dlg.c                 | 2 +-
>  ui/gtk/flow_graph.c                   | 2 +-
>  ui/gtk/follow_ssl.c                   | 2 +-
>  ui/gtk/follow_stream.c                | 2 +-
>  ui/gtk/follow_stream.h                | 2 +-
>  ui/gtk/follow_tcp.c                   | 2 +-
>  ui/gtk/follow_udp.c                   | 2 +-
>  ui/gtk/font_utils.c                   | 2 +-
>  ui/gtk/funnel_stat.c                  | 2 +-
>  ui/gtk/goto_dlg.c                     | 2 +-
>  ui/gtk/graph_analysis.c               | 2 +-
>  ui/gtk/graph_analysis.h               | 2 +-
>  ui/gtk/gsm_a_stat.c                   | 2 +-
>  ui/gtk/gsm_map_stat.c                 | 2 +-
>  ui/gtk/gsm_map_summary.c              | 2 +-
>  ui/gtk/gtp_stat.c                     | 2 +-
>  ui/gtk/gui_stat_util.c                | 2 +-
>  ui/gtk/gui_stat_util.h                | 2 +-
>  ui/gtk/gui_utils.c                    | 2 +-
>  ui/gtk/h225_counter.c                 | 2 +-
>  ui/gtk/h225_ras_srt.c                 | 2 +-
>  ui/gtk/help_dlg.c                     | 2 +-
>  ui/gtk/hostlist_eth.c                 | 2 +-
>  ui/gtk/hostlist_fc.c                  | 2 +-
>  ui/gtk/hostlist_fddi.c                | 2 +-
>  ui/gtk/hostlist_ip.c                  | 2 +-
>  ui/gtk/hostlist_ipv6.c                | 2 +-
>  ui/gtk/hostlist_ipx.c                 | 2 +-
>  ui/gtk/hostlist_jxta.c                | 2 +-
>  ui/gtk/hostlist_ncp.c                 | 2 +-
>  ui/gtk/hostlist_rsvp.c                | 2 +-
>  ui/gtk/hostlist_sctp.c                | 2 +-
>  ui/gtk/hostlist_table.c               | 2 +-
>  ui/gtk/hostlist_tcpip.c               | 2 +-
>  ui/gtk/hostlist_tr.c                  | 2 +-
>  ui/gtk/hostlist_udpip.c               | 2 +-
>  ui/gtk/hostlist_usb.c                 | 2 +-
>  ui/gtk/hostlist_wlan.c                | 2 +-
>  ui/gtk/iax2_analysis.c                | 2 +-
>  ui/gtk/io_stat.c                      | 2 +-
>  ui/gtk/ldap_stat.c                    | 2 +-
>  ui/gtk/mac_lte_stat_dlg.c             | 2 +-
>  ui/gtk/macros_dlg.c                   | 2 +-
>  ui/gtk/main.c                         | 2 +-
>  ui/gtk/main_80211_toolbar.c           | 2 +-
>  ui/gtk/main_airpcap_toolbar.c         | 2 +-
>  ui/gtk/main_filter_toolbar.c          | 2 +-
>  ui/gtk/main_menubar.c                 | 2 +-
>  ui/gtk/main_statusbar.c               | 2 +-
>  ui/gtk/main_titlebar.c                | 2 +-
>  ui/gtk/main_toolbar.c                 | 2 +-
>  ui/gtk/main_welcome.c                 | 2 +-
>  ui/gtk/manual_addr_resolv.c           | 2 +-
>  ui/gtk/mcast_stream.c                 | 2 +-
>  ui/gtk/mcast_stream_dlg.c             | 2 +-
>  ui/gtk/megaco_stat.c                  | 2 +-
>  ui/gtk/memory_dlg.c                   | 2 +-
>  ui/gtk/mgcp_stat.c                    | 2 +-
>  ui/gtk/mtp3_stat.c                    | 2 +-
>  ui/gtk/mtp3_summary.c                 | 2 +-
>  ui/gtk/ncp_stat.c                     | 2 +-
>  ui/gtk/packet_history.c               | 2 +-
>  ui/gtk/packet_list.c                  | 2 +-
>  ui/gtk/packet_list.h                  | 2 +-
>  ui/gtk/packet_list_store.c            | 2 +-
>  ui/gtk/packet_panes.c                 | 2 +-
>  ui/gtk/packet_win.c                   | 2 +-
>  ui/gtk/pixmap_save.c                  | 2 +-
>  ui/gtk/plugins_dlg.c                  | 2 +-
>  ui/gtk/prefs_capture.c                | 2 +-
>  ui/gtk/prefs_column.c                 | 2 +-
>  ui/gtk/prefs_dlg.c                    | 2 +-
>  ui/gtk/prefs_filter_expressions.c     | 2 +-
>  ui/gtk/prefs_font_color.c             | 2 +-
>  ui/gtk/prefs_gui.c                    | 2 +-
>  ui/gtk/prefs_layout.c                 | 2 +-
>  ui/gtk/print_dlg.c                    | 2 +-
>  ui/gtk/profile_dlg.c                  | 2 +-
>  ui/gtk/progress_dlg.c                 | 2 +-
>  ui/gtk/proto_dlg.c                    | 2 +-
>  ui/gtk/proto_help.c                   | 2 +-
>  ui/gtk/proto_hier_stats_dlg.c         | 2 +-
>  ui/gtk/proto_hier_tree_model.c        | 2 +-
>  ui/gtk/proto_tree_model.c             | 2 +-
>  ui/gtk/radius_stat.c                  | 2 +-
>  ui/gtk/range_utils.c                  | 2 +-
>  ui/gtk/rlc_lte_graph.c                | 2 +-
>  ui/gtk/rlc_lte_stat_dlg.c             | 2 +-
>  ui/gtk/rpc_progs.c                    | 2 +-
>  ui/gtk/rpc_stat.c                     | 2 +-
>  ui/gtk/rtp_analysis.c                 | 2 +-
>  ui/gtk/rtp_player.c                   | 2 +-
>  ui/gtk/rtp_stream_dlg.h               | 2 +-
>  ui/gtk/scsi_stat.c                    | 2 +-
>  ui/gtk/sctp_assoc_analyse.c           | 2 +-
>  ui/gtk/sctp_byte_graph_dlg.c          | 2 +-
>  ui/gtk/sctp_chunk_stat.c              | 2 +-
>  ui/gtk/sctp_chunk_stat_dlg.c          | 2 +-
>  ui/gtk/sctp_error_dlg.c               | 2 +-
>  ui/gtk/sctp_graph_dlg.c               | 2 +-
>  ui/gtk/sctp_stat_dlg.c                | 2 +-
>  ui/gtk/service_response_time_table.c  | 2 +-
>  ui/gtk/service_response_time_table.h  | 2 +-
>  ui/gtk/simple_dialog.c                | 2 +-
>  ui/gtk/sip_stat.c                     | 2 +-
>  ui/gtk/smb2_stat.c                    | 2 +-
>  ui/gtk/smb_stat.c                     | 2 +-
>  ui/gtk/stats_tree_stat.c              | 2 +-
>  ui/gtk/stock_icons.c                  | 2 +-
>  ui/gtk/summary_dlg.c                  | 2 +-
>  ui/gtk/supported_protos_dlg.c         | 2 +-
>  ui/gtk/tap_param_dlg.c                | 2 +-
>  ui/gtk/tcp_graph.c                    | 2 +-
>  ui/gtk/text_page_utils.c              | 2 +-
>  ui/gtk/time_shift_dlg.c               | 2 +-
>  ui/gtk/uat_gui.c                      | 2 +-
>  ui/gtk/voip_calls_dlg.c               | 2 +-
>  ui/gtk/voip_calls_dlg.h               | 2 +-
>  ui/gtk/webbrowser.c                   | 2 +-
>  ui/gtk/wlan_stat_dlg.c                | 2 +-
>  ui/gtk/wsp_stat.c                     | 2 +-
>  183 files changed, 183 insertions(+), 183 deletions(-)
> 
> diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
> index 07122ce..c06774d 100644
> --- a/plugins/asn1/packet-asn1.c
> +++ b/plugins/asn1/packet-asn1.c
> @@ -84,7 +84,7 @@
>  #include <plugins/asn1/asn1.h>
>  
>  #ifdef DISSECTOR_WITH_GUI
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #endif
>  
>  /* buffer lengths */
> diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
> index c4e3834..65eebee 100644
> --- a/ui/gtk/about_dlg.c
> +++ b/ui/gtk/about_dlg.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/filesystem.h>
>  #include <wsutil/plugins.h>
> diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c
> index 57ad8e1..066921b 100644
> --- a/ui/gtk/addr_resolution_dlg.c
> +++ b/ui/gtk/addr_resolution_dlg.c
> @@ -28,7 +28,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <wsutil/filesystem.h>
> diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
> index 61258ea..5b81f11 100644
> --- a/ui/gtk/afp_stat.c
> +++ b/ui/gtk/afp_stat.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
> index eb9f9cb..d2127c3 100644
> --- a/ui/gtk/airpcap_dlg.c
> +++ b/ui/gtk/airpcap_dlg.c
> @@ -28,7 +28,7 @@
>  
>  #ifdef HAVE_AIRPCAP
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <string.h>
>  
> diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
> index a43409a..13fbcb4 100644
> --- a/ui/gtk/airpcap_gui_utils.c
> +++ b/ui/gtk/airpcap_gui_utils.c
> @@ -28,7 +28,7 @@
>  
>  #ifdef HAVE_AIRPCAP
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <wsutil/wsglib.h>
>  
>  #include <stdio.h>
> diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c
> index 59f3181..2a8e147 100644
> --- a/ui/gtk/ansi_a_stat.c
> +++ b/ui/gtk/ansi_a_stat.c
> @@ -32,7 +32,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdlib.h>
>  #include <string.h>
> diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
> index 32fdb04..0504aab 100644
> --- a/ui/gtk/ansi_map_stat.c
> +++ b/ui/gtk/ansi_map_stat.c
> @@ -32,7 +32,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdlib.h>
>  #include <string.h>
> diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c
> index b465532..8e30f19 100644
> --- a/ui/gtk/bootp_stat.c
> +++ b/ui/gtk/bootp_stat.c
> @@ -25,7 +25,7 @@
>  /* #define DEBUG	do{ printf("%s:%d  ",__FILE__,__LINE__);} while(0); */
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <string.h>
>  
>  #include <epan/packet_info.h>
> diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c
> index dfbbcbc..f66b7ec 100644
> --- a/ui/gtk/bytes_view.c
> +++ b/ui/gtk/bytes_view.c
> @@ -31,7 +31,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include "ui/gtk/old-gtk-compat.h"
>  
>  #include <string.h>
> diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c
> index 53e334a..535f82a 100644
> --- a/ui/gtk/camel_counter.c
> +++ b/ui/gtk/camel_counter.c
> @@ -27,7 +27,7 @@
>  
>  
>  #include <string.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <epan/packet_info.h>
> diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
> index d9d396d..eae0a59 100644
> --- a/ui/gtk/camel_srt.c
> +++ b/ui/gtk/camel_srt.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  
>  #include <string.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
> index 520ee65..872aa56 100644
> --- a/ui/gtk/capture_dlg.c
> +++ b/ui/gtk/capture_dlg.c
> @@ -31,7 +31,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h
> index b6d7523..efe8772 100644
> --- a/ui/gtk/capture_dlg.h
> +++ b/ui/gtk/capture_dlg.h
> @@ -33,7 +33,7 @@
>   *  @ingroup dialog_group
>   */
>  #include "capture_opts.h"
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #define CR_MAIN_NB "compile_results_main_notebook"
>  
> diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
> index 4ca389a..5ddacbd 100644
> --- a/ui/gtk/capture_file_dlg.c
> +++ b/ui/gtk/capture_file_dlg.c
> @@ -30,7 +30,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/filesystem.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
> index d36d36e..28227be 100644
> --- a/ui/gtk/capture_if_details_dlg_win32.c
> +++ b/ui/gtk/capture_if_details_dlg_win32.c
> @@ -30,7 +30,7 @@
>  #include <time.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/value_string.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
> index ba739de..fced143 100644
> --- a/ui/gtk/capture_if_dlg.c
> +++ b/ui/gtk/capture_if_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #ifdef HAVE_LIBPCAP
>  
> diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
> index 2ec2118..d06c00e 100644
> --- a/ui/gtk/capture_info_dlg.c
> +++ b/ui/gtk/capture_info_dlg.c
> @@ -28,7 +28,7 @@
>  
>  #include <time.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  
> diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c
> index 3b57eaa..6f44a51 100644
> --- a/ui/gtk/color_dlg.c
> +++ b/ui/gtk/color_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/dfilter/dfilter.h>
> diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c
> index 24b34ce..cf5d08d 100644
> --- a/ui/gtk/color_edit_dlg.c
> +++ b/ui/gtk/color_edit_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/dfilter/dfilter.h>
>  
> diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c
> index d90b41c..5d2a4f3 100644
> --- a/ui/gtk/color_utils.c
> +++ b/ui/gtk/color_utils.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "../color.h"
>  
> diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
> index 79f1183..a85fc47 100644
> --- a/ui/gtk/compare_stat.c
> +++ b/ui/gtk/compare_stat.c
> @@ -40,7 +40,7 @@
>  #include <math.h>
>  
>  #include <wsutil/wsglib.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/report_err.h>
>  
> diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c
> index 7f6648b..14207d4 100644
> --- a/ui/gtk/conversation_hastables_dlg.c
> +++ b/ui/gtk/conversation_hastables_dlg.c
> @@ -28,7 +28,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <wsutil/filesystem.h>
> diff --git a/ui/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c
> index 513579a..c4ba36d 100644
> --- a/ui/gtk/conversations_eth.c
> +++ b/ui/gtk/conversations_eth.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c
> index 3c66fb8..318eb2d 100644
> --- a/ui/gtk/conversations_fc.c
> +++ b/ui/gtk/conversations_fc.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c
> index 39ae879..08912b0 100644
> --- a/ui/gtk/conversations_fddi.c
> +++ b/ui/gtk/conversations_fddi.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c
> index 3be82f2..3bce809 100644
> --- a/ui/gtk/conversations_ip.c
> +++ b/ui/gtk/conversations_ip.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c
> index e01782c..bc7df0b 100644
> --- a/ui/gtk/conversations_ipv6.c
> +++ b/ui/gtk/conversations_ipv6.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c
> index c3036bf..16dd549 100644
> --- a/ui/gtk/conversations_ipx.c
> +++ b/ui/gtk/conversations_ipx.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c
> index de82cc8..618f3b5 100644
> --- a/ui/gtk/conversations_jxta.c
> +++ b/ui/gtk/conversations_jxta.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c
> index f7cf956..da03a51 100644
> --- a/ui/gtk/conversations_ncp.c
> +++ b/ui/gtk/conversations_ncp.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c
> index 984cfac..1206eb0 100644
> --- a/ui/gtk/conversations_rsvp.c
> +++ b/ui/gtk/conversations_rsvp.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c
> index 5eed8cb..00ca9a9 100644
> --- a/ui/gtk/conversations_sctp.c
> +++ b/ui/gtk/conversations_sctp.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
> index 85dbcc5..01928a3 100644
> --- a/ui/gtk/conversations_table.c
> +++ b/ui/gtk/conversations_table.c
> @@ -28,7 +28,7 @@
>  #include <string.h>
>  #include <locale.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/to_str.h>
> diff --git a/ui/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c
> index f986693..1c6e71e 100644
> --- a/ui/gtk/conversations_tcpip.c
> +++ b/ui/gtk/conversations_tcpip.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c
> index 3f91458..87c87f8 100644
> --- a/ui/gtk/conversations_tr.c
> +++ b/ui/gtk/conversations_tr.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c
> index 8b24bd7..44a3d9d 100644
> --- a/ui/gtk/conversations_udpip.c
> +++ b/ui/gtk/conversations_udpip.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_usb.c b/ui/gtk/conversations_usb.c
> index 76a469a..5654505 100644
> --- a/ui/gtk/conversations_usb.c
> +++ b/ui/gtk/conversations_usb.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c
> index 8050ce9..913a7d6 100644
> --- a/ui/gtk/conversations_wlan.c
> +++ b/ui/gtk/conversations_wlan.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
> index c4c04af..bfe3d44 100644
> --- a/ui/gtk/dcerpc_stat.c
> +++ b/ui/gtk/dcerpc_stat.c
> @@ -35,7 +35,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
> index bb676f2..ee09ee3 100644
> --- a/ui/gtk/decode_as_dlg.c
> +++ b/ui/gtk/decode_as_dlg.c
> @@ -24,7 +24,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c
> index b3d36f3..918f363 100644
> --- a/ui/gtk/dfilter_expr_dlg.c
> +++ b/ui/gtk/dfilter_expr_dlg.c
> @@ -43,7 +43,7 @@
>  #include <ctype.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/ftypes/ftypes-int.h>
>  
> diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
> index c0cd20f..7e3e190 100644
> --- a/ui/gtk/diameter_stat.c
> +++ b/ui/gtk/diameter_stat.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c
> index d1826be..4d7f5e6 100644
> --- a/ui/gtk/dissector_tables_dlg.c
> +++ b/ui/gtk/dissector_tables_dlg.c
> @@ -30,7 +30,7 @@
>  
>  #include <epan/packet.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include "ui/gtk/gui_utils.h"
>  #include "ui/gtk/dlg_utils.h"
>  #include "ui/gtk/dissector_tables_dlg.h"
> diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c
> index 22eca80..ec90f98 100644
> --- a/ui/gtk/dlg_utils.c
> +++ b/ui/gtk/dlg_utils.c
> @@ -26,7 +26,7 @@
>  #include <string.h>
>  #include <stdarg.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/gtk/gtkglobals.h"
>  #include "ui/gtk/gui_utils.h"
> diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
> index 93e438a..12092cb 100644
> --- a/ui/gtk/drag_and_drop.c
> +++ b/ui/gtk/drag_and_drop.c
> @@ -27,7 +27,7 @@
>  #include <string.h>
>  #include <stdio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
> index 0765d7f..93bab0c 100644
> --- a/ui/gtk/edit_packet_comment_dlg.c
> +++ b/ui/gtk/edit_packet_comment_dlg.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <wsutil/filesystem.h>
> diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
> index f6fdbf5..2c48eec 100644
> --- a/ui/gtk/expert_comp_dlg.c
> +++ b/ui/gtk/expert_comp_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c
> index 5a8cbf0..d83128e 100644
> --- a/ui/gtk/expert_comp_table.c
> +++ b/ui/gtk/expert_comp_table.c
> @@ -32,7 +32,7 @@
>  #include <stdio.h>
>  #include <math.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet_info.h"
>  #include "epan/strutil.h"
> diff --git a/ui/gtk/expert_comp_table.h b/ui/gtk/expert_comp_table.h
> index 3e4c0ea..0368323 100644
> --- a/ui/gtk/expert_comp_table.h
> +++ b/ui/gtk/expert_comp_table.h
> @@ -28,7 +28,7 @@
>  #ifndef __EXPERT_COMP_TABLE_H__
>  #define __EXPERT_COMP_TABLE_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <epan/expert.h>
>  
>  typedef struct expert_tapdata_s expert_tapdata_t;
> diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c
> index 8d0051b..bcca73b 100644
> --- a/ui/gtk/export_object_dlg.c
> +++ b/ui/gtk/export_object_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c
> index 046bd54..6aef412 100644
> --- a/ui/gtk/export_pdu_dlg.c
> +++ b/ui/gtk/export_pdu_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "globals.h"
>  #include "wtap.h"
> diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
> index ab3c380..61456c7 100644
> --- a/ui/gtk/export_sslkeys.c
> +++ b/ui/gtk/export_sslkeys.c
> @@ -39,7 +39,7 @@
>  
>  #include <wsutil/file_util.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c
> index e84d7b3..33206ed 100644
> --- a/ui/gtk/fc_stat.c
> +++ b/ui/gtk/fc_stat.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c
> index 5a4a9df..8c7445b 100644
> --- a/ui/gtk/file_dlg.c
> +++ b/ui/gtk/file_dlg.c
> @@ -35,7 +35,7 @@
>  #include <string.h>
>  #include <errno.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #ifdef _WIN32
>  #  define COBJMACROS
> diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
> index 7d992fc..6a95540 100644
> --- a/ui/gtk/file_import_dlg.c
> +++ b/ui/gtk/file_import_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdlib.h>
>  
> diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
> index fbfa8667..8ecf0c3 100644
> --- a/ui/gtk/fileset_dlg.c
> +++ b/ui/gtk/fileset_dlg.c
> @@ -30,7 +30,7 @@
>  #include <fcntl.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "file.h"
>  #include <wsutil/filesystem.h>
> diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c
> index 3513ba5..11e1fc7 100644
> --- a/ui/gtk/filter_autocomplete.c
> +++ b/ui/gtk/filter_autocomplete.c
> @@ -31,7 +31,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
> index e196302..5fa0ae9 100644
> --- a/ui/gtk/filter_dlg.c
> +++ b/ui/gtk/filter_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/filesystem.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
> index f952583..c011c8a 100644
> --- a/ui/gtk/filter_expression_save_dlg.c
> +++ b/ui/gtk/filter_expression_save_dlg.c
> @@ -29,7 +29,7 @@
>  #include <ctype.h>
>  #include <math.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/proto.h>
>  #include <epan/dfilter/dfilter.h>
> diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c
> index 3fbdd2c..63e152b 100644
> --- a/ui/gtk/filter_utils.c
> +++ b/ui/gtk/filter_utils.c
> @@ -23,7 +23,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <string.h>
>  
>  #include "ui/gtk/main.h"
> diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c
> index 08a4b550..7062b10 100644
> --- a/ui/gtk/find_dlg.c
> +++ b/ui/gtk/find_dlg.c
> @@ -27,7 +27,7 @@
>  #include <string.h>
>  #include <ctype.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/proto.h>
>  #include <epan/dfilter/dfilter.h>
> diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
> index 3a065fd..ac09f08 100644
> --- a/ui/gtk/firewall_dlg.c
> +++ b/ui/gtk/firewall_dlg.c
> @@ -47,7 +47,7 @@
>  #include <unistd.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
> index 70d57fe..a00783d 100644
> --- a/ui/gtk/flow_graph.c
> +++ b/ui/gtk/flow_graph.c
> @@ -27,7 +27,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <epan/packet.h>
> diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
> index 7ee686d..e507247 100644
> --- a/ui/gtk/follow_ssl.c
> +++ b/ui/gtk/follow_ssl.c
> @@ -34,7 +34,7 @@
>  
>  #include <ctype.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/follow.h>
>  #include <epan/dissectors/packet-ipv6.h>
> diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
> index 0433311..c73813b 100644
> --- a/ui/gtk/follow_stream.c
> +++ b/ui/gtk/follow_stream.c
> @@ -31,7 +31,7 @@
>  #include <ctype.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/addr_resolv.h>
>  #include <epan/follow.h>
> diff --git a/ui/gtk/follow_stream.h b/ui/gtk/follow_stream.h
> index e88ba23..4dfd1e6 100644
> --- a/ui/gtk/follow_stream.h
> +++ b/ui/gtk/follow_stream.h
> @@ -26,7 +26,7 @@
>  #ifndef __FOLLOW_STREAM_H__
>  #define __FOLLOW_STREAM_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <ui/follow.h>
>  
>  typedef struct {
> diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
> index 1e62085..8c4f653 100644
> --- a/ui/gtk/follow_tcp.c
> +++ b/ui/gtk/follow_tcp.c
> @@ -34,7 +34,7 @@
>  
>  #include <ctype.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/follow.h>
>  #include <epan/dissectors/packet-ipv6.h>
> diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
> index 3ba4348..5e7d394 100644
> --- a/ui/gtk/follow_udp.c
> +++ b/ui/gtk/follow_udp.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/addr_resolv.h>
>  #include <epan/epan_dissect.h>
> diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c
> index 02eb079..3c55d3d 100644
> --- a/ui/gtk/font_utils.c
> +++ b/ui/gtk/font_utils.c
> @@ -27,7 +27,7 @@
>  #include <stdlib.h>
>  #include <stdio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
> index 11583fa..1990f65 100644
> --- a/ui/gtk/funnel_stat.c
> +++ b/ui/gtk/funnel_stat.c
> @@ -41,7 +41,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  #include <epan/funnel.h>
> diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
> index 9262d37..3edcb26 100644
> --- a/ui/gtk/goto_dlg.c
> +++ b/ui/gtk/goto_dlg.c
> @@ -25,7 +25,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdlib.h>
>  
> diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
> index 2314009..22ae181 100644
> --- a/ui/gtk/graph_analysis.c
> +++ b/ui/gtk/graph_analysis.c
> @@ -38,7 +38,7 @@
>  #include <unistd.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/graph_analysis.h b/ui/gtk/graph_analysis.h
> index d779c29..dd4a612 100644
> --- a/ui/gtk/graph_analysis.h
> +++ b/ui/gtk/graph_analysis.h
> @@ -32,7 +32,7 @@
>  #define __GRAPH_ANALYSIS_H__
>  
>  #include <wsutil/wsglib.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <epan/address.h>
>  #include <ui/tap-sequence-analysis.h>
>  
> diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c
> index f213044..3682ffd 100644
> --- a/ui/gtk/gsm_a_stat.c
> +++ b/ui/gtk/gsm_a_stat.c
> @@ -35,7 +35,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet_info.h"
>  #include "epan/epan.h"
> diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c
> index c736a93..3498c30 100644
> --- a/ui/gtk/gsm_map_stat.c
> +++ b/ui/gtk/gsm_map_stat.c
> @@ -35,7 +35,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <epan/packet.h>
> diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c
> index 8635083..914c86a 100644
> --- a/ui/gtk/gsm_map_summary.c
> +++ b/ui/gtk/gsm_map_summary.c
> @@ -29,7 +29,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wiretap/wtap.h>
>  
> diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c
> index 17e6a15..2f89502 100644
> --- a/ui/gtk/gtp_stat.c
> +++ b/ui/gtk/gtp_stat.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c
> index 76c68e5..340785c 100644
> --- a/ui/gtk/gui_stat_util.c
> +++ b/ui/gtk/gui_stat_util.c
> @@ -25,7 +25,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "../file.h"
>  
> diff --git a/ui/gtk/gui_stat_util.h b/ui/gtk/gui_stat_util.h
> index 1679ae2..0a1155d 100644
> --- a/ui/gtk/gui_stat_util.h
> +++ b/ui/gtk/gui_stat_util.h
> @@ -26,7 +26,7 @@
>  #ifndef __GTK_STAT_UTIL_H__
>  #define __GTK_STAT_UTIL_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  
>  /** @file
> diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
> index a9c6361..e4db973 100644
> --- a/ui/gtk/gui_utils.c
> +++ b/ui/gtk/gui_utils.c
> @@ -30,7 +30,7 @@
>  #include <string.h>
>  #include <locale.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c
> index 44e4bde..7d7743d 100644
> --- a/ui/gtk/h225_counter.c
> +++ b/ui/gtk/h225_counter.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/packet_info.h>
> diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
> index 20ab61e..bf802f9 100644
> --- a/ui/gtk/h225_ras_srt.c
> +++ b/ui/gtk/h225_ras_srt.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/packet_info.h>
> diff --git a/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c
> index 88743c2..01a5443 100644
> --- a/ui/gtk/help_dlg.c
> +++ b/ui/gtk/help_dlg.c
> @@ -27,7 +27,7 @@
>  #include <stdio.h>
>  #include <errno.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/hostlist_eth.c b/ui/gtk/hostlist_eth.c
> index add12c9..b127a14 100644
> --- a/ui/gtk/hostlist_eth.c
> +++ b/ui/gtk/hostlist_eth.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c
> index 8db5fc4..e324edf 100644
> --- a/ui/gtk/hostlist_fc.c
> +++ b/ui/gtk/hostlist_fc.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c
> index 2ff3309..b6d2cbb 100644
> --- a/ui/gtk/hostlist_fddi.c
> +++ b/ui/gtk/hostlist_fddi.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c
> index 7528899..3dda6d3 100644
> --- a/ui/gtk/hostlist_ip.c
> +++ b/ui/gtk/hostlist_ip.c
> @@ -28,7 +28,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c
> index 89f1fba..b0e6ea2 100644
> --- a/ui/gtk/hostlist_ipv6.c
> +++ b/ui/gtk/hostlist_ipv6.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c
> index afb9782..853738b 100644
> --- a/ui/gtk/hostlist_ipx.c
> +++ b/ui/gtk/hostlist_ipx.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c
> index b9b4a8d..992e254 100644
> --- a/ui/gtk/hostlist_jxta.c
> +++ b/ui/gtk/hostlist_jxta.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_ncp.c b/ui/gtk/hostlist_ncp.c
> index 4693fee..db68292 100644
> --- a/ui/gtk/hostlist_ncp.c
> +++ b/ui/gtk/hostlist_ncp.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c
> index 8235383..936547d 100644
> --- a/ui/gtk/hostlist_rsvp.c
> +++ b/ui/gtk/hostlist_rsvp.c
> @@ -27,7 +27,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c
> index ae81c59..3eb41ad 100644
> --- a/ui/gtk/hostlist_sctp.c
> +++ b/ui/gtk/hostlist_sctp.c
> @@ -25,7 +25,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
> index 5729504..b5a418d 100644
> --- a/ui/gtk/hostlist_table.c
> +++ b/ui/gtk/hostlist_table.c
> @@ -31,7 +31,7 @@
>  #include <math.h>
>  #include <locale.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/to_str.h>
> diff --git a/ui/gtk/hostlist_tcpip.c b/ui/gtk/hostlist_tcpip.c
> index 3acb3b7..063d46c 100644
> --- a/ui/gtk/hostlist_tcpip.c
> +++ b/ui/gtk/hostlist_tcpip.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c
> index 12865da..94e157e 100644
> --- a/ui/gtk/hostlist_tr.c
> +++ b/ui/gtk/hostlist_tr.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c
> index 695d6cb..cb3d699 100644
> --- a/ui/gtk/hostlist_udpip.c
> +++ b/ui/gtk/hostlist_udpip.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c
> index 427028f..332cf8c 100644
> --- a/ui/gtk/hostlist_usb.c
> +++ b/ui/gtk/hostlist_usb.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/hostlist_wlan.c b/ui/gtk/hostlist_wlan.c
> index 619e1d7..179ae16 100644
> --- a/ui/gtk/hostlist_wlan.c
> +++ b/ui/gtk/hostlist_wlan.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet.h"
>  #include <epan/stat_cmd_args.h>
> diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
> index ff720a1..4afd35d 100644
> --- a/ui/gtk/iax2_analysis.c
> +++ b/ui/gtk/iax2_analysis.c
> @@ -49,7 +49,7 @@
>  #include <fcntl.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/file_util.h>
>  #include <wsutil/g711.h>
> diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
> index 28a7944..a3e6320 100644
> --- a/ui/gtk/io_stat.c
> +++ b/ui/gtk/io_stat.c
> @@ -29,7 +29,7 @@
>  #include <string.h>
>  #include <math.h>
>  #include <ctype.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan_dissect.h>
>  #include <epan/packet_info.h>
> diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c
> index c2f9a6f..119010a 100644
> --- a/ui/gtk/ldap_stat.c
> +++ b/ui/gtk/ldap_stat.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
> index b47872d..3bf1525 100644
> --- a/ui/gtk/mac_lte_stat_dlg.c
> +++ b/ui/gtk/mac_lte_stat_dlg.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/gtk/gtkglobals.h"
>  
> diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c
> index 41b1445..237198d 100644
> --- a/ui/gtk/macros_dlg.c
> +++ b/ui/gtk/macros_dlg.c
> @@ -24,7 +24,7 @@
>  #include "config.h"
>  #include <stdlib.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/dfilter/dfilter-macro.h>
>  #include <epan/uat-int.h>
> diff --git a/ui/gtk/main.c b/ui/gtk/main.c
> index ba605c8..cb181ec 100644
> --- a/ui/gtk/main.c
> +++ b/ui/gtk/main.c
> @@ -28,7 +28,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
> index 2d3347f..a02e72a 100644
> --- a/ui/gtk/main_80211_toolbar.c
> +++ b/ui/gtk/main_80211_toolbar.c
> @@ -32,7 +32,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/prefs.h"
>  
> diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c
> index 9fbcd67..fd38a03 100644
> --- a/ui/gtk/main_airpcap_toolbar.c
> +++ b/ui/gtk/main_airpcap_toolbar.c
> @@ -30,7 +30,7 @@
>  
>  #ifdef HAVE_AIRPCAP
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include "ui/gtk/old-gtk-compat.h"
>  
>  #include <epan/epan.h>
> diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c
> index 5fd5988..ef5cd1a 100644
> --- a/ui/gtk/main_filter_toolbar.c
> +++ b/ui/gtk/main_filter_toolbar.c
> @@ -31,7 +31,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/recent.h"
>  #include "ui/recent_utils.h"
> diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
> index 559d368..32b158e 100644
> --- a/ui/gtk/main_menubar.c
> +++ b/ui/gtk/main_menubar.c
> @@ -23,7 +23,7 @@
>   */
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
> index 8ad286e..8cac232 100644
> --- a/ui/gtk/main_statusbar.c
> +++ b/ui/gtk/main_statusbar.c
> @@ -28,7 +28,7 @@
>  #include <unistd.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <wsutil/filesystem.h>
> diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c
> index 1ff0a97..1437437 100644
> --- a/ui/gtk/main_titlebar.c
> +++ b/ui/gtk/main_titlebar.c
> @@ -26,7 +26,7 @@
>  
>  #include <epan/prefs.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "cfile.h"
>  #include "file.h"
> diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
> index e629937..6523ed5 100644
> --- a/ui/gtk/main_toolbar.c
> +++ b/ui/gtk/main_toolbar.c
> @@ -29,7 +29,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  #include <epan/dfilter/dfilter.h>
> diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
> index 857cdb6..63f73c2 100644
> --- a/ui/gtk/main_welcome.c
> +++ b/ui/gtk/main_welcome.c
> @@ -25,7 +25,7 @@
>  
>  #include <time.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c
> index bfd2f03..a5c2d02 100644
> --- a/ui/gtk/manual_addr_resolv.c
> +++ b/ui/gtk/manual_addr_resolv.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/addr_resolv.h"
>  #include "ui/simple_dialog.h"
> diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c
> index ae09c6b..28eb1e0 100644
> --- a/ui/gtk/mcast_stream.c
> +++ b/ui/gtk/mcast_stream.c
> @@ -41,7 +41,7 @@
>  #include <time.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <epan/address.h>
> diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
> index 18a994f..58f165b 100644
> --- a/ui/gtk/mcast_stream_dlg.c
> +++ b/ui/gtk/mcast_stream_dlg.c
> @@ -35,7 +35,7 @@
>  #include <string.h>
>  #include <locale.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  #include <epan/address.h>
> diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c
> index 6e6a9b2..99ca32f 100644
> --- a/ui/gtk/megaco_stat.c
> +++ b/ui/gtk/megaco_stat.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/memory_dlg.c b/ui/gtk/memory_dlg.c
> index aab9ad0..5e5d3e1 100644
> --- a/ui/gtk/memory_dlg.c
> +++ b/ui/gtk/memory_dlg.c
> @@ -28,7 +28,7 @@
>  #include "config.h"
>  
>  #include <math.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/gtk/dlg_utils.h"
>  #include "ui/simple_dialog.h"
> diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c
> index 08c51c3..2bddecb 100644
> --- a/ui/gtk/mgcp_stat.c
> +++ b/ui/gtk/mgcp_stat.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c
> index afa4228..f52da45 100644
> --- a/ui/gtk/mtp3_stat.c
> +++ b/ui/gtk/mtp3_stat.c
> @@ -35,7 +35,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet_info.h"
>  #include "epan/epan.h"
> diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c
> index 72686c1..4431ddd 100644
> --- a/ui/gtk/mtp3_summary.c
> +++ b/ui/gtk/mtp3_summary.c
> @@ -31,7 +31,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "epan/packet_info.h"
>  #include "epan/epan.h"
> diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c
> index 3a8a9f2..cfd43fd 100644
> --- a/ui/gtk/ncp_stat.c
> +++ b/ui/gtk/ncp_stat.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/packet_history.c b/ui/gtk/packet_history.c
> index 46718fb..1396c65 100644
> --- a/ui/gtk/packet_history.c
> +++ b/ui/gtk/packet_history.c
> @@ -26,7 +26,7 @@
>  
>  #include <stdio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "../file.h"
>  #include "../globals.h"
> diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
> index beeea1e..3d36168 100644
> --- a/ui/gtk/packet_list.c
> +++ b/ui/gtk/packet_list.c
> @@ -31,7 +31,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <wsutil/wsglib.h>
>  
>  #include <epan/column-info.h>
> diff --git a/ui/gtk/packet_list.h b/ui/gtk/packet_list.h
> index 0cf157c..e930a77 100644
> --- a/ui/gtk/packet_list.h
> +++ b/ui/gtk/packet_list.h
> @@ -25,7 +25,7 @@
>  #ifndef __PACKET_LIST_H__
>  #define __PACKET_LIST_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  /** @file
>   *  @ingroup main_window_group
> diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
> index 8e921d8..6e366dd 100644
> --- a/ui/gtk/packet_list_store.c
> +++ b/ui/gtk/packet_list_store.c
> @@ -33,7 +33,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <wsutil/wsglib.h>
>  
>  #include "packet_list_store.h"
> diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
> index 60c7494..d846867 100644
> --- a/ui/gtk/packet_panes.c
> +++ b/ui/gtk/packet_panes.c
> @@ -37,7 +37,7 @@
>  #include <unistd.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
> index 8b7de89..36e8983 100644
> --- a/ui/gtk/packet_win.c
> +++ b/ui/gtk/packet_win.c
> @@ -33,7 +33,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c
> index fceb2af..c67a4a0 100644
> --- a/ui/gtk/pixmap_save.c
> +++ b/ui/gtk/pixmap_save.c
> @@ -27,7 +27,7 @@
>  #include "config.h"
>  #include <errno.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/filesystem.h>
>  
> diff --git a/ui/gtk/plugins_dlg.c b/ui/gtk/plugins_dlg.c
> index 292dd7f..dfd49a2 100644
> --- a/ui/gtk/plugins_dlg.c
> +++ b/ui/gtk/plugins_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #ifdef HAVE_LUA
>  #include <epan/wslua/init_wslua.h>
> diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
> index 1b629a6..e392065 100644
> --- a/ui/gtk/prefs_capture.c
> +++ b/ui/gtk/prefs_capture.c
> @@ -27,7 +27,7 @@
>  #ifdef HAVE_LIBPCAP
>  
>  #include <string.h>
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
> index 8848466..94c9cef 100644
> --- a/ui/gtk/prefs_column.c
> +++ b/ui/gtk/prefs_column.c
> @@ -27,7 +27,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  #include <epan/column-info.h>
> diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
> index c1aeb22..49e4a51 100644
> --- a/ui/gtk/prefs_dlg.c
> +++ b/ui/gtk/prefs_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <stdlib.h>
>  #include <string.h>
> diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c
> index 53a465d..d84d6b8 100644
> --- a/ui/gtk/prefs_filter_expressions.c
> +++ b/ui/gtk/prefs_filter_expressions.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  #include <epan/column-info.h>
> diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c
> index 3520570..6e995e5 100644
> --- a/ui/gtk/prefs_font_color.c
> +++ b/ui/gtk/prefs_font_color.c
> @@ -26,7 +26,7 @@
>  
>  #include <stdlib.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/proto.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
> index b649ddc..a12500f 100644
> --- a/ui/gtk/prefs_gui.c
> +++ b/ui/gtk/prefs_gui.c
> @@ -27,7 +27,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c
> index 12adf0e..fcc487c 100644
> --- a/ui/gtk/prefs_layout.c
> +++ b/ui/gtk/prefs_layout.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
> index ecbbfc2..b268694 100644
> --- a/ui/gtk/print_dlg.c
> +++ b/ui/gtk/print_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  #include <epan/epan_dissect.h>
> diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
> index a4f8b31..a549356 100644
> --- a/ui/gtk/profile_dlg.c
> +++ b/ui/gtk/profile_dlg.c
> @@ -25,7 +25,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c
> index 2d89352..e550766 100644
> --- a/ui/gtk/progress_dlg.c
> +++ b/ui/gtk/progress_dlg.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/progress_dlg.h"
>  
> diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
> index 304ffe8..dbb3ac6 100644
> --- a/ui/gtk/proto_dlg.c
> +++ b/ui/gtk/proto_dlg.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c
> index 8864961..313a931 100644
> --- a/ui/gtk/proto_help.c
> +++ b/ui/gtk/proto_help.c
> @@ -34,7 +34,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include "ui/gtk/webbrowser.h"
>  
>  #include "../file.h"
> diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c
> index edaca5f..33cc6e0 100644
> --- a/ui/gtk/proto_hier_stats_dlg.c
> +++ b/ui/gtk/proto_hier_stats_dlg.c
> @@ -27,7 +27,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "../proto_hier_stats.h"
>  #include "ui/simple_dialog.h"
> diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c
> index 96c2878..6c2ed98 100644
> --- a/ui/gtk/proto_hier_tree_model.c
> +++ b/ui/gtk/proto_hier_tree_model.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <wsutil/wsglib.h>
>  
>  #include "proto_hier_tree_model.h"
> diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c
> index da6a851..e87a8cd 100644
> --- a/ui/gtk/proto_tree_model.c
> +++ b/ui/gtk/proto_tree_model.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <wsutil/wsglib.h>
>  
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c
> index 8eea17e..b9a97b8 100644
> --- a/ui/gtk/radius_stat.c
> +++ b/ui/gtk/radius_stat.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c
> index 1a984e9..b8414a3 100644
> --- a/ui/gtk/range_utils.c
> +++ b/ui/gtk/range_utils.c
> @@ -26,7 +26,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "../globals.h"
>  #include "ui/simple_dialog.h"
> diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
> index 5317763..e165ac4 100644
> --- a/ui/gtk/rlc_lte_graph.c
> +++ b/ui/gtk/rlc_lte_graph.c
> @@ -28,7 +28,7 @@
>  #include <stdlib.h>
>  #include <math.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
> index 038fa0a..b89be9e 100644
> --- a/ui/gtk/rlc_lte_stat_dlg.c
> +++ b/ui/gtk/rlc_lte_stat_dlg.c
> @@ -32,7 +32,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/gtk/gtkglobals.h"
>  
> diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c
> index ed55151..b1b60d8 100644
> --- a/ui/gtk/rpc_progs.c
> +++ b/ui/gtk/rpc_progs.c
> @@ -33,7 +33,7 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
> index f3d3e31..dcd54bc 100644
> --- a/ui/gtk/rpc_stat.c
> +++ b/ui/gtk/rpc_stat.c
> @@ -33,7 +33,7 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
> index e2cbf85..09f22d0 100644
> --- a/ui/gtk/rtp_analysis.c
> +++ b/ui/gtk/rtp_analysis.c
> @@ -49,7 +49,7 @@
>  #include <fcntl.h>
>  #endif
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/file_util.h>
>  #include <wsutil/tempfile.h>
> diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
> index acee55f..b0793de 100644
> --- a/ui/gtk/rtp_player.c
> +++ b/ui/gtk/rtp_player.c
> @@ -58,7 +58,7 @@
>  #include <string.h>
>  #include <portaudio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/stats_tree.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/rtp_stream_dlg.h b/ui/gtk/rtp_stream_dlg.h
> index 4f5c70c..89b8d71 100644
> --- a/ui/gtk/rtp_stream_dlg.h
> +++ b/ui/gtk/rtp_stream_dlg.h
> @@ -28,7 +28,7 @@
>  #ifndef __RTP_STREAM_DLG_H__
>  #define __RTP_STREAM_DLG_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  /** @file
>   *  "RTP Stream Analysis" dialog box.
> diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c
> index b8c3892..db77481 100644
> --- a/ui/gtk/scsi_stat.c
> +++ b/ui/gtk/scsi_stat.c
> @@ -30,7 +30,7 @@
>  
>  #include <stdio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
> index 7229681..0477e85 100644
> --- a/ui/gtk/sctp_assoc_analyse.c
> +++ b/ui/gtk/sctp_assoc_analyse.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan_dissect.h>
>  #include "wsutil/filesystem.h"
> diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
> index 31b559d..8fc2067 100644
> --- a/ui/gtk/sctp_byte_graph_dlg.c
> +++ b/ui/gtk/sctp_byte_graph_dlg.c
> @@ -29,7 +29,7 @@
>  #include <math.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  #include <epan/strutil.h>
> diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
> index afbbae7..e5f4916 100644
> --- a/ui/gtk/sctp_chunk_stat.c
> +++ b/ui/gtk/sctp_chunk_stat.c
> @@ -29,7 +29,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
> index 4fb1d40..88863b6 100644
> --- a/ui/gtk/sctp_chunk_stat_dlg.c
> +++ b/ui/gtk/sctp_chunk_stat_dlg.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  #include "epan/to_str.h"
> diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
> index 55bc6c4..5908199 100644
> --- a/ui/gtk/sctp_error_dlg.c
> +++ b/ui/gtk/sctp_error_dlg.c
> @@ -24,7 +24,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  
> diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
> index 2e2b7a1..ba96af4 100644
> --- a/ui/gtk/sctp_graph_dlg.c
> +++ b/ui/gtk/sctp_graph_dlg.c
> @@ -30,7 +30,7 @@
>  #include <math.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  #include <epan/strutil.h>
> diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
> index 6d7093b..ab0377f 100644
> --- a/ui/gtk/sctp_stat_dlg.c
> +++ b/ui/gtk/sctp_stat_dlg.c
> @@ -25,7 +25,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  #include "epan/to_str.h"
> diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c
> index 570028f..f6bb355 100644
> --- a/ui/gtk/service_response_time_table.c
> +++ b/ui/gtk/service_response_time_table.c
> @@ -26,7 +26,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <stdio.h>
>  
>  #include "epan/packet_info.h"
> diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h
> index f6505a6..412e6b6 100644
> --- a/ui/gtk/service_response_time_table.h
> +++ b/ui/gtk/service_response_time_table.h
> @@ -27,7 +27,7 @@
>  #ifndef __SERVICE_RESPONSE_TIME_TABLE_H__
>  #define __SERVICE_RESPONSE_TIME_TABLE_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include "wsutil/nstime.h"
>  #include "epan/timestats.h"
>  
> diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c
> index 66d1795..b8a4d5a 100644
> --- a/ui/gtk/simple_dialog.c
> +++ b/ui/gtk/simple_dialog.c
> @@ -25,7 +25,7 @@
>  #include "config.h"
>  #include <stdio.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/strutil.h>
>  
> diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c
> index eae4c90..de1ec69 100644
> --- a/ui/gtk/sip_stat.c
> +++ b/ui/gtk/sip_stat.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
> index 4cf72b7..fc4821b 100644
> --- a/ui/gtk/smb2_stat.c
> +++ b/ui/gtk/smb2_stat.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c
> index 33c730b..4531155 100644
> --- a/ui/gtk/smb_stat.c
> +++ b/ui/gtk/smb_stat.c
> @@ -26,7 +26,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet_info.h>
>  #include <epan/epan.h>
> diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
> index bbb8018..34b8536 100644
> --- a/ui/gtk/stats_tree_stat.c
> +++ b/ui/gtk/stats_tree_stat.c
> @@ -34,7 +34,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/report_err.h>
>  #include <wsutil/file_util.h>
> diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c
> index 4c007fb..e5b225f 100644
> --- a/ui/gtk/stock_icons.c
> +++ b/ui/gtk/stock_icons.c
> @@ -25,7 +25,7 @@
>  
>  #include "config.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "ui/gtk/stock_icons.h"
>  #include "ui/gtk/toolbar_icons.h"
> diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
> index a64bcc1..07c2955 100644
> --- a/ui/gtk/summary_dlg.c
> +++ b/ui/gtk/summary_dlg.c
> @@ -27,7 +27,7 @@
>  #include <string.h>
>  #include <time.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/strutil.h>
>  
> diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c
> index ff325eb..bc42267 100644
> --- a/ui/gtk/supported_protos_dlg.c
> +++ b/ui/gtk/supported_protos_dlg.c
> @@ -28,7 +28,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/prefs.h>
>  
> diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c
> index 7d4dc2c..6d4d70b 100644
> --- a/ui/gtk/tap_param_dlg.c
> +++ b/ui/gtk/tap_param_dlg.c
> @@ -28,7 +28,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/stat_cmd_args.h>
>  
> diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
> index 1ff7e7f..3fd5f72 100644
> --- a/ui/gtk/tcp_graph.c
> +++ b/ui/gtk/tcp_graph.c
> @@ -31,7 +31,7 @@
>  #include <math.h>
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c
> index f65225f..ae58322 100644
> --- a/ui/gtk/text_page_utils.c
> +++ b/ui/gtk/text_page_utils.c
> @@ -29,7 +29,7 @@
>  #include <stdio.h>
>  #include <errno.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include "wsutil/filesystem.h"
>  
> diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
> index 06835f8..b938256 100644
> --- a/ui/gtk/time_shift_dlg.c
> +++ b/ui/gtk/time_shift_dlg.c
> @@ -29,7 +29,7 @@
>  
>  #include "globals.h"
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/proto.h>
>  #include <epan/dfilter/dfilter.h>
> diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
> index 95a5d53..a867682 100644
> --- a/ui/gtk/uat_gui.c
> +++ b/ui/gtk/uat_gui.c
> @@ -42,7 +42,7 @@
>  #include <stdio.h>
>  #include <math.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  #include <gdk/gdkkeysyms.h>
>  #if GTK_CHECK_VERSION(3,0,0)
>  # include <gdk/gdkkeysyms-compat.h>
> diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
> index 49c4ec3..98cf0a2 100644
> --- a/ui/gtk/voip_calls_dlg.c
> +++ b/ui/gtk/voip_calls_dlg.c
> @@ -39,7 +39,7 @@
>  #include <string.h>
>  #include <ctype.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/epan.h>
>  #include <epan/packet.h>
> diff --git a/ui/gtk/voip_calls_dlg.h b/ui/gtk/voip_calls_dlg.h
> index bccfcb8..a5ac09f 100644
> --- a/ui/gtk/voip_calls_dlg.h
> +++ b/ui/gtk/voip_calls_dlg.h
> @@ -36,7 +36,7 @@
>  #ifndef __VOIP_CALLS_DLG_H__
>  #define __VOIP_CALLS_DLG_H__
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  /**
>   * Update the contents of the dialog box clist with that of list.
> diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c
> index 401b849..1f659fb 100644
> --- a/ui/gtk/webbrowser.c
> +++ b/ui/gtk/webbrowser.c
> @@ -107,7 +107,7 @@
>  #include "config.h"
>  #include <string.h> /* strlen, strstr */
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <wsutil/filesystem.h>
>  #include <epan/prefs.h>
> diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
> index 9998055..36e345a 100644
> --- a/ui/gtk/wlan_stat_dlg.c
> +++ b/ui/gtk/wlan_stat_dlg.c
> @@ -27,7 +27,7 @@
>  
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/addr_resolv.h>
> diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c
> index 3781fbe..188850f 100644
> --- a/ui/gtk/wsp_stat.c
> +++ b/ui/gtk/wsp_stat.c
> @@ -26,7 +26,7 @@
>  #include "config.h"
>  #include <string.h>
>  
> -#include <gtk/gtk.h>
> +#include <wsutil/wsgtk.h>
>  
>  #include <epan/packet.h>
>  #include <epan/tap.h>
> -- 
> 1.8.3.2
> 

> ___________________________________________________________________________
> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives:    http://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe


-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.