Rename and move ui/stat_menu.h to epan/stat_groups.h.

The groups are, technically, independent of the notion of a menu, and,
if we have mechanisms by which taps that are not only GUI
toolkit-independent but independent of the *existence* of a GUI can be
registered, they might want to register themselves in a group just in
case they're running in a program that has a GUI.

Also, this might fix the Debian package build.

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

94 files changed, 95 insertions, 171 deletions

diff --git a/debian/libwireshark-dev.install b/debian/libwireshark-dev.install
index 712de96327..d42d843f91 100644
--- a/debian/libwireshark-dev.install
+++ b/debian/libwireshark-dev.install
@@ -3,7 +3,7 @@ usr/lib/*/pkgconfig/wireshark.pc
 color.h usr/include/wireshark
 obj-*/config.h usr/include/wireshark
 register.h usr/include/wireshark
-ui/stat_menu.h usr/include/wireshark
+epan/stat_groups.h usr/include/wireshark
 epan/*.h usr/include/wireshark/epan
 epan/crypt/*.h usr/include/wireshark/epan/crypt
 epan/dfilter/*.h usr/include/wireshark/epan/dfilter
diff --git a/epan/Makefile.common b/epan/Makefile.common
index f5991c91f7..1707635e29 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -238,6 +238,7 @@ LIBWIRESHARK_INCLUDES =		\
 	sminmpec.h		\
 	sna-utils.h		\
 	stat_cmd_args.h		\
+	stat_groups.h		\
 	stats_tree.h		\
 	stats_tree_priv.h	\
 	stream.h		\
diff --git a/epan/funnel.h b/epan/funnel.h
index b2878427fa..2b2282ab75 100644
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -27,7 +27,7 @@
 #define _FUNNEL_H
 
 #include <glib.h>
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ws_symbol_export.h"
 
 typedef struct _funnel_progress_window_t funnel_progress_window_t ;
diff --git a/epan/stats_tree.h b/epan/stats_tree.h
index 8f98ed2ce6..0efa1c7349 100644
--- a/epan/stats_tree.h
+++ b/epan/stats_tree.h
@@ -27,7 +27,7 @@
 #include <epan/epan.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "../register.h"
 #include "ws_symbol_export.h"
 
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index ca919b8572..6bb30756d7 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -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}/ui/stat_menu.h
+      ${CMAKE_SOURCE_DIR}/epan/stat_groups.h
 )
 
 add_custom_target(
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index 7e677dbec1..85203ced2d 100644
--- a/epan/wslua/Makefile.am
+++ b/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 ../../ui/stat_menu.h
+init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h  ../proto.h ../stat_groups.h
 	$(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua
 
 checkapi:
diff --git a/epan/wslua/make-init-lua.pl b/epan/wslua/make-init-lua.pl
index 336d6670bd..082fb5264d 100755
--- a/epan/wslua/make-init-lua.pl
+++ b/epan/wslua/make-init-lua.pl
@@ -204,7 +204,7 @@ while(<PROTO_H>) {
 close PROTO_H;
 
 #
-# Extract values from stat_menu.h:
+# Extract values from stat_groups.h:
 #
 #	MENU_X_X values for register_stat_group_t
 #
@@ -212,9 +212,9 @@ close PROTO_H;
 $menu_groups .= "-- menu groups for register_menu\n";
 my $menu_i = 0;
 
-open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h':  $!";
+open STAT_GROUPS, "< $WSROOT/epan/stat_groups.h" or die "cannot open '$WSROOT/epan/stat_groups.h':  $!";
 my $foundit = 0;
-while(<STAT_MENU>) {
+while(<STAT_GROUPS>) {
     # need to skip matching words in comments, and get to the enum
     if (/^typedef enum {/) { $foundit = 1; }
     # the problem here is we need to pick carefully, so we don't break existing scripts
@@ -224,7 +224,7 @@ while(<STAT_MENU>) {
         $menu_i++;
     }
 }
-close STAT_MENU;
+close STAT_GROUPS;
 
 
 $bases_table .= "}\n\n";
diff --git a/ui/Makefile.common b/ui/Makefile.common
index 5022898063..3392e9e94a 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -102,7 +102,6 @@ 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	\
diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index 30ac9441b0..0a1587c36b 100644
--- a/ui/gtk/afp_stat.c
+++ b/ui/gtk/afp_stat.c
@@ -34,7 +34,7 @@
 #include <epan/dissectors/packet-afp.h>
 
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c
index 4ed87f2361..52a782e65d 100644
--- a/ui/gtk/ansi_a_stat.c
+++ b/ui/gtk/ansi_a_stat.c
@@ -43,7 +43,7 @@
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
index aecfba0faf..9fcdf033e2 100644
--- a/ui/gtk/ansi_map_stat.c
+++ b/ui/gtk/ansi_map_stat.c
@@ -42,7 +42,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ansi_map.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c
index d85bc05601..6948157fe1 100644
--- a/ui/gtk/bootp_stat.c
+++ b/ui/gtk/bootp_stat.c
@@ -30,7 +30,7 @@
 #include <epan/epan.h>
 #include <epan/tap.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c
index 34943ff155..24e9964c15 100644
--- a/ui/gtk/camel_counter.c
+++ b/ui/gtk/camel_counter.c
@@ -35,7 +35,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-camel.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
index 12b3d84173..6a5c4392f5 100644
--- a/ui/gtk/camel_srt.c
+++ b/ui/gtk/camel_srt.c
@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-camel.h>
 
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 945d75bbc7..f1532810c3 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -53,7 +53,7 @@
 #include <epan/dissectors/packet-ip.h>
 #include <epan/in_cksum.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "epan/timestats.h"
 
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c
index 1e5a1679d5..6e8fa7eec2 100644
--- a/ui/gtk/conversations_eth.c
+++ b/ui/gtk/conversations_eth.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-eth.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c
index de004b62db..59a522d496 100644
--- a/ui/gtk/conversations_fc.c
+++ b/ui/gtk/conversations_fc.c
@@ -32,7 +32,7 @@
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-fc.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c
index eb544a3f05..6911bf564a 100644
--- a/ui/gtk/conversations_fddi.c
+++ b/ui/gtk/conversations_fddi.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-fddi.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c
index 495a02abaf..1f2f33a0e8 100644
--- a/ui/gtk/conversations_ip.c
+++ b/ui/gtk/conversations_ip.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ip.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c
index 706a5d5763..2a2833eb8c 100644
--- a/ui/gtk/conversations_ipv6.c
+++ b/ui/gtk/conversations_ipv6.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipv6.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c
index 49d6b0c398..9593adef93 100644
--- a/ui/gtk/conversations_ipx.c
+++ b/ui/gtk/conversations_ipx.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipx.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c
index 2eac226dac..fb3c1aa929 100644
--- a/ui/gtk/conversations_jxta.c
+++ b/ui/gtk/conversations_jxta.c
@@ -32,7 +32,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-jxta.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c
index bb80560961..50df44cd3f 100644
--- a/ui/gtk/conversations_ncp.c
+++ b/ui/gtk/conversations_ncp.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ncp-int.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c
index 9301b5c7f8..0ff4b86487 100644
--- a/ui/gtk/conversations_rsvp.c
+++ b/ui/gtk/conversations_rsvp.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rsvp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c
index d672bf1cee..b57f4f760d 100644
--- a/ui/gtk/conversations_sctp.c
+++ b/ui/gtk/conversations_sctp.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sctp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index faf034ad23..a8485c3ca7 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -36,7 +36,7 @@
 
 #include "../globals.h"
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
diff --git a/ui/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c
index c719057c9f..afd6e76c73 100644
--- a/ui/gtk/conversations_tcpip.c
+++ b/ui/gtk/conversations_tcpip.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c
index 4443252d0a..666d400791 100644
--- a/ui/gtk/conversations_tr.c
+++ b/ui/gtk/conversations_tr.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tr.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c
index 3921cc1d58..961b85e751 100644
--- a/ui/gtk/conversations_udpip.c
+++ b/ui/gtk/conversations_udpip.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-udp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_usb.c b/ui/gtk/conversations_usb.c
index acb8a4cfa7..e5d12160da 100644
--- a/ui/gtk/conversations_usb.c
+++ b/ui/gtk/conversations_usb.c
@@ -30,7 +30,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/tap.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c
index ce2c9941af..4ab1cb3d45 100644
--- a/ui/gtk/conversations_wlan.c
+++ b/ui/gtk/conversations_wlan.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ieee80211.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/conversations_table.h"
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index 6ca7bda5fa..5a59b995de 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -41,7 +41,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
index 0e7bf85077..3bb7d1609e 100644
--- a/ui/gtk/diameter_stat.c
+++ b/ui/gtk/diameter_stat.c
@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-diameter.h>
 
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index ba1e8c252a..311018e550 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/simple_dialog.h"
 
diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c
index ad9e16316c..8adab3208f 100644
--- a/ui/gtk/fc_stat.c
+++ b/ui/gtk/fc_stat.c
@@ -35,7 +35,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index e0671700a5..6b042e2a6e 100644
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -35,7 +35,7 @@
 #include <epan/to_str.h>
 #include <epan/strutil.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
index dbaf1bb2af..133b41af29 100644
--- a/ui/gtk/funnel_stat.c
+++ b/ui/gtk/funnel_stat.c
@@ -45,7 +45,7 @@
 #include <epan/funnel.h>
 
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/progress_dlg.h"
 #include "../color_filters.h"
 
diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c
index daebf0adcb..586286268f 100644
--- a/ui/gtk/gsm_a_stat.c
+++ b/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 "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c
index 19ae29bc03..4ba582208c 100644
--- a/ui/gtk/gsm_map_stat.c
+++ b/ui/gtk/gsm_map_stat.c
@@ -44,7 +44,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c
index c055ee4ba2..ef16df241e 100644
--- a/ui/gtk/gsm_map_summary.c
+++ b/ui/gtk/gsm_map_summary.c
@@ -39,7 +39,7 @@
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "../globals.h"
 #include "../file.h"
 #include "../summary.h"
diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c
index d79787e716..a6ec3cf4ba 100644
--- a/ui/gtk/gtp_stat.c
+++ b/ui/gtk/gtp_stat.c
@@ -35,7 +35,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c
index 8a8b28822d..3a64260545 100644
--- a/ui/gtk/h225_counter.c
+++ b/ui/gtk/h225_counter.c
@@ -36,7 +36,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
index 72eaf26ed0..83a0f8f698 100644
--- a/ui/gtk/h225_ras_srt.c
+++ b/ui/gtk/h225_ras_srt.c
@@ -37,7 +37,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/hostlist_eth.c b/ui/gtk/hostlist_eth.c
index 1de198a045..94dc017b98 100644
--- a/ui/gtk/hostlist_eth.c
+++ b/ui/gtk/hostlist_eth.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-eth.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c
index ee11dd906a..b5ab9898ba 100644
--- a/ui/gtk/hostlist_fc.c
+++ b/ui/gtk/hostlist_fc.c
@@ -32,7 +32,7 @@
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-fc.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c
index c7de4313de..e002f87cd6 100644
--- a/ui/gtk/hostlist_fddi.c
+++ b/ui/gtk/hostlist_fddi.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-fddi.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c
index b304b80e8a..a6633636fa 100644
--- a/ui/gtk/hostlist_ip.c
+++ b/ui/gtk/hostlist_ip.c
@@ -33,7 +33,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ip.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c
index 4fae34283f..932319b792 100644
--- a/ui/gtk/hostlist_ipv6.c
+++ b/ui/gtk/hostlist_ipv6.c
@@ -34,7 +34,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipv6.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c
index 218c8c794f..91a39eb0f1 100644
--- a/ui/gtk/hostlist_ipx.c
+++ b/ui/gtk/hostlist_ipx.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ipx.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c
index a44eaff860..8402bd8eea 100644
--- a/ui/gtk/hostlist_jxta.c
+++ b/ui/gtk/hostlist_jxta.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-jxta.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_ncp.c b/ui/gtk/hostlist_ncp.c
index 20c8a51731..79654bbdfa 100644
--- a/ui/gtk/hostlist_ncp.c
+++ b/ui/gtk/hostlist_ncp.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 /*#include <epan/dissectors/packet-ncp-int.h>*/
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c
index 402bd8423d..711e715fb6 100644
--- a/ui/gtk/hostlist_rsvp.c
+++ b/ui/gtk/hostlist_rsvp.c
@@ -32,7 +32,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rsvp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c
index 0cc9cd3efa..77a530762f 100644
--- a/ui/gtk/hostlist_sctp.c
+++ b/ui/gtk/hostlist_sctp.c
@@ -30,7 +30,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-sctp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_tcpip.c b/ui/gtk/hostlist_tcpip.c
index 23c4734386..9c777b5ea5 100644
--- a/ui/gtk/hostlist_tcpip.c
+++ b/ui/gtk/hostlist_tcpip.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tcp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c
index e0269cc586..e58bc4e656 100644
--- a/ui/gtk/hostlist_tr.c
+++ b/ui/gtk/hostlist_tr.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-tr.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c
index f10922cda8..2cdb3841ab 100644
--- a/ui/gtk/hostlist_udpip.c
+++ b/ui/gtk/hostlist_udpip.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-udp.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c
index 0c240bda92..8bf63b899e 100644
--- a/ui/gtk/hostlist_usb.c
+++ b/ui/gtk/hostlist_usb.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-usb.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/hostlist_wlan.c b/ui/gtk/hostlist_wlan.c
index d928914d4d..f456d93e19 100644
--- a/ui/gtk/hostlist_wlan.c
+++ b/ui/gtk/hostlist_wlan.c
@@ -31,7 +31,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ieee80211.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/hostlist_table.h"
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 3c72ad039b..9e77528e4a 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -64,7 +64,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/util.h"
 #include "ui/alert_box.h"
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index 9a402d5d46..09755260bd 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include <epan/strutil.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/alert_box.h"
 #include "ui/io_graph_item.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c
