Include <epan/to_str.h> only when needed.

svn path=/trunk/; revision=53189

85 files changed, 89 insertions, 11 deletions

diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 183b19fefa..db6a724294 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -66,6 +66,7 @@
 #include <stdarg.h>
 #include "diam_dict.h"
 #include "diam_dict_lex.h"
+#include <epan/to_str.h>
 #include <wsutil/file_util.h>
 
 typedef struct entity_t {
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index cce340ec9e..518bf49390 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -49,6 +49,7 @@
 #include <epan/wmem/wmem.h>
 /* Include vendor id translation */
 #include <epan/sminmpec.h>
+#include <epan/to_str.h>
 
 #include "packet-radius.h"
 
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 2f5ecff64e..5ed3b09d21 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -30,6 +30,7 @@
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 #include <epan/etypes.h>
+#include <epan/to_str.h>
 
 /* Forward declarations */
 void proto_register_aarp(void);
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c
index 7309b7cc0b..b5b94a78fb 100644
--- a/epan/dissectors/packet-adwin-config.c
+++ b/epan/dissectors/packet-adwin-config.c
@@ -32,6 +32,7 @@
 #include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/ipproto.h>
+#include <epan/to_str.h>
 
 /* Forward declarations */
 void proto_register_adwin_config(void);
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index e60c9bac10..a43cda6b00 100644
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
@@ -48,6 +48,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <etypes.h>
 
 void proto_register_ans(void);
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 29746777b6..98e8a0733a 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -35,6 +35,7 @@
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
 #include <epan/strutil.h>
+#include <epan/to_str.h>
 
 #include "packet-gsm_sms.h"
 
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 1e47b22353..938a43407f 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -35,6 +35,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 void proto_register_ansi_683(void);
 void proto_reg_handoff_ansi_683(void);
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 2db10ea969..3dba5a5fcb 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -42,6 +42,7 @@
 
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
+#include <epan/to_str.h>
 
 void proto_register_ansi_801(void);
 void proto_reg_handoff_ansi_801(void);
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 89080953f3..a685c64698 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 #ifndef offsetof
 #define	offsetof(type, member)	((size_t)(&((type *)0)->member))
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index e843994858..c20d8bbbc5 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -43,6 +43,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/sctpppids.h>
 
 void proto_register_asap(void);
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 3f7261e145..9cef4ff94f 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 void proto_register_auto_rp(void);
 void proto_reg_handoff_auto_rp(void);
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index fade71bc97..fba9186203 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -49,6 +49,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/xdlc.h>
 #include <epan/ax25_pids.h>
diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c
index f54d178433..d9818ccdd7 100644
--- a/epan/dissectors/packet-babel.c
+++ b/epan/dissectors/packet-babel.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 
 void proto_register_babel(void);
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index c8cb5fbd07..85071529fe 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 36be282927..a5f2684b2b 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/in_cksum.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index 0dbc524e35..99074c3986 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -33,6 +33,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 
 #define CIMD_STX   0x02 /* Start of CIMD PDU */
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c
index 85eab09807..12f69a9038 100644
--- a/epan/dissectors/packet-csn1.c
+++ b/epan/dissectors/packet-csn1.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include "packet-csn1.h"
 
 #define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset))
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index 827411e7d8..4b9a1e0836 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 14690a11c3..6869d0f93d 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 /*
diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c
index 6c5790751f..cc525a4d45 100644
--- a/epan/dissectors/packet-dvb-data-mpe.c
+++ b/epan/dissectors/packet-dvb-data-mpe.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/dissectors/packet-mpeg-sect.h>
 
 void proto_register_dvb_data_mpe(void);
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index abe8785bb6..e3e16858e4 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -42,6 +42,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/sctpppids.h>
 
 void proto_register_enrp(void);
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 7a28a579a0..56c01607c0 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index d700b71c3c..52c6199d62 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -145,6 +145,7 @@ These are the structures you will see most often in EDP frames.
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/in_cksum.h>
 #include "packet-llc.h"
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 85379bfebf..169c5bf474 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 500f8f5123..a3988e7f12 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -34,6 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index a2a3ffd550..5a519c1266 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -33,6 +33,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index c1e606f349..264018f2b6 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index c4c48fafb4..3ff9fcd3d6 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 8b9015d102..60a0dcdf01 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index f0ae267534..e1ac68547d 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 19ab34536c..46fd6d29c0 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -39,6 +39,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
index b4278e6fbd..ef93d0a3bf 100644
--- a/epan/dissectors/packet-glusterfs.c
+++ b/epan/dissectors/packet-glusterfs.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/guid-utils.h>
 
 #include "packet-rpc.h"
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 24962a33f3..e13b3db6d7 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -43,6 +43,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 72bd089c46..578b5bd0e2 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -34,6 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index a11e009c75..fff57207e4 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -37,6 +37,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/tap.h>
 
 #include "packet-sccp.h"
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 90027b364c..ed022bc552 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/sminmpec.h>
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index 267b9dc1e8..9c1ef63e16 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/oui.h>
 #include <packet-llc.h>
 
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index c8a9748567..e45c0788d0 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -139,6 +139,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 static gint proto_hsrp = -1;
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 1330bf5452..22ebaa2a2a 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/oui.h>
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index 8bed6e7840..d698d6e8b8 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -34,6 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 static int proto_icq = -1;
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index c354e538ba..0a531f085d 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -114,6 +114,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
 #include "packet-igmp.h"
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index f99df1cabe..59b14e1c6a 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -34,6 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/ipproto.h>
 
 #define IGRP_HEADER_LENGTH 12
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index c60f89212e..b07e616009 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -31,6 +31,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index 8d7f7d0a09..380b8eb9ef 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/etypes.h>
 
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index 5c00d7f656..9f17831f13 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/afn.h>
 #include <epan/ipv6-utils.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 260114b4b6..c42e2460c9 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -39,6 +39,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
@@ -173,7 +174,7 @@ typedef enum _RAT_Type_enum {
 } RAT_Type_enum;
 
 /*--- End of included file: packet-lte-rrc-val.h ---*/
-#line 72 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 73 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_lte_rrc = -1;
@@ -2312,7 +2313,7 @@ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1;  /* CandidateCellInfo
 static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ 
 
 /*--- End of included file: packet-lte-rrc-hf.c ---*/
-#line 77 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 78 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1;
 static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1;
@@ -3510,7 +3511,7 @@ static gint ett_lte_rrc_CandidateCellInfoList_r10 = -1;
 static gint ett_lte_rrc_CandidateCellInfo_r10 = -1;
 
 /*--- End of included file: packet-lte-rrc-ett.c ---*/
-#line 187 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 188 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static gint ett_lte_rrc_featureGroupIndicators = -1;
 static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
@@ -34735,7 +34736,7 @@ static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_inf
 
 
 /*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 2189 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2190 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static void
 dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -43399,7 +43400,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 2336 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2337 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     { &hf_lte_rrc_eutra_cap_feat_group_ind_1,
       { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1",
@@ -44910,7 +44911,7 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_CandidateCellInfo_r10,
 
 /*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 2759 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2760 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     &ett_lte_rrc_featureGroupIndicators,
     &ett_lte_rrc_featureGroupIndRel9Add,
@@ -44977,7 +44978,7 @@ void proto_register_lte_rrc(void) {
 
 
 /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 2810 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2811 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
   register_init_routine(&lte_rrc_init_protocol);
 }
diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c
index 8c61cd38e9..2880e82c75 100644
--- a/epan/dissectors/packet-maap.c
+++ b/epan/dissectors/packet-maap.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/etypes.h>
 
 /* MAAP starts after common 1722 header */
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index e5b065bc50..ebe5a5c703 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -31,6 +31,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/sminmpec.h>
 
 void proto_register_mip(void);
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index b2d03f9b51..171c9d2fe6 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -50,6 +50,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 #include <epan/ipproto.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index c87c750f97..45550855b9 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -40,6 +40,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 #include "packet-wap.h"
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 5a02d56e2f..d813c7e75b 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -29,6 +29,7 @@
 
 #include <string.h>
 
+#include <epan/to_str.h>
 #include "packet-rpc.h"
 #include "packet-mount.h"
 #include "packet-nfs.h"
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 854458209e..e39eabe815 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 /* MSDP message types. The messages are TLV (Type-Length-Value) encoded */
 enum { MSDP_SA     = 1,
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index 6632e75170..ca5d70e802 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -40,6 +40,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include "packet-igmp.h"
 #include "packet-msnip.h"
 
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index 80990c29dd..979f71b1e8 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include "packet-ipx.h"
 #include "packet-netbios.h"
 
diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c
index ce0a22ebec..7b464a4350 100644
--- a/epan/dissectors/packet-netrom.c
+++ b/epan/dissectors/packet-netrom.c
@@ -48,6 +48,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/ax25_pids.h>
 
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index e369753903..b889e1bc0f 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include "packet-ipx.h"
 
 /* NLSP base header */
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index 64f49fcb66..bf2313512c 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 /* Offsets of fields within a PagP PDU */
 
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 92fb2048bf..fc2643c49d 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -34,6 +34,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 1ad7a596e3..0fcd8efca0 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -33,6 +33,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/asn1.h>
 #include "packet-pktc.h"
 #include "packet-kerberos.h"
diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c
index 3fb57155bd..1dd809670a 100644
--- a/epan/dissectors/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 static int proto_ripng = -1;
 static int hf_ripng_cmd = -1;
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index d63044ad96..a468bc1dec 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/ipproto.h>
 
 /* Forward declaration we need below */
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index 0554b8515a..4efe2616f7 100644
--- a/epan/dissectors/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 static int proto_slimp3 = -1;
 static int hf_slimp3_opcode = -1;
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index ea2e3f1e2c..ed071c9aa4 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/dissectors/packet-smb.h>
 
 #include "packet-smb-browse.h"
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index c16ca57e56..c7fe7a877f 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -38,6 +38,7 @@ XXX  Fixme : shouldn't show [malformed frame] for long packets
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-smb.h>
 #include "packet-smb-pipe.h"
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 2e40ebffc0..a813aa0874 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -40,6 +40,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/conversation.h>
 #include <epan/ipproto.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 8f2fc92d3b..668a3ae26d 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -36,6 +36,7 @@ Specs:
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/ipproto.h>
 #include "packet-ip.h"
 
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index 737b7f3861..12ee053d24 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 static int proto_trmac = -1;
diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c
index 14ddf34938..eb043382cc 100644
--- a/epan/dissectors/packet-vxi11.c
+++ b/epan/dissectors/packet-vxi11.c
@@ -29,6 +29,7 @@
 #include "config.h"
 
 #include "packet-rpc.h"
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 
 /*
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index 4a3f8bc8d0..d24d100363 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index d047cf8f0d..10b03df1c3 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 
 /*
diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c
index 340d14c993..44aca0fcfb 100644
--- a/epan/dissectors/packet-wifi-display.c
+++ b/epan/dissectors/packet-wifi-display.c
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 #include "packet-ieee80211.h"
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index 0c63befa0e..a04a1b6486 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 #include "packet-ieee80211.h"
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 7bd9e7eda1..1e89f25b44 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -46,6 +46,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 6b99014f39..d37a2f97c0 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/expert.h>
 
 #define UDP_PORT_XDMCP 177
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 341e9b8728..44f8e2e9c6 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 #include "packet-zbee.h"
 #include "packet-zbee-aps.h"
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index 5be5e69fe9..3e470ed651 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 
 #include "packet-zbee.h"
 #include "packet-zbee-aps.h"
diff --git a/epan/follow.c b/epan/follow.c
index b2318b5a62..86b9b12616 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -35,6 +35,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/emem.h>
 #include <epan/ipproto.h>
 #include <epan/dissectors/packet-tcp.h>
diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c
index ba3037c9bf..175338549f 100644
--- a/epan/ftypes/ftype-guid.c
+++ b/epan/ftypes/ftype-guid.c
@@ -27,6 +27,7 @@
 
 #include <ftypes-int.h>
 #include <epan/guid-utils.h>
+#include <epan/to_str.h>
 
 static void
 guid_fvalue_set(fvalue_t *fv, gpointer value, gboolean already_copied)
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 9a27c54e73..79e9f12b32 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -38,6 +38,7 @@
 #include <time.h>
 
 #include <ftypes-int.h>
+#include <epan/to_str.h>
 
 #ifdef NEED_STRPTIME_H
 #include "wsutil/strptime.h"
diff --git a/epan/gcp.h b/epan/gcp.h
index dc034bbd58..71859b49e2 100644
--- a/epan/gcp.h
+++ b/epan/gcp.h
@@ -31,7 +31,6 @@
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/to_str.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/epan/ipv4.c b/epan/ipv4.c
index 0296c8141f..25e64bed77 100644
--- a/epan/ipv4.c
+++ b/epan/ipv4.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 #include "ipv4.h"
-#include "packet.h" /* for ip_to_str */
+#include "to_str.h"
 #include "addr_and_mask.h"
 
 
diff --git a/epan/packet.h b/epan/packet.h
index addfc14af1..f37a3dbcf7 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -29,7 +29,6 @@
 #include "proto.h"
 #include "tvbuff.h"
 #include "wsutil/pint.h"
-#include "to_str.h"
 #include "value_string.h"
 #include "column-info.h"
 #include "frame_data.h"
diff --git a/epan/print.c b/epan/print.c
index 01a8708e52..af00f05811 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -34,6 +34,7 @@
 
 #include <epan/epan.h>
 #include <epan/epan_dissect.h>
+#include <epan/to_str.h>
 #include <epan/tvbuff.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
diff --git a/epan/stats_tree.h b/epan/stats_tree.h
index d692321c3c..06db45f1dc 100644
--- a/epan/stats_tree.h
+++ b/epan/stats_tree.h
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <epan/epan.h>
 #include <epan/packet_info.h>
-#include <epan/to_str.h>
 #include <epan/tap.h>
 #include "../stat_menu.h"
 #include "../register.h"
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index 9f9c2bb6dc..f046452deb 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -32,6 +32,7 @@
 
 #include <epan/emem.h>
 #include <epan/packet.h>
+#include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/tcap-persistentdata.h>
 #include <epan/dissectors/packet-tcap.h>