diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index ebbb7932a2..f1b5b690f5 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -37,6 +37,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
+#include <wsutil/pint.h>
 
 #include <string.h>
 
diff --git a/dumpcap.c b/dumpcap.c
index f6134cffaa..8378aead6f 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -70,6 +70,7 @@
 #include <errno.h>
 
 #include <wsutil/crash_info.h>
+#include <wsutil/pint.h>
 
 #ifndef HAVE_GETOPT
 #include "wsutil/wsgetopt.h"
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index a0fc47f222..4322d1cb2a 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -126,6 +126,7 @@
 
 #include <wsutil/report_err.h>
 #include <wsutil/file_util.h>
+#include <wsutil/pint.h>
 
 #include <epan/strutil.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index b3712e65e6..b9836e739f 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 87f5f8f4b4..d1a6028ab9 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/oui.h>
 #include <epan/addr_resolv.h>
 #include <epan/ppptypes.h>
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 0e14a4a26c..d126166370 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/chdlctypes.h>
diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c
index 7b6755eed2..6d3c93d63b 100644
--- a/epan/dissectors/packet-cipsafety.c
+++ b/epan/dissectors/packet-cipsafety.c
@@ -30,6 +30,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <wsutil/pint.h>
 #include "packet-cip.h"
 #include "packet-enip.h"
 #include "packet-cipsafety.h"
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index daea348188..0ffffaad45 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -32,6 +32,7 @@
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/aftypes.h>
+#include <wsutil/pint.h>
 #include "packet-enc.h"
 #include "packet-ip.h"
 #include "packet-ipv6.h"
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 61c559cd45..7dd41a9836 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index c593de7b0b..5606e7963e 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -30,6 +30,7 @@
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
+#include <wsutil/pint.h>
 #include "packet-eth.h"
 #include "packet-ieee8023.h"
 #include "packet-ipx.h"
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 6e6a3c0eab..1dcdf0de9a 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -299,6 +299,7 @@
 #include "packet-ziop.h"
 #include "packet-tcp.h"
 #include <wsutil/file_util.h>
+#include <wsutil/pint.h>
 
 
 /*
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 028c9074b2..5f4276e7a7 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -33,6 +33,7 @@
 #include <epan/in_cksum.h>
 #include <epan/crc32-tvb.h>
 #include <wsutil/crc32.h>
+#include <wsutil/pint.h>
 #include <epan/expert.h>
 
 #include "packet-ieee8023.h"
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index c50f0a3edf..9b2e8173c7 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -45,6 +45,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
+#include <wsutil/pint.h>
 
 #include <string.h>
 
@@ -213,7 +214,7 @@ typedef enum _IndicationMessage_enum {
 } IndicationMessage_enum;
 
 /*--- End of included file: packet-h245-val.h ---*/