index 4295ed4449..475183ebd7 100644
--- a/ui/gtk/lbm_stream_dlg.c
+++ b/ui/gtk/lbm_stream_dlg.c
@@ -30,7 +30,7 @@
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 #include <gtk/gtk.h>
-#include <ui/stat_menu.h>
+#include <epan/stat_groups.h>
 #include <ui/gtk/gui_utils.h>
 #include <ui/gtk/dlg_utils.h>
 #include <cfile.h>
diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index 1f05ec614b..d766d0f7e4 100644
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -28,8 +28,8 @@
 #include <epan/funnel.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
+#include <epan/stat_groups.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>
diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c
index 4c90ffb452..1b6aa7d9b7 100644
--- a/ui/gtk/ldap_stat.c
+++ b/ui/gtk/ldap_stat.c
@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index eba41e5a75..097a6864b3 100644
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -35,7 +35,7 @@
 #include <epan/dissectors/packet-mac-lte.h>
 
 #include "ui/simple_dialog.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 1b6af6f505..6c45bf821c 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -48,7 +48,7 @@
 #include "globals.h"
 #include "color_filters.h"
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/iface_lists.h"
 #include "ui/main_statusbar.h"
 #include "ui/preference_utils.h"
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index c1f54d6809..545ba07571 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -41,7 +41,7 @@
 #include <epan/strutil.h>
 
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/mcast_stream_dlg.h"
diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c
index 8692002337..38c9f5a016 100644
--- a/ui/gtk/megaco_stat.c
+++ b/ui/gtk/megaco_stat.c
@@ -39,7 +39,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c
index 25a0e2f047..080408cb8b 100644
--- a/ui/gtk/mgcp_stat.c
+++ b/ui/gtk/mgcp_stat.c
@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c
index cb1f61c9d8..925fde34c5 100644
--- a/ui/gtk/mtp3_stat.c
+++ b/ui/gtk/mtp3_stat.c
@@ -43,7 +43,7 @@
 #include <epan/emem.h>
 #include <epan/dissectors/packet-mtp3.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c
