Add missing includes in order to remove exceptions.h from proto.h (next commit).

svn path=/trunk/; revision=53230

208 files changed, 345 insertions, 93 deletions

diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index d8b1a46119..506ae4ba09 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -38,6 +38,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c
index c47c979c0b..ae4aa043f7 100644
--- a/asn1/atn-cm/packet-atn-cm-template.c
+++ b/asn1/atn-cm/packet-atn-cm-template.c
@@ -49,6 +49,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-per.h>
diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
index bebaf982e3..745c953b0c 100644
--- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
+++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
@@ -53,6 +53,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-per.h>
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index f1b5b690f5..904b080724 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/strutil.h>
 #include <wsutil/pint.h>
 
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index fa191076ee..7d18842906 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include "packet-h248.h"
+#include <epan/exceptions.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 #include "packet-tpkt.h"
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index beade39f1f..6f821b5f73 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -90,6 +90,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c
index 5a80a9f4f4..ad2e003428 100644
--- a/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -30,6 +30,9 @@
 #include "config.h"
 
 #include <glib.h>
+
+#include <stdlib.h>
+
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index 3da29d1b73..24d911da78 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c
index 8fe86801a3..e2c6241fe0 100644
--- a/asn1/t124/packet-t124-template.c
+++ b/asn1/t124/packet-t124-template.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index ae512ce9d5..10eecbf9b6 100644
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #include <epan/asn1.h>
 #include "packet-ber.h"
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index fa9264ecb1..869ac0f9c9 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index a808d1bf36..725b167890 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -3,6 +3,8 @@
 %include {
 #include "config.h"
 
+#include <assert.h>
+
 #include "dfilter-int.h"
 #include "syntax-tree.h"
 #include "sttype-range.h"
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index d5ac627b6c..dc37ecf9fb 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -46,6 +46,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
@@ -189,7 +190,7 @@ static int hf_acse_ACSE_requirements_higher_level_association = -1;
 static int hf_acse_ACSE_requirements_nested_association = -1;
 
 /*--- End of included file: packet-acse-hf.c ---*/
-#line 72 "../../asn1/acse/packet-acse-template.c"
+#line 73 "../../asn1/acse/packet-acse-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_acse = -1;
@@ -233,7 +234,7 @@ static gint ett_acse_Authentication_value_other = -1;
 static gint ett_acse_Authentication_value = -1;
 
 /*--- End of included file: packet-acse-ett.c ---*/
-#line 76 "../../asn1/acse/packet-acse-template.c"
+#line 77 "../../asn1/acse/packet-acse-template.c"
 
 static expert_field ei_acse_dissector_not_available = EI_INIT;
 
@@ -1690,7 +1691,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 
 /*--- End of included file: packet-acse-fn.c ---*/
-#line 152 "../../asn1/acse/packet-acse-template.c"
+#line 153 "../../asn1/acse/packet-acse-template.c"
 
 
 /*
@@ -2241,7 +2242,7 @@ void proto_register_acse(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
-#line 270 "../../asn1/acse/packet-acse-template.c"
+#line 271 "../../asn1/acse/packet-acse-template.c"
   };
 
   /* List of subtrees */
@@ -2287,7 +2288,7 @@ void proto_register_acse(void) {
     &ett_acse_Authentication_value,
 
 /*--- End of included file: packet-acse-ettarr.c ---*/
-#line 276 "../../asn1/acse/packet-acse-template.c"
+#line 277 "../../asn1/acse/packet-acse-template.c"
   };
 
   static ei_register_info ei[] = {
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 54aef8b0a8..959dc953ff 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -32,6 +32,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 /* #include <epan/strutil.h> */
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 3b0df18275..03dc18a790 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -40,6 +40,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 7e1fc43643..3841b57278 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -40,6 +40,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c
index b1187ef524..c1aad136a7 100644
--- a/epan/dissectors/packet-atn-cm.c
+++ b/epan/dissectors/packet-atn-cm.c
@@ -57,6 +57,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-per.h>
@@ -115,7 +116,7 @@ static int hf_atn_cm_hours = -1;                  /* Timehours */
 static int hf_atn_cm_minutes = -1;                /* Timeminutes */
 
 /*--- End of included file: packet-atn-cm-hf.c ---*/
-#line 66 "../../asn1/atn-cm/packet-atn-cm-template.c"
+#line 67 "../../asn1/atn-cm/packet-atn-cm-template.c"
 
 
 /*--- Included file: packet-atn-cm-ett.c ---*/
@@ -137,7 +138,7 @@ static gint ett_atn_cm_ShortTsap = -1;
 static gint ett_atn_cm_Time = -1;
 
 /*--- End of included file: packet-atn-cm-ett.c ---*/
-#line 68 "../../asn1/atn-cm/packet-atn-cm-template.c"
+#line 69 "../../asn1/atn-cm/packet-atn-cm-template.c"
 static gint ett_atn_cm = -1;
 
 
@@ -634,7 +635,7 @@ static void dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
 
 
 /*--- End of included file: packet-atn-cm-fn.c ---*/
-#line 71 "../../asn1/atn-cm/packet-atn-cm-template.c"
+#line 72 "../../asn1/atn-cm/packet-atn-cm-template.c"
 static int proto_atn_cm = -1;
 
 static int
@@ -943,7 +944,7 @@ void proto_register_atn_cm (void)
         "Timeminutes", HFILL }},
 
 /*--- End of included file: packet-atn-cm-hfarr.c ---*/
-#line 215 "../../asn1/atn-cm/packet-atn-cm-template.c"
+#line 216 "../../asn1/atn-cm/packet-atn-cm-template.c"
     };
 		static gint *ett[] = {
 
@@ -966,7 +967,7 @@ void proto_register_atn_cm (void)
     &ett_atn_cm_Time,
 
 /*--- End of included file: packet-atn-cm-ettarr.c ---*/
-#line 218 "../../asn1/atn-cm/packet-atn-cm-template.c"
+#line 219 "../../asn1/atn-cm/packet-atn-cm-template.c"
 			&ett_atn_cm
 		};
 		
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c
index 6c8b63844f..c54f4cfa20 100644
--- a/epan/dissectors/packet-atn-cpdlc.c
+++ b/epan/dissectors/packet-atn-cpdlc.c
@@ -61,6 +61,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-per.h>
@@ -698,7 +699,7 @@ static int hf_atn_cpdlc_windSpeedEnglish = -1;    /* WindSpeedEnglish */
 static int hf_atn_cpdlc_windSpeedMetric = -1;     /* WindSpeedMetric */
 
 /*--- End of included file: packet-atn-cpdlc-hf.c ---*/
