Move the proto data stuff out of frame_data.[ch].

It's not tied to the frame_data structure any more, so it belongs by
itself.

Clean up some #includes while we're at it; in particular, frame_data.h
doesn't use anything related to tvbuffs, so don't have it gratuitiously
include tvbuff.h.

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

14 files changed, 57 insertions, 28 deletions

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index c76f4ece50..992666f443 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -37,13 +37,15 @@
 #include <string.h>
 #include <math.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/in_cksum.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-ip.h>
-#include "epan/timestats.h"
+#include <epan/timestats.h>
 
 
 /* For checksum */
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index efa9d3e478..bb3602fc6e 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -40,13 +40,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/epan_dissect.h>
 #include <epan/stat_tap_ui.h>
-#include "epan/value_string.h"
-#include "epan/to_str.h"
-#include "epan/dissectors/packet-diameter.h"
+#include <epan/value_string.h>
+#include <epan/to_str.h>
+#include <epan/dissectors/packet-diameter.h>
 
 void register_tap_listener_diameteravp(void);
 
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index 33905269ba..4454f12863 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -32,8 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
-#include "epan/value_string.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-bssap.h>
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index f986f6cd21..6b7334b223 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -26,8 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
-#include "epan/value_string.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-http.h>
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 106e79b7ec..9102cf32fe 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -31,12 +31,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
+
+#include <glib.h>
 
-#include "epan/packet_info.h"
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
-#include <math.h>
 
 void register_tap_listener_icmpstat(void);
 
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 909405629d..6c2a59d0d7 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -32,12 +32,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
+
+#include <glib.h>
 
-#include "epan/packet_info.h"
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
-#include <math.h>
 
 void register_tap_listener_icmpv6stat(void);
 
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index bfc4a196e4..798062087d 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rpc.h>
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index c7a87214f0..17fd2b740a 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -37,12 +37,15 @@
 #include <string.h>
 #include <locale.h>
 
-#include "epan/packet_info.h"
-#include "epan/value_string.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/rtp_pt.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>
+
 #include "ui/rtp_stream.h"
 #include "ui/tap-rtp-common.h"
 
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 81f74e503c..20d15e4640 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -29,8 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
-#include "epan/value_string.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rtsp.h>
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index 2fe6dc03ff..2d41d362ae 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -27,10 +27,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/to_str.h>
 
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index 3a1936ad4a..a7936102db 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -28,10 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 #include <epan/dissectors/packet-sip.h>
 
 void register_tap_listener_sipstat(void);
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index 7508b648a3..0234281e28 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -26,11 +26,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/dissectors/packet-smb-sidsnooping.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 #include <epan/dissectors/packet-smb.h>
 
 void register_tap_listener_smbsids(void);
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index 1b41e0c1a8..c7a43ef294 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -25,8 +25,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <string.h>
+
+#include <glib.h>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 77bd455e90..b2a0ba46a8 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -31,10 +31,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
+#include <glib.h>
+
+#include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 #include <epan/dissectors/packet-wsp.h>
 
 void register_tap_listener_wspstat(void);