index 52ec983cbe..de08b491b0 100644
--- a/ui/gtk/mtp3_summary.c
+++ b/ui/gtk/mtp3_summary.c
@@ -37,7 +37,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-mtp3.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "../globals.h"
 #include "../file.h"
 #include "../summary.h"
diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c
index 94f0bc857b..e8ed0a44e1 100644
--- a/ui/gtk/ncp_stat.c
+++ b/ui/gtk/ncp_stat.c
@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c
index 5d2c1aa6c8..604533440b 100644
--- a/ui/gtk/radius_stat.c
+++ b/ui/gtk/radius_stat.c
@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
index 764ce34d4a..05ad9e03a0 100644
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@@ -40,7 +40,7 @@
 #include "../globals.h"
 #include "../frame_tvbuff.h"
 #include "ui/simple_dialog.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index 92fbe8268b..d85f1fb14d 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -40,7 +40,7 @@
 #include <epan/dissectors/packet-rlc-lte.h>
 
 #include "ui/simple_dialog.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c
index fbc4adff27..4093556fe7 100644
--- a/ui/gtk/rpc_progs.c
+++ b/ui/gtk/rpc_progs.c
@@ -39,7 +39,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "../globals.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index d635d9fdea..81a7b01303 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -39,7 +39,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/simple_dialog.h"
 
 #include "ui/gtk/gui_stat_menu.h"
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index aaf7e97b15..14e91ae6df 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -63,7 +63,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/strutil.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/util.h"
 #include "ui/alert_box.h"
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 0378466bcf..ba707a5d76 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -36,7 +36,7 @@
 #include "wsutil/filesystem.h"
 
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c
index 6e2abfd217..6efc70b2b1 100644
--- a/ui/gtk/scsi_stat.c
+++ b/ui/gtk/scsi_stat.c
@@ -45,7 +45,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/gui_utils.h"
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 979c8761b4..1b89963915 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -31,7 +31,7 @@
 
 #include "../globals.h"
 #include "ui/simple_dialog.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