-#line 86 "../../asn1/h245/packet-h245-template.c"
+#line 87 "../../asn1/h245/packet-h245-template.c"
 
 static const value_string h245_RequestMessage_short_vals[] = {
 	{ RequestMessage_nonStandard              ,	"NSM" },
@@ -1921,7 +1922,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 387 "../../asn1/h245/packet-h245-template.c"
+#line 388 "../../asn1/h245/packet-h245-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_h245 = -1;
@@ -2422,7 +2423,7 @@ static gint ett_h245_FlowControlIndication = -1;
 static gint ett_h245_MobileMultilinkReconfigurationIndication = -1;
 
 /*--- End of included file: packet-h245-ett.c ---*/
-#line 392 "../../asn1/h245/packet-h245-template.c"
+#line 393 "../../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_);
@@ -14489,7 +14490,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-h245-fn.c ---*/
-#line 401 "../../asn1/h245/packet-h245-template.c"
+#line 402 "../../asn1/h245/packet-h245-template.c"
 
 static void
 dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
@@ -20183,7 +20184,7 @@ void proto_register_h245(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-h245-hfarr.c ---*/
-#line 482 "../../asn1/h245/packet-h245-template.c"
+#line 483 "../../asn1/h245/packet-h245-template.c"
   };
 
   /* List of subtrees */
@@ -20686,7 +20687,7 @@ void proto_register_h245(void) {
     &ett_h245_MobileMultilinkReconfigurationIndication,
 
 /*--- End of included file: packet-h245-ettarr.c ---*/
-#line 489 "../../asn1/h245/packet-h245-template.c"
+#line 490 "../../asn1/h245/packet-h245-template.c"
   };
   module_t *h245_module;
 
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c
index 3b7cc3fbd5..b7e7fbaaea 100644
--- a/epan/dissectors/packet-ieee80211-prism.c
+++ b/epan/dissectors/packet-ieee80211-prism.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/wmem/wmem.h>
 #include "packet-ieee80211.h"
 
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 8e91dfadf7..98ea388ae9 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/crc32-tvb.h>
 #include <epan/frequency-utils.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c
index e5dc373eec..7b9c8c9b34 100644
--- a/epan/dissectors/packet-ieee80211-wlancap.c
+++ b/epan/dissectors/packet-ieee80211-wlancap.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include "packet-ieee80211.h"
 
 static dissector_handle_t ieee80211_handle;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index bcb41ee993..a2e4313363 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 <wsutil/pint.h>
 #include <epan/bitswap.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 033990ccf8..f4a1d7604d 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 <wsutil/pint.h>
 #include <epan/crc16-tvb.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 5b0446462b..d7f148bf20 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -26,6 +26,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/addr_resolv.h>
 
 #include "packet-ieee8021ah.h"
diff --git a/epan/dissectors/packet-ixiatrailer.c b/epan/dissectors/packet-ixiatrailer.c
index b1ee84d699..bebba40642 100644
--- a/epan/dissectors/packet-ixiatrailer.c
+++ b/epan/dissectors/packet-ixiatrailer.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/prefs.h>
 #include <epan/in_cksum.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 15a2ddbfb9..3801420897 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <wsutil/str_util.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/conversation.h>
 #include <prefs.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index edf7994566..afa3e05905 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/oui.h>
 #include <epan/xdlc.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 2707815650..cbcf193b2a 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -27,8 +27,10 @@
 #include "config.h"
 
 #include <glib.h>
-
 #include <string.h>
+
+#include <wsutil/pint.h>
+
 #include <epan/packet.h>
 #include "packet-null.h"
 #include <epan/atalk-utils.h>
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index a2a4e42a0c..422b4dc838 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -56,6 +56,7 @@
 #include <epan/reassemble.h>
 #include <epan/frequency-utils.h>
 #include <epan/wmem/wmem.h>
+#include <wsutil/pint.h>
 
 /* Needed for wtap_pcap_encap_to_wtap_encap(). */
 #include <wiretap/pcap-encap.h>
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 4ca257f34e..4c4887c459 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/prefs.h>
 #include <epan/wmem/wmem.h>
 #include "packet-ppp.h"
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index e8edba979a..a6b98a3b70 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 <wsutil/pint.h>
 #include <epan/conversation.h>
 #include <epan/wmem/wmem.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 4bbe356ee3..3fdc645a63 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -69,6 +69,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 
 #include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index e41023c46f..1be101442e 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -30,6 +30,7 @@
 #include <epan/arptypes.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include "packet-sll.h"
 #include "packet-ipx.h"
 #include "packet-llc.h"
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 547d38d59d..81ad86c4bd 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 <wsutil/pint.h>
 #include "packet-tr.h"
 #include "packet-llc.h"
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index d55289e84e..27c8c1e4a9 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -30,6 +30,7 @@
 #include "isprint.h"
 
 #include <glib.h>
+#include <wsutil/pint.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index 74458d72ae..805cc17b0d 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/expert.h>
 #include "packet-ieee8023.h"
 #include "packet-ipx.h"
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index 0093f44a59..5092297d50 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -102,6 +102,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
+#include <wsutil/pint.h>
 #include <epan/circuit.h>
 #include <epan/wmem/wmem.h>
 #include <epan/etypes.h>
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index da5271c9a1..a57decab5d 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -28,6 +28,8 @@
 #include <epan/emem.h>
 #include <epan/addr_resolv.h>
 
+#include <wsutil/pint.h>
+
 static void
 int_fvalue_new(fvalue_t *fv)
 {
diff --git a/epan/packet.h b/epan/packet.h
index f37a3dbcf7..da1aaa67af 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -28,7 +28,6 @@
 #include "wiretap/wtap.h"
 #include "proto.h"
 #include "tvbuff.h"
-#include "wsutil/pint.h"
 #include "value_string.h"
 #include "column-info.h"
 #include "frame_data.h"
diff --git a/epan/xdlc.c b/epan/xdlc.c
index f9578eab3d..01856f3981 100644
--- a/epan/xdlc.c
+++ b/epan/xdlc.c
@@ -32,6 +32,7 @@
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 #include <epan/emem.h>
+#include <wsutil/pint.h>
 
 const value_string ftype_vals[] = {
     { XDLC_I, "Information frame" },
diff --git a/plugins/wimax/wimax_bits.h b/plugins/wimax/wimax_bits.h
index b88eda72c9..6077411bc3 100644
--- a/plugins/wimax/wimax_bits.h
+++ b/plugins/wimax/wimax_bits.h
@@ -29,6 +29,8 @@
 #ifndef __wimax_bits_h__
 #define __wimax_bits_h__
 
+#include <wsutil/pint.h>
+
 /********************************************************************
  * Functions for working with nibbles and bits
  */