diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 9b9b78e0c6..6d0e4b5162 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -2623,7 +2623,7 @@ dissect_bgp_capability(tvbuff_t *tvb, proto_tree *tree)
 }
 
 static void
-dissect_bgp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+dissect_bgp_pdu(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
     gboolean first)
 {
     guint16       bgp_len;       /* Message length             */
@@ -2740,7 +2740,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint         length_remaining;
     guint         length;
     volatile gboolean first = TRUE;  /* TRUE for the first BGP message in packet */
-    tvbuff_t      *next_tvb;
+    tvbuff_t *volatile next_tvb;
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP");
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 77853cf894..dbcdb8b18f 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -193,7 +193,7 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype,
 	guint			length_before;
 	gint			captured_length, reported_length;
 	volatile gboolean	dissector_found = FALSE;
-	const char		*saved_proto;
+	const char		*volatile saved_proto;
 
 	/* Add the Ethernet type to the protocol tree */
 	if (tree) {
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 5e8db215fb..352bff55fc 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -172,8 +172,8 @@ static int
 dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     gboolean is_verifier)
 {
-	proto_item *item;
-	proto_tree *subtree;
+	proto_item *volatile item;
+	proto_tree *volatile subtree;
 	volatile int return_offset = 0;
 	gssapi_conv_info_t *volatile gss_info;
 	gssapi_oid_value *oidvalue;
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index aed58f076b..358f851779 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -563,7 +563,7 @@ dissect_ieee802154_cc24xx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options)
 {
-    tvbuff_t            *payload_tvb;
+    tvbuff_t            *volatile payload_tvb;
     proto_tree          *volatile ieee802154_tree = NULL;
     proto_item          *volatile proto_root = NULL;
     proto_item          *ti;
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 14f7b4e738..1462f07ffc 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -149,7 +149,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
 {
   proto_tree *volatile fh_tree = NULL;
   proto_item *ti, *hidden_item;
-  guint8 type;
+  volatile guint8 type;
   volatile guint16 length;
   gint captured_length;
   tvbuff_t *volatile payload_tvb = NULL;
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index a418e4715c..d26be2cc3f 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -2484,7 +2484,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	int length_remaining;
 	guint16 plen;
 	int length;
-	tvbuff_t *next_tvb;
+	tvbuff_t *volatile next_tvb;
 
 	while (tvb_reported_length_remaining(tvb, offset) != 0) {
 		length_remaining = tvb_length_remaining(tvb, offset);
diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index 41257a6f4a..a8b1db487c 100644
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -241,7 +241,7 @@ extern const value_string scsi_devid_idtype_val[];
  */
 #define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length)		\
     {									\
-	gboolean short_packet;						\
+	volatile gboolean short_packet;						\
 	tvbuff_t *new_tvb;						\
 	guint32 end_data_offset=0;					\
 									\
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 315900561a..ec1e804ed1 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -1725,7 +1725,7 @@ dissect_tds_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	guint8 type;
 	guint16 plen;
 	guint length;
-	tvbuff_t *next_tvb;
+	tvbuff_t *volatile next_tvb;
 	proto_item *tds_item = NULL;
 	proto_tree *tds_tree = NULL;
 
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index a5750b5765..731ee01519 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -217,7 +217,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     int mgcp_version = 0;
     int mgcp_reserved = 0;
     volatile int length;
-    tvbuff_t *next_tvb;
+    tvbuff_t *volatile next_tvb;
     const char *saved_proto;
     guint8 string[4];
     /*
@@ -372,7 +372,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	int length_remaining;
 	int data_len;
 	volatile int length;
-	tvbuff_t *next_tvb;
+	tvbuff_t *volatile next_tvb;
 	const char *saved_proto;
 
 	/*
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 179d2ed48b..b38969e126 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -326,10 +326,10 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree	*tr_tree, *bf_tree;
 	proto_item	*ti, *hidden_item;
-	int		frame_type;
 	guint8		rcf1, rcf2;
 	tvbuff_t	*next_tvb;
 
+	volatile int		frame_type;
 	volatile int		fixoffset = 0;
 	volatile int		source_routed = 0;
 	volatile guint8		trn_rif_bytes;
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index bf8dcc7127..7bbf705500 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -74,7 +74,8 @@ static void
 dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   proto_tree *ti;
-  guint16 tci,encap_proto;
+  guint16 tci;
+  volatile guint16 encap_proto;
   volatile gboolean is_802_2;
   proto_tree *volatile vlan_tree;
 
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index 9f4d220c27..a93a9bc7d5 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -4099,7 +4099,7 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo,
       conversation_t *conversation;
       x11_conv_data_t *volatile state;
       int length;
-      tvbuff_t *next_tvb;
+      tvbuff_t *volatile next_tvb;
 
       while (tvb_reported_length_remaining(tvb, offset) != 0) {
 	    /*