index 008a54fd25..f0e8dcdbc3 100644
--- a/ui/gtk/sctp_chunk_stat.c
+++ b/ui/gtk/sctp_chunk_stat.c
@@ -39,7 +39,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_util.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index c754e50c30..20cbade0a8 100644
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -29,7 +29,7 @@
 #include "epan/to_str.h"
 
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_stat_menu.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c
index a1cbc3a705..8aba5daca6 100644
--- a/ui/gtk/sip_stat.c
+++ b/ui/gtk/sip_stat.c
@@ -34,7 +34,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
index 7b549c1b11..53b148039f 100644
--- a/ui/gtk/smb2_stat.c
+++ b/ui/gtk/smb2_stat.c
@@ -35,7 +35,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c
index 891c186e2d..b1c387a3b6 100644
--- a/ui/gtk/smb_stat.c
+++ b/ui/gtk/smb_stat.c
@@ -35,7 +35,7 @@
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index 406bc5da3a..952ee0b1e5 100644
--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@@ -41,7 +41,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c
index 28a9d85e3a..b235dd9edc 100644
--- a/ui/gtk/tap_param_dlg.c
+++ b/ui/gtk/tap_param_dlg.c
@@ -32,7 +32,7 @@
 
 #include "../file.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index af00f8c48a..5ff8e97fe9 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -46,7 +46,7 @@
 
 #include "../../globals.h"
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 #include "ui/tap-tcp-stream.h"
 #include "ui/utf8_entities.h"
 
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index 63c903b7e2..cc0c7d6b89 100644
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@@ -56,7 +56,7 @@
 #include <epan/value_string.h>
 #include <wsutil/filesystem.h>
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/help_url.h"
 #include "ui/gtk/gtkglobals.h"
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index 660bf6672a..8afab9c41f 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -50,7 +50,7 @@
 #include <epan/dissectors/packet-h248.h>
 
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/graph_analysis.h"
 #include "ui/gtk/voip_calls_dlg.h"
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 6b0971b2d9..91f5c6932b 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -37,7 +37,7 @@
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
 
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c
index 7cda88733b..a24f611bed 100644
--- a/ui/gtk/wsp_stat.c
+++ b/ui/gtk/wsp_stat.c
@@ -32,7 +32,7 @@
 
 #include "ui/simple_dialog.h"
 #include "../globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"