-#line 88 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
+#line 89 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
 
 
 /*--- Included file: packet-atn-cpdlc-ett.c ---*/
@@ -847,7 +848,7 @@ static gint ett_atn_cpdlc_Winds = -1;
 static gint ett_atn_cpdlc_WindSpeed = -1;
 
 /*--- End of included file: packet-atn-cpdlc-ett.c ---*/
-#line 90 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
+#line 91 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
 static gint ett_atn_cpdlc = -1;
 
 
@@ -5286,7 +5287,7 @@ static void dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pi
 
 
 /*--- End of included file: packet-atn-cpdlc-fn.c ---*/
-#line 93 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
+#line 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
 
 /* Wireshark ID of CPDLC protocol */
 static int proto_atn_cpdlc = -1;
@@ -7916,7 +7917,7 @@ void proto_register_atn_cpdlc (void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/
-#line 314 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
+#line 315 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
 			};
 
 		static gint *ett[] = {
@@ -8067,7 +8068,7 @@ void proto_register_atn_cpdlc (void)
     &ett_atn_cpdlc_WindSpeed,
 
 /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/
-#line 318 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
+#line 319 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
 				&ett_atn_cpdlc					
 		};
 
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index f42959d994..03cd7811df 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -64,6 +64,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/strutil.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index b27bb6b79e..efe1f4baea 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -59,6 +59,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/addr_and_mask.h>
 #include <epan/show_exception.h>
 #include <epan/afn.h>
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index 55ae1af59d..6b0b771c25 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -33,6 +33,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index dd16f3ff32..02c2361585 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -114,6 +114,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include "packet-arp.h"
 #include "packet-dns.h"				/* for get_dns_name() */
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 1187eb521b..553c972311 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -30,6 +30,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 68fcea38a5..3b003d1aee 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -34,6 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
 
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index 9d6cd674b7..5a481aae07 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -49,6 +49,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index cbadabc6be..5133fdeb85 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
 
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index cf49d4cff9..17d1f34efe 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/dissectors/packet-http.h>
 
 #define TCP_PORT_DAAP 3689
diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c
index 95ad7a7571..39113d23e6 100644
--- a/epan/dissectors/packet-dcerpc-browser.c
+++ b/epan/dissectors/packet-dcerpc-browser.c
@@ -30,7 +30,10 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
+
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-browser.h"
 #include "packet-dcerpc-nt.h"
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index cd8d62668c..5b07b533ef 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -28,9 +28,11 @@
 
 #include "config.h"
 
-
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
+
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-dce122.h"
 
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 318c81b351..1bc855e6b0 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -36,6 +36,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index ef9124268c..e1e5fe9458 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -217,6 +217,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index e4754fd0c3..55fbc17fef 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -85,7 +85,9 @@
 #include <string.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/addr_resolv.h>
 #include <wsutil/inet_aton.h>
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 9d98f18167..8f28b29d60 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -51,6 +51,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 66b22ebda0..c57620b2fd 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -28,8 +28,11 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
+
 #include "packet-tcp.h"
 
 void proto_register_dlsw(void);
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 463a284c01..0ab6a13615 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -38,6 +38,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 5606e7963e..8a6fb6bc3f 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -25,7 +25,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 04acc61388..63780d7d27 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -30,6 +30,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index a3df0d1c1c..de4fa4a41a 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 826c9eb09c..dac5775d61 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -34,6 +34,7 @@
 #include <wsutil/md5.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/show_exception.h>
 #include <epan/timestamp.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index bb752aa901..d76df034d7 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -290,6 +290,7 @@
 #include "isprint.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c
index 2c1aa4f8fc..08507a68fe 100644
--- a/epan/dissectors/packet-gmr1_rach.c
+++ b/epan/dissectors/packet-gmr1_rach.c
@@ -34,6 +34,9 @@
 #include "config.h"
 
 #include <glib.h>
+
+#include <stdlib.h>
+
 #include <epan/packet.h>
 
 #include "packet-csn1.h"
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index dd3848e8e8..9513fdf026 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -30,7 +30,9 @@
 #include <string.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index 80ae24e84c..1be9259a1d 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -26,7 +26,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 static int proto_h1 = -1;
 static int hf_h1_header = -1;
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 7006d21be1..0b1a60bc1d 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -31,6 +31,7 @@
 #include <epan/circuit.h>
 #include <epan/conversation.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/stream.h>
 #include <epan/reassemble.h>
 #include <epan/golay.h>
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 9b2e8173c7..d3ea2379ac 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -44,6 +44,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/strutil.h>
 #include <wsutil/pint.h>
 
@@ -214,7 +215,7 @@ typedef enum _IndicationMessage_enum {
 } IndicationMessage_enum;
 
 /*--- End of included file: packet-h245-val.h ---*/
