Move stat_menu.h to libui.

Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d
Reviewed-on: https://code.wireshark.org/review/2726
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Makefile.common

@@ -87,7 +87,6 @@ WIRESHARK_COMMON_INCLUDES =	\
 	globals.h	\
 	iface_monitor.h \
 	log.h		\
-	stat_menu.h	\
 	summary.h	\
 	sync_pipe.h	\
 	ws80211_utils.h

epan/funnel.h

@@ -27,7 +27,7 @@
 #define _FUNNEL_H
 
 #include <glib.h>
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ws_symbol_export.h"
 
 typedef struct _funnel_progress_window_t funnel_progress_window_t ;

epan/stats_tree.h

@@ -27,7 +27,7 @@
 #include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "../register.h"
 #include "ws_symbol_export.h"
 

epan/wslua/CMakeLists.txt

@@ -33,10 +33,10 @@ set(WSLUA_MODULES
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_pinfo.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_listener.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_gui.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dir.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_util.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_field.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c
+	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_file.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_struct.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_dumper.c
 	${CMAKE_CURRENT_SOURCE_DIR}/wslua/wslua_internals.c
@@ -106,7 +106,7 @@ ADD_CUSTOM_COMMAND(
       ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h
       ${CMAKE_SOURCE_DIR}/wiretap/wtap.h
       ${CMAKE_SOURCE_DIR}/epan/epan.h
-      ${CMAKE_SOURCE_DIR}/stat_menu.h
+      ${CMAKE_SOURCE_DIR}/ui/stat_menu.h
 )
 
 add_custom_target(

epan/wslua/Makefile.am

@@ -122,7 +122,7 @@ declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c
 dummy:
 	touch dummy
 
-init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h  ../proto.h ../../stat_menu.h
+init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h  ../proto.h ../../ui/stat_menu.h
 	$(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua
 
 checkapi:

epan/wslua/make-init-lua.pl

@@ -212,7 +212,7 @@ close PROTO_H;
 $menu_groups .= "-- menu groups for register_menu\n";
 my $menu_i = 0;
 
-open STAT_MENU, "< $WSROOT/stat_menu.h" or die "cannot open '$WSROOT/stat_menu.h':  $!";
+open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h':  $!";
 my $foundit = 0;
 while(<STAT_MENU>) {
     # need to skip matching words in comments, and get to the enum

ui/Makefile.common

@@ -100,6 +100,7 @@ noinst_HEADERS = \
 	simple_dialog.h		\
 	software_update.h	\
 	ssl_key_export.h	\
+	stat_menu.h		\
 	tap_export_pdu.h	\
 	tap-megaco-common.h	\
 	tap-rtp-common.h	\

ui/gtk/afp_stat.c

@@ -34,7 +34,7 @@
 #include <epan/dissectors/packet-afp.h>
 
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/ansi_a_stat.c

@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/ansi_map_stat.c

@@ -42,7 +42,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ansi_map.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/bootp_stat.c

@@ -30,7 +30,7 @@
 #include <epan/epan.h>
 #include <epan/tap.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/camel_counter.c

@@ -35,7 +35,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-camel.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/camel_srt.c

@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-camel.h>
 
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/compare_stat.c

@@ -53,7 +53,7 @@
 #include <epan/dissectors/packet-ip.h>
 #include <epan/in_cksum.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "epan/timestats.h"
 
 #include "ui/simple_dialog.h"

ui/gtk/conversations_eth.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-eth.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_fc.c

@@ -32,7 +32,7 @@
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-fc.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_fddi.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-fddi.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_ip.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ip.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_ipv6.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipv6.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_ipx.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipx.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_jxta.c

@@ -32,7 +32,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-jxta.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_ncp.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ncp-int.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_rsvp.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rsvp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_sctp.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sctp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_table.c

@@ -36,7 +36,7 @@
 
 #include "../globals.h"
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"

ui/gtk/conversations_tcpip.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_tr.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tr.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_udpip.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-udp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_usb.c

@@ -30,7 +30,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/tap.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/conversations_wlan.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ieee80211.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"

ui/gtk/dcerpc_stat.c

@@ -41,7 +41,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/diameter_stat.c

@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-diameter.h>
 
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/expert_comp_dlg.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/fc_stat.c

@@ -35,7 +35,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/flow_graph.c

@@ -35,7 +35,7 @@
 #include <epan/to_str.h>
 #include <epan/strutil.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/funnel_stat.c

@@ -45,7 +45,7 @@
 #include <epan/funnel.h>
 
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/progress_dlg.h"
 #include "../color_filters.h"
 

ui/gtk/gsm_a_stat.c

@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a_common.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/gsm_map_stat.c

@@ -44,7 +44,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/gsm_map_summary.c

@@ -39,7 +39,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "../globals.h"
 #include "../file.h"
 #include "../summary.h"

ui/gtk/gtp_stat.c

@@ -35,7 +35,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/h225_counter.c

@@ -36,7 +36,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/h225_ras_srt.c

@@ -37,7 +37,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/hostlist_eth.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-eth.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_fc.c

@@ -32,7 +32,7 @@
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-fc.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_fddi.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-fddi.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_ip.c

@@ -33,7 +33,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ip.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_ipv6.c

@@ -34,7 +34,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipv6.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_ipx.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipx.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_jxta.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-jxta.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_ncp.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 /*#include <epan/dissectors/packet-ncp-int.h>*/
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_rsvp.c

@@ -32,7 +32,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rsvp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_sctp.c

@@ -30,7 +30,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sctp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_tcpip.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_tr.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tr.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_udpip.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-udp.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_usb.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-usb.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/hostlist_wlan.c

@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ieee80211.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"

ui/gtk/iax2_analysis.c

@@ -64,7 +64,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/util.h"
 #include "ui/alert_box.h"

ui/gtk/io_stat.c

@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include <epan/strutil.h>
 
-#include "../../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/alert_box.h"
 #include "ui/io_graph_item.h"
 #include "ui/simple_dialog.h"

ui/gtk/lbm_stream_dlg.c

@@ -25,12 +25,12 @@
 #include "config.h"
 #include <glib.h>
 #include <epan/to_str.h>
-#include <stat_menu.h>
 #include <epan/funnel.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 #include <gtk/gtk.h>
+#include <ui/stat_menu.h>
 #include <ui/gtk/gui_utils.h>
 #include <ui/gtk/dlg_utils.h>
 #include <cfile.h>

ui/gtk/lbm_uimflow_dlg.c

@@ -25,11 +25,11 @@
 #include "config.h"
 #include <glib.h>
 #include <epan/to_str.h>
-#include <stat_menu.h>
 #include <epan/funnel.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <gtk/gtk.h>
+#include <ui/stat_menu.h>
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
 #include <cfile.h>

ui/gtk/ldap_stat.c

@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/mac_lte_stat_dlg.c

@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-mac-lte.h>
 
 #include "ui/simple_dialog.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/main_menubar.c

@@ -47,8 +47,8 @@
 #include "cfile.h"
 #include "globals.h"
 #include "color_filters.h"
-#include "stat_menu.h"
 
+#include "ui/stat_menu.h"
 #include "ui/iface_lists.h"
 #include "ui/main_statusbar.h"
 #include "ui/preference_utils.h"

ui/gtk/mcast_stream_dlg.c

@@ -41,7 +41,7 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/mcast_stream_dlg.h"

ui/gtk/megaco_stat.c

@@ -39,7 +39,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/mgcp_stat.c

@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/mtp3_stat.c

@@ -43,7 +43,7 @@
 #include <epan/emem.h>
 #include <epan/dissectors/packet-mtp3.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/mtp3_summary.c

@@ -37,7 +37,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-mtp3.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "../globals.h"
 #include "../file.h"
 #include "../summary.h"

ui/gtk/ncp_stat.c

@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/radius_stat.c

@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/rlc_lte_graph.c

@@ -40,7 +40,7 @@
 #include "../globals.h"
 #include "../frame_tvbuff.h"
 #include "ui/simple_dialog.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/rlc_lte_stat_dlg.c

@@ -40,7 +40,7 @@
 #include <epan/dissectors/packet-rlc-lte.h>
 
 #include "ui/simple_dialog.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/rpc_progs.c

@@ -39,7 +39,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "../globals.h"
 
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/rpc_stat.c

@@ -39,7 +39,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"

ui/gtk/rtp_analysis.c

@@ -63,7 +63,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/util.h"
 #include "ui/alert_box.h"

ui/gtk/rtp_stream_dlg.c

@@ -36,7 +36,7 @@
 #include "wsutil/filesystem.h"
 
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"

ui/gtk/scsi_stat.c

@@ -45,7 +45,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/gui_utils.h"

ui/gtk/sctp_assoc_analyse.c

@@ -31,7 +31,7 @@
 
 #include "../globals.h"
 #include "ui/simple_dialog.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/sctp_chunk_stat.c

@@ -39,7 +39,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/sctp_stat_dlg.c

@@ -29,7 +29,7 @@
 #include "epan/to_str.h"
 
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/sip_stat.c

@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/smb2_stat.c

@@ -35,7 +35,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/smb_stat.c

@@ -35,7 +35,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/stats_tree_stat.c

@@ -41,7 +41,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/tap_param_dlg.c

@@ -32,7 +32,7 @@
 
 #include "../file.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/tcp_graph.c

@@ -45,8 +45,8 @@
 #include <epan/conv_id.h>
 
 #include "../../globals.h"
-#include "../../stat_menu.h"
 
+#include "ui/stat_menu.h"
 #include "ui/tap-tcp-stream.h"
 #include "ui/utf8_entities.h"
 

ui/gtk/uat_gui.c

@@ -56,7 +56,7 @@
 #include <epan/value_string.h>
 #include <wsutil/filesystem.h>
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/help_url.h"
 #include "ui/gtk/gtkglobals.h"

ui/gtk/voip_calls_dlg.c

@@ -50,7 +50,7 @@
 #include <epan/dissectors/packet-h248.h>
 
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/voip_calls_dlg.h"

ui/gtk/wlan_stat_dlg.c

@@ -37,7 +37,7 @@
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
 
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"

ui/gtk/wsp_stat.c

@@ -32,7 +32,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "../stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

ui/tap-megaco-common.c

@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "file.h"
 #include "globals.h"
-#include "stat_menu.h"
+#include "ui/stat_menu.h"
 
 #include "tap-megaco-common.h"