diff --git a/ui/stat_menu.h b/ui/stat_menu.h
deleted file mode 100644
index 35ef533ac0..0000000000
--- a/ui/stat_menu.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* stat_menu.h
- * Menu definitions for use by stats
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 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 __STATMENU_H__
-#define __STATMENU_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** @file
- * Add a new menu item for a stat.
- */
-
-/*
- * XXX - defines stuff usable regardless of the GUI toolkit.  Right now,
- * that's only the menu group, which is used by tap_param_dlg.h.
- *
- * XXX - stats should be able to register additional menu groups, although
- * the question then would be "in what order should they appear in the menu?"
- *
- * NOTE: the enum below is parsed by epan/wslua/make-init-lua.pl in order
- * to generate usable values for Lua scripts to use, so they can add to
- * the menus in the GUI. The perl script's regex is such that the following
- * prefixes must only appear once in this list:
- * REGISTER_ANALYZE_GROUP_CONVERSATION
- * REGISTER_STAT_GROUP_CONVERSATION
- * REGISTER_STAT_GROUP_RESPONSE
- * REGISTER_STAT_GROUP_ENDPOINT
- * In other words, because there is a REGISTER_STAT_GROUP_RESPONSE_TIME, you cannot
- * add a REGISTER_STAT_GROUP_RESPONSE nor a REGISTER_STAT_GROUP_RESPONSE_FOOBAR
- * because they use the same "REGISTER_STAT_GROUP_RESPONSE" prefix.
- * Also, do NOT change the names in the enum - you can add, but not remove.
- * If you do, legacy scripts will break. (which is why the perl script regex isn't better)
- */
-
-/** The menu group this stat should be registered in. */
-typedef enum {
-    REGISTER_ANALYZE_GROUP_UNSORTED,            /* unsorted analyze stuff */
-    REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER, /* conversation filters */
-    REGISTER_STAT_GROUP_UNSORTED,               /* unsorted statistic function */
-    REGISTER_STAT_GROUP_GENERIC,                /* generic statistic function, not specific to a protocol */
-    REGISTER_STAT_GROUP_CONVERSATION_LIST,      /* member of the conversation list */
-    REGISTER_STAT_GROUP_ENDPOINT_LIST,          /* member of the endpoint list */
-    REGISTER_STAT_GROUP_RESPONSE_TIME,          /* member of the service response time list */
-    REGISTER_STAT_GROUP_TELEPHONY,              /* telephony specific */
-    REGISTER_STAT_GROUP_TELEPHONY_GSM,          /* GSM (and UMTS?) */
-    REGISTER_STAT_GROUP_TELEPHONY_LTE,          /* name says it all */
-    REGISTER_STAT_GROUP_TELEPHONY_SCTP,         /* name says it all */
-    REGISTER_TOOLS_GROUP_UNSORTED               /* unsorted tools */
-} register_stat_group_t;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __STATMENU_H__ */
diff --git a/ui/tap-megaco-common.c b/ui/tap-megaco-common.c
index 7b639df542..c547b39ec0 100644
--- a/ui/tap-megaco-common.c
+++ b/ui/tap-megaco-common.c
@@ -36,7 +36,7 @@
 #include "epan/timestats.h"
 #include "file.h"
 #include "globals.h"
-#include "ui/stat_menu.h"
+#include <epan/stat_groups.h>
 
 #include "tap-megaco-common.h"