-#line 87 "../../asn1/h245/packet-h245-template.c"
+#line 88 "../../asn1/h245/packet-h245-template.c"
 
 static const value_string h245_RequestMessage_short_vals[] = {
 	{ RequestMessage_nonStandard              ,	"NSM" },
@@ -1922,7 +1923,7 @@ static int hf_h245_encrypted = -1;                /* OCTET_STRING */
 static int hf_h245_encryptedAlphanumeric = -1;    /* EncryptedAlphanumeric */
 
 /*--- End of included file: packet-h245-hf.c ---*/
-#line 388 "../../asn1/h245/packet-h245-template.c"
+#line 389 "../../asn1/h245/packet-h245-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_h245 = -1;
@@ -2423,7 +2424,7 @@ static gint ett_h245_FlowControlIndication = -1;
 static gint ett_h245_MobileMultilinkReconfigurationIndication = -1;
 
 /*--- End of included file: packet-h245-ett.c ---*/
-#line 393 "../../asn1/h245/packet-h245-template.c"
+#line 394 "../../asn1/h245/packet-h245-template.c"
 
 /* Forward declarations */
 static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
@@ -14490,7 +14491,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-h245-fn.c ---*/
-#line 402 "../../asn1/h245/packet-h245-template.c"
+#line 403 "../../asn1/h245/packet-h245-template.c"
 
 static void
 dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
@@ -20184,7 +20185,7 @@ void proto_register_h245(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-h245-hfarr.c ---*/
-#line 483 "../../asn1/h245/packet-h245-template.c"
+#line 484 "../../asn1/h245/packet-h245-template.c"
   };
 
   /* List of subtrees */
@@ -20687,7 +20688,7 @@ void proto_register_h245(void) {
     &ett_h245_MobileMultilinkReconfigurationIndication,
 
 /*--- End of included file: packet-h245-ettarr.c ---*/
-#line 490 "../../asn1/h245/packet-h245-template.c"
+#line 491 "../../asn1/h245/packet-h245-template.c"
   };
   module_t *h245_module;
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 7872e85139..c94f4edac9 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #include "packet-h248.h"
+#include <epan/exceptions.h>
 #include <epan/tap.h>
 #include <epan/wmem/wmem.h>
 #include "packet-tpkt.h"
@@ -397,7 +398,7 @@ static int hf_h248_NotifyCompletion_otherReason = -1;
 static int hf_h248_NotifyCompletion_onIteration = -1;
 
 /*--- End of included file: packet-h248-hf.c ---*/
-#line 74 "../../asn1/h248/packet-h248-template.c"
+#line 75 "../../asn1/h248/packet-h248-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_h248 = -1;
@@ -562,7 +563,7 @@ static gint ett_h248_EventParameterV1 = -1;
 static gint ett_h248_SigParameterV1 = -1;
 
 /*--- End of included file: packet-h248-ett.c ---*/
-#line 91 "../../asn1/h248/packet-h248-template.c"
+#line 92 "../../asn1/h248/packet-h248-template.c"
 
 static expert_field ei_h248_errored_command = EI_INIT;
 static expert_field ei_h248_transactionId64 = EI_INIT;
@@ -5369,7 +5370,7 @@ dissect_h248_ValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 
 
 /*--- End of included file: packet-h248-fn.c ---*/
-#line 1412 "../../asn1/h248/packet-h248-template.c"
+#line 1413 "../../asn1/h248/packet-h248-template.c"
 
 static void dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle);
@@ -6791,7 +6792,7 @@ void proto_register_h248(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-h248-hfarr.c ---*/
-#line 1577 "../../asn1/h248/packet-h248-template.c"
+#line 1578 "../../asn1/h248/packet-h248-template.c"
 
         GCP_HF_ARR_ELEMS("h248",h248_arrel)
 
@@ -6957,7 +6958,7 @@ void proto_register_h248(void) {
     &ett_h248_SigParameterV1,
 
 /*--- End of included file: packet-h248-ettarr.c ---*/
-#line 1595 "../../asn1/h248/packet-h248-template.c"
+#line 1596 "../../asn1/h248/packet-h248-template.c"
     };
 
     static ei_register_info ei[] = {
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index 94ed0e1825..b678714216 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -27,7 +27,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 
 #include "packet-i2c.h"
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 6da5e20d93..5ab32bc0f1 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -38,6 +38,7 @@
 
 #include <epan/circuit.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a2e4313363..839a69b213 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -82,6 +82,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <wsutil/pint.h>
 #include <epan/bitswap.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index f4a1d7604d..0c74371cc3 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -69,6 +69,7 @@
 
 #include <epan/wmem/wmem.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <wsutil/pint.h>
 #include <epan/crc16-tvb.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c
index 773e86af28..49d4da15bb 100644
--- a/epan/dissectors/packet-ieee8023.c
+++ b/epan/dissectors/packet-ieee8023.c
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/show_exception.h>
 #include "packet-ieee8023.h"
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c
index 7c37164ddd..e7cda7533b 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/packet-image-png.c
@@ -32,7 +32,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 static header_field_info *hfi_png = NULL;
 
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 68ea68c952..bf57e32e3f 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index cac933a370..e6a3b2973f 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -25,7 +25,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/etypes.h>
 #include <epan/show_exception.h>
 
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index da4dc863b2..d978e0b5c4 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -31,10 +31,10 @@
 
 #include "config.h"
 
-
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 28b871ee94..3f19f50453 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -48,6 +48,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/stats_tree.h>
 #include <epan/asn1.h>
 #include <wsutil/str_util.h>
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index c7e581e6d3..15ed1098b1 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -84,6 +84,7 @@
 #include <epan/strutil.h>
 
 #include <epan/conversation.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 82b4892d6d..b67af77b53 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -98,6 +98,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
@@ -341,7 +342,7 @@ static int hf_ldap_graceAuthNsRemaining = -1;     /* INTEGER_0_maxInt */
 static int hf_ldap_error = -1;                    /* T_error */
 
 /*--- End of included file: packet-ldap-hf.c ---*/
-#line 189 "../../asn1/ldap/packet-ldap-template.c"
+#line 190 "../../asn1/ldap/packet-ldap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ldap = -1;
@@ -414,7 +415,7 @@ static gint ett_ldap_PasswordPolicyResponseValue = -1;
 static gint ett_ldap_T_warning = -1;
 
 /*--- End of included file: packet-ldap-ett.c ---*/
-#line 200 "../../asn1/ldap/packet-ldap-template.c"
+#line 201 "../../asn1/ldap/packet-ldap-template.c"
 
 static expert_field ei_ldap_exceeded_filter_length = EI_INIT;
 static expert_field ei_ldap_too_many_filter_elements = EI_INIT;
@@ -3834,7 +3835,7 @@ static void dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_in
 
 
 /*--- End of included file: packet-ldap-fn.c ---*/
-#line 882 "../../asn1/ldap/packet-ldap-template.c"
+#line 883 "../../asn1/ldap/packet-ldap-template.c"
 static int dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ldap_conv_info_t *ldap_info) {
 
   int offset = 0;
@@ -5777,7 +5778,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2248 "../../asn1/ldap/packet-ldap-template.c"
+#line 2249 "../../asn1/ldap/packet-ldap-template.c"
   };
 
   /* List of subtrees */
@@ -5852,7 +5853,7 @@ void proto_register_ldap(void) {
     &ett_ldap_T_warning,
 
 /*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2261 "../../asn1/ldap/packet-ldap-template.c"
+#line 2262 "../../asn1/ldap/packet-ldap-template.c"
   };
   /* UAT for header fields */
   static uat_field_t custom_attribute_types_uat_fields[] = {
@@ -6018,7 +6019,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2410 "../../asn1/ldap/packet-ldap-template.c"
+#line 2411 "../../asn1/ldap/packet-ldap-template.c"
 
 
 }
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 4a2a5a2400..965597df6e 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -42,7 +42,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/afn.h>
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 87aa4ca065..d0ea34b2ac 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -49,6 +49,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/in_cksum.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index c42e2460c9..783f034a33 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -38,6 +38,9 @@
 #include "config.h"
 
 #include <glib.h>
+
+#include <stdlib.h>
+
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
@@ -174,7 +177,7 @@ typedef enum _RAT_Type_enum {
 } RAT_Type_enum;
 
 /*--- End of included file: packet-lte-rrc-val.h ---*/
-#line 73 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 76 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_lte_rrc = -1;
@@ -2313,7 +2316,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 78 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 81 "../../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;
@@ -3511,7 +3514,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 188 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 191 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static gint ett_lte_rrc_featureGroupIndicators = -1;
 static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
@@ -34736,7 +34739,7 @@ static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_inf
 
 
 /*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 2190 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2193 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static void
 dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -43400,7 +43403,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 2337 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2340 "../../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",
@@ -44911,7 +44914,7 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_CandidateCellInfo_r10,
 
 /*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 2760 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2763 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     &ett_lte_rrc_featureGroupIndicators,
     &ett_lte_rrc_featureGroupIndRel9Add,
@@ -44978,7 +44981,7 @@ void proto_register_lte_rrc(void) {
 
 
 /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 2811 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2814 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
   register_init_routine(&lte_rrc_init_protocol);
 }
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index a09050d1f5..0c8a840c54 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -35,6 +35,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/sctpppids.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index d0034d24ba..037b6420e6 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 7a9b3cf372..bb06752569 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -48,6 +48,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 874cd712dc..5f152c04f9 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -42,6 +42,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c
index a0e5a56042..7c491a78b6 100644
--- a/epan/dissectors/packet-mih.c
+++ b/epan/dissectors/packet-mih.c
@@ -32,9 +32,10 @@
 
 
 
-# include "config.h"
+#include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/proto.h>
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c
index 49547659fb..53773d93e1 100644
--- a/epan/dissectors/packet-mint.c
+++ b/epan/dissectors/packet-mint.c
@@ -41,7 +41,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/etypes.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index 2ae5e19935..24b288c030 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -36,6 +36,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index b222cd32c6..82df7b4771 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -26,9 +26,9 @@
 
 #include "config.h"
 
-
 #include <string.h>
 
+#include <epan/exceptions.h>
 #include <epan/to_str.h>
 #include "packet-rpc.h"
 #include "packet-mount.h"
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index db39d3d834..b3121135b5 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -70,7 +70,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/reassemble.h>
 
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 260cbd37cd..aa612454b1 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -41,6 +41,8 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
+
 #include "packet-igmp.h"
 #include "packet-mrdisc.h"
 
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index cbe8cdff45..9b1a1f5514 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -37,6 +37,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index b3438f5743..a3d54f1a65 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index e2a4b5aacc..349a41b952 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -27,7 +27,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c
index 8054b320ad..a0ce91728f 100644
--- a/epan/dissectors/packet-negoex.c
+++ b/epan/dissectors/packet-negoex.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/show_exception.h>
 
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 64454befc6..ea11afcf4f 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -34,6 +34,7 @@
 #include "packet-nfs.h"
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <wsutil/crc16.h>
 #include <wsutil/crc32.h>
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 61a44b7e04..9df6bc4d48 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -42,6 +42,7 @@
 #include <wsutil/crc32.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c
index 6caa22d742..8d44b5b59a 100644
--- a/epan/dissectors/packet-openwire.c
+++ b/epan/dissectors/packet-openwire.c
@@ -44,6 +44,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index 404b2ae934..267b21347f 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -36,6 +36,7 @@ proper helper routines
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/oids.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 0fcd8efca0..ae86ad2b26 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/exceptions.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
 #include "packet-pktc.h"
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 422b4dc838..29e12a318c 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -50,6 +50,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/ptvcursor.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index 09c456e750..e9196acc43 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
@@ -178,7 +179,7 @@ static int hf_pres_User_session_requirements_symmetric_synchronize = -1;
 static int hf_pres_User_session_requirements_data_separation = -1;
 
 /*--- End of included file: packet-pres-hf.c ---*/
-#line 91 "../../asn1/pres/packet-pres-template.c"
+#line 92 "../../asn1/pres/packet-pres-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pres           = -1;
@@ -224,7 +225,7 @@ static gint ett_pres_User_session_requirements = -1;
 static gint ett_pres_UD_type = -1;
 
 /*--- End of included file: packet-pres-ett.c ---*/
-#line 96 "../../asn1/pres/packet-pres-template.c"
+#line 97 "../../asn1/pres/packet-pres-template.c"
 
 static expert_field ei_pres_dissector_not_available = EI_INIT;
 
@@ -1356,7 +1357,7 @@ static void dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-pres-fn.c ---*/
-#line 223 "../../asn1/pres/packet-pres-template.c"
+#line 224 "../../asn1/pres/packet-pres-template.c"
 
 
 /*
@@ -1842,7 +1843,7 @@ void proto_register_pres(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-pres-hfarr.c ---*/
-#line 396 "../../asn1/pres/packet-pres-template.c"
+#line 397 "../../asn1/pres/packet-pres-template.c"
   };
 
   /* List of subtrees */
@@ -1889,7 +1890,7 @@ void proto_register_pres(void) {
     &ett_pres_UD_type,
 
 /*--- End of included file: packet-pres-ettarr.c ---*/
-#line 402 "../../asn1/pres/packet-pres-template.c"
+#line 403 "../../asn1/pres/packet-pres-template.c"
   };
 
   static ei_register_info ei[] = {
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index f37b689ce3..6c135274dc 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -39,6 +39,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 41da254365..9d91e9e500 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -66,6 +66,7 @@
 #include <wsutil/md5.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/filesystem.h>
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index c56cccd0a1..fda739f121 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index cb01516ecc..6a16a865b5 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <wsutil/pint.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 6ac46c9559..70ec152e87 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -103,6 +103,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <prefs.h>
 #include <epan/in_cksum.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index 37d816a9cb..7046e12499 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -53,6 +53,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 30ffef3774..e8adf5d89c 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -59,6 +59,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #include "packet-rtp.h"
 
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 59b8b69792..b03b9235d0 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index d7896d37e8..2dbd714e0b 100644
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -27,6 +27,8 @@
 
 #include "ws_symbol_export.h"
 
+#include <epan/exceptions.h>
+
 /* Structure containing itl nexus data :
  * The itlq nexus is a structure containing data specific
  * for a initiator target lun combination.
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 4702137981..0a998425fa 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -54,8 +54,10 @@
 #include "config.h"
 
 #include <string.h>
+
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/tap.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index a5a134388e..34b5a1e8c2 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -52,6 +52,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/strutil.h>
 #include <epan/wmem/wmem.h>
 #include <epan/base64.h>
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 354855af9c..8e45b4b585 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -54,6 +54,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 5a3e239136..0dfdd8cdcc 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -40,6 +40,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/req_resp_hdrs.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index c7fe7a877f..fc8897337d 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -37,7 +37,9 @@ XXX  Fixme : shouldn't show [malformed frame] for long packets
 #include <string.h>
 #include <glib.h>
 #include <ctype.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-smb.h>
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 02321f4350..ec5a683a83 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -29,7 +29,9 @@
 #include "config.h"
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/dissectors/packet-smb.h>
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 0fb5ae9068..df1ea08822 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -58,6 +58,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/tap.h>
 #include <epan/stats_tree.h>
 
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 78a9176df9..60b0576cec 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -64,6 +64,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 6d2f221e19..c650721e11 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -54,6 +54,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/sctpppids.h>
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 951989750a..940dff2c9f 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -29,6 +29,7 @@
 #include <zlib.h>
 #endif
 
+#include <stdlib.h>
 #include <ctype.h>
 #include "packet-ssl-utils.h"
 #include "packet-ssl.h"
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index 106e507790..621c1c6d9b 100644
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 
 #include <epan/asn1.h>
@@ -287,7 +288,7 @@ static int hf_t124_Segmentation_begin = -1;
 static int hf_t124_Segmentation_end = -1;
 
 /*--- End of included file: packet-t124-hf.c ---*/
-#line 55 "../../asn1/t124/packet-t124-template.c"
+#line 56 "../../asn1/t124/packet-t124-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_t124 = -1;
@@ -410,7 +411,7 @@ static gint ett_t124_TokenTestConfirm = -1;
 static gint ett_t124_DomainMCSPDU = -1;
 
 /*--- End of included file: packet-t124-ett.c ---*/
-#line 72 "../../asn1/t124/packet-t124-template.c"
+#line 73 "../../asn1/t124/packet-t124-template.c"
 
 
 /*--- Included file: packet-t124-fn.c ---*/
@@ -2880,7 +2881,7 @@ dissect_t124_DomainMCSPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 
 /*--- End of included file: packet-t124-fn.c ---*/
-#line 74 "../../asn1/t124/packet-t124-template.c"
+#line 75 "../../asn1/t124/packet-t124-template.c"
 
 static const per_sequence_t t124Heur_sequence[] = {
   { &hf_t124_t124Identifier , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t124_Key },
@@ -3902,7 +3903,7 @@ void proto_register_t124(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-t124-hfarr.c ---*/
-#line 203 "../../asn1/t124/packet-t124-template.c"
+#line 204 "../../asn1/t124/packet-t124-template.c"
   };
 
   /* List of subtrees */
@@ -4015,7 +4016,7 @@ void proto_register_t124(void) {
     &ett_t124_DomainMCSPDU,
 
 /*--- End of included file: packet-t124-ettarr.c ---*/
-#line 210 "../../asn1/t124/packet-t124-template.c"
+#line 211 "../../asn1/t124/packet-t124-template.c"
   };
   
   /* Register protocol */
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 0ecadf2608..bea86e8201 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #include <epan/asn1.h>
 #include "packet-ber.h"
@@ -83,7 +84,7 @@ static int hf_t125_connect_additional = -1;       /* Connect_Additional */
 static int hf_t125_connect_result = -1;           /* Connect_Result */
 
 /*--- End of included file: packet-t125-hf.c ---*/
-#line 49 "../../asn1/t125/packet-t125-template.c"
+#line 50 "../../asn1/t125/packet-t125-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_t125 = -1;
@@ -102,7 +103,7 @@ static gint ett_t125_Connect_Result_U = -1;
 static gint ett_t125_ConnectMCSPDU = -1;
 
 /*--- End of included file: packet-t125-ett.c ---*/
-#line 57 "../../asn1/t125/packet-t125-template.c"
+#line 58 "../../asn1/t125/packet-t125-template.c"
 
 static heur_dissector_list_t t125_heur_subdissector_list;
 
@@ -385,7 +386,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-t125-fn.c ---*/
-#line 61 "../../asn1/t125/packet-t125-template.c"
+#line 62 "../../asn1/t125/packet-t125-template.c"
 
 static int
 dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
@@ -589,7 +590,7 @@ void proto_register_t125(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-t125-hfarr.c ---*/
-#line 160 "../../asn1/t125/packet-t125-template.c"
+#line 161 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* List of subtrees */
@@ -606,7 +607,7 @@ void proto_register_t125(void) {
     &ett_t125_ConnectMCSPDU,
 
 /*--- End of included file: packet-t125-ettarr.c ---*/
-#line 166 "../../asn1/t125/packet-t125-template.c"
+#line 167 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index f5e21e65a1..84ae484c70 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -37,6 +37,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
@@ -137,7 +138,7 @@ static int hf_tcap_AARQ_protocol_version_version1 = -1;
 static int hf_tcap_AARE_protocol_version_version1 = -1;
 
 /*--- End of included file: packet-tcap-hf.c ---*/
-#line 61 "../../asn1/tcap/packet-tcap-template.c"
+#line 62 "../../asn1/tcap/packet-tcap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_tcap = -1;
@@ -192,7 +193,7 @@ static gint ett_tcap_ABRT_user_information = -1;
 static gint ett_tcap_Associate_source_diagnostic = -1;
 
 /*--- End of included file: packet-tcap-ett.c ---*/
-#line 77 "../../asn1/tcap/packet-tcap-template.c"
+#line 78 "../../asn1/tcap/packet-tcap-template.c"
 
 #define MAX_SSN 254
 static range_t *global_ssn_range;
@@ -1422,7 +1423,7 @@ static void dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
 
 
 /*--- End of included file: packet-tcap-fn.c ---*/
-#line 140 "../../asn1/tcap/packet-tcap-template.c"
+#line 141 "../../asn1/tcap/packet-tcap-template.c"
 
 
 
@@ -1542,7 +1543,7 @@ proto_reg_handoff_tcap(void)
 
 
 /*--- End of included file: packet-tcap-dis-tab.c ---*/
-#line 252 "../../asn1/tcap/packet-tcap-template.c"
+#line 253 "../../asn1/tcap/packet-tcap-template.c"
 }
 
 static void init_tcap(void);
@@ -1873,7 +1874,7 @@ proto_register_tcap(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-tcap-hfarr.c ---*/
-#line 314 "../../asn1/tcap/packet-tcap-template.c"
+#line 315 "../../asn1/tcap/packet-tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -1922,7 +1923,7 @@ proto_register_tcap(void)
     &ett_tcap_Associate_source_diagnostic,
 
 /*--- End of included file: packet-tcap-ettarr.c ---*/
-#line 324 "../../asn1/tcap/packet-tcap-template.c"
+#line 325 "../../asn1/tcap/packet-tcap-template.c"
     };
 
     /*static enum_val_t tcap_options[] = {
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 0a69279948..bef56fb5e9 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -30,6 +30,7 @@
 #include <epan/in_cksum.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 2cd519afc1..f22e2e54dc 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -154,6 +154,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 42c4b727b7..73c1ec761b 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -35,6 +35,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/show_exception.h>
 
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 81ad86c4bd..5e61797bac 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <wsutil/pint.h>
 #include "packet-tr.h"
 #include "packet-llc.h"
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 27c8c1e4a9..14b24cd654 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 #include <wsutil/pint.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index 2dea67318f..8679292a54 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -46,6 +46,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 846f390adf..a6682565b6 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -51,6 +51,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
 
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index 2fc6da55e2..5fd63084fa 100644
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/wmem/wmem.h>
 #include "packet-dcerpc.h"
 #include "packet-smb-sidsnooping.h"
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index dd0dc82e91..8ebd17bd48 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -31,7 +31,9 @@
 #include <time.h>
 #include <glib.h>
 #include <ctype.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
 
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 209be44dc3..1eb4f489d7 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -57,6 +57,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index 388ed9ed0b..ee7b00ba19 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index 28a6793665..1d20756b86 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -29,7 +29,9 @@
 
 #include <string.h>
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>    /* req'd for packet-zbee-security.h */
 #include <epan/expert.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index ba10674f17..7b647b37c1 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index 952d270047..d7e9524f20 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/emem.c b/epan/emem.c
index 9f9ef055b6..7238862aa2 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -43,6 +43,7 @@
 
 #include "app_mem_usage.h"
 #include "proto.h"
+#include "exceptions.h"
 #include "emem.h"
 #include "wmem/wmem.h"
 
diff --git a/epan/expert.c b/epan/expert.c
index 972573f323..e416545053 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "packet.h"
 #include "expert.h"
diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c
index 175338549f..191694bee6 100644
--- a/epan/ftypes/ftype-guid.c
+++ b/epan/ftypes/ftype-guid.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <ftypes-int.h>
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index a57decab5d..be401a0b3a 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include "ftypes-int.h"
 #include <epan/emem.h>
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 79e9f12b32..e32a482173 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index c3612228bb..e7bacae062 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -26,6 +26,8 @@
 #include <ftypes-int.h>
 #include <string.h>
 
+#include <epan/exceptions.h>
+
 #define CMP_MATCHES cmp_matches
 
 #define tvb_is_private	fvalue_gboolean1
diff --git a/epan/packet.c b/epan/packet.c
index 09e38ad2b2..65cb2d5134 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -53,6 +53,7 @@
 #include "emem.h"
 #include "wmem/wmem.h"
 
+#include <epan/exceptions.h>
 #include <epan/reassemble.h>
 #include <epan/stream.h>
 #include <epan/expert.h>
diff --git a/epan/reassemble.c b/epan/reassemble.c
index 5b5426b4c1..1523c1d3bd 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/emem.h>
 #include <epan/reassemble.h>
 #include <epan/tvbuff-int.h>
diff --git a/epan/show_exception.c b/epan/show_exception.c
index 43ca165768..730114ee0b 100644
--- a/epan/show_exception.c
+++ b/epan/show_exception.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/show_exception.h>
 
diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index a6b76b2876..cf0a96787f 100644
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -43,6 +43,7 @@
 #include <wsutil/crc16.h>
 
 #include "packet.h"
+#include "exceptions.h"
 #include "strutil.h"
 #include "to_str.h"
 #include "sigcomp-udvm.h"
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 3be00973aa..0572b72aff 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -26,6 +26,9 @@
 #include "config.h"
 
 #include <glib.h>
+
+#include <stdlib.h>
+
 #include <epan/stats_tree_priv.h>
 #include <string.h>
 
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 5eefa1e3b2..c886e8568e 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -50,6 +50,7 @@
 #include "to_str.h"
 #include "charsets.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
+#include "exceptions.h"
 
 static guint64
 _tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits);
diff --git a/epan/tvbuff_real.c b/epan/tvbuff_real.c
index 0241153701..e6b277b927 100644
--- a/epan/tvbuff_real.c
+++ b/epan/tvbuff_real.c
@@ -30,6 +30,7 @@
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
+#include "exceptions.h"
 
 struct tvb_real {
 	struct tvbuff tvb;
diff --git a/epan/tvbuff_subset.c b/epan/tvbuff_subset.c
index a9fbd2be9b..3370ee070f 100644
--- a/epan/tvbuff_subset.c
+++ b/epan/tvbuff_subset.c
@@ -30,6 +30,7 @@
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
+#include "exceptions.h"
 
 typedef struct {
 	/** The backing tvbuff_t */
diff --git a/epan/uat.h b/epan/uat.h
index e0afc157c1..aa2c5da030 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -30,6 +30,8 @@
 #ifndef __UAT_H__
 #define __UAT_H__
 
+#include <stdlib.h>
+
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus
diff --git a/file.c b/file.c
index 4a936af5ec..a935438755 100644
--- a/file.c
+++ b/file.c
@@ -46,6 +46,7 @@
 
 #include <wiretap/merge.h>
 
+#include <epan/exceptions.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
 #include <epan/column.h>
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 36d0690198..cbd02b3460 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -73,6 +73,7 @@
 #include <wsutil/file_util.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/filesystem.h>
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 7899545670..e40943f9e3 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 /* BPKM Attributes defined in:
  * http://www.cablemodem.com/downloads/specs/SP-BPI+_I10-030730.pdf
diff --git a/plugins/docsis/packet-cmstatus.c b/plugins/docsis/packet-cmstatus.c
index 7681879c15..f5e442a544 100644
--- a/plugins/docsis/packet-cmstatus.c
+++ b/plugins/docsis/packet-cmstatus.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define SEC_CH_MDD_TIMEOUT      1
 #define QAM_FEC_LOCK_FAILURE    2
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index c080196847..ee5a276c8b 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define DCCACK_KEY_SEQ_NUM 31
 #define DCCACK_HMAC_DIGEST 27
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index a02bdbffaf..db5e4d1555 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define DCCREQ_UP_CHAN_ID 1
 #define DCCREQ_DS_PARAMS 2
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index 37cf71e749..1e88a6f760 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define DCCRSP_CM_JUMP_TIME 1
 #define DCCRSP_KEY_SEQ_NUM 31
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index ccefe6333d..ddab9b95cd 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define DCD_DOWN_CLASSIFIER 23
 #define DCD_DSG_RULE 50
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 2c1dfd3a39..2afb39f737 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -48,6 +48,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define FCTYPE_PACKET 0x00
 #define FCTYPE_ATMPDU 0x01
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index c641941c87..df2f0947a5 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define RNGRSP_TIMING 1
 #define RNGRSP_PWR_LEVEL_ADJ 2
diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c
index c96a5e0654..578584c1d8 100644
--- a/plugins/docsis/packet-tlv-cmctrl.c
+++ b/plugins/docsis/packet-tlv-cmctrl.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define CM_CTRL_MUTE 1
 #define CM_CTRL_MUTE_TIMEOUT 2
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index 30fbfb5df5..6f0bc6bf6c 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -26,6 +26,8 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
+
 #include "packet-tlv.h"
 
 /* This module will dissect the Appendix C TLV's.  Please see:
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index 2689805605..e26abdff86 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define type29ucd_SYMBOL_RATE 1
 #define type29ucd_FREQUENCY 2
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index df0cf1a170..3622123c31 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 #define UCD_SYMBOL_RATE 1
 #define UCD_FREQUENCY 2
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index b5202ce689..bb4fa196d8 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -52,6 +52,7 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 
 /* Define Vendor ID's here */
 #define VENDOR_CISCO 0x00000C
diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h
index 9c4a7cf09e..74cae5258b 100644
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@@ -44,6 +44,7 @@
 #include <wsutil/report_err.h>
 
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/proto.h>
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 0864c44472..4ded170b91 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -28,7 +28,9 @@
 #include <string.h>
 
 #include <glib.h>
+
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/to_str.h>
 #include <epan/wmem/wmem.h>
 #include <epan/expert.h>
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index 3e3e3d5dad..4ea4ab4b53 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5737,6 +5737,7 @@ def produce_code():
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <ftypes/ftypes-int.h>
 #include <epan/to_str.h>
 #include <epan/conversation.h>
diff --git a/tshark.c b/tshark.c
index 2db6fa5c7b..066096531e 100644
--- a/tshark.c
+++ b/tshark.c
@@ -58,6 +58,8 @@
 #endif
 
 #include <glib.h>
+
+#include <epan/exceptions.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
 #include <epan/filesystem.h>
diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c
index a35cc8574f..710a967b1a 100644
--- a/ui/cli/tap-afpstat.c
+++ b/ui/cli/tap-afpstat.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
index 90518541f2..6c7ad07d04 100644
--- a/ui/cli/tap-ansi_astat.c
+++ b/ui/cli/tap-ansi_astat.c
@@ -31,8 +31,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
index 736381a582..e6b367ea47 100644
--- a/ui/cli/tap-bootpstat.c
+++ b/ui/cli/tap-bootpstat.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "epan/packet_info.h"
diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c
index e16c2e1ced..d1fd5dbf44 100644
--- a/ui/cli/tap-camelcounter.c
+++ b/ui/cli/tap-camelcounter.c
@@ -28,8 +28,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include "epan/tap.h"
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index 47712660ab..64c357c2ff 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index d374fd8ccd..ccc9cf6361 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -35,9 +35,10 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
-#include <string.h>
 #include "epan/packet_info.h"
 #include <epan/in_cksum.h>
 #include <epan/packet.h>
diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
index 9f3c9f23ec..d01184e533 100644
--- a/ui/cli/tap-dcerpcstat.c
+++ b/ui/cli/tap-dcerpcstat.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index da84aa9bb9..d237024f59 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -39,8 +39,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/ftypes/ftypes-int.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index 4047e25e82..88936eccc5 100644
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index f4f6543b2c..1dd75e2a3f 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -36,6 +36,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <glib.h>
 #include <epan/addr_resolv.h>
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index b76932a2b1..e41f5e4951 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -31,8 +31,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-h225counter.c b/ui/cli/tap-h225counter.c
index e84d9df4f1..90f4186601 100644
--- a/ui/cli/tap-h225counter.c
+++ b/ui/cli/tap-h225counter.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
index 433198246e..45a8fc068c 100644
--- a/ui/cli/tap-h225rassrt.c
+++ b/ui/cli/tap-h225rassrt.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 537c429302..59c3cc068e 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
 
 #include "globals.h"
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index 122b686811..7c2ae16182 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "epan/packet_info.h"
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 0e89b3d844..89874776e2 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -31,8 +31,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index cfe0a02629..39c54d0549 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -32,8 +32,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index 4c98582103..c7f8828c0c 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <epan/epan_dissect.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index c841d0a590..1a9847eff2 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c
index d901bbd0e9..321686f035 100644
--- a/ui/cli/tap-mgcpstat.c
+++ b/ui/cli/tap-mgcpstat.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index 065cbcc5fe..c088d3ebfd 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -27,8 +27,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/epan_dissect.h"
 #include "epan/column-utils.h"
 #include "epan/proto.h"
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index aa544f78fc..5141746846 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -27,8 +27,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include "epan/epan_dissect.h"
 #include "epan/proto.h"
diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
index c75cfc168e..24b1f0381b 100644
--- a/ui/cli/tap-radiusstat.c
+++ b/ui/cli/tap-radiusstat.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index d78d062efc..20af7f1c11 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index f1fb0444f0..de74da4419 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -29,8 +29,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c
index 82a1856468..86f435ae5e 100644
--- a/ui/cli/tap-rpcstat.c
+++ b/ui/cli/tap-rpcstat.c
@@ -31,8 +31,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index f99eb1e350..f01a93ccd3 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -36,9 +36,10 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index fb073a0f42..d6d7fd8faf 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "epan/packet_info.h"
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index 9f69774177..96c51b0999 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include "epan/addr_resolv.h"
 #include <epan/tap.h>
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index 2eaf370730..7be4c3511b 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -26,8 +26,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index c065873e0c..f9899e2033 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/dissectors/packet-smb-sidsnooping.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c
index 69fccaccbd..e1e2821724 100644
--- a/ui/cli/tap-smbstat.c
+++ b/ui/cli/tap-smbstat.c
@@ -25,8 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 0bf539ea9c..e11fb2bb9b 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -30,8 +30,9 @@
 #include "config.h"
 
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index b2119f9da7..e8d0f58a19 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <epan/filesystem.h>
diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c
index 2f6927a443..59f3181504 100644
--- a/ui/gtk/ansi_a_stat.c
+++ b/ui/gtk/ansi_a_stat.c
@@ -33,6 +33,8 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #include "epan/packet_info.h"
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
index 9cc7d57add..32fdb049f2 100644
--- a/ui/gtk/ansi_map_stat.c
+++ b/ui/gtk/ansi_map_stat.c
@@ -33,6 +33,8 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #include <epan/packet_info.h>
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 23b68de358..4b2f15fe1b 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -35,6 +35,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index c44d793674..c4c04af07f 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -32,6 +32,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index 0ab5a4c5c6..7d992fc710 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -28,6 +28,8 @@
 
 #include <gtk/gtk.h>
 
+#include <stdlib.h>
+
 #include "globals.h"
 #include "wtap.h"
 #include "pcap-encap.h"
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index 27c7607f55..9262d37dc6 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -27,6 +27,8 @@
 
 #include <gtk/gtk.h>
 
+#include <stdlib.h>
+
 #include <epan/proto.h>
 
 #include "../globals.h"
diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c
index 235ad07dfd..f21304451a 100644
--- a/ui/gtk/gsm_a_stat.c
+++ b/ui/gtk/gsm_a_stat.c
@@ -31,6 +31,8 @@
  */
 
 #include "config.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c
index b6088949ac..c736a939b1 100644
--- a/ui/gtk/gsm_map_stat.c
+++ b/ui/gtk/gsm_map_stat.c
@@ -31,6 +31,8 @@
  */
 
 #include "config.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c
index 4509c57bbd..be18eed9fe 100644
--- a/ui/gtk/mcast_stream.c
+++ b/ui/gtk/mcast_stream.c
@@ -37,6 +37,7 @@
 #include <glib.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <string.h>
 
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index c7545579a8..b80ffdcdf4 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <locale.h>
 
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c
index d826e6b300..afa4228401 100644
--- a/ui/gtk/mtp3_stat.c
+++ b/ui/gtk/mtp3_stat.c
@@ -31,6 +31,8 @@
  */
 
 #include "config.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index cdba760ea4..55467c33b2 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -30,6 +30,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
index fa66ac26a8..53177639a3 100644
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <math.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index 4d6c9babfc..038fa0a337 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -29,6 +29,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c
index f57f4d6904..ed551514cd 100644
--- a/ui/gtk/rpc_progs.c
+++ b/ui/gtk/rpc_progs.c
@@ -31,6 +31,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index dc88de696b..f3d3e312ac 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -31,6 +31,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index e92c9c1cb7..080f2517cd 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <locale.h>
diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c
index 3b373d0ed9..238afe0eb2 100644
--- a/ui/gtk/rtp_stream.c
+++ b/ui/gtk/rtp_stream.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef HAVE_FCNTL_H
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 64c080aa90..88778f6d4e 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -23,7 +23,9 @@
  */
 
 #include "config.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index e9dc24fdfa..d09175e7a4 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -24,7 +24,9 @@
  */
 
 #include "config.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index e7f71deba4..f1120cb41a 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index f0ed9ed6c6..7ca0b4342f 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -28,6 +28,8 @@
 
 #include <glib.h>
 
+#include <stdlib.h>
+
 #include <file.h>
 #include <frame_tvbuff.h>