epan: convert dissectors L to C99 types

Ping #19116

71 files changed, 4834 insertions, 4833 deletions

diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
index 02e94ac009..06fc6e1307 100644
--- a/epan/dissectors/packet-l1-events.c
+++ b/epan/dissectors/packet-l1-events.c
@@ -29,23 +29,23 @@ static dissector_handle_t l1_events_handle;
  */
 
 /* Filterable header fields */
-static gint proto_l1_events;
+static int proto_l1_events;
 
 /* Subtrees */
-static gint ett_l1_events;
+static int ett_l1_events;
 
 static int
 dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
 	proto_tree	*subtree;
 	proto_item	*ti;
-	gint		offset = 0, next_offset;
-	gint		len;
+	int		offset = 0, next_offset;
+	int		len;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1");
 	col_set_str(pinfo->cinfo, COL_DEF_SRC,
 			    pinfo->pseudo_header->l1event.uton? "TE" : "NT");
-	len = tvb_find_line_end(tvb, 0, -1, &next_offset, FALSE);
+	len = tvb_find_line_end(tvb, 0, -1, &next_offset, false);
 	if(len>0)
 		col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(pinfo->pool, tvb, 0, len));
 
@@ -64,7 +64,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 			 * as "iso-10646-ucs-2", or might require other
 			 * special processing.
 			 */
-			len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+			len = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
 			if (len == -1)
 				break;
 
@@ -83,7 +83,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 void
 proto_register_l1_events(void)
 {
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_l1_events,
 	};
 
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 42ccc1a28f..f5d524a5a9 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -281,16 +281,16 @@ static dissector_table_t pw_type_table;
 /* DOCSIS DMPT Sub-Layer Header definitions */
 #define FLOW_ID_MASK  0x0E
 
-static gint ett_l2tp;
-static gint ett_l2tp_flags;
-static gint ett_l2tp_avp;
-static gint ett_l2tp_avp_sub;
-static gint ett_l2tp_ale_sub;
-static gint ett_l2tp_lcp;
-static gint ett_l2tp_l2_spec;
-static gint ett_l2tp_csu;
-static gint ett_l2tp_ericsson_tcg;
-static gint ett_l2tp_ericsson_map;
+static int ett_l2tp;
+static int ett_l2tp_flags;
+static int ett_l2tp_avp;
+static int ett_l2tp_avp_sub;
+static int ett_l2tp_ale_sub;
+static int ett_l2tp_lcp;
+static int ett_l2tp_l2_spec;
+static int ett_l2tp_csu;
+static int ett_l2tp_ericsson_tcg;
+static int ett_l2tp_ericsson_map;
 
 static expert_field ei_l2tp_incorrect_digest;
 /* Generated from convert_proto_tree_add_text.pl */
@@ -324,8 +324,8 @@ static const enum_val_t l2tpv3_l2_specifics[] = {
     {NULL, NULL, 0}
 };
 
-static gint l2tpv3_cookie = -1;
-static gint l2tpv3_l2_specific = -1;
+static int l2tpv3_cookie = -1;
+static int l2tpv3_l2_specific = -1;
 
 #define MESSAGE_TYPE_SCCRQ         1
 #define MESSAGE_TYPE_SCCRP         2
@@ -969,9 +969,9 @@ static dissector_handle_t atm_oam_llc_handle;
 
 typedef struct l2tpv3_conversation {
     address               lcce1;
-    guint16               lcce1_port;
+    uint16_t              lcce1_port;
     address               lcce2;
-    guint16               lcce2_port;
+    uint16_t              lcce2_port;
     port_type             pt;
     struct l2tpv3_tunnel *tunnel;
 } l2tpv3_conversation_t;
@@ -980,41 +980,41 @@ typedef struct l2tpv3_tunnel {
     l2tpv3_conversation_t *conv;
 
     address  lcce1;
-    guint32  lcce1_id;
-    guint8  *lcce1_nonce;
-    gint     lcce1_nonce_len;
+    uint32_t lcce1_id;
+    uint8_t *lcce1_nonce;
+    int      lcce1_nonce_len;
 
     address  lcce2;
-    guint32  lcce2_id;
-    guint8  *lcce2_nonce;
-    gint     lcce2_nonce_len;
+    uint32_t lcce2_id;
+    uint8_t *lcce2_nonce;
+    int      lcce2_nonce_len;
 
-    gchar   *shared_key_secret;
-    guint8   shared_key[HASH_MD5_LENGTH];
+    char    *shared_key_secret;
+    uint8_t  shared_key[HASH_MD5_LENGTH];
 
     GSList  *sessions;
 } l2tpv3_tunnel_t;
 
 typedef struct lcce_settings {
-    guint32 id;
-    gint    cookie_len;
-    gint    l2_specific;
+    uint32_t id;
+    int     cookie_len;
+    int     l2_specific;
 } lcce_settings_t;
 
 typedef struct l2tpv3_session {
     lcce_settings_t lcce1;
     lcce_settings_t lcce2;
 
-    guint    pw_type;
+    unsigned pw_type;
 } l2tpv3_session_t;
 
-static const gchar* shared_secret = "";
+static const char* shared_secret = "";
 
 static GSList *list_heads;
 
 static void update_shared_key(l2tpv3_tunnel_t *tunnel)
 {
-    const gchar *secret = "";
+    const char *secret = "";
 
     /* There is at least one nonce in the packet, so we can do authentication,
        otherwise it's just a plain digest without nonces. */
@@ -1025,7 +1025,7 @@ static void update_shared_key(l2tpv3_tunnel_t *tunnel)
     /* If there's no shared key in the conversation context, or the secret has been changed */
     if (tunnel->shared_key_secret == NULL || strcmp(secret, tunnel->shared_key_secret) != 0) {
         /* For secret specification, see RFC 3931 pg 37 */
-        guint8 data = 2;
+        uint8_t data = 2;
         if (ws_hmac_buffer(GCRY_MD_MD5, tunnel->shared_key, &data, 1, secret, strlen(secret))) {
             return;
         }
@@ -1040,9 +1040,9 @@ static void md5_hmac_digest(l2tpv3_tunnel_t *tunnel,
                             int avp_len,
                             int msg_type,
                             packet_info *pinfo,
-                            guint8 digest[20])
+                            uint8_t digest[20])
 {
-    guint8 zero[HASH_MD5_LENGTH] = { 0 };
+    uint8_t zero[HASH_MD5_LENGTH] = { 0 };
     gcry_md_hd_t hmac_handle;
     int remainder;
     int offset = 0;
@@ -1086,9 +1086,9 @@ static void sha1_hmac_digest(l2tpv3_tunnel_t *tunnel,
                              int avp_len,
                              int msg_type,
                              packet_info *pinfo,
-                             guint8 digest[20])
+                             uint8_t digest[20])
 {
-    guint8 zero[HASH_SHA1_LENGTH] = { 0 };
+    uint8_t zero[HASH_SHA1_LENGTH] = { 0 };
     gcry_md_hd_t hmac_handle;
     int remainder;
     int offset = 0;
@@ -1133,14 +1133,14 @@ static int check_control_digest(l2tpv3_tunnel_t *tunnel,
                                 int msg_type,
                                 packet_info *pinfo)
 {
-    guint8 digest[HASH_SHA1_LENGTH];
+    uint8_t digest[HASH_SHA1_LENGTH];
 
     if (!tunnel)
         return 1;
 
     update_shared_key(tunnel);
 
-    switch (tvb_get_guint8(tvb, idx)) {
+    switch (tvb_get_uint8(tvb, idx)) {
         case L2TP_HMAC_MD5:
             if ((avp_len - 1) != HASH_MD5_LENGTH)
                 return -1;
@@ -1165,7 +1165,7 @@ static void store_cma_nonce(l2tpv3_tunnel_t *tunnel,
                             int length,
                             int msg_type)
 {
-    guint8 *nonce = NULL;
+    uint8_t *nonce = NULL;
 
     if (!tunnel)
         return;
@@ -1173,14 +1173,14 @@ static void store_cma_nonce(l2tpv3_tunnel_t *tunnel,
     switch (msg_type) {
         case MESSAGE_TYPE_SCCRQ:
             if (!tunnel->lcce1_nonce) {
-                tunnel->lcce1_nonce = (guint8 *)wmem_alloc(wmem_file_scope(), length);
+                tunnel->lcce1_nonce = (uint8_t *)wmem_alloc(wmem_file_scope(), length);
                 tunnel->lcce1_nonce_len = length;
                 nonce = tunnel->lcce1_nonce;
             }
             break;
         case MESSAGE_TYPE_SCCRP:
             if (!tunnel->lcce2_nonce) {
-                tunnel->lcce2_nonce = (guint8 *)wmem_alloc(wmem_file_scope(), length);
+                tunnel->lcce2_nonce = (uint8_t *)wmem_alloc(wmem_file_scope(), length);
                 tunnel->lcce2_nonce_len = length;
                 nonce = tunnel->lcce2_nonce;
             }
@@ -1218,8 +1218,8 @@ static void store_ccid(l2tpv3_tunnel_t *tunnel,
 }
 
 static l2tpv3_session_t *find_session(l2tpv3_tunnel_t *tunnel,
-                                      guint32 lcce1_id,
-                                      guint32 lcce2_id)
+                                      uint32_t lcce1_id,
+                                      uint32_t lcce2_id)
 {
     l2tpv3_session_t *session = NULL;
     GSList *iterator;
@@ -1373,8 +1373,8 @@ static l2tpv3_session_t *store_l2_sublayer(l2tpv3_session_t *_session,
                                            int msg_type)
 {
     l2tpv3_session_t *session = _session;
-    gint result = l2tpv3_l2_specific;
-    guint16 l2_sublayer;
+    int result = l2tpv3_l2_specific;
+    uint16_t l2_sublayer;
 
     switch (msg_type) {
         case MESSAGE_TYPE_ICRQ:
@@ -1466,13 +1466,13 @@ static void update_session(l2tpv3_tunnel_t *tunnel, l2tpv3_session_t *session)
     }
 }
 
-static void l2tp_prompt(packet_info *pinfo _U_, gchar* result)
+static void l2tp_prompt(packet_info *pinfo _U_, char* result)
 {
     snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Decode L2TPv3 pseudowire type 0x%04x as",
         GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_l2tp, 0)));
 }
 
-static gpointer l2tp_value(packet_info *pinfo _U_)
+static void *l2tp_value(packet_info *pinfo _U_)
 {
     return p_get_proto_data(pinfo->pool, pinfo, proto_l2tp, 0);
 }
@@ -1484,9 +1484,9 @@ static int dissect_l2tp_cisco_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_
 
     int offset = 0;
     int         avp_type;
-    guint32     avp_vendor_id;
-    guint16     avp_len;
-    guint16     ver_len_hidden;
+    uint32_t    avp_vendor_id;
+    uint16_t    avp_len;
+    uint16_t    ver_len_hidden;
     proto_tree *l2tp_avp_tree, *l2tp_avp_tree_sub;
 
     ver_len_hidden  = tvb_get_ntohs(tvb, offset);
@@ -1595,9 +1595,9 @@ static int dissect_l2tp_broadband_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pr
 
     int offset = 0;
     int         avp_type;
-    guint32     avp_vendor_id;
-    guint16     avp_len;
-    guint16     ver_len_hidden;
+    uint32_t    avp_vendor_id;
+    uint16_t    avp_len;
+    uint16_t    ver_len_hidden;
     proto_tree *l2tp_avp_tree, *l2tp_avp_ale_tree;
     proto_item *ta;
 
@@ -1732,7 +1732,7 @@ static int dissect_l2tp_broadband_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pr
 static int dissect_l2tp_ericsson_transp_cfg(tvbuff_t *tvb, proto_tree *parent_tree)
 {
     int offset = 0;
-    guint32 i, num_sapis;
+    uint32_t i, num_sapis;
     proto_tree *tree;
 
     while (tvb_reported_length_remaining(tvb, offset) >= 8) {
@@ -1772,14 +1772,14 @@ static int dissect_l2tp_ericsson_tei_sc_map(tvbuff_t *tvb, proto_tree *parent_tr
     return offset;
 }
 
-static int dissect_l2tp_ericsson_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 ccid _U_)
+static int dissect_l2tp_ericsson_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t ccid _U_)
 {
     int offset = 0;
     int         avp_type;
-    guint32     avp_vendor_id;
-    guint16     avp_len;
-    guint16     ver_len_hidden;
-    guint32     msg_type;
+    uint32_t    avp_vendor_id;
+    uint16_t    avp_len;
+    uint16_t    ver_len_hidden;
+    uint32_t    msg_type;
     proto_tree *l2tp_avp_tree;
     tvbuff_t   *tcg_tvb;
 
@@ -1865,9 +1865,9 @@ dissect_l2tp_vnd_cablelabs_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 {
     int offset = 0;
     int         avp_type;
-    guint32     avp_vendor_id;
-    guint32     avp_len;
-    guint16     ver_len_hidden;
+    uint32_t    avp_vendor_id;
+    uint32_t    avp_len;
+    uint16_t    ver_len_hidden;
     proto_tree *l2tp_avp_tree;
 
     ver_len_hidden  = tvb_get_ntohs(tvb, offset);
@@ -1949,21 +1949,21 @@ static void process_control_avps(tvbuff_t *tvb,
                                  proto_tree *l2tp_tree,
                                  int idx,
                                  int length,
-                                 guint32 ccid,
+                                 uint32_t ccid,
                                  l2tpv3_tunnel_t *tunnel)
 {
     proto_tree *l2tp_lcp_avp_tree, *l2tp_avp_tree = NULL, *l2tp_avp_tree_sub, *l2tp_avp_csu_tree;
     proto_item *te, *tc;
 
     int                msg_type  = 0;
-    gboolean           isStopCcn = FALSE;
+    bool               isStopCcn = false;
     int                avp_type;
-    guint32            avp_vendor_id;
-    guint16            avp_len;
-    guint16            ver_len_hidden;
+    uint32_t           avp_vendor_id;
+    uint16_t           avp_len;
+    uint16_t           ver_len_hidden;
     tvbuff_t          *next_tvb, *avp_tvb;
     int                digest_idx = 0;
-    guint16            digest_avp_len = 0;
+    uint16_t           digest_avp_len = 0;
     proto_item        *digest_item = NULL;
     l2tp_cntrl_data_t *l2tp_cntrl_data = wmem_new0(pinfo->pool, l2tp_cntrl_data_t);
 
@@ -2006,7 +2006,7 @@ static void process_control_avps(tvbuff_t *tvb,
 
             } else {
                 /* Vendor-Specific AVP */
-                if (!dissector_try_uint_new(l2tp_vendor_avp_dissector_table, avp_vendor_id, avp_tvb, pinfo, l2tp_tree, FALSE, l2tp_cntrl_data)){
+                if (!dissector_try_uint_new(l2tp_vendor_avp_dissector_table, avp_vendor_id, avp_tvb, pinfo, l2tp_tree, false, l2tp_cntrl_data)){
                     l2tp_avp_tree =  proto_tree_add_subtree_format(l2tp_tree, tvb, idx,
                                           avp_len, ett_l2tp_avp, NULL, "Vendor %s (%u) AVP Type %u",
                                           enterprises_lookup(avp_vendor_id, "Unknown"), avp_vendor_id,
@@ -2082,7 +2082,7 @@ static void process_control_avps(tvbuff_t *tvb,
                                 tvb, idx, 2, ENC_BIG_ENDIAN);
 
             if (msg_type == MESSAGE_TYPE_StopCCN) {
-                isStopCcn = TRUE;
+                isStopCcn = true;
             }
             break;
 
@@ -2510,13 +2510,13 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 {
     int         idx         = *pIdx;
     int         sid;
-    guint32     oam_cell    = 0;
+    uint32_t    oam_cell    = 0;
     proto_tree *l2_specific = NULL;
     proto_item *ti          = NULL;
     tvbuff_t   *next_tvb;
-    gint        cookie_len  = l2tpv3_cookie;
-    gint        l2_spec     = l2tpv3_l2_specific;
-    guint       pw_type     = L2TPv3_PW_DEFAULT;
+    int         cookie_len  = l2tpv3_cookie;
+    int         l2_spec     = l2tpv3_l2_specific;
+    unsigned    pw_type     = L2TPv3_PW_DEFAULT;
 
     lcce_settings_t  *lcce      = NULL;
     l2tpv3_session_t *session   = NULL;
@@ -2618,7 +2618,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
              * As per RFC 4454, the T bit specifies whether
              * we're transporting an OAM cell or an AAL5 frame.
              */
-            oam_cell = tvb_get_guint8(tvb, idx) & 0x08;
+            oam_cell = tvb_get_uint8(tvb, idx) & 0x08;
             proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_g, tvb, idx,
                                 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_c, tvb, idx,
@@ -2644,7 +2644,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     proto_item_set_len(l2tp_item, idx);
     p_add_proto_data(pinfo->pool, pinfo, proto_l2tp, 0, GUINT_TO_POINTER(pw_type));
 
-    if (!dissector_try_uint_new(pw_type_table, pw_type, next_tvb, pinfo, tree, FALSE, GUINT_TO_POINTER(oam_cell)))
+    if (!dissector_try_uint_new(pw_type_table, pw_type, next_tvb, pinfo, tree, false, GUINT_TO_POINTER(oam_cell)))
     {
         call_data_dissector(next_tvb, pinfo, tree);
     }
@@ -2720,12 +2720,12 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 
     int     idx     = baseIdx;
     int     tmp_idx;
-    guint16 length  = 0;        /* Length field */
-    guint32 ccid    = 0;        /* Control Connection ID */
-    guint16 vendor_id = 0;
-    guint16 avp_type;
-    guint16 msg_type;
-    guint16 control = 0;
+    uint16_t length  = 0;        /* Length field */
+    uint32_t ccid    = 0;        /* Control Connection ID */
+    uint16_t vendor_id = 0;
+    uint16_t avp_type;
+    uint16_t msg_type;
+    uint16_t control = 0;
 
     l2tpv3_tunnel_t *tunnel = NULL;
     l2tpv3_tunnel_t tmp_tunnel;
@@ -2869,13 +2869,13 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     proto_item *l2tp_item;
     int         idx       = 0;
     int         tmp_idx;
-    guint16     length    = 0;  /* Length field */
-    guint16     tid;            /* Tunnel ID */
-    guint16     cid;            /* Call ID */
-    guint16     offset_size;    /* Offset size */
-    guint16     avp_type;
-    guint16     msg_type;
-    guint16     control;
+    uint16_t    length    = 0;  /* Length field */
+    uint16_t    tid;            /* Tunnel ID */
+    uint16_t    cid;            /* Call ID */
+    uint16_t    offset_size;    /* Offset size */
+    uint16_t    avp_type;
+    uint16_t    msg_type;
+    uint16_t    control;
     tvbuff_t   *next_tvb;
     conversation_t *conv = NULL;
     l2tpv3_conversation_t *l2tp_conv = NULL;
@@ -3106,7 +3106,7 @@ static int
 dissect_l2tp_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     int     idx = 0;
-    guint32 sid;                /* Session ID */
+    uint32_t sid;                /* Session ID */
 
     conversation_t *conv = NULL;
     l2tpv3_conversation_t *l2tp_conv = NULL;
@@ -3141,7 +3141,7 @@ dissect_l2tp_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
 
 static int dissect_atm_oam_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-    guint32      oam_cell   = GPOINTER_TO_UINT(data);
+    uint32_t     oam_cell   = GPOINTER_TO_UINT(data);
 
     if (oam_cell) {
         call_dissector(atm_oam_handle, tvb, pinfo, tree);
@@ -3681,7 +3681,7 @@ proto_register_l2tp(void)
       { &hf_l2tp_offset_padding, { "Offset Padding", "l2tp.offset_padding", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_l2tp,
         &ett_l2tp_flags,
         &ett_l2tp_avp,
@@ -3730,7 +3730,7 @@ proto_register_l2tp(void)
                                    "L2TPv3 Cookie Size",
                                    &l2tpv3_cookie,
                                    l2tpv3_cookies,
-                                   FALSE);
+                                   false);
 
     prefs_register_enum_preference(l2tp_module,
                                    "l2_specific",
@@ -3738,7 +3738,7 @@ proto_register_l2tp(void)
                                    "L2TPv3 L2-Specific Sublayer",
                                    &l2tpv3_l2_specific,
                                    l2tpv3_l2_specifics,
-                                   FALSE);
+                                   false);
 
     prefs_register_static_text_preference(l2tp_module, "protocol",
         "Dissection of pseudowire types is configured through \"Decode As\". "
diff --git a/epan/dissectors/packet-l2tp.h b/epan/dissectors/packet-l2tp.h
index 20449d76c1..3fb9132af2 100644
--- a/epan/dissectors/packet-l2tp.h
+++ b/epan/dissectors/packet-l2tp.h
@@ -11,7 +11,7 @@
 #define __PACKET_L2TP_H__
 
 typedef struct _l2tp_cntrl_data {
-	guint32     ccid;
+	uint32_t    ccid;
 	int         msg_type;
 } l2tp_cntrl_data_t;
 
diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c
index 8d5b06e60c..35c5a78b55 100644
--- a/epan/dissectors/packet-lacp.c
+++ b/epan/dissectors/packet-lacp.c
@@ -111,9 +111,9 @@ static int hf_lacp_vendor_hp_unknown;
 
 
 /* Initialise the subtree pointers */
-static gint ett_lacp;
-static gint ett_lacp_a_flags;
-static gint ett_lacp_p_flags;
+static int ett_lacp;
+static int ett_lacp_a_flags;
+static int ett_lacp_p_flags;
 
 /* Expert Items */
 static expert_field ei_lacp_wrong_tlv_type;
@@ -124,7 +124,7 @@ static const true_false_string tfs_short_long_timeout = { "Short Timeout", "Long
 static const true_false_string tfs_aggregatable_individual = { "Aggregatable", "Individual" };
 static const true_false_string tfs_in_sync_out_sync = { "In Sync", "Out of Sync" };
 
-static const char * lacp_state_flags_to_str(wmem_allocator_t *scope, guint32 value)
+static const char * lacp_state_flags_to_str(wmem_allocator_t *scope, uint32_t value)
 {
     wmem_strbuf_t *buf = wmem_strbuf_new(scope, "");
     const unsigned int flags_count = 8;
@@ -162,11 +162,11 @@ static int
 dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     int          offset = 0, length_remaining;
-    guint        tlv_type, tlv_length;
-    guint        version, port, key;
-    const gchar  *sysidstr, *flagstr;
-    guint32      protodetect;
-    guint8       is_vlacp;
+    unsigned     tlv_type, tlv_length;
+    unsigned     version, port, key;
+    const char   *sysidstr, *flagstr;
+    uint32_t     protodetect;
+    uint8_t      is_vlacp;
 
     proto_tree *lacp_tree;
     proto_item *lacp_item, *tlv_type_item, *tlv_length_item;
@@ -265,7 +265,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
     proto_tree_add_bitmask_with_flags(lacp_tree, tvb, offset, hf_lacp_actor_state,
                            ett_lacp_a_flags, actor_flags, ENC_NA, BMT_NO_INT|BMT_NO_TFS|BMT_NO_FALSE);
-    flagstr = lacp_state_flags_to_str(pinfo->pool, tvb_get_guint8(tvb, offset));
+    flagstr = lacp_state_flags_to_str(pinfo->pool, tvb_get_uint8(tvb, offset));
     ti = proto_tree_add_string(lacp_tree, hf_lacp_actor_state_str, tvb, offset, 1, flagstr);
     proto_item_set_generated(ti);
     offset += 1;
@@ -307,7 +307,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
     offset += 2;
 
     proto_tree_add_bitmask_with_flags(lacp_tree, tvb, offset, hf_lacp_partner_state, ett_lacp_p_flags, partner_flags, ENC_NA, BMT_NO_INT|BMT_NO_TFS|BMT_NO_FALSE);
-    flagstr = lacp_state_flags_to_str(pinfo->pool, tvb_get_guint8(tvb, offset));
+    flagstr = lacp_state_flags_to_str(pinfo->pool, tvb_get_uint8(tvb, offset));
     ti = proto_tree_add_string(lacp_tree, hf_lacp_partner_state_str, tvb, offset, 1, flagstr);
     proto_item_set_generated(ti);
     offset += 1;
@@ -376,7 +376,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
     if (length_remaining) {
 
         /* HP LACP MAD IRF, first bytes is always 0x64 and second bytes is the rest of length */
-        if (length_remaining > 2 && (tvb_get_guint8(tvb, offset) == 0x64) && ((length_remaining -2) == tvb_get_guint8(tvb, offset+1)) )
+        if (length_remaining > 2 && (tvb_get_uint8(tvb, offset) == 0x64) && ((length_remaining -2) == tvb_get_uint8(tvb, offset+1)) )
         {
             proto_tree_add_item(lacp_tree, hf_lacp_vendor, tvb, offset, length_remaining, ENC_NA);
             proto_tree_add_item(lacp_tree, hf_lacp_vendor_hp_unknown, tvb, offset, 1, ENC_NA);
@@ -649,7 +649,7 @@ proto_register_lacp(void)
 
     /* Setup protocol subtree array */
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lacp,
         &ett_lacp_a_flags,
         &ett_lacp_p_flags,
diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c
index 2b2f62bdb3..f8ccee5ad8 100644
--- a/epan/dissectors/packet-lanforge.c
+++ b/epan/dissectors/packet-lanforge.c
@@ -45,15 +45,15 @@ static int hf_lanforge_tx_time_ns;
 static int hf_lanforge_timestamp;
 
 /* Initialize the subtree pointer */
-static gint ett_lanforge;
+static int ett_lanforge;
 
 /* entry point */
 static bool dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
     proto_item *ti;
     proto_tree *lanforge_tree;
-    guint32 offset = 0;
-    guint32 magic, pld_len, pld_len_h;
+    uint32_t offset = 0;
+    uint32_t magic, pld_len, pld_len_h;
 
     /* check for min size */
     if(tvb_captured_length(tvb) < 28) {  /* Not a LANforge packet. */
@@ -229,7 +229,7 @@ void proto_register_lanforge(void)
 
     /* Setup protocol subtree array */
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lanforge
     };
 
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index b2f047b1a4..21a46189f9 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -31,8 +31,8 @@ static int hf_lapb_u_modifier_resp;
 static int hf_lapb_ftype_i;
 static int hf_lapb_ftype_s_u;
 
-static gint ett_lapb;
-static gint ett_lapb_control;
+static int ett_lapb;
+static int ett_lapb_control;
 
 static dissector_handle_t x25_dir_handle;
 static dissector_handle_t x25_handle;
@@ -54,9 +54,9 @@ static int
 dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     proto_tree          *lapb_tree, *ti;
-    guint16             control;
+    uint16_t            control;
     int                 is_response;
-    guint8              byte0;
+    uint8_t             byte0;
     tvbuff_t            *next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB");
@@ -80,7 +80,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
         break;
     }
 
-    byte0 = tvb_get_guint8(tvb, 0);
+    byte0 = tvb_get_uint8(tvb, 0);
 
     if (byte0 != 0x01 && byte0 != 0x03 && byte0 != 0x07 && byte0 != 0x0f) /* invalid LAPB frame */
     {
@@ -95,16 +95,16 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
     case P2P_DIR_SENT:
         if (byte0 == 0x03)
-            is_response = TRUE;
+            is_response = true;
         else
-            is_response = FALSE;
+            is_response = false;
         break;
 
     case P2P_DIR_RECV:
         if (byte0 == 0x01)
-            is_response = TRUE;
+            is_response = true;
         else
-            is_response = FALSE;
+            is_response = false;
         break;
 
     default:
@@ -114,7 +114,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
          * from another with that, but we can't say which is DTE->DCE
          * and which is DCE->DTE.
          */
-        is_response = FALSE;
+        is_response = false;
         break;
     }
 
@@ -125,7 +125,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
     control = dissect_xdlc_control(tvb, 1, pinfo, lapb_tree, hf_lapb_control,
             ett_lapb_control, &lapb_cf_items, NULL, NULL, NULL,
-            is_response, FALSE, FALSE);
+            is_response, false, false);
 
     /* information frame ==> X.25 */
     if (XDLC_IS_INFORMATION(control)) {
@@ -193,7 +193,7 @@ proto_register_lapb(void)
           { "Frame type", "lapb.control.ftype", FT_UINT8, BASE_HEX,
             VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lapb,
         &ett_lapb_control,
     };
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index 1d86044fb7..41762a23f1 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -22,7 +22,7 @@ static int proto_lapbether;
 
 static int hf_lapbether_length;
 
-static gint ett_lapbether;
+static int ett_lapbether;
 
 static dissector_handle_t lapbether_handle;
 static dissector_handle_t lapb_handle;
@@ -37,7 +37,7 @@ dissect_lapbether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPBETHER");
     col_clear(pinfo->cinfo, COL_INFO);
 
-    len = tvb_get_guint8(tvb, 0) + tvb_get_guint8(tvb, 1) * 256;
+    len = tvb_get_uint8(tvb, 0) + tvb_get_uint8(tvb, 1) * 256;
 
     if (tree) {
 
@@ -65,7 +65,7 @@ proto_register_lapbether(void)
           "LAPBEther Length Field", HFILL }},
 
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lapbether,
     };
 
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index 83b51cb65c..b2d3480bc2 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -64,10 +64,10 @@ static int hf_lapd_ftype_s_u_ext;
 static int hf_lapd_checksum;
 static int hf_lapd_checksum_status;
 
-static gint ett_lapd;
-static gint ett_lapd_address;
-static gint ett_lapd_control;
-static gint ett_lapd_checksum;
+static int ett_lapd;
+static int ett_lapd_address;
+static int ett_lapd_control;
+static int ett_lapd_checksum;
 
 static expert_field ei_lapd_abort;
 static expert_field ei_lapd_checksum_bad;
@@ -161,7 +161,7 @@ typedef struct lapd_byte_state {
 } lapd_byte_state_t;
 
 typedef struct lapd_ppi {
-	gboolean		has_crc; 		/* CRC is captured with LAPD the frames */
+	bool		has_crc; 		/* CRC is captured with LAPD the frames */
 	lapd_byte_state_t	start_byte_state; 	/* LAPD bitstream byte state at the beginning of processing the packet */
 } lapd_ppi_t;
 
@@ -181,15 +181,15 @@ fill_lapd_byte_state(lapd_byte_state_t *ptr, enum lapd_bitstream_states state, c
 typedef struct lapd_convo_data {
 	address		addr_a;
 	address		addr_b;
-	guint32		port_a;
-	guint32		port_b;
+	uint32_t		port_a;
+	uint32_t		port_b;
 	lapd_byte_state_t	*byte_state_a;
 	lapd_byte_state_t	*byte_state_b;
 } lapd_convo_data_t;
 
 
 static void
-dissect_lapd_full(tvbuff_t*, packet_info*, proto_tree*, guint32);
+dissect_lapd_full(tvbuff_t*, packet_info*, proto_tree*, uint32_t);
 
 /* got new LAPD frame byte */
 static void new_byte(char full_byte, char data[], int *data_len) {
@@ -202,7 +202,7 @@ static void new_byte(char full_byte, char data[], int *data_len) {
 }
 
 static void
-lapd_log_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, const char *msg)
+lapd_log_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset, const char *msg)
 {
 	proto_item *ti;
 
@@ -223,12 +223,12 @@ lapd_log_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset
 static int
 dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissector_data _U_)
 {
-	guint8		byte, full_byte = 0x00, bit_offset = 0;
-	gboolean	bit;
-	guint8		i, ones = 0, data[MAX_LAPD_PACKET_LEN];
+	uint8_t		byte, full_byte = 0x00, bit_offset = 0;
+	bool	bit;
+	uint8_t		i, ones = 0, data[MAX_LAPD_PACKET_LEN];
 	int		data_len = 0;
-	gint		offset = 0, available;
-	guint8		*buff;
+	int		offset = 0, available;
+	uint8_t		*buff;
 	tvbuff_t	*new_tvb;
 
 	enum lapd_bitstream_states state = OUT_OF_SYNC;
@@ -236,7 +236,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 	conversation_t		*conversation = NULL;
 	lapd_convo_data_t	*convo_data = NULL;
 	lapd_byte_state_t	*lapd_byte_state, *prev_byte_state = NULL;
-	gboolean		forward_stream = TRUE;
+	bool		forward_stream = true;
 
 	/* get remaining data from previous packets */
 	conversation = find_or_create_conversation(pinfo);
@@ -260,14 +260,14 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 					&& convo_data-> port_a == pinfo->srcport
 					&& convo_data-> port_b == pinfo->destport) {
 				/* "forward" direction */
-				forward_stream = TRUE;
+				forward_stream = true;
 				prev_byte_state = convo_data->byte_state_a;
 			} else if (addresses_equal(&convo_data-> addr_b, &pinfo->src)
 					&& addresses_equal(&convo_data->addr_a, &pinfo->dst)
 					&& convo_data-> port_b == pinfo->srcport
 					&& convo_data-> port_a == pinfo->destport) {
 				/* "backward" direction */
-				forward_stream = FALSE;
+				forward_stream = false;
 				prev_byte_state = convo_data->byte_state_b;
 			}
 		}
@@ -285,10 +285,10 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 	/* Consume tvb bytes */
 	available = tvb_reported_length_remaining(tvb, offset);
 	while (offset < available) {
-		byte = tvb_get_guint8(tvb,offset);
+		byte = tvb_get_uint8(tvb,offset);
 		offset++;
 		for (i=0; i < 8; i++) { /* cycle through bits */
-			bit = byte & (0x80 >> i) ? TRUE : FALSE;
+			bit = byte & (0x80 >> i) ? true : false;
 
 			/* consume a bit */
 			if (bit) {
@@ -298,7 +298,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 				if (ones == 5 && state == DATA) {
 					/* we don't increase bit_offset, it is an inserted zero */
 				} else if (ones == 6 && state == DATA) { /* probably starting flag sequence */
-					buff = (guint8 *)wmem_memdup(pinfo->pool, data, data_len);
+					buff = (uint8_t *)wmem_memdup(pinfo->pool, data, data_len);
 					/* Allocate new tvb for the LAPD frame */
 					new_tvb = tvb_new_child_real_data(tvb, buff, data_len, data_len);
 					add_new_data_source(pinfo, new_tvb, "Decoded LAPD bitstream");
@@ -365,7 +365,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 		if (NULL == p_get_proto_data(wmem_file_scope(), pinfo, proto_lapd, 0)) {
 			/* Per packet information */
 			lapd_ppi = wmem_new(wmem_file_scope(), lapd_ppi_t);
-			lapd_ppi->has_crc = TRUE;
+			lapd_ppi->has_crc = true;
 			if (prev_byte_state)
 				fill_lapd_byte_state(&lapd_ppi->start_byte_state, prev_byte_state->state,
 						prev_byte_state->full_byte, prev_byte_state->bit_offset,
@@ -410,7 +410,7 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 static int
 dissect_linux_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	guint32 flags = LAPD_HAS_LINUX_SLL | LAPD_HAS_DIRECTION;
+	uint32_t flags = LAPD_HAS_LINUX_SLL | LAPD_HAS_DIRECTION;
 
 	/* frame is captured via libpcap */
 	if (pinfo->pseudo_header->lapd.pkttype == 4 /*PACKET_OUTGOING*/) {
@@ -466,7 +466,7 @@ static int
 dissect_lapd_phdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
 	struct isdn_phdr *isdn = (struct isdn_phdr *)data;
-	guint32 flags = LAPD_HAS_DIRECTION;
+	uint32_t flags = LAPD_HAS_DIRECTION;
 
 	if (isdn->uton)
 		flags |= LAPD_USER_TO_NETWORK;
@@ -480,8 +480,8 @@ dissect_lapd_phdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
 static int
 dissect_lapd_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	guint32 flags;
-	guint32 lapd_flags = 0;
+	uint32_t flags;
+	uint32_t lapd_flags = 0;
 
 	/*
 	 * If we have direction flags, we have a direction;
@@ -517,14 +517,14 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 }
 
 static void
-dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 flags)
+dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t flags)
 {
 	proto_tree	*lapd_tree, *addr_tree;
 	proto_item	*lapd_ti, *addr_ti;
-	guint16		control;
+	uint16_t		control;
 	int		lapd_header_len, checksum_offset;
-	guint16		addr, cr, sapi, tei;
-	gboolean	is_response = 0;
+	uint16_t		addr, cr, sapi, tei;
+	bool	is_response = 0;
 	tvbuff_t	*next_tvb;
 	const char	*srcname = "?";
 	const char	*dstname = "?";
@@ -544,7 +544,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 f
 
 	if (flags & LAPD_HAS_DIRECTION) {
 		if (flags & LAPD_USER_TO_NETWORK) {
-			is_response = cr ? TRUE : FALSE;
+			is_response = cr ? true : false;
 			if (flags & LAPD_HAS_LINUX_SLL) {
 				srcname = (flags & LAPD_USER_IS_REMOTE) ?
 				    "Remote User" : "Local User";
@@ -555,7 +555,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 f
 				dstname = "Network";
 			}
 		} else {
-			is_response = cr ? FALSE : TRUE;
+			is_response = cr ? false : true;
 			if (flags & LAPD_HAS_LINUX_SLL) {
 				srcname = (flags & LAPD_NETWORK_IS_REMOTE) ?
 				    "Remote Network" : "Local Network";
@@ -610,8 +610,8 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 f
 
 	control = dissect_xdlc_control(tvb, 2, pinfo, lapd_tree, hf_lapd_control,
 	    ett_lapd_control, &lapd_cf_items, &lapd_cf_items_ext, NULL, NULL,
-	    is_response, TRUE, FALSE);
-	lapd_header_len += XDLC_CONTROL_LEN(control, TRUE);
+	    is_response, true, false);
+	lapd_header_len += XDLC_CONTROL_LEN(control, true);
 
 	if (tree)
 		proto_item_set_len(lapd_ti, lapd_header_len);
@@ -745,7 +745,7 @@ proto_register_lapd(void)
 		  { "Checksum Status", "lapd.checksum.status", FT_UINT8, BASE_NONE,
 		    VALS(proto_checksum_vals), 0x0, NULL, HFILL }},
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lapd,
 		&ett_lapd_address,
 		&ett_lapd_control,
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index eb38e97b5a..0ebf557df1 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -88,12 +88,12 @@ static int hf_lapdm_fragment_count;
 static int hf_lapdm_reassembled_in;
 static int hf_lapdm_reassembled_length;
 
-static gint ett_lapdm;
-static gint ett_lapdm_address;
-static gint ett_lapdm_control;
-static gint ett_lapdm_length;
-static gint ett_lapdm_fragment;
-static gint ett_lapdm_fragments;
+static int ett_lapdm;
+static int ett_lapdm_address;
+static int ett_lapdm_control;
+static int ett_lapdm_length;
+static int ett_lapdm_fragment;
+static int ett_lapdm_fragments;
 
 static reassembly_table lapdm_reassembly_table;
 
@@ -194,14 +194,14 @@ static const fragment_items lapdm_frag_items = {
     "fragments"
 };
 
-static gboolean hdr_has_length(enum lapdm_hdr_type hdr_type)
+static bool hdr_has_length(enum lapdm_hdr_type hdr_type)
 {
     switch (hdr_type) {
     case LAPDM_HDR_FMT_A:
     case LAPDM_HDR_FMT_B:
-        return TRUE;
+        return true;
     default:
-        return FALSE;
+        return false;
     }
 }
 
@@ -211,14 +211,14 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
     proto_tree *lapdm_tree, *addr_tree, *length_tree;
     proto_item *lapdm_ti, *addr_ti, *length_ti;
-    guint8 addr, length, header_len, cr, sapi, len, n_s;
+    uint8_t addr, length, header_len, cr, sapi, len, n_s;
     int control;
-    gboolean m;
+    bool m;
     tvbuff_t *payload;
     int available_length;
-    gboolean is_response = FALSE;
+    bool is_response = false;
     enum lapdm_hdr_type hdr_type = LAPDM_HDR_FMT_B;
-    gboolean is_acch = FALSE, is_ui_frame = FALSE;
+    bool is_acch = false, is_ui_frame = false;
 
     if (data) {
         lapdm_data_t *ld = (lapdm_data_t *) data;
@@ -229,7 +229,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     if (tvb_captured_length(tvb) < LAPDM_HEADER_LEN_B4)
         return 0;
 
-    control = tvb_get_guint8(tvb, 1);
+    control = tvb_get_uint8(tvb, 1);
     is_ui_frame = (control & XDLC_S_U_MASK) == XDLC_U && (control & XDLC_U_MODIFIER_MASK) == XDLC_UI;
 
     /* only downlink UI SACCH frames use B4 header format */
@@ -244,19 +244,19 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
         if (tvb_captured_length(tvb) < header_len)
             return 0;
 
-        length = tvb_get_guint8(tvb, 2);
+        length = tvb_get_uint8(tvb, 2);
     }
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPDm");
 
-    addr = tvb_get_guint8(tvb, 0);
+    addr = tvb_get_uint8(tvb, 0);
 
     cr = addr & LAPDM_CR;
     if (pinfo->p2p_dir == P2P_DIR_RECV) {
-        is_response = cr ? FALSE : TRUE;
+        is_response = cr ? false : true;
     }
     else if (pinfo->p2p_dir == P2P_DIR_SENT) {
-        is_response = cr ? TRUE : FALSE;
+        is_response = cr ? true : false;
     }
 
     if (tree) {
@@ -278,7 +278,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
     control = dissect_xdlc_control(tvb, 1, pinfo, lapdm_tree, hf_lapdm_control,
                                    ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesn't support extended */, NULL, NULL,
-                                   is_response, FALSE, FALSE);
+                                   is_response, false, false);
 
     /* dissect length field (if present) */
     if (tree && hdr_has_length(hdr_type)) {
@@ -316,8 +316,8 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     {
         fragment_head *fd_m = NULL;
         tvbuff_t *reassembled = NULL;
-        guint32 fragment_id;
-        gboolean save_fragmented = pinfo->fragmented, add_frag;
+        uint32_t fragment_id;
+        bool save_fragmented = pinfo->fragmented, add_frag;
 
         pinfo->fragmented = m;
 
@@ -327,15 +327,15 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
         if (!PINFO_FD_VISITED(pinfo)) {
             /* Check if new N(S) is equal to previous N(S) (to avoid adding retransmissions in reassembly table)
                As GUINT_TO_POINTER macro does not allow to differentiate NULL from 0, use 1-8 range instead of 0-7 */
-            guint *p_last_n_s = (guint*)wmem_map_lookup(lapdm_last_n_s_map, GUINT_TO_POINTER(fragment_id));
-            if (GPOINTER_TO_UINT(p_last_n_s) == (guint)(n_s+1)) {
-                add_frag = FALSE;
+            unsigned *p_last_n_s = (unsigned*)wmem_map_lookup(lapdm_last_n_s_map, GUINT_TO_POINTER(fragment_id));
+            if (GPOINTER_TO_UINT(p_last_n_s) == (unsigned)(n_s+1)) {
+                add_frag = false;
             } else {
-                add_frag = TRUE;
+                add_frag = true;
                 wmem_map_insert(lapdm_last_n_s_map, GUINT_TO_POINTER(fragment_id), GUINT_TO_POINTER(n_s+1));
             }
         } else {
-            add_frag = TRUE;
+            add_frag = true;
         }
 
         if (add_frag) {
@@ -345,10 +345,10 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
             */
             fd_m = fragment_add_seq_next (&lapdm_reassembly_table, payload, 0,
                                         pinfo,
-                                        fragment_id, /* guint32 ID for fragments belonging together */
+                                        fragment_id, /* uint32_t ID for fragments belonging together */
                                         NULL,
-                                        /*n_s guint32 fragment sequence number */
-                                        len, /* guint32 fragment length */
+                                        /*n_s uint32_t fragment sequence number */
+                                        len, /* uint32_t fragment length */
                                         m); /* More fragments? */
 
             reassembled = process_reassembled_data(payload, 0, pinfo,
@@ -387,7 +387,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     {
         if (!PINFO_FD_VISITED(pinfo) && ((control & XDLC_S_U_MASK) == XDLC_U) && ((control & XDLC_U_MODIFIER_MASK) == XDLC_SABM)) {
             /* SABM frame; reset the last N(S) to an invalid value */
-            guint32 fragment_id = (conversation_get_id_from_elements(pinfo, CONVERSATION_GSMTAP, USE_LAST_ENDPOINT) << 4) | (sapi << 1) | pinfo->p2p_dir;
+            uint32_t fragment_id = (conversation_get_id_from_elements(pinfo, CONVERSATION_GSMTAP, USE_LAST_ENDPOINT) << 4) | (sapi << 1) | pinfo->p2p_dir;
             wmem_map_insert(lapdm_last_n_s_map, GUINT_TO_POINTER(fragment_id), GUINT_TO_POINTER(0));
         }
 
@@ -529,7 +529,7 @@ proto_register_lapdm(void)
             NULL, 0x00, "The total length of the reassembled payload", HFILL }}
 
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lapdm,
         &ett_lapdm_address,
         &ett_lapdm_control,
diff --git a/epan/dissectors/packet-lapdm.h b/epan/dissectors/packet-lapdm.h
index 17d920ef34..42c6d77ecf 100644
--- a/epan/dissectors/packet-lapdm.h
+++ b/epan/dissectors/packet-lapdm.h
@@ -10,6 +10,7 @@
 #ifndef __PACKET_LAPDM_H__
 #define __PACKET_LAPDM_H__
 
+#include <stdbool.h>
 #include <glib.h>
 
 /* See GSM TS 04.06 */
@@ -22,7 +23,7 @@ enum lapdm_hdr_type {
 };
 
 typedef struct _lapdm_data_t {
-    gboolean is_acch;
+    bool is_acch;
 } lapdm_data_t;
 
 #endif
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 4cc3f5d558..3a5002b17b 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -34,7 +34,7 @@ static int hf_laplink_tcp_length;
 static int hf_laplink_tcp_data;
 
 /* Initialize the subtree pointers */
-static gint ett_laplink;
+static int ett_laplink;
 
 static const value_string laplink_udp_magic[] = {
 	{ 0x0f010000, "Name Solicitation" },
@@ -60,14 +60,14 @@ static const value_string laplink_tcp_magic[] = {
 static bool laplink_desegment = true;
 
 /* Code to actually dissect the packets - UDP */
-static gint
+static int
 dissect_laplink_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
 	int offset = 0;
 	proto_item *ti;
 	proto_tree *laplink_tree;
-	guint32 udp_ident;
-	const gchar *udp_ident_string;
+	uint32_t udp_ident;
+	const char *udp_ident_string;
 
 	/*
 	 * Make sure the identifier is reasonable.
@@ -104,7 +104,7 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
 	int length = 0;
 	proto_item *ti;
 	proto_tree *laplink_tree;
-	guint32 tcp_ident;
+	uint32_t tcp_ident;
 
 /* Make entries in Protocol column and Info column on summary display */
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Laplink");
@@ -136,10 +136,10 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
 /* If this protocol has a sub-dissector call it here, see section 1.8 */
 }
 
-static guint
+static unsigned
 get_laplink_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-	guint plen;
+	unsigned plen;
 	/*
 	 * The length doesn't include the length or ident fields; add those in.
 	 */
@@ -193,7 +193,7 @@ proto_register_laplink(void)
 	};
 
 /* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_laplink,
 	};
 
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c
index 9809b8f8d3..0e6161f5c2 100644
--- a/epan/dissectors/packet-lapsat.c
+++ b/epan/dissectors/packet-lapsat.c
@@ -33,11 +33,11 @@ static reassembly_table lapsat_reassembly_table;
 
 static dissector_table_t lapsat_sapi_dissector_table;
 
-static gint ett_lapsat;
-static gint ett_lapsat_address;
-static gint ett_lapsat_control;
-static gint ett_lapsat_fragment;
-static gint ett_lapsat_fragments;
+static int ett_lapsat;
+static int ett_lapsat_address;
+static int ett_lapsat_control;
+static int ett_lapsat_fragment;
+static int ett_lapsat_fragments;
 
 static int hf_lapsat_addr;
 static int hf_lapsat_addr_sst;
@@ -232,12 +232,12 @@ static const fragment_items lapsat_frag_items = {
  * Main dissection functions
  */
 
-static guint16
+static uint16_t
 dissect_control(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int is_response)
 {
 	proto_tree *ctl_tree;
 	proto_item *ctl_ti;
-	guint16 ctl, poll_final;
+	uint16_t ctl, poll_final;
 	const char *frame_type;
 	char *info;
 
@@ -323,7 +323,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int is_
 	/* Create item & subtree */
 	ctl_ti = proto_tree_add_uint_format_value(
 			tree, hf_lapsat_ctl,
-			tvb, 1, 2, (guint32)ctl,
+			tvb, 1, 2, (uint32_t)ctl,
 			"%s (0x%03x)", info, ctl
 	);
 
@@ -407,8 +407,8 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissec
 	proto_tree *lapsat_tree, *addr_tree;
 	proto_item *lapsat_ti, *addr_ti;
 	tvbuff_t *payload;
-	guint8 addr, sapi, cr;
-	guint16 control;
+	uint8_t addr, sapi, cr;
+	uint16_t control;
 	unsigned int hlen, is_response = 0, plen;
 
 	/* Check that there's enough data */
@@ -419,16 +419,16 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissec
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPSat");
 
 	/* Grab a couple of fields */
-	addr = tvb_get_guint8(tvb, 0);
+	addr = tvb_get_uint8(tvb, 0);
 
 	sapi = (addr & LAPSAT_SAPI_MSK) >> LAPSAT_SAPI_SHIFT;
 
 	cr = addr & LAPSAT_CR;
 	if (pinfo->p2p_dir == P2P_DIR_RECV) {
-		is_response = cr ? FALSE : TRUE;
+		is_response = cr ? false : true;
 	}
 	else if (pinfo->p2p_dir == P2P_DIR_SENT) {
-		is_response = cr ? TRUE : FALSE;
+		is_response = cr ? true : false;
 	}
 
 	hlen = LAPSAT_HEADER_LEN;
@@ -468,15 +468,15 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissec
 
 	/* Get the payload */
 	plen = (addr & LAPSAT_LFI) ?
-		tvb_get_guint8(tvb, 3) : tvb_captured_length(tvb) - hlen;
+		tvb_get_uint8(tvb, 3) : tvb_captured_length(tvb) - hlen;
 
 	if (!plen)
 		return 3;	/* No point in doing more if there is no payload */
 
 	if ((plen + hlen) == tvb_captured_length(tvb)) {
 		/* Need to integrate the last nibble */
-		guint8 *data = (guint8 *)tvb_memdup(pinfo->pool, tvb, hlen, plen);
-		data[plen-1] |= tvb_get_guint8(tvb, 2) << 4;
+		uint8_t *data = (uint8_t *)tvb_memdup(pinfo->pool, tvb, hlen, plen);
+		data[plen-1] |= tvb_get_uint8(tvb, 2) << 4;
 		payload = tvb_new_child_real_data(tvb, data, plen, plen);
 	} else {
 		/* Last nibble doesn't need merging */
@@ -492,8 +492,8 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissec
 		 */
 		fragment_head *fd_m = NULL;
 		tvbuff_t *reassembled = NULL;
-		guint32 fragment_id;
-		gboolean save_fragmented = pinfo->fragmented;
+		uint32_t fragment_id;
+		bool save_fragmented = pinfo->fragmented;
 
 		/* Is this a fragment ? */
 		pinfo->fragmented = !!(addr & LAPSAT_SI);
@@ -715,7 +715,7 @@ proto_register_lapsat(void)
 		},
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lapsat,
 		&ett_lapsat_address,
 		&ett_lapsat_control,
diff --git a/epan/dissectors/packet-lat.c b/epan/dissectors/packet-lat.c
index 75d224f6bc..2d50decae0 100644
--- a/epan/dissectors/packet-lat.c
+++ b/epan/dissectors/packet-lat.c
@@ -275,14 +275,14 @@ static int hf_lat_service_name;
 static int hf_lat_service_description;
 static int hf_lat_unknown_command_data;
 
-static gint ett_lat;
-static gint ett_data_b_slot_control_flags;
-static gint ett_lat_attention_slot_control_flags;
-static gint ett_lat_command_modifier;
-static gint ett_lat_entry_status;
-static gint ett_lat_response_status;
-static gint ett_lat_src_node_status;
-static gint ett_lat_srvc_status;
+static int ett_lat;
+static int ett_data_b_slot_control_flags;
+static int ett_lat_attention_slot_control_flags;
+static int ett_lat_command_modifier;
+static int ett_lat_entry_status;
+static int ett_lat_response_status;
+static int ett_lat_src_node_status;
+static int ett_lat_srvc_status;
 
 static expert_field ei_slot_data_len_invalid;
 static expert_field ei_entry_length_too_short;
@@ -328,9 +328,9 @@ static void dissect_lat_response_information(tvbuff_t *tvb, int offset,
 static int dissect_lat_string(tvbuff_t *tvb, int offset, int hf,
     proto_tree *tree);
 
-static guint dissect_lat_header(tvbuff_t *tvb, int offset, proto_tree *tree);
+static unsigned dissect_lat_header(tvbuff_t *tvb, int offset, proto_tree *tree);
 
-static void dissect_lat_slots(tvbuff_t *tvb, int offset, guint nbr_slots,
+static void dissect_lat_slots(tvbuff_t *tvb, int offset, unsigned nbr_slots,
     proto_tree *tree, packet_info *pinfo);
 
 static int
@@ -339,12 +339,12 @@ dissect_lat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 	int offset = 0;
 	proto_item *ti;
 	proto_tree *lat_tree = NULL;
-	guint8 command;
+	uint8_t command;
 
 	col_add_str(pinfo->cinfo, COL_PROTOCOL, "LAT");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	command = tvb_get_guint8(tvb, offset) >> 2;
+	command = tvb_get_uint8(tvb, offset) >> 2;
 
 	col_add_str(pinfo->cinfo, COL_INFO,
 	    val_to_str(command, msg_typ_vals, "Unknown command (%u)"));
@@ -411,10 +411,10 @@ dissect_lat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 /*
  * Virtual circuit message header.
  */
-static guint
+static unsigned
 dissect_lat_header(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint32 nbr_slots;
+	uint32_t nbr_slots;
 
 	proto_tree_add_item_ret_uint(tree, hf_lat_nbr_slots, tvb, offset, 1,
 	    ENC_LITTLE_ENDIAN, &nbr_slots);
@@ -438,9 +438,9 @@ dissect_lat_header(tvbuff_t *tvb, int offset, proto_tree *tree)
 static void
 dissect_lat_start(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint8 timer;
-	guint32 param_code;
-	guint32 param_len;
+	uint8_t timer;
+	uint32_t param_code;
+	uint32_t param_len;
 
 	dissect_lat_header(tvb, offset, tree);
 	offset += 1 + 2 + 2 + 1 + 1;
@@ -454,7 +454,7 @@ dissect_lat_start(tvbuff_t *tvb, int offset, proto_tree *tree)
 	offset += 1;
 	proto_tree_add_item(tree, hf_lat_nbr_dl_bufs, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
-	timer = tvb_get_guint8(tvb, offset);
+	timer = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint_format_value(tree, hf_lat_server_circuit_timer, tvb,
 	    offset, 1, timer, "%u milliseconds", timer*10);
 	offset += 1;
@@ -485,7 +485,7 @@ static void
 dissect_lat_run(tvbuff_t *tvb, int offset, proto_tree *tree,
     packet_info *pinfo)
 {
-	guint8 nbr_slots;
+	uint8_t nbr_slots;
 
 	nbr_slots = dissect_lat_header(tvb, offset, tree);
 	offset += 1 + 2 + 2 + 1 + 1;
@@ -535,9 +535,9 @@ static const value_string reason_code_vals[] = {
 static int
 dissect_lat_channel_char(proto_tree *tree, int hf, tvbuff_t *tvb, int offset)
 {
-	guint8 character;
+	uint8_t character;
 
-	character = tvb_get_guint8(tvb, offset);
+	character = tvb_get_uint8(tvb, offset);
 	if (g_ascii_isprint(character)) {
 		proto_tree_add_uint_format_value(tree, hf, tvb, offset, 1,
 		    character, "'%c'", character);
@@ -580,11 +580,11 @@ static const value_string start_slot_class_1_param_code_vals[] = {
 
 static int
 dissect_lat_terminal_parameters(tvbuff_t *tvb, int offset,
-    guint32 slot_byte_count, proto_item *length_ti, proto_tree *tree,
+    uint32_t slot_byte_count, proto_item *length_ti, proto_tree *tree,
     packet_info *pinfo)
 {
-	guint32 param_code;
-	guint32 param_len;
+	uint32_t param_code;
+	uint32_t param_len;
 	int length_dissected = 0;
 
 	for (;;) {
@@ -619,20 +619,20 @@ end_slot:
 }
 
 static void
-dissect_lat_slots(tvbuff_t *tvb, int offset, guint nbr_slots, proto_tree *tree,
+dissect_lat_slots(tvbuff_t *tvb, int offset, unsigned nbr_slots, proto_tree *tree,
     packet_info *pinfo)
 {
-	guint i;
+	unsigned i;
 	proto_item *length_ti;
-	guint32 slot_byte_count;
-	guint32 slot_type_byte;
+	uint32_t slot_byte_count;
+	uint32_t slot_type_byte;
 	int slot_padding;
-	guint32 start_slot_service_class;
-	guint32 name_len;
+	uint32_t start_slot_service_class;
+	uint32_t name_len;
 	int length_dissected;
-	guint32 param_code;
-	guint32 param_len;
-	guint32 mbz;
+	uint32_t param_code;
+	uint32_t param_len;
+	uint32_t mbz;
 	proto_item *mbz_ti;
 
 	for (i = 0; i < nbr_slots; i++) {
@@ -649,7 +649,7 @@ dissect_lat_slots(tvbuff_t *tvb, int offset, guint nbr_slots, proto_tree *tree,
 		offset += 1;
 		slot_padding = slot_byte_count & 1;
 
-		slot_type_byte = tvb_get_guint8(tvb, offset);
+		slot_type_byte = tvb_get_uint8(tvb, offset);
 		switch (slot_type_byte >> 4) {
 
 		case START_SLOT:
@@ -679,7 +679,7 @@ dissect_lat_slots(tvbuff_t *tvb, int offset, guint nbr_slots, proto_tree *tree,
 			slot_byte_count -= 1;
 
 			CHECK_SLOT_DATA_BOUNDS(1);
-			name_len = tvb_get_guint8(tvb, offset);
+			name_len = tvb_get_uint8(tvb, offset);
 			CHECK_SLOT_DATA_BOUNDS(1 + name_len);
 			proto_tree_add_item(tree, hf_lat_start_slot_obj_srvc,
 			    tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
@@ -687,7 +687,7 @@ dissect_lat_slots(tvbuff_t *tvb, int offset, guint nbr_slots, proto_tree *tree,
 			slot_byte_count -= 1 + name_len;
 
 			CHECK_SLOT_DATA_BOUNDS(1);
-			name_len = tvb_get_guint8(tvb, offset);
+			name_len = tvb_get_uint8(tvb, offset);
 			CHECK_SLOT_DATA_BOUNDS(1 + name_len);
 			proto_tree_add_item(tree, hf_lat_start_slot_subj_dscr,
 			    tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
@@ -911,13 +911,13 @@ static const value_string node_status_vals[] = {
 static void
 dissect_lat_service_announcement(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint8 timer;
-	guint32 node_group_len;
-	guint32 service_name_count;
-	guint32 node_service_len;
-	guint i;
+	uint8_t timer;
+	uint32_t node_group_len;
+	uint32_t service_name_count;
+	uint32_t node_service_len;
+	unsigned i;
 
-	timer = tvb_get_guint8(tvb, offset);
+	timer = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint_format_value(tree, hf_lat_server_circuit_timer, tvb,
 	    offset, 1, timer, "%u milliseconds", timer*10);
 	offset += 1;
@@ -943,7 +943,7 @@ dissect_lat_service_announcement(tvbuff_t *tvb, int offset, proto_tree *tree)
 	proto_tree_add_item(tree, hf_lat_data_link_rcv_frame_size, tvb, offset, 2, ENC_LITTLE_ENDIAN);
 	offset += 2;
 
-	timer = tvb_get_guint8(tvb, offset);
+	timer = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint_format(tree, hf_lat_node_multicast_timer, tvb,
 	    offset, 1, timer, "Multicast timer: %u seconds", timer);
 	offset += 1;
@@ -990,9 +990,9 @@ dissect_lat_service_announcement(tvbuff_t *tvb, int offset, proto_tree *tree)
 static void
 dissect_lat_command(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint32 subj_group_len;
-	guint32 param_code;
-	guint32 param_len;
+	uint32_t subj_group_len;
+	uint32_t param_code;
+	uint32_t param_len;
 
 	proto_tree_add_item(tree, hf_lat_prtcl_format, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
@@ -1062,9 +1062,9 @@ static void
 dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
     packet_info *pinfo)
 {
-	guint32 entries_counter;
-	guint32 subj_node_name_len;
-	guint i;
+	uint32_t entries_counter;
+	uint32_t subj_node_name_len;
+	unsigned i;
 
 	proto_tree_add_item(tree, hf_lat_prtcl_format, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
@@ -1104,12 +1104,12 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 
 	for (i = 0; i < entries_counter; i++) {
 		proto_item *entry_length_ti;
-		guint32 entry_length;
-		guint entry_padding;
-		guint64 entry_status;
+		uint32_t entry_length;
+		unsigned entry_padding;
+		uint64_t entry_status;
 		proto_item *mbz_ti;
-		guint32 mbz;
-		guint name_len;
+		uint32_t mbz;
+		unsigned name_len;
 
 		entry_length_ti = proto_tree_add_item_ret_uint(tree, hf_lat_entry_length, tvb, offset, 1,
 		    ENC_LITTLE_ENDIAN, &entry_length);
@@ -1200,7 +1200,7 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			goto end_entry;
 		}
-		name_len = tvb_get_guint8(tvb, offset);
+		name_len = tvb_get_uint8(tvb, offset);
 		if (entry_length < 1 + name_len) {
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			offset += entry_length;
@@ -1215,7 +1215,7 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			goto end_entry;
 		}
-		name_len = tvb_get_guint8(tvb, offset);
+		name_len = tvb_get_uint8(tvb, offset);
 		if (entry_length < 1 + name_len) {
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			offset += entry_length;
@@ -1230,7 +1230,7 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			goto end_entry;
 		}
-		name_len = tvb_get_guint8(tvb, offset);
+		name_len = tvb_get_uint8(tvb, offset);
 		if (entry_length < 1 + name_len) {
 			expert_add_info(pinfo, entry_length_ti, &ei_entry_length_too_short);
 			offset += entry_length;
@@ -1246,8 +1246,8 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 		offset += entry_padding;
 	}
 	for (;;) {
-		guint32 param_code;
-		guint32 param_len;
+		uint32_t param_code;
+		uint32_t param_len;
 
 		proto_tree_add_item_ret_uint(tree, hf_lat_param_code, tvb, offset, 1, ENC_LITTLE_ENDIAN, &param_code);
 		offset += 1;
@@ -1263,7 +1263,7 @@ dissect_lat_status(tvbuff_t *tvb, int offset, proto_tree *tree,
 static void
 dissect_lat_solicit_information(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint32 src_node_group_len;
+	uint32_t src_node_group_len;
 
 	proto_tree_add_item(tree, hf_lat_prtcl_format, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
@@ -1304,8 +1304,8 @@ dissect_lat_solicit_information(tvbuff_t *tvb, int offset, proto_tree *tree)
 	offset = dissect_lat_string(tvb, offset, hf_lat_dst_srvc_name, tree);
 
 	for (;;) {
-		guint32 param_code;
-		guint32 param_len;
+		uint32_t param_code;
+		uint32_t param_len;
 
 		proto_tree_add_item_ret_uint(tree, hf_lat_param_code, tvb, offset, 1, ENC_LITTLE_ENDIAN, &param_code);
 		offset += 1;
@@ -1322,9 +1322,9 @@ static void
 dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
     packet_info *pinfo)
 {
-	guint32 srvc_count;
-	guint32 src_node_group_len;
-	guint i;
+	uint32_t srvc_count;
+	uint32_t src_node_group_len;
+	unsigned i;
 
 	proto_tree_add_item(tree, hf_lat_prtcl_format, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 	offset += 1;
@@ -1382,11 +1382,11 @@ dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
 
 	for (i = 0; i < srvc_count; i++) {
 		proto_item *srvc_entry_len_ti;
-		guint32 srvc_entry_len;
-		guint32 srvc_class_len;
-		guint j;
-		guint32 srvc_group_len;
-		guint string_len;
+		uint32_t srvc_entry_len;
+		uint32_t srvc_class_len;
+		unsigned j;
+		uint32_t srvc_group_len;
+		unsigned string_len;
 
 		srvc_entry_len_ti = proto_tree_add_item_ret_uint(tree, hf_lat_srvc_entry_len,
 		    tvb, offset, 1, ENC_LITTLE_ENDIAN, &srvc_entry_len);
@@ -1453,7 +1453,7 @@ dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
 			expert_add_info(pinfo, srvc_entry_len_ti, &ei_srvc_entry_len_too_short);
 			goto end_entry;
 		}
-		string_len = tvb_get_guint8(tvb, offset);
+		string_len = tvb_get_uint8(tvb, offset);
 		if (srvc_entry_len < 1 + string_len) {
 			expert_add_info(pinfo, srvc_entry_len_ti, &ei_srvc_entry_len_too_short);
 			offset += srvc_entry_len;
@@ -1468,7 +1468,7 @@ dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
 			expert_add_info(pinfo, srvc_entry_len_ti, &ei_srvc_entry_len_too_short);
 			goto end_entry;
 		}
-		string_len = tvb_get_guint8(tvb, offset);
+		string_len = tvb_get_uint8(tvb, offset);
 		if (srvc_entry_len < 1 + string_len) {
 			expert_add_info(pinfo, srvc_entry_len_ti, &ei_srvc_entry_len_too_short);
 			offset += srvc_entry_len;
@@ -1485,8 +1485,8 @@ dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
 	}
 
 	for (;;) {
-		guint32 param_code;
-		guint32 param_len;
+		uint32_t param_code;
+		uint32_t param_len;
 
 		proto_tree_add_item_ret_uint(tree, hf_lat_param_code, tvb, offset, 1, ENC_LITTLE_ENDIAN, &param_code);
 		offset += 1;
@@ -1502,7 +1502,7 @@ dissect_lat_response_information(tvbuff_t *tvb, int offset, proto_tree *tree,
 static int
 dissect_lat_string(tvbuff_t *tvb, int offset, int hf, proto_tree *tree)
 {
-	gint item_length;
+	int item_length;
 
 	proto_tree_add_item_ret_length(tree, hf, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN, &item_length);
 	return offset + item_length;
@@ -2066,7 +2066,7 @@ proto_register_lat(void)
 		{ "Unknown command data", "lat.unknown_command_data", FT_BYTES,
 		  BASE_NONE, NULL, 0x0, NULL, HFILL}},
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lat,
 		&ett_data_b_slot_control_flags,
 		&ett_lat_attention_slot_control_flags,
diff --git a/epan/dissectors/packet-lbm.c b/epan/dissectors/packet-lbm.c
index 2e7861b7b3..b12883e804 100644
--- a/epan/dissectors/packet-lbm.c
+++ b/epan/dissectors/packet-lbm.c
@@ -77,42 +77,42 @@ void proto_register_lbm(void)
   Special values are used as placeholders to indicate an as-yet-unknown transport or stream TCP channel.
 */
 
-static guint64 lbm_next_channel_value = 1;
+static uint64_t lbm_next_channel_value = 1;
 
-#define LBM_CHANNEL_TYPE_MASK G_GUINT64_CONSTANT(0x00000000000000ff)
-#define LBM_CHANNEL_VALUE_LIMIT_MASK G_GUINT64_CONSTANT(0x000ffffffffffffff)
-#define LBM_CHANNEL_MAX_VALUE G_GUINT64_CONSTANT(0x000ffffffffffffe)
+#define LBM_CHANNEL_TYPE_MASK UINT64_C(0x00000000000000ff)
+#define LBM_CHANNEL_VALUE_LIMIT_MASK UINT64_C(0x000ffffffffffffff)
+#define LBM_CHANNEL_MAX_VALUE UINT64_C(0x000ffffffffffffe)
 
-#define LBM_CHANNEL_VALUE_UNKNOWN G_GUINT64_CONSTANT(0xfffffffffffff000)
-#define LBM_CHANNEL_VALUE_UNKNOWN_SOURCE G_GUINT64_CONSTANT(0xfffffffffffff100)
-#define LBM_CHANNEL_VALUE_UNKNOWN_CLIENT G_GUINT64_CONSTANT(0xfffffffffffff200)
+#define LBM_CHANNEL_VALUE_UNKNOWN UINT64_C(0xfffffffffffff000)
+#define LBM_CHANNEL_VALUE_UNKNOWN_SOURCE UINT64_C(0xfffffffffffff100)
+#define LBM_CHANNEL_VALUE_UNKNOWN_CLIENT UINT64_C(0xfffffffffffff200)
 #define LBM_CHANNEL_UNKNOWN_TRANSPORT_SOURCE_LBTTCP (LBM_CHANNEL_VALUE_UNKNOWN_SOURCE | LBM_CHANNEL_TRANSPORT_LBTTCP)
 #define LBM_CHANNEL_UNKNOWN_TRANSPORT_CLIENT_LBTTCP (LBM_CHANNEL_VALUE_UNKNOWN_CLIENT | LBM_CHANNEL_TRANSPORT_LBTTCP)
 #define LBM_CHANNEL_UNKNOWN_STREAM_TCP (LBM_CHANNEL_VALUE_UNKNOWN | LBM_CHANNEL_STREAM_TCP)
 
-#define LBM_CHANNEL_TYPE(ch) ((guint8)(ch & LBM_CHANNEL_TYPE_MASK))
+#define LBM_CHANNEL_TYPE(ch) ((uint8_t)(ch & LBM_CHANNEL_TYPE_MASK))
 
 void lbm_channel_reset(void)
 {
     lbm_next_channel_value = 1;
 }
 
-guint64 lbm_channel_assign(guint8 channel_type)
+uint64_t lbm_channel_assign(uint8_t channel_type)
 {
-    guint64 ch;
-    guint64 ch_counter = lbm_next_channel_value++;
+    uint64_t ch;
+    uint64_t ch_counter = lbm_next_channel_value++;
 
     if (lbm_next_channel_value == LBM_CHANNEL_MAX_VALUE)
     {
         lbm_next_channel_value = 1;
     }
-    ch = ((guint64)((ch_counter & LBM_CHANNEL_VALUE_LIMIT_MASK) << LBM_CHANNEL_VALUE_SHIFT_COUNT)) | channel_type;
+    ch = ((uint64_t)((ch_counter & LBM_CHANNEL_VALUE_LIMIT_MASK) << LBM_CHANNEL_VALUE_SHIFT_COUNT)) | channel_type;
     return (ch);
 }
 
-gboolean lbm_channel_is_transport(guint64 channel)
+bool lbm_channel_is_transport(uint64_t channel)
 {
-    guint8 ch_type;
+    uint8_t ch_type;
 
     ch_type = LBM_CHANNEL_TYPE(channel);
     switch (ch_type)
@@ -123,70 +123,70 @@ gboolean lbm_channel_is_transport(guint64 channel)
         case LBM_CHANNEL_TRANSPORT_LBTIPC:
         case LBM_CHANNEL_TRANSPORT_LBTRDMA:
         case LBM_CHANNEL_TRANSPORT_LBTSMX:
-            return TRUE;
+            return true;
             break;
         default:
             break;
     }
-    return FALSE;
+    return false;
 }
 
-guint8 lbm_channel_type(guint64 channel)
+uint8_t lbm_channel_type(uint64_t channel)
 {
-    guint8 ch_type;
+    uint8_t ch_type;
 
     ch_type = LBM_CHANNEL_TYPE(channel);
     return (ch_type);
 }
 
-guint64 lbm_channel_assign_unknown_transport_source_lbttcp(void)
+uint64_t lbm_channel_assign_unknown_transport_source_lbttcp(void)
 {
     return (LBM_CHANNEL_UNKNOWN_TRANSPORT_SOURCE_LBTTCP);
 }
 
-guint64 lbm_channel_assign_unknown_transport_client_lbttcp(void)
+uint64_t lbm_channel_assign_unknown_transport_client_lbttcp(void)
 {
     return (LBM_CHANNEL_UNKNOWN_TRANSPORT_CLIENT_LBTTCP);
 }
 
-guint64 lbm_channel_assign_unknown_stream_tcp(void)
+uint64_t lbm_channel_assign_unknown_stream_tcp(void)
 {
     return (LBM_CHANNEL_UNKNOWN_STREAM_TCP);
 }
 
-gboolean lbm_channel_is_unknown_transport_lbttcp(guint64 channel)
+bool lbm_channel_is_unknown_transport_lbttcp(uint64_t channel)
 {
     return (lbm_channel_is_unknown_transport_source_lbttcp(channel) || lbm_channel_is_unknown_transport_client_lbttcp(channel));
 }
 
-gboolean lbm_channel_is_unknown_transport_source_lbttcp(guint64 channel)
+bool lbm_channel_is_unknown_transport_source_lbttcp(uint64_t channel)
 {
     if (channel == LBM_CHANNEL_UNKNOWN_TRANSPORT_SOURCE_LBTTCP)
     {
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
-gboolean lbm_channel_is_unknown_transport_client_lbttcp(guint64 channel)
+bool lbm_channel_is_unknown_transport_client_lbttcp(uint64_t channel)
 {
     if (channel == LBM_CHANNEL_UNKNOWN_TRANSPORT_CLIENT_LBTTCP)
     {
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
-gboolean lbm_channel_is_unknown_stream_tcp(guint64 channel)
+bool lbm_channel_is_unknown_stream_tcp(uint64_t channel)
 {
     if (channel == LBM_CHANNEL_UNKNOWN_STREAM_TCP)
     {
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
-gboolean lbm_channel_is_known(guint64 channel)
+bool lbm_channel_is_known(uint64_t channel)
 {
     return (!lbm_channel_is_unknown_transport_lbttcp(channel) && !lbm_channel_is_unknown_stream_tcp(channel));
 }
@@ -194,7 +194,7 @@ gboolean lbm_channel_is_known(guint64 channel)
 /*----------------------------------------------------------------------------*/
 /* Frame/SQN interface.                                                       */
 /*----------------------------------------------------------------------------*/
-lbm_transport_frame_t * lbm_transport_frame_add(wmem_tree_t * list, guint8 type, guint32 frame, guint32 sqn, gboolean retransmission)
+lbm_transport_frame_t * lbm_transport_frame_add(wmem_tree_t * list, uint8_t type, uint32_t frame, uint32_t sqn, bool retransmission)
 {
     lbm_transport_frame_t * frame_entry = NULL;
 
@@ -215,7 +215,7 @@ lbm_transport_frame_t * lbm_transport_frame_add(wmem_tree_t * list, guint8 type,
     frame_entry->retransmission = retransmission;
     frame_entry->sqn_gap = 0;
     frame_entry->ooo_gap = 0;
-    frame_entry->duplicate = FALSE;
+    frame_entry->duplicate = false;
     wmem_tree_insert32(list, frame, (void *) frame_entry);
     return (frame_entry);
 }
@@ -259,8 +259,8 @@ typedef struct lbm_topic_t_stct lbm_topic_t;
 
 typedef struct
 {
-    guint64 channel;
-    guint32 topic_idx;
+    uint64_t channel;
+    uint32_t topic_idx;
     lbm_topic_t * topic;
 } lbm_topic_key_t;
 
@@ -275,10 +275,10 @@ void lbm_topic_init(void)
     lbm_topic_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
 
-static void lbm_topic_build_key(guint32 * key_value, wmem_tree_key_t * key, guint64 channel, guint32 topic_index)
+static void lbm_topic_build_key(uint32_t * key_value, wmem_tree_key_t * key, uint64_t channel, uint32_t topic_index)
 {
-    key_value[LBM_TOPIC_KEY_ELEMENT_CHANNEL_HIGH] = (guint32) ((channel >> 32) & 0xffffffff);
-    key_value[LBM_TOPIC_KEY_ELEMENT_CHANNEL_LOW] = (guint32) (channel & 0xffffffff);
+    key_value[LBM_TOPIC_KEY_ELEMENT_CHANNEL_HIGH] = (uint32_t) ((channel >> 32) & 0xffffffff);
+    key_value[LBM_TOPIC_KEY_ELEMENT_CHANNEL_LOW] = (uint32_t) (channel & 0xffffffff);
     key_value[LBM_TOPIC_KEY_ELEMENT_TOPIC_INDEX] = topic_index;
     key[0].length = LBM_TOPIC_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
@@ -286,10 +286,10 @@ static void lbm_topic_build_key(guint32 * key_value, wmem_tree_key_t * key, guin
     key[1].key = NULL;
 }
 
-static lbm_topic_t * lbm_topic_locate(guint64 channel, guint32 topic_index)
+static lbm_topic_t * lbm_topic_locate(uint64_t channel, uint32_t topic_index)
 {
     lbm_topic_t * entry = NULL;
-    guint32 keyval[LBM_TOPIC_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_TOPIC_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     lbm_topic_build_key(keyval, tkey, channel, topic_index);
@@ -297,7 +297,7 @@ static lbm_topic_t * lbm_topic_locate(guint64 channel, guint32 topic_index)
     return (entry);
 }
 
-const char * lbm_topic_find(guint64 channel, guint32 topic_index)
+const char * lbm_topic_find(uint64_t channel, uint32_t topic_index)
 {
     lbm_topic_t * entry = NULL;
     const char * topic = NULL;
@@ -310,10 +310,10 @@ const char * lbm_topic_find(guint64 channel, guint32 topic_index)
     return (topic);
 }
 
-void lbm_topic_add(guint64 channel, guint32 topic_index, const char * name)
+void lbm_topic_add(uint64_t channel, uint32_t topic_index, const char * name)
 {
     lbm_topic_t * entry;
-    guint32 keyval[LBM_TOPIC_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_TOPIC_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbm_topic_locate(channel, topic_index);
diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h
index 31b337d001..a2a995386c 100644
--- a/epan/dissectors/packet-lbm.h
+++ b/epan/dissectors/packet-lbm.h
@@ -90,12 +90,12 @@
 #include <winsock2.h>
 #endif
 
-typedef guint8 lbm_uint8_t;
-typedef guint16 lbm_uint16_t;
-typedef guint32 lbm_uint32_t;
-typedef guint64 lbm_uint64_t;
-#define SIZEOF(TYPE, MEMBER) (gint)(sizeof(((TYPE *)0)->MEMBER))
-#define OFFSETOF(TYPE, MEMBER) (gint)(offsetof(TYPE, MEMBER))
+typedef uint8_t lbm_uint8_t;
+typedef uint16_t lbm_uint16_t;
+typedef uint32_t lbm_uint32_t;
+typedef uint64_t lbm_uint64_t;
+#define SIZEOF(TYPE, MEMBER) (int)(sizeof(((TYPE *)0)->MEMBER))
+#define OFFSETOF(TYPE, MEMBER) (int)(offsetof(TYPE, MEMBER))
 #define STRINGIZE(a) #a
 #define MAKESTRING(a) STRINGIZE(a)
 #define LBM_OTID_BLOCK_SZ 32
@@ -106,17 +106,17 @@ typedef guint64 lbm_uint64_t;
 #define UAT_IPV4_CB_DEF(basename,field_name,rec_t) \
     static bool basename ## _ ## field_name ## _chk_cb(void * u1 _U_, const char * strptr, unsigned len _U_, const void * u2 _U_, const void * u3 _U_, char ** err) \
     { \
-        guint32 addr; \
+        uint32_t addr; \
         if (!ws_inet_pton4(strptr, &addr)) \
         { \
             *err = g_strdup("invalid address"); \
-            return FALSE; \
+            return false; \
         } \
-        return TRUE; \
+        return true; \
     } \
     static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, const void* u1 _U_, const void* u2 _U_) \
     { \
-        guint32 addr; \
+        uint32_t addr; \
         char* new_buf = g_strndup(buf,len); \
         g_free((((rec_t*)rec)->field_name)); \
         (((rec_t*)rec)->field_name) = new_buf; \
@@ -144,22 +144,22 @@ typedef guint64 lbm_uint64_t;
 #define UAT_IPV4_MC_CB_DEF(basename,field_name,rec_t) \
     static bool basename ## _ ## field_name ## _chk_cb(void * u1 _U_, const char * strptr, unsigned len _U_, const void * u2 _U_, const void * u3 _U_, char ** err) \
     { \
-        guint32 addr; \
+        uint32_t addr; \
         if (!ws_inet_pton4(strptr, &addr)) \
         { \
             *err = g_strdup("invalid address"); \
-            return FALSE; \
+            return false; \
         } \
         if (!IN_MULTICAST(g_ntohl(addr)) && (g_ntohl(addr) != 0)) \
         { \
             *err = g_strdup("invalid multicast address"); \
-            return FALSE; \
+            return false; \
         } \
-        return TRUE; \
+        return true; \
     } \
     static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, const void* u1 _U_, const void* u2 _U_) \
     { \
-        guint32 addr; \
+        uint32_t addr; \
         char* new_buf = g_strndup(buf,len); \
         g_free((((rec_t*)rec)->field_name)); \
         (((rec_t*)rec)->field_name) = new_buf; \
@@ -185,14 +185,14 @@ typedef guint64 lbm_uint64_t;
 
 typedef struct
 {
-    guint32 domain;
+    uint32_t domain;
     address addr;
-    guint16 port;
+    uint16_t port;
 } lbm_uim_stream_destination_t;
 
 typedef struct
 {
-    guint8 ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    uint8_t ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
 } lbm_uim_stream_ctxinst_t;
 
 typedef enum
@@ -213,59 +213,59 @@ typedef struct
 
 typedef struct
 {
-    guint64 channel;
-    guint32 substream_id;
-    guint32 bytes;
+    uint64_t channel;
+    uint32_t substream_id;
+    uint32_t bytes;
     lbm_uim_stream_endpoint_t endpoint_a;
     lbm_uim_stream_endpoint_t endpoint_b;
 } lbm_uim_stream_tap_info_t;
 
 typedef struct
 {
-    gchar * transport;
-    guint8 type;
-    gboolean retransmission;
-    guint32 sqn;
-    guint8 ncf_reason;
-    guint16 num_sqns;
-    guint32 * sqns;
+    char * transport;
+    uint8_t type;
+    bool retransmission;
+    uint32_t sqn;
+    uint8_t ncf_reason;
+    uint16_t num_sqns;
+    uint32_t * sqns;
 } lbm_lbtrm_tap_info_t;
 
 typedef struct
 {
-    gchar * transport;
-    guint8 type;
-    gboolean retransmission;
-    guint32 sqn;
-    guint8 ncf_reason;
-    guint16 num_sqns;
-    guint16 creq_type;
-    guint16 rst_type;
-    guint32 * sqns;
+    char * transport;
+    uint8_t type;
+    bool retransmission;
+    uint32_t sqn;
+    uint8_t ncf_reason;
+    uint16_t num_sqns;
+    uint16_t creq_type;
+    uint16_t rst_type;
+    uint32_t * sqns;
 } lbm_lbtru_tap_info_t;
 
 typedef struct
 {
-    guint16 size;
-    guint8 topic_length;
-    guint8 source_length;
-    guint32 topic_index;
+    uint16_t size;
+    uint8_t topic_length;
+    uint8_t source_length;
+    uint32_t topic_index;
     char topic[256];
     char source[256];
 } lbm_lbmr_topic_advertisement_tap_info_t;
 
 typedef struct
 {
-    guint16 size;
-    guint8 topic_length;
+    uint16_t size;
+    uint8_t topic_length;
     char topic[256];
 } lbm_lbmr_topic_query_tap_info_t;
 
 typedef struct
 {
-    guint16 size;
-    guint8 type;
-    guint8 pattern_length;
+    uint16_t size;
+    uint8_t type;
+    uint8_t pattern_length;
     char pattern[256];
 } lbm_lbmr_pattern_query_tap_info_t;
 
@@ -274,18 +274,18 @@ typedef struct
 
 typedef struct
 {
-    guint16 size;
-    guint16 port;
-    guint8 queue_length;
-    guint8 topic_length;
+    uint16_t size;
+    uint16_t port;
+    uint8_t queue_length;
+    uint8_t topic_length;
     char queue[256];
     char topic[256];
 } lbm_lbmr_queue_advertisement_tap_info_t;
 
 typedef struct
 {
-    guint16 size;
-    guint8 queue_length;
+    uint16_t size;
+    uint8_t queue_length;
     char queue[256];
 } lbm_lbmr_queue_query_tap_info_t;
 
@@ -327,12 +327,12 @@ typedef struct
 /* LBT-RU RST reasons */
 #define LBTRU_RST_REASON_DEFAULT 0x0
 
-gboolean lbmc_test_lbmc_header(tvbuff_t * tvb, int offset);
-int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, guint64 channel);
+bool lbmc_test_lbmc_header(tvbuff_t * tvb, int offset);
+int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, uint64_t channel);
 int lbmc_get_minimum_length(void);
-guint16 lbmc_get_message_length(tvbuff_t * tvb, int offset);
-gboolean lbmpdm_verify_payload(tvbuff_t * tvb, int offset, int * encoding, int * length);
-int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint64 channel);
+uint16_t lbmc_get_message_length(tvbuff_t * tvb, int offset);
+bool lbmpdm_verify_payload(tvbuff_t * tvb, int offset, int * encoding, int * length);
+int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint64_t channel);
 int lbmpdm_get_minimum_length(void);
 int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 
@@ -343,7 +343,7 @@ extern const value_string lbm_wildcard_pattern_type_short[];
 /*----------------------------------------------------------------------------*/
 /* Channel interface.                                                         */
 /*----------------------------------------------------------------------------*/
-#define LBM_CHANNEL_NO_CHANNEL (~((guint64) 0))
+#define LBM_CHANNEL_NO_CHANNEL (~((uint64_t) 0))
 
 #define LBM_CHANNEL_TRANSPORT_LBTTCP 0x00
 #define LBM_CHANNEL_TRANSPORT_LBTRU 0x01
@@ -354,21 +354,21 @@ extern const value_string lbm_wildcard_pattern_type_short[];
 #define LBM_CHANNEL_STREAM_TCP 0x10
 #define LBM_CHANNEL_TCP 0x20
 
-#define LBM_CHANNEL_VALUE_MASK G_GUINT64_CONSTANT(0xfffffffffffff000)
+#define LBM_CHANNEL_VALUE_MASK UINT64_C(0xfffffffffffff000)
 #define LBM_CHANNEL_VALUE_SHIFT_COUNT 12
 
 void lbm_channel_reset(void);
-guint64 lbm_channel_assign(guint8 channel_type);
-gboolean lbm_channel_is_transport(guint64 channel);
-guint8 lbm_channel_type(guint64 channel);
-guint64 lbm_channel_assign_unknown_transport_source_lbttcp(void);
-guint64 lbm_channel_assign_unknown_transport_client_lbttcp(void);
-guint64 lbm_channel_assign_unknown_stream_tcp(void);
-gboolean lbm_channel_is_unknown_transport_lbttcp(guint64 channel);
-gboolean lbm_channel_is_unknown_transport_source_lbttcp(guint64 channel);
-gboolean lbm_channel_is_unknown_transport_client_lbttcp(guint64 channel);
-gboolean lbm_channel_is_unknown_stream_tcp(guint64 channel);
-gboolean lbm_channel_is_known(guint64 channel);
+uint64_t lbm_channel_assign(uint8_t channel_type);
+bool lbm_channel_is_transport(uint64_t channel);
+uint8_t lbm_channel_type(uint64_t channel);
+uint64_t lbm_channel_assign_unknown_transport_source_lbttcp(void);
+uint64_t lbm_channel_assign_unknown_transport_client_lbttcp(void);
+uint64_t lbm_channel_assign_unknown_stream_tcp(void);
+bool lbm_channel_is_unknown_transport_lbttcp(uint64_t channel);
+bool lbm_channel_is_unknown_transport_source_lbttcp(uint64_t channel);
+bool lbm_channel_is_unknown_transport_client_lbttcp(uint64_t channel);
+bool lbm_channel_is_unknown_stream_tcp(uint64_t channel);
+bool lbm_channel_is_known(uint64_t channel);
 
 #define LBM_CHANNEL_ID(ch) ((ch & LBM_CHANNEL_VALUE_MASK) >> LBM_CHANNEL_VALUE_SHIFT_COUNT)
 
@@ -377,41 +377,41 @@ gboolean lbm_channel_is_known(guint64 channel);
 /*----------------------------------------------------------------------------*/
 typedef struct
 {
-    guint32 frame;
-    guint8 type;
-    guint32 sqn;
-    guint32 previous_frame;
-    guint32 previous_type_frame;
-    guint32 next_frame;
-    guint32 next_type_frame;
-    gboolean retransmission;
-    guint32 sqn_gap;
-    guint32 ooo_gap;
-    gboolean duplicate;
+    uint32_t frame;
+    uint8_t type;
+    uint32_t sqn;
+    uint32_t previous_frame;
+    uint32_t previous_type_frame;
+    uint32_t next_frame;
+    uint32_t next_type_frame;
+    bool retransmission;
+    uint32_t sqn_gap;
+    uint32_t ooo_gap;
+    bool duplicate;
 } lbm_transport_frame_t;
 
 typedef struct
 {
-    guint32 frame;
-    gboolean retransmission;
+    uint32_t frame;
+    bool retransmission;
 } lbm_transport_sqn_frame_t;
 
 typedef struct
 {
-    guint32 sqn;
-    guint32 frame_count;
+    uint32_t sqn;
+    uint32_t frame_count;
     wmem_tree_t * frame;  /* List of lbm_transport_sqn_frame_t */
 } lbm_transport_sqn_t;
 
-lbm_transport_frame_t * lbm_transport_frame_add(wmem_tree_t * list, guint8 type, guint32 frame, guint32 sqn, gboolean retransmission);
+lbm_transport_frame_t * lbm_transport_frame_add(wmem_tree_t * list, uint8_t type, uint32_t frame, uint32_t sqn, bool retransmission);
 lbm_transport_sqn_t * lbm_transport_sqn_add(wmem_tree_t * list, lbm_transport_frame_t * frame);
 
 /*----------------------------------------------------------------------------*/
 /* Topic interface.                                                           */
 /*----------------------------------------------------------------------------*/
 void lbm_topic_init(void);
-const char * lbm_topic_find(guint64 channel, guint32 topic_index);
-void lbm_topic_add(guint64 channel, guint32 topic_index, const char * name);
+const char * lbm_topic_find(uint64_t channel, uint32_t topic_index);
+void lbm_topic_add(uint64_t channel, uint32_t topic_index, const char * name);
 
 #endif
 
diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c
index b8b9fc5213..8158074c12 100644
--- a/epan/dissectors/packet-lbmc.c
+++ b/epan/dissectors/packet-lbmc.c
@@ -37,28 +37,28 @@ typedef struct lbm_istream_substream_entry_t_stct lbm_istream_substream_entry_t;
 struct lbm_istream_substream_entry_t_stct
 {
     address src_addr;
-    guint16 src_port;
+    uint16_t src_port;
     address dst_addr;
-    guint16 dst_port;
-    guint32 lbm_stream_id;
+    uint16_t dst_port;
+    uint32_t lbm_stream_id;
     lbm_istream_entry_t * parent;
-    guint32 substream_id;
-    guint32 first_frame;
-    guint32 last_frame;
-    guint32 messages;
-    guint32 bytes;
+    uint32_t substream_id;
+    uint32_t first_frame;
+    uint32_t last_frame;
+    uint32_t messages;
+    uint32_t bytes;
 };
 
 struct lbm_istream_entry_t_stct
 {
-    guint8 ctxinst_1[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
-    guint8 ctxinst_2[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
-    guint64 channel;
-    guint32 next_substream_id;
-    guint32 first_frame;
-    guint32 last_frame;
-    guint32 messages;
-    guint32 bytes;
+    uint8_t ctxinst_1[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    uint8_t ctxinst_2[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    uint64_t channel;
+    uint32_t next_substream_id;
+    uint32_t first_frame;
+    uint32_t last_frame;
+    uint32_t messages;
+    uint32_t bytes;
     wmem_tree_t * substream_list;
 };
 
@@ -71,32 +71,32 @@ typedef struct lbm_dstream_substream_entry_t_stct lbm_dstream_substream_entry_t;
 struct lbm_dstream_substream_entry_t_stct
 {
     address src_addr;
-    guint16 src_port;
+    uint16_t src_port;
     address dst_addr;
-    guint16 dst_port;
-    guint32 lbm_stream_id;
+    uint16_t dst_port;
+    uint32_t lbm_stream_id;
     lbm_dstream_entry_t * parent;
-    guint32 substream_id;
-    guint32 first_frame;
-    guint32 last_frame;
-    guint32 messages;
-    guint32 bytes;
+    uint32_t substream_id;
+    uint32_t first_frame;
+    uint32_t last_frame;
+    uint32_t messages;
+    uint32_t bytes;
 };
 
 struct lbm_dstream_entry_t_stct
 {
-    guint32 domain_1;
+    uint32_t domain_1;
     address addr_1;
-    guint32 domain_2;
+    uint32_t domain_2;
     address addr_2;
-    guint16 port_1;
-    guint16 port_2;
-    guint64 channel;
-    guint32 next_substream_id;
-    guint32 first_frame;
-    guint32 last_frame;
-    guint32 messages;
-    guint32 bytes;
+    uint16_t port_1;
+    uint16_t port_2;
+    uint64_t channel;
+    uint32_t next_substream_id;
+    uint32_t first_frame;
+    uint32_t last_frame;
+    uint32_t messages;
+    uint32_t bytes;
     wmem_tree_t * substream_list;
 };
 
@@ -140,21 +140,21 @@ static void lbm_stream_init(void)
     domain_stream_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
 
-static void lbm_istream_stream_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbm_istream_entry_t * stream)
+static void lbm_istream_stream_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbm_istream_entry_t * stream)
 {
-    guint32 val;
+    uint32_t val;
 
     /* Note: ctxinst_1 and ctxinst_2 are 8-byte blocks, not guaranteed to be aligned. So we memcpy them 4 bytes
        at a time to an intermediate variable, to prevent any alignment issues with assigning to a 32-bit unsigned int
        on certain platforms.
     */
-    memcpy((void *) &val, (const void *) stream->ctxinst_1, sizeof(guint32));
+    memcpy((void *) &val, (const void *) stream->ctxinst_1, sizeof(uint32_t));
     key_value[LBM_ISTREAM_STREAM_KEY_ELEMENT_CTXINST1_HIGH] = val;
-    memcpy((void *) &val, (const void *) (stream->ctxinst_1 + sizeof(guint32)), sizeof(guint32));
+    memcpy((void *) &val, (const void *) (stream->ctxinst_1 + sizeof(uint32_t)), sizeof(uint32_t));
     key_value[LBM_ISTREAM_STREAM_KEY_ELEMENT_CTXINST1_LOW] = val;
-    memcpy((void *) &val, (const void *) stream->ctxinst_2, sizeof(guint32));
+    memcpy((void *) &val, (const void *) stream->ctxinst_2, sizeof(uint32_t));
     key_value[LBM_ISTREAM_STREAM_KEY_ELEMENT_CTXINST2_HIGH] = val;
-    memcpy((void *) &val, (const void *) (stream->ctxinst_2 + sizeof(guint32)), sizeof(guint32));
+    memcpy((void *) &val, (const void *) (stream->ctxinst_2 + sizeof(uint32_t)), sizeof(uint32_t));
     key_value[LBM_ISTREAM_STREAM_KEY_ELEMENT_CTXINST2_LOW] = val;
     key[0].length = LBM_ISTREAM_STREAM_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
@@ -164,7 +164,7 @@ static void lbm_istream_stream_build_key(guint32 * key_value, wmem_tree_key_t *
 
 static void lbm_stream_order_istream_key(lbm_istream_entry_t * stream)
 {
-    guint8 ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    uint8_t ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
 
     if (memcmp((void *)stream->ctxinst_1, (void *)stream->ctxinst_2, LBM_CONTEXT_INSTANCE_BLOCK_SZ) > 0)
     {
@@ -174,11 +174,11 @@ static void lbm_stream_order_istream_key(lbm_istream_entry_t * stream)
     }
 }
 
-static lbm_istream_entry_t * lbm_stream_istream_find(const guint8 * instance1, const guint8 * instance2)
+static lbm_istream_entry_t * lbm_stream_istream_find(const uint8_t * instance1, const uint8_t * instance2)
 {
     lbm_istream_entry_t key;
     lbm_istream_entry_t * entry = NULL;
-    guint32 keyval[LBM_ISTREAM_STREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_ISTREAM_STREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     memset((void *)&key, 0, sizeof(lbm_istream_entry_t));
@@ -190,10 +190,10 @@ static lbm_istream_entry_t * lbm_stream_istream_find(const guint8 * instance1, c
     return (entry);
 }
 
-static lbm_istream_entry_t * lbm_stream_istream_add(const guint8 * instance1, const guint8 * instance2)
+static lbm_istream_entry_t * lbm_stream_istream_add(const uint8_t * instance1, const uint8_t * instance2)
 {
     lbm_istream_entry_t * entry;
-    guint32 keyval[LBM_ISTREAM_STREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_ISTREAM_STREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbm_stream_istream_find(instance1, instance2);
@@ -207,7 +207,7 @@ static lbm_istream_entry_t * lbm_stream_istream_add(const guint8 * instance1, co
     lbm_stream_order_istream_key(entry);
     entry->channel = lbm_channel_assign(LBM_CHANNEL_STREAM_TCP);
     entry->next_substream_id = 1;
-    entry->first_frame = ~((guint32)0);
+    entry->first_frame = ~((uint32_t)0);
     entry->last_frame = 0;
     entry->messages = 0;
     entry->bytes = 0;
@@ -217,21 +217,21 @@ static lbm_istream_entry_t * lbm_stream_istream_add(const guint8 * instance1, co
     return (entry);
 }
 
-static void lbm_istream_substream_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbm_istream_substream_entry_t * substream)
+static void lbm_istream_substream_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbm_istream_substream_entry_t * substream)
 {
-    guint32 val;
+    uint32_t val;
 
     /* Note: for the time being we only support IPv4 addresses (currently enforced in the dissectors), so
        assume it's an IPv4 address. memcpy to an intermediate value (don't know for sure the address.data field
        has any particular alignment) to prevent any alignment issues with assigning to a 32-bit unsigned int
        on certain platforms.
     */
-    memcpy((void *) &val, (const void *) substream->src_addr.data, sizeof(guint32));
+    memcpy((void *) &val, (const void *) substream->src_addr.data, sizeof(uint32_t));
     key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_SRC_ADDR] = val;
-    key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_SRC_PORT] = (guint32) substream->src_port;
-    memcpy((void *) &val, (const void *) substream->dst_addr.data, sizeof(guint32));
+    key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_SRC_PORT] = (uint32_t) substream->src_port;
+    memcpy((void *) &val, (const void *) substream->dst_addr.data, sizeof(uint32_t));
     key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_DST_ADDR] = val;
-    key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_DST_PORT] = (guint32) substream->dst_port;
+    key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_DST_PORT] = (uint32_t) substream->dst_port;
     key_value[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_LBM_STREAM_ID] = substream->lbm_stream_id;
     key[0].length = LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
@@ -239,11 +239,11 @@ static void lbm_istream_substream_build_key(guint32 * key_value, wmem_tree_key_t
     key[1].key = NULL;
 }
 
-static lbm_istream_substream_entry_t * lbm_stream_istream_substream_find(lbm_istream_entry_t * stream, const address * src_addr, guint16 src_port, const address * dst_addr, guint16 dst_port, guint32 stream_id)
+static lbm_istream_substream_entry_t * lbm_stream_istream_substream_find(lbm_istream_entry_t * stream, const address * src_addr, uint16_t src_port, const address * dst_addr, uint16_t dst_port, uint32_t stream_id)
 {
     lbm_istream_substream_entry_t key;
     lbm_istream_substream_entry_t * entry = NULL;
-    guint32 keyval[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     memset((void *)&key, 0, sizeof(lbm_istream_substream_entry_t));
@@ -257,10 +257,10 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_find(lbm_ist
     return (entry);
 }
 
-static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istream_entry_t * stream, const address * src_addr, guint16 src_port, const address * dst_addr, guint16 dst_port, guint32 stream_id)
+static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istream_entry_t * stream, const address * src_addr, uint16_t src_port, const address * dst_addr, uint16_t dst_port, uint32_t stream_id)
 {
     lbm_istream_substream_entry_t * entry;
-    guint32 keyval[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_ISTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbm_stream_istream_substream_find(stream, src_addr, src_port, dst_addr, dst_port, stream_id);
@@ -276,7 +276,7 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istr
     entry->lbm_stream_id = stream_id;
     entry->parent = stream;
     entry->substream_id = stream->next_substream_id++;
-    entry->first_frame = ~((guint32)0);
+    entry->first_frame = ~((uint32_t)0);
     entry->last_frame = 0;
     entry->messages = 0;
     entry->bytes = 0;
@@ -285,12 +285,12 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istr
     return (entry);
 }
 
-static void lbm_stream_istream_substream_update(lbm_istream_substream_entry_t * substream, guint16 length, guint32 frame)
+static void lbm_stream_istream_substream_update(lbm_istream_substream_entry_t * substream, uint16_t length, uint32_t frame)
 {
     substream->messages++;
     substream->parent->messages++;
-    substream->bytes += (guint32)length;
-    substream->parent->bytes += (guint32)length;
+    substream->bytes += (uint32_t)length;
+    substream->parent->bytes += (uint32_t)length;
     if (frame < substream->first_frame)
     {
         substream->first_frame = frame;
@@ -309,9 +309,9 @@ static void lbm_stream_istream_substream_update(lbm_istream_substream_entry_t *
     }
 }
 
-static void lbm_dstream_stream_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbm_dstream_entry_t * stream)
+static void lbm_dstream_stream_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbm_dstream_entry_t * stream)
 {
-    guint32 val;
+    uint32_t val;
 
     /* Note: for the time being we only support IPv4 addresses (currently enforced in the dissectors), so
        assume it's an IPv4 address. memcpy to an intermediate value (don't know for sure the address.data field
@@ -319,13 +319,13 @@ static void lbm_dstream_stream_build_key(guint32 * key_value, wmem_tree_key_t *
        on certain platforms.
     */
     key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_DOMAIN_1] = stream->domain_1;
-    memcpy((void *) &val, (const void *) (stream->addr_1.data), sizeof(guint32));
+    memcpy((void *) &val, (const void *) (stream->addr_1.data), sizeof(uint32_t));
     key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_ADDR_1] = val;
     key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_DOMAIN_2] = stream->domain_2;
-    memcpy((void *) &val, (const void *) (stream->addr_2.data), sizeof(guint32));
+    memcpy((void *) &val, (const void *) (stream->addr_2.data), sizeof(uint32_t));
     key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_ADDR_2] = val;
-    key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_PORT_1] = (guint32) stream->port_1;
-    key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_PORT_2] = (guint32) stream->port_2;
+    key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_PORT_1] = (uint32_t) stream->port_1;
+    key_value[LBM_DSTREAM_STREAM_KEY_ELEMENT_PORT_2] = (uint32_t) stream->port_2;
     key[0].length = LBM_DSTREAM_STREAM_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
     key[1].length = 0;
@@ -334,14 +334,14 @@ static void lbm_dstream_stream_build_key(guint32 * key_value, wmem_tree_key_t *
 
 static void lbm_stream_order_dstream_key(lbm_dstream_entry_t * stream)
 {
-    gboolean swap_items = FALSE;
+    bool swap_items = false;
     address addr;
-    guint32 domain;
-    guint16 port;
+    uint32_t domain;
+    uint16_t port;
 
     if (stream->domain_1 > stream->domain_2)
     {
-        swap_items = TRUE;
+        swap_items = true;
     }
     else if (stream->domain_1 == stream->domain_2)
     {
@@ -350,13 +350,13 @@ static void lbm_stream_order_dstream_key(lbm_dstream_entry_t * stream)
         compare = cmp_address(&(stream->addr_1), &(stream->addr_2));
         if (compare > 0)
         {
-            swap_items = TRUE;
+            swap_items = true;
         }
         else if (compare == 0)
         {
             if (stream->port_1 > stream->port_2)
             {
-                swap_items = TRUE;
+                swap_items = true;
             }
         }
     }
@@ -380,7 +380,7 @@ static lbm_dstream_entry_t * lbm_stream_dstream_find(const lbm_uim_stream_destin
 {
     lbm_dstream_entry_t key;
     lbm_dstream_entry_t * entry = NULL;
-    guint32 keyval[LBM_DSTREAM_STREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_DSTREAM_STREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     key.domain_1 = endpoint_a->domain;
@@ -398,7 +398,7 @@ static lbm_dstream_entry_t * lbm_stream_dstream_find(const lbm_uim_stream_destin
 static lbm_dstream_entry_t * lbm_stream_dstream_add(const lbm_uim_stream_destination_t * endpoint_a, const lbm_uim_stream_destination_t * endpoint_b)
 {
     lbm_dstream_entry_t * entry;
-    guint32 keyval[LBM_DSTREAM_STREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_DSTREAM_STREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbm_stream_dstream_find(endpoint_a, endpoint_b);
@@ -416,7 +416,7 @@ static lbm_dstream_entry_t * lbm_stream_dstream_add(const lbm_uim_stream_destina
     lbm_stream_order_dstream_key(entry);
     entry->channel = lbm_channel_assign(LBM_CHANNEL_STREAM_TCP);
     entry->next_substream_id = 1;
-    entry->first_frame = ~((guint32)0);
+    entry->first_frame = ~((uint32_t)0);
     entry->last_frame = 0;
     entry->messages = 0;
     entry->bytes = 0;
@@ -426,21 +426,21 @@ static lbm_dstream_entry_t * lbm_stream_dstream_add(const lbm_uim_stream_destina
     return (entry);
 }
 
-static void lbm_dstream_substream_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbm_dstream_substream_entry_t * substream)
+static void lbm_dstream_substream_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbm_dstream_substream_entry_t * substream)
 {
-    guint32 val;
+    uint32_t val;
 
     /* Note: for the time being we only support IPv4 addresses (currently enforced in the dissectors), so
        assume it's an IPv4 address. memcpy to an intermediate value (don't know for sure the address.data field
        has any particular alignment) to prevent any alignment issues with assigning to a 32-bit unsigned int
        on certain platforms.
     */
-    memcpy((void *) &val, (const void *) substream->src_addr.data, sizeof(guint32));
+    memcpy((void *) &val, (const void *) substream->src_addr.data, sizeof(uint32_t));
     key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_SRC_ADDR] = val;
-    key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_SRC_PORT] = (guint32) substream->src_port;
-    memcpy((void *) &val, (const void *) substream->dst_addr.data, sizeof(guint32));
+    key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_SRC_PORT] = (uint32_t) substream->src_port;
+    memcpy((void *) &val, (const void *) substream->dst_addr.data, sizeof(uint32_t));
     key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_DST_ADDR] = val;
-    key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_DST_PORT] = (guint32) substream->dst_port;
+    key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_DST_PORT] = (uint32_t) substream->dst_port;
     key_value[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_LBM_STREAM_ID] = substream->lbm_stream_id;
     key[0].length = LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
@@ -448,11 +448,11 @@ static void lbm_dstream_substream_build_key(guint32 * key_value, wmem_tree_key_t
     key[1].key = NULL;
 }
 
-static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_find(lbm_dstream_entry_t * stream, const address * src_addr, guint16 src_port, const address * dst_addr, guint16 dst_port, guint32 stream_id)
+static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_find(lbm_dstream_entry_t * stream, const address * src_addr, uint16_t src_port, const address * dst_addr, uint16_t dst_port, uint32_t stream_id)
 {
     lbm_dstream_substream_entry_t key;
     lbm_dstream_substream_entry_t * entry = NULL;
-    guint32 keyval[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     memset((void *)&key, 0, sizeof(lbm_dstream_substream_entry_t));
@@ -466,10 +466,10 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_find(lbm_dst
     return (entry);
 }
 
-static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstream_entry_t * stream, const address * src_addr, guint16 src_port, const address * dst_addr, guint16 dst_port, guint32 stream_id)
+static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstream_entry_t * stream, const address * src_addr, uint16_t src_port, const address * dst_addr, uint16_t dst_port, uint32_t stream_id)
 {
     lbm_dstream_substream_entry_t * entry;
-    guint32 keyval[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBM_DSTREAM_SUBSTREAM_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbm_stream_dstream_substream_find(stream, src_addr, src_port, dst_addr, dst_port, stream_id);
@@ -485,7 +485,7 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstr
     entry->lbm_stream_id = stream_id;
     entry->parent = stream;
     entry->substream_id = stream->next_substream_id++;
-    entry->first_frame = ~((guint32)0);
+    entry->first_frame = ~((uint32_t)0);
     entry->last_frame = 0;
     entry->messages = 0;
     entry->bytes = 0;
@@ -494,12 +494,12 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstr
     return (entry);
 }
 
-static void lbm_stream_dstream_substream_update(lbm_dstream_substream_entry_t * substream, guint16 length, guint32 frame)
+static void lbm_stream_dstream_substream_update(lbm_dstream_substream_entry_t * substream, uint16_t length, uint32_t frame)
 {
     substream->messages++;
     substream->parent->messages++;
-    substream->bytes += (guint32)length;
-    substream->parent->bytes += (guint32)length;
+    substream->bytes += (uint32_t)length;
+    substream->parent->bytes += (uint32_t)length;
     if (frame < substream->first_frame)
     {
         substream->first_frame = frame;
@@ -541,7 +541,7 @@ typedef struct
 #define L_LBMC_HDR_T_TIDX SIZEOF(lbmc_hdr_t, tidx)
 #define O_LBMC_HDR_T_SQN OFFSETOF(lbmc_hdr_t, sqn)
 #define L_LBMC_HDR_T_SQN SIZEOF(lbmc_hdr_t, sqn)
-#define L_LBMC_HDR_T (gint) sizeof(lbmc_hdr_t)
+#define L_LBMC_HDR_T (int) sizeof(lbmc_hdr_t)
 
 /* LBMC control header */
 typedef struct
@@ -556,7 +556,7 @@ typedef struct
 #define L_LBMC_CNTL_HDR_T_NEXT_HDR SIZEOF(lbmc_cntl_hdr_t, next_hdr)
 #define O_LBMC_CNTL_HDR_T_MSGLEN OFFSETOF(lbmc_cntl_hdr_t, msglen)
 #define L_LBMC_CNTL_HDR_T_MSGLEN SIZEOF(lbmc_cntl_hdr_t, msglen)
-#define L_LBMC_CNTL_HDR_T (gint) sizeof(lbmc_cntl_hdr_t)
+#define L_LBMC_CNTL_HDR_T (int) sizeof(lbmc_cntl_hdr_t)
 
 #define LBMC_HDR_VER_TYPE_VER_MASK 0xF0
 #define LBMC_HDR_VER_TYPE_TYPE_MASK 0x0F
@@ -574,7 +574,7 @@ typedef struct
 #define L_LBMC_MINIMAL_HDR_T_NEXT_HDR SIZEOF(lbmc_minimal_hdr_t, next_hdr)
 #define O_LBMC_MINIMAL_HDR_T_MSGLEN OFFSETOF(lbmc_minimal_hdr_t, msglen)
 #define L_LBMC_MINIMAL_HDR_T_MSGLEN SIZEOF(lbmc_minimal_hdr_t, msglen)
-#define L_LBMC_MINIMAL_HDR_T (gint) sizeof(lbmc_minimal_hdr_t)
+#define L_LBMC_MINIMAL_HDR_T (int) sizeof(lbmc_minimal_hdr_t)
 
 #define LBMC_HDR_VER(x) (x >> 4)
 #define LBMC_HDR_TYPE(x) (x & 0xF)
@@ -592,7 +592,7 @@ typedef struct
 #define L_LBMC_BASIC_HDR_T_HDR_LEN SIZEOF(lbmc_basic_hdr_t, hdr_len)
 #define O_LBMC_BASIC_HDR_T_RES OFFSETOF(lbmc_basic_hdr_t, res)
 #define L_LBMC_BASIC_HDR_T_RES SIZEOF(lbmc_basic_hdr_t, res)
-#define L_LBMC_BASIC_HDR_T (gint) sizeof(lbmc_basic_hdr_t)
+#define L_LBMC_BASIC_HDR_T (int) sizeof(lbmc_basic_hdr_t)
 
 /* LBMC fragment header */
 typedef struct
@@ -616,7 +616,7 @@ typedef struct
 #define L_LBMC_FRAG_HDR_T_OFFSET SIZEOF(lbmc_frag_hdr_t, offset)
 #define O_LBMC_FRAG_HDR_T_LEN OFFSETOF(lbmc_frag_hdr_t, len)
 #define L_LBMC_FRAG_HDR_T_LEN SIZEOF(lbmc_frag_hdr_t, len)
-#define L_LBMC_FRAG_HDR_T (gint) sizeof(lbmc_frag_hdr_t)
+#define L_LBMC_FRAG_HDR_T (int) sizeof(lbmc_frag_hdr_t)
 
 /* LBMC batch header */
 typedef struct
@@ -631,7 +631,7 @@ typedef struct
 #define L_LBMC_BATCH_HDR_T_HDR_LEN SIZEOF(lbmc_batch_hdr_t, hdr_len)
 #define O_LBMC_BATCH_HDR_T_FLAGS OFFSETOF(lbmc_batch_hdr_t, flags)
 #define L_LBMC_BATCH_HDR_T_FLAGS SIZEOF(lbmc_batch_hdr_t, flags)
-#define L_LBMC_BATCH_HDR_T (gint) sizeof(lbmc_batch_hdr_t)
+#define L_LBMC_BATCH_HDR_T (int) sizeof(lbmc_batch_hdr_t)
 
 /* LBMC TCP request header */
 typedef struct
@@ -661,7 +661,7 @@ typedef struct
 #define L_LBMC_TCP_REQUEST_HDR_T_RESERVED SIZEOF(lbmc_tcp_request_hdr_t, reserved)
 #define O_LBMC_TCP_REQUEST_HDR_T_IPADDR OFFSETOF(lbmc_tcp_request_hdr_t, ipaddr)
 #define L_LBMC_TCP_REQUEST_HDR_T_IPADDR SIZEOF(lbmc_tcp_request_hdr_t, ipaddr)
-#define L_LBMC_TCP_REQUEST_HDR_T (gint) sizeof(lbmc_tcp_request_hdr_t)
+#define L_LBMC_TCP_REQUEST_HDR_T (int) sizeof(lbmc_tcp_request_hdr_t)
 
 /* LBMC topicname header (an extension to lbmc_basic_hdr_t) */
 #define O_LBMC_TOPICNAME_HDR_T_NEXT_HDR OFFSETOF(lbmc_basic_hdr_t, next_hdr)
@@ -696,7 +696,7 @@ typedef struct
 #define L_LBMC_APPHDR_CHAIN_ELEMENT_T_HDR_LEN SIZEOF(lbmc_apphdr_chain_element_t, hdr_len)
 #define O_LBMC_APPHDR_CHAIN_ELEMENT_T_RES OFFSETOF(lbmc_apphdr_chain_element_t, res)
 #define L_LBMC_APPHDR_CHAIN_ELEMENT_T_RES SIZEOF(lbmc_apphdr_chain_element_t, res)
-#define L_LBMC_APPHDR_CHAIN_ELEMENT_T_MIN (gint) sizeof(lbmc_apphdr_chain_element_t)
+#define L_LBMC_APPHDR_CHAIN_ELEMENT_T_MIN (int) sizeof(lbmc_apphdr_chain_element_t)
 
 /* LBMC appheader chain message properties element */
 typedef struct
@@ -714,7 +714,7 @@ typedef struct
 #define L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_RES SIZEOF(lbmc_apphdr_chain_msgprop_element_t, res)
 #define O_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_LEN OFFSETOF(lbmc_apphdr_chain_msgprop_element_t, len)
 #define L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_LEN SIZEOF(lbmc_apphdr_chain_msgprop_element_t, len)
-#define L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T (gint) sizeof(lbmc_apphdr_chain_msgprop_element_t)
+#define L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T (int) sizeof(lbmc_apphdr_chain_msgprop_element_t)
 
 /* LBMC appheader chain header */
 typedef struct
@@ -732,7 +732,7 @@ typedef struct
 #define L_LBMC_APPHDR_CHAIN_HDR_T_RES SIZEOF(lbmc_apphdr_chain_hdr_t, res)
 #define O_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR OFFSETOF(lbmc_apphdr_chain_hdr_t, first_chain_hdr)
 #define L_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR SIZEOF(lbmc_apphdr_chain_hdr_t, first_chain_hdr)
-#define L_LBMC_APPHDR_CHAIN_HDR_T (gint) sizeof(lbmc_apphdr_chain_hdr_t)
+#define L_LBMC_APPHDR_CHAIN_HDR_T (int) sizeof(lbmc_apphdr_chain_hdr_t)
 
 /* LBMC UMQ Message ID header */
 typedef struct
@@ -753,7 +753,7 @@ typedef struct
 #define L_LBMC_UMQ_MSGID_HDR_T_MSGID_REGID SIZEOF(lbmc_umq_msgid_hdr_t, msgid_regid)
 #define O_LBMC_UMQ_MSGID_HDR_T_MSGID_STAMP OFFSETOF(lbmc_umq_msgid_hdr_t, msgid_stamp)
 #define L_LBMC_UMQ_MSGID_HDR_T_MSGID_STAMP SIZEOF(lbmc_umq_msgid_hdr_t, msgid_stamp)
-#define L_LBMC_UMQ_MSGID_HDR_T (gint) sizeof(lbmc_umq_msgid_hdr_t)
+#define L_LBMC_UMQ_MSGID_HDR_T (int) sizeof(lbmc_umq_msgid_hdr_t)
 
 /* LBMC UMQ SQD receive header */
 typedef struct
@@ -780,7 +780,7 @@ typedef struct
 #define L_LBMC_UMQ_SQD_RCV_HDR_T_RCR_IDX SIZEOF(lbmc_umq_sqd_rcv_hdr_t, rcr_idx)
 #define O_LBMC_UMQ_SQD_RCV_HDR_T_ASSIGN_ID OFFSETOF(lbmc_umq_sqd_rcv_hdr_t, assign_id)
 #define L_LBMC_UMQ_SQD_RCV_HDR_T_ASSIGN_ID SIZEOF(lbmc_umq_sqd_rcv_hdr_t, assign_id)
-#define L_LBMC_UMQ_SQD_RCV_HDR_T (gint) sizeof(lbmc_umq_sqd_rcv_hdr_t)
+#define L_LBMC_UMQ_SQD_RCV_HDR_T (int) sizeof(lbmc_umq_sqd_rcv_hdr_t)
 
 /* LBMC UMQ resubmission header */
 typedef struct
@@ -807,7 +807,7 @@ typedef struct
 #define L_LBMC_UMQ_RESUB_HDR_T_RESP_PORT SIZEOF(lbmc_umq_resub_hdr_t, resp_port)
 #define O_LBMC_UMQ_RESUB_HDR_T_APPSET_IDX OFFSETOF(lbmc_umq_resub_hdr_t, appset_idx)
 #define L_LBMC_UMQ_RESUB_HDR_T_APPSET_IDX SIZEOF(lbmc_umq_resub_hdr_t, appset_idx)
-#define L_LBMC_UMQ_RESUB_HDR_T (gint) sizeof(lbmc_umq_resub_hdr_t)
+#define L_LBMC_UMQ_RESUB_HDR_T (int) sizeof(lbmc_umq_resub_hdr_t)
 
 /* LBMC originating transport ID header */
 typedef struct
@@ -825,7 +825,7 @@ typedef struct
 #define L_LBMC_OTID_HDR_T_FLAGS SIZEOF(lbmc_otid_hdr_t, flags)
 #define O_LBMC_OTID_HDR_T_OTID OFFSETOF(lbmc_otid_hdr_t, otid)
 #define L_LBMC_OTID_HDR_T_OTID SIZEOF(lbmc_otid_hdr_t, otid)
-#define L_LBMC_OTID_HDR_T (gint) sizeof(lbmc_otid_hdr_t)
+#define L_LBMC_OTID_HDR_T (int) sizeof(lbmc_otid_hdr_t)
 
 /* LBMC context instance header(s) */
 typedef struct
@@ -843,7 +843,7 @@ typedef struct
 #define L_LBMC_CTXINST_HDR_T_FLAGS SIZEOF(lbmc_ctxinst_hdr_t, flags)
 #define O_LBMC_CTXINST_HDR_T_CTXINST OFFSETOF(lbmc_ctxinst_hdr_t, ctxinst)
 #define L_LBMC_CTXINST_HDR_T_CTXINST SIZEOF(lbmc_ctxinst_hdr_t, ctxinst)
-#define L_LBMC_CTXINST_HDR_T (gint) sizeof(lbmc_ctxinst_hdr_t)
+#define L_LBMC_CTXINST_HDR_T (int) sizeof(lbmc_ctxinst_hdr_t)
 
 /* LBMC source index header */
 typedef struct
@@ -861,7 +861,7 @@ typedef struct
 #define L_LBMC_SRCIDX_HDR_T_FLAGS SIZEOF(lbmc_srcidx_hdr_t, flags)
 #define O_LBMC_SRCIDX_HDR_T_SRCIDX OFFSETOF(lbmc_srcidx_hdr_t, srcidx)
 #define L_LBMC_SRCIDX_HDR_T_SRCIDX SIZEOF(lbmc_srcidx_hdr_t, srcidx)
-#define L_LBMC_SRCIDX_HDR_T (gint) sizeof(lbmc_srcidx_hdr_t)
+#define L_LBMC_SRCIDX_HDR_T (int) sizeof(lbmc_srcidx_hdr_t)
 
 /* LBMC UMQ ULB message header */
 typedef struct
@@ -891,7 +891,7 @@ typedef struct
 #define L_LBMC_UMQ_ULB_MSG_HDR_T_APPSET_IDX SIZEOF(lbmc_umq_ulb_msg_hdr_t, appset_idx)
 #define O_LBMC_UMQ_ULB_MSG_HDR_T_NUM_RAS OFFSETOF(lbmc_umq_ulb_msg_hdr_t, num_ras)
 #define L_LBMC_UMQ_ULB_MSG_HDR_T_NUM_RAS SIZEOF(lbmc_umq_ulb_msg_hdr_t, num_ras)
-#define L_LBMC_UMQ_ULB_MSG_HDR_T (gint) sizeof(lbmc_umq_ulb_msg_hdr_t)
+#define L_LBMC_UMQ_ULB_MSG_HDR_T (int) sizeof(lbmc_umq_ulb_msg_hdr_t)
 
 /* LBMC control source-side filtering initialization header */
 typedef struct
@@ -924,7 +924,7 @@ typedef struct
 #define L_LBMC_CNTL_SSF_INIT_HDR_T_RES SIZEOF(lbmc_cntl_ssf_init_hdr_t, res)
 #define O_LBMC_CNTL_SSF_INIT_HDR_T_SSF_IP OFFSETOF(lbmc_cntl_ssf_init_hdr_t, ssf_ip)
 #define L_LBMC_CNTL_SSF_INIT_HDR_T_SSF_IP SIZEOF(lbmc_cntl_ssf_init_hdr_t, ssf_ip)
-#define L_LBMC_CNTL_SSF_INIT_HDR_T (gint) sizeof(lbmc_cntl_ssf_init_hdr_t)
+#define L_LBMC_CNTL_SSF_INIT_HDR_T (int) sizeof(lbmc_cntl_ssf_init_hdr_t)
 
 /* LBMC control source-side filtering control request header */
 typedef struct
@@ -951,7 +951,7 @@ typedef struct
 #define L_LBMC_CNTL_SSF_CREQ_HDR_T_TOPIC_IDX SIZEOF(lbmc_cntl_ssf_creq_hdr_t, topic_idx)
 #define O_LBMC_CNTL_SSF_CREQ_HDR_T_CLIENT_IDX OFFSETOF(lbmc_cntl_ssf_creq_hdr_t, client_idx)
 #define L_LBMC_CNTL_SSF_CREQ_HDR_T_CLIENT_IDX SIZEOF(lbmc_cntl_ssf_creq_hdr_t, client_idx)
-#define L_LBMC_CNTL_SSF_CREQ_HDR_T (gint) sizeof(lbmc_cntl_ssf_creq_hdr_t)
+#define L_LBMC_CNTL_SSF_CREQ_HDR_T (int) sizeof(lbmc_cntl_ssf_creq_hdr_t)
 
 /* LBMC control UME persistent registration header */
 typedef struct
@@ -990,7 +990,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_PREG_HDR_T_RES2 SIZEOF(lbmc_cntl_ume_preg_hdr_t, res2)
 #define O_LBMC_CNTL_UME_PREG_HDR_T_RESP_IP OFFSETOF(lbmc_cntl_ume_preg_hdr_t, resp_ip)
 #define L_LBMC_CNTL_UME_PREG_HDR_T_RESP_IP SIZEOF(lbmc_cntl_ume_preg_hdr_t, resp_ip)
-#define L_LBMC_CNTL_UME_PREG_HDR_T (gint) sizeof(lbmc_cntl_ume_preg_hdr_t)
+#define L_LBMC_CNTL_UME_PREG_HDR_T (int) sizeof(lbmc_cntl_ume_preg_hdr_t)
 
 #define LBMC_CNTL_UME_PREG_MARKER(x) (x & 0x7F)
 #define LBMC_CNTL_UME_PREG_MARKER_MASK 0x7F
@@ -1026,7 +1026,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_PREG_RESP_HDR_T_LOW_SEQNUM SIZEOF(lbmc_cntl_ume_preg_resp_hdr_t, low_seqnum)
 #define O_LBMC_CNTL_UME_PREG_RESP_HDR_T_HIGH_SEQNUM OFFSETOF(lbmc_cntl_ume_preg_resp_hdr_t, high_seqnum)
 #define L_LBMC_CNTL_UME_PREG_RESP_HDR_T_HIGH_SEQNUM SIZEOF(lbmc_cntl_ume_preg_resp_hdr_t, high_seqnum)
-#define L_LBMC_CNTL_UME_PREG_RESP_HDR_T (gint) sizeof(lbmc_cntl_ume_preg_resp_hdr_t)
+#define L_LBMC_CNTL_UME_PREG_RESP_HDR_T (int) sizeof(lbmc_cntl_ume_preg_resp_hdr_t)
 
 #define LBMC_CNTL_UME_PREG_RESP_CODE(x) (x & 0x0F)
 #define LBMC_CNTL_UME_PREG_RESP_CODE_MASK 0x0F
@@ -1059,7 +1059,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_ACK_HDR_T_RCV_REG_ID SIZEOF(lbmc_cntl_ume_ack_hdr_t, rcv_reg_id)
 #define O_LBMC_CNTL_UME_ACK_HDR_T_SEQNUM OFFSETOF(lbmc_cntl_ume_ack_hdr_t, seqnum)
 #define L_LBMC_CNTL_UME_ACK_HDR_T_SEQNUM SIZEOF(lbmc_cntl_ume_ack_hdr_t, seqnum)
-#define L_LBMC_CNTL_UME_ACK_HDR_T (gint) sizeof(lbmc_cntl_ume_ack_hdr_t)
+#define L_LBMC_CNTL_UME_ACK_HDR_T (int) sizeof(lbmc_cntl_ume_ack_hdr_t)
 
 /* LBMC control UME ranged acknowledgement header */
 typedef struct
@@ -1080,7 +1080,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_RANGED_ACK_HDR_T_FIRST_SEQNUM SIZEOF(lbmc_cntl_ume_ranged_ack_hdr_t, first_seqnum)
 #define O_LBMC_CNTL_UME_RANGED_ACK_HDR_T_LAST_SEQNUM OFFSETOF(lbmc_cntl_ume_ranged_ack_hdr_t, last_seqnum)
 #define L_LBMC_CNTL_UME_RANGED_ACK_HDR_T_LAST_SEQNUM SIZEOF(lbmc_cntl_ume_ranged_ack_hdr_t, last_seqnum)
-#define L_LBMC_CNTL_UME_RANGED_ACK_HDR_T (gint) sizeof(lbmc_cntl_ume_ranged_ack_hdr_t)
+#define L_LBMC_CNTL_UME_RANGED_ACK_HDR_T (int) sizeof(lbmc_cntl_ume_ranged_ack_hdr_t)
 
 /* LBMC control UME acknowledgement ID header */
 typedef struct
@@ -1098,7 +1098,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_ACK_ID_HDR_T_FLAGS SIZEOF(lbmc_cntl_ume_ack_id_hdr_t, flags)
 #define O_LBMC_CNTL_UME_ACK_ID_HDR_T_ID OFFSETOF(lbmc_cntl_ume_ack_id_hdr_t, id)
 #define L_LBMC_CNTL_UME_ACK_ID_HDR_T_ID SIZEOF(lbmc_cntl_ume_ack_id_hdr_t, id)
-#define L_LBMC_CNTL_UME_ACK_ID_HDR_T (gint) sizeof(lbmc_cntl_ume_ack_id_hdr_t)
+#define L_LBMC_CNTL_UME_ACK_ID_HDR_T (int) sizeof(lbmc_cntl_ume_ack_id_hdr_t)
 
 /* LBMC control UME retransmission request header */
 typedef struct
@@ -1134,7 +1134,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_RXREQ_HDR_T_RES SIZEOF(lbmc_cntl_ume_rxreq_hdr_t, res)
 #define O_LBMC_CNTL_UME_RXREQ_HDR_T_RX_IP OFFSETOF(lbmc_cntl_ume_rxreq_hdr_t, rx_ip)
 #define L_LBMC_CNTL_UME_RXREQ_HDR_T_RX_IP SIZEOF(lbmc_cntl_ume_rxreq_hdr_t, rx_ip)
-#define L_LBMC_CNTL_UME_RXREQ_HDR_T (gint) sizeof(lbmc_cntl_ume_rxreq_hdr_t)
+#define L_LBMC_CNTL_UME_RXREQ_HDR_T (int) sizeof(lbmc_cntl_ume_rxreq_hdr_t)
 
 /* LBMC control late join initiation request */
 typedef struct
@@ -1178,7 +1178,7 @@ typedef struct
 #define L_LBMC_CNTL_LJI_REQ_HDR_T_RX_REQ_OUTSTANDING_MAX SIZEOF(lbmc_cntl_lji_req_hdr_t, rx_req_outstanding_max)
 #define O_LBMC_CNTL_LJI_REQ_HDR_T_FLAGS OFFSETOF(lbmc_cntl_lji_req_hdr_t, flags)
 #define L_LBMC_CNTL_LJI_REQ_HDR_T_FLAGS SIZEOF(lbmc_cntl_lji_req_hdr_t, flags)
-#define L_LBMC_CNTL_LJI_REQ_HDR_T (gint) sizeof(lbmc_cntl_lji_req_hdr_t)
+#define L_LBMC_CNTL_LJI_REQ_HDR_T (int) sizeof(lbmc_cntl_lji_req_hdr_t)
 
 /* LBMC control UME keepalive header */
 typedef struct
@@ -1205,7 +1205,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_KEEPALIVE_HDR_T_TOPIC_IDX SIZEOF(lbmc_cntl_ume_keepalive_hdr_t, topic_idx)
 #define O_LBMC_CNTL_UME_KEEPALIVE_HDR_T_REG_ID OFFSETOF(lbmc_cntl_ume_keepalive_hdr_t, reg_id)
 #define L_LBMC_CNTL_UME_KEEPALIVE_HDR_T_REG_ID SIZEOF(lbmc_cntl_ume_keepalive_hdr_t, reg_id)
-#define L_LBMC_CNTL_UME_KEEPALIVE_HDR_T (gint) sizeof(lbmc_cntl_ume_keepalive_hdr_t)
+#define L_LBMC_CNTL_UME_KEEPALIVE_HDR_T (int) sizeof(lbmc_cntl_ume_keepalive_hdr_t)
 
 /* LBMC control UME store ID header */
 typedef struct
@@ -1220,7 +1220,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_STOREID_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_ume_storeid_hdr_t, hdr_len)
 #define O_LBMC_CNTL_UME_STOREID_HDR_T_STORE_ID OFFSETOF(lbmc_cntl_ume_storeid_hdr_t, store_id)
 #define L_LBMC_CNTL_UME_STOREID_HDR_T_STORE_ID SIZEOF(lbmc_cntl_ume_storeid_hdr_t, store_id)
-#define L_LBMC_CNTL_UME_STOREID_HDR_T (gint) sizeof(lbmc_cntl_ume_storeid_hdr_t)
+#define L_LBMC_CNTL_UME_STOREID_HDR_T (int) sizeof(lbmc_cntl_ume_storeid_hdr_t)
 
 #define LBMC_CNTL_UME_STOREID_STOREID(x) (x & 0x7FFF)
 #define LBMC_CNTL_UME_STOREID_STOREID_MASK 0x7FFF
@@ -1238,7 +1238,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_CAPABILITY_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_ume_capability_hdr_t, hdr_len)
 #define O_LBMC_CNTL_UME_CAPABILITY_HDR_T_FLAGS OFFSETOF(lbmc_cntl_ume_capability_hdr_t, flags)
 #define L_LBMC_CNTL_UME_CAPABILITY_HDR_T_FLAGS SIZEOF(lbmc_cntl_ume_capability_hdr_t, flags)
-#define L_LBMC_CNTL_UME_CAPABILITY_HDR_T (gint) sizeof(lbmc_cntl_ume_capability_hdr_t)
+#define L_LBMC_CNTL_UME_CAPABILITY_HDR_T (int) sizeof(lbmc_cntl_ume_capability_hdr_t)
 
 /* LBMC control UME Proxy Source header */
 typedef struct
@@ -1253,7 +1253,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_PROXY_SRC_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_ume_proxy_src_hdr_t, hdr_len)
 #define O_LBMC_CNTL_UME_PROXY_SRC_HDR_T_FLAGS OFFSETOF(lbmc_cntl_ume_proxy_src_hdr_t, flags)
 #define L_LBMC_CNTL_UME_PROXY_SRC_HDR_T_FLAGS SIZEOF(lbmc_cntl_ume_proxy_src_hdr_t, flags)
-#define L_LBMC_CNTL_UME_PROXY_SRC_HDR_T (gint) sizeof(lbmc_cntl_ume_proxy_src_hdr_t)
+#define L_LBMC_CNTL_UME_PROXY_SRC_HDR_T (int) sizeof(lbmc_cntl_ume_proxy_src_hdr_t)
 
 /* LBMC control UME Store header */
 typedef struct
@@ -1283,7 +1283,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_STORE_HDR_T_STORE_IP_ADDR SIZEOF(lbmc_cntl_ume_store_hdr_t, store_ip_addr)
 #define O_LBMC_CNTL_UME_STORE_HDR_T_SRC_REG_ID OFFSETOF(lbmc_cntl_ume_store_hdr_t, src_reg_id)
 #define L_LBMC_CNTL_UME_STORE_HDR_T_SRC_REG_ID SIZEOF(lbmc_cntl_ume_store_hdr_t, src_reg_id)
-#define L_LBMC_CNTL_UME_STORE_HDR_T (gint) sizeof(lbmc_cntl_ume_store_hdr_t)
+#define L_LBMC_CNTL_UME_STORE_HDR_T (int) sizeof(lbmc_cntl_ume_store_hdr_t)
 
 /* LBMC control UME Store Extended header */
 typedef struct
@@ -1319,7 +1319,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_STORE_EXT_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_ume_store_ext_hdr_t, domain_id)
 #define O_LBMC_CNTL_UME_STORE_EXT_HDR_T_VERSION OFFSETOF(lbmc_cntl_ume_store_ext_hdr_t, version)
 #define L_LBMC_CNTL_UME_STORE_EXT_HDR_T_VERSION SIZEOF(lbmc_cntl_ume_store_ext_hdr_t, version)
-#define L_LBMC_CNTL_UME_STORE_EXT_HDR_T (gint) sizeof(lbmc_cntl_ume_store_ext_hdr_t)
+#define L_LBMC_CNTL_UME_STORE_EXT_HDR_T (int) sizeof(lbmc_cntl_ume_store_ext_hdr_t)
 
 /* LBMC control UME Late Join info header */
 typedef struct
@@ -1343,7 +1343,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_LJ_INFO_HDR_T_HIGH_SEQNUM SIZEOF(lbmc_cntl_ume_lj_info_hdr_t, high_seqnum)
 #define O_LBMC_CNTL_UME_LJ_INFO_HDR_T_QIDX OFFSETOF(lbmc_cntl_ume_lj_info_hdr_t, qidx)
 #define L_LBMC_CNTL_UME_LJ_INFO_HDR_T_QIDX SIZEOF(lbmc_cntl_ume_lj_info_hdr_t, qidx)
-#define L_LBMC_CNTL_UME_LJ_INFO_HDR_T (gint) sizeof(lbmc_cntl_ume_lj_info_hdr_t)
+#define L_LBMC_CNTL_UME_LJ_INFO_HDR_T (int) sizeof(lbmc_cntl_ume_lj_info_hdr_t)
 
 /* LBMC control UME Store Group header */
 typedef struct
@@ -1367,7 +1367,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_STORE_GROUP_HDR_T_GRP_SZ SIZEOF(lbmc_cntl_ume_store_group_hdr_t, grp_sz)
 #define O_LBMC_CNTL_UME_STORE_GROUP_HDR_T_RES1 OFFSETOF(lbmc_cntl_ume_store_group_hdr_t, res1)
 #define L_LBMC_CNTL_UME_STORE_GROUP_HDR_T_RES1 SIZEOF(lbmc_cntl_ume_store_group_hdr_t, res1)
-#define L_LBMC_CNTL_UME_STORE_GROUP_HDR_T (gint) sizeof(lbmc_cntl_ume_store_group_hdr_t)
+#define L_LBMC_CNTL_UME_STORE_GROUP_HDR_T (int) sizeof(lbmc_cntl_ume_store_group_hdr_t)
 
 /* LBMC control TSNI header */
 typedef struct
@@ -1382,7 +1382,7 @@ typedef struct
 #define L_LBMC_CNTL_TSNI_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_tsni_hdr_t, hdr_len)
 #define O_LBMC_CNTL_TSNI_HDR_T_NUM_RECS OFFSETOF(lbmc_cntl_tsni_hdr_t, num_recs)
 #define L_LBMC_CNTL_TSNI_HDR_T_NUM_RECS SIZEOF(lbmc_cntl_tsni_hdr_t, num_recs)
-#define L_LBMC_CNTL_TSNI_HDR_T (gint) sizeof(lbmc_cntl_tsni_hdr_t)
+#define L_LBMC_CNTL_TSNI_HDR_T (int) sizeof(lbmc_cntl_tsni_hdr_t)
 
 #define LBMC_CNTL_TSNI_NUM_RECS_MASK 0x7fff
 
@@ -1395,7 +1395,7 @@ typedef struct
 #define L_LBMC_CNTL_TSNI_REC_HDR_T_TIDX SIZEOF(lbmc_cntl_tsni_rec_hdr_t, tidx)
 #define O_LBMC_CNTL_TSNI_REC_HDR_T_SQN OFFSETOF(lbmc_cntl_tsni_rec_hdr_t, sqn)
 #define L_LBMC_CNTL_TSNI_REC_HDR_T_SQN SIZEOF(lbmc_cntl_tsni_rec_hdr_t, sqn)
-#define L_LBMC_CNTL_TSNI_REC_HDR_T (gint) sizeof(lbmc_cntl_tsni_rec_hdr_t)
+#define L_LBMC_CNTL_TSNI_REC_HDR_T (int) sizeof(lbmc_cntl_tsni_rec_hdr_t)
 
 /* LBMC control UMQ registration header(s) */
 typedef struct
@@ -1413,7 +1413,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_CTX_HDR_T_IP SIZEOF(lbmc_cntl_umq_reg_ctx_hdr_t, ip)
 #define O_LBMC_CNTL_UMQ_REG_CTX_HDR_T_CAPABILITIES OFFSETOF(lbmc_cntl_umq_reg_ctx_hdr_t, capabilities)
 #define L_LBMC_CNTL_UMQ_REG_CTX_HDR_T_CAPABILITIES SIZEOF(lbmc_cntl_umq_reg_ctx_hdr_t, capabilities)
-#define L_LBMC_CNTL_UMQ_REG_CTX_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_ctx_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_CTX_HDR_T (int) sizeof(lbmc_cntl_umq_reg_ctx_hdr_t)
 
 typedef struct
 {
@@ -1424,7 +1424,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_SRC_HDR_T_TRANSPORT_IDX SIZEOF(lbmc_cntl_umq_reg_src_hdr_t, transport_idx)
 #define O_LBMC_CNTL_UMQ_REG_SRC_HDR_T_TOPIC_IDX OFFSETOF(lbmc_cntl_umq_reg_src_hdr_t, topic_idx)
 #define L_LBMC_CNTL_UMQ_REG_SRC_HDR_T_TOPIC_IDX SIZEOF(lbmc_cntl_umq_reg_src_hdr_t, topic_idx)
-#define L_LBMC_CNTL_UMQ_REG_SRC_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_src_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_SRC_HDR_T (int) sizeof(lbmc_cntl_umq_reg_src_hdr_t)
 
 typedef struct
 {
@@ -1438,7 +1438,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RCV_HDR_T_RCV_TYPE_ID SIZEOF(lbmc_cntl_umq_reg_rcv_hdr_t, rcv_type_id)
 #define O_LBMC_CNTL_UMQ_REG_RCV_HDR_T_LAST_TOPIC_RCR_TSP OFFSETOF(lbmc_cntl_umq_reg_rcv_hdr_t, last_topic_rcr_tsp)
 #define L_LBMC_CNTL_UMQ_REG_RCV_HDR_T_LAST_TOPIC_RCR_TSP SIZEOF(lbmc_cntl_umq_reg_rcv_hdr_t, last_topic_rcr_tsp)
-#define L_LBMC_CNTL_UMQ_REG_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_rcv_hdr_t)
 
 typedef struct
 {
@@ -1449,7 +1449,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_DEREG_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rcv_dereg_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RCV_DEREG_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_rcv_dereg_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_RCV_DEREG_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rcv_dereg_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_RCV_DEREG_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_dereg_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_DEREG_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_dereg_hdr_t)
 
 typedef struct
 {
@@ -1475,7 +1475,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_ULB_RCV_HDR_T_IP SIZEOF(lbmc_cntl_umq_reg_ulb_rcv_hdr_t, ip)
 #define O_LBMC_CNTL_UMQ_REG_ULB_RCV_HDR_T_CAPABILITIES OFFSETOF(lbmc_cntl_umq_reg_ulb_rcv_hdr_t, capabilities)
 #define L_LBMC_CNTL_UMQ_REG_ULB_RCV_HDR_T_CAPABILITIES SIZEOF(lbmc_cntl_umq_reg_ulb_rcv_hdr_t, capabilities)
-#define L_LBMC_CNTL_UMQ_REG_ULB_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_ulb_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_ULB_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_ulb_rcv_hdr_t)
 
 typedef struct
 {
@@ -1486,7 +1486,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_HDR_T_ULB_SRC_ID SIZEOF(lbmc_cntl_umq_ulb_rcv_dereg_hdr_t, ulb_src_id)
 #define O_LBMC_CNTL_UMQ_ULB_RCV_DEREG_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_ulb_rcv_dereg_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_ulb_rcv_dereg_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_rcv_dereg_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_rcv_dereg_hdr_t)
 
 typedef struct
 {
@@ -1500,7 +1500,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_OBSERVER_RCV_HDR_T_RCV_TYPE_ID SIZEOF(lbmc_cntl_umq_reg_observer_rcv_hdr_t, rcv_type_id)
 #define O_LBMC_CNTL_UMQ_REG_OBSERVER_RCV_HDR_T_LAST_TOPIC_RCR_TSP OFFSETOF(lbmc_cntl_umq_reg_observer_rcv_hdr_t, last_topic_rcr_tsp)
 #define L_LBMC_CNTL_UMQ_REG_OBSERVER_RCV_HDR_T_LAST_TOPIC_RCR_TSP SIZEOF(lbmc_cntl_umq_reg_observer_rcv_hdr_t, last_topic_rcr_tsp)
-#define L_LBMC_CNTL_UMQ_REG_OBSERVER_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_observer_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_OBSERVER_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_observer_rcv_hdr_t)
 
 typedef struct
 {
@@ -1511,7 +1511,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_observer_rcv_dereg_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_observer_rcv_dereg_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_observer_rcv_dereg_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_HDR_T (gint) sizeof(lbmc_cntl_umq_observer_rcv_dereg_hdr_t)
+#define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_HDR_T (int) sizeof(lbmc_cntl_umq_observer_rcv_dereg_hdr_t)
 
 typedef struct
 {
@@ -1540,7 +1540,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_reg_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_REG_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_reg_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_REG_HDR_T_REGID SIZEOF(lbmc_cntl_umq_reg_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_REG_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_HDR_T (int) sizeof(lbmc_cntl_umq_reg_hdr_t)
 
 /* LBMC control UMQ registration response header(s) */
 typedef struct
@@ -1549,7 +1549,7 @@ typedef struct
 } lbmc_cntl_umq_reg_resp_ctx_hdr_t;
 #define O_LBMC_CNTL_UMQ_REG_RESP_CTX_HDR_T_CAPABILITIES OFFSETOF(lbmc_cntl_umq_reg_resp_ctx_hdr_t, capabilities)
 #define L_LBMC_CNTL_UMQ_REG_RESP_CTX_HDR_T_CAPABILITIES SIZEOF(lbmc_cntl_umq_reg_resp_ctx_hdr_t, capabilities)
-#define L_LBMC_CNTL_UMQ_REG_RESP_CTX_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_ctx_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_CTX_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_ctx_hdr_t)
 
 typedef struct
 {
@@ -1566,7 +1566,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_CTX_EX_HDR_T_FLAGS SIZEOF(lbmc_cntl_umq_reg_resp_ctx_ex_hdr_t, flags)
 #define O_LBMC_CNTL_UMQ_REG_RESP_CTX_EX_HDR_T_STAMP OFFSETOF(lbmc_cntl_umq_reg_resp_ctx_ex_hdr_t, stamp)
 #define L_LBMC_CNTL_UMQ_REG_RESP_CTX_EX_HDR_T_STAMP SIZEOF(lbmc_cntl_umq_reg_resp_ctx_ex_hdr_t, stamp)
-#define L_LBMC_CNTL_UMQ_REG_RESP_CTX_EX_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_ctx_ex_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_CTX_EX_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_ctx_ex_hdr_t)
 
 typedef struct
 {
@@ -1577,7 +1577,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_ERR_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_reg_resp_err_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_REG_RESP_ERR_HDR_T_CODE OFFSETOF(lbmc_cntl_umq_reg_resp_err_hdr_t, code)
 #define L_LBMC_CNTL_UMQ_REG_RESP_ERR_HDR_T_CODE SIZEOF(lbmc_cntl_umq_reg_resp_err_hdr_t, code)
-#define L_LBMC_CNTL_UMQ_REG_RESP_ERR_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_err_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_ERR_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_err_hdr_t)
 
 typedef struct
 {
@@ -1585,7 +1585,7 @@ typedef struct
 } lbmc_cntl_umq_reg_resp_src_hdr_t;
 #define O_LBMC_CNTL_UMQ_REG_RESP_SRC_HDR_T_RCR_IDX OFFSETOF(lbmc_cntl_umq_reg_resp_src_hdr_t, rcr_idx)
 #define L_LBMC_CNTL_UMQ_REG_RESP_SRC_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_reg_resp_src_hdr_t, rcr_idx)
-#define L_LBMC_CNTL_UMQ_REG_RESP_SRC_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_src_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_SRC_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_src_hdr_t)
 
 typedef struct
 {
@@ -1602,7 +1602,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_RCV_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_reg_resp_rcv_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_REG_RESP_RCV_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_reg_resp_rcv_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_REG_RESP_RCV_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_reg_resp_rcv_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_REG_RESP_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_rcv_hdr_t)
 
 typedef struct
 {
@@ -1613,7 +1613,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_DEREG_RESP_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rcv_dereg_resp_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RCV_DEREG_RESP_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_rcv_dereg_resp_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_RCV_DEREG_RESP_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rcv_dereg_resp_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_RCV_DEREG_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_dereg_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_DEREG_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_dereg_resp_hdr_t)
 
 typedef struct
 {
@@ -1633,7 +1633,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_ULB_RCV_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_reg_resp_ulb_rcv_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_REG_RESP_ULB_RCV_HDR_T_CAPABILITIES OFFSETOF(lbmc_cntl_umq_reg_resp_ulb_rcv_hdr_t, capabilities)
 #define L_LBMC_CNTL_UMQ_REG_RESP_ULB_RCV_HDR_T_CAPABILITIES SIZEOF(lbmc_cntl_umq_reg_resp_ulb_rcv_hdr_t, capabilities)
-#define L_LBMC_CNTL_UMQ_REG_RESP_ULB_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_ulb_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_ULB_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_ulb_rcv_hdr_t)
 
 typedef struct
 {
@@ -1644,7 +1644,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_RESP_HDR_T_ULB_SRC_ID SIZEOF(lbmc_cntl_umq_ulb_rcv_dereg_resp_hdr_t, ulb_src_id)
 #define O_LBMC_CNTL_UMQ_ULB_RCV_DEREG_RESP_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_ulb_rcv_dereg_resp_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_RESP_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_ulb_rcv_dereg_resp_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_rcv_dereg_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_RCV_DEREG_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_rcv_dereg_resp_hdr_t)
 
 typedef struct
 {
@@ -1661,7 +1661,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_OBSERVER_RCV_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_reg_resp_observer_rcv_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_REG_RESP_OBSERVER_RCV_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_reg_resp_observer_rcv_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_REG_RESP_OBSERVER_RCV_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_reg_resp_observer_rcv_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_REG_RESP_OBSERVER_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_observer_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_OBSERVER_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_observer_rcv_hdr_t)
 
 typedef struct
 {
@@ -1672,7 +1672,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_RESP_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_observer_rcv_dereg_resp_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_RESP_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_observer_rcv_dereg_resp_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_RESP_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_observer_rcv_dereg_resp_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_observer_rcv_dereg_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_OBSERVER_RCV_DEREG_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_observer_rcv_dereg_resp_hdr_t)
 
 typedef struct
 {
@@ -1701,7 +1701,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_REG_RESP_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_reg_resp_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_REG_RESPID OFFSETOF(lbmc_cntl_umq_reg_resp_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_REG_RESP_HDR_T_REG_RESPID SIZEOF(lbmc_cntl_umq_reg_resp_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_REG_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_reg_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_REG_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_reg_resp_hdr_t)
 
 /* LBMC control UMQ ACK header(s) */
 typedef struct
@@ -1713,7 +1713,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ACK_MSGID_HDR_T_REGID SIZEOF(lbmc_cntl_umq_ack_msgid_hdr_t, regid)
 #define O_LBMC_CNTL_UMQ_ACK_MSGID_HDR_T_STAMP OFFSETOF(lbmc_cntl_umq_ack_msgid_hdr_t, stamp)
 #define L_LBMC_CNTL_UMQ_ACK_MSGID_HDR_T_STAMP SIZEOF(lbmc_cntl_umq_ack_msgid_hdr_t, stamp)
-#define L_LBMC_CNTL_UMQ_ACK_MSGID_HDR_T (gint) sizeof(lbmc_cntl_umq_ack_msgid_hdr_t)
+#define L_LBMC_CNTL_UMQ_ACK_MSGID_HDR_T (int) sizeof(lbmc_cntl_umq_ack_msgid_hdr_t)
 
 typedef struct
 {
@@ -1727,7 +1727,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ACK_STABLE_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_ack_stable_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_ACK_STABLE_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ack_stable_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ACK_STABLE_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ack_stable_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_ACK_STABLE_HDR_T (gint) sizeof(lbmc_cntl_umq_ack_stable_hdr_t)
+#define L_LBMC_CNTL_UMQ_ACK_STABLE_HDR_T (int) sizeof(lbmc_cntl_umq_ack_stable_hdr_t)
 
 typedef struct
 {
@@ -1744,7 +1744,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ACK_CR_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ack_cr_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_ACK_CR_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ack_cr_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ACK_CR_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ack_cr_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_ACK_CR_HDR_T (gint) sizeof(lbmc_cntl_umq_ack_cr_hdr_t)
+#define L_LBMC_CNTL_UMQ_ACK_CR_HDR_T (int) sizeof(lbmc_cntl_umq_ack_cr_hdr_t)
 
 typedef struct
 {
@@ -1761,7 +1761,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ACK_ULB_CR_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ack_ulb_cr_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_ACK_ULB_CR_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ack_ulb_cr_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ACK_ULB_CR_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ack_ulb_cr_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_ACK_ULB_CR_HDR_T (gint) sizeof(lbmc_cntl_umq_ack_ulb_cr_hdr_t)
+#define L_LBMC_CNTL_UMQ_ACK_ULB_CR_HDR_T (int) sizeof(lbmc_cntl_umq_ack_ulb_cr_hdr_t)
 
 typedef struct
 {
@@ -1778,7 +1778,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS SIZEOF(lbmc_cntl_umq_ack_hdr_t, msgs)
 #define O_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE OFFSETOF(lbmc_cntl_umq_ack_hdr_t, ack_type)
 #define L_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE SIZEOF(lbmc_cntl_umq_ack_hdr_t, ack_type)
-#define L_LBMC_CNTL_UMQ_ACK_HDR_T (gint) sizeof(lbmc_cntl_umq_ack_hdr_t)
+#define L_LBMC_CNTL_UMQ_ACK_HDR_T (int) sizeof(lbmc_cntl_umq_ack_hdr_t)
 
 /* UMQ control receiver control record header */
 typedef struct
@@ -1823,7 +1823,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCR_HDR_T_NUM_RAS SIZEOF(lbmc_cntl_umq_rcr_hdr_t, num_ras)
 #define O_LBMC_CNTL_UMQ_RCR_HDR_T_QUEUE_VER OFFSETOF(lbmc_cntl_umq_rcr_hdr_t, queue_ver)
 #define L_LBMC_CNTL_UMQ_RCR_HDR_T_QUEUE_VER SIZEOF(lbmc_cntl_umq_rcr_hdr_t, queue_ver)
-#define L_LBMC_CNTL_UMQ_RCR_HDR_T (gint) sizeof(lbmc_cntl_umq_rcr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCR_HDR_T (int) sizeof(lbmc_cntl_umq_rcr_hdr_t)
 
 /* LBMC control UMQ keepalive header(s) */
 typedef struct
@@ -1835,7 +1835,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_KA_SRC_HDR_T_TRANSPORT_IDX SIZEOF(lbmc_cntl_umq_ka_src_hdr_t, transport_idx)
 #define O_LBMC_CNTL_UMQ_KA_SRC_HDR_T_TOPIC_IDX OFFSETOF(lbmc_cntl_umq_ka_src_hdr_t, topic_idx)
 #define L_LBMC_CNTL_UMQ_KA_SRC_HDR_T_TOPIC_IDX SIZEOF(lbmc_cntl_umq_ka_src_hdr_t, topic_idx)
-#define L_LBMC_CNTL_UMQ_KA_SRC_HDR_T (gint) sizeof(lbmc_cntl_umq_ka_src_hdr_t)
+#define L_LBMC_CNTL_UMQ_KA_SRC_HDR_T (int) sizeof(lbmc_cntl_umq_ka_src_hdr_t)
 
 typedef struct
 {
@@ -1846,7 +1846,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_KA_RCV_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_ka_rcv_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_KA_RCV_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_ka_rcv_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_KA_RCV_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_ka_rcv_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_KA_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_ka_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_KA_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_ka_rcv_hdr_t)
 
 typedef struct
 {
@@ -1857,7 +1857,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_KA_ULB_RCV_HDR_T_ULB_SRC_ID SIZEOF(lbmc_cntl_umq_ka_ulb_rcv_hdr_t, ulb_src_id)
 #define O_LBMC_CNTL_UMQ_KA_ULB_RCV_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_ka_ulb_rcv_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_KA_ULB_RCV_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_ka_ulb_rcv_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_KA_ULB_RCV_HDR_T (gint) sizeof(lbmc_cntl_umq_ka_ulb_rcv_hdr_t)
+#define L_LBMC_CNTL_UMQ_KA_ULB_RCV_HDR_T (int) sizeof(lbmc_cntl_umq_ka_ulb_rcv_hdr_t)
 
 typedef struct
 {
@@ -1874,7 +1874,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_KA_ULB_RCV_RESP_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ka_ulb_rcv_resp_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_KA_ULB_RCV_RESP_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ka_ulb_rcv_resp_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_KA_ULB_RCV_RESP_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ka_ulb_rcv_resp_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_KA_ULB_RCV_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_ka_ulb_rcv_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_KA_ULB_RCV_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_ka_ulb_rcv_resp_hdr_t)
 
 typedef struct
 {
@@ -1903,7 +1903,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_KA_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_ka_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_KA_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ka_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_KA_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ka_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_KA_HDR_T (gint) sizeof(lbmc_cntl_umq_ka_hdr_t)
+#define L_LBMC_CNTL_UMQ_KA_HDR_T (int) sizeof(lbmc_cntl_umq_ka_hdr_t)
 
 /* LBMC control UMQ retransmission request header(s) */
 typedef struct
@@ -1912,7 +1912,7 @@ typedef struct
 } lbmc_cntl_umq_rxreq_regid_resp_hdr_t;
 #define O_LBMC_CNTL_UMQ_RXREQ_REGID_RESP_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_rxreq_regid_resp_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_RXREQ_REGID_RESP_HDR_T_REGID SIZEOF(lbmc_cntl_umq_rxreq_regid_resp_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_RXREQ_REGID_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_regid_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_REGID_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_regid_resp_hdr_t)
 
 typedef struct
 {
@@ -1926,7 +1926,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_ADDR_RESP_HDR_T_PORT SIZEOF(lbmc_cntl_umq_rxreq_addr_resp_hdr_t, port)
 #define O_LBMC_CNTL_UMQ_RXREQ_ADDR_RESP_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_rxreq_addr_resp_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_RXREQ_ADDR_RESP_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_rxreq_addr_resp_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_RXREQ_ADDR_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_addr_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_ADDR_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_addr_resp_hdr_t)
 
 typedef struct
 {
@@ -1940,7 +1940,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_MR_HDR_T_MSGID_REGID SIZEOF(lbmc_cntl_umq_rxreq_mr_hdr_t, msgid_regid)
 #define O_LBMC_CNTL_UMQ_RXREQ_MR_HDR_T_MSGID_STAMP OFFSETOF(lbmc_cntl_umq_rxreq_mr_hdr_t, msgid_stamp)
 #define L_LBMC_CNTL_UMQ_RXREQ_MR_HDR_T_MSGID_STAMP SIZEOF(lbmc_cntl_umq_rxreq_mr_hdr_t, msgid_stamp)
-#define L_LBMC_CNTL_UMQ_RXREQ_MR_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_mr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_MR_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_mr_hdr_t)
 
 typedef struct
 {
@@ -1963,7 +1963,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_HDR_T_MSGID_REGID SIZEOF(lbmc_cntl_umq_rxreq_ulb_mr_hdr_t, msgid_regid)
 #define O_LBMC_CNTL_UMQ_RXREQ_ULB_MR_HDR_T_MSGID_STAMP OFFSETOF(lbmc_cntl_umq_rxreq_ulb_mr_hdr_t, msgid_stamp)
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_HDR_T_MSGID_STAMP SIZEOF(lbmc_cntl_umq_rxreq_ulb_mr_hdr_t, msgid_stamp)
-#define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_ulb_mr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_ulb_mr_hdr_t)
 
 typedef struct
 {
@@ -1980,7 +1980,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_ABORT_HDR_T_MSGID_REGID SIZEOF(lbmc_cntl_umq_rxreq_ulb_mr_abort_hdr_t, msgid_regid)
 #define O_LBMC_CNTL_UMQ_RXREQ_ULB_MR_ABORT_HDR_T_MSGID_STAMP OFFSETOF(lbmc_cntl_umq_rxreq_ulb_mr_abort_hdr_t, msgid_stamp)
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_ABORT_HDR_T_MSGID_STAMP SIZEOF(lbmc_cntl_umq_rxreq_ulb_mr_abort_hdr_t, msgid_stamp)
-#define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_ABORT_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_ulb_mr_abort_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_ULB_MR_ABORT_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_ulb_mr_abort_hdr_t)
 
 typedef struct
 {
@@ -1988,7 +1988,7 @@ typedef struct
 } lbmc_cntl_umq_rxreq_qrcrr_hdr_t;
 #define O_LBMC_CNTL_UMQ_RXREQ_QRCRR_HDR_T_TSP OFFSETOF(lbmc_cntl_umq_rxreq_qrcrr_hdr_t, tsp)
 #define L_LBMC_CNTL_UMQ_RXREQ_QRCRR_HDR_T_TSP SIZEOF(lbmc_cntl_umq_rxreq_qrcrr_hdr_t, tsp)
-#define L_LBMC_CNTL_UMQ_RXREQ_QRCRR_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_qrcrr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_QRCRR_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_qrcrr_hdr_t)
 
 typedef struct
 {
@@ -1999,7 +1999,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_TRCRR_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rxreq_trcrr_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RXREQ_TRCRR_HDR_T_TSP OFFSETOF(lbmc_cntl_umq_rxreq_trcrr_hdr_t, tsp)
 #define L_LBMC_CNTL_UMQ_RXREQ_TRCRR_HDR_T_TSP SIZEOF(lbmc_cntl_umq_rxreq_trcrr_hdr_t, tsp)
-#define L_LBMC_CNTL_UMQ_RXREQ_TRCRR_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_trcrr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_TRCRR_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_trcrr_hdr_t)
 
 typedef struct
 {
@@ -2013,7 +2013,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rxreq_ulb_trcrr_hdr_t, assign_id)
 #define O_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_HDR_T_TSP OFFSETOF(lbmc_cntl_umq_rxreq_ulb_trcrr_hdr_t, tsp)
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_HDR_T_TSP SIZEOF(lbmc_cntl_umq_rxreq_ulb_trcrr_hdr_t, tsp)
-#define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_ulb_trcrr_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_ulb_trcrr_hdr_t)
 
 typedef struct
 {
@@ -2027,7 +2027,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_ABORT_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rxreq_ulb_trcrr_abort_hdr_t, assign_id)
 #define O_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_ABORT_HDR_T_TSP OFFSETOF(lbmc_cntl_umq_rxreq_ulb_trcrr_abort_hdr_t, tsp)
 #define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_ABORT_HDR_T_TSP SIZEOF(lbmc_cntl_umq_rxreq_ulb_trcrr_abort_hdr_t, tsp)
-#define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_ABORT_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_ulb_trcrr_abort_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_ULB_TRCRR_ABORT_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_ulb_trcrr_abort_hdr_t)
 
 typedef struct
 {
@@ -2044,7 +2044,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RXREQ_HDR_T_FLAGS SIZEOF(lbmc_cntl_umq_rxreq_hdr_t, flags)
 #define O_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE OFFSETOF(lbmc_cntl_umq_rxreq_hdr_t, rxreq_type)
 #define L_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE SIZEOF(lbmc_cntl_umq_rxreq_hdr_t, rxreq_type)
-#define L_LBMC_CNTL_UMQ_RXREQ_HDR_T (gint) sizeof(lbmc_cntl_umq_rxreq_hdr_t)
+#define L_LBMC_CNTL_UMQ_RXREQ_HDR_T (int) sizeof(lbmc_cntl_umq_rxreq_hdr_t)
 
 /* LBMC control UMQ queue management header */
 typedef struct
@@ -2056,7 +2056,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_QMGMT_HDR_T_NEXT_HDR SIZEOF(lbmc_cntl_umq_qmgmt_hdr_t, next_hdr)
 #define O_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN OFFSETOF(lbmc_cntl_umq_qmgmt_hdr_t, hdr_len)
 #define L_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN SIZEOF(lbmc_cntl_umq_qmgmt_hdr_t, hdr_len)
-#define L_LBMC_CNTL_UMQ_QMGMT_HDR_T (gint) sizeof(lbmc_cntl_umq_qmgmt_hdr_t)
+#define L_LBMC_CNTL_UMQ_QMGMT_HDR_T (int) sizeof(lbmc_cntl_umq_qmgmt_hdr_t)
 
 /* LBMC control UMQ resubmission request header */
 typedef struct
@@ -2089,7 +2089,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RESUB_REQ_HDR_T_RESP_PORT SIZEOF(lbmc_cntl_umq_resub_req_hdr_t, resp_port)
 #define O_LBMC_CNTL_UMQ_RESUB_REQ_HDR_T_APPSET_IDX OFFSETOF(lbmc_cntl_umq_resub_req_hdr_t, appset_idx)
 #define L_LBMC_CNTL_UMQ_RESUB_REQ_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_resub_req_hdr_t, appset_idx)
-#define L_LBMC_CNTL_UMQ_RESUB_REQ_HDR_T (gint) sizeof(lbmc_cntl_umq_resub_req_hdr_t)
+#define L_LBMC_CNTL_UMQ_RESUB_REQ_HDR_T (int) sizeof(lbmc_cntl_umq_resub_req_hdr_t)
 
 /* LBMC control UMQ resubmission response header */
 typedef struct
@@ -2122,7 +2122,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RESUB_RESP_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_resub_resp_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_RESUB_RESP_HDR_T_APPSET_IDX OFFSETOF(lbmc_cntl_umq_resub_resp_hdr_t, appset_idx)
 #define L_LBMC_CNTL_UMQ_RESUB_RESP_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_resub_resp_hdr_t, appset_idx)
-#define L_LBMC_CNTL_UMQ_RESUB_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_resub_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_RESUB_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_resub_resp_hdr_t)
 
 /* LBMC control topic interest header */
 typedef struct
@@ -2140,7 +2140,7 @@ typedef struct
 #define L_LBMC_CNTL_TOPIC_INTEREST_HDR_T_FLAGS SIZEOF(lbmc_cntl_topic_interest_hdr_t, flags)
 #define O_LBMC_CNTL_TOPIC_INTEREST_HDR_T_DOMAIN_ID OFFSETOF(lbmc_cntl_topic_interest_hdr_t, domain_id)
 #define L_LBMC_CNTL_TOPIC_INTEREST_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_topic_interest_hdr_t, domain_id)
-#define L_LBMC_CNTL_TOPIC_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_topic_interest_hdr_t)
+#define L_LBMC_CNTL_TOPIC_INTEREST_HDR_T (int) sizeof(lbmc_cntl_topic_interest_hdr_t)
 
 /* LBMC control pattern interest header */
 typedef struct
@@ -2164,7 +2164,7 @@ typedef struct
 #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_pattern_interest_hdr_t, domain_id)
 #define O_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_interest_hdr_t, idx)
 #define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_interest_hdr_t, idx)
-#define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_pattern_interest_hdr_t)
+#define L_LBMC_CNTL_PATTERN_INTEREST_HDR_T (int) sizeof(lbmc_cntl_pattern_interest_hdr_t)
 
 /* LBMC control advertisement header */
 typedef struct
@@ -2209,7 +2209,7 @@ typedef struct
 #define L_LBMC_CNTL_ADVERTISEMENT_HDR_T_PAT_IDX SIZEOF(lbmc_cntl_advertisement_hdr_t, pat_idx)
 #define O_LBMC_CNTL_ADVERTISEMENT_HDR_T_CTXINST OFFSETOF(lbmc_cntl_advertisement_hdr_t, ctxinst)
 #define L_LBMC_CNTL_ADVERTISEMENT_HDR_T_CTXINST SIZEOF(lbmc_cntl_advertisement_hdr_t, ctxinst)
-#define L_LBMC_CNTL_ADVERTISEMENT_HDR_T (gint) sizeof(lbmc_cntl_advertisement_hdr_t)
+#define L_LBMC_CNTL_ADVERTISEMENT_HDR_T (int) sizeof(lbmc_cntl_advertisement_hdr_t)
 
 /* LBMC control UME storename header. */
 #define O_LBMC_UME_STORENAME_HDR_T_NEXT_HDR OFFSETOF(lbmc_basic_hdr_t, next_hdr)
@@ -2257,7 +2257,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ULB_RCR_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ulb_rcr_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_ULB_RCR_HDR_T_NUM_RAS OFFSETOF(lbmc_cntl_umq_ulb_rcr_hdr_t, num_ras)
 #define L_LBMC_CNTL_UMQ_ULB_RCR_HDR_T_NUM_RAS SIZEOF(lbmc_cntl_umq_ulb_rcr_hdr_t, num_ras)
-#define L_LBMC_CNTL_UMQ_ULB_RCR_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_rcr_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_RCR_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_rcr_hdr_t)
 
 /* LBMC control UMQ load factor header */
 typedef struct
@@ -2281,7 +2281,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_LF_HDR_T_NUM_SRCS SIZEOF(lbmc_cntl_umq_lf_hdr_t, num_srcs)
 #define O_LBMC_CNTL_UMQ_LF_HDR_T_LF OFFSETOF(lbmc_cntl_umq_lf_hdr_t, lf)
 #define L_LBMC_CNTL_UMQ_LF_HDR_T_LF SIZEOF(lbmc_cntl_umq_lf_hdr_t, lf)
-#define L_LBMC_CNTL_UMQ_LF_HDR_T (gint) sizeof(lbmc_cntl_umq_lf_hdr_t)
+#define L_LBMC_CNTL_UMQ_LF_HDR_T (int) sizeof(lbmc_cntl_umq_lf_hdr_t)
 
 /* LBMC control context information header */
 typedef struct
@@ -2314,7 +2314,7 @@ typedef struct
 #define L_LBMC_CNTL_CTXINFO_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_ctxinfo_hdr_t, domain_id)
 #define O_LBMC_CNTL_CTXINFO_HDR_T_CTXINST OFFSETOF(lbmc_cntl_ctxinfo_hdr_t, ctxinst)
 #define L_LBMC_CNTL_CTXINFO_HDR_T_CTXINST SIZEOF(lbmc_cntl_ctxinfo_hdr_t, ctxinst)
-#define L_LBMC_CNTL_CTXINFO_HDR_T (gint) sizeof(lbmc_cntl_ctxinfo_hdr_t)
+#define L_LBMC_CNTL_CTXINFO_HDR_T (int) sizeof(lbmc_cntl_ctxinfo_hdr_t)
 
 /* LBMC control UME proxy source election header */
 typedef struct
@@ -2353,7 +2353,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_PSER_HDR_T_SOURCE_CTXINST SIZEOF(lbmc_cntl_ume_pser_hdr_t, source_ctxinst)
 #define O_LBMC_CNTL_UME_PSER_HDR_T_STORE_CTXINST OFFSETOF(lbmc_cntl_ume_pser_hdr_t, store_ctxinst)
 #define L_LBMC_CNTL_UME_PSER_HDR_T_STORE_CTXINST SIZEOF(lbmc_cntl_ume_pser_hdr_t, store_ctxinst)
-#define L_LBMC_CNTL_UME_PSER_HDR_T (gint) sizeof(lbmc_cntl_ume_pser_hdr_t)
+#define L_LBMC_CNTL_UME_PSER_HDR_T (int) sizeof(lbmc_cntl_ume_pser_hdr_t)
 
 /* LBMC domain header */
 typedef struct
@@ -2371,7 +2371,7 @@ typedef struct
 #define L_LBMC_DOMAIN_HDR_T_FLAGS SIZEOF(lbmc_domain_hdr_t, flags)
 #define O_LBMC_DOMAIN_HDR_T_DOMAIN OFFSETOF(lbmc_domain_hdr_t, domain)
 #define L_LBMC_DOMAIN_HDR_T_DOMAIN SIZEOF(lbmc_domain_hdr_t, domain)
-#define L_LBMC_DOMAIN_HDR_T (gint) sizeof(lbmc_domain_hdr_t)
+#define L_LBMC_DOMAIN_HDR_T (int) sizeof(lbmc_domain_hdr_t)
 
 /* LBMC control TNWG capabilities header */
 typedef struct
@@ -2399,7 +2399,7 @@ typedef struct
 #define L_LBMC_CNTL_TNWG_CAPABILITIES_HDR_T_CAPABILITIES3 SIZEOF(lbmc_cntl_tnwg_capabilities_hdr_t, capabilities3)
 #define O_LBMC_CNTL_TNWG_CAPABILITIES_HDR_T_CAPABILITIES4 OFFSETOF(lbmc_cntl_tnwg_capabilities_hdr_t, capabilities4)
 #define L_LBMC_CNTL_TNWG_CAPABILITIES_HDR_T_CAPABILITIES4 SIZEOF(lbmc_cntl_tnwg_capabilities_hdr_t, capabilities4)
-#define L_LBMC_CNTL_TNWG_CAPABILITIES_HDR_T (gint) sizeof(lbmc_cntl_tnwg_capabilities_hdr_t)
+#define L_LBMC_CNTL_TNWG_CAPABILITIES_HDR_T (int) sizeof(lbmc_cntl_tnwg_capabilities_hdr_t)
 
 /* LBMC pattern index header */
 typedef struct
@@ -2417,7 +2417,7 @@ typedef struct
 #define L_LBMC_PATIDX_HDR_T_FLAGS SIZEOF(lbmc_patidx_hdr_t, flags)
 #define O_LBMC_PATIDX_HDR_T_PATIDX OFFSETOF(lbmc_patidx_hdr_t, patidx)
 #define L_LBMC_PATIDX_HDR_T_PATIDX SIZEOF(lbmc_patidx_hdr_t, patidx)
-#define L_LBMC_PATIDX_HDR_T (gint) sizeof(lbmc_patidx_hdr_t)
+#define L_LBMC_PATIDX_HDR_T (int) sizeof(lbmc_patidx_hdr_t)
 
 /* LBMC control UME client lifetime header */
 typedef struct
@@ -2441,7 +2441,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_CLIENT_LIFETIME_HDR_T_LIFETIME SIZEOF(lbmc_cntl_ume_client_lifetime_hdr_t, lifetime)
 #define O_LBMC_CNTL_UME_CLIENT_LIFETIME_HDR_T_TTL OFFSETOF(lbmc_cntl_ume_client_lifetime_hdr_t, ttl)
 #define L_LBMC_CNTL_UME_CLIENT_LIFETIME_HDR_T_TTL SIZEOF(lbmc_cntl_ume_client_lifetime_hdr_t, ttl)
-#define L_LBMC_CNTL_UME_CLIENT_LIFETIME_HDR_T (gint) sizeof(lbmc_cntl_ume_client_lifetime_hdr_t)
+#define L_LBMC_CNTL_UME_CLIENT_LIFETIME_HDR_T (int) sizeof(lbmc_cntl_ume_client_lifetime_hdr_t)
 
 /* LBMC control UME session ID header */
 typedef struct
@@ -2459,7 +2459,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_SID_HDR_T_FLAGS SIZEOF(lbmc_cntl_ume_sid_hdr_t, flags)
 #define O_LBMC_CNTL_UME_SID_HDR_T_SID OFFSETOF(lbmc_cntl_ume_sid_hdr_t, sid)
 #define L_LBMC_CNTL_UME_SID_HDR_T_SID SIZEOF(lbmc_cntl_ume_sid_hdr_t, sid)
-#define L_LBMC_CNTL_UME_SID_HDR_T (gint) sizeof(lbmc_cntl_ume_sid_hdr_t)
+#define L_LBMC_CNTL_UME_SID_HDR_T (int) sizeof(lbmc_cntl_ume_sid_hdr_t)
 
 /* LBMC control UMQ index command header */
 typedef struct
@@ -2489,7 +2489,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_idx_cmd_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_REGID SIZEOF(lbmc_cntl_umq_idx_cmd_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_hdr_t)
 
 typedef struct
 {
@@ -2500,7 +2500,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_STOP_IDX_ASSIGN_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rcv_stop_idx_assign_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RCV_STOP_IDX_ASSIGN_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_rcv_stop_idx_assign_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_RCV_STOP_IDX_ASSIGN_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rcv_stop_idx_assign_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_RCV_STOP_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_stop_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_STOP_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_stop_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2511,7 +2511,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_START_IDX_ASSIGN_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rcv_start_idx_assign_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RCV_START_IDX_ASSIGN_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_rcv_start_idx_assign_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_RCV_START_IDX_ASSIGN_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rcv_start_idx_assign_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_RCV_START_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_start_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_START_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_start_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2532,7 +2532,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_rcv_release_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_rcv_release_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_rcv_release_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_rcv_release_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2549,7 +2549,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ulb_rcv_stop_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ulb_rcv_stop_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ulb_rcv_stop_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_ULB_RCV_STOP_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_rcv_stop_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_RCV_STOP_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_rcv_stop_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2566,7 +2566,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_ULB_RCV_START_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_ulb_rcv_start_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_ULB_RCV_START_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ulb_rcv_start_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ULB_RCV_START_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ulb_rcv_start_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_ULB_RCV_START_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_rcv_start_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_RCV_START_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_rcv_start_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2590,7 +2590,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ulb_idx_cmd_rcv_release_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ulb_idx_cmd_rcv_release_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_idx_cmd_rcv_release_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_idx_cmd_rcv_release_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2611,7 +2611,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_rcv_reserve_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_rcv_reserve_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_rcv_reserve_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_rcv_reserve_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2635,7 +2635,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_ulb_idx_cmd_rcv_reserve_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_ulb_idx_cmd_rcv_reserve_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_ulb_idx_cmd_rcv_reserve_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_ulb_idx_cmd_rcv_reserve_idx_assign_hdr_t)
 
 /* LBMC control UMQ index command response header */
 typedef struct
@@ -2665,7 +2665,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_REGID SIZEOF(lbmc_cntl_umq_idx_cmd_resp_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_hdr_t)
 
 typedef struct
 {
@@ -2676,7 +2676,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_err_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_CODE OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_err_hdr_t, code)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T_CODE SIZEOF(lbmc_cntl_umq_idx_cmd_resp_err_hdr_t, code)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_err_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ERR_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_err_hdr_t)
 
 typedef struct
 {
@@ -2687,7 +2687,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_stop_idx_assign_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_rcv_stop_idx_assign_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_stop_idx_assign_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_stop_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_STOP_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_stop_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2704,7 +2704,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_START_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_start_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_START_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_rcv_start_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_START_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_start_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_START_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_start_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_START_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_start_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2721,7 +2721,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RELEASE_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_release_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_rcv_release_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_release_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RELEASE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_release_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RELEASE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_release_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2738,7 +2738,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_stop_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_stop_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_STOP_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_stop_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_STOP_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_stop_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_STOP_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_stop_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2755,7 +2755,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_START_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_start_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_START_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_start_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_START_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_start_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_START_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_start_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_START_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_start_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2772,7 +2772,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RELEASE_IDX_ASSIGN_HDR_T_APPSET_IDX SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_release_idx_assign_hdr_t, appset_idx)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_release_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_release_idx_assign_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RELEASE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_release_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RELEASE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_release_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2796,7 +2796,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_rcv_reserve_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_rcv_reserve_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_reserve_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_rcv_reserve_idx_assign_hdr_t)
 
 typedef struct
 {
@@ -2820,7 +2820,7 @@ typedef struct
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_reserve_idx_assign_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_reserve_idx_assign_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T_INDEX O_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED
-#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T (gint) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_reserve_idx_assign_hdr_t)
+#define L_LBMC_CNTL_UMQ_IDX_CMD_RESP_ULB_RCV_RESERVE_IDX_ASSIGN_HDR_T (int) sizeof(lbmc_cntl_umq_idx_cmd_resp_ulb_rcv_reserve_idx_assign_hdr_t)
 
 /* LBMC originating domain header (same as lbmc_domain_hdr_t) */
 #define O_LBMC_ODOMAIN_HDR_T_NEXT_HDR OFFSETOF(lbmc_domain_hdr_t, next_hdr)
@@ -2831,7 +2831,7 @@ typedef struct
 #define L_LBMC_ODOMAIN_HDR_T_FLAGS SIZEOF(lbmc_domain_hdr_t, flags)
 #define O_LBMC_ODOMAIN_HDR_T_ODOMAIN OFFSETOF(lbmc_domain_hdr_t, domain)
 #define L_LBMC_ODOMAIN_HDR_T_ODOMAIN SIZEOF(lbmc_domain_hdr_t, domain)
-#define L_LBMC_ODOMAIN_HDR_T (gint) sizeof(lbmc_domain_hdr_t)
+#define L_LBMC_ODOMAIN_HDR_T (int) sizeof(lbmc_domain_hdr_t)
 
 /* LBMC stream header */
 typedef struct
@@ -2855,7 +2855,7 @@ typedef struct
 #define L_LBMC_STREAM_HDR_T_SQN SIZEOF(lbmc_stream_hdr_t, sqn)
 #define O_LBMC_STREAM_HDR_T_CTXINST OFFSETOF(lbmc_stream_hdr_t, ctxinst)
 #define L_LBMC_STREAM_HDR_T_CTXINST SIZEOF(lbmc_stream_hdr_t, ctxinst)
-#define L_LBMC_STREAM_HDR_T (gint) sizeof(lbmc_stream_hdr_t)
+#define L_LBMC_STREAM_HDR_T (int) sizeof(lbmc_stream_hdr_t)
 
 /* LBMC control topic multi-domain interest header */
 typedef struct
@@ -2876,7 +2876,7 @@ typedef struct
 #define L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_DOMAIN_COUNT SIZEOF(lbmc_cntl_topic_md_interest_hdr_t, domain_count)
 #define O_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_RES1 OFFSETOF(lbmc_cntl_topic_md_interest_hdr_t, res1)
 #define L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_RES1 SIZEOF(lbmc_cntl_topic_md_interest_hdr_t, res1)
-#define L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_topic_md_interest_hdr_t)
+#define L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T (int) sizeof(lbmc_cntl_topic_md_interest_hdr_t)
 
 /* LBMC control pattern multi-domain interest header */
 typedef struct
@@ -2903,7 +2903,7 @@ typedef struct
 #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_RES1 SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, res1)
 #define O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX OFFSETOF(lbmc_cntl_pattern_md_interest_hdr_t, idx)
 #define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_INDEX SIZEOF(lbmc_cntl_pattern_md_interest_hdr_t, idx)
-#define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T (gint) sizeof(lbmc_cntl_pattern_md_interest_hdr_t)
+#define L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T (int) sizeof(lbmc_cntl_pattern_md_interest_hdr_t)
 
 /* LBMC control TNWG keepalive header */
 typedef struct
@@ -2945,7 +2945,7 @@ typedef struct
 #define L_LBMC_CNTL_TNWG_KA_HDR_T_RESERVED_5 SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, reserved_5)
 #define O_LBMC_CNTL_TNWG_KA_HDR_T_RESERVED_6 OFFSETOF(lbmc_cntl_tnwg_ka_hdr_t, reserved_6)
 #define L_LBMC_CNTL_TNWG_KA_HDR_T_RESERVED_6 SIZEOF(lbmc_cntl_tnwg_ka_hdr_t, reserved_6)
-#define L_LBMC_CNTL_TNWG_KA_HDR_T (gint) sizeof(lbmc_cntl_tnwg_ka_hdr_t)
+#define L_LBMC_CNTL_TNWG_KA_HDR_T (int) sizeof(lbmc_cntl_tnwg_ka_hdr_t)
 
 /* LBMC control UME receiver keepalive header */
 typedef struct
@@ -2969,7 +2969,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_RECEIVER_KEEPALIVE_HDR_T_SESSION_ID SIZEOF(lbmc_cntl_ume_receiver_keepalive_hdr_t, session_id)
 #define O_LBMC_CNTL_UME_RECEIVER_KEEPALIVE_HDR_T_CTXINST OFFSETOF(lbmc_cntl_ume_receiver_keepalive_hdr_t, ctxinst)
 #define L_LBMC_CNTL_UME_RECEIVER_KEEPALIVE_HDR_T_CTXINST SIZEOF(lbmc_cntl_ume_receiver_keepalive_hdr_t, ctxinst)
-#define L_LBMC_CNTL_UME_RECEIVER_KEEPALIVE_HDR_T (gint) sizeof(lbmc_cntl_ume_receiver_keepalive_hdr_t)
+#define L_LBMC_CNTL_UME_RECEIVER_KEEPALIVE_HDR_T (int) sizeof(lbmc_cntl_ume_receiver_keepalive_hdr_t)
 
 /* LBMC control UMQ command header */
 typedef struct
@@ -2999,7 +2999,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_cmd_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_CMD_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_cmd_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_CMD_HDR_T_REGID SIZEOF(lbmc_cntl_umq_cmd_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_CMD_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_hdr_t)
 
 typedef struct
 {
@@ -3007,7 +3007,7 @@ typedef struct
 } lbmc_cntl_umq_ctx_queue_topic_list_hdr_t;
 #define O_LBMC_CNTL_UMQ_CTX_QUEUE_TOPIC_LIST_HDR_T_SERIAL_NUM OFFSETOF(lbmc_cntl_umq_ctx_queue_topic_list_hdr_t, serial_num)
 #define L_LBMC_CNTL_UMQ_CTX_QUEUE_TOPIC_LIST_HDR_T_SERIAL_NUM SIZEOF(lbmc_cntl_umq_ctx_queue_topic_list_hdr_t, serial_num)
-#define L_LBMC_CNTL_UMQ_CTX_QUEUE_TOPIC_LIST_HDR_T (gint) sizeof(lbmc_cntl_umq_ctx_queue_topic_list_hdr_t)
+#define L_LBMC_CNTL_UMQ_CTX_QUEUE_TOPIC_LIST_HDR_T (int) sizeof(lbmc_cntl_umq_ctx_queue_topic_list_hdr_t)
 
 typedef struct
 {
@@ -3027,7 +3027,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_NUM_MSGIDS SIZEOF(lbmc_cntl_umq_rcv_msg_retrieve_hdr_t, num_msgids)
 #define O_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_FLAGS OFFSETOF(lbmc_cntl_umq_rcv_msg_retrieve_hdr_t, flags)
 #define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_FLAGS SIZEOF(lbmc_cntl_umq_rcv_msg_retrieve_hdr_t, flags)
-#define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_msg_retrieve_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_msg_retrieve_hdr_t)
 
 typedef struct
 {
@@ -3038,7 +3038,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_ENTRY_HDR_T_REGID SIZEOF(lbmc_cntl_umq_rcv_msg_retrieve_entry_hdr_t, regid)
 #define O_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_ENTRY_HDR_T_STAMP OFFSETOF(lbmc_cntl_umq_rcv_msg_retrieve_entry_hdr_t, stamp)
 #define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_ENTRY_HDR_T_STAMP SIZEOF(lbmc_cntl_umq_rcv_msg_retrieve_entry_hdr_t, stamp)
-#define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_ENTRY_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_msg_retrieve_entry_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_ENTRY_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_msg_retrieve_entry_hdr_t)
 
 typedef struct
 {
@@ -3049,7 +3049,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_RCV_MSG_LIST_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_rcv_msg_list_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_RCV_MSG_LIST_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_rcv_msg_list_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_RCV_MSG_LIST_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_rcv_msg_list_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_RCV_MSG_LIST_HDR_T (gint) sizeof(lbmc_cntl_umq_rcv_msg_list_hdr_t)
+#define L_LBMC_CNTL_UMQ_RCV_MSG_LIST_HDR_T (int) sizeof(lbmc_cntl_umq_rcv_msg_list_hdr_t)
 
 /* LBMC control UMQ command response header */
 typedef struct
@@ -3079,7 +3079,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_INST_IDX SIZEOF(lbmc_cntl_umq_cmd_resp_hdr_t, inst_idx)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_REGID OFFSETOF(lbmc_cntl_umq_cmd_resp_hdr_t, regid)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_REGID SIZEOF(lbmc_cntl_umq_cmd_resp_hdr_t, regid)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_hdr_t)
 
 typedef struct
 {
@@ -3090,7 +3090,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t)
 
 typedef struct
 {
@@ -3104,7 +3104,7 @@ typedef struct
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_FLAGS SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, flags)
 #define O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_RESERVED OFFSETOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, reserved)
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_RESERVED SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t, reserved)
-#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T (gint) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t)
+#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T (int) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_hdr_t)
 
 typedef struct
 {
@@ -3127,7 +3127,7 @@ typedef struct
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T_STATUS SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_entry_hdr_t, status)
 #define O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T_RESERVED OFFSETOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_entry_hdr_t, reserved)
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T_RESERVED SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_entry_hdr_t, reserved)
-#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T (gint) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_entry_hdr_t)
+#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T (int) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_retrieve_entry_hdr_t)
 
 typedef struct
 {
@@ -3138,7 +3138,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T_RCR_IDX SIZEOF(lbmc_cntl_umq_cmd_resp_rcv_msg_list_hdr_t, rcr_idx)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T_ASSIGN_ID OFFSETOF(lbmc_cntl_umq_cmd_resp_rcv_msg_list_hdr_t, assign_id)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T_ASSIGN_ID SIZEOF(lbmc_cntl_umq_cmd_resp_rcv_msg_list_hdr_t, assign_id)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_rcv_msg_list_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_rcv_msg_list_hdr_t)
 
 typedef struct
 {
@@ -3146,7 +3146,7 @@ typedef struct
 } lbmc_xcntl_umq_cmd_resp_rcv_msg_list_hdr_t;
 #define O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T_NUM_MSGS OFFSETOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_hdr_t, num_msgs)
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T_NUM_MSGS SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_hdr_t, num_msgs)
-#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T (gint) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_hdr_t)
+#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T (int) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_hdr_t)
 
 typedef struct
 {
@@ -3157,7 +3157,7 @@ typedef struct
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_MSG_ENTRY_HDR_T_REGID SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_msg_entry_hdr_t, regid)
 #define O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_MSG_ENTRY_HDR_T_STAMP OFFSETOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_msg_entry_hdr_t, stamp)
 #define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_MSG_ENTRY_HDR_T_STAMP SIZEOF(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_msg_entry_hdr_t, stamp)
-#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_MSG_ENTRY_HDR_T (gint) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_msg_entry_hdr_t)
+#define L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_MSG_ENTRY_HDR_T (int) sizeof(lbmc_xcntl_umq_cmd_resp_rcv_msg_list_msg_entry_hdr_t)
 
 typedef struct
 {
@@ -3165,7 +3165,7 @@ typedef struct
 } lbmc_cntl_umq_cmd_resp_ctx_topic_list_hdr_t;
 #define O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_HDR_T_NUM_TOPICS OFFSETOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_hdr_t, num_topics)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_HDR_T_NUM_TOPICS SIZEOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_hdr_t, num_topics)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_hdr_t)
 
 typedef struct
 {
@@ -3182,7 +3182,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN SIZEOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_appset_entry_hdr_t, appset_name_len)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_appset_entry_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_appset_entry_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_appset_entry_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_appset_entry_hdr_t)
 
 typedef struct
 {
@@ -3199,7 +3199,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN SIZEOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_topic_entry_hdr_t, topic_len)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_RESERVED OFFSETOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_topic_entry_hdr_t, reserved)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_cmd_resp_ctx_topic_list_topic_entry_hdr_t, reserved)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_topic_entry_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_ctx_topic_list_topic_entry_hdr_t)
 
 typedef struct
 {
@@ -3210,7 +3210,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T_RESERVED SIZEOF(lbmc_cntl_umq_cmd_resp_err_hdr_t, reserved)
 #define O_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T_CODE OFFSETOF(lbmc_cntl_umq_cmd_resp_err_hdr_t, code)
 #define L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T_CODE SIZEOF(lbmc_cntl_umq_cmd_resp_err_hdr_t, code)
-#define L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T (gint) sizeof(lbmc_cntl_umq_cmd_resp_err_hdr_t)
+#define L_LBMC_CNTL_UMQ_CMD_RESP_ERR_HDR_T (int) sizeof(lbmc_cntl_umq_cmd_resp_err_hdr_t)
 
 /* LBMC control source registration information request header. */
 typedef struct
@@ -3231,7 +3231,7 @@ typedef struct
 #define L_LBMC_CNTL_SRI_REQ_HDR_T_TRANSPORT_IDX SIZEOF(lbmc_cntl_sri_req_hdr_t, transport_idx)
 #define O_LBMC_CNTL_SRI_REQ_HDR_T_TOPIC_IDX OFFSETOF(lbmc_cntl_sri_req_hdr_t, topic_idx)
 #define L_LBMC_CNTL_SRI_REQ_HDR_T_TOPIC_IDX SIZEOF(lbmc_cntl_sri_req_hdr_t, topic_idx)
-#define L_LBMC_CNTL_SRI_REQ_HDR_T (gint) sizeof(lbmc_cntl_sri_req_hdr_t)
+#define L_LBMC_CNTL_SRI_REQ_HDR_T (int) sizeof(lbmc_cntl_sri_req_hdr_t)
 
 /* LBMC control UME store domain header. */
 typedef struct
@@ -3249,7 +3249,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_STORE_DOMAIN_HDR_T_FLAGS SIZEOF(lbmc_cntl_ume_store_domain_hdr_t, flags)
 #define O_LBMC_CNTL_UME_STORE_DOMAIN_HDR_T_DOMAIN OFFSETOF(lbmc_cntl_ume_store_domain_hdr_t, domain)
 #define L_LBMC_CNTL_UME_STORE_DOMAIN_HDR_T_DOMAIN SIZEOF(lbmc_cntl_ume_store_domain_hdr_t, domain)
-#define L_LBMC_CNTL_UME_STORE_DOMAIN_HDR_T (gint) sizeof(lbmc_cntl_ume_store_domain_hdr_t)
+#define L_LBMC_CNTL_UME_STORE_DOMAIN_HDR_T (int) sizeof(lbmc_cntl_ume_store_domain_hdr_t)
 
 /* LBMC control source registration information header. */
 typedef struct
@@ -3273,7 +3273,7 @@ typedef struct
 #define L_LBMC_CNTL_SRI_HDR_T_LOW_SQN SIZEOF(lbmc_cntl_sri_hdr_t, low_sqn)
 #define O_LBMC_CNTL_SRI_HDR_T_HIGH_SQN OFFSETOF(lbmc_cntl_sri_hdr_t, high_sqn)
 #define L_LBMC_CNTL_SRI_HDR_T_HIGH_SQN SIZEOF(lbmc_cntl_sri_hdr_t, high_sqn)
-#define L_LBMC_CNTL_SRI_HDR_T (gint) sizeof(lbmc_cntl_sri_hdr_t)
+#define L_LBMC_CNTL_SRI_HDR_T (int) sizeof(lbmc_cntl_sri_hdr_t)
 
 /* LBMC control route information header. */
 typedef struct
@@ -3315,7 +3315,7 @@ typedef struct
 #define L_LBMC_CNTL_ROUTE_INFO_HDR_T_RESERVED1 SIZEOF(lbmc_cntl_route_info_hdr_t, reserved1)
 #define O_LBMC_CNTL_ROUTE_INFO_HDR_T_RESERVED2 OFFSETOF(lbmc_cntl_route_info_hdr_t, reserved2)
 #define L_LBMC_CNTL_ROUTE_INFO_HDR_T_RESERVED2 SIZEOF(lbmc_cntl_route_info_hdr_t, reserved2)
-#define L_LBMC_CNTL_ROUTE_INFO_HDR_T (gint) sizeof(lbmc_cntl_route_info_hdr_t)
+#define L_LBMC_CNTL_ROUTE_INFO_HDR_T (int) sizeof(lbmc_cntl_route_info_hdr_t)
 
 /* LBMC control route information neighbor header. */
 typedef struct
@@ -3339,7 +3339,7 @@ typedef struct
 #define L_LBMC_CNTL_ROUTE_INFO_NEIGHBOR_HDR_T_INGRESS_COST SIZEOF(lbmc_cntl_route_info_neighbor_hdr_t, ingress_cost)
 #define O_LBMC_CNTL_ROUTE_INFO_NEIGHBOR_HDR_T_EGRESS_COST OFFSETOF(lbmc_cntl_route_info_neighbor_hdr_t, egress_cost)
 #define L_LBMC_CNTL_ROUTE_INFO_NEIGHBOR_HDR_T_EGRESS_COST SIZEOF(lbmc_cntl_route_info_neighbor_hdr_t, egress_cost)
-#define L_LBMC_CNTL_ROUTE_INFO_NEIGHBOR_HDR_T (gint) sizeof(lbmc_cntl_route_info_neighbor_hdr_t)
+#define L_LBMC_CNTL_ROUTE_INFO_NEIGHBOR_HDR_T (int) sizeof(lbmc_cntl_route_info_neighbor_hdr_t)
 
 /* LBMC control gateway name header. */
 #define O_LBMC_CNTL_GATEWAY_NAME_HDR_T_NEXT_HDR OFFSETOF(lbmc_basic_hdr_t, next_hdr)
@@ -3366,7 +3366,7 @@ typedef struct
 #define L_LBMC_CNTL_AUTH_GENERIC_HDR_T_FLAGS SIZEOF(lbmc_cntl_auth_generic_hdr_t, flags)
 #define O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID OFFSETOF(lbmc_cntl_auth_generic_hdr_t, opid)
 #define L_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID SIZEOF(lbmc_cntl_auth_generic_hdr_t, opid)
-#define L_LBMC_CNTL_AUTH_GENERIC_HDR_T (gint) sizeof(lbmc_cntl_auth_generic_hdr_t)
+#define L_LBMC_CNTL_AUTH_GENERIC_HDR_T (int) sizeof(lbmc_cntl_auth_generic_hdr_t)
 
 /* LBMC control authentication request header. */
 typedef struct
@@ -3387,7 +3387,7 @@ typedef struct
 #define L_LBMC_CNTL_AUTH_REQUEST_HDR_T_OPID SIZEOF(lbmc_cntl_auth_request_hdr_t, opid)
 #define O_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN OFFSETOF(lbmc_cntl_auth_request_hdr_t, user_len)
 #define L_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN SIZEOF(lbmc_cntl_auth_request_hdr_t, user_len)
-#define L_LBMC_CNTL_AUTH_REQUEST_HDR_T (gint) sizeof(lbmc_cntl_auth_request_hdr_t)
+#define L_LBMC_CNTL_AUTH_REQUEST_HDR_T (int) sizeof(lbmc_cntl_auth_request_hdr_t)
 
 /* LBMC control authentication challenge header. */
 typedef struct
@@ -3417,7 +3417,7 @@ typedef struct
 #define L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_SALT_LEN SIZEOF(lbmc_cntl_auth_challenge_hdr_t, salt_len)
 #define O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN OFFSETOF(lbmc_cntl_auth_challenge_hdr_t, pubkey_len)
 #define L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN SIZEOF(lbmc_cntl_auth_challenge_hdr_t, pubkey_len)
-#define L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T (gint) sizeof(lbmc_cntl_auth_challenge_hdr_t)
+#define L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T (int) sizeof(lbmc_cntl_auth_challenge_hdr_t)
 
 /* LBMC control authentication challenge response header. */
 typedef struct
@@ -3441,7 +3441,7 @@ typedef struct
 #define L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_PUBKEY_LEN SIZEOF(lbmc_cntl_auth_challenge_rsp_hdr_t, pubkey_len)
 #define O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN OFFSETOF(lbmc_cntl_auth_challenge_rsp_hdr_t, evidence_len)
 #define L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN SIZEOF(lbmc_cntl_auth_challenge_rsp_hdr_t, evidence_len)
-#define L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T (gint) sizeof(lbmc_cntl_auth_challenge_rsp_hdr_t)
+#define L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T (int) sizeof(lbmc_cntl_auth_challenge_rsp_hdr_t)
 
 /* LBMC control authentication result header. */
 typedef struct
@@ -3462,7 +3462,7 @@ typedef struct
 #define L_LBMC_CNTL_AUTH_RESULT_HDR_T_OPID SIZEOF(lbmc_cntl_auth_result_hdr_t, opid)
 #define O_LBMC_CNTL_AUTH_RESULT_HDR_T_RESULT OFFSETOF(lbmc_cntl_auth_result_hdr_t, result)
 #define L_LBMC_CNTL_AUTH_RESULT_HDR_T_RESULT SIZEOF(lbmc_cntl_auth_result_hdr_t, result)
-#define L_LBMC_CNTL_AUTH_RESULT_HDR_T (gint) sizeof(lbmc_cntl_auth_result_hdr_t)
+#define L_LBMC_CNTL_AUTH_RESULT_HDR_T (int) sizeof(lbmc_cntl_auth_result_hdr_t)
 
 /* LBMC control HMAC header. */
 typedef struct
@@ -3483,7 +3483,7 @@ typedef struct
 #define L_LBMC_CNTL_HMAC_HDR_T_PADDING SIZEOF(lbmc_cntl_hmac_hdr_t, padding)
 #define O_LBMC_CNTL_HMAC_HDR_T_DATA OFFSETOF(lbmc_cntl_hmac_hdr_t, data)
 #define L_LBMC_CNTL_HMAC_HDR_T_DATA SIZEOF(lbmc_cntl_hmac_hdr_t, data)
-#define L_LBMC_CNTL_HMAC_HDR_T (gint) sizeof(lbmc_cntl_hmac_hdr_t)
+#define L_LBMC_CNTL_HMAC_HDR_T (int) sizeof(lbmc_cntl_hmac_hdr_t)
 
 /* LBMC control UMQ session ID header. */
 typedef struct
@@ -3504,7 +3504,7 @@ typedef struct
 #define L_LBMC_CNTL_UMQ_SID_HDR_T_KEY SIZEOF(lbmc_cntl_umq_sid_hdr_t, key)
 #define O_LBMC_CNTL_UMQ_SID_HDR_T_SID OFFSETOF(lbmc_cntl_umq_sid_hdr_t, sid)
 #define L_LBMC_CNTL_UMQ_SID_HDR_T_SID SIZEOF(lbmc_cntl_umq_sid_hdr_t, sid)
-#define L_LBMC_CNTL_UMQ_SID_HDR_T (gint) sizeof(lbmc_cntl_umq_sid_hdr_t)
+#define L_LBMC_CNTL_UMQ_SID_HDR_T (int) sizeof(lbmc_cntl_umq_sid_hdr_t)
 
 /* LBMC destination header. */
 typedef struct
@@ -3543,7 +3543,7 @@ typedef struct
 #define L_LBMC_DESTINATION_HDR_T_ORIG_PORT SIZEOF(lbmc_destination_hdr_t, orig_port)
 #define O_LBMC_DESTINATION_HDR_T_RESERVED OFFSETOF(lbmc_destination_hdr_t, reserved)
 #define L_LBMC_DESTINATION_HDR_T_RESERVED SIZEOF(lbmc_destination_hdr_t, reserved)
-#define L_LBMC_DESTINATION_HDR_T (gint) sizeof(lbmc_destination_hdr_t)
+#define L_LBMC_DESTINATION_HDR_T (int) sizeof(lbmc_destination_hdr_t)
 
 /* LBMC topic index header. */
 typedef struct
@@ -3561,7 +3561,7 @@ typedef struct
 #define L_LBMC_TOPIC_IDX_HDR_T_FLAGS SIZEOF(lbmc_topic_idx_hdr_t, flags)
 #define O_LBMC_TOPIC_IDX_HDR_T_TIDX OFFSETOF(lbmc_topic_idx_hdr_t, tidx)
 #define L_LBMC_TOPIC_IDX_HDR_T_TIDX SIZEOF(lbmc_topic_idx_hdr_t, tidx)
-#define L_LBMC_TOPIC_IDX_HDR_T (gint) sizeof(lbmc_topic_idx_hdr_t)
+#define L_LBMC_TOPIC_IDX_HDR_T (int) sizeof(lbmc_topic_idx_hdr_t)
 
 /* LBMC control topic source header. */
 typedef struct
@@ -3579,7 +3579,7 @@ typedef struct
 #define L_LBMC_CNTL_TOPIC_SOURCE_HDR_T_FLAGS SIZEOF(lbmc_cntl_topic_source_hdr_t, flags)
 #define O_LBMC_CNTL_TOPIC_SOURCE_HDR_T_DOMAIN_ID OFFSETOF(lbmc_cntl_topic_source_hdr_t, domain_id)
 #define L_LBMC_CNTL_TOPIC_SOURCE_HDR_T_DOMAIN_ID SIZEOF(lbmc_cntl_topic_source_hdr_t, domain_id)
-#define L_LBMC_CNTL_TOPIC_SOURCE_HDR_T (gint) sizeof(lbmc_cntl_topic_source_hdr_t)
+#define L_LBMC_CNTL_TOPIC_SOURCE_HDR_T (int) sizeof(lbmc_cntl_topic_source_hdr_t)
 
 /* LBMC control topic source extended functionality header. */
 typedef struct
@@ -3606,7 +3606,7 @@ typedef struct
 #define L_LBMC_CNTL_TOPIC_SOURCE_EXFUNC_HDR_T_UNUSED SIZEOF(lbmc_cntl_topic_source_exfunc_hdr_t, unused)
 #define O_LBMC_CNTL_TOPIC_SOURCE_EXFUNC_HDR_T_FUNCTIONALITY_FLAGS OFFSETOF(lbmc_cntl_topic_source_exfunc_hdr_t, functionality_flags)
 #define L_LBMC_CNTL_TOPIC_SOURCE_EXFUNC_HDR_T_FUNCTIONALITY_FLAGS SIZEOF(lbmc_cntl_topic_source_exfunc_hdr_t, functionality_flags)
-#define L_LBMC_CNTL_TOPIC_SOURCE_EXFUNC_HDR_T (gint) sizeof(lbmc_cntl_topic_source_exfunc_hdr_t)
+#define L_LBMC_CNTL_TOPIC_SOURCE_EXFUNC_HDR_T (int) sizeof(lbmc_cntl_topic_source_exfunc_hdr_t)
 
 /* LBM control UME proxy source election token header. */
 typedef struct
@@ -3627,7 +3627,7 @@ typedef struct
 #define L_LBMC_CNTL_UME_PSRC_ELECTION_TOKEN_HDR_T_STORE_INDEX SIZEOF(lbmc_cntl_ume_psrc_election_token_hdr_t, store_index)
 #define O_LBMC_CNTL_UME_PSRC_ELECTION_TOKEN_HDR_T_TOKEN OFFSETOF(lbmc_cntl_ume_psrc_election_token_hdr_t, token)
 #define L_LBMC_CNTL_UME_PSRC_ELECTION_TOKEN_HDR_T_TOKEN SIZEOF(lbmc_cntl_ume_psrc_election_token_hdr_t, token)
-#define L_LBMC_CNTL_UME_PSRC_ELECTION_TOKEN_HDR_T (gint) sizeof(lbmc_cntl_ume_psrc_election_token_hdr_t)
+#define L_LBMC_CNTL_UME_PSRC_ELECTION_TOKEN_HDR_T (int) sizeof(lbmc_cntl_ume_psrc_election_token_hdr_t)
 
 /* LBM control TCP session ID header. */
 typedef struct
@@ -3645,7 +3645,7 @@ typedef struct
 #define L_LBMC_CNTL_TCP_SID_HDR_T_FLAGS SIZEOF(lbmc_cntl_tcp_sid_hdr_t, flags)
 #define O_LBMC_CNTL_TCP_SID_HDR_T_SID OFFSETOF(lbmc_cntl_tcp_sid_hdr_t, sid)
 #define L_LBMC_CNTL_TCP_SID_HDR_T_SID SIZEOF(lbmc_cntl_tcp_sid_hdr_t, sid)
-#define L_LBMC_CNTL_TCP_SID_HDR_T (gint) sizeof(lbmc_cntl_tcp_sid_hdr_t)
+#define L_LBMC_CNTL_TCP_SID_HDR_T (int) sizeof(lbmc_cntl_tcp_sid_hdr_t)
 
 /* LBMC extended configuration option. */
 typedef struct
@@ -3657,7 +3657,7 @@ typedef struct
 #define L_LBMC_EXTOPT_CFGOPT_HDR_T_SCOPE SIZEOF(lbmc_extopt_cfgopt_hdr_t, scope)
 #define O_LBMC_EXTOPT_CFGOPT_HDR_T_PARENT OFFSETOF(lbmc_extopt_cfgopt_hdr_t, scope)
 #define L_LBMC_EXTOPT_CFGOPT_HDR_T_PARENT SIZEOF(lbmc_extopt_cfgopt_hdr_t, scope)
-#define L_LBMC_EXTOPT_CFGOPT_HDR_T (gint) sizeof(lbmc_extopt_cfgopt_hdr_t)
+#define L_LBMC_EXTOPT_CFGOPT_HDR_T (int) sizeof(lbmc_extopt_cfgopt_hdr_t)
 
 /* LBMC extended option. */
 typedef struct
@@ -3681,7 +3681,7 @@ typedef struct
 #define L_LBMC_EXTOPT_HDR_T_SUBTYPE SIZEOF(lbmc_extopt_hdr_t, subtype)
 #define O_LBMC_EXTOPT_HDR_T_FRAGMENT_OFFSET OFFSETOF(lbmc_extopt_hdr_t, fragment_offset)
 #define L_LBMC_EXTOPT_HDR_T_FRAGMENT_OFFSET SIZEOF(lbmc_extopt_hdr_t, fragment_offset)
-#define L_LBMC_EXTOPT_HDR_T (gint) sizeof(lbmc_extopt_hdr_t)
+#define L_LBMC_EXTOPT_HDR_T (int) sizeof(lbmc_extopt_hdr_t)
 
 /* LBMC message properties. */
 typedef struct
@@ -3699,7 +3699,7 @@ typedef struct
 #define L_LBM_MSG_PROPERTIES_HDR_T_HASH SIZEOF(lbm_msg_properties_hdr_t, hash)
 #define O_LBM_MSG_PROPERTIES_HDR_T_TYPE OFFSETOF(lbm_msg_properties_hdr_t, type)
 #define L_LBM_MSG_PROPERTIES_HDR_T_TYPE SIZEOF(lbm_msg_properties_hdr_t, type)
-#define L_LBM_MSG_PROPERTIES_HDR_T (gint) sizeof(lbm_msg_properties_hdr_t)
+#define L_LBM_MSG_PROPERTIES_HDR_T (int) sizeof(lbm_msg_properties_hdr_t)
 
 typedef struct
 {
@@ -3716,7 +3716,7 @@ typedef struct
 #define L_LBM_MSG_PROPERTIES_DATA_T_VERTYPE SIZEOF(lbm_msg_properties_data_t, vertype)
 #define O_LBM_MSG_PROPERTIES_DATA_T_RES OFFSETOF(lbm_msg_properties_data_t, res)
 #define L_LBM_MSG_PROPERTIES_DATA_T_RES SIZEOF(lbm_msg_properties_data_t, res)
-#define L_LBM_MSG_PROPERTIES_DATA_T (gint) sizeof(lbm_msg_properties_data_t)
+#define L_LBM_MSG_PROPERTIES_DATA_T (int) sizeof(lbm_msg_properties_data_t)
 
 /* Unhandled header. */
 #define O_LBMC_UNHANDLED_HDR_T_NEXT_HDR OFFSETOF(lbmc_basic_hdr_t, next_hdr)
@@ -5742,262 +5742,262 @@ static int hf_lbmc_reassembly_fragment;
 static int hf_reassembly_frame;
 
 /* Protocol trees */
-static gint ett_lbmc;
-static gint ett_lbmc_frag;
-static gint ett_lbmc_frag_flags;
-static gint ett_lbmc_batch;
-static gint ett_lbmc_batch_flags;
-static gint ett_lbmc_tcp_request;
-static gint ett_lbmc_tcp_request_flags;
-static gint ett_lbmc_topicname;
-static gint ett_lbmc_topicname_flags;
-static gint ett_lbmc_apphdr;
-static gint ett_lbmc_apphdr_chain;
-static gint ett_lbmc_apphdr_chain_element;
-static gint ett_lbmc_apphdr_chain_msgprop;
-static gint ett_lbmc_umq_msgid;
-static gint ett_lbmc_umq_msgid_flags;
-static gint ett_lbmc_umq_sqd_rcv;
-static gint ett_lbmc_umq_sqd_rcv_flags;
-static gint ett_lbmc_umq_resub;
-static gint ett_lbmc_umq_resub_flags;
-static gint ett_lbmc_otid;
-static gint ett_lbmc_otid_flags;
-static gint ett_lbmc_ctxinst;
-static gint ett_lbmc_ctxinst_flags;
-static gint ett_lbmc_ctxinstd;
-static gint ett_lbmc_ctxinstr;
-static gint ett_lbmc_srcidx;
-static gint ett_lbmc_srcidx_flags;
-static gint ett_lbmc_umq_ulb_msg;
-static gint ett_lbmc_umq_ulb_msg_flags;
-static gint ett_lbmc_ssf_init;
-static gint ett_lbmc_ssf_init_flags;
-static gint ett_lbmc_ssf_creq;
-static gint ett_lbmc_ssf_creq_flags;
-static gint ett_lbmc_ume_preg;
-static gint ett_lbmc_ume_preg_flags;
-static gint ett_lbmc_ume_preg_resp;
-static gint ett_lbmc_ume_preg_resp_code;
-static gint ett_lbmc_ume_preg_resp_marker;
-static gint ett_lbmc_ume_ack;
-static gint ett_lbmc_ume_ack_flags;
-static gint ett_lbmc_ume_rxreq;
-static gint ett_lbmc_ume_rxreq_flags;
-static gint ett_lbmc_ume_keepalive;
-static gint ett_lbmc_ume_keepalive_flags;
-static gint ett_lbmc_ume_storeid;
-static gint ett_lbmc_ume_ranged_ack;
-static gint ett_lbmc_ume_ranged_ack_flags;
-static gint ett_lbmc_ume_ack_id;
-static gint ett_lbmc_ume_ack_id_flags;
-static gint ett_lbmc_ume_capability;
-static gint ett_lbmc_ume_capability_flags;
-static gint ett_lbmc_ume_proxy_src;
-static gint ett_lbmc_ume_proxy_src_flags;
-static gint ett_lbmc_ume_store_group;
-static gint ett_lbmc_ume_store_group_flags;
-static gint ett_lbmc_ume_store;
-static gint ett_lbmc_ume_store_flags;
-static gint ett_lbmc_ume_lj_info;
-static gint ett_lbmc_ume_lj_info_flags;
-static gint ett_lbmc_tsni;
-static gint ett_lbmc_tsni_rec;
-static gint ett_lbmc_umq_reg;
-static gint ett_lbmc_umq_reg_flags;
-static gint ett_lbmc_umq_reg_reg_ctx;
-static gint ett_lbmc_umq_reg_reg_src;
-static gint ett_lbmc_umq_reg_reg_rcv;
-static gint ett_lbmc_umq_reg_rcv_dereg;
-static gint ett_lbmc_umq_reg_reg_ulb_rcv;
-static gint ett_lbmc_umq_reg_ulb_rcv_dereg;
-static gint ett_lbmc_umq_reg_reg_observer_rcv;
-static gint ett_lbmc_umq_reg_observer_rcv_dereg;
-static gint ett_lbmc_umq_reg_resp;
-static gint ett_lbmc_umq_reg_resp_flags;
-static gint ett_lbmc_umq_reg_resp_reg_ctx;
-static gint ett_lbmc_umq_reg_resp_reg_ctx_ex;
-static gint ett_lbmc_umq_reg_resp_reg_ctx_ex_flags;
-static gint ett_lbmc_umq_reg_resp_err;
-static gint ett_lbmc_umq_reg_resp_reg_src;
-static gint ett_lbmc_umq_reg_resp_reg_rcv;
-static gint ett_lbmc_umq_reg_resp_rcv_dereg;
-static gint ett_lbmc_umq_reg_resp_reg_ulb_rcv;
-static gint ett_lbmc_umq_reg_resp_ulb_rcv_dereg;
-static gint ett_lbmc_umq_reg_resp_reg_observer_rcv;
-static gint ett_lbmc_umq_reg_resp_observer_rcv_dereg;
-static gint ett_lbmc_umq_ack;
-static gint ett_lbmc_umq_ack_msgs;
-static gint ett_lbmc_umq_ack_msgid;
-static gint ett_lbmc_umq_ack_stable;
-static gint ett_lbmc_umq_ack_cr;
-static gint ett_lbmc_umq_ack_ulb_cr;
-static gint ett_lbmc_umq_rcr;
-static gint ett_lbmc_umq_rcr_flags;
-static gint ett_lbmc_umq_ka;
-static gint ett_lbmc_umq_ka_flags;
-static gint ett_lbmc_umq_ka_src;
-static gint ett_lbmc_umq_ka_rcv;
-static gint ett_lbmc_umq_ka_ulb_rcv;
-static gint ett_lbmc_umq_ka_ulb_rcv_resp;
-static gint ett_lbmc_umq_rxreq;
-static gint ett_lbmc_umq_rxreq_flags;
-static gint ett_lbmc_umq_rxreq_regid_resp;
-static gint ett_lbmc_umq_rxreq_addr_resp;
-static gint ett_lbmc_umq_rxreq_mr;
-static gint ett_lbmc_umq_rxreq_ulb_mr;
-static gint ett_lbmc_umq_rxreq_ulb_mr_abort;
-static gint ett_lbmc_umq_rxreq_qrcrr;
-static gint ett_lbmc_umq_rxreq_trcrr;
-static gint ett_lbmc_umq_rxreq_ulb_trcrr;
-static gint ett_lbmc_umq_rxreq_ulb_trcrr_abort;
-static gint ett_lbmc_umq_qmgmt;
-static gint ett_lbmc_umq_resub_req;
-static gint ett_lbmc_umq_resub_req_flags;
-static gint ett_lbmc_umq_resub_resp;
-static gint ett_lbmc_umq_resub_resp_flags;
-static gint ett_lbmc_topic_interest;
-static gint ett_lbmc_topic_interest_flags;
-static gint ett_lbmc_pattern_interest;
-static gint ett_lbmc_pattern_interest_flags;
-static gint ett_lbmc_advertisement;
-static gint ett_lbmc_advertisement_flags;
-static gint ett_lbmc_advertisement_ad_flags;
-static gint ett_lbmc_ume_storename;
-static gint ett_lbmc_ume_storename_flags;
-static gint ett_lbmc_umq_ulb_rcr;
-static gint ett_lbmc_umq_ulb_rcr_flags;
-static gint ett_lbmc_umq_lf;
-static gint ett_lbmc_umq_lf_flags;
-static gint ett_lbmc_ctxinfo;
-static gint ett_lbmc_ctxinfo_flags;
-static gint ett_lbmc_ume_pser;
-static gint ett_lbmc_ume_pser_flags;
-static gint ett_lbmc_domain;
-static gint ett_lbmc_domain_flags;
-static gint ett_lbmc_tnwg_capabilities;
-static gint ett_lbmc_tnwg_capabilities_flags;
-static gint ett_lbmc_tnwg_capabilities_capabilities1;
-static gint ett_lbmc_tnwg_capabilities_capabilities3;
-static gint ett_lbmc_patidx;
-static gint ett_lbmc_patidx_flags;
-static gint ett_lbmc_ume_client_lifetime;
-static gint ett_lbmc_ume_client_lifetime_flags;
-static gint ett_lbmc_ume_sid;
-static gint ett_lbmc_ume_sid_flags;
-static gint ett_lbmc_umq_idx_cmd;
-static gint ett_lbmc_umq_idx_cmd_flags;
-static gint ett_lbmc_umq_idx_cmd_stop_assign;
-static gint ett_lbmc_umq_idx_cmd_start_assign;
-static gint ett_lbmc_umq_idx_cmd_release_assign;
-static gint ett_lbmc_umq_idx_cmd_release_assign_flags;
-static gint ett_lbmc_umq_idx_cmd_ulb_stop_assign;
-static gint ett_lbmc_umq_idx_cmd_ulb_start_assign;
-static gint ett_lbmc_umq_idx_cmd_ulb_release_assign;
-static gint ett_lbmc_umq_idx_cmd_ulb_release_assign_flags;
-static gint ett_lbmc_umq_idx_cmd_reserve_assign;
-static gint ett_lbmc_umq_idx_cmd_reserve_assign_flags;
-static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign;
-static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign_flags;
-static gint ett_lbmc_umq_idx_cmd_resp;
-static gint ett_lbmc_umq_idx_cmd_resp_flags;
-static gint ett_lbmc_umq_idx_cmd_resp_err;
-static gint ett_lbmc_umq_idx_cmd_resp_stop_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_start_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_release_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_stop_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_start_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_release_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign_flags;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags;
-static gint ett_lbmc_odomain;
-static gint ett_lbmc_odomain_flags;
-static gint ett_lbmc_stream;
-static gint ett_lbmc_stream_flags;
-static gint ett_lbmc_topic_md_interest;
-static gint ett_lbmc_topic_md_interest_flags;
-static gint ett_lbmc_pattern_md_interest;
-static gint ett_lbmc_pattern_md_interest_flags;
-static gint ett_lbmc_lji_req;
-static gint ett_lbmc_lji_req_flags;
-static gint ett_lbmc_tnwg_ka;
-static gint ett_lbmc_tnwg_ka_flags;
-static gint ett_lbmc_ume_receiver_keepalive;
-static gint ett_lbmc_ume_receiver_keepalive_flags;
-static gint ett_lbmc_umq_cmd;
-static gint ett_lbmc_umq_cmd_flags;
-static gint ett_lbmc_umq_cmd_topic_list;
-static gint ett_lbmc_umq_cmd_msg_retrieve;
-static gint ett_lbmc_umq_cmd_msg_retrieve_entry;
-static gint ett_lbmc_umq_cmd_msg_list;
-static gint ett_lbmc_umq_cmd_resp;
-static gint ett_lbmc_umq_cmd_resp_flags;
-static gint ett_lbmc_umq_cmd_resp_msg_retrieve;
-static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve;
-static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve_entry;
-static gint ett_lbmc_umq_cmd_resp_msg_list;
-static gint ett_lbmc_umq_cmd_resp_xmsg_list;
-static gint ett_lbmc_umq_cmd_resp_xmsg_list_entry;
-static gint ett_lbmc_umq_cmd_resp_topic_list;
-static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry;
-static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry;
-static gint ett_lbmc_umq_cmd_resp_err;
-static gint ett_lbmc_sri_req;
-static gint ett_lbmc_sri_req_flags;
-static gint ett_lbmc_ume_store_domain;
-static gint ett_lbmc_ume_store_domain_flags;
-static gint ett_lbmc_sri;
-static gint ett_lbmc_sri_flags;
-static gint ett_lbmc_route_info;
-static gint ett_lbmc_route_info_flags;
-static gint ett_lbmc_route_info_neighbor;
-static gint ett_lbmc_route_info_neighbor_flags;
-static gint ett_lbmc_gateway_name;
-static gint ett_lbmc_gateway_name_flags;
-static gint ett_lbmc_auth_request;
-static gint ett_lbmc_auth_request_flags;
-static gint ett_lbmc_auth_challenge;
-static gint ett_lbmc_auth_challenge_flags;
-static gint ett_lbmc_auth_challenge_rsp;
-static gint ett_lbmc_auth_challenge_rsp_flags;
-static gint ett_lbmc_auth_result;
-static gint ett_lbmc_auth_result_flags;
-static gint ett_lbmc_auth_unknown;
-static gint ett_lbmc_hmac;
-static gint ett_lbmc_hmac_flags;
-static gint ett_lbmc_umq_sid;
-static gint ett_lbmc_umq_sid_flags;
-static gint ett_lbmc_destination;
-static gint ett_lbmc_destination_flags;
-static gint ett_lbmc_topic_idx;
-static gint ett_lbmc_topic_idx_flags;
-static gint ett_lbmc_topic_source;
-static gint ett_lbmc_topic_source_flags;
-static gint ett_lbmc_topic_source_exfunc;
-static gint ett_lbmc_topic_source_exfunc_flags;
-static gint ett_lbmc_topic_source_exfunc_functionality_flags;
-static gint ett_lbmc_ume_store_ext;
-static gint ett_lbmc_ume_store_ext_flags;
-static gint ett_lbmc_ume_psrc_election_token;
-static gint ett_lbmc_ume_psrc_election_token_flags;
-static gint ett_lbmc_tcp_sid;
-static gint ett_lbmc_tcp_sid_flags;
-static gint ett_lbmc_extopt;
-static gint ett_lbmc_extopt_flags;
-static gint ett_lbmc_extopt_cfgopt;
-static gint ett_lbmc_extopt_reassembled_data;
-static gint ett_lbmc_extopt_reassembled_data_cfgopt;
-static gint ett_lbm_msg_properties;
-static gint ett_lbm_msg_properties_data;
-static gint ett_lbm_msg_properties_hdr;
-static gint ett_lbmc_unhandled_hdr;
-static gint ett_lbm_stream;
-static gint ett_lbmc_reassembly;
-static gint ett_unknown;
-static gint ett_msg_data;
-static gint ett_msgprop_data;
+static int ett_lbmc;
+static int ett_lbmc_frag;
+static int ett_lbmc_frag_flags;
+static int ett_lbmc_batch;
+static int ett_lbmc_batch_flags;
+static int ett_lbmc_tcp_request;
+static int ett_lbmc_tcp_request_flags;
+static int ett_lbmc_topicname;
+static int ett_lbmc_topicname_flags;
+static int ett_lbmc_apphdr;
+static int ett_lbmc_apphdr_chain;
+static int ett_lbmc_apphdr_chain_element;
+static int ett_lbmc_apphdr_chain_msgprop;
+static int ett_lbmc_umq_msgid;
+static int ett_lbmc_umq_msgid_flags;
+static int ett_lbmc_umq_sqd_rcv;
+static int ett_lbmc_umq_sqd_rcv_flags;
+static int ett_lbmc_umq_resub;
+static int ett_lbmc_umq_resub_flags;
+static int ett_lbmc_otid;
+static int ett_lbmc_otid_flags;
+static int ett_lbmc_ctxinst;
+static int ett_lbmc_ctxinst_flags;
+static int ett_lbmc_ctxinstd;
+static int ett_lbmc_ctxinstr;
+static int ett_lbmc_srcidx;
+static int ett_lbmc_srcidx_flags;
+static int ett_lbmc_umq_ulb_msg;
+static int ett_lbmc_umq_ulb_msg_flags;
+static int ett_lbmc_ssf_init;
+static int ett_lbmc_ssf_init_flags;
+static int ett_lbmc_ssf_creq;
+static int ett_lbmc_ssf_creq_flags;
+static int ett_lbmc_ume_preg;
+static int ett_lbmc_ume_preg_flags;
+static int ett_lbmc_ume_preg_resp;
+static int ett_lbmc_ume_preg_resp_code;
+static int ett_lbmc_ume_preg_resp_marker;
+static int ett_lbmc_ume_ack;
+static int ett_lbmc_ume_ack_flags;
+static int ett_lbmc_ume_rxreq;
+static int ett_lbmc_ume_rxreq_flags;
+static int ett_lbmc_ume_keepalive;
+static int ett_lbmc_ume_keepalive_flags;
+static int ett_lbmc_ume_storeid;
+static int ett_lbmc_ume_ranged_ack;
+static int ett_lbmc_ume_ranged_ack_flags;
+static int ett_lbmc_ume_ack_id;
+static int ett_lbmc_ume_ack_id_flags;
+static int ett_lbmc_ume_capability;
+static int ett_lbmc_ume_capability_flags;
+static int ett_lbmc_ume_proxy_src;
+static int ett_lbmc_ume_proxy_src_flags;
+static int ett_lbmc_ume_store_group;
+static int ett_lbmc_ume_store_group_flags;
+static int ett_lbmc_ume_store;
+static int ett_lbmc_ume_store_flags;
+static int ett_lbmc_ume_lj_info;
+static int ett_lbmc_ume_lj_info_flags;
+static int ett_lbmc_tsni;
+static int ett_lbmc_tsni_rec;
+static int ett_lbmc_umq_reg;
+static int ett_lbmc_umq_reg_flags;
+static int ett_lbmc_umq_reg_reg_ctx;
+static int ett_lbmc_umq_reg_reg_src;
+static int ett_lbmc_umq_reg_reg_rcv;
+static int ett_lbmc_umq_reg_rcv_dereg;
+static int ett_lbmc_umq_reg_reg_ulb_rcv;
+static int ett_lbmc_umq_reg_ulb_rcv_dereg;
+static int ett_lbmc_umq_reg_reg_observer_rcv;
+static int ett_lbmc_umq_reg_observer_rcv_dereg;
+static int ett_lbmc_umq_reg_resp;
+static int ett_lbmc_umq_reg_resp_flags;
+static int ett_lbmc_umq_reg_resp_reg_ctx;
+static int ett_lbmc_umq_reg_resp_reg_ctx_ex;
+static int ett_lbmc_umq_reg_resp_reg_ctx_ex_flags;
+static int ett_lbmc_umq_reg_resp_err;
+static int ett_lbmc_umq_reg_resp_reg_src;
+static int ett_lbmc_umq_reg_resp_reg_rcv;
+static int ett_lbmc_umq_reg_resp_rcv_dereg;
+static int ett_lbmc_umq_reg_resp_reg_ulb_rcv;
+static int ett_lbmc_umq_reg_resp_ulb_rcv_dereg;
+static int ett_lbmc_umq_reg_resp_reg_observer_rcv;
+static int ett_lbmc_umq_reg_resp_observer_rcv_dereg;
+static int ett_lbmc_umq_ack;
+static int ett_lbmc_umq_ack_msgs;
+static int ett_lbmc_umq_ack_msgid;
+static int ett_lbmc_umq_ack_stable;
+static int ett_lbmc_umq_ack_cr;
+static int ett_lbmc_umq_ack_ulb_cr;
+static int ett_lbmc_umq_rcr;
+static int ett_lbmc_umq_rcr_flags;
+static int ett_lbmc_umq_ka;
+static int ett_lbmc_umq_ka_flags;
+static int ett_lbmc_umq_ka_src;
+static int ett_lbmc_umq_ka_rcv;
+static int ett_lbmc_umq_ka_ulb_rcv;
+static int ett_lbmc_umq_ka_ulb_rcv_resp;
+static int ett_lbmc_umq_rxreq;
+static int ett_lbmc_umq_rxreq_flags;
+static int ett_lbmc_umq_rxreq_regid_resp;
+static int ett_lbmc_umq_rxreq_addr_resp;
+static int ett_lbmc_umq_rxreq_mr;
+static int ett_lbmc_umq_rxreq_ulb_mr;
+static int ett_lbmc_umq_rxreq_ulb_mr_abort;
+static int ett_lbmc_umq_rxreq_qrcrr;
+static int ett_lbmc_umq_rxreq_trcrr;
+static int ett_lbmc_umq_rxreq_ulb_trcrr;
+static int ett_lbmc_umq_rxreq_ulb_trcrr_abort;
+static int ett_lbmc_umq_qmgmt;
+static int ett_lbmc_umq_resub_req;
+static int ett_lbmc_umq_resub_req_flags;
+static int ett_lbmc_umq_resub_resp;
+static int ett_lbmc_umq_resub_resp_flags;
+static int ett_lbmc_topic_interest;
+static int ett_lbmc_topic_interest_flags;
+static int ett_lbmc_pattern_interest;
+static int ett_lbmc_pattern_interest_flags;
+static int ett_lbmc_advertisement;
+static int ett_lbmc_advertisement_flags;
+static int ett_lbmc_advertisement_ad_flags;
+static int ett_lbmc_ume_storename;
+static int ett_lbmc_ume_storename_flags;
+static int ett_lbmc_umq_ulb_rcr;
+static int ett_lbmc_umq_ulb_rcr_flags;
+static int ett_lbmc_umq_lf;
+static int ett_lbmc_umq_lf_flags;
+static int ett_lbmc_ctxinfo;
+static int ett_lbmc_ctxinfo_flags;
+static int ett_lbmc_ume_pser;
+static int ett_lbmc_ume_pser_flags;
+static int ett_lbmc_domain;
+static int ett_lbmc_domain_flags;
+static int ett_lbmc_tnwg_capabilities;
+static int ett_lbmc_tnwg_capabilities_flags;
+static int ett_lbmc_tnwg_capabilities_capabilities1;
+static int ett_lbmc_tnwg_capabilities_capabilities3;
+static int ett_lbmc_patidx;
+static int ett_lbmc_patidx_flags;
+static int ett_lbmc_ume_client_lifetime;
+static int ett_lbmc_ume_client_lifetime_flags;
+static int ett_lbmc_ume_sid;
+static int ett_lbmc_ume_sid_flags;
+static int ett_lbmc_umq_idx_cmd;
+static int ett_lbmc_umq_idx_cmd_flags;
+static int ett_lbmc_umq_idx_cmd_stop_assign;
+static int ett_lbmc_umq_idx_cmd_start_assign;
+static int ett_lbmc_umq_idx_cmd_release_assign;
+static int ett_lbmc_umq_idx_cmd_release_assign_flags;
+static int ett_lbmc_umq_idx_cmd_ulb_stop_assign;
+static int ett_lbmc_umq_idx_cmd_ulb_start_assign;
+static int ett_lbmc_umq_idx_cmd_ulb_release_assign;
+static int ett_lbmc_umq_idx_cmd_ulb_release_assign_flags;
+static int ett_lbmc_umq_idx_cmd_reserve_assign;
+static int ett_lbmc_umq_idx_cmd_reserve_assign_flags;
+static int ett_lbmc_umq_idx_cmd_ulb_reserve_assign;
+static int ett_lbmc_umq_idx_cmd_ulb_reserve_assign_flags;
+static int ett_lbmc_umq_idx_cmd_resp;
+static int ett_lbmc_umq_idx_cmd_resp_flags;
+static int ett_lbmc_umq_idx_cmd_resp_err;
+static int ett_lbmc_umq_idx_cmd_resp_stop_assign;
+static int ett_lbmc_umq_idx_cmd_resp_start_assign;
+static int ett_lbmc_umq_idx_cmd_resp_release_assign;
+static int ett_lbmc_umq_idx_cmd_resp_ulb_stop_assign;
+static int ett_lbmc_umq_idx_cmd_resp_ulb_start_assign;
+static int ett_lbmc_umq_idx_cmd_resp_ulb_release_assign;
+static int ett_lbmc_umq_idx_cmd_resp_reserve_assign;
+static int ett_lbmc_umq_idx_cmd_resp_reserve_assign_flags;
+static int ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign;
+static int ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags;
+static int ett_lbmc_odomain;
+static int ett_lbmc_odomain_flags;
+static int ett_lbmc_stream;
+static int ett_lbmc_stream_flags;
+static int ett_lbmc_topic_md_interest;
+static int ett_lbmc_topic_md_interest_flags;
+static int ett_lbmc_pattern_md_interest;
+static int ett_lbmc_pattern_md_interest_flags;
+static int ett_lbmc_lji_req;
+static int ett_lbmc_lji_req_flags;
+static int ett_lbmc_tnwg_ka;
+static int ett_lbmc_tnwg_ka_flags;
+static int ett_lbmc_ume_receiver_keepalive;
+static int ett_lbmc_ume_receiver_keepalive_flags;
+static int ett_lbmc_umq_cmd;
+static int ett_lbmc_umq_cmd_flags;
+static int ett_lbmc_umq_cmd_topic_list;
+static int ett_lbmc_umq_cmd_msg_retrieve;
+static int ett_lbmc_umq_cmd_msg_retrieve_entry;
+static int ett_lbmc_umq_cmd_msg_list;
+static int ett_lbmc_umq_cmd_resp;
+static int ett_lbmc_umq_cmd_resp_flags;
+static int ett_lbmc_umq_cmd_resp_msg_retrieve;
+static int ett_lbmc_umq_cmd_resp_xmsg_retrieve;
+static int ett_lbmc_umq_cmd_resp_xmsg_retrieve_entry;
+static int ett_lbmc_umq_cmd_resp_msg_list;
+static int ett_lbmc_umq_cmd_resp_xmsg_list;
+static int ett_lbmc_umq_cmd_resp_xmsg_list_entry;
+static int ett_lbmc_umq_cmd_resp_topic_list;
+static int ett_lbmc_umq_cmd_resp_topic_list_topic_entry;
+static int ett_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry;
+static int ett_lbmc_umq_cmd_resp_err;
+static int ett_lbmc_sri_req;
+static int ett_lbmc_sri_req_flags;
+static int ett_lbmc_ume_store_domain;
+static int ett_lbmc_ume_store_domain_flags;
+static int ett_lbmc_sri;
+static int ett_lbmc_sri_flags;
+static int ett_lbmc_route_info;
+static int ett_lbmc_route_info_flags;
+static int ett_lbmc_route_info_neighbor;
+static int ett_lbmc_route_info_neighbor_flags;
+static int ett_lbmc_gateway_name;
+static int ett_lbmc_gateway_name_flags;
+static int ett_lbmc_auth_request;
+static int ett_lbmc_auth_request_flags;
+static int ett_lbmc_auth_challenge;
+static int ett_lbmc_auth_challenge_flags;
+static int ett_lbmc_auth_challenge_rsp;
+static int ett_lbmc_auth_challenge_rsp_flags;
+static int ett_lbmc_auth_result;
+static int ett_lbmc_auth_result_flags;
+static int ett_lbmc_auth_unknown;
+static int ett_lbmc_hmac;
+static int ett_lbmc_hmac_flags;
+static int ett_lbmc_umq_sid;
+static int ett_lbmc_umq_sid_flags;
+static int ett_lbmc_destination;
+static int ett_lbmc_destination_flags;
+static int ett_lbmc_topic_idx;
+static int ett_lbmc_topic_idx_flags;
+static int ett_lbmc_topic_source;
+static int ett_lbmc_topic_source_flags;
+static int ett_lbmc_topic_source_exfunc;
+static int ett_lbmc_topic_source_exfunc_flags;
+static int ett_lbmc_topic_source_exfunc_functionality_flags;
+static int ett_lbmc_ume_store_ext;
+static int ett_lbmc_ume_store_ext_flags;
+static int ett_lbmc_ume_psrc_election_token;
+static int ett_lbmc_ume_psrc_election_token_flags;
+static int ett_lbmc_tcp_sid;
+static int ett_lbmc_tcp_sid_flags;
+static int ett_lbmc_extopt;
+static int ett_lbmc_extopt_flags;
+static int ett_lbmc_extopt_cfgopt;
+static int ett_lbmc_extopt_reassembled_data;
+static int ett_lbmc_extopt_reassembled_data_cfgopt;
+static int ett_lbm_msg_properties;
+static int ett_lbm_msg_properties_data;
+static int ett_lbm_msg_properties_hdr;
+static int ett_lbmc_unhandled_hdr;
+static int ett_lbm_stream;
+static int ett_lbmc_reassembly;
+static int ett_unknown;
+static int ett_msg_data;
+static int ett_msgprop_data;
 
 /* Expert info handles */
 static expert_field ei_lbmc_analysis_length_incorrect;
@@ -6014,30 +6014,30 @@ static expert_field ei_lbmc_extopt_fragment_offset;
 #define LBMC_EXTOPT_REASSEMBLED_DATA_MAX_LEN 65536
 typedef struct
 {
-    gboolean reassembly_in_progress;
-    guint16 subtype;
+    bool reassembly_in_progress;
+    uint16_t subtype;
     int len;
-    gchar data[LBMC_EXTOPT_REASSEMBLED_DATA_MAX_LEN];
+    char data[LBMC_EXTOPT_REASSEMBLED_DATA_MAX_LEN];
 } lbmc_extopt_reassembled_data_t;
 
 /* Stream structures. */
 typedef struct
 {
-    gboolean set;
-    guint32 stream_id;
-    guint32 sqn;
-    gchar ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    bool set;
+    uint32_t stream_id;
+    uint32_t sqn;
+    char ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
 } lbmc_stream_info_t;
 
 typedef struct
 {
-    gboolean set;
-    gchar ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
+    bool set;
+    char ctxinst[LBM_CONTEXT_INSTANCE_BLOCK_SZ];
 } lbmc_ctxinst_info_t;
 
 typedef struct
 {
-    gboolean set;
+    bool set;
     lbm_uim_stream_destination_t endpoint_a;
     lbm_uim_stream_destination_t endpoint_b;
 } lbmc_destination_info_t;
@@ -6045,8 +6045,8 @@ typedef struct
 /* TCP session ID structures. */
 typedef struct
 {
-    gboolean set;
-    guint32 session_id;
+    bool set;
+    uint32_t session_id;
 } lbmc_tcp_sid_info_t;
 
 /*----------------------------------------------------------------------------*/
@@ -6054,11 +6054,11 @@ typedef struct
 /*----------------------------------------------------------------------------*/
 typedef struct
 {
-    guint64 channel;
-    guint32 sqn;
+    uint64_t channel;
+    uint32_t sqn;
     lbm_uim_stream_endpoint_t endpoint_a;
     lbm_uim_stream_endpoint_t endpoint_b;
-    const gchar * description;
+    const char * description;
 } lbm_uim_stream_info_t;
 
 static tap_packet_status
@@ -6068,9 +6068,9 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _
     const lbm_uim_stream_info_t* stream_info = (const lbm_uim_stream_info_t *)uim_info;
     lbm_uim_stream_endpoint_t epa;
     lbm_uim_stream_endpoint_t epb;
-    gchar * ctxinst1;
-    gchar * ctxinst2;
-    gboolean swap_endpoints = FALSE;
+    char * ctxinst1;
+    char * ctxinst2;
+    bool swap_endpoints = false;
     seq_analysis_item_t* sai;
     char time_str[COL_MAX_LEN];
     int rc;
@@ -6086,22 +6086,22 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _
                     LBM_CONTEXT_INSTANCE_BLOCK_SZ);
         if (rc <= 0)
         {
-            swap_endpoints = FALSE;
+            swap_endpoints = false;
         }
         else
         {
-            swap_endpoints = TRUE;
+            swap_endpoints = true;
         }
     }
     else
     {
         if (stream_info->endpoint_a.stream_info.dest.domain < stream_info->endpoint_b.stream_info.dest.domain)
         {
-            swap_endpoints = FALSE;
+            swap_endpoints = false;
         }
         else if (stream_info->endpoint_a.stream_info.dest.domain > stream_info->endpoint_b.stream_info.dest.domain)
         {
-            swap_endpoints = TRUE;
+            swap_endpoints = true;
         }
         else
         {
@@ -6110,26 +6110,26 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _
             compare = cmp_address(&(stream_info->endpoint_a.stream_info.dest.addr), &(stream_info->endpoint_b.stream_info.dest.addr));
             if (compare < 0)
             {
-                swap_endpoints = FALSE;
+                swap_endpoints = false;
             }
             else if (compare > 0)
             {
-                swap_endpoints = TRUE;
+                swap_endpoints = true;
             }
             else
             {
                 if (stream_info->endpoint_a.stream_info.dest.port <= stream_info->endpoint_b.stream_info.dest.port)
                 {
-                    swap_endpoints = FALSE;
+                    swap_endpoints = false;
                 }
                 else
                 {
-                    swap_endpoints = TRUE;
+                    swap_endpoints = true;
                 }
             }
         }
     }
-    if (swap_endpoints == FALSE)
+    if (swap_endpoints == false)
     {
         epa = stream_info->endpoint_a;
         epb = stream_info->endpoint_b;
@@ -6180,8 +6180,8 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _
     set_fd_time(pinfo->epan, pinfo->fd, time_str);
     sai->time_str = g_strdup(time_str);
 
-    sai->conv_num = (guint16)LBM_CHANNEL_ID(stream_info->channel);
-    sai->display = TRUE;
+    sai->conv_num = (uint16_t)LBM_CHANNEL_ID(stream_info->channel);
+    sai->display = true;
     sai->line_style = 1;
 
     g_queue_push_tail(sainfo->items, sai);
@@ -6205,9 +6205,9 @@ static wmem_tree_t * lbmc_message_table;
 typedef struct
 {
     int fragment_found;
-    guint32 first_sqn;
-    guint32 offset;
-    guint32 len;
+    uint32_t first_sqn;
+    uint32_t offset;
+    uint32_t len;
 } lbmc_fragment_info_t;
 
 struct lbmc_fragment_entry_t_stct;
@@ -6216,40 +6216,40 @@ struct lbmc_fragment_entry_t_stct
 {
     lbmc_fragment_entry_t * prev;
     lbmc_fragment_entry_t * next;
-    guint32 fragment_start;
-    guint32 fragment_len;
-    guint32 frame;
+    uint32_t fragment_start;
+    uint32_t fragment_len;
+    uint32_t frame;
     int frame_offset;
-    gchar * data;
+    char * data;
 };
 
 typedef struct
 {
-    guint64 channel;
+    uint64_t channel;
     address addr;
-    guint16 port;
-    guint32 first_sqn;
-    guint32 fragment_count;
-    guint32 total_len;
-    guint32 accumulated_len;
-    guint32 msgprop_len;
-    gboolean data_is_umq_cmd_resp;
+    uint16_t port;
+    uint32_t first_sqn;
+    uint32_t fragment_count;
+    uint32_t total_len;
+    uint32_t accumulated_len;
+    uint32_t msgprop_len;
+    bool data_is_umq_cmd_resp;
     lbmc_fragment_entry_t * entry;
-    guint32 reassembled_frame;
+    uint32_t reassembled_frame;
     tvbuff_t * reassembled_data;
     tvbuff_t * data;
     tvbuff_t * msgprop;
 } lbmc_message_entry_t;
 
-static void lbmc_message_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbmc_message_entry_t * message)
+static void lbmc_message_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbmc_message_entry_t * message)
 {
-    guint32 val;
+    uint32_t val;
 
-    key_value[LBMC_MESSAGE_KEY_ELEMENT_CHANNEL_HIGH] = (guint32) ((message->channel >> 32) & 0xffffffff);
-    key_value[LBMC_MESSAGE_KEY_ELEMENT_CHANNEL_LOW] = (guint32) (message->channel & 0xffffffff);
-    memcpy((void *) &val, (const void *) message->addr.data, sizeof(guint32));
+    key_value[LBMC_MESSAGE_KEY_ELEMENT_CHANNEL_HIGH] = (uint32_t) ((message->channel >> 32) & 0xffffffff);
+    key_value[LBMC_MESSAGE_KEY_ELEMENT_CHANNEL_LOW] = (uint32_t) (message->channel & 0xffffffff);
+    memcpy((void *) &val, (const void *) message->addr.data, sizeof(uint32_t));
     key_value[LBMC_MESSAGE_KEY_ELEMENT_ADDR] = val;
-    key_value[LBMC_MESSAGE_KEY_ELEMENT_PORT] = (guint32) message->port;
+    key_value[LBMC_MESSAGE_KEY_ELEMENT_PORT] = (uint32_t) message->port;
     key_value[LBMC_MESSAGE_KEY_ELEMENT_FIRST_SQN] = message->first_sqn;
     key[0].length = LBMC_MESSAGE_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
@@ -6257,11 +6257,11 @@ static void lbmc_message_build_key(guint32 * key_value, wmem_tree_key_t * key, c
     key[1].key = NULL;
 }
 
-static lbmc_message_entry_t * lbmc_message_find(guint64 channel, const address * dest_address, guint16 port, lbmc_fragment_info_t * info)
+static lbmc_message_entry_t * lbmc_message_find(uint64_t channel, const address * dest_address, uint16_t port, lbmc_fragment_info_t * info)
 {
     lbmc_message_entry_t key;
     lbmc_message_entry_t * entry = NULL;
-    guint32 keyval[LBMC_MESSAGE_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBMC_MESSAGE_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     memset((void *)&key, 0, sizeof(lbmc_message_entry_t));
@@ -6274,10 +6274,10 @@ static lbmc_message_entry_t * lbmc_message_find(guint64 channel, const address *
     return (entry);
 }
 
-static lbmc_message_entry_t * lbmc_message_create(guint64 channel, const address * dest_address, guint16 port, lbmc_fragment_info_t * info, guint32 msgprop_length)
+static lbmc_message_entry_t * lbmc_message_create(uint64_t channel, const address * dest_address, uint16_t port, lbmc_fragment_info_t * info, uint32_t msgprop_length)
 {
     lbmc_message_entry_t * entry = NULL;
-    guint32 keyval[LBMC_MESSAGE_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBMC_MESSAGE_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbmc_message_find(channel, dest_address, port, info);
@@ -6294,7 +6294,7 @@ static lbmc_message_entry_t * lbmc_message_create(guint64 channel, const address
     entry->total_len = info->len;
     entry->accumulated_len = 0;
     entry->msgprop_len = msgprop_length;
-    entry->data_is_umq_cmd_resp = FALSE;
+    entry->data_is_umq_cmd_resp = false;
     entry->entry = NULL;
     entry->reassembled_frame = 0;
     entry->reassembled_data = NULL;
@@ -6305,7 +6305,7 @@ static lbmc_message_entry_t * lbmc_message_create(guint64 channel, const address
     return (entry);
 }
 
-static void lbmc_message_add_fragment(lbmc_message_entry_t * message, tvbuff_t * tvb, int data_offset, lbmc_fragment_info_t * info, guint32 frame)
+static void lbmc_message_add_fragment(lbmc_message_entry_t * message, tvbuff_t * tvb, int data_offset, lbmc_fragment_info_t * info, uint32_t frame)
 {
     lbmc_fragment_entry_t * frag = NULL;
     lbmc_fragment_entry_t * cur = NULL;
@@ -6373,7 +6373,7 @@ static void lbmc_message_add_fragment(lbmc_message_entry_t * message, tvbuff_t *
     }
     frag->fragment_start = info->offset;
     frag->fragment_len = tvb_reported_length_remaining(tvb, data_offset);
-    frag->data = (gchar *) tvb_memdup(wmem_file_scope(), tvb, data_offset, frag->fragment_len);
+    frag->data = (char *) tvb_memdup(wmem_file_scope(), tvb, data_offset, frag->fragment_len);
     frag->frame = frame;
     frag->frame_offset = data_offset;
     message->accumulated_len += frag->fragment_len;
@@ -6385,7 +6385,7 @@ static void lbmc_message_add_fragment(lbmc_message_entry_t * message, tvbuff_t *
 /*----------------------------------------------------------------------------*/
 static void lbmc_init_extopt_reassembled_data(lbmc_extopt_reassembled_data_t * reassembly)
 {
-    reassembly->reassembly_in_progress = FALSE;
+    reassembly->reassembly_in_progress = false;
     reassembly->subtype = 0;
     reassembly->len = 0;
     memset((void *)&(reassembly->data), 0, sizeof(reassembly->data));
@@ -6469,7 +6469,7 @@ static int dissect_nhdr_topicname(tvbuff_t * tvb, int offset, packet_info * pinf
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_topicname_flags_ignore,
@@ -6479,8 +6479,8 @@ static int dissect_nhdr_topicname(tvbuff_t * tvb, int offset, packet_info * pinf
     int namelen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_TOPICNAME_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_topicname, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_TOPICNAME_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_topicname, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_topicname);
     proto_tree_add_item(subtree, hf_lbmc_topicname_next_hdr, tvb, offset + O_LBMC_TOPICNAME_HDR_T_NEXT_HDR, L_LBMC_TOPICNAME_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_topicname_hdr_len, tvb, offset + O_LBMC_TOPICNAME_HDR_T_HDR_LEN, L_LBMC_TOPICNAME_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -6504,13 +6504,13 @@ static int dissect_nhdr_apphdr(tvbuff_t * tvb, int offset, packet_info * pinfo _
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     int len_dissected = 0;
     int datalen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_APPHDR_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_apphdr, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_APPHDR_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_apphdr, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_apphdr);
     proto_tree_add_item(subtree, hf_lbmc_apphdr_next_hdr, tvb, offset + O_LBMC_APPHDR_HDR_T_NEXT_HDR, L_LBMC_APPHDR_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_apphdr_hdr_len, tvb, offset + O_LBMC_APPHDR_HDR_T_HDR_LEN, L_LBMC_APPHDR_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -6531,17 +6531,17 @@ static int dissect_nhdr_apphdr(tvbuff_t * tvb, int offset, packet_info * pinfo _
     return (len_dissected);
 }
 
-static int dissect_nhdr_apphdr_chain_element(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, guint8 element)
+static int dissect_nhdr_apphdr_chain_element(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, uint8_t element)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     proto_item * hdrlen_item;
     int datalen = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_HDR_LEN);
-    subtree_item = proto_tree_add_none_format(tree, hf_lbmc_apphdr_chain_element, tvb, offset, (gint)hdrlen, "%s element", val_to_str(element, lbmc_apphdr_chain_type, "Unknown (0x%02x)"));
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_HDR_LEN);
+    subtree_item = proto_tree_add_none_format(tree, hf_lbmc_apphdr_chain_element, tvb, offset, (int)hdrlen, "%s element", val_to_str(element, lbmc_apphdr_chain_type, "Unknown (0x%02x)"));
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_apphdr_chain_element);
     proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_element_next_hdr, tvb, offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_NEXT_HDR, L_LBMC_APPHDR_CHAIN_ELEMENT_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_element_hdr_len, tvb, offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_HDR_LEN, L_LBMC_APPHDR_CHAIN_ELEMENT_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -6566,17 +6566,17 @@ static int dissect_nhdr_apphdr_chain_element(tvbuff_t * tvb, int offset, packet_
     return (len_dissected);
 }
 
-static int dissect_nhdr_apphdr_chain_msgprop_element(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, guint8 element, guint32 * msg_prop_len)
+static int dissect_nhdr_apphdr_chain_msgprop_element(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, uint8_t element, uint32_t * msg_prop_len)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint32 datalen;
+    uint8_t hdrlen = 0;
+    uint32_t datalen;
     int len_dissected = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_HDR_LEN);
-    subtree_item = proto_tree_add_none_format(tree, hf_lbmc_apphdr_chain_msgprop, tvb, offset, (gint)hdrlen, "%s element", val_to_str(element, lbmc_apphdr_chain_type, "Unknown (0x%02x)"));
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_HDR_LEN);
+    subtree_item = proto_tree_add_none_format(tree, hf_lbmc_apphdr_chain_msgprop, tvb, offset, (int)hdrlen, "%s element", val_to_str(element, lbmc_apphdr_chain_type, "Unknown (0x%02x)"));
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_apphdr_chain_msgprop);
     proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_msgprop_next_hdr, tvb, offset + O_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_NEXT_HDR, L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_msgprop_hdr_len, tvb, offset + O_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_HDR_LEN, L_LBMC_APPHDR_CHAIN_MSGPROP_ELEMENT_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -6597,20 +6597,20 @@ static int dissect_nhdr_apphdr_chain_msgprop_element(tvbuff_t * tvb, int offset,
     return (len_dissected);
 }
 
-static int dissect_nhdr_apphdr_chain(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, guint32 * msg_prop_len)
+static int dissect_nhdr_apphdr_chain(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, uint32_t * msg_prop_len)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 datalen = 0;
+    uint8_t hdrlen = 0;
+    uint8_t datalen = 0;
     int elem_offset = 0;
     int elem_len = 0;
-    guint8 elem = 0;
+    uint8_t elem = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_HDR_LEN);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_HDR_LEN);
     datalen = hdrlen - L_LBMC_APPHDR_CHAIN_HDR_T;
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_apphdr_chain, tvb, offset, (gint)hdrlen, ENC_NA);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_apphdr_chain, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_apphdr_chain);
     proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_next_hdr, tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_NEXT_HDR, L_LBMC_APPHDR_CHAIN_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_hdr_len, tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_HDR_LEN, L_LBMC_APPHDR_CHAIN_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -6618,7 +6618,7 @@ static int dissect_nhdr_apphdr_chain(tvbuff_t * tvb, int offset, packet_info * p
     proto_tree_add_item(subtree, hf_lbmc_apphdr_chain_first_chain_hdr, tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR, L_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_APPHDR_CHAIN_HDR_T;
     elem_offset = offset + L_LBMC_APPHDR_CHAIN_HDR_T;
-    elem = tvb_get_guint8(tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR);
+    elem = tvb_get_uint8(tvb, offset + O_LBMC_APPHDR_CHAIN_HDR_T_FIRST_CHAIN_HDR);
     while (datalen > 0)
     {
         switch (elem)
@@ -6639,7 +6639,7 @@ static int dissect_nhdr_apphdr_chain(tvbuff_t * tvb, int offset, packet_info * p
         len_dissected += elem_len;
         if (datalen >= L_LBMC_APPHDR_CHAIN_ELEMENT_T_MIN)
         {
-            elem = tvb_get_guint8(tvb, elem_offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_NEXT_HDR);
+            elem = tvb_get_uint8(tvb, elem_offset + O_LBMC_APPHDR_CHAIN_ELEMENT_T_NEXT_HDR);
         }
     }
     proto_item_set_len(subtree_item, len_dissected);
@@ -6666,7 +6666,7 @@ static int dissect_nhdr_umq_msgid(tvbuff_t * tvb, int offset, packet_info * pinf
     return (L_LBMC_UMQ_MSGID_HDR_T);
 }
 
-static int dissect_nhdr_umq_sqd_rcv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, gboolean * data_is_response)
+static int dissect_nhdr_umq_sqd_rcv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, bool * data_is_response)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
@@ -6692,16 +6692,16 @@ static int dissect_nhdr_umq_sqd_rcv(tvbuff_t * tvb, int offset, packet_info * pi
     proto_tree_add_item(subtree, hf_lbmc_umq_sqd_rcv_assign_id, tvb, offset + O_LBMC_UMQ_SQD_RCV_HDR_T_ASSIGN_ID, L_LBMC_UMQ_SQD_RCV_HDR_T_ASSIGN_ID, ENC_BIG_ENDIAN);
     if (data_is_response != NULL)
     {
-        guint32 rcr_index;
+        uint32_t rcr_index;
 
         rcr_index = tvb_get_ntohl(tvb, offset + O_LBMC_UMQ_SQD_RCV_HDR_T_RCR_IDX);
         if (rcr_index == 0)
         {
-            *data_is_response = TRUE;
+            *data_is_response = true;
         }
         else
         {
-            *data_is_response = FALSE;
+            *data_is_response = false;
         }
     }
     return (L_LBMC_UMQ_SQD_RCV_HDR_T);
@@ -6763,7 +6763,7 @@ static void dissect_ctxinst(tvbuff_t * tvb, int offset, proto_tree * tree, lbmc_
     proto_tree_add_item(tree, hf_lbmc_ctxinst_ctxinst, tvb, offset + O_LBMC_CTXINST_HDR_T_CTXINST, L_LBMC_CTXINST_HDR_T_CTXINST, ENC_NA);
     if (info != NULL)
     {
-        info->set = TRUE;
+        info->set = true;
         tvb_memcpy(tvb, (void *)&(info->ctxinst), offset + O_LBMC_CTXINST_HDR_T_CTXINST, L_LBMC_CTXINST_HDR_T_CTXINST);
     }
 }
@@ -6928,7 +6928,7 @@ static int dissect_nhdr_ume_preg_resp(tvbuff_t * tvb, int offset, packet_info *
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 code = 0;
+    uint8_t code = 0;
     static int * const codes[] =
     {
         &hf_lbmc_ume_preg_resp_code_ignore,
@@ -6952,7 +6952,7 @@ static int dissect_nhdr_ume_preg_resp(tvbuff_t * tvb, int offset, packet_info *
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_ume_preg_resp);
     proto_tree_add_item(subtree, hf_lbmc_ume_preg_resp_next_hdr, tvb, offset + O_LBMC_CNTL_UME_PREG_RESP_HDR_T_NEXT_HDR, L_LBMC_CNTL_UME_PREG_RESP_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_ume_preg_resp_hdr_len, tvb, offset + O_LBMC_CNTL_UME_PREG_RESP_HDR_T_HDR_LEN, L_LBMC_CNTL_UME_PREG_RESP_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
-    code = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UME_PREG_RESP_HDR_T_CODE);
+    code = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UME_PREG_RESP_HDR_T_CODE);
     if ((code & LBMC_UME_PREG_RESP_E_FLAG) == 0)
     {
         proto_tree_add_bitmask(subtree, tvb, offset + O_LBMC_CNTL_UME_PREG_RESP_HDR_T_CODE, hf_lbmc_ume_preg_resp_code, ett_lbmc_ume_preg_resp_code, codes, ENC_BIG_ENDIAN);
@@ -7212,7 +7212,7 @@ static int dissect_nhdr_tsni_rec(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     proto_item * sqn_item = NULL;
-    guint32 sqn = 0;
+    uint32_t sqn = 0;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmc_tsni_rec, tvb, offset, L_LBMC_CNTL_TSNI_REC_HDR_T, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_tsni_rec);
@@ -7227,13 +7227,13 @@ static int dissect_nhdr_tsni(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 hdrlen_remaining;
+    uint8_t hdrlen = 0;
+    uint8_t hdrlen_remaining;
     int rec_offset = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_TSNI_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_tsni, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_TSNI_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_tsni, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_tsni);
     proto_tree_add_item(subtree, hf_lbmc_tsni_next_hdr, tvb, offset + O_LBMC_CNTL_TSNI_HDR_T_NEXT_HDR, L_LBMC_CNTL_TSNI_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_tsni_hdr_len, tvb, offset + O_LBMC_CNTL_TSNI_HDR_T_HDR_LEN, L_LBMC_CNTL_TSNI_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -7364,8 +7364,8 @@ static int dissect_nhdr_umq_reg(tvbuff_t * tvb, int offset, packet_info * pinfo,
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 reg_type = 0;
+    uint8_t hdrlen = 0;
+    uint8_t reg_type = 0;
     int len_dissected = 0;
     int len = 0;
     proto_item * reg_type_item = NULL;
@@ -7379,8 +7379,8 @@ static int dissect_nhdr_umq_reg(tvbuff_t * tvb, int offset, packet_info * pinfo,
         NULL
     };
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_reg, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_reg, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_reg);
     proto_tree_add_item(subtree, hf_lbmc_umq_reg_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_REG_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_reg_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_REG_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -7392,7 +7392,7 @@ static int dissect_nhdr_umq_reg(tvbuff_t * tvb, int offset, packet_info * pinfo,
     proto_tree_add_item(subtree, hf_lbmc_umq_reg_regid, tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_REGID, L_LBMC_CNTL_UMQ_REG_HDR_T_REGID, ENC_BIG_ENDIAN);
 
     len_dissected = L_LBMC_CNTL_UMQ_REG_HDR_T;
-    reg_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_REG_TYPE);
+    reg_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_HDR_T_REG_TYPE);
     switch (reg_type)
     {
         case LBMC_UMQ_REG_CTX_TYPE:
@@ -7565,8 +7565,8 @@ static int dissect_nhdr_umq_reg_resp(tvbuff_t * tvb, int offset, packet_info * p
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 resp_type = 0;
+    uint8_t hdrlen = 0;
+    uint8_t resp_type = 0;
     int len_dissected = 0;
     static int * const flags[] =
     {
@@ -7593,9 +7593,9 @@ static int dissect_nhdr_umq_reg_resp(tvbuff_t * tvb, int offset, packet_info * p
     int len = 0;
     proto_item * resp_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_HDR_LEN);
-    resp_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_REG_RESP_TYPE);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_reg_resp, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_HDR_LEN);
+    resp_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_REG_RESP_TYPE);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_reg_resp, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_reg_resp);
     proto_tree_add_item(subtree, hf_lbmc_umq_reg_resp_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_REG_RESP_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_reg_resp_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_REG_RESP_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_REG_RESP_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -7724,12 +7724,12 @@ static int dissect_nhdr_umq_ack(tvbuff_t * tvb, int offset, packet_info * pinfo,
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 ack_type = 0;
-    guint8 num_ids = 0;
-    guint8 idx;
+    uint8_t hdrlen = 0;
+    uint8_t ack_type = 0;
+    uint8_t num_ids = 0;
+    uint8_t idx;
     int len_dissected = 0;
-    guint8 msg_count;
+    uint8_t msg_count;
     static int * const msgs[] =
     {
         &hf_lbmc_umq_ack_msgs_ignore,
@@ -7741,12 +7741,12 @@ static int dissect_nhdr_umq_ack(tvbuff_t * tvb, int offset, packet_info * pinfo,
     int packet_len = 0;
     proto_item * ack_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_ack, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_ack, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_ack);
     proto_tree_add_item(subtree, hf_lbmc_umq_ack_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_ACK_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_ack_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_ACK_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
-    msg_count = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS);
+    msg_count = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS);
     proto_tree_add_bitmask(subtree, tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS, hf_lbmc_umq_ack_msgs, ett_lbmc_umq_ack_msgs, msgs, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_ack_numids, tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS, L_LBMC_CNTL_UMQ_ACK_HDR_T_MSGS, ENC_BIG_ENDIAN);
     ack_type_item = proto_tree_add_item(subtree, hf_lbmc_umq_ack_ack_type, tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE, L_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE, ENC_BIG_ENDIAN);
@@ -7758,7 +7758,7 @@ static int dissect_nhdr_umq_ack(tvbuff_t * tvb, int offset, packet_info * pinfo,
         len = dissect_nhdr_umq_ack_msgid(tvb, offset + len_dissected, pinfo, subtree);
         len_dissected += len;
     }
-    ack_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE);
+    ack_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_ACK_HDR_T_ACK_TYPE);
     switch (ack_type)
     {
         case LBMC_UMQ_ACK_STABLE_TYPE:
@@ -7867,8 +7867,8 @@ static int dissect_nhdr_umq_ka(tvbuff_t * tvb, int offset, packet_info * pinfo,
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 type;
+    uint8_t hdrlen = 0;
+    uint8_t type;
     int len_dissected = 0;
     int len;
     proto_item * ka_type_item = NULL;
@@ -7879,8 +7879,8 @@ static int dissect_nhdr_umq_ka(tvbuff_t * tvb, int offset, packet_info * pinfo,
         NULL
     };
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_cntl_umq_ka, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_cntl_umq_ka, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_ka);
     proto_tree_add_item(subtree, hf_lbmc_cntl_umq_ka_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_KA_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_cntl_umq_ka_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_KA_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -7891,7 +7891,7 @@ static int dissect_nhdr_umq_ka(tvbuff_t * tvb, int offset, packet_info * pinfo,
     proto_tree_add_item(subtree, hf_lbmc_cntl_umq_ka_inst_idx, tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_INST_IDX, L_LBMC_CNTL_UMQ_KA_HDR_T_INST_IDX, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_cntl_umq_ka_reserved, tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_KA_HDR_T_RESERVED, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_UMQ_KA_HDR_T;
-    type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_KA_TYPE);
+    type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_KA_HDR_T_KA_TYPE);
     switch (type)
     {
         case LBMC_UMQ_KA_SRC_TYPE:
@@ -8042,9 +8042,9 @@ static int dissect_nhdr_umq_rxreq(tvbuff_t * tvb, int offset, packet_info * pinf
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint8 type;
-    guint8 flags_val;
+    uint8_t hdrlen = 0;
+    uint8_t type;
+    uint8_t flags_val;
     static int * const flags[] =
     {
         &hf_lbmc_umq_rxreq_flags_ignore,
@@ -8055,15 +8055,15 @@ static int dissect_nhdr_umq_rxreq(tvbuff_t * tvb, int offset, packet_info * pinf
     int len = 0;
     proto_item * rxreq_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_rxreq, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_rxreq, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_rxreq);
     proto_tree_add_item(subtree, hf_lbmc_umq_rxreq_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_RXREQ_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_rxreq_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_RXREQ_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_bitmask(subtree, tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_FLAGS, hf_lbmc_umq_rxreq_flags, ett_lbmc_umq_rxreq_flags, flags, ENC_BIG_ENDIAN);
     rxreq_type_item = proto_tree_add_item(subtree, hf_lbmc_umq_rxreq_rxreq_type, tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE, L_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_UMQ_RXREQ_HDR_T;
-    flags_val = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_FLAGS);
+    flags_val = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_FLAGS);
     if ((flags_val & LBMC_UMQ_RXREQ_R_FLAG) != 0)
     {
         len = dissect_nhdr_umq_rxreq_regid_resp(tvb, offset + len_dissected, pinfo, subtree);
@@ -8073,7 +8073,7 @@ static int dissect_nhdr_umq_rxreq(tvbuff_t * tvb, int offset, packet_info * pinf
         len = dissect_nhdr_umq_rxreq_addr_resp(tvb, offset + len_dissected, pinfo, subtree);
     }
     len_dissected += len;
-    type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE);
+    type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_RXREQ_HDR_T_RXREQ_TYPE);
     switch (type)
     {
         case LBMC_UMQ_RXREQ_MR_TYPE:
@@ -8111,11 +8111,11 @@ static int dissect_nhdr_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinf
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_qmgmt, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_qmgmt, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_qmgmt);
     proto_tree_add_item(subtree, hf_lbmc_umq_qmgmt_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_QMGMT_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_QMGMT_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_qmgmt_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_QMGMT_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -8261,7 +8261,7 @@ static int dissect_nhdr_storename(tvbuff_t * tvb, int offset, packet_info * pinf
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_ume_storename_flags_ignore,
@@ -8271,8 +8271,8 @@ static int dissect_nhdr_storename(tvbuff_t * tvb, int offset, packet_info * pinf
     int namelen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_UME_STORENAME_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_ume_storename, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_UME_STORENAME_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_ume_storename, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_ume_storename);
     proto_tree_add_item(subtree, hf_lbmc_ume_storename_next_hdr, tvb, offset + O_LBMC_UME_STORENAME_HDR_T_NEXT_HDR, L_LBMC_UME_STORENAME_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_ume_storename_hdr_len, tvb, offset + O_LBMC_UME_STORENAME_HDR_T_HDR_LEN, L_LBMC_UME_STORENAME_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -8347,8 +8347,8 @@ static int dissect_nhdr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
-    guint16 flags_val = 0;
+    uint8_t hdrlen = 0;
+    uint16_t flags_val = 0;
     static int * const flags[] =
     {
         &hf_lbmc_ctxinfo_flags_ignore,
@@ -8364,8 +8364,8 @@ static int dissect_nhdr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo
     int len_dissected = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_CTXINFO_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_ctxinfo, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_CTXINFO_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_ctxinfo, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_ctxinfo);
     proto_tree_add_item(subtree, hf_lbmc_ctxinfo_next_hdr, tvb, offset + O_LBMC_CNTL_CTXINFO_HDR_T_NEXT_HDR, L_LBMC_CNTL_CTXINFO_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_ctxinfo_hdr_len, tvb, offset + O_LBMC_CNTL_CTXINFO_HDR_T_HDR_LEN, L_LBMC_CNTL_CTXINFO_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -8542,16 +8542,16 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_umq_idx_cmd_flags_ignore,
         NULL
     };
-    guint8 cmd_type = 0;
+    uint8_t cmd_type = 0;
     proto_item * opt_subtree_item = NULL;
     proto_tree * opt_subtree = NULL;
-    guint32 opt_flags = 0;
+    uint32_t opt_flags = 0;
     static int * const release_assign_flags[] =
     {
         &hf_lbmc_umq_idx_cmd_release_assign_flags_numeric,
@@ -8572,17 +8572,17 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
         &hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags_numeric,
         NULL
     };
-    guint8 index_len = 0;
+    uint8_t index_len = 0;
     int len_dissected = 0;
     proto_item * cmd_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_idx_cmd, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_idx_cmd, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_idx_cmd);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_bitmask(subtree, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_FLAGS, hf_lbmc_umq_idx_cmd_flags, ett_lbmc_umq_idx_cmd_flags, flags, ENC_BIG_ENDIAN);
-    cmd_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_TYPE);
+    cmd_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_TYPE);
     cmd_type_item = proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_cmd_type, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_TYPE, L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_TYPE, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_queue_id, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_QUEUE_ID, L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_QUEUE_ID, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_cmd_id, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_ID, L_LBMC_CNTL_UMQ_IDX_CMD_HDR_T_CMD_ID, ENC_BIG_ENDIAN);
@@ -8636,11 +8636,11 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T + index_len;
             break;
@@ -8657,11 +8657,11 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RELEASE_IDX_ASSIGN_HDR_T + index_len;
             break;
@@ -8677,11 +8677,11 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += L_LBMC_CNTL_UMQ_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len;
             break;
@@ -8698,11 +8698,11 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len;
             break;
@@ -8718,7 +8718,7 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_umq_idx_cmd_resp_flags_ignore,
@@ -8735,22 +8735,22 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info
         &hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags_numeric,
         NULL
     };
-    guint8 resp_type = 0;
+    uint8_t resp_type = 0;
     proto_item * opt_subtree_item = NULL;
     proto_tree * opt_subtree = NULL;
     int string_len = 0;
     int len_dissected = 0;
-    guint32 opt_flags = 0;
-    guint8 index_len = 0;
+    uint32_t opt_flags = 0;
+    uint8_t index_len = 0;
     proto_item * resp_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_idx_cmd_resp, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_idx_cmd_resp, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_idx_cmd_resp);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_resp_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_resp_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_bitmask(subtree, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_FLAGS, hf_lbmc_umq_idx_cmd_resp_flags, ett_lbmc_umq_idx_cmd_resp_flags, flags, ENC_BIG_ENDIAN);
-    resp_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_RESP_TYPE);
+    resp_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_RESP_TYPE);
     resp_type_item = proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_resp_resp_type, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_RESP_TYPE, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_RESP_TYPE, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_resp_queue_id, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_QUEUE_ID, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_QUEUE_ID, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_idx_cmd_resp_cmd_id, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_CMD_ID, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_HDR_T_CMD_ID, ENC_BIG_ENDIAN);
@@ -8834,11 +8834,11 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += (L_LBMC_CNTL_UMQ_IDX_CMD_RESP_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len);
             break;
@@ -8855,11 +8855,11 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info
             proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_reserved, tvb, offset + O_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T_RESERVED, ENC_NA);
             if ((opt_flags & LBM_UMQ_INDEX_FLAG_NUMERIC) != 0)
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_BIG_ENDIAN);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_numeric_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_BIG_ENDIAN);
             }
             else
             {
-                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (gint)index_len, ENC_ASCII);
+                proto_tree_add_item(opt_subtree, hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index, tvb, offset + L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T, (int)index_len, ENC_ASCII);
             }
             len_dissected += (L_LBMC_CNTL_UMQ_ULB_IDX_CMD_RCV_RESERVE_IDX_ASSIGN_HDR_T + index_len);
             break;
@@ -8910,7 +8910,7 @@ static int dissect_nhdr_stream(tvbuff_t * tvb, int offset, packet_info * pinfo _
     proto_tree_add_item(subtree, hf_lbmc_stream_ctxinst, tvb, offset + O_LBMC_STREAM_HDR_T_CTXINST, L_LBMC_STREAM_HDR_T_CTXINST, ENC_NA);
     if (info != NULL)
     {
-        info->set = TRUE;
+        info->set = true;
         info->stream_id = tvb_get_ntohl(tvb, offset + O_LBMC_STREAM_HDR_T_STREAM_ID);
         info->sqn = tvb_get_ntohl(tvb, offset + O_LBMC_STREAM_HDR_T_SQN);
         tvb_memcpy(tvb, (void *)&(info->ctxinst), offset + O_LBMC_STREAM_HDR_T_CTXINST, L_LBMC_STREAM_HDR_T_CTXINST);
@@ -8922,7 +8922,7 @@ static int dissect_nhdr_topic_md_interest(tvbuff_t * tvb, int offset, packet_inf
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_topic_md_interest_flags_ignore,
@@ -8930,12 +8930,12 @@ static int dissect_nhdr_topic_md_interest(tvbuff_t * tvb, int offset, packet_inf
         &hf_lbmc_topic_md_interest_flags_refresh,
         NULL
     };
-    guint16 dom_count = 0;
+    uint16_t dom_count = 0;
     int idx = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_topic_md_interest, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_topic_md_interest, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_topic_md_interest);
     proto_tree_add_item(subtree, hf_lbmc_topic_md_interest_next_hdr, tvb, offset + O_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_NEXT_HDR, L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_topic_md_interest_hdr_len, tvb, offset + O_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_HDR_LEN, L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -8947,7 +8947,7 @@ static int dissect_nhdr_topic_md_interest(tvbuff_t * tvb, int offset, packet_inf
     offset += L_LBMC_CNTL_TOPIC_MD_INTEREST_HDR_T;
     for (idx = 0; idx < dom_count; ++idx)
     {
-        proto_tree_add_item(subtree, hf_lbmc_topic_md_interest_domain_id, tvb, offset, (gint)sizeof(lbm_uint32_t), ENC_BIG_ENDIAN);
+        proto_tree_add_item(subtree, hf_lbmc_topic_md_interest_domain_id, tvb, offset, (int)sizeof(lbm_uint32_t), ENC_BIG_ENDIAN);
         offset += (int)sizeof(lbm_uint32_t);
         len_dissected += (int)sizeof(lbm_uint32_t);
     }
@@ -8959,7 +8959,7 @@ static int dissect_nhdr_pattern_md_interest(tvbuff_t * tvb, int offset, packet_i
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_pattern_md_interest_flags_ignore,
@@ -8967,12 +8967,12 @@ static int dissect_nhdr_pattern_md_interest(tvbuff_t * tvb, int offset, packet_i
         &hf_lbmc_pattern_md_interest_flags_refresh,
         NULL
     };
-    guint16 dom_count = 0;
+    uint16_t dom_count = 0;
     int idx = 0;
     int len_dissected = 0;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_pattern_md_interest, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_pattern_md_interest, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_pattern_md_interest);
     proto_tree_add_item(subtree, hf_lbmc_pattern_md_interest_next_hdr, tvb, offset + O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_NEXT_HDR, L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_pattern_md_interest_hdr_len, tvb, offset + O_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_HDR_LEN, L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -8986,7 +8986,7 @@ static int dissect_nhdr_pattern_md_interest(tvbuff_t * tvb, int offset, packet_i
     offset += L_LBMC_CNTL_PATTERN_MD_INTEREST_HDR_T;
     for (idx = 0; idx < dom_count; ++idx)
     {
-        proto_tree_add_item(subtree, hf_lbmc_pattern_md_interest_domain_id, tvb, offset, (gint)sizeof(lbm_uint32_t), ENC_BIG_ENDIAN);
+        proto_tree_add_item(subtree, hf_lbmc_pattern_md_interest_domain_id, tvb, offset, (int)sizeof(lbm_uint32_t), ENC_BIG_ENDIAN);
         offset += (int)sizeof(lbm_uint32_t);
         len_dissected += (int)sizeof(lbm_uint32_t);
     }
@@ -9103,8 +9103,8 @@ static int dissect_nhdr_umq_rcv_msg_retrieve(tvbuff_t * tvb, int offset, packet_
     proto_tree * subtree = NULL;
     int len = 0;
     int dissected_len = 0;
-    guint8 num_msgids;
-    guint8 idx;
+    uint8_t num_msgids;
+    uint8_t idx;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_msg_retrieve, tvb, offset, L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_cmd_msg_retrieve);
@@ -9115,7 +9115,7 @@ static int dissect_nhdr_umq_rcv_msg_retrieve(tvbuff_t * tvb, int offset, packet_
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_msg_retrieve_flags, tvb, offset + O_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_FLAGS, L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_FLAGS, ENC_BIG_ENDIAN);
 
     dissected_len = L_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T;
-    num_msgids = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_NUM_MSGIDS);
+    num_msgids = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_RCV_MSG_RETRIEVE_HDR_T_NUM_MSGIDS);
     for (idx = 0; idx < num_msgids; ++idx)
     {
         len = dissect_nhdr_umq_rcv_msg_retrieve_entry(tvb, offset + dissected_len, pinfo, subtree);
@@ -9141,18 +9141,18 @@ static int dissect_nhdr_umq_cmd(tvbuff_t * tvb, int offset, packet_info * pinfo,
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_umq_cmd_flags_ignore,
         NULL
     };
     int len_dissected = 0;
-    guint8 cmd_type = 0;
+    uint8_t cmd_type = 0;
     proto_item * cmd_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_cmd);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_CMD_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_CMD_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9163,7 +9163,7 @@ static int dissect_nhdr_umq_cmd(tvbuff_t * tvb, int offset, packet_info * pinfo,
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_inst_idx, tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_INST_IDX, L_LBMC_CNTL_UMQ_CMD_HDR_T_INST_IDX, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_regid, tvb, offset + O_LBMC_CNTL_UMQ_CMD_HDR_T_REGID, L_LBMC_CNTL_UMQ_CMD_HDR_T_REGID, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_UMQ_CMD_HDR_T;
-    cmd_type = tvb_get_guint8(tvb, O_LBMC_CNTL_UMQ_CMD_HDR_T_CMD_TYPE);
+    cmd_type = tvb_get_uint8(tvb, O_LBMC_CNTL_UMQ_CMD_HDR_T_CMD_TYPE);
     switch (cmd_type)
     {
         case LBMC_UMQ_CMD_TYPE_TOPIC_LIST:
@@ -9213,7 +9213,7 @@ static int dissect_nhdr_umq_cmd_resp_rcv_xmsg_retrieve(tvbuff_t * tvb, int offse
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_xmsg_retrieve_reserved, tvb, offset + O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_RESERVED, L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_RESERVED, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T;
     entry_offset = offset + len_dissected;
-    num_msgs = (int)tvb_get_guint8(tvb, offset + O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_NUM_MSGS);
+    num_msgs = (int)tvb_get_uint8(tvb, offset + O_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_HDR_T_NUM_MSGS);
     for (idx = 0; idx < num_msgs; ++idx)
     {
         entry_item = proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry, tvb, entry_offset, L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_RETRIEVE_ENTRY_HDR_T, ENC_NA);
@@ -9248,11 +9248,11 @@ static int dissect_nhdr_umq_cmd_resp_rcv_xmsg_list(tvbuff_t * tvb, int offset, p
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     int len_dissected = 0;
-    guint64 num_msgs = 0;
+    uint64_t num_msgs = 0;
     int entry_offset = 0;
     proto_item * entry_item = NULL;
     proto_tree * entry_tree = NULL;
-    guint64 idx;
+    uint64_t idx;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_resp_xmsg_list, tvb, offset, L_LBMC_XCNTL_UMQ_CMD_RESP_RCV_MSG_LIST_HDR_T, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_cmd_resp_xmsg_list);
@@ -9278,9 +9278,9 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_appset_entry(tvbuff_t * tvb,
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     int len_dissected = 0;
-    guint8 appset_name_len;
-    guint16 num_receiver_type_ids;
-    guint16 idx;
+    uint8_t appset_name_len;
+    uint16_t num_receiver_type_ids;
+    uint16_t idx;
     int receiver_type_id_offset;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry, tvb, offset, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T, ENC_NA);
@@ -9290,7 +9290,7 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_appset_entry(tvbuff_t * tvb,
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_appset_name_len, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_reserved, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_RESERVED, ENC_NA);
     len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T;
-    appset_name_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN);
+    appset_name_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_APPSET_NAME_LEN);
     len_dissected += (int)appset_name_len;
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_name, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T, (int)appset_name_len, ENC_ASCII);
     num_receiver_type_ids = tvb_get_ntohs(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_APPSET_ENTRY_HDR_T_NUM_RECEIVER_TYPE_IDS);
@@ -9313,9 +9313,9 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_topic_entry(tvbuff_t * tvb,
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     int len_dissected = 0;
-    guint8 topic_len;
-    guint16 num_appsets;
-    guint16 idx;
+    uint8_t topic_len;
+    uint16_t num_appsets;
+    uint16_t idx;
     int appset_offset;
     int len;
 
@@ -9326,7 +9326,7 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list_topic_entry(tvbuff_t * tvb,
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic_len, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_reserved, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_RESERVED, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_RESERVED, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T;
-    topic_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN);
+    topic_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_TOPIC_LEN);
     len_dissected += (int)topic_len;
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic, tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T, (int)topic_len, ENC_ASCII);
     num_appsets = tvb_get_ntohs(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_TOPIC_ENTRY_HDR_T_NUM_APPSETS);
@@ -9350,8 +9350,8 @@ static int dissect_nhdr_umq_cmd_resp_ctx_topic_list(tvbuff_t * tvb, int offset,
     proto_tree * subtree = NULL;
     int len_dissected = 0;
     int len;
-    guint32 num_topics;
-    guint32 idx;
+    uint32_t num_topics;
+    uint32_t idx;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_resp_topic_list, tvb, offset, L_LBMC_CNTL_UMQ_CMD_RESP_CTX_TOPIC_LIST_HDR_T, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_cmd_resp_topic_list);
@@ -9386,11 +9386,11 @@ static int dissect_nhdr_umq_cmd_resp_err(tvbuff_t * tvb, int offset, packet_info
     return (len_dissected);
 }
 
-static int dissect_nhdr_umq_cmd_resp(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, gboolean data_msg)
+static int dissect_nhdr_umq_cmd_resp(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, bool data_msg)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_umq_cmd_resp_flags_ignore,
@@ -9398,11 +9398,11 @@ static int dissect_nhdr_umq_cmd_resp(tvbuff_t * tvb, int offset, packet_info * p
     };
     int len_dissected = 0;
     int len;
-    guint8 resp_type;
+    uint8_t resp_type;
     proto_item * resp_type_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_resp, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_umq_cmd_resp, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_umq_cmd_resp);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_next_hdr, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_NEXT_HDR, L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_hdr_len, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_HDR_LEN, L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9413,7 +9413,7 @@ static int dissect_nhdr_umq_cmd_resp(tvbuff_t * tvb, int offset, packet_info * p
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_inst_idx, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_INST_IDX, L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_INST_IDX, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_umq_cmd_resp_regid, tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_REGID, L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_REGID, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T;
-    resp_type = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_RESP_TYPE);
+    resp_type = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_UMQ_CMD_RESP_HDR_T_RESP_TYPE);
     if (tvb_reported_length_remaining(tvb, offset + L_LBMC_CNTL_UMQ_CMD_RESP_HDR_T) > 0)
     {
         switch (resp_type)
@@ -9573,7 +9573,7 @@ static int dissect_nhdr_gateway_name(tvbuff_t * tvb, int offset, packet_info * p
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_gateway_name_flags_ignore,
@@ -9583,8 +9583,8 @@ static int dissect_nhdr_gateway_name(tvbuff_t * tvb, int offset, packet_info * p
     int namelen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_GATEWAY_NAME_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_gateway_name, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_GATEWAY_NAME_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_gateway_name, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_gateway_name);
     proto_tree_add_item(subtree, hf_lbmc_gateway_name_next_hdr, tvb, offset + O_LBMC_CNTL_GATEWAY_NAME_HDR_T_NEXT_HDR, L_LBMC_CNTL_GATEWAY_NAME_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_gateway_name_hdr_len, tvb, offset + O_LBMC_CNTL_GATEWAY_NAME_HDR_T_HDR_LEN, L_LBMC_CNTL_GATEWAY_NAME_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9608,18 +9608,18 @@ static int dissect_nhdr_auth_request(tvbuff_t * tvb, int offset, packet_info * p
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_auth_request_flags_ignore,
         NULL
     };
     int len_dissected = 0;
-    guint8 user_len;
+    uint8_t user_len;
     int data_offset;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_request, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_request, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_auth_request);
     proto_tree_add_item(subtree, hf_lbmc_auth_request_next_hdr, tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_NEXT_HDR, L_LBMC_CNTL_AUTH_REQUEST_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_auth_request_hdr_len, tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_HDR_LEN, L_LBMC_CNTL_AUTH_REQUEST_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9628,7 +9628,7 @@ static int dissect_nhdr_auth_request(tvbuff_t * tvb, int offset, packet_info * p
     proto_tree_add_item(subtree, hf_lbmc_auth_request_user_len, tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN, L_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_AUTH_REQUEST_HDR_T;
     data_offset = offset + len_dissected;
-    user_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN);
+    user_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_REQUEST_HDR_T_USER_LEN);
     if (user_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_request_user_name, tvb, data_offset, (int)user_len, ENC_ASCII);
@@ -9642,21 +9642,21 @@ static int dissect_nhdr_auth_challenge(tvbuff_t * tvb, int offset, packet_info *
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_auth_challenge_flags_ignore,
         NULL
     };
     int len_dissected = 0;
-    guint8 mod_len;
-    guint8 gen_len;
-    guint8 salt_len;
-    guint8 pubkey_len;
+    uint8_t mod_len;
+    uint8_t gen_len;
+    uint8_t salt_len;
+    uint8_t pubkey_len;
     int data_offset;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_challenge, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_challenge, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_auth_challenge);
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_next_hdr, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_NEXT_HDR, L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_hdr_len, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_HDR_LEN, L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9668,28 +9668,28 @@ static int dissect_nhdr_auth_challenge(tvbuff_t * tvb, int offset, packet_info *
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_pubkey_len, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN, L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_AUTH_CHALLENGE_HDR_T;
     data_offset = offset + len_dissected;
-    mod_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_MOD_LEN);
+    mod_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_MOD_LEN);
     if (mod_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_mod, tvb, data_offset, (int)mod_len, ENC_NA);
         len_dissected += (int)mod_len;
         data_offset += (int)mod_len;
     }
-    gen_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_GEN_LEN);
+    gen_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_GEN_LEN);
     if (gen_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_gen, tvb, data_offset, (int)gen_len, ENC_NA);
         len_dissected += (int)gen_len;
         data_offset += (int)gen_len;
     }
-    salt_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_SALT_LEN);
+    salt_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_SALT_LEN);
     if (salt_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_salt, tvb, data_offset, (int)salt_len, ENC_NA);
         len_dissected += (int)salt_len;
         data_offset += (int)salt_len;
     }
-    pubkey_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN);
+    pubkey_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_HDR_T_PUBKEY_LEN);
     if (pubkey_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_pubkey, tvb, data_offset, (int)pubkey_len, ENC_NA);
@@ -9703,19 +9703,19 @@ static int dissect_nhdr_auth_challenge_rsp(tvbuff_t * tvb, int offset, packet_in
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_auth_challenge_rsp_flags_ignore,
         NULL
     };
     int len_dissected = 0;
-    guint8 pubkey_len;
-    guint8 evidence_len;
+    uint8_t pubkey_len;
+    uint8_t evidence_len;
     int data_offset;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_challenge_rsp, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_challenge_rsp, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_auth_challenge_rsp);
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_rsp_next_hdr, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_NEXT_HDR, L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_rsp_hdr_len, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_HDR_LEN, L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -9725,14 +9725,14 @@ static int dissect_nhdr_auth_challenge_rsp(tvbuff_t * tvb, int offset, packet_in
     proto_tree_add_item(subtree, hf_lbmc_auth_challenge_rsp_evidence_len, tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN, L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN, ENC_BIG_ENDIAN);
     len_dissected = L_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T;
     data_offset = offset + len_dissected;
-    pubkey_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_PUBKEY_LEN);
+    pubkey_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_PUBKEY_LEN);
     if (pubkey_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_rsp_pubkey, tvb, data_offset, (int)pubkey_len, ENC_NA);
         len_dissected += (int)pubkey_len;
         data_offset += (int)pubkey_len;
     }
-    evidence_len = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN);
+    evidence_len = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_CHALLENGE_RSP_HDR_T_EVIDENCE_LEN);
     if (evidence_len > 0)
     {
         proto_tree_add_item(subtree, hf_lbmc_auth_challenge_rsp_evidence, tvb, data_offset, (int)evidence_len, ENC_NA);
@@ -9766,21 +9766,21 @@ static int dissect_nhdr_auth_unknown(tvbuff_t * tvb, int offset, packet_info * p
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     proto_item * opid_item = NULL;
-    guint8 opid;
+    uint8_t opid;
     int len_dissected = 0;
     int datalen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_HDR_LEN);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_HDR_LEN);
     subtree_item = proto_tree_add_item(tree, hf_lbmc_auth_unknown, tvb, offset, (int) hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_auth_unknown);
     proto_tree_add_item(subtree, hf_lbmc_auth_unknown_next_hdr, tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_NEXT_HDR, L_LBMC_CNTL_AUTH_GENERIC_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     hdrlen_item = proto_tree_add_item(subtree, hf_lbmc_auth_unknown_hdr_len, tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_HDR_LEN, L_LBMC_CNTL_AUTH_GENERIC_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_auth_unknown_flags, tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_FLAGS, L_LBMC_CNTL_AUTH_GENERIC_HDR_T_FLAGS, ENC_BIG_ENDIAN);
     opid_item = proto_tree_add_item(subtree, hf_lbmc_auth_unknown_opid, tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID, L_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID, ENC_BIG_ENDIAN);
-    opid = tvb_get_guint8(tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID);
+    opid = tvb_get_uint8(tvb, offset + O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID);
     expert_add_info_format(pinfo, opid_item, &ei_lbmc_analysis_invalid_value, "Invalid LBMC AUTH OPID 0x%02x", opid);
     len_dissected = L_LBMC_CNTL_AUTH_GENERIC_HDR_T;
     datalen = (int) hdrlen - len_dissected;
@@ -9862,7 +9862,7 @@ static int dissect_nhdr_destination(tvbuff_t * tvb, int offset, packet_info * pi
     proto_tree_add_item(subtree, hf_lbmc_destination_reserved, tvb, offset + O_LBMC_DESTINATION_HDR_T_RESERVED, L_LBMC_DESTINATION_HDR_T_RESERVED, ENC_BIG_ENDIAN);
     if (info != NULL)
     {
-        info->set = TRUE;
+        info->set = true;
         info->endpoint_a.domain = tvb_get_ntohl(tvb, offset + O_LBMC_DESTINATION_HDR_T_DOMAIN_ID);
         set_address_tvb(&(info->endpoint_a.addr), AT_IPv4, L_LBMC_DESTINATION_HDR_T_IPADDR, tvb, offset + O_LBMC_DESTINATION_HDR_T_IPADDR);
         info->endpoint_a.port = tvb_get_ntohs(tvb, offset + O_LBMC_DESTINATION_HDR_T_PORT);
@@ -10005,7 +10005,7 @@ static int dissect_nhdr_tcp_sid(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_tree_add_item(subtree, hf_lbmc_tcp_sid_sid, tvb, offset + O_LBMC_CNTL_TCP_SID_HDR_T_SID, L_LBMC_CNTL_TCP_SID_HDR_T_SID, ENC_BIG_ENDIAN);
     if (info != NULL)
     {
-        info->set = TRUE;
+        info->set = true;
         info->session_id = tvb_get_ntohl(tvb, offset + O_LBMC_CNTL_TCP_SID_HDR_T_SID);
     }
     return (L_LBMC_CNTL_TCP_SID_HDR_T);
@@ -10052,7 +10052,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     static int * const flags[] =
     {
         &hf_lbmc_extopt_flags_ignore,
@@ -10062,18 +10062,18 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
     };
     proto_item * ritem = NULL;
     proto_tree * rtree = NULL, *fragment_item;
-    guint8 flags_val = 0;
+    uint8_t flags_val = 0;
     int len_dissected = 0;
     int data_len = 0;
-    guint16 subtype;
-    guint16 fragment_offset;
+    uint16_t subtype;
+    uint16_t fragment_offset;
     int data_offset;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_EXTOPT_HDR_T_HDR_LEN);
-    flags_val = tvb_get_guint8(tvb, offset + O_LBMC_EXTOPT_HDR_T_FLAGS);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_EXTOPT_HDR_T_HDR_LEN);
+    flags_val = tvb_get_uint8(tvb, offset + O_LBMC_EXTOPT_HDR_T_FLAGS);
     subtype = tvb_get_ntohs(tvb, offset + O_LBMC_EXTOPT_HDR_T_SUBTYPE);
     fragment_offset = tvb_get_ntohs(tvb, offset + O_LBMC_EXTOPT_HDR_T_FRAGMENT_OFFSET);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_extopt, tvb, offset, (gint)hdrlen, ENC_NA);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_extopt, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_extopt);
     proto_tree_add_item(subtree, hf_lbmc_extopt_next_hdr, tvb, offset + O_LBMC_EXTOPT_HDR_T_NEXT_HDR, L_LBMC_EXTOPT_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmc_extopt_hdr_len, tvb, offset + O_LBMC_EXTOPT_HDR_T_HDR_LEN, L_LBMC_EXTOPT_HDR_T_HDR_LEN, ENC_BIG_ENDIAN);
@@ -10091,14 +10091,14 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
         if (reassembly->reassembly_in_progress)
         {
             tvbuff_t * reassembly_tvb;
-            gchar * buf;
+            char * buf;
             proto_item * pi = NULL;
 
             if ((reassembly->len + fragment_offset + data_len) < LBMC_EXTOPT_REASSEMBLED_DATA_MAX_LEN)
             {
                 tvb_memcpy(tvb, reassembly->data + fragment_offset, data_offset, data_len);
                 reassembly->len += data_len;
-                buf = (gchar *) wmem_memdup(pinfo->pool, reassembly->data, reassembly->len);
+                buf = (char *) wmem_memdup(pinfo->pool, reassembly->data, reassembly->len);
                 reassembly_tvb = tvb_new_real_data(buf, reassembly->len, reassembly->len);
                 add_new_data_source(pinfo, reassembly_tvb, "Reassembled EXTOPT fragment data");
             }
@@ -10112,7 +10112,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
             rtree = proto_item_add_subtree(ritem, ett_lbmc_extopt_reassembled_data);
             pi = proto_tree_add_uint(rtree, hf_lbmc_extopt_reassembled_data_subtype, reassembly_tvb, 0, 0, reassembly->subtype);
             proto_item_set_generated(pi);
-            pi = proto_tree_add_uint(rtree, hf_lbmc_extopt_reassembled_data_len, reassembly_tvb, 0, 0, (guint32)reassembly->len);
+            pi = proto_tree_add_uint(rtree, hf_lbmc_extopt_reassembled_data_len, reassembly_tvb, 0, 0, (uint32_t)reassembly->len);
             proto_item_set_generated(pi);
             switch (reassembly->subtype)
             {
@@ -10163,7 +10163,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
         }
         else
         {
-            reassembly->reassembly_in_progress = TRUE;
+            reassembly->reassembly_in_progress = true;
             reassembly->subtype = subtype;
             reassembly->len = 0;
             if (fragment_offset != 0)
@@ -10190,17 +10190,17 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo,
     return (len_dissected);
 }
 
-static int dissect_nhdr_unhandled(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint8 next_hdr)
+static int dissect_nhdr_unhandled(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint8_t next_hdr)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 hdrlen = 0;
+    uint8_t hdrlen = 0;
     int len_dissected = 0;
     int datalen = 0;
     proto_item * hdrlen_item = NULL;
 
-    hdrlen = tvb_get_guint8(tvb, offset + O_LBMC_BASIC_HDR_T_HDR_LEN);
-    subtree_item = proto_tree_add_item(tree, hf_lbmc_unhandled, tvb, offset, (gint)hdrlen, ENC_NA);
+    hdrlen = tvb_get_uint8(tvb, offset + O_LBMC_BASIC_HDR_T_HDR_LEN);
+    subtree_item = proto_tree_add_item(tree, hf_lbmc_unhandled, tvb, offset, (int)hdrlen, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmc_unhandled_hdr);
     expert_add_info_format(pinfo, subtree_item, &ei_lbmc_analysis_invalid_value, "Invalid LBMC header type 0x%02x", next_hdr);
     proto_tree_add_item(subtree, hf_lbmc_unhandled_next_hdr, tvb, offset + O_LBMC_UNHANDLED_HDR_T_NEXT_HDR, L_LBMC_UNHANDLED_HDR_T_NEXT_HDR, ENC_BIG_ENDIAN);
@@ -10228,10 +10228,10 @@ static int dissect_msg_properties(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_tree * data_tree = NULL;
     proto_item * field_item = NULL;
     proto_tree * field_tree = NULL;
-    guint32 magic;
-    guint16 num_fields;
-    guint16 idx;
-    guint encoding;
+    uint32_t magic;
+    uint16_t num_fields;
+    uint16_t idx;
+    unsigned encoding;
     int field_offset;
     int data_length;
     proto_item * magic_item = NULL;
@@ -10276,9 +10276,9 @@ static int dissect_msg_properties(tvbuff_t * tvb, int offset, packet_info * pinf
     field_offset = offset + L_LBM_MSG_PROPERTIES_DATA_T;
     for (idx = 0; idx < num_fields; ++idx)
     {
-        guint32 key_offset;
-        guint32 value_offset;
-        guint32 type;
+        uint32_t key_offset;
+        uint32_t value_offset;
+        uint32_t type;
         int actual_key_offset;
         int actual_value_offset;
         int key_len;
@@ -10370,7 +10370,7 @@ static int dissect_msg_properties(tvbuff_t * tvb, int offset, packet_info * pinf
 /*----------------------------------------------------------------------------*/
 /* Miscellaneous functions.                                                   */
 /*----------------------------------------------------------------------------*/
-static const gchar * lbmc_determine_msg_type(const guint8 * header_array)
+static const char * lbmc_determine_msg_type(const uint8_t * header_array)
 {
     if (header_array[LBMC_NHDR_SSF_INIT] != 0)
     {
@@ -10563,7 +10563,7 @@ static const gchar * lbmc_determine_msg_type(const guint8 * header_array)
     return (NULL);
 }
 
-static const gchar * lbmc_determine_data_msg_type(gboolean retransmission, const guint8 * header_array)
+static const char * lbmc_determine_data_msg_type(bool retransmission, const uint8_t * header_array)
 {
     if (retransmission)
     {
@@ -10619,24 +10619,24 @@ static lbm_uim_stream_info_t * lbmc_dup_stream_info(wmem_allocator_t *scope, con
     return (ptr);
 }
 
-gboolean lbmc_test_lbmc_header(tvbuff_t * tvb, int offset)
+bool lbmc_test_lbmc_header(tvbuff_t * tvb, int offset)
 {
-    guint8 type;
-    guint8 version;
-    guint8 ver_type;
-    guint8 next_header;
-    guint16 msglen;
+    uint8_t type;
+    uint8_t version;
+    uint8_t ver_type;
+    uint8_t next_header;
+    uint16_t msglen;
 
     if (tvb_reported_length_remaining(tvb, offset) < (O_LBMC_HDR_T_MSGLEN + L_LBMC_HDR_T_MSGLEN))
     {
-        return FALSE;
+        return false;
     }
-    ver_type = tvb_get_guint8(tvb, offset + O_LBMC_HDR_T_VER_TYPE);
+    ver_type = tvb_get_uint8(tvb, offset + O_LBMC_HDR_T_VER_TYPE);
     version = LBMC_HDR_VER(ver_type);
     type = LBMC_HDR_TYPE(ver_type);
     if (version != LBMC_VERSION)
     {
-        return FALSE;
+        return false;
     }
     switch (type)
     {
@@ -10647,9 +10647,9 @@ gboolean lbmc_test_lbmc_header(tvbuff_t * tvb, int offset)
         case LBMC_TYPE_RETRANS:
             break;
         default:
-            return FALSE;
+            return false;
     }
-    next_header = tvb_get_guint8(tvb, offset + O_LBMC_HDR_T_NEXT_HDR);
+    next_header = tvb_get_uint8(tvb, offset + O_LBMC_HDR_T_NEXT_HDR);
     switch (next_header)
     {
         case LBMC_NHDR_DATA:
@@ -10738,37 +10738,37 @@ gboolean lbmc_test_lbmc_header(tvbuff_t * tvb, int offset)
         case LBMC_NHDR_EXTOPT:
             break;
         default:
-            return FALSE;
+            return false;
     }
     msglen = tvb_get_ntohs(tvb, offset + O_LBMC_HDR_T_MSGLEN);
     if (msglen == 0)
     {
-        return FALSE;
+        return false;
     }
-    return TRUE;
+    return true;
 }
 
-int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, guint64 channel)
+int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, uint64_t channel)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
-    guint8 type;
-    guint8 ver_type;
-    guint8 next_hdr;
-    guint16 msglen = 0;
+    uint8_t type;
+    uint8_t ver_type;
+    uint8_t next_hdr;
+    uint16_t msglen = 0;
     int pkt_offset = 0;
     lbmc_basic_hdr_t bhdr;
     tvbuff_t * lbmc_tvb = NULL;
     int tvb_lbmc_offset = offset;
     const char * topic_name = NULL;
-    guint32 topic_index = 0;
+    uint32_t topic_index = 0;
     int len_dissected = 0;
     int lbmc_hdr_len;
-    guint32 msgprop_len = 0;
+    uint32_t msgprop_len = 0;
     lbmc_fragment_info_t frag_info;
     lbmc_extopt_reassembled_data_t *reassembly;
-    gboolean data_is_umq_cmd_resp;
-    gboolean packet_is_data;
+    bool data_is_umq_cmd_resp;
+    bool packet_is_data;
     lbmc_stream_info_t stream_info;
     lbmc_ctxinst_info_t ctxinstd_info;
     lbmc_ctxinst_info_t ctxinstr_info;
@@ -10778,23 +10778,23 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
     lbm_dstream_entry_t * dom_stream;
     lbm_dstream_substream_entry_t * dom_substream;
     proto_item * last_initial_item = NULL;
-    guint8 found_header[256];
+    uint8_t found_header[256];
     lbm_uim_stream_info_t uim_stream_info;
     lbm_uim_stream_info_t * puim_stream_info = NULL;
     lbmc_tcp_sid_info_t tcp_sid_info;
-    gboolean has_source_index;
+    bool has_source_index;
     address tcp_addr;
-    guint16 tcp_port = 0;
-    guint64 actual_channel = channel;
-    gboolean tcp_address_valid = FALSE;
+    uint16_t tcp_port = 0;
+    uint64_t actual_channel = channel;
+    bool tcp_address_valid = false;
 
     while (tvb_reported_length_remaining(tvb, tvb_lbmc_offset) >= L_LBMC_MINIMAL_HDR_T)
     {
         proto_item * type_item = NULL;
-        const gchar * msg_type = NULL;
+        const char * msg_type = NULL;
 
         /* Get the version and type. */
-        ver_type = tvb_get_guint8(tvb, tvb_lbmc_offset + O_LBMC_HDR_T_VER_TYPE);
+        ver_type = tvb_get_uint8(tvb, tvb_lbmc_offset + O_LBMC_HDR_T_VER_TYPE);
         type = LBMC_HDR_TYPE(ver_type);
         /* Get the message length. */
         msglen = tvb_get_ntohs(tvb, tvb_lbmc_offset + O_LBMC_MINIMAL_HDR_T_MSGLEN);
@@ -10804,7 +10804,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
             return (len_dissected);
         }
         /* Create a new tvb for just this LBMC message. */
-        lbmc_tvb = tvb_new_subset_length(tvb, tvb_lbmc_offset, (gint)msglen);
+        lbmc_tvb = tvb_new_subset_length(tvb, tvb_lbmc_offset, (int)msglen);
         if ((type == LBMC_TYPE_MESSAGE) || (type == LBMC_TYPE_RETRANS) || (type == LBMC_TYPE_PRORX))
         {
             topic_index = tvb_get_ntohl(lbmc_tvb, O_LBMC_HDR_T_TIDX);
@@ -10865,12 +10865,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         {
             case LBMC_TYPE_EOT:
             case LBMC_TYPE_CONTROL:
-                packet_is_data = FALSE;
+                packet_is_data = false;
                 break;
             case LBMC_TYPE_MESSAGE:
             case LBMC_TYPE_RETRANS:
             case LBMC_TYPE_PRORX:
-                packet_is_data = TRUE;
+                packet_is_data = true;
                 break;
             default:
                 expert_add_info_format(pinfo, type_item, &ei_lbmc_analysis_invalid_value, "Invalid LBMC type 0x%02x", type);
@@ -10879,7 +10879,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                 continue;
                 break;
         }
-        next_hdr = tvb_get_guint8(lbmc_tvb, O_LBMC_HDR_T_NEXT_HDR);
+        next_hdr = tvb_get_uint8(lbmc_tvb, O_LBMC_HDR_T_NEXT_HDR);
         pkt_offset = lbmc_hdr_len;
         if ((type == LBMC_TYPE_MESSAGE) || (type == LBMC_TYPE_RETRANS) || (type == LBMC_TYPE_PRORX))
         {
@@ -10893,35 +10893,35 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         msgprop_len = 0;
         reassembly = wmem_new(pinfo->pool, lbmc_extopt_reassembled_data_t);
         lbmc_init_extopt_reassembled_data(reassembly);
-        data_is_umq_cmd_resp = FALSE;
-        stream_info.set = FALSE;
-        ctxinstd_info.set = FALSE;
-        ctxinstr_info.set = FALSE;
-        destination_info.set = FALSE;
+        data_is_umq_cmd_resp = false;
+        stream_info.set = false;
+        ctxinstd_info.set = false;
+        ctxinstr_info.set = false;
+        destination_info.set = false;
         inst_stream = NULL;
         inst_substream = NULL;
         dom_stream = NULL;
         dom_substream = NULL;
         memset((void *)found_header, 0, sizeof(found_header));
         puim_stream_info = NULL;
-        tcp_sid_info.set = FALSE;
-        tcp_sid_info.session_id = G_MAXUINT32;
-        has_source_index = FALSE;
+        tcp_sid_info.set = false;
+        tcp_sid_info.session_id = UINT32_MAX;
+        has_source_index = false;
 
         while ((tvb_reported_length_remaining(lbmc_tvb, pkt_offset) >= L_LBMC_BASIC_HDR_T) && (next_hdr != LBMC_NHDR_DATA) && (next_hdr != LBMC_NHDR_NONE))
         {
             tvbuff_t * hdr_tvb = NULL;
             int dissected_hdr_len;
-            guint8 opid;
+            uint8_t opid;
 
-            bhdr.next_hdr = tvb_get_guint8(lbmc_tvb, pkt_offset + O_LBMC_BASIC_HDR_T_NEXT_HDR);
-            bhdr.hdr_len = tvb_get_guint8(lbmc_tvb, pkt_offset + O_LBMC_BASIC_HDR_T_HDR_LEN);
+            bhdr.next_hdr = tvb_get_uint8(lbmc_tvb, pkt_offset + O_LBMC_BASIC_HDR_T_NEXT_HDR);
+            bhdr.hdr_len = tvb_get_uint8(lbmc_tvb, pkt_offset + O_LBMC_BASIC_HDR_T_HDR_LEN);
             if (bhdr.hdr_len == 0)
             {
                 expert_add_info_format(pinfo, NULL, &ei_lbmc_analysis_zero_length, "LBMC header length is zero");
                 return (len_dissected);
             }
-            hdr_tvb = tvb_new_subset_length(lbmc_tvb, pkt_offset, (gint)bhdr.hdr_len);
+            hdr_tvb = tvb_new_subset_length(lbmc_tvb, pkt_offset, (int)bhdr.hdr_len);
             found_header[next_hdr] = 1;
             switch (next_hdr)
             {
@@ -10967,7 +10967,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     break;
                 case LBMC_NHDR_SRCIDX:
                     dissected_hdr_len = dissect_nhdr_srcidx(hdr_tvb, 0, pinfo, subtree);
-                    has_source_index = TRUE;
+                    has_source_index = true;
                     break;
                 case LBMC_NHDR_UMQ_ULB_MSG:
                     dissected_hdr_len = dissect_nhdr_umq_ulb_msg(hdr_tvb, 0, pinfo, subtree);
@@ -11144,7 +11144,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     dissected_hdr_len = dissect_nhdr_gateway_name(hdr_tvb, 0, pinfo, subtree);
                     break;
                 case LBMC_NHDR_AUTHENTICATION:
-                    opid = tvb_get_guint8(hdr_tvb, O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID);
+                    opid = tvb_get_uint8(hdr_tvb, O_LBMC_CNTL_AUTH_GENERIC_HDR_T_OPID);
                     switch (opid)
                     {
                         case AUTH_OP_REQ:
@@ -11205,20 +11205,20 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
             pkt_offset += bhdr.hdr_len;
         }
         /* If transport is TCP and we got a TCP SID header, process it. */
-        tcp_address_valid = TRUE;
+        tcp_address_valid = true;
         if (lbm_channel_is_unknown_transport_source_lbttcp(channel))
         {
             copy_address_shallow(&tcp_addr, &(pinfo->src));
-            tcp_port = (guint16)pinfo->srcport;
+            tcp_port = (uint16_t)pinfo->srcport;
         }
         else if (lbm_channel_is_unknown_transport_client_lbttcp(channel))
         {
             copy_address_shallow(&tcp_addr, &(pinfo->dst));
-            tcp_port = (guint16)pinfo->destport;
+            tcp_port = (uint16_t)pinfo->destport;
         }
         else
         {
-            tcp_address_valid = FALSE;
+            tcp_address_valid = false;
         }
         /* Note: it *is* possible for a TCP SID to appear in an LBTTCP non-transport (UIM) message. */
         if ((pinfo->fd->visited == 0) && (tcp_sid_info.set) && lbm_channel_is_unknown_transport_lbttcp(channel) && tcp_address_valid)
@@ -11237,7 +11237,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
             }
             else
             {
-                guint32 tcp_session_id = 0;
+                uint32_t tcp_session_id = 0;
 
                 if (lbttcp_transport_sid_find(&tcp_addr, tcp_port, pinfo->num, &tcp_session_id))
                 {
@@ -11374,20 +11374,20 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
             int msgprop_offset = 0;
             tvbuff_t * data_tvb = NULL;
             tvbuff_t * msgprop_tvb = NULL;
-            gboolean msg_complete = TRUE;
-            gboolean msg_reassembled = FALSE;
-            gboolean can_call_subdissector = FALSE;
+            bool msg_complete = true;
+            bool msg_reassembled = false;
+            bool can_call_subdissector = false;
             lbmc_message_entry_t * msg = NULL;
             bool dissector_found = false;
             heur_dtbl_entry_t *hdtbl_entry;
-            gboolean retransmission = FALSE;
+            bool retransmission = false;
 
             /* Note on heuristic subdissectors:
-               If the preference "lbmc.use_heuristic_subdissectors" is TRUE, and a heuristic subdissector is
+               If the preference "lbmc.use_heuristic_subdissectors" is true, and a heuristic subdissector is
                registered for "lbm_msg_payload", we can call the heuristic subdissector under one of the
                following conditions:
                - The message is unfragmented
-               - The message is fragmented, AND the preference "lbmc.reassemble_fragments" is TRUE, AND
+               - The message is fragmented, AND the preference "lbmc.reassemble_fragments" is true, AND
                  the entire message has been reassembled.
                This applies to the lbmpdm subdissector as well.
              */
@@ -11408,9 +11408,9 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     data_tvb = tvb_new_subset_remaining(lbmc_tvb, pkt_offset);
                     msgprop_tvb = NULL;
                 }
-                msg_complete = TRUE;
-                msg_reassembled = FALSE;
-                can_call_subdissector = TRUE;
+                msg_complete = true;
+                msg_reassembled = false;
+                can_call_subdissector = true;
             }
             else
             {
@@ -11421,14 +11421,14 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     actual_data_len = tvb_reported_length_remaining(lbmc_tvb, pkt_offset);
                     data_tvb = tvb_new_subset_length(lbmc_tvb, pkt_offset, actual_data_len);
                     msgprop_tvb = NULL;
-                    msg_complete = TRUE;
+                    msg_complete = true;
                 }
                 else
                 {
                     /* Fragment info is present and we should reassemble */
-                    guint32 port;
+                    uint32_t port;
 
-                    port = (guint32)pinfo->destport;
+                    port = (uint32_t)pinfo->destport;
                     msg = lbmc_message_find(actual_channel, &(pinfo->dst), port, &frag_info);
                     if (msg == NULL)
                     {
@@ -11438,7 +11438,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     {
                         /* Check fragment against message */
                         int frag_len = tvb_reported_length_remaining(lbmc_tvb, pkt_offset);
-                        if ((frag_info.offset + (guint32) frag_len) > msg->total_len)
+                        if ((frag_info.offset + (uint32_t) frag_len) > msg->total_len)
                         {
                             /* Indicate a malformed packet */
                             expert_add_info_format(pinfo, NULL, &ei_lbmc_analysis_invalid_fragment,
@@ -11450,7 +11450,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                             (void)lbmc_message_add_fragment(msg, lbmc_tvb, pkt_offset, &frag_info, pinfo->num);
                             if (data_is_umq_cmd_resp)
                             {
-                                msg->data_is_umq_cmd_resp = TRUE;
+                                msg->data_is_umq_cmd_resp = true;
                             }
                             if (msg->total_len == msg->accumulated_len)
                             {
@@ -11461,12 +11461,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                                 }
                                 data_tvb = tvb_new_subset_remaining(lbmc_tvb, pkt_offset);
                                 msgprop_tvb = NULL;
-                                msg_reassembled = TRUE;
-                                msg_complete = TRUE;
+                                msg_reassembled = true;
+                                msg_complete = true;
                                 if (msg->reassembled_frame == pinfo->num)
                                 {
                                     /* We can only call a subdissector if this is the frame in which the message is reassembled */
-                                    can_call_subdissector = TRUE;
+                                    can_call_subdissector = true;
                                 }
                             }
                             else
@@ -11474,8 +11474,8 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                                 /* This is not the last fragment of the message. */
                                 data_tvb = tvb_new_subset_remaining(lbmc_tvb, pkt_offset);
                                 msgprop_tvb = NULL;
-                                msg_reassembled = TRUE;
-                                msg_complete = FALSE;
+                                msg_reassembled = true;
+                                msg_complete = false;
                             }
                         }
                     }
@@ -11494,12 +11494,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                     proto_tree * frag_tree = NULL;
                     proto_item * frag_item = NULL;
                     proto_item * pi = NULL;
-                    gboolean first_item = TRUE;
+                    bool first_item = true;
                     lbmc_fragment_entry_t * cur = NULL;
-                    gchar * buf = NULL;
+                    char * buf = NULL;
 
                     /* Create a new real data tvb of the reassembled data. */
-                    buf = (gchar *)wmem_alloc(pinfo->pool, (size_t)msg->total_len);
+                    buf = (char *)wmem_alloc(pinfo->pool, (size_t)msg->total_len);
                     cur = msg->entry;
                     while (cur != NULL)
                     {
@@ -11507,7 +11507,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                         cur = cur->next;
                     }
                     msg->reassembled_data = tvb_new_real_data(buf, msg->total_len, msg->total_len);
-                    msg_complete = TRUE;
+                    msg_complete = true;
                     /* Create separate data and msgprop tvbs */
                     msg->data = tvb_new_subset_length(msg->reassembled_data, 0, msg->total_len - msg->msgprop_len);
                     if (msg->msgprop_len > 0)
@@ -11540,7 +11540,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                         msg->total_len);
                     frag_tree = proto_item_add_subtree(frag_item, ett_lbmc_reassembly);
                     cur = msg->entry;
-                    first_item = TRUE;
+                    first_item = true;
                     while (cur != NULL)
                     {
                         pi = proto_tree_add_uint_format_value(frag_tree,
@@ -11563,7 +11563,7 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
                         {
                             proto_item_append_text(frag_item, ", #%" PRIu32 "(%" PRIu32 ")", cur->frame, cur->fragment_len);
                         }
-                        first_item = FALSE;
+                        first_item = false;
                         cur = cur->next;
                     }
                     proto_item_set_generated(frag_item);
@@ -11586,14 +11586,14 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
 
             if (data_is_umq_cmd_resp && msg_complete)
             {
-                (void)dissect_nhdr_umq_cmd_resp(data_tvb, 0, pinfo, subtree, TRUE);
+                (void)dissect_nhdr_umq_cmd_resp(data_tvb, 0, pinfo, subtree, true);
                 col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "UMQ-CMD-RESP");
             }
             else
             {
                 if ((!lbm_channel_is_transport(channel)) && (!has_source_index))
                 {
-                    retransmission = TRUE;
+                    retransmission = true;
                 }
                 msg_type = lbmc_determine_data_msg_type(retransmission, found_header);
                 col_append_sep_str(pinfo->cinfo, COL_INFO, " ", msg_type);
@@ -11673,7 +11673,7 @@ int lbmc_get_minimum_length(void)
     return (O_LBMC_HDR_T_MSGLEN + L_LBMC_HDR_T_MSGLEN);
 }
 
-guint16 lbmc_get_message_length(tvbuff_t * tvb, int offset)
+uint16_t lbmc_get_message_length(tvbuff_t * tvb, int offset)
 {
     return (tvb_get_ntohs(tvb, offset + O_LBMC_HDR_T_MSGLEN));
 }
@@ -14043,7 +14043,7 @@ void proto_register_lbmc(void)
             { "Reassembled message in frame", "lbmc.reassembly_frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Frame in which reassembled message appears", HFILL } },
     };
 
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbmc,
         &ett_lbmc_frag,
diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c
index 2cc24b15c9..96d0398910 100644
--- a/epan/dissectors/packet-lbmpdm.c
+++ b/epan/dissectors/packet-lbmpdm.c
@@ -32,13 +32,13 @@ void proto_register_lbmpdm(void);
 /*------------*/
 typedef struct lbmpdm_msg_hdr_stct_t
 {
-    guint32 magic;
-    guint8 ver_type;
-    guint8 next_hdr;
-    guint8 def_major_ver;
-    guint8 def_minor_ver;
-    guint32 def_id;
-    guint32 len;
+    uint32_t magic;
+    uint8_t ver_type;
+    uint8_t next_hdr;
+    uint8_t def_major_ver;
+    uint8_t def_minor_ver;
+    uint32_t def_id;
+    uint32_t len;
 } lbmpdm_msg_hdr_t;
 #define O_LBMPDM_MSG_HDR_T_MAGIC OFFSETOF(lbmpdm_msg_hdr_t, magic)
 #define L_LBMPDM_MSG_HDR_T_MAGIC SIZEOF(lbmpdm_msg_hdr_t, magic)
@@ -54,17 +54,17 @@ typedef struct lbmpdm_msg_hdr_stct_t
 #define L_LBMPDM_MSG_HDR_T_DEF_ID SIZEOF(lbmpdm_msg_hdr_t, def_id)
 #define O_LBMPDM_MSG_HDR_T_LEN OFFSETOF(lbmpdm_msg_hdr_t, len)
 #define L_LBMPDM_MSG_HDR_T_LEN SIZEOF(lbmpdm_msg_hdr_t, len)
-#define L_LBMPDM_MSG_HDR_T (gint) sizeof(lbmpdm_msg_hdr_t)
+#define L_LBMPDM_MSG_HDR_T (int) sizeof(lbmpdm_msg_hdr_t)
 
 /*---------------------*/
 /* PDM segment header. */
 /*---------------------*/
 typedef struct lbmpdm_seg_hdr_stct_t
 {
-    guint8 next_hdr;
-    guint8 flags;
-    guint16 res;
-    guint32 len;
+    uint8_t next_hdr;
+    uint8_t flags;
+    uint16_t res;
+    uint32_t len;
 } lbmpdm_seg_hdr_t;
 #define O_LBMPDM_SEG_HDR_T_NEXT_HDR OFFSETOF(lbmpdm_seg_hdr_t, next_hdr)
 #define L_LBMPDM_SEG_HDR_T_NEXT_HDR SIZEOF(lbmpdm_seg_hdr_t, next_hdr)
@@ -74,21 +74,21 @@ typedef struct lbmpdm_seg_hdr_stct_t
 #define L_LBMPDM_SEG_HDR_T_RES SIZEOF(lbmpdm_seg_hdr_t, res)
 #define O_LBMPDM_SEG_HDR_T_LEN OFFSETOF(lbmpdm_seg_hdr_t, len)
 #define L_LBMPDM_SEG_HDR_T_LEN SIZEOF(lbmpdm_seg_hdr_t, len)
-#define L_LBMPDM_SEG_HDR_T (gint) sizeof(lbmpdm_seg_hdr_t)
+#define L_LBMPDM_SEG_HDR_T (int) sizeof(lbmpdm_seg_hdr_t)
 
 /*--------------------------------*/
 /* PDM definition segment header. */
 /*--------------------------------*/
 typedef struct lbmpdm_defn_stct_t
 {
-    gint32 id;
-    gint32 num_fields;
-    guint8 field_names_type;
-    guint8 finalized;
-    guint8 msg_vers_major;
-    guint8 msg_vers_minor;
-    guint32 fixed_req_section_len;
-    guint32 field_info_len;
+    int32_t id;
+    int32_t num_fields;
+    uint8_t field_names_type;
+    uint8_t finalized;
+    uint8_t msg_vers_major;
+    uint8_t msg_vers_minor;
+    uint32_t fixed_req_section_len;
+    uint32_t field_info_len;
 } lbmpdm_defn_t;
 #define O_LBMPDM_DEFN_T_ID OFFSETOF(lbmpdm_defn_t, id)
 #define L_LBMPDM_DEFN_T_ID SIZEOF(lbmpdm_defn_t, id)
@@ -106,21 +106,21 @@ typedef struct lbmpdm_defn_stct_t
 #define L_LBMPDM_DEFN_T_FIXED_REQ_SECTION_LEN SIZEOF(lbmpdm_defn_t, fixed_req_section_len)
 #define O_LBMPDM_DEFN_T_FIELD_INFO_LEN OFFSETOF(lbmpdm_defn_t, field_info_len)
 #define L_LBMPDM_DEFN_T_FIELD_INFO_LEN SIZEOF(lbmpdm_defn_t, field_info_len)
-#define L_LBMPDM_DEFN_T (gint) sizeof(lbmpdm_defn_t)
+#define L_LBMPDM_DEFN_T (int) sizeof(lbmpdm_defn_t)
 
 /*----------------------------*/
 /* PDM definition field info. */
 /*----------------------------*/
 typedef struct lbmpdm_field_info_stct_t
 {
-    guint32 id;
-    guint32 len;
-    guint32 fixed_str_len;
-    guint32 num_arr_elem;
-    guint8 req;
-    guint8 fixed;
-    gint32 fld_int_name;
-    gint32 str_name_len;
+    uint32_t id;
+    uint32_t len;
+    uint32_t fixed_str_len;
+    uint32_t num_arr_elem;
+    uint8_t req;
+    uint8_t fixed;
+    int32_t fld_int_name;
+    int32_t str_name_len;
     /* NUL-terminated field name, if str_name_len != 0 */
     /* int16_t fld_type */
 } lbmpdm_field_info_t;
@@ -141,21 +141,21 @@ typedef struct lbmpdm_field_info_stct_t
 #define O_LBMPDM_FIELD_INFO_T_STR_NAME_LEN (O_LBMPDM_FIELD_INFO_T_FLD_INT_NAME + L_LBMPDM_FIELD_INFO_T_FLD_INT_NAME)
 #define L_LBMPDM_FIELD_INFO_T_STR_NAME_LEN 4
 #define L_LBMPDM_FIELD_INFO_T (O_LBMPDM_FIELD_INFO_T_STR_NAME_LEN + L_LBMPDM_FIELD_INFO_T_STR_NAME_LEN)
-#define L_LBMPDM_FIELD_INFO_T_INT_NAME (gint) (L_LBMPDM_FIELD_INFO_T + 2)
+#define L_LBMPDM_FIELD_INFO_T_INT_NAME (int) (L_LBMPDM_FIELD_INFO_T + 2)
 
 /*---------------------------------*/
 /* PDM offset table segment entry. */
 /*---------------------------------*/
 typedef struct
 {
-    guint32 id;
-    guint32 offset;
+    uint32_t id;
+    uint32_t offset;
 } lbmpdm_offset_entry_t;
 #define O_LBMPDM_OFFSET_ENTRY_T_ID OFFSETOF(lbmpdm_offset_entry_t, id)
 #define L_LBMPDM_OFFSET_ENTRY_T_ID SIZEOF(lbmpdm_offset_entry_t, id)
 #define O_LBMPDM_OFFSET_ENTRY_T_OFFSET OFFSETOF(lbmpdm_offset_entry_t, offset)
 #define L_LBMPDM_OFFSET_ENTRY_T_OFFSET SIZEOF(lbmpdm_offset_entry_t, offset)
-#define L_LBMPDM_OFFSET_ENTRY_T (gint) sizeof(lbmpdm_offset_entry_t)
+#define L_LBMPDM_OFFSET_ENTRY_T (int) sizeof(lbmpdm_offset_entry_t)
 
 /*-----------------------------------*/
 /* Header types (value of next_hdr). */
@@ -233,9 +233,9 @@ typedef struct
 
 typedef struct
 {
-    guint32 num_flds;
-    gint32 * min_set_offset;
-    gint32 * offset_list;
+    uint32_t num_flds;
+    int32_t * min_set_offset;
+    int32_t * offset_list;
 } lbmpdm_offset_table_t;
 
 struct lbmpdm_definition_field_t_stct;
@@ -246,16 +246,16 @@ typedef struct lbmpdm_definition_t_stct lbmpdm_definition_t;
 
 struct lbmpdm_definition_field_t_stct
 {
-    guint32 id;
-    guint32 len;
-    guint32 fixed_string_len;
-    guint32 num_array_elem;
-    guint8 required;
-    guint8 fixed;
-    guint16 field_type;
-    guint16 base_type;
-    gint32 field_int_name;
-    guint32 field_string_name_len;
+    uint32_t id;
+    uint32_t len;
+    uint32_t fixed_string_len;
+    uint32_t num_array_elem;
+    uint8_t required;
+    uint8_t fixed;
+    uint16_t field_type;
+    uint16_t base_type;
+    int32_t field_int_name;
+    uint32_t field_string_name_len;
     char * field_string_name;
     int fixed_required_offset;
     lbmpdm_definition_field_t * next_fixed_required;
@@ -264,25 +264,25 @@ struct lbmpdm_definition_field_t_stct
 
 struct lbmpdm_definition_t_stct
 {
-    guint64 channel;
-    guint32 id;
-    guint8 vers_major;
-    guint8 vers_minor;
-    gint32 num_fields;
-    guint8 field_names_type;
-    guint8 finalized;
-    guint32 fixed_req_section_len;
-    guint32 fixed_required_count;
+    uint64_t channel;
+    uint32_t id;
+    uint8_t vers_major;
+    uint8_t vers_minor;
+    int32_t num_fields;
+    uint8_t field_names_type;
+    uint8_t finalized;
+    uint32_t fixed_req_section_len;
+    uint32_t fixed_required_count;
     lbmpdm_definition_field_t * first_fixed_required;
     wmem_tree_t * field_list;
 };
 
 typedef struct
 {
-    guint64 channel;
-    guint32 msg_def_id;
-    guint8 ver_major;
-    guint8 ver_minor;
+    uint64_t channel;
+    uint32_t msg_def_id;
+    uint8_t ver_major;
+    uint8_t ver_minor;
     lbmpdm_offset_table_t * offset_table;
 } lbmpdm_msg_definition_id_t;
 
@@ -370,12 +370,12 @@ static int hf_lbmpdm_field_value_blob;
 static int hf_lbmpdm_field_value_message;
 
 /* Protocol trees */
-static gint ett_lbmpdm;
-static gint ett_lbmpdm_segments;
-static gint ett_lbmpdm_segment;
-static gint ett_lbmpdm_offset_entry;
-static gint ett_lbmpdm_segment_def_field;
-static gint ett_lbmpdm_field;
+static int ett_lbmpdm;
+static int ett_lbmpdm_segments;
+static int ett_lbmpdm_segment;
+static int ett_lbmpdm_offset_entry;
+static int ett_lbmpdm_segment_def_field;
+static int ett_lbmpdm_field;
 
 /*----------------------------------------------------------------------------*/
 /* Value translation tables.                                                  */
@@ -457,19 +457,19 @@ static const value_string lbmpdm_field_fixed_length[] =
 
 static int lbmpdm_get_segment_length(tvbuff_t * tvb, int offset, int encoding, int * data_length)
 {
-    guint32 datalen = 0;
+    uint32_t datalen = 0;
     int seglen = 0;
 
-    datalen = tvb_get_guint32(tvb, offset + O_LBMPDM_SEG_HDR_T_LEN, encoding);
+    datalen = tvb_get_uint32(tvb, offset + O_LBMPDM_SEG_HDR_T_LEN, encoding);
     seglen = ((int)datalen) + L_LBMPDM_SEG_HDR_T;
     *data_length = (int) datalen;
     return (seglen);
 }
 
-static void lbmpdm_definition_build_key(guint32 * key_value, wmem_tree_key_t * key, guint64 channel, guint32 id, guint8 version_major, guint8 version_minor)
+static void lbmpdm_definition_build_key(uint32_t * key_value, wmem_tree_key_t * key, uint64_t channel, uint32_t id, uint8_t version_major, uint8_t version_minor)
 {
-    key_value[LBMPDM_DEFINITION_KEY_ELEMENT_CHANNEL_HIGH] = (guint32) ((channel >> 32) & 0xffffffff);
-    key_value[LBMPDM_DEFINITION_KEY_ELEMENT_CHANNEL_LOW] = (guint32) (channel & 0xffffffff);
+    key_value[LBMPDM_DEFINITION_KEY_ELEMENT_CHANNEL_HIGH] = (uint32_t) ((channel >> 32) & 0xffffffff);
+    key_value[LBMPDM_DEFINITION_KEY_ELEMENT_CHANNEL_LOW] = (uint32_t) (channel & 0xffffffff);
     key_value[LBMPDM_DEFINITION_KEY_ELEMENT_ID] = id;
     key_value[LBMPDM_DEFINITION_KEY_ELEMENT_VERS_MAJOR] = version_major;
     key_value[LBMPDM_DEFINITION_KEY_ELEMENT_VERS_MINOR] = version_minor;
@@ -479,10 +479,10 @@ static void lbmpdm_definition_build_key(guint32 * key_value, wmem_tree_key_t * k
     key[1].key = NULL;
 }
 
-static lbmpdm_definition_t * lbmpdm_definition_find(guint64 channel, guint32 ID, guint8 version_major, guint8 version_minor)
+static lbmpdm_definition_t * lbmpdm_definition_find(uint64_t channel, uint32_t ID, uint8_t version_major, uint8_t version_minor)
 {
     lbmpdm_definition_t * entry = NULL;
-    guint32 keyval[LBMPDM_DEFINITION_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBMPDM_DEFINITION_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     lbmpdm_definition_build_key(keyval, tkey, channel, ID, version_major, version_minor);
@@ -490,10 +490,10 @@ static lbmpdm_definition_t * lbmpdm_definition_find(guint64 channel, guint32 ID,
     return (entry);
 }
 
-static lbmpdm_definition_t * lbmpdm_definition_add(guint64 channel, guint32 id, guint8 version_major, guint8 version_minor)
+static lbmpdm_definition_t * lbmpdm_definition_add(uint64_t channel, uint32_t id, uint8_t version_major, uint8_t version_minor)
 {
     lbmpdm_definition_t * entry = NULL;
-    guint32 keyval[LBMPDM_DEFINITION_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBMPDM_DEFINITION_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbmpdm_definition_find(channel, id, version_major, version_minor);
@@ -512,7 +512,7 @@ static lbmpdm_definition_t * lbmpdm_definition_add(guint64 channel, guint32 id,
     return (entry);
 }
 
-static lbmpdm_definition_field_t * lbmpdm_definition_field_find(lbmpdm_definition_t * definition, guint32 id)
+static lbmpdm_definition_field_t * lbmpdm_definition_field_find(lbmpdm_definition_t * definition, uint32_t id)
 {
     lbmpdm_definition_field_t * entry = NULL;
 
@@ -520,7 +520,7 @@ static lbmpdm_definition_field_t * lbmpdm_definition_field_find(lbmpdm_definitio
     return (entry);
 }
 
-static lbmpdm_definition_field_t * lbmpdm_definition_field_add(lbmpdm_definition_t * definition, guint32 id)
+static lbmpdm_definition_field_t * lbmpdm_definition_field_add(lbmpdm_definition_t * definition, uint32_t id)
 {
     lbmpdm_definition_field_t * entry = NULL;
 
@@ -539,7 +539,7 @@ static lbmpdm_definition_field_t * lbmpdm_definition_field_add(lbmpdm_definition
 /*----------------------------------------------------------------------------*/
 /* Dissection functions.                                                      */
 /*----------------------------------------------------------------------------*/
-static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 field_type, int field_length, int encoding)
+static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, uint16_t field_type, int field_length, int encoding)
 {
     switch (field_type)
     {
@@ -578,14 +578,14 @@ static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, g
             break;
         case PDM_TYPE_DECIMAL:
             {
-                gint64 mantissa;
-                gint8 exponent;
-                gint64 whole = 0;
-                guint64 fraction = 0;
-                gint8 shift_count;
-
-                exponent = tvb_get_gint8(tvb, offset);
-                mantissa = tvb_get_gint64(tvb, offset + 1, encoding);
+                int64_t mantissa;
+                int8_t exponent;
+                int64_t whole = 0;
+                uint64_t fraction = 0;
+                int8_t shift_count;
+
+                exponent = tvb_get_int8(tvb, offset);
+                mantissa = tvb_get_int64(tvb, offset + 1, encoding);
                 if (exponent >= 0)
                 {
                     whole = mantissa;
@@ -600,7 +600,7 @@ static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, g
                 }
                 else
                 {
-                    guint64 divisor = 1;
+                    uint64_t divisor = 1;
                     int decimal_digits = -exponent;
                     shift_count = decimal_digits;
                     while (shift_count > 0)
@@ -632,8 +632,8 @@ static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, g
             {
                 nstime_t timestamp;
 
-                timestamp.secs = (time_t)tvb_get_guint32(tvb, offset, encoding);
-                timestamp.nsecs = (int)(tvb_get_guint32(tvb, offset + 4, encoding) * 1000);
+                timestamp.secs = (time_t)tvb_get_uint32(tvb, offset, encoding);
+                timestamp.nsecs = (int)(tvb_get_uint32(tvb, offset + 4, encoding) * 1000);
                 proto_tree_add_time(tree, hf_lbmpdm_field_value_timestamp, tvb, offset, field_length, &timestamp);
             }
             break;
@@ -660,14 +660,14 @@ static void dissect_field_value(tvbuff_t * tvb, int offset, proto_tree * tree, g
     }
 }
 
-static int dissect_field(tvbuff_t * tvb, int offset, proto_tree * tree, lbmpdm_definition_field_t * field, gboolean string_field_names, int encoding)
+static int dissect_field(tvbuff_t * tvb, int offset, proto_tree * tree, lbmpdm_definition_field_t * field, bool string_field_names, int encoding)
 {
     proto_item * field_item = NULL;
     proto_tree * field_tree = NULL;
     proto_item * ti = NULL;
     int ofs = offset;
-    guint32 element_count = 0;
-    guint32 idx;
+    uint32_t element_count = 0;
+    uint32_t idx;
     int len_dissected = 0;
 
     field_item = proto_tree_add_item(tree, hf_lbmpdm_field, tvb, offset, field->len, ENC_NA);
@@ -702,16 +702,16 @@ static int dissect_field(tvbuff_t * tvb, int offset, proto_tree * tree, lbmpdm_d
     for (idx = 0; idx < element_count; ++idx)
     {
         /* field_len is length of the entire entry, including any length prefix. */
-        guint32 field_len = field->len / element_count;
+        uint32_t field_len = field->len / element_count;
         /* value_len is the length of the data only. */
-        guint32 value_len = field_len;
+        uint32_t value_len = field_len;
         /* value_offset is the offset of the actual value. */
         int value_offset = ofs;
 
         if (field->fixed == PDM_DEFN_VARIABLE_LENGTH_FIELD)
         {
             proto_tree_add_item(field_tree, hf_lbmpdm_field_length, tvb, ofs, 4, encoding);
-            value_len = tvb_get_guint32(tvb, ofs, encoding);
+            value_len = tvb_get_uint32(tvb, ofs, encoding);
             field_len = value_len + 4;
             value_offset += 4;
         }
@@ -753,16 +753,16 @@ static int dissect_segment_data(tvbuff_t * tvb, int offset, packet_info * pinfo
     {
         int fld_offset = offset + L_LBMPDM_SEG_HDR_T;
         lbmpdm_definition_field_t * field = NULL;
-        gboolean string_field_names = FALSE;
-        guint32 idx;
+        bool string_field_names = false;
+        uint32_t idx;
 
         if (def->field_names_type == PDM_DEFN_STR_FIELD_NAMES)
         {
-            string_field_names = TRUE;
+            string_field_names = true;
         }
         else
         {
-            string_field_names = FALSE;
+            string_field_names = false;
         }
 
         /* Handle any fixed required fields first. */
@@ -773,7 +773,7 @@ static int dissect_segment_data(tvbuff_t * tvb, int offset, packet_info * pinfo
         /* Step through the offset table. */
         for (idx = 0; idx < id->offset_table->num_flds; ++idx)
         {
-            gint32 ofs = id->offset_table->offset_list[idx];
+            int32_t ofs = id->offset_table->offset_list[idx];
             if (ofs != -1)
             {
                 field = lbmpdm_definition_field_find(def, idx);
@@ -796,10 +796,10 @@ static int dissect_segment_ofstable(tvbuff_t * tvb, int offset, packet_info * pi
     int ofs = 0;
     int field_count = 0;
     int idx;
-    gint32 * id_list = NULL;
-    gint32 * ofs_list = NULL;
-    gint32 max_index = -1;
-    gint32 min_offset = G_MAXINT32;
+    int32_t * id_list = NULL;
+    int32_t * ofs_list = NULL;
+    int32_t max_index = -1;
+    int32_t min_offset = INT32_MAX;
     lbmpdm_offset_table_t * ofs_table = NULL;
 
     seglen = lbmpdm_get_segment_length(tvb, offset, encoding, &datalen);
@@ -810,8 +810,8 @@ static int dissect_segment_ofstable(tvbuff_t * tvb, int offset, packet_info * pi
     proto_tree_add_item(subtree, hf_lbmpdm_segment_res, tvb, offset + O_LBMPDM_SEG_HDR_T_RES, L_LBMPDM_SEG_HDR_T_RES, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_len, tvb, offset + O_LBMPDM_SEG_HDR_T_LEN, L_LBMPDM_SEG_HDR_T_LEN, encoding);
     field_count = datalen / L_LBMPDM_OFFSET_ENTRY_T;
-    id_list = wmem_alloc_array(pinfo->pool, gint32, field_count);
-    ofs_list = wmem_alloc_array(pinfo->pool, gint32, field_count);
+    id_list = wmem_alloc_array(pinfo->pool, int32_t, field_count);
+    ofs_list = wmem_alloc_array(pinfo->pool, int32_t, field_count);
     for (idx = 0; idx < field_count; ++idx)
     {
         id_list[idx] = -1;
@@ -826,9 +826,9 @@ static int dissect_segment_ofstable(tvbuff_t * tvb, int offset, packet_info * pi
         offset_item = proto_tree_add_item(subtree, hf_lbmpdm_offset_entry, tvb, ofs, L_LBMPDM_OFFSET_ENTRY_T, ENC_NA);
         offset_tree = proto_item_add_subtree(offset_item, ett_lbmpdm_offset_entry);
         proto_tree_add_item(offset_tree, hf_lbmpdm_offset_entry_id, tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_ID, L_LBMPDM_OFFSET_ENTRY_T_ID, encoding);
-        id_list[idx] = (gint32)tvb_get_guint32(tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_ID, encoding);
+        id_list[idx] = (int32_t)tvb_get_uint32(tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_ID, encoding);
         proto_tree_add_item(offset_tree, hf_lbmpdm_offset_entry_offset, tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_OFFSET, L_LBMPDM_OFFSET_ENTRY_T_OFFSET, encoding);
-        ofs_list[idx] = (gint32)tvb_get_guint32(tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_OFFSET, encoding);
+        ofs_list[idx] = (int32_t)tvb_get_uint32(tvb, ofs + O_LBMPDM_OFFSET_ENTRY_T_OFFSET, encoding);
         if (id_list[idx] < 0 || ofs_list[idx] < 0) {
             THROW(ReportedBoundsError);
         }
@@ -844,7 +844,7 @@ static int dissect_segment_ofstable(tvbuff_t * tvb, int offset, packet_info * pi
     ofs_table = wmem_new(pinfo->pool, lbmpdm_offset_table_t);
     ofs_table->num_flds = max_index + 1;
     ofs_table->min_set_offset = NULL;
-    ofs_table->offset_list = wmem_alloc_array(pinfo->pool, gint32, ofs_table->num_flds);
+    ofs_table->offset_list = wmem_alloc_array(pinfo->pool, int32_t, ofs_table->num_flds);
     for (idx = 0; idx < (int)ofs_table->num_flds; ++idx)
     {
         ofs_table->offset_list[idx] = -1;
@@ -864,26 +864,26 @@ static int dissect_segment_ofstable(tvbuff_t * tvb, int offset, packet_info * pi
     return (seglen);
 }
 
-static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint64 channel, int encoding)
+static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint64_t channel, int encoding)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     int seglen = 0;
     int ofs = 0;
-    gboolean string_field_name = FALSE;
+    bool string_field_name = false;
     int remaining_datalen = 0;
-    guint32 num_fields = 0;
+    uint32_t num_fields = 0;
     lbmpdm_definition_t * def = NULL;
-    gboolean add_definition = FALSE;
-    guint32 def_id = 0;
-    guint8 vers_major = 0;
-    guint8 vers_minor = 0;
+    bool add_definition = false;
+    uint32_t def_id = 0;
+    uint8_t vers_major = 0;
+    uint8_t vers_minor = 0;
     lbmpdm_definition_field_t * last_fixed_required_field = NULL;
 
     seglen = lbmpdm_get_segment_length(tvb, offset, encoding, &remaining_datalen);
     if (pinfo->fd->visited == 0)
     {
-        add_definition = TRUE;
+        add_definition = true;
     }
     subtree_item = proto_tree_add_none_format(tree, hf_lbmpdm_segment, tvb, offset, seglen, "Definition Segment");
     subtree = proto_item_add_subtree(subtree_item, ett_lbmpdm_segment);
@@ -893,21 +893,21 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
     proto_tree_add_item(subtree, hf_lbmpdm_segment_len, tvb, offset + O_LBMPDM_SEG_HDR_T_LEN, L_LBMPDM_SEG_HDR_T_LEN, encoding);
     ofs = offset + L_LBMPDM_SEG_HDR_T;
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_id, tvb, ofs + O_LBMPDM_DEFN_T_ID, L_LBMPDM_DEFN_T_ID, encoding);
-    def_id = tvb_get_guint32(tvb, ofs + O_LBMPDM_DEFN_T_ID, encoding);
+    def_id = tvb_get_uint32(tvb, ofs + O_LBMPDM_DEFN_T_ID, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_num_fields, tvb, ofs + O_LBMPDM_DEFN_T_NUM_FIELDS, L_LBMPDM_DEFN_T_NUM_FIELDS, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_field_names_type, tvb, ofs + O_LBMPDM_DEFN_T_FIELD_NAMES_TYPE, L_LBMPDM_DEFN_T_FIELD_NAMES_TYPE, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_finalized, tvb, ofs + O_LBMPDM_DEFN_T_FINALIZED, L_LBMPDM_DEFN_T_FINALIZED, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_msg_vers_major, tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MAJOR, L_LBMPDM_DEFN_T_MSG_VERS_MAJOR, encoding);
-    vers_major = tvb_get_guint8(tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MAJOR);
+    vers_major = tvb_get_uint8(tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MAJOR);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_msg_vers_minor, tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MINOR, L_LBMPDM_DEFN_T_MSG_VERS_MINOR, encoding);
-    vers_minor = tvb_get_guint8(tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MINOR);
+    vers_minor = tvb_get_uint8(tvb, ofs + O_LBMPDM_DEFN_T_MSG_VERS_MINOR);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_fixed_req_section_len, tvb, ofs + O_LBMPDM_DEFN_T_FIXED_REQ_SECTION_LEN, L_LBMPDM_DEFN_T_FIXED_REQ_SECTION_LEN, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_segment_def_field_info_len, tvb, ofs + O_LBMPDM_DEFN_T_FIELD_INFO_LEN, L_LBMPDM_DEFN_T_FIELD_INFO_LEN, encoding);
-    if (tvb_get_guint8(tvb, ofs + O_LBMPDM_DEFN_T_FIELD_NAMES_TYPE) == PDM_DEFN_STR_FIELD_NAMES)
+    if (tvb_get_uint8(tvb, ofs + O_LBMPDM_DEFN_T_FIELD_NAMES_TYPE) == PDM_DEFN_STR_FIELD_NAMES)
     {
-        string_field_name = TRUE;
+        string_field_name = true;
     }
-    num_fields = tvb_get_guint32(tvb, ofs + O_LBMPDM_DEFN_T_NUM_FIELDS, encoding);
+    num_fields = tvb_get_uint32(tvb, ofs + O_LBMPDM_DEFN_T_NUM_FIELDS, encoding);
     if (add_definition)
     {
         def = lbmpdm_definition_find(channel, def_id, vers_major, vers_minor);
@@ -915,8 +915,8 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
         {
             def = lbmpdm_definition_add(channel, def_id, vers_major, vers_minor);
             def->num_fields = num_fields;
-            def->field_names_type = tvb_get_guint8(tvb, ofs + O_LBMPDM_DEFN_T_FIELD_NAMES_TYPE);
-            def->fixed_req_section_len = tvb_get_guint32(tvb, ofs + O_LBMPDM_DEFN_T_FIXED_REQ_SECTION_LEN, encoding);
+            def->field_names_type = tvb_get_uint8(tvb, ofs + O_LBMPDM_DEFN_T_FIELD_NAMES_TYPE);
+            def->fixed_req_section_len = tvb_get_uint32(tvb, ofs + O_LBMPDM_DEFN_T_FIXED_REQ_SECTION_LEN, encoding);
             def->first_fixed_required = NULL;
             def->fixed_required_count = 0;
         }
@@ -927,15 +927,15 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
     {
         proto_item * field_item = NULL;
         proto_tree * field_tree = NULL;
-        guint32 def_len = L_LBMPDM_FIELD_INFO_T_INT_NAME;
+        uint32_t def_len = L_LBMPDM_FIELD_INFO_T_INT_NAME;
         int def_ofs = 0;
         int type_ofs = L_LBMPDM_FIELD_INFO_T;
-        guint32 string_name_len = 0;
+        uint32_t string_name_len = 0;
         int string_name_ofs = -1;
 
         if (string_field_name)
         {
-            def_len = tvb_get_guint32(tvb, ofs, encoding) + 4;
+            def_len = tvb_get_uint32(tvb, ofs, encoding) + 4;
         }
         field_item = proto_tree_add_item(subtree, hf_lbmpdm_segment_def_field, tvb, ofs, def_len, ENC_NA);
         field_tree = proto_item_add_subtree(field_item, ett_lbmpdm_segment_def_field);
@@ -955,7 +955,7 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
         proto_tree_add_item(field_tree, hf_lbmpdm_segment_def_field_str_name_len, tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_STR_NAME_LEN, L_LBMPDM_FIELD_INFO_T_STR_NAME_LEN, encoding);
         if (string_field_name)
         {
-            string_name_len = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_STR_NAME_LEN, encoding);
+            string_name_len = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_STR_NAME_LEN, encoding);
             if (string_name_len > 0)
             {
                 string_name_ofs = ofs + def_ofs + L_LBMPDM_FIELD_INFO_T;
@@ -967,21 +967,21 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
         if (add_definition && (def != NULL))
         {
             lbmpdm_definition_field_t * field = NULL;
-            guint32 field_id;
+            uint32_t field_id;
 
-            field_id = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_ID, encoding);
+            field_id = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_ID, encoding);
             field = lbmpdm_definition_field_find(def, field_id);
             if (field == NULL)
             {
                 field = lbmpdm_definition_field_add(def, field_id);
                 if (field != NULL)
                 {
-                    field->len = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_LEN, encoding);
-                    field->fixed_string_len = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FIXED_STR_LEN, encoding);
-                    field->num_array_elem = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_NUM_ARR_ELEM, encoding);
-                    field->required = tvb_get_guint8(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_REQ);
-                    field->fixed = tvb_get_guint8(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FIXED);
-                    field->field_int_name = tvb_get_guint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FLD_INT_NAME, encoding);
+                    field->len = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_LEN, encoding);
+                    field->fixed_string_len = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FIXED_STR_LEN, encoding);
+                    field->num_array_elem = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_NUM_ARR_ELEM, encoding);
+                    field->required = tvb_get_uint8(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_REQ);
+                    field->fixed = tvb_get_uint8(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FIXED);
+                    field->field_int_name = tvb_get_uint32(tvb, ofs + def_ofs + O_LBMPDM_FIELD_INFO_T_FLD_INT_NAME, encoding);
                     if (string_field_name && (string_name_len > 0))
                     {
                         field->field_string_name_len = string_name_len;
@@ -992,7 +992,7 @@ static int dissect_segment_defn(tvbuff_t * tvb, int offset, packet_info * pinfo,
                         field->field_string_name_len = 0;
                         field->field_string_name = NULL;
                     }
-                    field->field_type = tvb_get_guint16(tvb, ofs + type_ofs, encoding);
+                    field->field_type = tvb_get_uint16(tvb, ofs + type_ofs, encoding);
                     switch (field->field_type)
                     {
                         case PDM_TYPE_BOOLEAN:
@@ -1116,18 +1116,18 @@ static int dissect_segment_unknown(tvbuff_t * tvb, int offset, packet_info * pin
     return (seglen);
 }
 
-static gboolean check_lbmpdm_encoding(tvbuff_t * tvb, int offset, int * encoding)
+static bool check_lbmpdm_encoding(tvbuff_t * tvb, int offset, int * encoding)
 {
-    guint8 magic_byte_1;
-    guint8 magic_byte_2;
-    guint8 magic_byte_3;
-    guint8 magic_byte_4;
-    gboolean result = TRUE;
-
-    magic_byte_1 = tvb_get_guint8(tvb, offset);
-    magic_byte_2 = tvb_get_guint8(tvb, offset + 1);
-    magic_byte_3 = tvb_get_guint8(tvb, offset + 2);
-    magic_byte_4 = tvb_get_guint8(tvb, offset + 3);
+    uint8_t magic_byte_1;
+    uint8_t magic_byte_2;
+    uint8_t magic_byte_3;
+    uint8_t magic_byte_4;
+    bool result = true;
+
+    magic_byte_1 = tvb_get_uint8(tvb, offset);
+    magic_byte_2 = tvb_get_uint8(tvb, offset + 1);
+    magic_byte_3 = tvb_get_uint8(tvb, offset + 2);
+    magic_byte_4 = tvb_get_uint8(tvb, offset + 3);
     if ((magic_byte_1 == PDM_MSG_HDR_BE_MAGIC_BYTE_1) && (magic_byte_2 == PDM_MSG_HDR_BE_MAGIC_BYTE_2)
         && (magic_byte_3 == PDM_MSG_HDR_BE_MAGIC_BYTE_3) && (magic_byte_4 == PDM_MSG_HDR_BE_MAGIC_BYTE_4))
     {
@@ -1140,25 +1140,25 @@ static gboolean check_lbmpdm_encoding(tvbuff_t * tvb, int offset, int * encoding
     }
     else
     {
-        result = FALSE;
+        result = false;
     }
     return (result);
 }
 
-gboolean lbmpdm_verify_payload(tvbuff_t * tvb, int offset, int * encoding, int * length)
+bool lbmpdm_verify_payload(tvbuff_t * tvb, int offset, int * encoding, int * length)
 {
-    guint8 next_header;
-    guint32 len = 0;
+    uint8_t next_header;
+    uint32_t len = 0;
 
     if (!tvb_bytes_exist(tvb, offset, L_LBMPDM_MSG_HDR_T))
     {
-        return FALSE;
+        return false;
     }
     if (!check_lbmpdm_encoding(tvb, offset, encoding))
     {
-        return FALSE;
+        return false;
     }
-    next_header = tvb_get_guint8(tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR);
+    next_header = tvb_get_uint8(tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR);
     switch (next_header)
     {
         case PDM_HDR_TYPE_DATA:
@@ -1167,26 +1167,26 @@ gboolean lbmpdm_verify_payload(tvbuff_t * tvb, int offset, int * encoding, int *
         case PDM_HDR_TYPE_EOM:
             break;
         default:
-            return FALSE;
+            return false;
             break;
     }
-    len = tvb_get_guint32(tvb, offset + O_LBMPDM_MSG_HDR_T_LEN, *encoding);
-    if (len > G_MAXINT)
+    len = tvb_get_uint32(tvb, offset + O_LBMPDM_MSG_HDR_T_LEN, *encoding);
+    if (len > INT_MAX)
     {
-        return FALSE;
+        return false;
     }
     *length = (int)len;
-    return TRUE;
+    return true;
 }
 
-int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint64 channel)
+int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint64_t channel)
 {
     proto_item * subtree_item = NULL;
     proto_tree * subtree = NULL;
     proto_item * segments_item = NULL;
     proto_tree * segments_tree = NULL;
     proto_item * pi = NULL;
-    guint8 next_hdr;
+    uint8_t next_hdr;
     int dissected_len = 0;
     int encoding;
     int msglen = 0;
@@ -1194,7 +1194,7 @@ int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinf
     int ofs = 0;
     int segment_len = 0;
     int datalen = 0;
-    guint32 raw_msglen = 0;
+    uint32_t raw_msglen = 0;
     lbmpdm_msg_definition_id_t msgid;
 
     if (!lbmpdm_verify_payload(tvb, offset, &encoding, &raw_msglen))
@@ -1215,27 +1215,27 @@ int lbmpdm_dissect_lbmpdm_payload(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_tree_add_item(subtree, hf_lbmpdm_type, tvb, offset + O_LBMPDM_MSG_HDR_T_VER_TYPE, L_LBMPDM_MSG_HDR_T_VER_TYPE, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_next_hdr, tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR, L_LBMPDM_MSG_HDR_T_NEXT_HDR, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_def_major_ver, tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MAJOR_VER, L_LBMPDM_MSG_HDR_T_DEF_MAJOR_VER, encoding);
-    msgid.ver_major = tvb_get_guint8(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MAJOR_VER);
+    msgid.ver_major = tvb_get_uint8(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MAJOR_VER);
     proto_tree_add_item(subtree, hf_lbmpdm_def_minor_ver, tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MINOR_VER, L_LBMPDM_MSG_HDR_T_DEF_MINOR_VER, encoding);
-    msgid.ver_minor = tvb_get_guint8(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MINOR_VER);
+    msgid.ver_minor = tvb_get_uint8(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_MINOR_VER);
     proto_tree_add_item(subtree, hf_lbmpdm_def_id, tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_ID, L_LBMPDM_MSG_HDR_T_DEF_ID, encoding);
-    msgid.msg_def_id = tvb_get_guint32(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_ID, encoding);
+    msgid.msg_def_id = tvb_get_uint32(tvb, offset + O_LBMPDM_MSG_HDR_T_DEF_ID, encoding);
     proto_tree_add_item(subtree, hf_lbmpdm_len, tvb, offset + O_LBMPDM_MSG_HDR_T_LEN, L_LBMPDM_MSG_HDR_T_LEN, encoding);
 
-    next_hdr = tvb_get_guint8(tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR);
+    next_hdr = tvb_get_uint8(tvb, offset + O_LBMPDM_MSG_HDR_T_NEXT_HDR);
     len_remaining = msglen - L_LBMPDM_MSG_HDR_T;
     ofs = offset + L_LBMPDM_MSG_HDR_T;
     dissected_len = L_LBMPDM_MSG_HDR_T;
     datalen = msglen - L_LBMPDM_MSG_HDR_T;
     if (len_remaining > 0)
     {
-        guint8 this_hdr = next_hdr;
+        uint8_t this_hdr = next_hdr;
 
         segments_item = proto_tree_add_item(subtree, hf_lbmpdm_segments, tvb, ofs, datalen, encoding);
         segments_tree = proto_item_add_subtree(segments_item, ett_lbmpdm_segments);
         while ((this_hdr != PDM_HDR_TYPE_EOM) && (len_remaining >= L_LBMPDM_SEG_HDR_T))
         {
-            next_hdr = tvb_get_guint8(tvb, ofs + O_LBMPDM_SEG_HDR_T_NEXT_HDR);
+            next_hdr = tvb_get_uint8(tvb, ofs + O_LBMPDM_SEG_HDR_T_NEXT_HDR);
             switch (this_hdr)
             {
                 case PDM_HDR_TYPE_DATA:
@@ -1401,7 +1401,7 @@ void proto_register_lbmpdm(void)
         { &hf_lbmpdm_field_value_message,
             { "MESSAGE Value", "lbmpdm.field.value_message", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbmpdm,
         &ett_lbmpdm_segments,
diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c
index 3273940b72..8172469be1 100644
--- a/epan/dissectors/packet-lbmpdmtcp.c
+++ b/epan/dissectors/packet-lbmpdmtcp.c
@@ -34,34 +34,34 @@ static dissector_handle_t lbmpdm_tcp_dissector_handle;
 typedef struct
 {
     address addr1;
-    guint16 port1;
+    uint16_t port1;
     address addr2;
-    guint16 port2;
-    guint64 channel;
+    uint16_t port2;
+    uint64_t channel;
 } lbmtcp_transport_t;
 
 static void lbmtcp_order_key(lbmtcp_transport_t * transport)
 {
-    gboolean swap = FALSE;
+    bool swap = false;
     int compare;
 
     /* Order the key so that addr1:port1 <= addr2:port2 */
     compare = cmp_address(&(transport->addr1), &(transport->addr2));
     if (compare > 0)
     {
-        swap = TRUE;
+        swap = true;
     }
     else if (compare == 0)
     {
         if (transport->port1 > transport->port2)
         {
-            swap = TRUE;
+            swap = true;
         }
     }
     if (swap)
     {
         address addr;
-        guint16 port;
+        uint16_t port;
 
         copy_address_shallow(&addr, &(transport->addr1));
         copy_address_shallow(&(transport->addr2), &(transport->addr1));
@@ -72,7 +72,7 @@ static void lbmtcp_order_key(lbmtcp_transport_t * transport)
     }
 }
 
-static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, guint16 port1, const address * address2, guint16 port2, guint32 frame)
+static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, uint16_t port1, const address * address2, uint16_t port2, uint32_t frame)
 {
     lbmtcp_transport_t * entry;
     conversation_t * conv = NULL;
@@ -107,25 +107,25 @@ static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, guint
 #define LBMPDM_TCP_DEFAULT_PORT_HIGH 14390
 
 /* Global preferences variables (altered by the preferences dialog). */
-static guint32 global_lbmpdm_tcp_port_low   = LBMPDM_TCP_DEFAULT_PORT_LOW;
-static guint32 global_lbmpdm_tcp_port_high  = LBMPDM_TCP_DEFAULT_PORT_HIGH;
+static uint32_t global_lbmpdm_tcp_port_low   = LBMPDM_TCP_DEFAULT_PORT_LOW;
+static uint32_t global_lbmpdm_tcp_port_high  = LBMPDM_TCP_DEFAULT_PORT_HIGH;
 static bool global_lbmpdm_tcp_use_tag;
 
 /* Local preferences variables (used by the dissector). */
-static guint32 lbmpdm_tcp_port_low  = LBMPDM_TCP_DEFAULT_PORT_LOW;
-static guint32 lbmpdm_tcp_port_high = LBMPDM_TCP_DEFAULT_PORT_HIGH;
-static gboolean lbmpdm_tcp_use_tag;
+static uint32_t lbmpdm_tcp_port_low  = LBMPDM_TCP_DEFAULT_PORT_LOW;
+static uint32_t lbmpdm_tcp_port_high = LBMPDM_TCP_DEFAULT_PORT_HIGH;
+static bool lbmpdm_tcp_use_tag;
 
 /* Tag definitions. */
 typedef struct
 {
     char * name;
-    guint32 port_low;
-    guint32 port_high;
+    uint32_t port_low;
+    uint32_t port_high;
 } lbmpdm_tcp_tag_entry_t;
 
 static lbmpdm_tcp_tag_entry_t * lbmpdm_tcp_tag_entry;
-static guint lbmpdm_tcp_tag_count;
+static unsigned lbmpdm_tcp_tag_count;
 
 UAT_CSTRING_CB_DEF(lbmpdm_tcp_tag, name, lbmpdm_tcp_tag_entry_t)
 UAT_DEC_CB_DEF(lbmpdm_tcp_tag, port_low, lbmpdm_tcp_tag_entry_t)
@@ -148,7 +148,7 @@ static bool lbmpdm_tcp_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -156,10 +156,10 @@ static bool lbmpdm_tcp_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbmpdm_tcp_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -186,7 +186,7 @@ static void lbmpdm_tcp_tag_free_cb(void * record)
 
 static const lbmpdm_tcp_tag_entry_t * lbmpdm_tcp_tag_locate(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     const lbmpdm_tcp_tag_entry_t * tag = NULL;
 
     if (!lbmpdm_tcp_use_tag)
@@ -234,7 +234,7 @@ static int ett_lbmpdm_tcp;
 static int hf_lbmpdm_tcp_tag;
 static int hf_lbmpdm_tcp_channel;
 
-static guint get_lbmpdm_tcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb,
+static unsigned get_lbmpdm_tcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb,
                                        int offset, void *data _U_)
 {
     int encoding;
@@ -254,7 +254,7 @@ static int dissect_lbmpdm_tcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tre
     proto_item * ti = NULL;
     lbmtcp_transport_t * transport = NULL;
     char * tag_name = NULL;
-    guint64 channel = LBM_CHANNEL_NO_CHANNEL;
+    uint64_t channel = LBM_CHANNEL_NO_CHANNEL;
 
     if (lbmpdm_tcp_use_tag)
     {
@@ -310,7 +310,7 @@ static int dissect_lbmpdm_tcp(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         col_add_fstr(pinfo->cinfo, COL_INFO, "[Tag: %s]", tag_name);
     }
     col_set_fence(pinfo->cinfo, COL_INFO);
-    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, lbmpdm_get_minimum_length(), /* Need at least the msglen */
+    tcp_dissect_pdus(tvb, pinfo, tree, true, lbmpdm_get_minimum_length(), /* Need at least the msglen */
         get_lbmpdm_tcp_pdu_length, dissect_lbmpdm_tcp_pdu, NULL);
     return tvb_captured_length(tvb);
 }
@@ -368,7 +368,7 @@ void proto_register_lbmpdm_tcp(void)
         { &hf_lbmpdm_tcp_channel,
             { "Channel ID", "lbmpdm_tcp.channel", FT_UINT64, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL } },
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbmpdm_tcp,
     };
@@ -403,7 +403,7 @@ void proto_register_lbmpdm_tcp(void)
     tag_uat = uat_new("LBMPDM-TCP tag definitions",
         sizeof(lbmpdm_tcp_tag_entry_t),
         "lbmpdm_tcp_domains",
-        TRUE,
+        true,
         (void * *)&lbmpdm_tcp_tag_entry,
         &lbmpdm_tcp_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -426,7 +426,7 @@ void proto_register_lbmpdm_tcp(void)
 /* The registration hand-off routine */
 void proto_reg_handoff_lbmpdm_tcp(void)
 {
-    static gboolean already_registered = FALSE;
+    static bool already_registered = false;
 
     if (!already_registered)
     {
@@ -443,7 +443,7 @@ void proto_reg_handoff_lbmpdm_tcp(void)
 
     lbmpdm_tcp_use_tag = global_lbmpdm_tcp_use_tag;
 
-    already_registered = TRUE;
+    already_registered = true;
 }
 
 /*
diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c
index 5e88405cc8..de8360f28a 100644
--- a/epan/dissectors/packet-lbmr.c
+++ b/epan/dissectors/packet-lbmr.c
@@ -38,10 +38,10 @@ void proto_reg_handoff_lbmr(void);
 
 typedef struct
 {
-    guint32 host_id;
-    guint32 session_id;
-    guint16 xport_id;
-    guint64 channel;
+    uint32_t host_id;
+    uint32_t session_id;
+    uint16_t xport_id;
+    uint64_t channel;
 } lbtipc_transport_t;
 
 static wmem_tree_t * lbtipc_transport_table;
@@ -56,15 +56,15 @@ static void lbtipc_transport_init(void)
     lbtipc_transport_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
 
-static lbtipc_transport_t * lbtipc_transport_find(guint32 host_id, guint32 session_id, guint16 xport_id)
+static lbtipc_transport_t * lbtipc_transport_find(uint32_t host_id, uint32_t session_id, uint16_t xport_id)
 {
     lbtipc_transport_t * entry = NULL;
-    guint32 keyval[LBTIPC_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTIPC_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     keyval[LBTIPC_KEY_ELEMENT_HOST_ID] = host_id;
     keyval[LBTIPC_KEY_ELEMENT_SESSION_ID] = session_id;
-    keyval[LBTIPC_KEY_ELEMENT_XPORT_ID] = (guint32) xport_id;
+    keyval[LBTIPC_KEY_ELEMENT_XPORT_ID] = (uint32_t) xport_id;
     tkey[0].length = LBTIPC_KEY_ELEMENT_COUNT;
     tkey[0].key = keyval;
     tkey[1].length = 0;
@@ -73,10 +73,10 @@ static lbtipc_transport_t * lbtipc_transport_find(guint32 host_id, guint32 sessi
     return (entry);
 }
 
-static lbtipc_transport_t * lbtipc_transport_add(guint32 host_id, guint32 session_id, guint16 xport_id)
+static lbtipc_transport_t * lbtipc_transport_add(uint32_t host_id, uint32_t session_id, uint16_t xport_id)
 {
     lbtipc_transport_t * entry;
-    guint32 keyval[LBTIPC_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTIPC_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbtipc_transport_find(host_id, session_id, xport_id);
@@ -91,7 +91,7 @@ static lbtipc_transport_t * lbtipc_transport_add(guint32 host_id, guint32 sessio
     entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTIPC);
     keyval[LBTIPC_KEY_ELEMENT_HOST_ID] = host_id;
     keyval[LBTIPC_KEY_ELEMENT_SESSION_ID] = session_id;
-    keyval[LBTIPC_KEY_ELEMENT_XPORT_ID] = (guint32) xport_id;
+    keyval[LBTIPC_KEY_ELEMENT_XPORT_ID] = (uint32_t) xport_id;
     tkey[0].length = LBTIPC_KEY_ELEMENT_COUNT;
     tkey[0].key = keyval;
     tkey[1].length = 0;
@@ -100,7 +100,7 @@ static lbtipc_transport_t * lbtipc_transport_add(guint32 host_id, guint32 sessio
     return (entry);
 }
 
-static char * lbtipc_transport_source_string(guint32 host_id _U_, guint32 session_id, guint16 xport_id)
+static char * lbtipc_transport_source_string(uint32_t host_id _U_, uint32_t session_id, uint16_t xport_id)
 {
     return (wmem_strdup_printf(wmem_file_scope(), "LBT-IPC:%x:%" PRIu16, session_id, xport_id));
 }
@@ -111,10 +111,10 @@ static char * lbtipc_transport_source_string(guint32 host_id _U_, guint32 sessio
 
 typedef struct
 {
-    guint32 host_id;
-    guint32 session_id;
-    guint16 xport_id;
-    guint64 channel;
+    uint32_t host_id;
+    uint32_t session_id;
+    uint16_t xport_id;
+    uint64_t channel;
 } lbtsmx_transport_t;
 
 static wmem_tree_t * lbtsmx_transport_table;
@@ -129,15 +129,15 @@ static void lbtsmx_transport_init(void)
     lbtsmx_transport_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
 
-static lbtsmx_transport_t * lbtsmx_transport_find(guint32 host_id, guint32 session_id, guint16 xport_id)
+static lbtsmx_transport_t * lbtsmx_transport_find(uint32_t host_id, uint32_t session_id, uint16_t xport_id)
 {
     lbtsmx_transport_t * entry = NULL;
-    guint32 keyval[LBTSMX_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTSMX_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     keyval[LBTSMX_KEY_ELEMENT_HOST_ID] = host_id;
     keyval[LBTSMX_KEY_ELEMENT_SESSION_ID] = session_id;
-    keyval[LBTSMX_KEY_ELEMENT_XPORT_ID] = (guint32) xport_id;
+    keyval[LBTSMX_KEY_ELEMENT_XPORT_ID] = (uint32_t) xport_id;
     tkey[0].length = LBTSMX_KEY_ELEMENT_COUNT;
     tkey[0].key = keyval;
     tkey[1].length = 0;
@@ -146,10 +146,10 @@ static lbtsmx_transport_t * lbtsmx_transport_find(guint32 host_id, guint32 sessi
     return (entry);
 }
 
-static lbtsmx_transport_t * lbtsmx_transport_add(guint32 host_id, guint32 session_id, guint16 xport_id)
+static lbtsmx_transport_t * lbtsmx_transport_add(uint32_t host_id, uint32_t session_id, uint16_t xport_id)
 {
     lbtsmx_transport_t * entry;
-    guint32 keyval[LBTSMX_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTSMX_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbtsmx_transport_find(host_id, session_id, xport_id);
@@ -164,7 +164,7 @@ static lbtsmx_transport_t * lbtsmx_transport_add(guint32 host_id, guint32 sessio
     entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTSMX);
     keyval[LBTSMX_KEY_ELEMENT_HOST_ID] = host_id;
     keyval[LBTSMX_KEY_ELEMENT_SESSION_ID] = session_id;
-    keyval[LBTSMX_KEY_ELEMENT_XPORT_ID] = (guint32) xport_id;
+    keyval[LBTSMX_KEY_ELEMENT_XPORT_ID] = (uint32_t) xport_id;
     tkey[0].length = LBTSMX_KEY_ELEMENT_COUNT;
     tkey[0].key = keyval;
     tkey[1].length = 0;
@@ -173,7 +173,7 @@ static lbtsmx_transport_t * lbtsmx_transport_add(guint32 host_id, guint32 sessio
     return (entry);
 }
 
-static char * lbtsmx_transport_source_string(guint32 host_id _U_, guint32 session_id, guint16 xport_id)
+static char * lbtsmx_transport_source_string(uint32_t host_id _U_, uint32_t session_id, uint16_t xport_id)
 {
     return (wmem_strdup_printf(wmem_file_scope(), "LBT-SMX:%x:%" PRIu16, session_id, xport_id));
 }
@@ -185,9 +185,9 @@ static char * lbtsmx_transport_source_string(guint32 host_id _U_, guint32 sessio
 typedef struct
 {
     address source_address;
-    guint32 session_id;
-    guint16 port;
-    guint64 channel;
+    uint32_t session_id;
+    uint16_t port;
+    uint64_t channel;
 } lbtrdma_transport_t;
 
 static wmem_tree_t * lbtrdma_transport_table;
@@ -202,25 +202,25 @@ static void lbtrdma_transport_init(void)
     lbtrdma_transport_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
 }
 
-static void lbtrdma_transport_build_key(guint32 * key_value, wmem_tree_key_t * key, const lbtrdma_transport_t * transport)
+static void lbtrdma_transport_build_key(uint32_t * key_value, wmem_tree_key_t * key, const lbtrdma_transport_t * transport)
 {
-    guint32 val;
+    uint32_t val;
 
-    memcpy(&val, transport->source_address.data, sizeof(guint32));
+    memcpy(&val, transport->source_address.data, sizeof(uint32_t));
     key_value[LBTRDMA_KEY_ELEMENT_SOURCE_ADDRESS] = val;
     key_value[LBTRDMA_KEY_ELEMENT_SESSION_ID] = transport->session_id;
-    key_value[LBTRDMA_KEY_ELEMENT_PORT] = (guint32) transport->port;
+    key_value[LBTRDMA_KEY_ELEMENT_PORT] = (uint32_t) transport->port;
     key[0].length = LBTRDMA_KEY_ELEMENT_COUNT;
     key[0].key = key_value;
     key[1].length = 0;
     key[1].key = NULL;
 }
 
-static lbtrdma_transport_t * lbtrdma_transport_find(const address * source_address, guint32 session_id, guint16 port)
+static lbtrdma_transport_t * lbtrdma_transport_find(const address * source_address, uint32_t session_id, uint16_t port)
 {
     lbtrdma_transport_t key;
     lbtrdma_transport_t * entry = NULL;
-    guint32 keyval[LBTRDMA_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTRDMA_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     memset((void *)&key, 0, sizeof(lbtrdma_transport_t));
@@ -232,10 +232,10 @@ static lbtrdma_transport_t * lbtrdma_transport_find(const address * source_addre
     return (entry);
 }
 
-static lbtrdma_transport_t * lbtrdma_transport_add(const address * source_address, guint32 session_id, guint16 port)
+static lbtrdma_transport_t * lbtrdma_transport_add(const address * source_address, uint32_t session_id, uint16_t port)
 {
     lbtrdma_transport_t * entry;
-    guint32 keyval[LBTRDMA_KEY_ELEMENT_COUNT];
+    uint32_t keyval[LBTRDMA_KEY_ELEMENT_COUNT];
     wmem_tree_key_t tkey[2];
 
     entry = lbtrdma_transport_find(source_address, session_id, port);
@@ -253,7 +253,7 @@ static lbtrdma_transport_t * lbtrdma_transport_add(const address * source_addres
     return (entry);
 }
 
-static char * lbtrdma_transport_source_string(const address * source_address _U_, guint32 session_id, guint16 port)
+static char * lbtrdma_transport_source_string(const address * source_address _U_, uint32_t session_id, uint16_t port)
 {
     return (wmem_strdup_printf(wmem_file_scope(), "LBT-RDMA:%x:%" PRIu16, session_id, port));
 }
@@ -275,7 +275,7 @@ typedef struct
 #define L_LBMR_HDR_T_TQRS SIZEOF(lbmr_hdr_t, tqrs)
 #define O_LBMR_HDR_T_TIRS OFFSETOF(lbmr_hdr_t, tirs)
 #define L_LBMR_HDR_T_TIRS SIZEOF(lbmr_hdr_t, tirs)
-#define L_LBMR_HDR_T (gint) sizeof(lbmr_hdr_t)
+#define L_LBMR_HDR_T (int) sizeof(lbmr_hdr_t)
 
 #define LBMR_HDR_VER_VER_MASK 0xf0
 #define LBMR_HDR_VER_TYPE_MASK 0x07
@@ -304,7 +304,7 @@ typedef struct
 #define L_LBMR_HDR_EXT_TYPE_T_EXT_TYPE SIZEOF(lbmr_hdr_ext_type_t, ext_type)
 #define O_LBMR_HDR_EXT_TYPE_T_DEP OFFSETOF(lbmr_hdr_ext_type_t, dep)
 #define L_LBMR_HDR_EXT_TYPE_T_DEP SIZEOF(lbmr_hdr_ext_type_t, dep)
-#define L_LBMR_HDR_EXT_TYPE_T (gint) sizeof(lbmr_hdr_ext_type_t)
+#define L_LBMR_HDR_EXT_TYPE_T (int) sizeof(lbmr_hdr_ext_type_t)
 
 #define LBMR_HDR_EXT_TYPE_UME_PROXY_SRC_ELECT 0x1
 #define LBMR_HDR_EXT_TYPE_UMQ_QUEUE_MGMT 0x2
@@ -330,7 +330,7 @@ typedef struct
 #define L_LBMR_TIR_T_TTL SIZEOF(lbmr_tir_t, ttl)
 #define O_LBMR_TIR_T_INDEX OFFSETOF(lbmr_tir_t, idx)
 #define L_LBMR_TIR_T_INDEX SIZEOF(lbmr_tir_t, idx)
-#define L_LBMR_TIR_T (gint) sizeof(lbmr_tir_t)
+#define L_LBMR_TIR_T (int) sizeof(lbmr_tir_t)
 
 /* LBMR topic information record TCP option data */
 typedef struct
@@ -376,7 +376,7 @@ typedef struct
 #define L_LBMR_TIR_LBTRM_T_UDP_DEST_PORT SIZEOF(lbmr_tir_lbtrm_t, udp_dest_port)
 #define O_LBMR_TIR_LBTRM_T_SRC_UCAST_PORT OFFSETOF(lbmr_tir_lbtrm_t, src_ucast_port)
 #define L_LBMR_TIR_LBTRM_T_SRC_UCAST_PORT SIZEOF(lbmr_tir_lbtrm_t, src_ucast_port)
-#define L_LBMR_TIR_LBTRM_T (gint) sizeof(lbmr_tir_lbtrm_t)
+#define L_LBMR_TIR_LBTRM_T (int) sizeof(lbmr_tir_lbtrm_t)
 
 /* LBMR topic information record LBT-RU option data */
 typedef struct
@@ -465,7 +465,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_T_LEN SIZEOF(lbmr_topic_opt_t, len)
 #define O_LBMR_TOPIC_OPT_T_FLAGS OFFSETOF(lbmr_topic_opt_t, flags)
 #define L_LBMR_TOPIC_OPT_T_FLAGS SIZEOF(lbmr_topic_opt_t, flags)
-#define L_LBMR_TOPIC_OPT_T (gint) sizeof(lbmr_topic_opt_t)
+#define L_LBMR_TOPIC_OPT_T (int) sizeof(lbmr_topic_opt_t)
 
 #define LBMR_TOPIC_OPT_FLAG_IGNORE 0x8000
 
@@ -482,7 +482,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_LEN_T_LEN SIZEOF(lbmr_topic_opt_len_t, len)
 #define O_LBMR_TOPIC_OPT_LEN_T_TOTAL_LEN OFFSETOF(lbmr_topic_opt_len_t, total_len)
 #define L_LBMR_TOPIC_OPT_LEN_T_TOTAL_LEN SIZEOF(lbmr_topic_opt_len_t, total_len)
-#define L_LBMR_TOPIC_OPT_LEN_T (gint) sizeof(lbmr_topic_opt_len_t)
+#define L_LBMR_TOPIC_OPT_LEN_T (int) sizeof(lbmr_topic_opt_len_t)
 
 #define LBMR_TOPIC_OPT_LEN_TYPE 0x00
 #define LBMR_TOPIC_OPT_LEN_SZ 4
@@ -524,7 +524,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_UME_T_HIGH_SEQNUM SIZEOF(lbmr_topic_opt_ume_t, high_seqnum)
 #define O_LBMR_TOPIC_OPT_UME_T_LOW_SEQNUM OFFSETOF(lbmr_topic_opt_ume_t, low_seqnum)
 #define L_LBMR_TOPIC_OPT_UME_T_LOW_SEQNUM SIZEOF(lbmr_topic_opt_ume_t, low_seqnum)
-#define L_LBMR_TOPIC_OPT_UME_T (gint) sizeof(lbmr_topic_opt_ume_t)
+#define L_LBMR_TOPIC_OPT_UME_T (int) sizeof(lbmr_topic_opt_ume_t)
 
 #define LBMR_TOPIC_OPT_UME_TYPE 0x01
 #define LBMR_TOPIC_OPT_UME_FLAG_IGNORE 0x8000
@@ -562,7 +562,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_UME_STORE_T_STORE_IP_ADDR SIZEOF(lbmr_topic_opt_ume_store_t, store_ip_addr)
 #define O_LBMR_TOPIC_OPT_UME_STORE_T_SRC_REG_ID OFFSETOF(lbmr_topic_opt_ume_store_t, src_reg_id)
 #define L_LBMR_TOPIC_OPT_UME_STORE_T_SRC_REG_ID SIZEOF(lbmr_topic_opt_ume_store_t, src_reg_id)
-#define L_LBMR_TOPIC_OPT_UME_STORE_T (gint) sizeof(lbmr_topic_opt_ume_store_t)
+#define L_LBMR_TOPIC_OPT_UME_STORE_T (int) sizeof(lbmr_topic_opt_ume_store_t)
 
 #define LBMR_TOPIC_OPT_UME_STORE_TYPE 0x02
 #define LBMR_TOPIC_OPT_UME_STORE_FLAG_IGNORE 0x80
@@ -590,7 +590,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_UME_STORE_GROUP_T_GRP_SZ SIZEOF(lbmr_topic_opt_ume_store_group_t, grp_sz)
 #define O_LBMR_TOPIC_OPT_UME_STORE_GROUP_T_RESERVED OFFSETOF(lbmr_topic_opt_ume_store_group_t, reserved)
 #define L_LBMR_TOPIC_OPT_UME_STORE_GROUP_T_RESERVED SIZEOF(lbmr_topic_opt_ume_store_group_t, reserved)
-#define L_LBMR_TOPIC_OPT_UME_STORE_GROUP_T (gint) sizeof(lbmr_topic_opt_ume_store_group_t)
+#define L_LBMR_TOPIC_OPT_UME_STORE_GROUP_T (int) sizeof(lbmr_topic_opt_ume_store_group_t)
 
 #define LBMR_TOPIC_OPT_UME_STORE_GROUP_TYPE 0x03
 #define LBMR_TOPIC_OPT_UME_STORE_GROUP_FLAG_IGNORE 0x80
@@ -627,7 +627,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_LATEJOIN_T_HIGH_SEQNUM SIZEOF(lbmr_topic_opt_latejoin_t, high_seqnum)
 #define O_LBMR_TOPIC_OPT_LATEJOIN_T_LOW_SEQNUM OFFSETOF(lbmr_topic_opt_latejoin_t, low_seqnum)
 #define L_LBMR_TOPIC_OPT_LATEJOIN_T_LOW_SEQNUM SIZEOF(lbmr_topic_opt_latejoin_t, low_seqnum)
-#define L_LBMR_TOPIC_OPT_LATEJOIN_T (gint) sizeof(lbmr_topic_opt_latejoin_t)
+#define L_LBMR_TOPIC_OPT_LATEJOIN_T (int) sizeof(lbmr_topic_opt_latejoin_t)
 
 #define LBMR_TOPIC_OPT_LATEJOIN_TYPE 0x04
 #define LBMR_TOPIC_OPT_LATEJOIN_FLAG_IGNORE 0x8000
@@ -650,7 +650,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_FLAGS SIZEOF(lbmr_topic_opt_umq_rcridx_t, flags)
 #define O_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_RCR_IDX OFFSETOF(lbmr_topic_opt_umq_rcridx_t, rcr_idx)
 #define L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T_RCR_IDX SIZEOF(lbmr_topic_opt_umq_rcridx_t, rcr_idx)
-#define L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T (gint) sizeof(lbmr_topic_opt_umq_rcridx_t)
+#define L_LBMR_TOPIC_OPT_UMQ_RCRIDX_T (int) sizeof(lbmr_topic_opt_umq_rcridx_t)
 
 #define LBMR_TOPIC_OPT_UMQ_RCRIDX_TYPE 0x05
 #define LBMR_TOPIC_OPT_UMQ_RCRIDX_SZ 8
@@ -696,7 +696,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_ULB_T_SRC_TCP_PORT SIZEOF(lbmr_topic_opt_ulb_t, src_tcp_port)
 #define O_LBMR_TOPIC_OPT_ULB_T_RESERVED OFFSETOF(lbmr_topic_opt_ulb_t, reserved)
 #define L_LBMR_TOPIC_OPT_ULB_T_RESERVED SIZEOF(lbmr_topic_opt_ulb_t, reserved)
-#define L_LBMR_TOPIC_OPT_ULB_T (gint) sizeof(lbmr_topic_opt_ulb_t)
+#define L_LBMR_TOPIC_OPT_ULB_T (int) sizeof(lbmr_topic_opt_ulb_t)
 
 #define LBMR_TOPIC_OPT_ULB_TYPE 0x0B
 #define LBMR_TOPIC_OPT_ULB_FLAG_IGNORE 0x8000
@@ -721,7 +721,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_COST_T_HOP_COUNT SIZEOF(lbmr_topic_opt_cost_t, hop_count)
 #define O_LBMR_TOPIC_OPT_COST_T_COST OFFSETOF(lbmr_topic_opt_cost_t, cost)
 #define L_LBMR_TOPIC_OPT_COST_T_COST SIZEOF(lbmr_topic_opt_cost_t, cost)
-#define L_LBMR_TOPIC_OPT_COST_T (gint) sizeof(lbmr_topic_opt_cost_t)
+#define L_LBMR_TOPIC_OPT_COST_T (int) sizeof(lbmr_topic_opt_cost_t)
 
 #define LBMR_TOPIC_OPT_COST_TYPE 0x07
 #define LBMR_TOPIC_OPT_COST_FLAG_IGNORE 0x80
@@ -743,7 +743,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_OTID_T_FLAGS SIZEOF(lbmr_topic_opt_otid_t, flags)
 #define O_LBMR_TOPIC_OPT_OTID_T_ORIGINATING_TRANSPORT OFFSETOF(lbmr_topic_opt_otid_t, originating_transport)
 #define L_LBMR_TOPIC_OPT_OTID_T_ORIGINATING_TRANSPORT SIZEOF(lbmr_topic_opt_otid_t, originating_transport)
-#define L_LBMR_TOPIC_OPT_OTID_T (gint) sizeof(lbmr_topic_opt_otid_t)
+#define L_LBMR_TOPIC_OPT_OTID_T (int) sizeof(lbmr_topic_opt_otid_t)
 
 #define LBMR_TOPIC_OPT_OTID_TYPE 0x08
 #define LBMR_TOPIC_OPT_OTID_FLAG_IGNORE 0x8000
@@ -768,7 +768,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_CTXINST_T_RES SIZEOF(lbmr_topic_opt_ctxinst_t, res)
 #define O_LBMR_TOPIC_OPT_CTXINST_T_CTXINST OFFSETOF(lbmr_topic_opt_ctxinst_t, ctxinst)
 #define L_LBMR_TOPIC_OPT_CTXINST_T_CTXINST SIZEOF(lbmr_topic_opt_ctxinst_t, ctxinst)
-#define L_LBMR_TOPIC_OPT_CTXINST_T (gint) sizeof(lbmr_topic_opt_ctxinst_t)
+#define L_LBMR_TOPIC_OPT_CTXINST_T (int) sizeof(lbmr_topic_opt_ctxinst_t)
 
 #define LBMR_TOPIC_OPT_CTXINST_TYPE 0x09
 #define LBMR_TOPIC_OPT_CTXINST_FLAG_IGNORE 0x80
@@ -793,7 +793,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_CTXINSTS_T_IDX SIZEOF(lbmr_topic_opt_ctxinsts_t, idx)
 #define O_LBMR_TOPIC_OPT_CTXINSTS_T_CTXINST OFFSETOF(lbmr_topic_opt_ctxinsts_t, ctxinst)
 #define L_LBMR_TOPIC_OPT_CTXINSTS_T_CTXINST SIZEOF(lbmr_topic_opt_ctxinsts_t, ctxinst)
-#define L_LBMR_TOPIC_OPT_CTXINSTS_T (gint) sizeof(lbmr_topic_opt_ctxinsts_t)
+#define L_LBMR_TOPIC_OPT_CTXINSTS_T (int) sizeof(lbmr_topic_opt_ctxinsts_t)
 
 #define LBMR_TOPIC_OPT_CTXINSTS_TYPE 0x0A
 #define LBMR_TOPIC_OPT_CTXINSTS_FLAG_IGNORE 0x80
@@ -818,7 +818,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_CTXINSTQ_T_IDX SIZEOF(lbmr_topic_opt_ctxinstq_t, idx)
 #define O_LBMR_TOPIC_OPT_CTXINSTQ_T_CTXINST OFFSETOF(lbmr_topic_opt_ctxinstq_t, ctxinst)
 #define L_LBMR_TOPIC_OPT_CTXINSTQ_T_CTXINST SIZEOF(lbmr_topic_opt_ctxinstq_t, ctxinst)
-#define L_LBMR_TOPIC_OPT_CTXINSTQ_T (gint) sizeof(lbmr_topic_opt_ctxinstq_t)
+#define L_LBMR_TOPIC_OPT_CTXINSTQ_T (int) sizeof(lbmr_topic_opt_ctxinstq_t)
 
 #define LBMR_TOPIC_OPT_CTXINSTQ_TYPE 0x0C
 #define LBMR_TOPIC_OPT_CTXINSTQ_FLAG_IGNORE 0x80
@@ -840,7 +840,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_DOMAIN_ID_T_FLAGS SIZEOF(lbmr_topic_opt_domain_id_t, flags)
 #define O_LBMR_TOPIC_OPT_DOMAIN_ID_T_DOMAIN_ID OFFSETOF(lbmr_topic_opt_domain_id_t, domain_id)
 #define L_LBMR_TOPIC_OPT_DOMAIN_ID_T_DOMAIN_ID SIZEOF(lbmr_topic_opt_domain_id_t, domain_id)
-#define L_LBMR_TOPIC_OPT_DOMAIN_ID_T (gint) sizeof(lbmr_topic_opt_domain_id_t)
+#define L_LBMR_TOPIC_OPT_DOMAIN_ID_T (int) sizeof(lbmr_topic_opt_domain_id_t)
 
 #define LBMR_TOPIC_OPT_DOMAIN_ID_TYPE 0x0D
 #define LBMR_TOPIC_OPT_DOMAIN_ID_FLAG_IGNORE 0x8000
@@ -871,7 +871,7 @@ typedef struct
 #define L_LBMR_TOPIC_OPT_EXFUNC_T_SRC_IP_ADDR SIZEOF(lbmr_topic_opt_exfunc_t, src_ip_addr)
 #define O_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS OFFSETOF(lbmr_topic_opt_exfunc_t, functionality_flags)
 #define L_LBMR_TOPIC_OPT_EXFUNC_T_FUNCTIONALITY_FLAGS SIZEOF(lbmr_topic_opt_exfunc_t, functionality_flags)
-#define L_LBMR_TOPIC_OPT_EXFUNC_T (gint) sizeof(lbmr_topic_opt_exfunc_t)
+#define L_LBMR_TOPIC_OPT_EXFUNC_T (int) sizeof(lbmr_topic_opt_exfunc_t)
 
 #define LBMR_TOPIC_OPT_EXFUNC_TYPE 0x0E
 #define LBMR_TOPIC_OPT_EXFUNC_FLAG_IGNORE 0x8000
@@ -917,7 +917,7 @@ typedef struct
 #define L_LBMR_CTXINFO_T_IP SIZEOF(lbmr_ctxinfo_t, ip)
 #define O_LBMR_CTXINFO_T_INSTANCE OFFSETOF(lbmr_ctxinfo_t, instance)
 #define L_LBMR_CTXINFO_T_INSTANCE SIZEOF(lbmr_ctxinfo_t, instance)
-#define L_LBMR_CTXINFO_T (gint) sizeof(lbmr_ctxinfo_t)
+#define L_LBMR_CTXINFO_T (int) sizeof(lbmr_ctxinfo_t)
 
 #define LBMR_CTXINFO_QUERY_FLAG 0x8000
 #define LBMR_CTXINFO_IP_FLAG 0x4000
@@ -940,7 +940,7 @@ typedef struct
 #define L_LBMR_TOPIC_RES_REQUEST_T_EXT_TYPE SIZEOF(lbmr_topic_res_request_t, ext_type)
 #define O_LBMR_TOPIC_RES_REQUEST_T_FLAGS OFFSETOF(lbmr_topic_res_request_t, flags)
 #define L_LBMR_TOPIC_RES_REQUEST_T_FLAGS SIZEOF(lbmr_topic_res_request_t, flags)
-#define L_LBMR_TOPIC_RES_REQUEST_T (gint) sizeof(lbmr_topic_res_request_t)
+#define L_LBMR_TOPIC_RES_REQUEST_T (int) sizeof(lbmr_topic_res_request_t)
 
 #define LBM_TOPIC_RES_REQUEST_GW_REMOTE_INTEREST 0x40
 #define LBM_TOPIC_RES_REQUEST_CONTEXT_QUERY 0x20
@@ -960,7 +960,7 @@ typedef struct
 #define L_LBMR_TMB_T_LEN SIZEOF(lbmr_tmb_t, len)
 #define O_LBMR_TMB_T_TMRS OFFSETOF(lbmr_tmb_t, tmrs)
 #define L_LBMR_TMB_T_TMRS SIZEOF(lbmr_tmb_t, tmrs)
-#define L_LBMR_TMB_T (gint) sizeof(lbmr_tmb_t)
+#define L_LBMR_TMB_T (int) sizeof(lbmr_tmb_t)
 
 /* LBMR topic management record */
 typedef struct
@@ -975,7 +975,7 @@ typedef struct
 #define L_LBMR_TMR_T_TYPE SIZEOF(lbmr_tmr_t, type)
 #define O_LBMR_TMR_T_FLAGS OFFSETOF(lbmr_tmr_t, flags)
 #define L_LBMR_TMR_T_FLAGS SIZEOF(lbmr_tmr_t, flags)
-#define L_LBMR_TMR_T (gint) sizeof(lbmr_tmr_t)
+#define L_LBMR_TMR_T (int) sizeof(lbmr_tmr_t)
 
 #define LBMR_TMR_LEAVE_TOPIC 0x00
 #define LBMR_TMR_TOPIC_USE 0x01
@@ -1004,7 +1004,7 @@ typedef struct
 #define L_LBMR_QIR_T_GRP_BLKS SIZEOF(lbmr_qir_t, grp_blks)
 #define O_LBMR_QIR_T_QUEUE_BLKS OFFSETOF(lbmr_qir_t, queue_blks)
 #define L_LBMR_QIR_T_QUEUE_BLKS SIZEOF(lbmr_qir_t, queue_blks)
-#define L_LBMR_QIR_T (gint) sizeof(lbmr_qir_t)
+#define L_LBMR_QIR_T (int) sizeof(lbmr_qir_t)
 
 #define LBMR_QIR_OPTIONS 0x8000
 #define LBMR_QIR_GRP_BLOCKS_MASK 0x7fff
@@ -1019,7 +1019,7 @@ typedef struct
 #define L_LBMR_QIR_GRP_BLK_T_GRP_IDX SIZEOF(lbmr_qir_grp_blk_t, grp_idx)
 #define O_LBMR_QIR_GRP_BLK_T_GRP_SZ OFFSETOF(lbmr_qir_grp_blk_t, grp_sz)
 #define L_LBMR_QIR_GRP_BLK_T_GRP_SZ SIZEOF(lbmr_qir_grp_blk_t, grp_sz)
-#define L_LBMR_QIR_GRP_BLK_T (gint) sizeof(lbmr_qir_grp_blk_t)
+#define L_LBMR_QIR_GRP_BLK_T (int) sizeof(lbmr_qir_grp_blk_t)
 
 /* LBMR queue block record */
 typedef struct
@@ -1040,7 +1040,7 @@ typedef struct
 #define L_LBMR_QIR_QUEUE_BLK_T_GRP_IDX SIZEOF(lbmr_qir_queue_blk_t, grp_idx)
 #define O_LBMR_QIR_QUEUE_BLK_T_RESERVED OFFSETOF(lbmr_qir_queue_blk_t, reserved)
 #define L_LBMR_QIR_QUEUE_BLK_T_RESERVED SIZEOF(lbmr_qir_queue_blk_t, reserved)
-#define L_LBMR_QIR_QUEUE_BLK_T (gint) sizeof(lbmr_qir_queue_blk_t)
+#define L_LBMR_QIR_QUEUE_BLK_T (int) sizeof(lbmr_qir_queue_blk_t)
 
 #define LBMR_QIR_QUEUE_BLK_FLAG_MASTER 0x8000
 
@@ -1057,7 +1057,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_HDR_T_LEN SIZEOF(lbmr_lbmr_opt_hdr_t, len)
 #define O_LBMR_LBMR_OPT_HDR_T_FLAGS OFFSETOF(lbmr_lbmr_opt_hdr_t, flags)
 #define L_LBMR_LBMR_OPT_HDR_T_FLAGS SIZEOF(lbmr_lbmr_opt_hdr_t, flags)
-#define L_LBMR_LBMR_OPT_HDR_T (gint) sizeof(lbmr_lbmr_opt_hdr_t)
+#define L_LBMR_LBMR_OPT_HDR_T (int) sizeof(lbmr_lbmr_opt_hdr_t)
 
 #define LBMR_LBMR_OPT_HDR_FLAG_IGNORE 0x8000
 
@@ -1074,7 +1074,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_LEN_T_LEN SIZEOF(lbmr_lbmr_opt_len_t, len)
 #define O_LBMR_LBMR_OPT_LEN_T_TOTAL_LEN OFFSETOF(lbmr_lbmr_opt_len_t, total_len)
 #define L_LBMR_LBMR_OPT_LEN_T_TOTAL_LEN SIZEOF(lbmr_lbmr_opt_len_t, total_len)
-#define L_LBMR_LBMR_OPT_LEN_T (gint) sizeof(lbmr_lbmr_opt_len_t)
+#define L_LBMR_LBMR_OPT_LEN_T (int) sizeof(lbmr_lbmr_opt_len_t)
 
 #define LBMR_LBMR_OPT_LEN_TYPE 0x80
 
@@ -1094,7 +1094,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_SRC_ID_T_FLAGS SIZEOF(lbmr_lbmr_opt_src_id_t, flags)
 #define O_LBMR_LBMR_OPT_SRC_ID_T_SRC_ID OFFSETOF(lbmr_lbmr_opt_src_id_t, src_id)
 #define L_LBMR_LBMR_OPT_SRC_ID_T_SRC_ID SIZEOF(lbmr_lbmr_opt_src_id_t, src_id)
-#define L_LBMR_LBMR_OPT_SRC_ID_T (gint) sizeof(lbmr_lbmr_opt_src_id_t)
+#define L_LBMR_LBMR_OPT_SRC_ID_T (int) sizeof(lbmr_lbmr_opt_src_id_t)
 
 #define LBMR_LBMR_OPT_SRC_ID_TYPE 0x81
 #define LBMR_LBMR_OPT_SRC_ID_FLAG_IGNORE 0x8000
@@ -1115,7 +1115,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_SRC_TYPE_T_FLAGS SIZEOF(lbmr_lbmr_opt_src_type_t, flags)
 #define O_LBMR_LBMR_OPT_SRC_TYPE_T_SRC_TYPE OFFSETOF(lbmr_lbmr_opt_src_type_t, src_type)
 #define L_LBMR_LBMR_OPT_SRC_TYPE_T_SRC_TYPE SIZEOF(lbmr_lbmr_opt_src_type_t, src_type)
-#define L_LBMR_LBMR_OPT_SRC_TYPE_T (gint) sizeof(lbmr_lbmr_opt_src_type_t)
+#define L_LBMR_LBMR_OPT_SRC_TYPE_T (int) sizeof(lbmr_lbmr_opt_src_type_t)
 
 #define LBMR_LBMR_OPT_SRC_TYPE_TYPE 0x82
 #define LBMR_LBMR_OPT_SRC_TYPE_SZ 4
@@ -1141,7 +1141,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_VERSION_T_FLAGS SIZEOF(lbmr_lbmr_opt_version_t, flags)
 #define O_LBMR_LBMR_OPT_VERSION_T_VERSION OFFSETOF(lbmr_lbmr_opt_version_t, version)
 #define L_LBMR_LBMR_OPT_VERSION_T_VERSION SIZEOF(lbmr_lbmr_opt_version_t, version)
-#define L_LBMR_LBMR_OPT_VERSION_T (gint) sizeof(lbmr_lbmr_opt_version_t)
+#define L_LBMR_LBMR_OPT_VERSION_T (int) sizeof(lbmr_lbmr_opt_version_t)
 
 #define LBMR_LBMR_OPT_VERSION_TYPE 0x83
 #define LBMR_LBMR_OPT_VERSIION_SZ 8
@@ -1165,7 +1165,7 @@ typedef struct
 #define L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_FLAGS SIZEOF(lbmr_lbmr_opt_local_domain_t, flags)
 #define O_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LOCAL_DOMAIN_ID OFFSETOF(lbmr_lbmr_opt_local_domain_t, local_domain_id)
 #define L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T_LOCAL_DOMAIN_ID SIZEOF(lbmr_lbmr_opt_local_domain_t, local_domain_id)
-#define L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T (gint) sizeof(lbmr_lbmr_opt_local_domain_t)
+#define L_LBMR_LBMR_OPT_LOCAL_DOMAIN_T (int) sizeof(lbmr_lbmr_opt_local_domain_t)
 
 #define LBMR_LBMR_OPT_LOCAL_DOMAIN_TYPE 0x84
 #define LBMR_LBMR_OPT_LOCAL_DOMAIN_SZ 8
@@ -1209,7 +1209,7 @@ typedef struct
 #define O_LBMR_PSER_T_STORE_PORT OFFSETOF(lbmr_pser_t, store_port)
 #define L_LBMR_PSER_T_STORE_PORT SIZEOF(lbmr_pser_t, store_port)
 #define O_LBMR_PSER_T_TOPIC (O_LBMR_PSER_T_STORE_PORT + L_LBMR_PSER_T_STORE_PORT)
-#define L_LBMR_PSER_T (gint) sizeof(lbmr_pser_t)
+#define L_LBMR_PSER_T (int) sizeof(lbmr_pser_t)
 
 #define LBMR_PSER_OPT_FLAG 0x8000
 #define LBMR_HDR_EXT_TYPE_UME_PROXY_SRC_ELECT_DEP_ELECT 0
@@ -1224,7 +1224,7 @@ typedef struct
 #define L_LBMR_PSER_OPTLEN_T_TYPE SIZEOF(lbmr_pser_optlen_t, type)
 #define O_LBMR_PSER_OPTLEN_T_OPTLEN OFFSETOF(lbmr_pser_optlen_t, optlen)
 #define L_LBMR_PSER_OPTLEN_T_OPTLEN SIZEOF(lbmr_pser_optlen_t, optlen)
-#define L_LBMR_PSER_OPTLEN_T (gint) sizeof(lbmr_pser_optlen_t)
+#define L_LBMR_PSER_OPTLEN_T (int) sizeof(lbmr_pser_optlen_t)
 
 typedef struct
 {
@@ -1235,7 +1235,7 @@ typedef struct
 #define L_LBMR_PSER_OPT_HDR_T_LEN SIZEOF(lbmr_pser_opt_hdr_t, len)
 #define O_LBMR_PSER_OPT_HDR_T_TYPE OFFSETOF(lbmr_pser_opt_hdr_t, type)
 #define L_LBMR_PSER_OPT_HDR_T_TYPE SIZEOF(lbmr_pser_opt_hdr_t, type)
-#define L_LBMR_PSER_OPT_HDR_T (gint) sizeof(lbmr_pser_opt_hdr_t)
+#define L_LBMR_PSER_OPT_HDR_T (int) sizeof(lbmr_pser_opt_hdr_t)
 
 #define LBMR_PSER_OPT_SRC_CTXINST_TYPE 0x00
 #define LBMR_PSER_OPT_STORE_CTXINST_TYPE 0x01
@@ -1252,7 +1252,7 @@ typedef struct
 #define L_LBMR_PSER_OPT_CTXINST_T_TYPE SIZEOF(lbmr_pser_opt_ctxinst_t, type)
 #define O_LBMR_PSER_OPT_CTXINST_T_CTXINST OFFSETOF(lbmr_pser_opt_ctxinst_t, ctxinst)
 #define L_LBMR_PSER_OPT_CTXINST_T_CTXINST SIZEOF(lbmr_pser_opt_ctxinst_t, ctxinst)
-#define L_LBMR_PSER_OPT_CTXINST_T (gint) sizeof(lbmr_pser_opt_ctxinst_t)
+#define L_LBMR_PSER_OPT_CTXINST_T (int) sizeof(lbmr_pser_opt_ctxinst_t)
 
 /* LBMR (extended) gateway message */
 typedef struct
@@ -1273,7 +1273,7 @@ typedef struct
 #define L_LBMR_TNWG_T_TYPE SIZEOF(lbmr_tnwg_t, type)
 #define O_LBMR_TNWG_T_RESERVED OFFSETOF(lbmr_tnwg_t, reserved)
 #define L_LBMR_TNWG_T_RESERVED SIZEOF(lbmr_tnwg_t, reserved)
-#define L_LBMR_TNWG_T (gint) sizeof(lbmr_tnwg_t)
+#define L_LBMR_TNWG_T (int) sizeof(lbmr_tnwg_t)
 
 #define LBMR_TNWG_TYPE_INTEREST 0x0000
 #define LBMR_TNWG_TYPE_CTXINFO  0x0001
@@ -1289,7 +1289,7 @@ typedef struct
 #define L_LBMR_TNWG_INTEREST_T_LEN SIZEOF(lbmr_tnwg_interest_t, len)
 #define O_LBMR_TNWG_INTEREST_T_COUNT OFFSETOF(lbmr_tnwg_interest_t, count)
 #define L_LBMR_TNWG_INTEREST_T_COUNT SIZEOF(lbmr_tnwg_interest_t, count)
-#define L_LBMR_TNWG_INTEREST_T (gint) sizeof(lbmr_tnwg_interest_t)
+#define L_LBMR_TNWG_INTEREST_T (int) sizeof(lbmr_tnwg_interest_t)
 
 /* LBMR (extended) gateway message - interest record */
 typedef struct
@@ -1307,7 +1307,7 @@ typedef struct
 #define L_LBMR_TNWG_INTEREST_REC_T_PATTYPE SIZEOF(lbmr_tnwg_interest_rec_t, pattype)
 #define O_LBMR_TNWG_INTEREST_REC_T_DOMAIN_ID OFFSETOF(lbmr_tnwg_interest_rec_t, domain_id)
 #define L_LBMR_TNWG_INTEREST_REC_T_DOMAIN_ID SIZEOF(lbmr_tnwg_interest_rec_t, domain_id)
-#define L_LBMR_TNWG_INTEREST_REC_T (gint) sizeof(lbmr_tnwg_interest_rec_t)
+#define L_LBMR_TNWG_INTEREST_REC_T (int) sizeof(lbmr_tnwg_interest_rec_t)
 
 #define LBMR_TNWG_INTEREST_REC_PATTERN_FLAG 0x80
 #define LBMR_TNWG_INTEREST_REC_CANCEL_FLAG  0x40
@@ -1332,7 +1332,7 @@ typedef struct
 #define L_LBMR_TNWG_CTXINFO_T_FLAGS1 SIZEOF(lbmr_tnwg_ctxinfo_t, flags1)
 #define O_LBMR_TNWG_CTXINFO_T_FLAGS2 OFFSETOF(lbmr_tnwg_ctxinfo_t, flags2)
 #define L_LBMR_TNWG_CTXINFO_T_FLAGS2 SIZEOF(lbmr_tnwg_ctxinfo_t, flags2)
-#define L_LBMR_TNWG_CTXINFO_T (gint) sizeof(lbmr_tnwg_ctxinfo_t)
+#define L_LBMR_TNWG_CTXINFO_T (int) sizeof(lbmr_tnwg_ctxinfo_t)
 
 #define LBMR_TNWG_CTXINFO_QUERY_FLAG 0x80000000
 #define LBMR_TNWG_CTXINFO_TNWG_SRC_FLAG 0x40000000
@@ -1346,7 +1346,7 @@ typedef struct
 } lbmr_tnwg_trreq_t;
 #define O_LBMR_TNWG_TRREQ_T_LEN OFFSETOF(lbmr_tnwg_trreq_t, len)
 #define L_LBMR_TNWG_TRREQ_T_LEN SIZEOF(lbmr_tnwg_trreq_t, len)
-#define L_LBMR_TNWG_TRREQ_T (gint) sizeof(lbmr_tnwg_trreq_t)
+#define L_LBMR_TNWG_TRREQ_T (int) sizeof(lbmr_tnwg_trreq_t)
 
 /* LBMR (extended) gateway message - basic option */
 typedef struct
@@ -1361,7 +1361,7 @@ typedef struct
 #define L_LBMR_TNWG_OPT_T_LEN SIZEOF(lbmr_tnwg_opt_t, len)
 #define O_LBMR_TNWG_OPT_T_FLAGS OFFSETOF(lbmr_tnwg_opt_t, flags)
 #define L_LBMR_TNWG_OPT_T_FLAGS SIZEOF(lbmr_tnwg_opt_t, flags)
-#define L_LBMR_TNWG_OPT_T (gint) sizeof(lbmr_tnwg_opt_t)
+#define L_LBMR_TNWG_OPT_T (int) sizeof(lbmr_tnwg_opt_t)
 
 #define LBMR_TNWG_OPT_IGNORE_FLAG 0x8000
 
@@ -1381,7 +1381,7 @@ typedef struct
 #define L_LBMR_TNWG_OPT_CTXINST_T_FLAGS SIZEOF(lbmr_tnwg_opt_ctxinst_t, flags)
 #define O_LBMR_TNWG_OPT_CTXINST_T_INSTANCE OFFSETOF(lbmr_tnwg_opt_ctxinst_t, instance)
 #define L_LBMR_TNWG_OPT_CTXINST_T_INSTANCE SIZEOF(lbmr_tnwg_opt_ctxinst_t, instance)
-#define L_LBMR_TNWG_OPT_CTXINST_T (gint) sizeof(lbmr_tnwg_opt_ctxinst_t)
+#define L_LBMR_TNWG_OPT_CTXINST_T (int) sizeof(lbmr_tnwg_opt_ctxinst_t)
 
 #define LBMR_TNWG_OPT_CTXINST_TYPE 0x00
 
@@ -1407,7 +1407,7 @@ typedef struct
 #define L_LBMR_TNWG_OPT_ADDRESS_T_RES SIZEOF(lbmr_tnwg_opt_address_t, res)
 #define O_LBMR_TNWG_OPT_ADDRESS_T_IP OFFSETOF(lbmr_tnwg_opt_address_t, ip)
 #define L_LBMR_TNWG_OPT_ADDRESS_T_IP SIZEOF(lbmr_tnwg_opt_address_t, ip)
-#define L_LBMR_TNWG_OPT_ADDRESS_T (gint) sizeof(lbmr_tnwg_opt_address_t)
+#define L_LBMR_TNWG_OPT_ADDRESS_T (int) sizeof(lbmr_tnwg_opt_address_t)
 
 #define LBMR_TNWG_OPT_ADDRESS_TYPE 0x01
 
@@ -1427,7 +1427,7 @@ typedef struct
 #define L_LBMR_TNWG_OPT_DOMAIN_T_FLAGS SIZEOF(lbmr_tnwg_opt_domain_t, flags)
 #define O_LBMR_TNWG_OPT_DOMAIN_T_DOMAIN_ID OFFSETOF(lbmr_tnwg_opt_domain_t, domain_id)
 #define L_LBMR_TNWG_OPT_DOMAIN_T_DOMAIN_ID SIZEOF(lbmr_tnwg_opt_domain_t, domain_id)
-#define L_LBMR_TNWG_OPT_DOMAIN_T (gint) sizeof(lbmr_tnwg_opt_domain_t)
+#define L_LBMR_TNWG_OPT_DOMAIN_T (int) sizeof(lbmr_tnwg_opt_domain_t)
 
 #define LBMR_TNWG_OPT_DOMAIN_TYPE 0x02
 
@@ -1460,7 +1460,7 @@ typedef struct
 #define L_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_RESERVED SIZEOF(lbmr_remote_domain_route_hdr_t, reserved)
 #define O_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_LENGTH OFFSETOF(lbmr_remote_domain_route_hdr_t, length)
 #define L_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_LENGTH SIZEOF(lbmr_remote_domain_route_hdr_t, length)
-#define L_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T (gint) sizeof(lbmr_remote_domain_route_hdr_t)
+#define L_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T (int) sizeof(lbmr_remote_domain_route_hdr_t)
 
 /* LBMR (extended) remote context information message */
 typedef struct
@@ -1481,7 +1481,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_T_NUM_RECS SIZEOF(lbmr_rctxinfo_t, num_recs)
 #define O_LBMR_RCTXINFO_T_RESERVED OFFSETOF(lbmr_rctxinfo_t, reserved)
 #define L_LBMR_RCTXINFO_T_RESERVED SIZEOF(lbmr_rctxinfo_t, reserved)
-#define L_LBMR_RCTXINFO_T (gint) sizeof(lbmr_rctxinfo_t)
+#define L_LBMR_RCTXINFO_T (int) sizeof(lbmr_rctxinfo_t)
 
 /* LBMR (extended) remote context information record */
 typedef struct
@@ -1493,7 +1493,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_T_LEN SIZEOF(lbmr_rctxinfo_rec_t, len)
 #define O_LBMR_RCTXINFO_REC_T_FLAGS OFFSETOF(lbmr_rctxinfo_rec_t, flags)
 #define L_LBMR_RCTXINFO_REC_T_FLAGS SIZEOF(lbmr_rctxinfo_rec_t, flags)
-#define L_LBMR_RCTXINFO_REC_T (gint) sizeof(lbmr_rctxinfo_rec_t)
+#define L_LBMR_RCTXINFO_REC_T (int) sizeof(lbmr_rctxinfo_rec_t)
 
 #define LBMR_RCTXINFO_REC_FLAG_QUERY 0x8000
 
@@ -1510,7 +1510,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_OPT_T_LEN SIZEOF(lbmr_rctxinfo_rec_opt_t, len)
 #define O_LBMR_RCTXINFO_REC_OPT_T_FLAGS OFFSETOF(lbmr_rctxinfo_rec_opt_t, flags)
 #define L_LBMR_RCTXINFO_REC_OPT_T_FLAGS SIZEOF(lbmr_rctxinfo_rec_opt_t, flags)
-#define L_LBMR_RCTXINFO_REC_OPT_T (gint) sizeof(lbmr_rctxinfo_rec_opt_t)
+#define L_LBMR_RCTXINFO_REC_OPT_T (int) sizeof(lbmr_rctxinfo_rec_opt_t)
 
 /* LBMR (extended) remote context information record address option */
 typedef struct
@@ -1537,7 +1537,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_ADDRESS_OPT_T_PORT SIZEOF(lbmr_rctxinfo_rec_address_opt_t, port)
 #define O_LBMR_RCTXINFO_REC_ADDRESS_OPT_T_RES OFFSETOF(lbmr_rctxinfo_rec_address_opt_t, res)
 #define L_LBMR_RCTXINFO_REC_ADDRESS_OPT_T_RES SIZEOF(lbmr_rctxinfo_rec_address_opt_t, res)
-#define L_LBMR_RCTXINFO_REC_ADDRESS_OPT_T (gint) sizeof(lbmr_rctxinfo_rec_address_opt_t)
+#define L_LBMR_RCTXINFO_REC_ADDRESS_OPT_T (int) sizeof(lbmr_rctxinfo_rec_address_opt_t)
 
 #define LBMR_RCTXINFO_OPT_ADDRESS_TYPE 0x01
 
@@ -1557,7 +1557,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_FLAGS SIZEOF(lbmr_rctxinfo_rec_instance_opt_t, flags)
 #define O_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_INSTANCE OFFSETOF(lbmr_rctxinfo_rec_instance_opt_t, instance)
 #define L_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_INSTANCE SIZEOF(lbmr_rctxinfo_rec_instance_opt_t, instance)
-#define L_LBMR_RCTXINFO_REC_INSTANCE_OPT_T (gint) sizeof(lbmr_rctxinfo_rec_instance_opt_t)
+#define L_LBMR_RCTXINFO_REC_INSTANCE_OPT_T (int) sizeof(lbmr_rctxinfo_rec_instance_opt_t)
 
 #define LBMR_RCTXINFO_OPT_INSTANCE_TYPE 0x02
 
@@ -1577,7 +1577,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_FLAGS SIZEOF(lbmr_rctxinfo_rec_odomain_opt_t, flags)
 #define O_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_DOMAIN_ID OFFSETOF(lbmr_rctxinfo_rec_odomain_opt_t, domain_id)
 #define L_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_DOMAIN_ID SIZEOF(lbmr_rctxinfo_rec_odomain_opt_t, domain_id)
-#define L_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T (gint) sizeof(lbmr_rctxinfo_rec_odomain_opt_t)
+#define L_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T (int) sizeof(lbmr_rctxinfo_rec_odomain_opt_t)
 
 #define LBMR_RCTXINFO_OPT_ODOMAIN_TYPE 0x03
 
@@ -1594,7 +1594,7 @@ typedef struct
 #define L_LBMR_RCTXINFO_REC_NAME_OPT_T_LEN SIZEOF(lbmr_rctxinfo_rec_name_opt_t, len)
 #define O_LBMR_RCTXINFO_REC_NAME_OPT_T_FLAGS OFFSETOF(lbmr_rctxinfo_rec_name_opt_t, flags)
 #define L_LBMR_RCTXINFO_REC_NAME_OPT_T_FLAGS SIZEOF(lbmr_rctxinfo_rec_name_opt_t, flags)
-#define L_LBMR_RCTXINFO_REC_NAME_OPT_T (gint) sizeof(lbmr_rctxinfo_rec_name_opt_t)
+#define L_LBMR_RCTXINFO_REC_NAME_OPT_T (int) sizeof(lbmr_rctxinfo_rec_name_opt_t)
 
 #define LBMR_RCTXINFO_OPT_NAME_TYPE 0x04
 
@@ -1608,7 +1608,7 @@ typedef struct
 #define L_LBMR_UMQ_QMGMT_HDR_T_VER_TYPE SIZEOF(lbmr_umq_qmgmt_hdr_t, ver_type)
 #define O_LBMR_UMQ_QMGMT_HDR_T_EXT_TYPE OFFSETOF(lbmr_umq_qmgmt_hdr_t, ext_type)
 #define L_LBMR_UMQ_QMGMT_HDR_T_EXT_TYPE SIZEOF(lbmr_umq_qmgmt_hdr_t, ext_type)
-#define L_LBMR_UMQ_QMGMT_HDR_T (gint) sizeof(lbmr_umq_qmgmt_hdr_t)
+#define L_LBMR_UMQ_QMGMT_HDR_T (int) sizeof(lbmr_umq_qmgmt_hdr_t)
 
 typedef struct
 {
@@ -1645,7 +1645,7 @@ typedef struct
 #define L_UMQ_QMGMT_HDR_T_GRP_IDX SIZEOF(umq_qmgmt_hdr_t, grp_idx)
 #define O_UMQ_QMGMT_HDR_T_PCKT_TYPE_DEP16 OFFSETOF(umq_qmgmt_hdr_t, pckt_type_dep16)
 #define L_UMQ_QMGMT_HDR_T_PCKT_TYPE_DEP16 SIZEOF(umq_qmgmt_hdr_t, pckt_type_dep16)
-#define L_UMQ_QMGMT_HDR_T (gint) sizeof(umq_qmgmt_hdr_t)
+#define L_UMQ_QMGMT_HDR_T (int) sizeof(umq_qmgmt_hdr_t)
 
 #define UMQ_QMGMT_HDR_I_FLAG 0x80
 #define UMQ_QMGMT_HDR_N_FLAG 0x40
@@ -1658,7 +1658,7 @@ typedef struct
 } umq_qmgmt_il_hdr_t;
 #define O_UMQ_QMGMT_IL_HDR_T_HIGHEST_RCR_TSP OFFSETOF(umq_qmgmt_il_hdr_t, highest_rcr_tsp)
 #define L_UMQ_QMGMT_IL_HDR_T_HIGHEST_RCR_TSP SIZEOF(umq_qmgmt_il_hdr_t, highest_rcr_tsp)
-#define L_UMQ_QMGMT_IL_HDR_T (gint) sizeof(umq_qmgmt_il_hdr_t)
+#define L_UMQ_QMGMT_IL_HDR_T (int) sizeof(umq_qmgmt_il_hdr_t)
 
 typedef struct
 {
@@ -1678,7 +1678,7 @@ typedef struct
 #define L_UMQ_QMGMT_IL_INST_HDR_T_GRP_IDX SIZEOF(umq_qmgmt_il_inst_hdr_t, grp_idx)
 #define O_UMQ_QMGMT_IL_INST_HDR_T_FLAGS OFFSETOF(umq_qmgmt_il_inst_hdr_t, flags)
 #define L_UMQ_QMGMT_IL_INST_HDR_T_FLAGS SIZEOF(umq_qmgmt_il_inst_hdr_t, flags)
-#define L_UMQ_QMGMT_IL_INST_HDR_T (gint) sizeof(umq_qmgmt_il_inst_hdr_t)
+#define L_UMQ_QMGMT_IL_INST_HDR_T (int) sizeof(umq_qmgmt_il_inst_hdr_t)
 
 #define UMQ_QMGMT_HDR_IL_INST_M_FLAG 0x8000
 #define UMQ_QMGMT_HDR_IL_INST_Q_FLAG 0x4000
@@ -1690,7 +1690,7 @@ typedef struct
 } umq_qmgmt_ec_hdr_t;
 #define O_UMQ_QMGMT_EC_HDR_T_QUEUE_NEW_VER OFFSETOF(umq_qmgmt_ec_hdr_t, queue_new_ver)
 #define L_UMQ_QMGMT_EC_HDR_T_QUEUE_NEW_VER SIZEOF(umq_qmgmt_ec_hdr_t, queue_new_ver)
-#define L_UMQ_QMGMT_EC_HDR_T (gint) sizeof(umq_qmgmt_ec_hdr_t)
+#define L_UMQ_QMGMT_EC_HDR_T (int) sizeof(umq_qmgmt_ec_hdr_t)
 
 typedef struct
 {
@@ -1701,7 +1701,7 @@ typedef struct
 #define L_UMQ_QMGMT_EV_HDR_T_HIGHEST_RCR_TSP SIZEOF(umq_qmgmt_ev_hdr_t, highest_rcr_tsp)
 #define O_UMQ_QMGMT_EV_HDR_T_AGE OFFSETOF(umq_qmgmt_ev_hdr_t, age)
 #define L_UMQ_QMGMT_EV_HDR_T_AGE SIZEOF(umq_qmgmt_ev_hdr_t, age)
-#define L_UMQ_QMGMT_EV_HDR_T (gint) sizeof(umq_qmgmt_ev_hdr_t)
+#define L_UMQ_QMGMT_EV_HDR_T (int) sizeof(umq_qmgmt_ev_hdr_t)
 
 typedef struct
 {
@@ -1709,7 +1709,7 @@ typedef struct
 } umq_qmgmt_qro_hdr_t;
 #define O_UMQ_QMGMT_QRO_HDR_T_HIGHEST_RCR_TSP OFFSETOF(umq_qmgmt_qro_hdr_t, highest_rcr_tsp)
 #define L_UMQ_QMGMT_QRO_HDR_T_HIGHEST_RCR_TSP SIZEOF(umq_qmgmt_qro_hdr_t, highest_rcr_tsp)
-#define L_UMQ_QMGMT_QRO_HDR_T (gint) sizeof(umq_qmgmt_qro_hdr_t)
+#define L_UMQ_QMGMT_QRO_HDR_T (int) sizeof(umq_qmgmt_qro_hdr_t)
 
 #define UMQ_QMGMT_HDR_PCKT_TYPE_IL 0x1
 #define UMQ_QMGMT_HDR_PCKT_TYPE_JR 0x2
@@ -1882,45 +1882,45 @@ static const value_string lbmr_rctxinfo_option_type[] =
 #define LBMR_DEFAULT_UC_ADDRESS "0.0.0.0"
 
 /* Global preferences variables (altered by the preferences dialog). */
-static guint32 global_lbmr_mc_incoming_udp_port = LBMR_DEFAULT_MC_INCOMING_UDP_PORT;
-static guint32 global_lbmr_mc_outgoing_udp_port  = LBMR_DEFAULT_MC_OUTGOING_UDP_PORT;
+static uint32_t global_lbmr_mc_incoming_udp_port = LBMR_DEFAULT_MC_INCOMING_UDP_PORT;
+static uint32_t global_lbmr_mc_outgoing_udp_port  = LBMR_DEFAULT_MC_OUTGOING_UDP_PORT;
 static const char * global_lbmr_mc_incoming_address = LBMR_DEFAULT_MC_INCOMING_ADDRESS;
 static const char * global_lbmr_mc_outgoing_address = LBMR_DEFAULT_MC_OUTGOING_ADDRESS;
-static guint32 global_lbmr_uc_port_high = LBMR_DEFAULT_UC_PORT_HIGH;
-static guint32 global_lbmr_uc_port_low = LBMR_DEFAULT_UC_PORT_LOW;
-static guint32 global_lbmr_uc_dest_port = LBMR_DEFAULT_UC_DEST_PORT;
+static uint32_t global_lbmr_uc_port_high = LBMR_DEFAULT_UC_PORT_HIGH;
+static uint32_t global_lbmr_uc_port_low = LBMR_DEFAULT_UC_PORT_LOW;
+static uint32_t global_lbmr_uc_dest_port = LBMR_DEFAULT_UC_DEST_PORT;
 static const char * global_lbmr_uc_address = LBMR_DEFAULT_UC_ADDRESS;
 static bool global_lbmr_use_tag;
 
 /* Local preferences variables (used by the dissector). */
-static guint32 lbmr_mc_incoming_udp_port = LBMR_DEFAULT_MC_INCOMING_UDP_PORT;
-static guint32 lbmr_mc_outgoing_udp_port = LBMR_DEFAULT_MC_OUTGOING_UDP_PORT;
-static guint32 lbmr_mc_incoming_address_host;
-static guint32 lbmr_mc_outgoing_address_host;
-static guint32 lbmr_uc_port_high = LBMR_DEFAULT_UC_PORT_HIGH;
-static guint32 lbmr_uc_port_low = LBMR_DEFAULT_UC_PORT_LOW;
-static guint32 lbmr_uc_dest_port = LBMR_DEFAULT_UC_DEST_PORT;
-static guint32 lbmr_uc_address_host;
-static gboolean lbmr_use_tag;
+static uint32_t lbmr_mc_incoming_udp_port = LBMR_DEFAULT_MC_INCOMING_UDP_PORT;
+static uint32_t lbmr_mc_outgoing_udp_port = LBMR_DEFAULT_MC_OUTGOING_UDP_PORT;
+static uint32_t lbmr_mc_incoming_address_host;
+static uint32_t lbmr_mc_outgoing_address_host;
+static uint32_t lbmr_uc_port_high = LBMR_DEFAULT_UC_PORT_HIGH;
+static uint32_t lbmr_uc_port_low = LBMR_DEFAULT_UC_PORT_LOW;
+static uint32_t lbmr_uc_dest_port = LBMR_DEFAULT_UC_DEST_PORT;
+static uint32_t lbmr_uc_address_host;
+static bool lbmr_use_tag;
 
 typedef struct
 {
     char * name;
-    guint32 mc_outgoing_udp_port;
-    guint32 mc_incoming_udp_port;
+    uint32_t mc_outgoing_udp_port;
+    uint32_t mc_incoming_udp_port;
     char * mc_incoming_address;
-    guint32 mc_incoming_address_val_h;
+    uint32_t mc_incoming_address_val_h;
     char * mc_outgoing_address;
-    guint32 mc_outgoing_address_val_h;
-    guint32 uc_port_high;
-    guint32 uc_port_low;
-    guint32 uc_dest_port;
+    uint32_t mc_outgoing_address_val_h;
+    uint32_t uc_port_high;
+    uint32_t uc_port_low;
+    uint32_t uc_dest_port;
     char * uc_address;
-    guint32 uc_address_val_h;
+    uint32_t uc_address_val_h;
 } lbmr_tag_entry_t;
 
 static lbmr_tag_entry_t * lbmr_tag_entry;
-static guint lbmr_tag_count;
+static unsigned lbmr_tag_count;
 
 UAT_CSTRING_CB_DEF(lbmr_tag, name, lbmr_tag_entry_t)
 UAT_DEC_CB_DEF(lbmr_tag, mc_outgoing_udp_port, lbmr_tag_entry_t)
@@ -1955,7 +1955,7 @@ static bool lbmr_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -1963,10 +1963,10 @@ static bool lbmr_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbmr_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -2017,8 +2017,8 @@ static void lbmr_tag_free_cb(void * record)
 
 static tap_packet_status lbmr_match_packet(packet_info * pinfo, const lbmr_tag_entry_t * entry)
 {
-    guint32 dest_addr_h;
-    guint32 src_addr_h;
+    uint32_t dest_addr_h;
+    uint32_t src_addr_h;
 
     if ((pinfo->dst.type != AT_IPv4) || (pinfo->dst.len != 4) ||
         (pinfo->src.type != AT_IPv4) || (pinfo->src.len != 4))
@@ -2068,7 +2068,7 @@ static tap_packet_status lbmr_match_packet(packet_info * pinfo, const lbmr_tag_e
 
 static char * lbmr_tag_find(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     lbmr_tag_entry_t * tag = NULL;
 
     if (!lbmr_use_tag)
@@ -2096,112 +2096,112 @@ static int proto_lbmr;
 static dissector_handle_t lbmr_dissector_handle;
 
 /* Dissector tree handles */
-static gint ett_lbmr;
-static gint ett_lbmr_hdr;
-static gint ett_lbmr_tqrs;
-static gint ett_lbmr_tqr;
-static gint ett_lbmr_tirs;
-static gint ett_lbmr_tir;
-static gint ett_lbmr_tir_tcp;
-static gint ett_lbmr_tir_lbtrm;
-static gint ett_lbmr_tir_lbtru;
-static gint ett_lbmr_tir_lbtipc;
-static gint ett_lbmr_tir_lbtrdma;
-static gint ett_lbmr_tir_lbtsmx;
-static gint ett_lbmr_topts;
-static gint ett_lbmr_topt_len;
-static gint ett_lbmr_topt_ume;
-static gint ett_lbmr_topt_ume_flags;
-static gint ett_lbmr_topt_ume_store;
-static gint ett_lbmr_topt_ume_store_flags;
-static gint ett_lbmr_topt_ume_store_group;
-static gint ett_lbmr_topt_ume_store_group_flags;
-static gint ett_lbmr_topt_latejoin;
-static gint ett_lbmr_topt_latejoin_flags;
-static gint ett_lbmr_topt_umq_rcridx;
-static gint ett_lbmr_topt_umq_rcridx_flags;
-static gint ett_lbmr_topt_umq_qinfo;
-static gint ett_lbmr_topt_umq_qinfo_flags;
-static gint ett_lbmr_topt_cost;
-static gint ett_lbmr_topt_cost_flags;
-static gint ett_lbmr_topt_otid;
-static gint ett_lbmr_topt_otid_flags;
-static gint ett_lbmr_topt_ctxinst;
-static gint ett_lbmr_topt_ctxinst_flags;
-static gint ett_lbmr_topt_ctxinsts;
-static gint ett_lbmr_topt_ctxinsts_flags;
-static gint ett_lbmr_topt_ulb;
-static gint ett_lbmr_topt_ulb_flags;
-static gint ett_lbmr_topt_ctxinstq;
-static gint ett_lbmr_topt_ctxinstq_flags;
-static gint ett_lbmr_topt_domain_id;
-static gint ett_lbmr_topt_domain_id_flags;
-static gint ett_lbmr_topt_exfunc;
-static gint ett_lbmr_topt_exfunc_flags;
-static gint ett_lbmr_topt_exfunc_functionality_flags;
-static gint ett_lbmr_topt_unknown;
-static gint ett_lbmr_tmb;
-static gint ett_lbmr_tmrs;
-static gint ett_lbmr_tmr;
-static gint ett_lbmr_tmr_flags;
-static gint ett_lbmr_pser_flags;
-static gint ett_lbmr_pser_opts;
-static gint ett_lbmr_pser_opt_len;
-static gint ett_lbmr_pser_opt_ctxinst;
-static gint ett_lbmr_qqrs;
-static gint ett_lbmr_qirs;
-static gint ett_lbmr_qir;
-static gint ett_lbmr_qir_options;
-static gint ett_lbmr_qir_grp_blk;
-static gint ett_lbmr_qir_queue_blk;
-static gint ett_lbmr_qir_grp;
-static gint ett_lbmr_qir_queue;
-static gint ett_lbmr_topic_res_request_flags;
-static gint ett_lbmr_ctxinfo_flags;
-static gint ett_lbmr_tnwg;
-static gint ett_lbmr_tnwg_interest;
-static gint ett_lbmr_tnwg_interest_rec;
-static gint ett_lbmr_tnwg_interest_rec_flags;
-static gint ett_lbmr_tnwg_ctxinfo;
-static gint ett_lbmr_tnwg_ctxinfo_flags1;
-static gint ett_lbmr_tnwg_trreq;
-static gint ett_lbmr_tnwg_ctxinst_opt;
-static gint ett_lbmr_tnwg_ctxinst_opt_flags;
-static gint ett_lbmr_tnwg_address_opt;
-static gint ett_lbmr_tnwg_address_opt_flags;
-static gint ett_lbmr_tnwg_domain_opt;
-static gint ett_lbmr_tnwg_domain_opt_flags;
-static gint ett_lbmr_tnwg_name_opt;
-static gint ett_lbmr_tnwg_name_opt_flags;
-static gint ett_lbmr_tnwg_unknown_opt;
-static gint ett_lbmr_tnwg_unknown_opt_flags;
-static gint ett_lbmr_remote_domain_route_hdr;
-static gint ett_lbmr_rctxinfo;
-static gint ett_lbmr_rctxinfo_rec;
-static gint ett_lbmr_rctxinfo_rec_flags;
-static gint ett_lbmr_rctxinfo_rec_address;
-static gint ett_lbmr_rctxinfo_rec_instance;
-static gint ett_lbmr_rctxinfo_rec_odomain;
-static gint ett_lbmr_rctxinfo_rec_name;
-static gint ett_lbmr_rctxinfo_rec_unknown;
-static gint ett_qmgmt_flags;
-static gint ett_qmgmt_il;
-static gint ett_qmgmt_il_inst;
-static gint ett_qmgmt_il_inst_flags;
-static gint ett_qmgmt_ec;
-static gint ett_qmgmt_ev;
-static gint ett_qmgmt_qro;
-static gint ett_lbmr_opts;
-static gint ett_lbmr_opt_src_id;
-static gint ett_lbmr_opt_src_id_flags;
-static gint ett_lbmr_opt_len;
-static gint ett_lbmr_opt_src_type;
-static gint ett_lbmr_opt_src_type_flags;
-static gint ett_lbmr_opt_version;
-static gint ett_lbmr_opt_version_flags;
-static gint ett_lbmr_opt_local_domain;
-static gint ett_lbmr_opt_local_domain_flags;
-static gint ett_lbmr_opt_unknown;
+static int ett_lbmr;
+static int ett_lbmr_hdr;
+static int ett_lbmr_tqrs;
+static int ett_lbmr_tqr;
+static int ett_lbmr_tirs;
+static int ett_lbmr_tir;
+static int ett_lbmr_tir_tcp;
+static int ett_lbmr_tir_lbtrm;
+static int ett_lbmr_tir_lbtru;
+static int ett_lbmr_tir_lbtipc;
+static int ett_lbmr_tir_lbtrdma;
+static int ett_lbmr_tir_lbtsmx;
+static int ett_lbmr_topts;
+static int ett_lbmr_topt_len;
+static int ett_lbmr_topt_ume;
+static int ett_lbmr_topt_ume_flags;
+static int ett_lbmr_topt_ume_store;
+static int ett_lbmr_topt_ume_store_flags;
+static int ett_lbmr_topt_ume_store_group;
+static int ett_lbmr_topt_ume_store_group_flags;
+static int ett_lbmr_topt_latejoin;
+static int ett_lbmr_topt_latejoin_flags;
+static int ett_lbmr_topt_umq_rcridx;
+static int ett_lbmr_topt_umq_rcridx_flags;
+static int ett_lbmr_topt_umq_qinfo;
+static int ett_lbmr_topt_umq_qinfo_flags;
+static int ett_lbmr_topt_cost;
+static int ett_lbmr_topt_cost_flags;
+static int ett_lbmr_topt_otid;
+static int ett_lbmr_topt_otid_flags;
+static int ett_lbmr_topt_ctxinst;
+static int ett_lbmr_topt_ctxinst_flags;
+static int ett_lbmr_topt_ctxinsts;
+static int ett_lbmr_topt_ctxinsts_flags;
+static int ett_lbmr_topt_ulb;
+static int ett_lbmr_topt_ulb_flags;
+static int ett_lbmr_topt_ctxinstq;
+static int ett_lbmr_topt_ctxinstq_flags;
+static int ett_lbmr_topt_domain_id;
+static int ett_lbmr_topt_domain_id_flags;
+static int ett_lbmr_topt_exfunc;
+static int ett_lbmr_topt_exfunc_flags;
+static int ett_lbmr_topt_exfunc_functionality_flags;
+static int ett_lbmr_topt_unknown;
+static int ett_lbmr_tmb;
+static int ett_lbmr_tmrs;
+static int ett_lbmr_tmr;
+static int ett_lbmr_tmr_flags;
+static int ett_lbmr_pser_flags;
+static int ett_lbmr_pser_opts;
+static int ett_lbmr_pser_opt_len;
+static int ett_lbmr_pser_opt_ctxinst;
+static int ett_lbmr_qqrs;
+static int ett_lbmr_qirs;
+static int ett_lbmr_qir;
+static int ett_lbmr_qir_options;
+static int ett_lbmr_qir_grp_blk;
+static int ett_lbmr_qir_queue_blk;
+static int ett_lbmr_qir_grp;
+static int ett_lbmr_qir_queue;
+static int ett_lbmr_topic_res_request_flags;
+static int ett_lbmr_ctxinfo_flags;
+static int ett_lbmr_tnwg;
+static int ett_lbmr_tnwg_interest;
+static int ett_lbmr_tnwg_interest_rec;
+static int ett_lbmr_tnwg_interest_rec_flags;
+static int ett_lbmr_tnwg_ctxinfo;
+static int ett_lbmr_tnwg_ctxinfo_flags1;
+static int ett_lbmr_tnwg_trreq;
+static int ett_lbmr_tnwg_ctxinst_opt;
+static int ett_lbmr_tnwg_ctxinst_opt_flags;
+static int ett_lbmr_tnwg_address_opt;
+static int ett_lbmr_tnwg_address_opt_flags;
+static int ett_lbmr_tnwg_domain_opt;
+static int ett_lbmr_tnwg_domain_opt_flags;
+static int ett_lbmr_tnwg_name_opt;
+static int ett_lbmr_tnwg_name_opt_flags;
+static int ett_lbmr_tnwg_unknown_opt;
+static int ett_lbmr_tnwg_unknown_opt_flags;
+static int ett_lbmr_remote_domain_route_hdr;
+static int ett_lbmr_rctxinfo;
+static int ett_lbmr_rctxinfo_rec;
+static int ett_lbmr_rctxinfo_rec_flags;
+static int ett_lbmr_rctxinfo_rec_address;
+static int ett_lbmr_rctxinfo_rec_instance;
+static int ett_lbmr_rctxinfo_rec_odomain;
+static int ett_lbmr_rctxinfo_rec_name;
+static int ett_lbmr_rctxinfo_rec_unknown;
+static int ett_qmgmt_flags;
+static int ett_qmgmt_il;
+static int ett_qmgmt_il_inst;
+static int ett_qmgmt_il_inst_flags;
+static int ett_qmgmt_ec;
+static int ett_qmgmt_ev;
+static int ett_qmgmt_qro;
+static int ett_lbmr_opts;
+static int ett_lbmr_opt_src_id;
+static int ett_lbmr_opt_src_id_flags;
+static int ett_lbmr_opt_len;
+static int ett_lbmr_opt_src_type;
+static int ett_lbmr_opt_src_type_flags;
+static int ett_lbmr_opt_version;
+static int ett_lbmr_opt_version_flags;
+static int ett_lbmr_opt_local_domain;
+static int ett_lbmr_opt_local_domain_flags;
+static int ett_lbmr_opt_unknown;
 
 /* Dissector field handles */
 static int hf_lbmr_tag;
@@ -2676,7 +2676,7 @@ typedef struct tqr_node_t_stct tqr_node_t;
 struct wctqr_node_t_stct;
 struct wctqr_node_t_stct
 {
-    guint8 type;
+    uint8_t type;
     char * pattern;
     struct wctqr_node_t_stct * next;
 };
@@ -2687,18 +2687,18 @@ struct tir_node_t_stct
 {
     char * topic;
     char * source_string;
-    guint32 idx;
+    uint32_t idx;
     struct tir_node_t_stct * next;
 };
 typedef struct tir_node_t_stct tir_node_t;
 
 typedef struct
 {
-    gint tqr_count;
+    int tqr_count;
     tqr_node_t * tqr;
-    gint tir_count;
+    int tir_count;
     tir_node_t * tir;
-    gint wctqr_count;
+    int wctqr_count;
     wctqr_node_t * wctqr;
 } lbmr_topic_contents_t;
 
@@ -2715,22 +2715,22 @@ struct qir_node_t_stct
 {
     char * queue;
     char * topic;
-    guint16 port;
+    uint16_t port;
     struct qir_node_t_stct * next;
 };
 typedef struct qir_node_t_stct qir_node_t;
 
 typedef struct
 {
-    gint qqr_count;
+    int qqr_count;
     qqr_node_t * qqr;
-    gint qir_count;
+    int qir_count;
     qir_node_t * qir;
 } lbmr_queue_contents_t;
 
 typedef struct
 {
-    gint type;
+    int type;
     union
     {
         lbmr_topic_contents_t topic;
@@ -2742,17 +2742,17 @@ typedef struct
 #define LBMR_CONTENTS_QUEUE 1
 
 /* Statistics titles */
-static const gchar * lbmr_stat_tree_name_topic_ads_topic = "29West/Topics/Advertisements by Topic";
-static const gchar * lbmr_stat_tree_name_topic_ads_source = "29West/Topics/Advertisements by Source";
-static const gchar * lbmr_stat_tree_name_topic_ads_transport = "29West/Topics/Advertisements by Transport";
-static const gchar * lbmr_stat_tree_name_topic_queries_topic = "29West/Topics/Queries by Topic";
-static const gchar * lbmr_stat_tree_name_topic_queries_receiver  = "29West/Topics/Queries by Receiver";
-static const gchar * lbmr_stat_tree_name_topic_queries_pattern = "29West/Topics/Wildcard Queries by Pattern";
-static const gchar * lbmr_stat_tree_name_topic_queries_pattern_receiver = "29West/Topics/Wildcard Queries by Receiver";
-static const gchar * lbmr_stat_tree_name_queue_ads_queue = "29West/Queues/Advertisements by Queue";
-static const gchar * lbmr_stat_tree_name_queue_ads_source = "29West/Queues/Advertisements by Source";
-static const gchar * lbmr_stat_tree_name_queue_queries_queue = "29West/Queues/Queries by Queue";
-static const gchar * lbmr_stat_tree_name_queue_queries_receiver = "29West/Queues/Queries by Receiver";
+static const char * lbmr_stat_tree_name_topic_ads_topic = "29West/Topics/Advertisements by Topic";
+static const char * lbmr_stat_tree_name_topic_ads_source = "29West/Topics/Advertisements by Source";
+static const char * lbmr_stat_tree_name_topic_ads_transport = "29West/Topics/Advertisements by Transport";
+static const char * lbmr_stat_tree_name_topic_queries_topic = "29West/Topics/Queries by Topic";
+static const char * lbmr_stat_tree_name_topic_queries_receiver  = "29West/Topics/Queries by Receiver";
+static const char * lbmr_stat_tree_name_topic_queries_pattern = "29West/Topics/Wildcard Queries by Pattern";
+static const char * lbmr_stat_tree_name_topic_queries_pattern_receiver = "29West/Topics/Wildcard Queries by Receiver";
+static const char * lbmr_stat_tree_name_queue_ads_queue = "29West/Queues/Advertisements by Queue";
+static const char * lbmr_stat_tree_name_queue_ads_source = "29West/Queues/Advertisements by Source";
+static const char * lbmr_stat_tree_name_queue_queries_queue = "29West/Queues/Queries by Queue";
+static const char * lbmr_stat_tree_name_queue_queries_receiver = "29West/Queues/Queries by Receiver";
 
 /* Statistics handles */
 static int lbmr_stats_tree_handle_topic_ads_topic = -1;
@@ -2794,7 +2794,7 @@ static void add_contents_wctqr(lbmr_contents_t * contents, unsigned char type, c
     contents->contents.topic.wctqr_count++;
 }
 
-static void add_contents_tir(lbmr_contents_t * contents, const char * topic, char * source, guint32 topic_index)
+static void add_contents_tir(lbmr_contents_t * contents, const char * topic, char * source, uint32_t topic_index)
 {
     tir_node_t * node = NULL;
 
@@ -2818,7 +2818,7 @@ static void add_contents_qqr(lbmr_contents_t * contents, const char * queue)
     contents->contents.queue.qqr_count++;
 }
 
-static void add_contents_qir(lbmr_contents_t * contents, const char * queue, const char * topic, guint16 port)
+static void add_contents_qir(lbmr_contents_t * contents, const char * queue, const char * topic, uint16_t port)
 {
     qir_node_t * node = NULL;
 
@@ -2848,7 +2848,7 @@ static tap_packet_status lbmr_topic_ads_topic_stats_tree_packet(stats_tree * tre
     const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data;
     int topic_node;
     int source_node;
-    gchar * full_source_string;
+    char * full_source_string;
 
     tick_stat_node(tree, lbmr_stat_tree_name_topic_ads_topic, 0, false);
     topic_node = tick_stat_node(tree, info->topic, lbmr_stats_tree_handle_topic_ads_topic, true);
@@ -2875,7 +2875,7 @@ static tap_packet_status lbmr_topic_ads_source_stats_tree_packet(stats_tree * tr
     const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data;
     int source_node;
     int topic_node;
-    gchar * full_source_string;
+    char * full_source_string;
 
     tick_stat_node(tree, lbmr_stat_tree_name_topic_ads_source, 0, false);
     source_node = tick_stat_node(tree, address_to_str(wmem_packet_scope(), &pinfo->net_src), lbmr_stats_tree_handle_topic_ads_source, true);
@@ -2900,7 +2900,7 @@ static tap_packet_status lbmr_topic_ads_transport_stats_tree_packet(stats_tree *
 {
     const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data;
     int transport_node;
-    gchar * full_source_string;
+    char * full_source_string;
 
     tick_stat_node(tree, lbmr_stat_tree_name_topic_ads_transport, 0, false);
     transport_node = tick_stat_node(tree, info->source, lbmr_stats_tree_handle_topic_ads_transport, true);
@@ -3020,7 +3020,7 @@ static tap_packet_status lbmr_queue_ads_queue_stats_tree_packet(stats_tree * tre
 {
     const lbm_lbmr_queue_advertisement_tap_info_t * info = (const lbm_lbmr_queue_advertisement_tap_info_t *) data;
     int queue_node;
-    gchar * str;
+    char * str;
 
     tick_stat_node(tree, lbmr_stat_tree_name_queue_ads_queue, 0, false);
     queue_node = tick_stat_node(tree, info->queue, lbmr_stats_tree_handle_queue_ads_queue, true);
@@ -3044,7 +3044,7 @@ static tap_packet_status lbmr_queue_ads_source_stats_tree_packet(stats_tree * tr
 {
     const lbm_lbmr_queue_advertisement_tap_info_t * info = (const lbm_lbmr_queue_advertisement_tap_info_t *) data;
     int source_node;
-    gchar * str;
+    char * str;
 
     tick_stat_node(tree, lbmr_stat_tree_name_queue_ads_source, 0, false);
     source_node = tick_stat_node(tree, address_to_str(wmem_packet_scope(), &pinfo->net_src), lbmr_stats_tree_handle_queue_ads_source, true);
@@ -3108,14 +3108,14 @@ static int dissect_lbmr_tnwg_ctxinst_opt(tvbuff_t * tvb, int offset, packet_info
 {
     proto_tree * opt_tree = NULL;
     proto_item * opt_item = NULL;
-    guint8 opt_len = 0;
+    uint8_t opt_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_opt_ctxinst_flags_ignore,
         NULL
     };
 
-    opt_len = tvb_get_guint8(tvb, offset + O_LBMR_TNWG_OPT_CTXINST_T_LEN);
+    opt_len = tvb_get_uint8(tvb, offset + O_LBMR_TNWG_OPT_CTXINST_T_LEN);
     opt_item = proto_tree_add_item(tree, hf_lbmr_tnwg_opt_ctxinst, tvb, offset, opt_len, ENC_NA);
     opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_tnwg_ctxinst_opt);
     proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_ctxinst_type, tvb, offset + O_LBMR_TNWG_OPT_CTXINST_T_TYPE, L_LBMR_TNWG_OPT_CTXINST_T_TYPE, ENC_BIG_ENDIAN);
@@ -3129,14 +3129,14 @@ static int dissect_lbmr_tnwg_address_opt(tvbuff_t * tvb, int offset, packet_info
 {
     proto_tree * opt_tree = NULL;
     proto_item * opt_item = NULL;
-    guint8 opt_len = 0;
+    uint8_t opt_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_opt_address_flags_ignore,
         NULL
     };
 
-    opt_len = tvb_get_guint8(tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_LEN);
+    opt_len = tvb_get_uint8(tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_LEN);
     opt_item = proto_tree_add_item(tree, hf_lbmr_tnwg_opt_address, tvb, offset, opt_len, ENC_NA);
     opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_tnwg_address_opt);
     proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_address_type, tvb, offset + O_LBMR_TNWG_OPT_ADDRESS_T_TYPE, L_LBMR_TNWG_OPT_ADDRESS_T_TYPE, ENC_BIG_ENDIAN);
@@ -3152,14 +3152,14 @@ static int dissect_lbmr_tnwg_domain_opt(tvbuff_t * tvb, int offset, packet_info
 {
     proto_tree * opt_tree = NULL;
     proto_item * opt_item = NULL;
-    guint8 opt_len = 0;
+    uint8_t opt_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_opt_domain_flags_ignore,
         NULL
     };
 
-    opt_len = tvb_get_guint8(tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_LEN);
+    opt_len = tvb_get_uint8(tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_LEN);
     opt_item = proto_tree_add_item(tree, hf_lbmr_tnwg_opt_domain, tvb, offset, opt_len, ENC_NA);
     opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_tnwg_domain_opt);
     proto_tree_add_item(opt_tree, hf_lbmr_tnwg_opt_domain_type, tvb, offset + O_LBMR_TNWG_OPT_DOMAIN_T_TYPE, L_LBMR_TNWG_OPT_DOMAIN_T_TYPE, ENC_BIG_ENDIAN);
@@ -3173,15 +3173,15 @@ static int dissect_lbmr_tnwg_name_opt(tvbuff_t * tvb, int offset, packet_info *
 {
     proto_tree * opt_tree = NULL;
     proto_item * opt_item = NULL;
-    guint8 opt_len = 0;
+    uint8_t opt_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_opt_name_flags_ignore,
         NULL
     };
-    guint32 name_len = 0;
+    uint32_t name_len = 0;
 
-    opt_len = tvb_get_guint8(tvb, offset + O_LBMR_TNWG_OPT_T_LEN);
+    opt_len = tvb_get_uint8(tvb, offset + O_LBMR_TNWG_OPT_T_LEN);
     name_len = opt_len - L_LBMR_TNWG_OPT_T;
     opt_item = proto_tree_add_item(tree, hf_lbmr_tnwg_opt_name, tvb, offset, opt_len, ENC_NA);
     opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_tnwg_name_opt);
@@ -3196,15 +3196,15 @@ static int dissect_lbmr_tnwg_unknown_opt(tvbuff_t * tvb, int offset, packet_info
 {
     proto_tree * opt_tree = NULL;
     proto_item * opt_item = NULL;
-    guint8 opt_len = 0;
+    uint8_t opt_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_opt_flags_ignore,
         NULL
     };
-    guint32 data_len = 0;
+    uint32_t data_len = 0;
 
-    opt_len = tvb_get_guint8(tvb, offset + O_LBMR_TNWG_OPT_T_LEN);
+    opt_len = tvb_get_uint8(tvb, offset + O_LBMR_TNWG_OPT_T_LEN);
     data_len = opt_len - L_LBMR_TNWG_OPT_T;
     opt_item = proto_tree_add_item(tree, hf_lbmr_tnwg_opt, tvb, offset, opt_len, ENC_NA);
     opt_tree = proto_item_add_subtree(opt_item, ett_lbmr_tnwg_unknown_opt);
@@ -3220,12 +3220,12 @@ static int dissect_lbmr_tnwg_opts(tvbuff_t * tvb, int offset, int length, packet
     int len_remaining = length;
     int curr_offset = offset;
     int dissected_len = 0;
-    guint8 type = 0;
+    uint8_t type = 0;
     int len_used = 0;
 
     while (len_remaining >= L_LBMR_TNWG_OPT_T)
     {
-        type = tvb_get_guint8(tvb, curr_offset);
+        type = tvb_get_uint8(tvb, curr_offset);
         switch (type)
         {
             case LBMR_TNWG_OPT_CTXINST_TYPE:
@@ -3258,8 +3258,8 @@ static int dissect_lbmr_tnwg_interest_rec(tvbuff_t * tvb, int offset, packet_inf
 {
     proto_tree * rec_tree = NULL;
     proto_item * rec_item = NULL;
-    guint16 rec_len = 0;
-    gint string_len = 0;
+    uint16_t rec_len = 0;
+    int string_len = 0;
     static int * const flags[] =
     {
         &hf_lbmr_tnwg_interest_rec_flags_pattern,
@@ -3290,7 +3290,7 @@ static int dissect_lbmr_tnwg_interest(tvbuff_t * tvb, int offset, packet_info *
 {
     proto_tree * int_tree = NULL;
     proto_item * int_item = NULL;
-    guint16 rec_count = 0;
+    uint16_t rec_count = 0;
     int curr_offset = 0;
     int len = 0;
     int len_remaining = 0;
@@ -3330,13 +3330,13 @@ static int dissect_lbmr_tnwg_ctxinfo(tvbuff_t * tvb, int offset, packet_info * p
         &hf_lbmr_tnwg_ctxinfo_flags1_proxy,
         NULL
     };
-    guint16 reclen = 0;
-    guint16 len_remaining = 0;
+    uint16_t reclen = 0;
+    uint16_t len_remaining = 0;
     int len_used = 0;
 
     reclen = tvb_get_ntohs(tvb, offset + O_LBMR_TNWG_CTXINFO_T_LEN);
     len_remaining = reclen;
-    ctxinfo_item = proto_tree_add_item(tree, hf_lbmr_tnwg_ctxinfo, tvb, offset, (gint)reclen, ENC_NA);
+    ctxinfo_item = proto_tree_add_item(tree, hf_lbmr_tnwg_ctxinfo, tvb, offset, (int)reclen, ENC_NA);
     ctxinfo_tree = proto_item_add_subtree(ctxinfo_item, ett_lbmr_tnwg_ctxinfo);
     proto_tree_add_item(ctxinfo_tree, hf_lbmr_tnwg_ctxinfo_len, tvb, offset + O_LBMR_TNWG_CTXINFO_T_LEN, L_LBMR_TNWG_CTXINFO_T_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(ctxinfo_tree, hf_lbmr_tnwg_ctxinfo_hop_count, tvb, offset + O_LBMR_TNWG_CTXINFO_T_HOP_COUNT, L_LBMR_TNWG_CTXINFO_T_HOP_COUNT, ENC_BIG_ENDIAN);
@@ -3360,14 +3360,14 @@ static int dissect_lbmr_tnwg_trreq(tvbuff_t * tvb, int offset, packet_info * pin
 {
     proto_tree * trreq_tree = NULL;
     proto_item * trreq_item = NULL;
-    guint16 reclen = 0;
-    guint16 len_remaining = 0;
+    uint16_t reclen = 0;
+    uint16_t len_remaining = 0;
     int len_used = 0;
 
     reclen = tvb_get_ntohs(tvb, offset + O_LBMR_TNWG_TRREQ_T_LEN);
     len_remaining = reclen;
 
-    trreq_item = proto_tree_add_item(tree, hf_lbmr_tnwg_trreq, tvb, offset, (gint)reclen, ENC_NA);
+    trreq_item = proto_tree_add_item(tree, hf_lbmr_tnwg_trreq, tvb, offset, (int)reclen, ENC_NA);
     trreq_tree = proto_item_add_subtree(trreq_item, ett_lbmr_tnwg_trreq);
     proto_tree_add_item(trreq_tree, hf_lbmr_tnwg_trreq_len, tvb, offset + O_LBMR_TNWG_TRREQ_T_LEN, L_LBMR_TNWG_TRREQ_T_LEN, ENC_BIG_ENDIAN);
 
@@ -3386,7 +3386,7 @@ static int dissect_lbmr_tnwg_trreq(tvbuff_t * tvb, int offset, packet_info * pin
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_tnwg(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
-    guint16 type = 0;
+    uint16_t type = 0;
     int curr_offset = 0;
     int len_dissected = 0;
     proto_item * type_item = NULL;
@@ -3420,7 +3420,7 @@ static int dissect_lbmr_tnwg(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_tmr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
-    gint namelen = 0;
+    int namelen = 0;
     int name_offset = 0;
     char * name = NULL;
     proto_item * ti = NULL;
@@ -3432,14 +3432,14 @@ static int dissect_lbmr_tmr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
         &hf_lbmr_tmr_flags_wildcard_regex,
         NULL
     };
-    guint16 tmr_len;
-    guint8 tmr_type;
-    guint8 tmr_flags;
+    uint16_t tmr_len;
+    uint8_t tmr_type;
+    uint8_t tmr_flags;
     const char * info_string = "";
 
     tmr_len = tvb_get_ntohs(tvb, offset + O_LBMR_TMR_T_LEN);
-    tmr_type = tvb_get_guint8(tvb, offset + O_LBMR_TMR_T_TYPE);
-    tmr_flags = tvb_get_guint8(tvb, offset + O_LBMR_TMR_T_FLAGS);
+    tmr_type = tvb_get_uint8(tvb, offset + O_LBMR_TMR_T_TYPE);
+    tmr_flags = tvb_get_uint8(tvb, offset + O_LBMR_TMR_T_FLAGS);
     name_offset = offset + L_LBMR_TMR_T;
 
     name = tvb_get_stringz_enc(wmem_packet_scope(), tvb, name_offset, &namelen, ENC_ASCII);
@@ -3478,7 +3478,7 @@ static int dissect_lbmr_tmb(tvbuff_t * tvb, int offset, packet_info * pinfo, pro
     proto_tree * tmr_tree = NULL;
     proto_item * tmr_ti = NULL;
     int tmr_count = 0;
-    guint16 tmrs;
+    uint16_t tmrs;
     int len_dissected;
 
     tmrs = tvb_get_ntohs(tvb, offset + O_LBMR_TMB_T_TMRS);
@@ -3504,19 +3504,19 @@ static int dissect_lbmr_tmb(tvbuff_t * tvb, int offset, packet_info * pinfo, pro
 /*----------------------------------------------------------------------------*/
 /* LBMR Topic Query Record dissection functions.                              */
 /*----------------------------------------------------------------------------*/
-static int dissect_lbmr_tqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, gboolean wildcard_tqr, lbmr_contents_t * contents)
+static int dissect_lbmr_tqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, bool wildcard_tqr, lbmr_contents_t * contents)
 {
-    gint namelen = 0;
-    guint reclen = 0;
+    int namelen = 0;
+    unsigned reclen = 0;
     char * name = NULL;
-    guint8 pattern_type;
+    uint8_t pattern_type;
     proto_item * tqr_item = NULL;
     proto_tree * tqr_tree = NULL;
-    gint name_offset = offset;
+    int name_offset = offset;
 
     if (wildcard_tqr)
     {
-        pattern_type = tvb_get_guint8(tvb, offset);
+        pattern_type = tvb_get_uint8(tvb, offset);
         name_offset++;
         reclen++;
     }
@@ -3546,8 +3546,8 @@ static int dissect_lbmr_tqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return (reclen);
 }
 
-static int dissect_lbmr_tqrs(tvbuff_t * tvb, int offset, guint8 tqr_count, packet_info * pinfo, proto_tree * tree,
-    gboolean wildcard_tqr, lbmr_contents_t * contents)
+static int dissect_lbmr_tqrs(tvbuff_t * tvb, int offset, uint8_t tqr_count, packet_info * pinfo, proto_tree * tree,
+    bool wildcard_tqr, lbmr_contents_t * contents)
 {
     int start_offset = 0;
     int tqr_len = 0;
@@ -3580,8 +3580,8 @@ static int dissect_lbmr_tqrs(tvbuff_t * tvb, int offset, guint8 tqr_count, packe
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
-    guint8 opt_type = 0;
-    guint8 opt_len = 0;
+    uint8_t opt_type = 0;
+    uint8_t opt_len = 0;
     int opt_total_len = 0;
     int opt_remaining_len = 0;
     int curr_offset = offset;
@@ -3699,8 +3699,8 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi
         proto_item * ei_item = NULL;
         int qname_len;
 
-        opt_type = tvb_get_guint8(tvb, curr_offset + O_LBMR_TOPIC_OPT_T_TYPE);
-        opt_len = tvb_get_guint8(tvb, curr_offset + O_LBMR_TOPIC_OPT_T_LEN);
+        opt_type = tvb_get_uint8(tvb, curr_offset + O_LBMR_TOPIC_OPT_T_TYPE);
+        opt_len = tvb_get_uint8(tvb, curr_offset + O_LBMR_TOPIC_OPT_T_LEN);
         if (opt_len == 0)
         {
             opt_item = proto_tree_add_item(otree, hf_lbmr_topt_unknown, tvb, curr_offset + O_LBMR_TOPIC_OPT_T_TYPE, opt_len, ENC_NA);
@@ -3881,10 +3881,10 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi
 }
 
 static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t transport, lbm_uint8_t transport_len, const char * topic_name,
-    guint32 topic_index, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents, proto_item * transport_len_item)
+    uint32_t topic_index, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents, proto_item * transport_len_item)
 {
     int len = 0;
-    guint64 channel;
+    uint64_t channel;
     proto_item * channel_item = NULL;
     proto_item * ei_item = NULL;
 
@@ -3892,13 +3892,13 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
     {
         case LBMR_TRANSPORT_TCP:
             {
-                guint16 port = 0;
-                guint32 session_id = 0;
+                uint16_t port = 0;
+                uint32_t session_id = 0;
                 proto_item * tcp_item = NULL;
                 proto_tree * tcp_tree = NULL;
                 lbttcp_transport_t * lbttcp_transport = NULL;
 
-                tcp_item = proto_tree_add_item(tree, hf_lbmr_tir_tcp, tvb, offset, (gint) transport_len, ENC_NA);
+                tcp_item = proto_tree_add_item(tree, hf_lbmr_tir_tcp, tvb, offset, (int) transport_len, ENC_NA);
                 tcp_tree = proto_item_add_subtree(tcp_item, ett_lbmr_tir_tcp);
                 if ((transport_len != L_LBMR_TIR_TCP_T) && (transport_len != L_LBMR_TIR_TCP_WITH_SID_T))
                 {
@@ -3929,15 +3929,15 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
             break;
         case LBMR_TRANSPORT_LBTRM:
             {
-                guint16 src_ucast_port = 0;
-                guint16 udp_dest_port = 0;
-                guint32 session_id = 0;
+                uint16_t src_ucast_port = 0;
+                uint16_t udp_dest_port = 0;
+                uint32_t session_id = 0;
                 proto_item * lbtrm_item = NULL;
                 proto_tree * lbtrm_tree = NULL;
                 lbtrm_transport_t * lbtrm_transport = NULL;
                 address multicast_group;
 
-                lbtrm_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtrm, tvb, offset, (gint)transport_len, ENC_NA);
+                lbtrm_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtrm, tvb, offset, (int)transport_len, ENC_NA);
                 lbtrm_tree = proto_item_add_subtree(lbtrm_item, ett_lbmr_tir_lbtrm);
                 set_address_tvb(&multicast_group, AT_IPv4, L_LBMR_TIR_LBTRM_T_MCAST_ADDR, tvb, offset + O_LBMR_TIR_LBTRM_T_MCAST_ADDR);
                 session_id = tvb_get_ntohl(tvb, offset + O_LBMR_TIR_LBTRM_T_SESSION_ID);
@@ -3960,13 +3960,13 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
             break;
         case LBMR_TRANSPORT_LBTRU:
             {
-                guint32 session_id;
-                guint16 port;
+                uint32_t session_id;
+                uint16_t port;
                 proto_item * lbtru_item = NULL;
                 proto_tree * lbtru_tree = NULL;
                 lbtru_transport_t * lbtru_transport = NULL;
 
-                lbtru_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtru, tvb, offset, (gint)transport_len, ENC_NA);
+                lbtru_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtru, tvb, offset, (int)transport_len, ENC_NA);
                 lbtru_tree = proto_item_add_subtree(lbtru_item, ett_lbmr_tir_lbtru);
                 if ((transport_len != L_LBMR_TIR_LBTRU_T) && (transport_len != L_LBMR_TIR_LBTRU_WITH_SID_T))
                 {
@@ -3997,14 +3997,14 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
             break;
         case LBMR_TRANSPORT_LBTIPC:
             {
-                guint32 host_id;
-                guint32 session_id;
-                guint16 xport_id;
+                uint32_t host_id;
+                uint32_t session_id;
+                uint16_t xport_id;
                 proto_item * lbtipc_item = NULL;
                 proto_tree * lbtipc_tree = NULL;
                 lbtipc_transport_t * lbtipc_transport = NULL;
 
-                lbtipc_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtipc, tvb, offset, (gint)transport_len, ENC_NA);
+                lbtipc_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtipc, tvb, offset, (int)transport_len, ENC_NA);
                 lbtipc_tree = proto_item_add_subtree(lbtipc_item, ett_lbmr_tir_lbtipc);
                 if (transport_len != L_LBMR_TIR_LBTIPC_T)
                 {
@@ -4025,14 +4025,14 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
             break;
         case LBMR_TRANSPORT_LBTRDMA:
             {
-                guint32 session_id;
-                guint16 port;
+                uint32_t session_id;
+                uint16_t port;
                 proto_item * lbtrdma_item = NULL;
                 proto_tree * lbtrdma_tree = NULL;
                 lbtrdma_transport_t * lbtrdma_transport = NULL;
                 address source_addr;
 
-                lbtrdma_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtrdma, tvb, offset, (gint)transport_len, ENC_NA);
+                lbtrdma_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtrdma, tvb, offset, (int)transport_len, ENC_NA);
                 lbtrdma_tree = proto_item_add_subtree(lbtrdma_item, ett_lbmr_tir_lbtrdma);
                 if (transport_len != L_LBMR_TIR_LBTRDMA_T)
                 {
@@ -4053,14 +4053,14 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
             break;
         case LBMR_TRANSPORT_LBTSMX:
             {
-                guint32 host_id;
-                guint32 session_id;
-                guint16 xport_id;
+                uint32_t host_id;
+                uint32_t session_id;
+                uint16_t xport_id;
                 proto_item * lbtsmx_item = NULL;
                 proto_tree * lbtsmx_tree = NULL;
                 lbtsmx_transport_t * lbtsmx_transport = NULL;
 
-                lbtsmx_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtsmx, tvb, offset, (gint)transport_len, ENC_NA);
+                lbtsmx_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtsmx, tvb, offset, (int)transport_len, ENC_NA);
                 lbtsmx_tree = proto_item_add_subtree(lbtsmx_item, ett_lbmr_tir_lbtsmx);
                 if (transport_len != L_LBMR_TIR_LBTSMX_T)
                 {
@@ -4096,17 +4096,17 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr
 
 static int dissect_lbmr_tir_entry(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
 {
-    gint namelen = 0;
-    gint reclen = 0;
+    int namelen = 0;
+    int reclen = 0;
     int dissect_len = 0;
     int tinfo_offset = 0;
     char * name = NULL;
     proto_item * ti = NULL;
     proto_tree * tinfo_tree = NULL;
-    guint8 transport;
-    guint8 tlen;
-    guint16 ttl;
-    guint32 idx;
+    uint8_t transport;
+    uint8_t tlen;
+    uint16_t ttl;
+    uint32_t idx;
     int curr_offset;
     proto_item * transport_len_item = NULL;
 
@@ -4114,8 +4114,8 @@ static int dissect_lbmr_tir_entry(tvbuff_t * tvb, int offset, packet_info * pinf
     reclen += namelen;
     curr_offset = offset + namelen;
     tinfo_offset = curr_offset;
-    transport = tvb_get_guint8(tvb, curr_offset + O_LBMR_TIR_T_TRANSPORT);
-    tlen = tvb_get_guint8(tvb, curr_offset + O_LBMR_TIR_T_TLEN);
+    transport = tvb_get_uint8(tvb, curr_offset + O_LBMR_TIR_T_TRANSPORT);
+    tlen = tvb_get_uint8(tvb, curr_offset + O_LBMR_TIR_T_TLEN);
     ttl = tvb_get_ntohs(tvb, curr_offset + O_LBMR_TIR_T_TTL);
     idx = tvb_get_ntohl(tvb, curr_offset + O_LBMR_TIR_T_INDEX);
     reclen += L_LBMR_TIR_T;
@@ -4141,7 +4141,7 @@ static int dissect_lbmr_tir_entry(tvbuff_t * tvb, int offset, packet_info * pinf
     return (reclen);
 }
 
-static int dissect_lbmr_tirs(tvbuff_t * tvb, int offset, guint16 tir_count, packet_info * pinfo, proto_tree * tree,
+static int dissect_lbmr_tirs(tvbuff_t * tvb, int offset, uint16_t tir_count, packet_info * pinfo, proto_tree * tree,
     const char * name, lbmr_contents_t * contents)
 {
     int start_offset;
@@ -4168,8 +4168,8 @@ static int dissect_lbmr_tirs(tvbuff_t * tvb, int offset, guint16 tir_count, pack
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_qqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, lbmr_contents_t * contents)
 {
-    gint namelen = 0;
-    guint reclen = 0;
+    int namelen = 0;
+    unsigned reclen = 0;
     char * name = NULL;
 
     name = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &namelen, ENC_ASCII);
@@ -4179,7 +4179,7 @@ static int dissect_lbmr_qqr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return (reclen);
 }
 
-static int dissect_lbmr_qqrs(tvbuff_t * tvb, int offset, guint8 qqr_count, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
+static int dissect_lbmr_qqrs(tvbuff_t * tvb, int offset, uint8_t qqr_count, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
 {
     int start_offset;
     int qqr_len;
@@ -4206,7 +4206,7 @@ static int dissect_lbmr_qqrs(tvbuff_t * tvb, int offset, guint8 qqr_count, packe
 static int dissect_lbmr_qir_queue_blk(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree, const char * queue_name,
     const char * topic_name, lbmr_contents_t * contents)
 {
-    guint16 port = 0;
+    uint16_t port = 0;
     proto_item * ti = NULL;
     proto_tree * blk_tree = NULL;
 
@@ -4226,8 +4226,8 @@ static int dissect_lbmr_qir_grp_blk(tvbuff_t * tvb, int offset, packet_info * pi
 {
     proto_item * ti = NULL;
     proto_tree * blk_tree = NULL;
-    guint16 idx = 0;
-    guint16 sz = 0;
+    uint16_t idx = 0;
+    uint16_t sz = 0;
 
     idx = tvb_get_ntohs(tvb, offset + O_LBMR_QIR_GRP_BLK_T_GRP_IDX);
     sz = tvb_get_ntohs(tvb, offset + O_LBMR_QIR_GRP_BLK_T_GRP_SZ);
@@ -4240,13 +4240,13 @@ static int dissect_lbmr_qir_grp_blk(tvbuff_t * tvb, int offset, packet_info * pi
 
 static int dissect_lbmr_qir_entry(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
 {
-    gint qnamelen = 0;
-    gint qnameoffset = 0;
+    int qnamelen = 0;
+    int qnameoffset = 0;
     char * qname = NULL;
-    gint tnamelen = 0;
-    gint tnameoffset = 0;
+    int tnamelen = 0;
+    int tnameoffset = 0;
     char * tname = NULL;
-    gint reclen = 0;
+    int reclen = 0;
     int curr_offset = 0;
     proto_item * qirti = NULL;
     proto_tree * qirtree = NULL;
@@ -4256,10 +4256,10 @@ static int dissect_lbmr_qir_entry(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item * queueti = NULL;
     proto_item * queuetree = NULL;
     int queuelen = 0;
-    guint32 queue_id = 0;
-    guint16 grp_blks = 0;
-    guint16 queue_blks = 0;
-    guint16 have_options = 0;
+    uint32_t queue_id = 0;
+    uint16_t grp_blks = 0;
+    uint16_t queue_blks = 0;
+    uint16_t have_options = 0;
     int optlen = 0;
 
     /*
@@ -4336,7 +4336,7 @@ static int dissect_lbmr_qir_entry(tvbuff_t * tvb, int offset, packet_info * pinf
     return (reclen);
 }
 
-static int dissect_lbmr_qirs(tvbuff_t * tvb, int offset, guint16 qirs, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
+static int dissect_lbmr_qirs(tvbuff_t * tvb, int offset, uint16_t qirs, packet_info * pinfo, proto_tree * tree, lbmr_contents_t * contents)
 {
     int start_offset;
     int qir_len;
@@ -4371,7 +4371,7 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         NULL
     };
     int curr_offset = offset;
-    guint16 flags_val = 0;
+    uint16_t flags_val = 0;
 
     hdr_len = (int)tvb_get_ntohs(tvb, curr_offset + O_LBMR_PSER_T_LEN);
     flags_val = tvb_get_ntohs(tvb, curr_offset + O_LBMR_PSER_T_FLAGS);
@@ -4394,7 +4394,7 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         proto_item * opts_item = NULL;
         proto_tree * optlen_tree = NULL;
         proto_tree * optlen_item = NULL;
-        guint16 opt_len = 0;
+        uint16_t opt_len = 0;
 
         opt_len = tvb_get_ntohs(tvb, curr_offset + O_LBMR_PSER_OPTLEN_T_OPTLEN);
         opts_item = proto_tree_add_item(tree, hf_lbmr_pser_opts, tvb, curr_offset, -1, ENC_NA);
@@ -4411,8 +4411,8 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         {
             proto_tree * ctxinst_tree = NULL;
             proto_item * ctxinst_item = NULL;
-            guint8 opt_type = tvb_get_guint8(tvb, curr_offset + O_LBMR_PSER_OPT_HDR_T_TYPE);
-            guint8 option_len = tvb_get_guint8(tvb, curr_offset + O_LBMR_PSER_OPT_HDR_T_LEN);
+            uint8_t opt_type = tvb_get_uint8(tvb, curr_offset + O_LBMR_PSER_OPT_HDR_T_TYPE);
+            uint8_t option_len = tvb_get_uint8(tvb, curr_offset + O_LBMR_PSER_OPT_HDR_T_LEN);
 
             switch (opt_type)
             {
@@ -4447,11 +4447,11 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
 /*----------------------------------------------------------------------------*/
 int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
-    guint8 pckt_type = 0;
+    uint8_t pckt_type = 0;
     int curr_offset = 0;
-    guint16 dep16;
-    guint16 idx;
-    guint8 flags_val = 0;
+    uint16_t dep16;
+    uint16_t idx;
+    uint8_t flags_val = 0;
     int len_dissected = 0;
     static int * const flags[] =
     {
@@ -4468,8 +4468,8 @@ int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, prot
         NULL
     };
 
-    flags_val = tvb_get_guint8(tvb, offset + O_UMQ_QMGMT_HDR_T_FLAGS);
-    pckt_type = tvb_get_guint8(tvb, offset + O_UMQ_QMGMT_HDR_T_PCKT_TYPE);
+    flags_val = tvb_get_uint8(tvb, offset + O_UMQ_QMGMT_HDR_T_FLAGS);
+    pckt_type = tvb_get_uint8(tvb, offset + O_UMQ_QMGMT_HDR_T_PCKT_TYPE);
     dep16 = tvb_get_ntohs(tvb, offset + O_UMQ_QMGMT_HDR_T_PCKT_TYPE_DEP16);
     if (pckt_type == UMQ_QMGMT_HDR_PCKT_TYPE_IL)
     {
@@ -4610,8 +4610,8 @@ int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, prot
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
-    guint16 flags16 = 0;
-    guint8 reclen = 0;
+    uint16_t flags16 = 0;
+    uint8_t reclen = 0;
     static int * const flags[] =
     {
         &hf_lbmr_ctxinfo_flags_query,
@@ -4625,7 +4625,7 @@ static int dissect_lbmr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo
     };
 
     flags16 = tvb_get_ntohs(tvb, offset + O_LBMR_CTXINFO_T_FLAGS);
-    reclen = tvb_get_guint8(tvb, offset + O_LBMR_CTXINFO_T_LEN);
+    reclen = tvb_get_uint8(tvb, offset + O_LBMR_CTXINFO_T_LEN);
     proto_tree_add_item(tree, hf_lbmr_ctxinfo_len, tvb, offset + O_LBMR_CTXINFO_T_LEN, L_LBMR_CTXINFO_T_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(tree, hf_lbmr_ctxinfo_hop_count, tvb, offset + O_LBMR_CTXINFO_T_HOP_COUNT, L_LBMR_CTXINFO_T_HOP_COUNT, ENC_BIG_ENDIAN);
     proto_tree_add_bitmask(tree, tvb, offset + O_LBMR_CTXINFO_T_FLAGS, hf_lbmr_ctxinfo_flags, ett_lbmr_ctxinfo_flags, flags, ENC_BIG_ENDIAN);
@@ -4665,10 +4665,10 @@ static int dissect_lbmr_topic_res_request(tvbuff_t * tvb, int offset, packet_inf
 /*----------------------------------------------------------------------------*/
 static int dissect_lbmr_remote_domain_route(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
-    guint16 num_domains;
+    uint16_t num_domains;
     int len_dissected = 0;
     int ofs = 0;
-    guint16 idx;
+    uint16_t idx;
 
     num_domains = tvb_get_ntohs(tvb, offset + O_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_NUM_DOMAINS);
     proto_tree_add_item(tree, hf_lbmr_remote_domain_route_hdr_num_domains, tvb, offset + O_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_NUM_DOMAINS, L_LBMR_REMOTE_DOMAIN_ROUTE_HDR_T_NUM_DOMAINS, ENC_BIG_ENDIAN);
@@ -4711,9 +4711,9 @@ static int dissect_lbmr_rctxinfo_rec_instance_opt(tvbuff_t * tvb, int offset, pa
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 len = 0;
+    uint8_t len = 0;
 
-    len = tvb_get_guint8(tvb, offset + O_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_LEN);
+    len = tvb_get_uint8(tvb, offset + O_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_LEN);
     subtree_item = proto_tree_add_item(tree, hf_lbmr_rctxinfo_rec_instance, tvb, offset, (int)len, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmr_rctxinfo_rec_instance);
     proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_instance_type, tvb, offset + O_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_TYPE, L_LBMR_RCTXINFO_REC_INSTANCE_OPT_T_TYPE, ENC_BIG_ENDIAN);
@@ -4727,9 +4727,9 @@ static int dissect_lbmr_rctxinfo_rec_odomain_opt(tvbuff_t * tvb, int offset, pac
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 len = 0;
+    uint8_t len = 0;
 
-    len = tvb_get_guint8(tvb, offset + O_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_LEN);
+    len = tvb_get_uint8(tvb, offset + O_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_LEN);
     subtree_item = proto_tree_add_item(tree, hf_lbmr_rctxinfo_rec_odomain, tvb, offset, (int)len, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmr_rctxinfo_rec_odomain);
     proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_odomain_type, tvb, offset + O_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_TYPE, L_LBMR_RCTXINFO_REC_ODOMAIN_OPT_T_TYPE, ENC_BIG_ENDIAN);
@@ -4743,10 +4743,10 @@ static int dissect_lbmr_rctxinfo_rec_name_opt(tvbuff_t * tvb, int offset, packet
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 len = 0;
+    uint8_t len = 0;
     int name_len = 0;
 
-    len = tvb_get_guint8(tvb, offset + O_LBMR_RCTXINFO_REC_NAME_OPT_T_LEN);
+    len = tvb_get_uint8(tvb, offset + O_LBMR_RCTXINFO_REC_NAME_OPT_T_LEN);
     subtree_item = proto_tree_add_item(tree, hf_lbmr_rctxinfo_rec_name, tvb, offset, (int)len, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmr_rctxinfo_rec_name);
     proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_name_type, tvb, offset + O_LBMR_RCTXINFO_REC_NAME_OPT_T_TYPE, L_LBMR_RCTXINFO_REC_NAME_OPT_T_TYPE, ENC_BIG_ENDIAN);
@@ -4761,12 +4761,12 @@ static int dissect_lbmr_rctxinfo_rec_unknown_opt(tvbuff_t * tvb, int offset, pac
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 len = 0;
+    uint8_t len = 0;
     int data_len = 0;
-    guint8 opt_type;
+    uint8_t opt_type;
 
-    opt_type = tvb_get_guint8(tvb, offset + O_LBMR_RCTXINFO_REC_OPT_T_TYPE);
-    len = tvb_get_guint8(tvb, offset + O_LBMR_RCTXINFO_REC_OPT_T_LEN);
+    opt_type = tvb_get_uint8(tvb, offset + O_LBMR_RCTXINFO_REC_OPT_T_TYPE);
+    len = tvb_get_uint8(tvb, offset + O_LBMR_RCTXINFO_REC_OPT_T_LEN);
     subtree_item = proto_tree_add_item(tree, hf_lbmr_rctxinfo_rec_unknown, tvb, offset, (int)len, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmr_rctxinfo_rec_unknown);
     proto_tree_add_item(subtree, hf_lbmr_rctxinfo_rec_unknown_type, tvb, offset + O_LBMR_RCTXINFO_REC_OPT_T_TYPE, L_LBMR_RCTXINFO_REC_OPT_T_TYPE, ENC_BIG_ENDIAN);
@@ -4785,13 +4785,13 @@ static int dissect_lbmr_rctxinfo_rec(tvbuff_t * tvb, int offset, packet_info * p
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 opt_type = 0;
+    uint8_t opt_type = 0;
     static int * const flags[] =
     {
         &hf_lbmr_rctxinfo_rec_flags_query,
         NULL
     };
-    guint16 len = 0;
+    uint16_t len = 0;
     int rec_len_remaining = 0;
     int ofs = 0;
     int opt_len_dissected = 0;
@@ -4807,7 +4807,7 @@ static int dissect_lbmr_rctxinfo_rec(tvbuff_t * tvb, int offset, packet_info * p
     len_dissected = L_LBMR_RCTXINFO_REC_T;
     while (rec_len_remaining > 0)
     {
-        opt_type = tvb_get_guint8(tvb, ofs + O_LBMR_RCTXINFO_REC_OPT_T_TYPE);
+        opt_type = tvb_get_uint8(tvb, ofs + O_LBMR_RCTXINFO_REC_OPT_T_TYPE);
         switch (opt_type)
         {
             case LBMR_RCTXINFO_OPT_ADDRESS_TYPE:
@@ -4836,7 +4836,7 @@ static int dissect_lbmr_rctxinfo_rec(tvbuff_t * tvb, int offset, packet_info * p
 
 static int dissect_lbmr_rctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
-    guint16 num_recs = 0;
+    uint16_t num_recs = 0;
     int ofs = 0;
     int len_dissected = 0;
     int rec_len_dissected = 0;
@@ -4967,15 +4967,15 @@ static int dissect_lbmr_opt_unknown(tvbuff_t * tvb, int offset, packet_info * pi
 {
     proto_tree * subtree = NULL;
     proto_item * subtree_item = NULL;
-    guint8 len = 0;
+    uint8_t len = 0;
     proto_item * type_item = NULL;
-    guint8 opt_type = 0;
+    uint8_t opt_type = 0;
 
     subtree_item = proto_tree_add_item(tree, hf_lbmr_opt_unknown, tvb, offset, -1, ENC_NA);
     subtree = proto_item_add_subtree(subtree_item, ett_lbmr_opt_unknown);
-    opt_type = tvb_get_guint8(tvb, offset + O_LBMR_LBMR_OPT_HDR_T_TYPE);
+    opt_type = tvb_get_uint8(tvb, offset + O_LBMR_LBMR_OPT_HDR_T_TYPE);
     type_item = proto_tree_add_item(subtree, hf_lbmr_opt_unknown_type, tvb, offset + O_LBMR_LBMR_OPT_HDR_T_TYPE, L_LBMR_LBMR_OPT_HDR_T_TYPE, ENC_BIG_ENDIAN);
-    len = tvb_get_guint8(tvb, offset + O_LBMR_LBMR_OPT_HDR_T_LEN);
+    len = tvb_get_uint8(tvb, offset + O_LBMR_LBMR_OPT_HDR_T_LEN);
     proto_tree_add_item(subtree, hf_lbmr_opt_unknown_len, tvb, offset + O_LBMR_LBMR_OPT_HDR_T_LEN, L_LBMR_LBMR_OPT_HDR_T_LEN, ENC_BIG_ENDIAN);
     proto_tree_add_item(subtree, hf_lbmr_opt_unknown_flags, tvb, offset + O_LBMR_LBMR_OPT_HDR_T_FLAGS, L_LBMR_LBMR_OPT_HDR_T_FLAGS, ENC_NA);
     proto_tree_add_item(subtree, hf_lbmr_opt_unknown_data, tvb, offset + L_LBMR_LBMR_OPT_HDR_T, (int) len - L_LBMR_LBMR_OPT_HDR_T, ENC_NA);
@@ -4996,9 +4996,9 @@ static int dissect_lbmr_options(tvbuff_t * tvb, int offset, packet_info * pinfo,
     while (tvb_reported_length_remaining(tvb, curr_offset) > 0)
     {
         int opt_len;
-        guint8 opt_type;
+        uint8_t opt_type;
 
-        opt_type = tvb_get_guint8(tvb, curr_offset + O_LBMR_LBMR_OPT_HDR_T_TYPE);
+        opt_type = tvb_get_uint8(tvb, curr_offset + O_LBMR_LBMR_OPT_HDR_T_TYPE);
         switch (opt_type)
         {
             case LBMR_LBMR_OPT_LEN_TYPE:
@@ -5041,8 +5041,8 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c
                 while (tqr != NULL)
                 {
                     lbm_lbmr_topic_query_tap_info_t * tqr_tap = wmem_new0(wmem_packet_scope(), lbm_lbmr_topic_query_tap_info_t);
-                    tqr_tap->size = (guint16) sizeof(lbm_lbmr_topic_query_tap_info_t);
-                    tqr_tap->topic_length = (guint8)strlen(tqr->topic);
+                    tqr_tap->size = (uint16_t) sizeof(lbm_lbmr_topic_query_tap_info_t);
+                    tqr_tap->topic_length = (uint8_t)strlen(tqr->topic);
                     memcpy(tqr_tap->topic, tqr->topic, tqr_tap->topic_length);
                     tap_queue_packet(lbmr_topic_query_tap_handle, pinfo, (void *) tqr_tap);
                     tqr = tqr->next;
@@ -5054,9 +5054,9 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c
                 while (tir != NULL)
                 {
                     lbm_lbmr_topic_advertisement_tap_info_t * tir_tap = wmem_new0(wmem_packet_scope(), lbm_lbmr_topic_advertisement_tap_info_t);
-                    tir_tap->size = (guint16) sizeof(lbm_lbmr_topic_advertisement_tap_info_t);
-                    tir_tap->topic_length = (guint8)strlen(tir->topic);
-                    tir_tap->source_length = (guint8)strlen(tir->source_string);
+                    tir_tap->size = (uint16_t) sizeof(lbm_lbmr_topic_advertisement_tap_info_t);
+                    tir_tap->topic_length = (uint8_t)strlen(tir->topic);
+                    tir_tap->source_length = (uint8_t)strlen(tir->source_string);
                     tir_tap->topic_index = tir->idx;
                     memcpy(tir_tap->topic, tir->topic, tir_tap->topic_length);
                     memcpy(tir_tap->source, tir->source_string, tir_tap->source_length);
@@ -5070,9 +5070,9 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c
                 while (wctqr != NULL)
                 {
                     lbm_lbmr_pattern_query_tap_info_t * wctqr_tap = wmem_new0(wmem_packet_scope(), lbm_lbmr_pattern_query_tap_info_t);
-                    wctqr_tap->size = (guint16) sizeof(lbm_lbmr_pattern_query_tap_info_t);
+                    wctqr_tap->size = (uint16_t) sizeof(lbm_lbmr_pattern_query_tap_info_t);
                     wctqr_tap->type = wctqr->type;
-                    wctqr_tap->pattern_length = (guint8)strlen(wctqr->pattern);
+                    wctqr_tap->pattern_length = (uint8_t)strlen(wctqr->pattern);
                     memcpy(wctqr_tap->pattern, wctqr->pattern, wctqr_tap->pattern_length);
                     tap_queue_packet(lbmr_pattern_query_tap_handle, pinfo, (void *) wctqr_tap);
                     wctqr = wctqr->next;
@@ -5087,8 +5087,8 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c
                 while (qqr != NULL)
                 {
                     lbm_lbmr_queue_query_tap_info_t * qqr_tap = wmem_new0(wmem_packet_scope(), lbm_lbmr_queue_query_tap_info_t);
-                    qqr_tap->size = (guint16) sizeof(lbm_lbmr_queue_query_tap_info_t);
-                    qqr_tap->queue_length = (guint8)strlen(qqr->queue);
+                    qqr_tap->size = (uint16_t) sizeof(lbm_lbmr_queue_query_tap_info_t);
+                    qqr_tap->queue_length = (uint8_t)strlen(qqr->queue);
                     memcpy(qqr_tap->queue, qqr->queue, qqr_tap->queue_length);
                     tap_queue_packet(lbmr_queue_advertisement_tap_handle, pinfo, (void *) qqr_tap);
                     qqr = qqr->next;
@@ -5100,10 +5100,10 @@ static void lbmr_tap_queue_packet(packet_info * pinfo, const lbmr_contents_t * c
                 while (qir != NULL)
                 {
                     lbm_lbmr_queue_advertisement_tap_info_t * qir_tap = wmem_new0(wmem_packet_scope(), lbm_lbmr_queue_advertisement_tap_info_t);
-                    qir_tap->size = (guint16) sizeof(lbm_lbmr_queue_advertisement_tap_info_t);
+                    qir_tap->size = (uint16_t) sizeof(lbm_lbmr_queue_advertisement_tap_info_t);
                     qir_tap->port = qir->port;
-                    qir_tap->queue_length = (guint8)strlen(qir->queue);
-                    qir_tap->topic_length = (guint8)strlen(qir->topic);
+                    qir_tap->queue_length = (uint8_t)strlen(qir->queue);
+                    qir_tap->topic_length = (uint8_t)strlen(qir->topic);
                     memcpy(qir_tap->queue, qir->queue, qir_tap->queue_length);
                     memcpy(qir_tap->topic, qir->topic, qir_tap->topic_length);
                     tap_queue_packet(lbmr_queue_query_tap_handle, pinfo, (void *) qir_tap);
@@ -5124,9 +5124,9 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     proto_tree * lbmr_tree = NULL;
     proto_item * ti = NULL;
     int offset = 0;
-    guint8 ver_type;
-    guint8 ver;
-    guint8 type;
+    uint8_t ver_type;
+    uint8_t ver;
+    uint8_t type;
     lbmr_contents_t * contents = NULL;
     char * tag_name = NULL;
     int total_len_dissected = 0;
@@ -5147,7 +5147,7 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     }
     col_set_fence(pinfo->cinfo, COL_INFO);
 
-    ver_type = tvb_get_guint8(tvb, O_LBMR_HDR_T_VER_TYPE);
+    ver_type = tvb_get_uint8(tvb, O_LBMR_HDR_T_VER_TYPE);
     ver = LBMR_HDR_VER(ver_type);
     type = LBMR_HDR_TYPE(ver_type);
     offset = 0;
@@ -5156,21 +5156,21 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
     if ((ver_type & LBMR_HDR_TYPE_OPTS_MASK) != 0)
     {
-        guint8 opt_type;
-        guint8 opt_len;
+        uint8_t opt_type;
+        uint8_t opt_len;
 
-        opt_type = tvb_get_guint8(tvb, -L_LBMR_LBMR_OPT_LEN_T + O_LBMR_LBMR_OPT_LEN_T_TYPE);
-        opt_len = tvb_get_guint8(tvb, -L_LBMR_LBMR_OPT_LEN_T + O_LBMR_LBMR_OPT_LEN_T_LEN);
-        if ((opt_type == LBMR_LBMR_OPT_LEN_TYPE) && (((gint)opt_len) == L_LBMR_LBMR_OPT_LEN_T))
+        opt_type = tvb_get_uint8(tvb, -L_LBMR_LBMR_OPT_LEN_T + O_LBMR_LBMR_OPT_LEN_T_TYPE);
+        opt_len = tvb_get_uint8(tvb, -L_LBMR_LBMR_OPT_LEN_T + O_LBMR_LBMR_OPT_LEN_T_LEN);
+        if ((opt_type == LBMR_LBMR_OPT_LEN_TYPE) && (((int)opt_len) == L_LBMR_LBMR_OPT_LEN_T))
         {
-            gint opt_total_len = 0;
-            gint packet_len;
+            int opt_total_len = 0;
+            int packet_len;
 
             packet_len = tvb_reported_length_remaining(tvb, 0);
             opt_total_len = tvb_get_ntohis(tvb, -L_LBMR_LBMR_OPT_LEN_T + O_LBMR_LBMR_OPT_LEN_T_TOTAL_LEN);
             if (packet_len > opt_total_len)
             {
-                gint tvb_len = packet_len - opt_total_len;
+                int tvb_len = packet_len - opt_total_len;
 
                 packet_tvb = tvb_new_subset_length(tvb, 0, tvb_len);
             }
@@ -5179,11 +5179,11 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
     if (type == LBMR_HDR_TYPE_EXT)
     {
-        guint8 ext_type = 0;
-        const gchar * ext_string;
+        uint8_t ext_type = 0;
+        const char * ext_string;
         proto_item * ext_type_item = NULL;
 
-        ext_type = tvb_get_guint8(tvb, O_LBMR_HDR_EXT_TYPE_T_EXT_TYPE);
+        ext_type = tvb_get_uint8(tvb, O_LBMR_HDR_EXT_TYPE_T_EXT_TYPE);
         ext_string = val_to_str(ext_type, lbmr_ext_packet_type, "Unknown(0x%02x)");
         col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "ExtType %s", ext_string);
         if (tag_name != NULL)
@@ -5245,31 +5245,31 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     }
     else
     {
-        guint8 tqrs = 0;
-        guint16 tirs = 0;
-        gboolean rd_keepalive = FALSE;
-        gboolean topic_mgmt = FALSE;
-        gboolean client_rd_keepalive = FALSE;
-        gboolean zero_tirs_tqrs = FALSE;
+        uint8_t tqrs = 0;
+        uint16_t tirs = 0;
+        bool rd_keepalive = false;
+        bool topic_mgmt = false;
+        bool client_rd_keepalive = false;
+        bool zero_tirs_tqrs = false;
         proto_item * type_item = NULL;
 
-        tqrs = tvb_get_guint8(tvb, O_LBMR_HDR_T_TQRS);
+        tqrs = tvb_get_uint8(tvb, O_LBMR_HDR_T_TQRS);
         tirs = tvb_get_ntohs(tvb, O_LBMR_HDR_T_TIRS);
         if ((tqrs == 0) && (tirs == 0))
         {
-            zero_tirs_tqrs = TRUE;
+            zero_tirs_tqrs = true;
         }
         if ((type == LBMR_HDR_TYPE_NORMAL) && zero_tirs_tqrs)
         {
-            rd_keepalive = TRUE;
+            rd_keepalive = true;
         }
         else if (zero_tirs_tqrs && ((type == LBMR_HDR_TYPE_UCAST_RCV_ALIVE) || (type == LBMR_HDR_TYPE_UCAST_SRC_ALIVE)))
         {
-            client_rd_keepalive = TRUE;
+            client_rd_keepalive = true;
         }
         else if (type == LBMR_HDR_TYPE_TOPIC_MGMT)
         {
-            topic_mgmt = TRUE;
+            topic_mgmt = true;
         }
         switch (type)
         {
@@ -5406,11 +5406,11 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                     contents->type = LBMR_CONTENTS_TOPIC;
                     if (tqrs > 0)
                     {
-                        gboolean wc_tqrs = FALSE;
+                        bool wc_tqrs = false;
 
                         if (type == LBMR_HDR_TYPE_WC_TQRS)
                         {
-                            wc_tqrs = TRUE;
+                            wc_tqrs = true;
                         }
                         len_dissected = dissect_lbmr_tqrs(packet_tvb, offset, tqrs, pinfo, lbmr_tree, wc_tqrs, contents);
                         total_len_dissected += len_dissected;
@@ -5450,7 +5450,7 @@ static int dissect_lbmr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 static bool test_lbmr_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data _U_)
 {
     lbmr_tag_entry_t entry;
-    gboolean valid_packet = FALSE;
+    bool valid_packet = false;
 
     /* Must be a UDP packet. */
     if (pinfo->ptype != PT_UDP)
@@ -5467,7 +5467,7 @@ static bool test_lbmr_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * t
     {
         if (lbmr_tag_find(pinfo) != NULL)
         {
-            valid_packet = TRUE;
+            valid_packet = true;
         }
     }
     else
@@ -6374,7 +6374,7 @@ void proto_register_lbmr(void)
         { &hf_qmgmt_qname,
             { "Queue Name", "lbmr.qmgmt.qname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbmr,
         &ett_lbmr_hdr,
@@ -6490,7 +6490,7 @@ void proto_register_lbmr(void)
         { &ei_lbmr_analysis_zero_len_option, { "lbmr.analysis.zero_len_option", PI_MALFORMED, PI_ERROR, "Zero-length LBMR option", EXPFILL } },
     };
     module_t * lbmr_module;
-    guint32 addr;
+    uint32_t addr;
     uat_t * tag_uat;
     expert_module_t * expert_lbmr;
 
@@ -6564,7 +6564,7 @@ void proto_register_lbmr(void)
     tag_uat = uat_new("LBMR tag definitions",
         sizeof(lbmr_tag_entry_t),
         "lbmr_domains",
-        TRUE,
+        true,
         (void * *)&lbmr_tag_entry,
         &lbmr_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -6674,8 +6674,8 @@ void proto_register_lbmr(void)
 /* The registration hand-off routine */
 void proto_reg_handoff_lbmr(void)
 {
-    static gboolean already_registered = FALSE;
-    guint32 addr;
+    static bool already_registered = false;
+    uint32_t addr;
 
     if (!already_registered)
     {
@@ -6702,7 +6702,7 @@ void proto_reg_handoff_lbmr(void)
     lbmr_uc_address_host = g_ntohl(addr);
     lbmr_use_tag = global_lbmr_use_tag;
 
-    already_registered = TRUE;
+    already_registered = true;
 }
 
 /*
diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c
index e3d71aff54..1083dd5ed5 100644
--- a/epan/dissectors/packet-lbmsrs.c
+++ b/epan/dissectors/packet-lbmsrs.c
@@ -27,7 +27,7 @@
 
 
 
-static gint proto_lbmsrs;
+static int proto_lbmsrs;
 
 void proto_register_lbmsrs(void);
 void proto_reg_handoff_lbmsrs(void);
@@ -316,12 +316,12 @@ typedef struct
 {
     char * name;
     char * ip_address;
-    guint32 ip_address_val_h;
-    guint32 tcp_port;
+    uint32_t ip_address_val_h;
+    uint32_t tcp_port;
 } lbmsrs_tag_entry_t;
 
 static lbmsrs_tag_entry_t* lbmsrs_tag_entry;
-static guint lbmsrs_tag_count;
+static unsigned lbmsrs_tag_count;
 
 UAT_CSTRING_CB_DEF(lbmsrs_tag, name, lbmsrs_tag_entry_t)
 UAT_IPV4_CB_DEF(lbmsrs_tag, ip_address, lbmsrs_tag_entry_t)
@@ -368,183 +368,183 @@ static const value_string lbmsrsApplicationType[] =
 };
 
 /* Dissector field handles */
-static gint hf_lbmsrs_message_id;
+static int hf_lbmsrs_message_id;
 
 /*handles for registration request*/
-static gint hf_lbmsrs_app_type;
-static gint hf_lbmsrs_client_addr;
-static gint hf_lbmsrs_client_port;
-static gint hf_lbmsrs_session_id;
-static gint hf_lbmsrs_host_id;
-static gint hf_lbmsrs_protocol_version;
-static gint hf_lbmsrs_interest_mode;
-static gint hf_lbmsrs_req_local_domain_id;
+static int hf_lbmsrs_app_type;
+static int hf_lbmsrs_client_addr;
+static int hf_lbmsrs_client_port;
+static int hf_lbmsrs_session_id;
+static int hf_lbmsrs_host_id;
+static int hf_lbmsrs_protocol_version;
+static int hf_lbmsrs_interest_mode;
+static int hf_lbmsrs_req_local_domain_id;
 
 /*handles for registration response*/
-static gint hf_lbmsrs_client_id;
-static gint hf_lbmsrs_resp_local_domain_id;
-static gint hf_lbmsrs_reg_resp_protocol_version;
+static int hf_lbmsrs_client_id;
+static int hf_lbmsrs_resp_local_domain_id;
+static int hf_lbmsrs_reg_resp_protocol_version;
 
 /*handles for stream request*/
-static gint hf_lbmsrs_stream_req_unused;
+static int hf_lbmsrs_stream_req_unused;
 
 /*handles for source info*/
-static gint hf_lbmsrs_sir;
-static gint hf_lbmsrs_sir_otid;
-static gint hf_lbmsrs_sir_topic_len;
-static gint hf_lbmsrs_sir_topic;
-static gint hf_lbmsrs_sir_source_len;
-static gint hf_lbmsrs_sir_source;
-static gint hf_lbmsrs_sir_host_id;
-static gint hf_lbmsrs_sir_topic_idx;
-static gint hf_lbmsrs_sir_functionality_flags;
-static gint hf_lbmsrs_sir_request_ip;
-static gint hf_lbmsrs_sir_request_port;
-static gint hf_lbmsrs_sir_domain_id;
-static gint hf_lbmsrs_sir_encryption;
-static gint hf_lbmsrs_sir_compression;
-static gint hf_lbmsrs_sir_ulb_src_id;
-static gint hf_lbmsrs_sir_ulb_queue_id;
-static gint hf_lbmsrs_sir_ulb_reg_id;
-static gint hf_lbmsrs_sir_context_instance;
-static gint hf_lbmsrs_sir_context_type;
-static gint hf_lbmsrs_sir_version;
-static gint hf_lbmsrs_sir_version_flags;
-static gint hf_lbmsrs_sir_ttl;
-static gint hf_lbmsrs_sir_cost;
+static int hf_lbmsrs_sir;
+static int hf_lbmsrs_sir_otid;
+static int hf_lbmsrs_sir_topic_len;
+static int hf_lbmsrs_sir_topic;
+static int hf_lbmsrs_sir_source_len;
+static int hf_lbmsrs_sir_source;
+static int hf_lbmsrs_sir_host_id;
+static int hf_lbmsrs_sir_topic_idx;
+static int hf_lbmsrs_sir_functionality_flags;
+static int hf_lbmsrs_sir_request_ip;
+static int hf_lbmsrs_sir_request_port;
+static int hf_lbmsrs_sir_domain_id;
+static int hf_lbmsrs_sir_encryption;
+static int hf_lbmsrs_sir_compression;
+static int hf_lbmsrs_sir_ulb_src_id;
+static int hf_lbmsrs_sir_ulb_queue_id;
+static int hf_lbmsrs_sir_ulb_reg_id;
+static int hf_lbmsrs_sir_context_instance;
+static int hf_lbmsrs_sir_context_type;
+static int hf_lbmsrs_sir_version;
+static int hf_lbmsrs_sir_version_flags;
+static int hf_lbmsrs_sir_ttl;
+static int hf_lbmsrs_sir_cost;
 
 /*handles for source delete*/
-static gint hf_lbmsrs_sdr;
-static gint hf_lbmsrs_sdr_otid;
-static gint hf_lbmsrs_sdr_topic_len;
-static gint hf_lbmsrs_sdr_topic;
+static int hf_lbmsrs_sdr;
+static int hf_lbmsrs_sdr_otid;
+static int hf_lbmsrs_sdr_topic_len;
+static int hf_lbmsrs_sdr_topic;
 
 /*handles for receiver info*/
-static gint hf_lbmsrs_rir;
-static gint hf_lbmsrs_rir_topic_len;
-static gint hf_lbmsrs_rir_topic;
-static gint hf_lbmsrs_rir_domain_id;
-static gint hf_lbmsrs_rir_context_instance;
-static gint hf_lbmsrs_rir_context_type;
-static gint hf_lbmsrs_rir_version;
-static gint hf_lbmsrs_rir_version_flags;
-static gint hf_lbmsrs_rir_reserved;
+static int hf_lbmsrs_rir;
+static int hf_lbmsrs_rir_topic_len;
+static int hf_lbmsrs_rir_topic;
+static int hf_lbmsrs_rir_domain_id;
+static int hf_lbmsrs_rir_context_instance;
+static int hf_lbmsrs_rir_context_type;
+static int hf_lbmsrs_rir_version;
+static int hf_lbmsrs_rir_version_flags;
+static int hf_lbmsrs_rir_reserved;
 
 /*handles for receiver delete*/
-static gint hf_lbmsrs_rdr;
-static gint hf_lbmsrs_rdr_topic_len;
-static gint hf_lbmsrs_rdr_topic;
-static gint hf_lbmsrs_rdr_domain_id;
-static gint hf_lbmsrs_rdr_context_instance;
-static gint hf_lbmsrs_rdr_context_type;
-static gint hf_lbmsrs_rdr_version;
-static gint hf_lbmsrs_rdr_version_flags;
-static gint hf_lbmsrs_rdr_reserved;
+static int hf_lbmsrs_rdr;
+static int hf_lbmsrs_rdr_topic_len;
+static int hf_lbmsrs_rdr_topic;
+static int hf_lbmsrs_rdr_domain_id;
+static int hf_lbmsrs_rdr_context_instance;
+static int hf_lbmsrs_rdr_context_type;
+static int hf_lbmsrs_rdr_version;
+static int hf_lbmsrs_rdr_version_flags;
+static int hf_lbmsrs_rdr_reserved;
 
 /*handles for receiver end*/
-static gint hf_lbmsrs_rer;
-static gint hf_lbmsrs_rer_topic_len;
-static gint hf_lbmsrs_rer_topic;
-static gint hf_lbmsrs_rer_domain_id;
-static gint hf_lbmsrs_rer_context_instance;
-static gint hf_lbmsrs_rer_context_type;
-static gint hf_lbmsrs_rer_version;
-static gint hf_lbmsrs_rer_version_flags;
-static gint hf_lbmsrs_rer_reserved;
+static int hf_lbmsrs_rer;
+static int hf_lbmsrs_rer_topic_len;
+static int hf_lbmsrs_rer_topic;
+static int hf_lbmsrs_rer_domain_id;
+static int hf_lbmsrs_rer_context_instance;
+static int hf_lbmsrs_rer_context_type;
+static int hf_lbmsrs_rer_version;
+static int hf_lbmsrs_rer_version_flags;
+static int hf_lbmsrs_rer_reserved;
 
 /*handles for wildcard receiver info*/
-static gint hf_lbmsrs_wir;
-static gint hf_lbmsrs_wir_pattern_len;
-static gint hf_lbmsrs_wir_pattern;
-static gint hf_lbmsrs_wir_domain_id;
-static gint hf_lbmsrs_wir_context_instance;
-static gint hf_lbmsrs_wir_context_type;
-static gint hf_lbmsrs_wir_version;
-static gint hf_lbmsrs_wir_version_flags;
-static gint hf_lbmsrs_wir_reserved;
+static int hf_lbmsrs_wir;
+static int hf_lbmsrs_wir_pattern_len;
+static int hf_lbmsrs_wir_pattern;
+static int hf_lbmsrs_wir_domain_id;
+static int hf_lbmsrs_wir_context_instance;
+static int hf_lbmsrs_wir_context_type;
+static int hf_lbmsrs_wir_version;
+static int hf_lbmsrs_wir_version_flags;
+static int hf_lbmsrs_wir_reserved;
 
 /*handles for wildcard receiver delete*/
-static gint hf_lbmsrs_wdr;
-static gint hf_lbmsrs_wdr_pattern_len;
-static gint hf_lbmsrs_wdr_pattern;
-static gint hf_lbmsrs_wdr_domain_id;
-static gint hf_lbmsrs_wdr_context_instance;
-static gint hf_lbmsrs_wdr_context_type;
-static gint hf_lbmsrs_wdr_version;
-static gint hf_lbmsrs_wdr_version_flags;
-static gint hf_lbmsrs_wdr_reserved;
+static int hf_lbmsrs_wdr;
+static int hf_lbmsrs_wdr_pattern_len;
+static int hf_lbmsrs_wdr_pattern;
+static int hf_lbmsrs_wdr_domain_id;
+static int hf_lbmsrs_wdr_context_instance;
+static int hf_lbmsrs_wdr_context_type;
+static int hf_lbmsrs_wdr_version;
+static int hf_lbmsrs_wdr_version_flags;
+static int hf_lbmsrs_wdr_reserved;
 
 /*handles for wildcard receiver end*/
-static gint hf_lbmsrs_wer;
-static gint hf_lbmsrs_wer_pattern_len;
-static gint hf_lbmsrs_wer_pattern;
-static gint hf_lbmsrs_wer_domain_id;
-static gint hf_lbmsrs_wer_context_instance;
-static gint hf_lbmsrs_wer_context_type;
-static gint hf_lbmsrs_wer_version;
-static gint hf_lbmsrs_wer_version_flags;
-static gint hf_lbmsrs_wer_reserved;
+static int hf_lbmsrs_wer;
+static int hf_lbmsrs_wer_pattern_len;
+static int hf_lbmsrs_wer_pattern;
+static int hf_lbmsrs_wer_domain_id;
+static int hf_lbmsrs_wer_context_instance;
+static int hf_lbmsrs_wer_context_type;
+static int hf_lbmsrs_wer_version;
+static int hf_lbmsrs_wer_version_flags;
+static int hf_lbmsrs_wer_reserved;
 
 /*handles for src leave info*/
-static gint hf_lbmsrs_sli;
-static gint hf_lbmsrs_sli_otid;
-static gint hf_lbmsrs_sli_topic_len;
-static gint hf_lbmsrs_sli_topic;
-static gint hf_lbmsrs_sli_source_len;
-static gint hf_lbmsrs_sli_source;
-static gint hf_lbmsrs_sli_context_instance;
-static gint hf_lbmsrs_sli_context_type;
-static gint hf_lbmsrs_sli_version;
-static gint hf_lbmsrs_sli_version_flags;
-static gint hf_lbmsrs_sli_reserved;
+static int hf_lbmsrs_sli;
+static int hf_lbmsrs_sli_otid;
+static int hf_lbmsrs_sli_topic_len;
+static int hf_lbmsrs_sli_topic;
+static int hf_lbmsrs_sli_source_len;
+static int hf_lbmsrs_sli_source;
+static int hf_lbmsrs_sli_context_instance;
+static int hf_lbmsrs_sli_context_type;
+static int hf_lbmsrs_sli_version;
+static int hf_lbmsrs_sli_version_flags;
+static int hf_lbmsrs_sli_reserved;
 
 
 /*rsocket dissector field handles*/
-static gint hf_lbmsrs_rsocket_frame_len;
-static gint hf_lbmsrs_rsocket_stream_id;
-static gint hf_lbmsrs_rsocket_frame_type;
-static gint hf_lbmsrs_rsocket_mdata_len;
-static gint hf_lbmsrs_rsocket_mdata;
-static gint hf_lbmsrs_rsocket_major_version;
-static gint hf_lbmsrs_rsocket_minor_version;
-static gint hf_lbmsrs_rsocket_keepalive_interval;
-static gint hf_lbmsrs_rsocket_max_lifetime;
-static gint hf_lbmsrs_rsocket_mdata_mime_length;
-static gint hf_lbmsrs_rsocket_mdata_mime_type;
-static gint hf_lbmsrs_rsocket_data_mime_length;
-static gint hf_lbmsrs_rsocket_data_mime_type;
-static gint hf_lbmsrs_rsocket_req_n;
-static gint hf_lbmsrs_rsocket_error_code;
-static gint hf_lbmsrs_rsocket_keepalive_last_rcvd_pos;
-static gint hf_lbmsrs_rsocket_resume_token_len;
-static gint hf_lbmsrs_rsocket_resume_token;
+static int hf_lbmsrs_rsocket_frame_len;
+static int hf_lbmsrs_rsocket_stream_id;
+static int hf_lbmsrs_rsocket_frame_type;
+static int hf_lbmsrs_rsocket_mdata_len;
+static int hf_lbmsrs_rsocket_mdata;
+static int hf_lbmsrs_rsocket_major_version;
+static int hf_lbmsrs_rsocket_minor_version;
+static int hf_lbmsrs_rsocket_keepalive_interval;
+static int hf_lbmsrs_rsocket_max_lifetime;
+static int hf_lbmsrs_rsocket_mdata_mime_length;
+static int hf_lbmsrs_rsocket_mdata_mime_type;
+static int hf_lbmsrs_rsocket_data_mime_length;
+static int hf_lbmsrs_rsocket_data_mime_type;
+static int hf_lbmsrs_rsocket_req_n;
+static int hf_lbmsrs_rsocket_error_code;
+static int hf_lbmsrs_rsocket_keepalive_last_rcvd_pos;
+static int hf_lbmsrs_rsocket_resume_token_len;
+static int hf_lbmsrs_rsocket_resume_token;
 
 // other flags
-static gint hf_lbmsrs_rsocket_ignore_flag;
-static gint hf_lbmsrs_rsocket_metadata_flag;
-static gint hf_lbmsrs_rsocket_resume_flag;
-static gint hf_lbmsrs_rsocket_lease_flag;
-static gint hf_lbmsrs_rsocket_follows_flag;
-static gint hf_lbmsrs_rsocket_complete_flag;
-static gint hf_lbmsrs_rsocket_next_flag;
-static gint hf_lbmsrs_rsocket_respond_flag;
+static int hf_lbmsrs_rsocket_ignore_flag;
+static int hf_lbmsrs_rsocket_metadata_flag;
+static int hf_lbmsrs_rsocket_resume_flag;
+static int hf_lbmsrs_rsocket_lease_flag;
+static int hf_lbmsrs_rsocket_follows_flag;
+static int hf_lbmsrs_rsocket_complete_flag;
+static int hf_lbmsrs_rsocket_next_flag;
+static int hf_lbmsrs_rsocket_respond_flag;
 
 /*dissector tree handles*/
-static gint ett_lbmsrs;
-static gint ett_lbmsrs_data;
-static gint ett_lbmsrs_details;
-static gint ett_lbmsrs_sir;
-static gint ett_lbmsrs_sdr;
-static gint ett_lbmsrs_ser;
-static gint ett_lbmsrs_rir;
-static gint ett_lbmsrs_rdr;
-static gint ett_lbmsrs_rer;
-static gint ett_lbmsrs_wir;
-static gint ett_lbmsrs_wdr;
-static gint ett_lbmsrs_wer;
-static gint ett_lbmsrs_sli;
-
-static gint ett_lbmsrs_rsocket_frame;
+static int ett_lbmsrs;
+static int ett_lbmsrs_data;
+static int ett_lbmsrs_details;
+static int ett_lbmsrs_sir;
+static int ett_lbmsrs_sdr;
+static int ett_lbmsrs_ser;
+static int ett_lbmsrs_rir;
+static int ett_lbmsrs_rdr;
+static int ett_lbmsrs_rer;
+static int ett_lbmsrs_wir;
+static int ett_lbmsrs_wdr;
+static int ett_lbmsrs_wer;
+static int ett_lbmsrs_sli;
+
+static int ett_lbmsrs_rsocket_frame;
 
 /*Expert analysis fields*/
 static expert_field ei_lbmsrs_analysis_invalid_msg_id;
@@ -552,19 +552,19 @@ static expert_field ei_lbmsrs_analysis_invalid_msg_id;
 /* Dissector handle */
 static dissector_handle_t lbmsrs_dissector_handle;
 
-static const guint rsocket_frame_len_field_size = 3;
-static const guint rsocket_stream_id_field_size = 4;
+static const unsigned rsocket_frame_len_field_size = 3;
+static const unsigned rsocket_stream_id_field_size = 4;
 
 /* SRS default definitions*/
 #define LBMSRS_DEFAULT_SOURCE_PORT 0
 #define LBMSRS_DEFAULT_SOURCE_IP "127.0.0.1"
 
-static guint32 lbmsrs_source_ip_address;
+static uint32_t lbmsrs_source_ip_address;
 static const char* global_lbmsrs_source_ip_address = LBMSRS_DEFAULT_SOURCE_IP;
-static guint32 global_lbmsrs_source_port = LBMSRS_DEFAULT_SOURCE_PORT;
+static uint32_t global_lbmsrs_source_port = LBMSRS_DEFAULT_SOURCE_PORT;
 static bool global_lbmsrs_use_tag;
-static guint32 lbmsrs_source_port = LBMSRS_DEFAULT_SOURCE_PORT;
-static gboolean lbmsrs_use_tag;
+static uint32_t lbmsrs_source_port = LBMSRS_DEFAULT_SOURCE_PORT;
+static bool lbmsrs_use_tag;
 
 
 #define RSOCKET_FRAME_RESERVED 0x00
@@ -641,7 +641,7 @@ static bool lbmsrs_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -649,10 +649,10 @@ static bool lbmsrs_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbmsrs_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -685,16 +685,16 @@ static void lbmsrs_tag_free_cb(void * record)
 }
 
 /*Tag helper functions*/
-static gboolean lbmsrs_match_packet(packet_info * pinfo, const lbmsrs_tag_entry_t * entry)
+static bool lbmsrs_match_packet(packet_info * pinfo, const lbmsrs_tag_entry_t * entry)
 {
     if ((pinfo->dst.type != AT_IPv4) || (pinfo->dst.len != 4) ||
         (pinfo->src.type != AT_IPv4) || (pinfo->src.len != 4))
-        return FALSE;
+        return false;
 
-    guint32 dest_addr_h = pntoh32(pinfo->dst.data);
-    guint32 src_addr_h = pntoh32(pinfo->src.data);
+    uint32_t dest_addr_h = pntoh32(pinfo->dst.data);
+    uint32_t src_addr_h = pntoh32(pinfo->src.data);
 
-    guint32 ip_address_val_h = 0;
+    uint32_t ip_address_val_h = 0;
     if (NULL != entry->ip_address)
     {
         ip_address_val_h = entry->ip_address_val_h;
@@ -705,7 +705,7 @@ static gboolean lbmsrs_match_packet(packet_info * pinfo, const lbmsrs_tag_entry_
     {
         if ((entry->tcp_port == pinfo->destport) || (entry->tcp_port == pinfo->srcport))
         {
-            return TRUE;
+            return true;
         }
     }
     /*if only IP is specified*/
@@ -713,7 +713,7 @@ static gboolean lbmsrs_match_packet(packet_info * pinfo, const lbmsrs_tag_entry_
     {
         if ((ip_address_val_h == dest_addr_h) || (ip_address_val_h == src_addr_h))
         {
-            return TRUE;
+            return true;
         }
     }
     /*if both IP and port is specified*/
@@ -722,16 +722,16 @@ static gboolean lbmsrs_match_packet(packet_info * pinfo, const lbmsrs_tag_entry_
         if (((ip_address_val_h == dest_addr_h) && (entry->tcp_port == pinfo->destport))
             || ((ip_address_val_h == src_addr_h) && (entry->tcp_port == pinfo->srcport)))
         {
-            return TRUE;
+            return true;
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 static char * lbmsrs_tag_find(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     lbmsrs_tag_entry_t * tag = NULL;
 
     if (!lbmsrs_use_tag)
@@ -750,7 +750,7 @@ static char * lbmsrs_tag_find(packet_info * pinfo)
 }
 
 /*Utility functions*/
-static const gchar *getFrameTypeName(const guint64 frame_type) {
+static const char *getFrameTypeName(const uint64_t frame_type) {
     for (size_t i = 0; i < array_length(rSocketFrameTypeNames); i++) {
         if (rSocketFrameTypeNames[i].value == frame_type) {
             return rSocketFrameTypeNames[i].strptr;
@@ -759,7 +759,7 @@ static const gchar *getFrameTypeName(const guint64 frame_type) {
     return NULL;
 }
 
-static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
+static bool check_lbmsrs_packet(tvbuff_t *tvb, unsigned offset)
 {
     /*check if valid rsocket packet*/
     offset += rsocket_frame_len_field_size;
@@ -768,25 +768,25 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
     /*rsocket data may be split across multiple packets*/
     if (!tvb_bytes_exist(tvb, offset, rsocket_stream_id_field_size))
     {
-        return FALSE;
+        return false;
     }
 
     /*get the stream-id*/
-    guint32 rsocket_stream_id = tvb_get_guint32(tvb, offset, ENC_BIG_ENDIAN);
+    uint32_t rsocket_stream_id = tvb_get_uint32(tvb, offset, ENC_BIG_ENDIAN);
 
     /*move the offset past the stream id field*/
     offset += rsocket_stream_id_field_size;
 
     if (!tvb_bytes_exist(tvb, offset, 1))
     {
-        return FALSE;
+        return false;
     }
 
     /*get the rsocket frame type*/
-    guint64 rsocket_frame_type = tvb_get_bits64(tvb, offset * 8, 6, ENC_BIG_ENDIAN);
+    uint64_t rsocket_frame_type = tvb_get_bits64(tvb, offset * 8, 6, ENC_BIG_ENDIAN);
 
     /*read the rsocket metadata flag*/
-    guint8 rsocket_metadata_flag = tvb_get_bits8(tvb, (offset * 8) + 6, 2);
+    uint8_t rsocket_metadata_flag = tvb_get_bits8(tvb, (offset * 8) + 6, 2);
 
     /*check if valid rsocket frame type*/
     /*update the offset according to the frame type*/
@@ -801,14 +801,14 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
         /*for these frame types stream id must be 0 */
         if (rsocket_stream_id != 0)
         {
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
     case RSOCKET_FRAME_EXT:
     {
-        return TRUE;
+        return true;
     }
 
     case RSOCKET_FRAME_REQUEST_RESPONSE:
@@ -830,7 +830,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
     }
 
     default:
-        return FALSE;
+        return false;
     }
 
     /*if rsocket metadata is available get the metadata length*/
@@ -838,17 +838,17 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
     {
         if (!tvb_bytes_exist(tvb, offset, 3))
         {
-            return FALSE;
+            return false;
         }
 
         /*add the rsocket metadata length field*/
-        guint32 rsocket_metadata_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN);
+        uint32_t rsocket_metadata_len = tvb_get_uint24(tvb, offset, ENC_BIG_ENDIAN);
         offset += 3;
         /*move the offset by the metadata length*/
         offset += rsocket_metadata_len;
         if (!tvb_bytes_exist(tvb, offset, 6))
         {
-            return FALSE;
+            return false;
         }
     }
 
@@ -858,7 +858,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
     /*if payload is available start processing for SRS*/
     if (tvb_bytes_exist(tvb, offset, 2))
     {
-        guint16 message_id = tvb_get_guint16(tvb, offset, ENC_BIG_ENDIAN);
+        uint16_t message_id = tvb_get_uint16(tvb, offset, ENC_BIG_ENDIAN);
         switch (message_id)
         {
         case MSG_ID_REGISTRATION_REQUEST:
@@ -874,25 +874,25 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset)
         case MSG_ID_WRCV_END:
         case MSG_ID_SRC_LEAVE:
         {
-            return TRUE;
+            return true;
         }
 
         default:
-            return FALSE;
+            return false;
 
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 
 
-static guint get_rsocket_frame_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
+static unsigned get_rsocket_frame_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
     /*get the rsocket frame length (3-byte long field)*/
     /*offset argument points to the beginning of the Rsocket PDU*/
-    guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN);
+    uint32_t rsocket_frame_len = tvb_get_uint24(tvb, offset, ENC_BIG_ENDIAN);
 
     /*return total RSocket PDU size*/
     return (rsocket_frame_len + rsocket_frame_len_field_size);
@@ -900,11 +900,11 @@ static guint get_rsocket_frame_len(packet_info *pinfo _U_, tvbuff_t *tvb, int of
 
 /*----------------Main Dissection Functions----------------------*/
 /*Rsocket dissector function*/
-static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocket_frame_tree, tvbuff_t * tvb,guint offset, gboolean *can_dissect_further)
+static unsigned dissect_rsocket_frame(uint64_t rsocket_frame_type,proto_tree* rsocket_frame_tree, tvbuff_t * tvb,unsigned offset, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint remaining_payload_len = total_payload_len - offset;
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned remaining_payload_len = total_payload_len - offset;
+    unsigned start_offset = offset;
 
     switch (rsocket_frame_type)
     {
@@ -913,11 +913,11 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
             if (remaining_payload_len < RSOCKET_FRAME_SETUP_MIN_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
 
-            gint8 resume_flag = tvb_get_bits8(tvb, (offset + 1) * 8, 1);
+            int8_t resume_flag = tvb_get_bits8(tvb, (offset + 1) * 8, 1);
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_resume_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_lease_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
             offset += 2;
@@ -934,16 +934,16 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
             if (resume_flag) {
                 if ((total_payload_len - offset) < 2)
                 {
-                    *can_dissect_further = FALSE;
+                    *can_dissect_further = false;
                     break;
                 }
-                guint resume_token_len;
+                unsigned resume_token_len;
                 proto_tree_add_item_ret_uint(rsocket_frame_tree, hf_lbmsrs_rsocket_resume_token_len, tvb, offset,2, ENC_BIG_ENDIAN, &resume_token_len);
                 offset += 2;
 
                 if ((total_payload_len - offset) < resume_token_len)
                 {
-                    *can_dissect_further = FALSE;
+                    *can_dissect_further = false;
                     break;
                 }
                 proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_resume_token, tvb, offset,resume_token_len, ENC_STRING);
@@ -952,17 +952,17 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
             if ((total_payload_len - offset) < 1)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
 
-            guint mdata_mime_length;
+            unsigned mdata_mime_length;
             proto_tree_add_item_ret_uint(rsocket_frame_tree, hf_lbmsrs_rsocket_mdata_mime_length, tvb, offset,1, ENC_BIG_ENDIAN, &mdata_mime_length);
             offset += 1;
 
             if ((total_payload_len - offset) < mdata_mime_length)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
 
@@ -971,16 +971,16 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
             if ((total_payload_len - offset) < 1)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
-            guint data_mime_length;
+            unsigned data_mime_length;
             proto_tree_add_item_ret_uint(rsocket_frame_tree, hf_lbmsrs_rsocket_data_mime_length, tvb, offset,1, ENC_BIG_ENDIAN, &data_mime_length);
             offset += 1;
 
             if ((total_payload_len - offset) < data_mime_length)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
 
@@ -994,7 +994,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
             if (remaining_payload_len < RSOCKET_FRAME_KEEPALIVE_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
 
@@ -1012,7 +1012,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
             if (remaining_payload_len < RSOCKET_FRAME_REQUEST_RESPONSE_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_follows_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -1025,7 +1025,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_REQUEST_FNF_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_follows_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -1037,7 +1037,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_REQUEST_STREAM_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_follows_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -1052,7 +1052,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_REQUEST_CHANNEL_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_follows_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -1068,7 +1068,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_REQUEST_N_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             offset += 2;
@@ -1081,7 +1081,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_CANCEL_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             offset += 2;
@@ -1092,7 +1092,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < RSOCKET_FRAME_PAYLOAD_SIZE)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_follows_flag, tvb, offset, 2,ENC_BIG_ENDIAN);
@@ -1107,7 +1107,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
         {
             if (remaining_payload_len < 6)
             {
-                *can_dissect_further = FALSE;
+                *can_dissect_further = false;
                 break;
             }
             offset += 2;
@@ -1118,7 +1118,7 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
         default:
         {
-            *can_dissect_further = FALSE;
+            *can_dissect_further = false;
         }
 
     }
@@ -1127,16 +1127,16 @@ static guint dissect_rsocket_frame(guint64 rsocket_frame_type,proto_tree* rsocke
 
 }
 
-static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_sir, guint *cnt_ser, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_sir, unsigned *cnt_ser, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is OTID, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1154,20 +1154,20 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_topic_len, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_SRC_INFO_INFO_T_TOPIC_LEN;
 
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -1175,17 +1175,17 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_SOURCE_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    guint8 source_len = tvb_get_guint8(tvb, offset);
+    uint8_t source_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_source_len, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_SOURCE_LEN, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_SRC_INFO_INFO_T_SOURCE_LEN;
 
     if ((total_payload_len - offset) < source_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
@@ -1195,7 +1195,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_HOST_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_host_id, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_HOST_ID, ENC_BIG_ENDIAN);
@@ -1204,7 +1204,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_TOPIC_IDX)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_topic_idx, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_TOPIC_IDX, ENC_BIG_ENDIAN);
@@ -1213,7 +1213,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_FUNCTIONALITY_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_functionality_flags, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_FUNCTIONALITY_FLAGS, ENC_BIG_ENDIAN);
@@ -1222,7 +1222,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_REQUEST_IP)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_request_ip, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_REQUEST_IP, ENC_BIG_ENDIAN);
@@ -1231,7 +1231,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_REQUEST_PORT)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_request_port, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_REQUEST_PORT, ENC_BIG_ENDIAN);
@@ -1240,7 +1240,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_domain_id, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1249,7 +1249,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_ENCRYPTION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_encryption, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_ENCRYPTION, ENC_BIG_ENDIAN);
@@ -1258,7 +1258,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_COMPRESSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_compression, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_COMPRESSION, ENC_BIG_ENDIAN);
@@ -1267,7 +1267,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_ULB_SRC_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_ulb_src_id, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_ULB_SRC_ID, ENC_BIG_ENDIAN);
@@ -1276,7 +1276,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_ULB_QUEUE_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_ulb_queue_id, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_ULB_QUEUE_ID, ENC_BIG_ENDIAN);
@@ -1285,7 +1285,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_ULB_REG_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_ulb_reg_id, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_ULB_REG_ID, ENC_BIG_ENDIAN);
@@ -1294,7 +1294,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_context_instance, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1303,7 +1303,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_context_type, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1312,7 +1312,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_version, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1321,7 +1321,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_version_flags, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1330,7 +1330,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_TTL)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sir_tree, hf_lbmsrs_sir_ttl, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_TTL, ENC_BIG_ENDIAN);
@@ -1339,10 +1339,10 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_COST)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint32 cost;
+    int32_t cost;
     proto_tree_add_item_ret_int(sir_tree, hf_lbmsrs_sir_cost, tvb, offset, L_LBM_SRS_SRC_INFO_INFO_T_COST, ENC_BIG_ENDIAN, &cost);
     offset += L_LBM_SRS_SRC_INFO_INFO_T_COST;
 
@@ -1362,16 +1362,16 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, packet_info * pinfo, proto_t
     return (offset - start_offset);
 }
 
-static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_sdr,gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_sdr,bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is OTID, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1386,7 +1386,7 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
@@ -1396,10 +1396,10 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_DELETE_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(sdr_tree, hf_lbmsrs_sdr_topic_len, tvb, offset, L_LBM_SRS_SRC_DELETE_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_SRC_DELETE_INFO_T_TOPIC_LEN;
@@ -1407,10 +1407,10 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(sdr_tree, hf_lbmsrs_sdr_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -1423,16 +1423,16 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_rir, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_rir, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1447,11 +1447,11 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_topic_len, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_RCV_INFO_INFO_T_TOPIC_LEN;
@@ -1459,10 +1459,10 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -1470,7 +1470,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_domain_id, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1479,7 +1479,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_context_instance, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1488,7 +1488,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_context_type, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1497,7 +1497,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_version, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1506,7 +1506,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_version_flags, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1515,7 +1515,7 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_INFO_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rir_tree, hf_lbmsrs_rir_reserved, tvb, offset, L_LBM_SRS_RCV_INFO_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -1529,16 +1529,16 @@ static guint dissect_lbmsrs_rir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_rer, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_rer, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1553,11 +1553,11 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_topic_len, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_RCV_END_INFO_T_TOPIC_LEN;
@@ -1565,10 +1565,10 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -1576,7 +1576,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_domain_id, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1585,7 +1585,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_context_instance, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1594,7 +1594,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_context_type, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1603,7 +1603,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_version, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1612,7 +1612,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_version_flags, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1622,7 +1622,7 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_END_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rer_tree, hf_lbmsrs_rer_reserved, tvb, offset, L_LBM_SRS_RCV_END_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -1636,16 +1636,16 @@ static guint dissect_lbmsrs_rer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_rdr, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_rdr, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1660,11 +1660,11 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_topic_len, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_RCV_DELETE_INFO_T_TOPIC_LEN;
@@ -1672,10 +1672,10 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -1683,7 +1683,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_domain_id, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1692,7 +1692,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_context_instance, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1701,7 +1701,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_context_type, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1711,7 +1711,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_version, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1720,7 +1720,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_version_flags, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1729,7 +1729,7 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_RCV_DELETE_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(rdr_tree, hf_lbmsrs_rdr_reserved, tvb, offset, L_LBM_SRS_RCV_DELETE_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -1743,16 +1743,16 @@ static guint dissect_lbmsrs_rdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_wir, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_wir, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1767,11 +1767,11 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 pattern_len = tvb_get_guint8(tvb, offset);
+    uint8_t pattern_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_pattern_len, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_PATTERN_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_WRCV_INFO_INFO_T_PATTERN_LEN;
@@ -1779,10 +1779,10 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < pattern_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_pattern, tvb, offset, pattern_len, ENC_ASCII | ENC_NA);
     offset += pattern_len;
@@ -1790,7 +1790,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_domain_id, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1799,7 +1799,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_context_instance, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1808,7 +1808,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_context_type, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1818,7 +1818,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_version, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1827,7 +1827,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_version_flags, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1836,7 +1836,7 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_INFO_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wir_tree, hf_lbmsrs_wir_reserved, tvb, offset, L_LBM_SRS_WRCV_INFO_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -1850,16 +1850,16 @@ static guint dissect_lbmsrs_wir(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_wdr, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_wdr, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1874,11 +1874,11 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 pattern_len = tvb_get_guint8(tvb, offset);
+    uint8_t pattern_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_pattern_len, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_PATTERN_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_WRCV_DELETE_INFO_T_PATTERN_LEN;
@@ -1886,10 +1886,10 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < pattern_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_pattern, tvb, offset, pattern_len, ENC_ASCII | ENC_NA);
     offset += pattern_len;
@@ -1897,7 +1897,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_domain_id, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -1906,7 +1906,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_context_instance, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -1915,7 +1915,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_context_type, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -1925,7 +1925,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_version, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -1934,7 +1934,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_version_flags, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -1943,7 +1943,7 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_DELETE_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wdr_tree, hf_lbmsrs_wdr_reserved, tvb, offset, L_LBM_SRS_WRCV_DELETE_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -1957,16 +1957,16 @@ static guint dissect_lbmsrs_wdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint *cnt_wer, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, unsigned *cnt_wer, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    gint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    int start_offset = offset;
 
     /*first field is Topic length, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -1981,11 +1981,11 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_PATTERN_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
 
-    guint8 pattern_len = tvb_get_guint8(tvb, offset);
+    uint8_t pattern_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_pattern_len, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_PATTERN_LEN, ENC_BIG_ENDIAN);
 
     offset += L_LBM_SRS_WRCV_END_INFO_T_PATTERN_LEN;
@@ -1993,10 +1993,10 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < pattern_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_pattern, tvb, offset, pattern_len, ENC_ASCII | ENC_NA);
     offset += pattern_len;
@@ -2004,7 +2004,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_DOMAIN_ID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_domain_id, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_DOMAIN_ID, ENC_BIG_ENDIAN);
@@ -2013,7 +2013,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_context_instance, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -2022,7 +2022,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_context_type, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -2031,7 +2031,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_version, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -2040,7 +2040,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_version_flags, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -2049,7 +2049,7 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_WRCV_END_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(wer_tree, hf_lbmsrs_wer_reserved, tvb, offset, L_LBM_SRS_WRCV_END_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -2063,16 +2063,16 @@ static guint dissect_lbmsrs_wer(tvbuff_t * tvb, packet_info * pinfo, proto_tree
 
 }
 
-static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree * tree, guint offset, guint *cnt_sli, gboolean *can_dissect_further)
+static unsigned dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree * tree, unsigned offset, unsigned *cnt_sli, bool *can_dissect_further)
 {
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned start_offset = offset;
 
     /*first field is OTID, check if that many bytes are left to process*/
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_OTID)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return 0;
     }
 
@@ -2090,20 +2090,20 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_TOPIC_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    guint8 topic_len = tvb_get_guint8(tvb, offset);
+    uint8_t topic_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_topic_len, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_TOPIC_LEN, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_SRC_LEAVE_INFO_T_TOPIC_LEN;
 
     if ((total_payload_len - offset) < topic_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    gint len;
+    int len;
     char* name = tvb_get_stringz_enc(pinfo->pool, tvb, offset, &len, ENC_ASCII);
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_topic, tvb, offset, topic_len, ENC_ASCII | ENC_NA);
     offset += topic_len;
@@ -2111,17 +2111,17 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_SOURCE_LEN)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
-    guint8 source_len = tvb_get_guint8(tvb, offset);
+    uint8_t source_len = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_source_len, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_SOURCE_LEN, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_SRC_LEAVE_INFO_T_SOURCE_LEN;
 
     if ((total_payload_len - offset) < source_len)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_source, tvb, offset, source_len, ENC_ASCII | ENC_NA);
@@ -2130,7 +2130,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_CONTEXT_INSTANCE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_context_instance, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_CONTEXT_INSTANCE, ENC_NA);
@@ -2139,7 +2139,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_CONTEXT_TYPE)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_context_type, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_CONTEXT_TYPE, ENC_BIG_ENDIAN);
@@ -2149,7 +2149,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_VERSION)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_version, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_VERSION, ENC_BIG_ENDIAN);
@@ -2158,7 +2158,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_VERSION_FLAGS)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_version_flags, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_VERSION_FLAGS, ENC_BIG_ENDIAN);
@@ -2168,7 +2168,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
     if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_RESERVED)
     {
         /*stop processing in case not available*/
-        *can_dissect_further = FALSE;
+        *can_dissect_further = false;
         return (offset - start_offset);
     }
     proto_tree_add_item(sli_tree, hf_lbmsrs_sli_reserved, tvb, offset, L_LBM_SRS_SRC_LEAVE_INFO_T_RESERVED, ENC_BIG_ENDIAN);
@@ -2182,14 +2182,14 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, packet_info * pinfo,  proto_tree
 }
 
 /*Function to dissect SRS SIR/SER/SDR*/
-static guint dissect_lbmsrs_batch(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint32 rsocket_payload_len)
+static unsigned dissect_lbmsrs_batch(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, uint32_t rsocket_payload_len)
 {
-    guint start_offset = offset;
-    guint total_payload_len = tvb_captured_length(tvb);
-    guint cnt_sir = 0, cnt_ser = 0, cnt_sdr = 0;
-    guint cnt_rir = 0, cnt_rer = 0, cnt_rdr = 0;
-    guint cnt_wir = 0, cnt_wer = 0, cnt_wdr = 0;
-    guint cnt_sli = 0;
+    unsigned start_offset = offset;
+    unsigned total_payload_len = tvb_captured_length(tvb);
+    unsigned cnt_sir = 0, cnt_ser = 0, cnt_sdr = 0;
+    unsigned cnt_rir = 0, cnt_rer = 0, cnt_rdr = 0;
+    unsigned cnt_wir = 0, cnt_wer = 0, cnt_wdr = 0;
+    unsigned cnt_sli = 0;
 
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "[");
@@ -2212,11 +2212,11 @@ static guint dissect_lbmsrs_batch(tvbuff_t * tvb, packet_info * pinfo, proto_tre
             return (offset - start_offset);
         }
 
-        guint16 message_id = tvb_get_guint16(tvb, offset, ENC_BIG_ENDIAN);
+        uint16_t message_id = tvb_get_uint16(tvb, offset, ENC_BIG_ENDIAN);
 
         /*process the SIR/SDR/SER*/
-        guint len_dissected = 0;
-        gboolean can_dissect_further = TRUE;
+        unsigned len_dissected = 0;
+        bool can_dissect_further = true;
         switch (message_id)
         {
             case MSG_ID_SOURCE_INFO:
@@ -2272,7 +2272,7 @@ static guint dissect_lbmsrs_batch(tvbuff_t * tvb, packet_info * pinfo, proto_tre
         }
 
         /*if nothing is dissected then return the current offset*/
-        if (FALSE == can_dissect_further || len_dissected < 1)
+        if (false == can_dissect_further || len_dissected < 1)
         {
             col_append_fstr(pinfo->cinfo, COL_INFO, "SIR:%u SER:%u SDR:%u RIR:%u RER:%u RDR:%u WIR:%u WER:%u WDR:%u SLI:%u]",
                 cnt_sir, cnt_ser, cnt_sdr, cnt_rir, cnt_rer, cnt_rdr, cnt_wir, cnt_wer, cnt_wdr, cnt_sli);
@@ -2293,9 +2293,9 @@ static guint dissect_lbmsrs_batch(tvbuff_t * tvb, packet_info * pinfo, proto_tre
     return (offset - start_offset);
 }
 
-static guint dissect_lbmsrs_registration_request(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint32 rsocket_payload_len)
+static unsigned dissect_lbmsrs_registration_request(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, uint32_t rsocket_payload_len)
 {
-    guint start_offset = offset;
+    unsigned start_offset = offset;
     proto_tree_add_item(tree, hf_lbmsrs_message_id, tvb, offset, L_LBM_SRS_MESSAGE_ID, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_MESSAGE_ID;
 
@@ -2332,9 +2332,9 @@ static guint dissect_lbmsrs_registration_request(tvbuff_t * tvb, packet_info * p
 
 }
 
-static guint dissect_lbmsrs_registration_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint32 rsocket_payload_len)
+static unsigned dissect_lbmsrs_registration_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, uint32_t rsocket_payload_len)
 {
-    guint start_offset = offset;
+    unsigned start_offset = offset;
     proto_tree_add_item(tree, hf_lbmsrs_message_id, tvb, offset, L_LBM_SRS_MESSAGE_ID, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_MESSAGE_ID;
 
@@ -2362,9 +2362,9 @@ static guint dissect_lbmsrs_registration_response(tvbuff_t * tvb, packet_info *
     return (offset - start_offset);
 }
 
-static guint dissect_lbmsrs_stream_request(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint32 rsocket_payload_len)
+static unsigned dissect_lbmsrs_stream_request(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, uint32_t rsocket_payload_len)
 {
-    guint start_offset = offset;
+    unsigned start_offset = offset;
     proto_tree_add_item(tree, hf_lbmsrs_message_id, tvb, offset, L_LBM_SRS_MESSAGE_ID, ENC_BIG_ENDIAN);
     offset += L_LBM_SRS_MESSAGE_ID;
 
@@ -2388,9 +2388,9 @@ static guint dissect_lbmsrs_stream_request(tvbuff_t * tvb, packet_info * pinfo,
     return (offset - start_offset);
 }
 /*Function to dissect SRS as part of Rsocket payload/metadata*/
-static guint dissect_lbmsrs_data(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint offset, guint32 rsocket_payload_len)
+static unsigned dissect_lbmsrs_data(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, unsigned offset, uint32_t rsocket_payload_len)
 {
-    guint len_dissected = 0;
+    unsigned len_dissected = 0;
 
     if (tvb_captured_length_remaining(tvb, offset) < L_LBM_SRS_MESSAGE_ID)
     {
@@ -2398,7 +2398,7 @@ static guint dissect_lbmsrs_data(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     }
 
     /*add and get the SRS message id*/
-    guint16 message_id = tvb_get_guint16(tvb,offset, ENC_BIG_ENDIAN);
+    uint16_t message_id = tvb_get_uint16(tvb,offset, ENC_BIG_ENDIAN);
 
     switch (message_id)
     {
@@ -2449,8 +2449,8 @@ Return > 0 - If the data is dissected properly, return the actual length dissect
 Return < 0 - If need more data for dissection, return the negative of the length required*/
 static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data _U_)
 {
-    guint offset = 0;
-    guint tvb_length = tvb_captured_length(tvb);
+    unsigned offset = 0;
+    unsigned tvb_length = tvb_captured_length(tvb);
 
     if (tvb_length < rsocket_frame_len_field_size)
     {
@@ -2458,11 +2458,11 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     }
 
     /*get the rsocket frame length*/
-    guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN);
+    uint32_t rsocket_frame_len = tvb_get_uint24(tvb, offset, ENC_BIG_ENDIAN);
     /*adjust the rsocket tree size correctly so as to accommodate
     only the available data. It's always possible that the rsocket length reported
     in the rsocket PDU is more than the data captured in this packet or vice-versa*/
-    guint32 rsocket_tree_length = rsocket_frame_len;
+    uint32_t rsocket_tree_length = rsocket_frame_len;
     if (tvb_length < (rsocket_frame_len + rsocket_frame_len_field_size))
     {
         rsocket_tree_length = tvb_length - rsocket_frame_len_field_size;
@@ -2503,12 +2503,12 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         return offset;
     }
-    guint64 rsocket_frame_type;
+    uint64_t rsocket_frame_type;
     proto_tree_add_bits_ret_val(rsocket_frame_tree, hf_lbmsrs_rsocket_frame_type, tvb,
         offset * 8, 6, &rsocket_frame_type, ENC_BIG_ENDIAN);
 
 
-    const gchar *frameName = getFrameTypeName(rsocket_frame_type);
+    const char *frameName = getFrameTypeName(rsocket_frame_type);
 
     if (frameName) {
         col_add_str(pinfo->cinfo, COL_INFO, frameName);
@@ -2522,16 +2522,16 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         ENC_BIG_ENDIAN);
 
     /*read the rsocket metadata flag*/
-    guint8 rsocket_metadata_flag = tvb_get_bits8(tvb, (offset * 8) + 6, 2);
+    uint8_t rsocket_metadata_flag = tvb_get_bits8(tvb, (offset * 8) + 6, 2);
     proto_tree_add_item(rsocket_frame_tree, hf_lbmsrs_rsocket_metadata_flag, tvb, offset, 2,
         ENC_BIG_ENDIAN);
 
     /*dissect rsocket frame based on type */
-    gboolean can_dissect_further = TRUE;
+    bool can_dissect_further = true;
     int rsocket_dissected_len  = dissect_rsocket_frame(rsocket_frame_type, rsocket_frame_tree, tvb, offset,&can_dissect_further);
     offset += rsocket_dissected_len;
 
-    if (FALSE == can_dissect_further)
+    if (false == can_dissect_further)
     {
         return (offset - rsocket_frame_len);
     }
@@ -2544,7 +2544,7 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         {
             return (offset - rsocket_frame_len);
         }
-        guint32 rsocket_metadata_len;
+        uint32_t rsocket_metadata_len;
         proto_tree_add_item_ret_uint(rsocket_frame_tree, hf_lbmsrs_rsocket_mdata_len, tvb, offset,3, ENC_BIG_ENDIAN, &rsocket_metadata_len);
         offset += 3;
 
@@ -2558,7 +2558,7 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     }
 
     /*get the remaining payload length*/
-    guint32 rsocket_payload_len = tvb_length - offset;
+    uint32_t rsocket_payload_len = tvb_length - offset;
 
     /*if payload is available start processing for SRS*/
     if (rsocket_payload_len > 0) {
@@ -2571,7 +2571,7 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
 }
 
 /*common dissection function for LBMSRS*/
-static guint dissect_lbmsrs_real(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * data _U_)
+static unsigned dissect_lbmsrs_real(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * data _U_)
 {
     char* tag_name = NULL;
     if (lbmsrs_use_tag)
@@ -2587,7 +2587,7 @@ static guint dissect_lbmsrs_real(tvbuff_t * tvb, packet_info * pinfo, proto_tree
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LBMSRS");
     col_set_fence(pinfo->cinfo, COL_INFO);
 
-    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 3, get_rsocket_frame_len, dissect_lbmsrs_pdus, data);
+    tcp_dissect_pdus(tvb, pinfo, tree, true, 3, get_rsocket_frame_len, dissect_lbmsrs_pdus, data);
     return tvb_captured_length(tvb);
 }
 
@@ -2605,7 +2605,7 @@ static int dissect_lbmsrs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
 /*heuristic dissection function*/
 static bool test_lbmsrs_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data _U_)
 {
-    gboolean valid_packet = FALSE;
+    bool valid_packet = false;
     lbmsrs_tag_entry_t entry;
 
     /* Must be a TCP packet. */
@@ -2618,7 +2618,7 @@ static bool test_lbmsrs_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         if (lbmsrs_tag_find(pinfo) != NULL)
         {
-            valid_packet = TRUE;
+            valid_packet = true;
         }
     }
     else
@@ -2642,7 +2642,7 @@ static bool test_lbmsrs_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     if (valid_packet)
     {
         dissect_lbmsrs_real(tvb, pinfo, tree, user_data);
-        return TRUE;
+        return true;
     }
 
     return false;
@@ -2955,7 +2955,7 @@ void proto_register_lbmsrs(void)
         /*SRS Source Leave Info items end*/
     };
 
-    static gint *ett[] =
+    static int *ett[] =
     {
         &ett_lbmsrs,
         &ett_lbmsrs_rsocket_frame,
@@ -2989,7 +2989,7 @@ void proto_register_lbmsrs(void)
     /*Set the preference menu items*/
     module_t* lbmsrs_module = prefs_register_protocol_subtree("29West", proto_lbmsrs, proto_reg_handoff_lbmsrs);
 
-    guint32 addr;
+    uint32_t addr;
     ws_inet_pton4(LBMSRS_DEFAULT_SOURCE_IP, &addr);
     lbmsrs_source_ip_address = g_ntohl(addr);
     prefs_register_string_preference(lbmsrs_module,
@@ -3014,7 +3014,7 @@ void proto_register_lbmsrs(void)
     uat_t *tag_uat = uat_new("LBMSRS tag definitions",
         sizeof(lbmsrs_tag_entry_t),
         "lbmsrs_domains",
-        TRUE,
+        true,
         (void * *)&lbmsrs_tag_entry,
         &lbmsrs_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -3036,8 +3036,8 @@ void proto_register_lbmsrs(void)
 
 void proto_reg_handoff_lbmsrs(void)
 {
-    static gboolean already_registered = FALSE;
-    guint32 addr;
+    static bool already_registered = false;
+    uint32_t addr;
 
     if (!already_registered)
     {
@@ -3049,7 +3049,7 @@ void proto_reg_handoff_lbmsrs(void)
     lbmsrs_source_ip_address = g_ntohl(addr);
     lbmsrs_source_port = global_lbmsrs_source_port;
     lbmsrs_use_tag = global_lbmsrs_use_tag;
-    already_registered = TRUE;
+    already_registered = true;
 }
 /*
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c
index 8bbc019c76..d655b1664f 100644
--- a/epan/dissectors/packet-lbtrm.c
+++ b/epan/dissectors/packet-lbtrm.c
@@ -41,7 +41,7 @@ static int lbtrm_tap_handle = -1;
 
 static const address lbtrm_null_address = ADDRESS_INIT_NONE;
 
-static lbtrm_transport_t * lbtrm_transport_unicast_find(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame)
+static lbtrm_transport_t * lbtrm_transport_unicast_find(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame)
 {
     lbtrm_transport_t * transport = NULL;
     conversation_t * conv = NULL;
@@ -63,7 +63,7 @@ static lbtrm_transport_t * lbtrm_transport_unicast_find(const address * source_a
     return (transport);
 }
 
-static void lbtrm_transport_unicast_add(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame, lbtrm_transport_t * transport)
+static void lbtrm_transport_unicast_add(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame, lbtrm_transport_t * transport)
 {
     conversation_t * conv = NULL;
     wmem_tree_t * session_tree = NULL;
@@ -87,7 +87,7 @@ static void lbtrm_transport_unicast_add(const address * source_address, guint16
     }
 }
 
-static lbtrm_transport_t * lbtrm_transport_find(const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port, guint32 frame)
+static lbtrm_transport_t * lbtrm_transport_find(const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port, uint32_t frame)
 {
     lbtrm_transport_t * entry = NULL;
     wmem_tree_t * session_tree = NULL;
@@ -109,7 +109,7 @@ static lbtrm_transport_t * lbtrm_transport_find(const address * source_address,
     return (entry);
 }
 
-lbtrm_transport_t * lbtrm_transport_add(const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port, guint32 frame)
+lbtrm_transport_t * lbtrm_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port, uint32_t frame)
 {
     lbtrm_transport_t * entry;
     conversation_t * conv = NULL;
@@ -157,7 +157,7 @@ lbtrm_transport_t * lbtrm_transport_add(const address * source_address, guint16
     return (entry);
 }
 
-static lbm_transport_sqn_t * lbtrm_transport_sqn_find(lbtrm_transport_t * transport, guint8 type, guint32 sqn)
+static lbm_transport_sqn_t * lbtrm_transport_sqn_find(lbtrm_transport_t * transport, uint8_t type, uint32_t sqn)
 {
     lbm_transport_sqn_t * sqn_entry = NULL;
 
@@ -203,12 +203,12 @@ static lbm_transport_sqn_t * lbtrm_transport_sqn_add(lbtrm_transport_t * transpo
     return (sqn_entry);
 }
 
-static lbm_transport_frame_t * lbtrm_transport_frame_find(lbtrm_transport_t * transport, guint32 frame)
+static lbm_transport_frame_t * lbtrm_transport_frame_find(lbtrm_transport_t * transport, uint32_t frame)
 {
     return ((lbm_transport_frame_t *) wmem_tree_lookup32(transport->frame, frame));
 }
 
-static lbm_transport_frame_t * lbtrm_transport_frame_add(lbtrm_transport_t * transport, guint8 type, guint32 frame, guint32 sqn, gboolean retransmission)
+static lbm_transport_frame_t * lbtrm_transport_frame_add(lbtrm_transport_t * transport, uint8_t type, uint32_t frame, uint32_t sqn, bool retransmission)
 {
     lbm_transport_sqn_t * dup_sqn_entry = NULL;
     lbm_transport_frame_t * frame_entry = NULL;
@@ -242,7 +242,7 @@ static lbm_transport_frame_t * lbtrm_transport_frame_add(lbtrm_transport_t * tra
                         /* Out of order */
                         if (dup_sqn_entry != NULL)
                         {
-                            frame_entry->duplicate = TRUE;
+                            frame_entry->duplicate = true;
                         }
                         if (frame_entry->sqn != transport->data_high_sqn)
                         {
@@ -280,7 +280,7 @@ static lbm_transport_frame_t * lbtrm_transport_frame_add(lbtrm_transport_t * tra
                     dup_sqn_entry = lbtrm_transport_sqn_find(transport, type, frame_entry->sqn);
                     if (dup_sqn_entry != NULL)
                     {
-                        frame_entry->duplicate = TRUE;
+                        frame_entry->duplicate = true;
                     }
                     if (frame_entry->sqn != transport->sm_high_sqn)
                     {
@@ -325,14 +325,14 @@ static lbm_transport_frame_t * lbtrm_transport_frame_add(lbtrm_transport_t * tra
     return (frame_entry);
 }
 
-static char * lbtrm_transport_source_string_format(wmem_allocator_t *pool, const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port)
+static char * lbtrm_transport_source_string_format(wmem_allocator_t *pool, const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port)
 {
     /* Returns a packet-scoped string. */
     return (wmem_strdup_printf(pool, "LBTRM:%s:%" PRIu16 ":%08x:%s:%" PRIu16, address_to_str(pool, source_address), source_port, session_id,
             address_to_str(pool, multicast_group), dest_port));
 }
 
-char * lbtrm_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port)
+char * lbtrm_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port)
 {
     /* Returns a file-scoped string. */
     return lbtrm_transport_source_string_format(wmem_file_scope(), source_address, source_port, session_id, multicast_group, dest_port);
@@ -364,7 +364,7 @@ typedef struct
 #define L_LBTRM_HDR_T_UCAST_PORT SIZEOF(lbtrm_hdr_t, ucast_port)
 #define O_LBTRM_HDR_T_SESSION_ID OFFSETOF(lbtrm_hdr_t, session_id)
 #define L_LBTRM_HDR_T_SESSION_ID SIZEOF(lbtrm_hdr_t, session_id)
-#define L_LBTRM_HDR_T (gint) (sizeof(lbtrm_hdr_t))
+#define L_LBTRM_HDR_T (int) (sizeof(lbtrm_hdr_t))
 
 #define LBTRM_VERSION 0x00
 #define LBTRM_HDR_VER(x) (x >> 4)
@@ -391,7 +391,7 @@ typedef struct
 #define L_LBTRM_DATA_HDR_T_FLAGS_TGSZ SIZEOF(lbtrm_data_hdr_t, flags_tgsz)
 #define O_LBTRM_DATA_HDR_T_FEC_SYMBOL OFFSETOF(lbtrm_data_hdr_t, fec_symbol)
 #define L_LBTRM_DATA_HDR_T_FEC_SYMBOL SIZEOF(lbtrm_data_hdr_t, fec_symbol)
-#define L_LBTRM_DATA_HDR_T (gint) (sizeof(lbtrm_data_hdr_t))
+#define L_LBTRM_DATA_HDR_T (int) (sizeof(lbtrm_data_hdr_t))
 
 #define LBTRM_DATA_UNICAST_NAKS_FLAG 0x80
 #define LBTRM_MULTICAST_NAKS_FLAG 0x40
@@ -423,7 +423,7 @@ typedef struct
 #define L_LBTRM_SM_HDR_T_FLAGS_TGSZ SIZEOF(lbtrm_sm_hdr_t, flags_tgsz)
 #define O_LBTRM_SM_HDR_T_RESERVED OFFSETOF(lbtrm_sm_hdr_t, reserved)
 #define L_LBTRM_SM_HDR_T_RESERVED SIZEOF(lbtrm_sm_hdr_t, reserved)
-#define L_LBTRM_SM_HDR_T (gint) (sizeof(lbtrm_sm_hdr_t))
+#define L_LBTRM_SM_HDR_T (int) (sizeof(lbtrm_sm_hdr_t))
 
 #define LBTRM_SM_UNICAST_NAKS_FLAG 0x80
 #define LBTRM_SM_FLAGS(x) (x >> 4)
@@ -439,7 +439,7 @@ typedef struct
 #define L_LBTRM_NAK_HDR_T_NUM_NAKS SIZEOF(lbtrm_nak_hdr_t, num_naks)
 #define O_LBTRM_NAK_HDR_T_FORMAT OFFSETOF(lbtrm_nak_hdr_t, format)
 #define L_LBTRM_NAK_HDR_T_FORMAT SIZEOF(lbtrm_nak_hdr_t, format)
-#define L_LBTRM_NAK_HDR_T (gint) (sizeof(lbtrm_nak_hdr_t))
+#define L_LBTRM_NAK_HDR_T (int) (sizeof(lbtrm_nak_hdr_t))
 
 #define LBTRM_NAK_SELECTIVE_FORMAT 0x0
 #define LBTRM_NAK_PARITY_FORMAT 0x1
@@ -462,7 +462,7 @@ typedef struct
 #define L_LBTRM_NCF_HDR_T_RESERVED SIZEOF(lbtrm_ncf_hdr_t, reserved)
 #define O_LBTRM_NCF_HDR_T_REASON_FORMAT OFFSETOF(lbtrm_ncf_hdr_t, reason_format)
 #define L_LBTRM_NCF_HDR_T_REASON_FORMAT SIZEOF(lbtrm_ncf_hdr_t, reason_format)
-#define L_LBTRM_NCF_HDR_T (gint) (sizeof(lbtrm_ncf_hdr_t))
+#define L_LBTRM_NCF_HDR_T (int) (sizeof(lbtrm_ncf_hdr_t))
 
 #define LBTRM_NCF_SELECTIVE_FORMAT 0x0
 #define LBTRM_NCF_PARITY_FORMAT 0x1
@@ -484,7 +484,7 @@ typedef struct
 #define L_LBTRM_BASIC_OPT_T_HDR_LEN SIZEOF(lbtrm_basic_opt_t, hdr_len)
 #define O_LBTRM_BASIC_OPT_T_RES OFFSETOF(lbtrm_basic_opt_t, res)
 #define L_LBTRM_BASIC_OPT_T_RES SIZEOF(lbtrm_basic_opt_t, res)
-#define L_LBTRM_BASIC_OPT_T (gint) (sizeof(lbtrm_basic_opt_t))
+#define L_LBTRM_BASIC_OPT_T (int) (sizeof(lbtrm_basic_opt_t))
 
 #define LBTRM_NHDR_DATA 0x0
 
@@ -549,12 +549,12 @@ static const value_string lbtrm_next_header[] =
 /* Global preferences variables (altered by the preferences dialog). */
 static const char * global_lbtrm_mc_address_low = LBTRM_DEFAULT_MC_ADDRESS_LOW;
 static const char * global_lbtrm_mc_address_high = LBTRM_DEFAULT_MC_ADDRESS_HIGH;
-static guint32 global_lbtrm_dest_port_low = LBTRM_DEFAULT_DPORT_LOW;
-static guint32 global_lbtrm_dest_port_high = LBTRM_DEFAULT_DPORT_HIGH;
-static guint32 global_lbtrm_src_port_low = LBTRM_DEFAULT_SPORT_LOW;
-static guint32 global_lbtrm_src_port_high = LBTRM_DEFAULT_SPORT_HIGH;
-static guint32 global_mim_incoming_dest_port = MIM_DEFAULT_INCOMING_DPORT;
-static guint32 global_mim_outgoing_dest_port = MIM_DEFAULT_OUTGOING_DPORT;
+static uint32_t global_lbtrm_dest_port_low = LBTRM_DEFAULT_DPORT_LOW;
+static uint32_t global_lbtrm_dest_port_high = LBTRM_DEFAULT_DPORT_HIGH;
+static uint32_t global_lbtrm_src_port_low = LBTRM_DEFAULT_SPORT_LOW;
+static uint32_t global_lbtrm_src_port_high = LBTRM_DEFAULT_SPORT_HIGH;
+static uint32_t global_mim_incoming_dest_port = MIM_DEFAULT_INCOMING_DPORT;
+static uint32_t global_mim_outgoing_dest_port = MIM_DEFAULT_OUTGOING_DPORT;
 static const char * global_mim_incoming_mc_address = MIM_DEFAULT_MC_INCOMING_ADDRESS;
 static const char * global_mim_outgoing_mc_address = MIM_DEFAULT_MC_OUTGOING_ADDRESS;
 static bool global_lbtrm_expert_separate_naks;
@@ -563,20 +563,20 @@ static bool global_lbtrm_use_tag;
 static bool global_lbtrm_sequence_analysis;
 
 /* Local preferences variables (used by the dissector). */
-static guint32 lbtrm_mc_address_low_host;
-static guint32 lbtrm_mc_address_high_host;
-static guint32 lbtrm_dest_port_low = LBTRM_DEFAULT_DPORT_LOW;
-static guint32 lbtrm_dest_port_high = LBTRM_DEFAULT_DPORT_HIGH;
-static guint32 lbtrm_src_port_low = LBTRM_DEFAULT_SPORT_LOW;
-static guint32 lbtrm_src_port_high = LBTRM_DEFAULT_SPORT_HIGH;
-static guint32 mim_incoming_dest_port = MIM_DEFAULT_INCOMING_DPORT;
-static guint32 mim_outgoing_dest_port = MIM_DEFAULT_OUTGOING_DPORT;
-static guint32 mim_incoming_mc_address_host;
-static guint32 mim_outgoing_mc_address_host;
-static gboolean lbtrm_expert_separate_naks;
-static gboolean lbtrm_expert_separate_ncfs;
-static gboolean lbtrm_use_tag;
-static gboolean lbtrm_sequence_analysis;
+static uint32_t lbtrm_mc_address_low_host;
+static uint32_t lbtrm_mc_address_high_host;
+static uint32_t lbtrm_dest_port_low = LBTRM_DEFAULT_DPORT_LOW;
+static uint32_t lbtrm_dest_port_high = LBTRM_DEFAULT_DPORT_HIGH;
+static uint32_t lbtrm_src_port_low = LBTRM_DEFAULT_SPORT_LOW;
+static uint32_t lbtrm_src_port_high = LBTRM_DEFAULT_SPORT_HIGH;
+static uint32_t mim_incoming_dest_port = MIM_DEFAULT_INCOMING_DPORT;
+static uint32_t mim_outgoing_dest_port = MIM_DEFAULT_OUTGOING_DPORT;
+static uint32_t mim_incoming_mc_address_host;
+static uint32_t mim_outgoing_mc_address_host;
+static bool lbtrm_expert_separate_naks;
+static bool lbtrm_expert_separate_ncfs;
+static bool lbtrm_use_tag;
+static bool lbtrm_sequence_analysis;
 
 /*----------------------------------------------------------------------------*/
 /* Tag management.                                                            */
@@ -585,23 +585,23 @@ typedef struct
 {
     char * name;
     char * mc_address_low;
-    guint32 mc_address_low_val_h;
+    uint32_t mc_address_low_val_h;
     char * mc_address_high;
-    guint32 mc_address_high_val_h;
-    guint32 dport_low;
-    guint32 dport_high;
-    guint32 sport_low;
-    guint32 sport_high;
-    guint32 mim_incoming_dport;
-    guint32 mim_outgoing_dport;
+    uint32_t mc_address_high_val_h;
+    uint32_t dport_low;
+    uint32_t dport_high;
+    uint32_t sport_low;
+    uint32_t sport_high;
+    uint32_t mim_incoming_dport;
+    uint32_t mim_outgoing_dport;
     char * mim_mc_incoming_address;
-    guint32 mim_mc_incoming_address_val_h;
+    uint32_t mim_mc_incoming_address_val_h;
     char * mim_mc_outgoing_address;
-    guint32 mim_mc_outgoing_address_val_h;
+    uint32_t mim_mc_outgoing_address_val_h;
 } lbtrm_tag_entry_t;
 
 static lbtrm_tag_entry_t * lbtrm_tag_entry;
-static guint lbtrm_tag_count;
+static unsigned lbtrm_tag_count;
 
 UAT_CSTRING_CB_DEF(lbtrm_tag, name, lbtrm_tag_entry_t)
 UAT_IPV4_MC_CB_DEF(lbtrm_tag, mc_address_low, lbtrm_tag_entry_t)
@@ -640,7 +640,7 @@ static bool lbtrm_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -648,10 +648,10 @@ static bool lbtrm_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbtrm_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -710,9 +710,9 @@ static void lbtrm_tag_free_cb(void * record)
 
 static char * lbtrm_tag_find(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     lbtrm_tag_entry_t * tag = NULL;
-    guint32 dest_addr_h;
+    uint32_t dest_addr_h;
 
     if (!lbtrm_use_tag)
     {
@@ -770,18 +770,18 @@ static char * lbtrm_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbtrm;
-static gint ett_lbtrm_hdr;
-static gint ett_lbtrm_data;
-static gint ett_lbtrm_data_flags_fec_type;
-static gint ett_lbtrm_sm;
-static gint ett_lbtrm_sm_flags_fec_type;
-static gint ett_lbtrm_nak;
-static gint ett_lbtrm_nak_list;
-static gint ett_lbtrm_ncf;
-static gint ett_lbtrm_ncf_list;
-static gint ett_lbtrm_transport;
-static gint ett_lbtrm_transport_sqn;
+static int ett_lbtrm;
+static int ett_lbtrm_hdr;
+static int ett_lbtrm_data;
+static int ett_lbtrm_data_flags_fec_type;
+static int ett_lbtrm_sm;
+static int ett_lbtrm_sm_flags_fec_type;
+static int ett_lbtrm_nak;
+static int ett_lbtrm_nak_list;
+static int ett_lbtrm_ncf;
+static int ett_lbtrm_ncf_list;
+static int ett_lbtrm_transport;
+static int ett_lbtrm_transport_sqn;
 
 /* Dissector field handles */
 static int hf_lbtrm_channel;
@@ -861,7 +861,7 @@ static expert_field ei_lbtrm_analysis_sm_dup;
 /*----------------------------------------------------------------------------*/
 /* LBT-RM data payload dissection functions.                                  */
 /*----------------------------------------------------------------------------*/
-static int dissect_lbtrm_data_contents(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, guint64 channel)
+static int dissect_lbtrm_data_contents(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, uint64_t channel)
 {
     tvbuff_t * next_tvb;
 
@@ -902,8 +902,8 @@ static int dissect_lbtrm_ncf_list(tvbuff_t * tvb, int offset, packet_info * pinf
 static int dissect_lbtrm_ncf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, lbm_lbtrm_tap_info_t * tap_info)
 {
     int len = 0;
-    guint16 num_ncfs;
-    guint8 reason;
+    uint16_t num_ncfs;
+    uint8_t reason;
     proto_tree * ncf_tree = NULL;
     proto_item * ncf_item = NULL;
     proto_item * reason_item = NULL;
@@ -911,7 +911,7 @@ static int dissect_lbtrm_ncf(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
     ncf_item = proto_tree_add_item(tree, hf_lbtrm_ncf, tvb, offset, -1, ENC_NA);
     ncf_tree = proto_item_add_subtree(ncf_item, ett_lbtrm_ncf);
     num_ncfs = tvb_get_ntohs(tvb, offset + O_LBTRM_NCF_HDR_T_NUM_NCFS);
-    reason = tvb_get_guint8(tvb, offset + O_LBTRM_NCF_HDR_T_REASON_FORMAT);
+    reason = tvb_get_uint8(tvb, offset + O_LBTRM_NCF_HDR_T_REASON_FORMAT);
     proto_tree_add_item(ncf_tree, hf_lbtrm_ncf_trail_sqn, tvb, offset + O_LBTRM_NCF_HDR_T_TRAIL_SQN, L_LBTRM_NCF_HDR_T_TRAIL_SQN, ENC_BIG_ENDIAN);
     proto_tree_add_item(ncf_tree, hf_lbtrm_ncf_num_ncfs, tvb, offset + O_LBTRM_NCF_HDR_T_NUM_NCFS, L_LBTRM_NCF_HDR_T_NUM_NCFS, ENC_BIG_ENDIAN);
     proto_tree_add_item(ncf_tree, hf_lbtrm_ncf_reserved, tvb, offset + O_LBTRM_NCF_HDR_T_RESERVED, L_LBTRM_NCF_HDR_T_RESERVED, ENC_BIG_ENDIAN);
@@ -924,7 +924,7 @@ static int dissect_lbtrm_ncf(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
     }
     tap_info->ncf_reason = LBTRM_NCF_HDR_REASON(reason);
     tap_info->num_sqns = num_ncfs;
-    tap_info->sqns = wmem_alloc_array(pinfo->pool, guint32, num_ncfs);
+    tap_info->sqns = wmem_alloc_array(pinfo->pool, uint32_t, num_ncfs);
     len += dissect_lbtrm_ncf_list(tvb, offset + len, pinfo, ncf_tree, num_ncfs, LBTRM_NCF_HDR_REASON(reason), tap_info);
     proto_item_set_len(ncf_item, len);
     return (len);
@@ -963,7 +963,7 @@ static int dissect_lbtrm_nak_list(tvbuff_t * tvb, int offset, packet_info * pinf
 static int dissect_lbtrm_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, lbm_lbtrm_tap_info_t * tap_info)
 {
     int len = 0;
-    guint16 num_naks;
+    uint16_t num_naks;
     proto_tree * nak_tree = NULL;
     proto_item * nak_item = NULL;
 
@@ -978,7 +978,7 @@ static int dissect_lbtrm_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         expert_add_info(pinfo, nak_item, &ei_lbtrm_analysis_nak);
     }
     tap_info->num_sqns = num_naks;
-    tap_info->sqns = wmem_alloc_array(pinfo->pool, guint32, num_naks);
+    tap_info->sqns = wmem_alloc_array(pinfo->pool, uint32_t, num_naks);
     len += dissect_lbtrm_nak_list(tvb, offset + len, pinfo, nak_tree, num_naks, tap_info);
     proto_item_set_len(nak_item, len);
     return (len);
@@ -987,7 +987,7 @@ static int dissect_lbtrm_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
 /*----------------------------------------------------------------------------*/
 /* LBT-RM session message packet dissection functions.                        */
 /*----------------------------------------------------------------------------*/
-static int dissect_lbtrm_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint32 * sequence, lbm_lbtrm_tap_info_t * tap_info)
+static int dissect_lbtrm_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint32_t * sequence, lbm_lbtrm_tap_info_t * tap_info)
 {
     proto_tree * sm_tree = NULL;
     proto_item * sm_item = NULL;
@@ -997,7 +997,7 @@ static int dissect_lbtrm_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro
         NULL
     };
     proto_item * sm_sqn_item = NULL;
-    guint32 sqn;
+    uint32_t sqn;
 
     sm_item = proto_tree_add_item(tree, hf_lbtrm_sm, tvb, offset, L_LBTRM_SM_HDR_T, ENC_NA);
     sm_tree = proto_item_add_subtree(sm_item, ett_lbtrm_sm);
@@ -1020,7 +1020,7 @@ static int dissect_lbtrm_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro
 /*----------------------------------------------------------------------------*/
 /* LBT-RM data packet dissection functions.                                   */
 /*----------------------------------------------------------------------------*/
-static int dissect_lbtrm_data(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, guint32 * sequence, gboolean * retransmission, lbm_lbtrm_tap_info_t * tap_info)
+static int dissect_lbtrm_data(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, uint32_t * sequence, bool * retransmission, lbm_lbtrm_tap_info_t * tap_info)
 {
     proto_tree * data_tree = NULL;
     proto_item * data_item = NULL;
@@ -1031,15 +1031,15 @@ static int dissect_lbtrm_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p
         NULL
     };
     proto_item * sqn_item = NULL;
-    guint8 flags_val;
-    guint32 sqn;
-    gboolean is_retransmission = FALSE;
+    uint8_t flags_val;
+    uint32_t sqn;
+    bool is_retransmission = false;
 
     data_item = proto_tree_add_item(tree, hf_lbtrm_data, tvb, offset, L_LBTRM_DATA_HDR_T, ENC_NA);
     data_tree = proto_item_add_subtree(data_item, ett_lbtrm_data);
     sqn_item = proto_tree_add_item(data_tree, hf_lbtrm_data_sqn, tvb, offset + O_LBTRM_DATA_HDR_T_SQN, L_LBTRM_DATA_HDR_T_SQN, ENC_BIG_ENDIAN);
     proto_tree_add_item(data_tree, hf_lbtrm_data_trail_sqn, tvb, offset + O_LBTRM_DATA_HDR_T_TRAIL_SQN, L_LBTRM_DATA_HDR_T_TRAIL_SQN, ENC_BIG_ENDIAN);
-    flags_val = tvb_get_guint8(tvb, offset + O_LBTRM_DATA_HDR_T_FLAGS_FEC_TYPE);
+    flags_val = tvb_get_uint8(tvb, offset + O_LBTRM_DATA_HDR_T_FLAGS_FEC_TYPE);
     proto_tree_add_bitmask(data_tree, tvb, offset + O_LBTRM_DATA_HDR_T_FLAGS_FEC_TYPE, hf_lbtrm_data_flags_fec_type, ett_lbtrm_data_flags_fec_type, flags, ENC_BIG_ENDIAN);
     proto_tree_add_item(data_tree, hf_lbtrm_data_flags_tgsz, tvb, offset + O_LBTRM_DATA_HDR_T_FLAGS_TGSZ, L_LBTRM_DATA_HDR_T_FLAGS_TGSZ, ENC_BIG_ENDIAN);
     proto_tree_add_item(data_tree, hf_lbtrm_data_fec_symbol, tvb, offset + O_LBTRM_DATA_HDR_T_FEC_SYMBOL, L_LBTRM_DATA_HDR_T_FEC_SYMBOL, ENC_BIG_ENDIAN);
@@ -1050,7 +1050,7 @@ static int dissect_lbtrm_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p
     }
     if ((flags_val & LBTRM_DATA_RETRANSMISSION_FLAG) != 0)
     {
-        is_retransmission = TRUE;
+        is_retransmission = true;
         expert_add_info_format(pinfo, sqn_item, &ei_lbtrm_analysis_rx, "RX 0x%08x", sqn);
     }
     if (retransmission != NULL)
@@ -1069,7 +1069,7 @@ typedef struct
 {
     proto_tree * tree;
     tvbuff_t * tvb;
-    guint32 current_frame;
+    uint32_t current_frame;
 } lbtrm_sqn_frame_list_callback_data_t;
 
 static bool dissect_lbtrm_sqn_frame_list_callback(const void *key _U_, void * frame, void * user_data)
@@ -1090,7 +1090,7 @@ static bool dissect_lbtrm_sqn_frame_list_callback(const void *key _U_, void * fr
         }
         proto_item_set_generated(transport_item);
     }
-    return FALSE;
+    return false;
 }
 
 static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data _U_)
@@ -1098,26 +1098,26 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     proto_tree * lbtrm_tree = NULL;
     proto_item * lbtrm_item;
     int offset = 0;
-    guint8 next_hdr = 0;
+    uint8_t next_hdr = 0;
     char * tag_name = NULL;
     int dissected_len = 0;
     int total_dissected_len = 0;
     proto_tree * hdr_tree = NULL;
     proto_item * hdr_item = NULL;
-    guint16 src_port = 0;
-    guint32 session_id = 0;
-    guint16 dest_port = 0;
+    uint16_t src_port = 0;
+    uint32_t session_id = 0;
+    uint16_t dest_port = 0;
     lbtrm_transport_t * transport = NULL;
     proto_tree * transport_tree = NULL;
     proto_item * transport_item = NULL;
-    guint32 sequence = 0;
-    gboolean retransmission = FALSE;
-    guint8 packet_type = 0;
-    guint64 channel = LBM_CHANNEL_NO_CHANNEL;
-    guint8 ver_type = 0;
-    guint8 flags_fec_type = 0;
-    guint16 num_naks = 0;
-    guint16 num_ncfs = 0;
+    uint32_t sequence = 0;
+    bool retransmission = false;
+    uint8_t packet_type = 0;
+    uint64_t channel = LBM_CHANNEL_NO_CHANNEL;
+    uint8_t ver_type = 0;
+    uint8_t flags_fec_type = 0;
+    uint16_t num_naks = 0;
+    uint16_t num_ncfs = 0;
     lbm_lbtrm_tap_info_t * tapinfo = NULL;
     proto_item * header_type_item = NULL;
 
@@ -1133,9 +1133,9 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     }
     col_set_fence(pinfo->cinfo, COL_INFO);
 
-    ver_type = tvb_get_guint8(tvb, O_LBTRM_HDR_T_VER_TYPE);
+    ver_type = tvb_get_uint8(tvb, O_LBTRM_HDR_T_VER_TYPE);
     packet_type = LBTRM_HDR_TYPE(ver_type);
-    next_hdr = tvb_get_guint8(tvb, O_LBTRM_HDR_T_NEXT_HDR);
+    next_hdr = tvb_get_uint8(tvb, O_LBTRM_HDR_T_NEXT_HDR);
     src_port = tvb_get_ntohs(tvb, O_LBTRM_HDR_T_UCAST_PORT);
     session_id = tvb_get_ntohl(tvb, O_LBTRM_HDR_T_SESSION_ID);
     if (tag_name != NULL)
@@ -1210,7 +1210,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     {
         case LBTRM_PACKET_TYPE_DATA:
             sequence = tvb_get_ntohl(tvb, L_LBTRM_HDR_T + O_LBTRM_DATA_HDR_T_SQN);
-            flags_fec_type = tvb_get_guint8(tvb, L_LBTRM_HDR_T + O_LBTRM_DATA_HDR_T_FLAGS_FEC_TYPE);
+            flags_fec_type = tvb_get_uint8(tvb, L_LBTRM_HDR_T + O_LBTRM_DATA_HDR_T_FLAGS_FEC_TYPE);
             if ((flags_fec_type & LBTRM_DATA_RETRANSMISSION_FLAG) != 0)
             {
                 col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "DATA(RX) sqn 0x%x Port %" PRIu16 " ID 0x%08x", sequence, src_port, session_id);
@@ -1265,10 +1265,10 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     offset += dissected_len;
     while (next_hdr != LBTRM_NHDR_DATA)
     {
-        guint8 hdrlen = 0;
+        uint8_t hdrlen = 0;
 
-        next_hdr = tvb_get_guint8(tvb, offset + O_LBTRM_BASIC_OPT_T_NEXT_HDR);
-        hdrlen = tvb_get_guint8(tvb, offset + O_LBTRM_BASIC_OPT_T_HDR_LEN);
+        next_hdr = tvb_get_uint8(tvb, offset + O_LBTRM_BASIC_OPT_T_NEXT_HDR);
+        hdrlen = tvb_get_uint8(tvb, offset + O_LBTRM_BASIC_OPT_T_HDR_LEN);
         if (hdrlen == 0)
         {
             break;
@@ -1344,7 +1344,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                             }
                             if (frame->retransmission)
                             {
-                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_retransmission, tvb, 0, 0, TRUE);
+                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_retransmission, tvb, 0, 0, true);
                                 proto_item_set_generated(transport_item);
                                 expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_data_rx);
                             }
@@ -1362,7 +1362,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                             }
                             if (frame->duplicate)
                             {
-                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_duplicate, tvb, 0, 0, TRUE);
+                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_data_duplicate, tvb, 0, 0, true);
                                 proto_item_set_generated(transport_item);
                                 expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_data_dup);
                             }
@@ -1410,7 +1410,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                             }
                             if (frame->duplicate)
                             {
-                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_sm_duplicate, tvb, 0, 0, TRUE);
+                                transport_item = proto_tree_add_boolean(transport_tree, hf_lbtrm_analysis_sm_duplicate, tvb, 0, 0, true);
                                 proto_item_set_generated(transport_item);
                                 expert_add_info(pinfo, transport_item, &ei_lbtrm_analysis_sm_dup);
                             }
@@ -1460,12 +1460,12 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
 static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data)
 {
-    guint32 dest_addr_h;
-    gboolean valid_packet = FALSE;
-    guint8 ver_type = 0;
-    guint8 packet_type = 0;
-    guint8 packet_ver = 0;
-    guint8 next_hdr = 0;
+    uint32_t dest_addr_h;
+    bool valid_packet = false;
+    uint8_t ver_type = 0;
+    uint8_t packet_type = 0;
+    uint8_t packet_ver = 0;
+    uint8_t next_hdr = 0;
 
     /* Must be a UDP packet. */
     if (pinfo->ptype != PT_UDP)
@@ -1481,7 +1481,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         return false;
     }
-    ver_type = tvb_get_guint8(tvb, O_LBTRM_HDR_T_VER_TYPE);
+    ver_type = tvb_get_uint8(tvb, O_LBTRM_HDR_T_VER_TYPE);
     packet_type = LBTRM_HDR_TYPE(ver_type);
     switch (packet_type)
     {
@@ -1498,7 +1498,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         return false;
     }
-    next_hdr = tvb_get_guint8(tvb, O_LBTRM_HDR_T_NEXT_HDR);
+    next_hdr = tvb_get_uint8(tvb, O_LBTRM_HDR_T_NEXT_HDR);
     if (next_hdr != LBTRM_NHDR_DATA)
     {
         return false;
@@ -1507,7 +1507,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         if (lbtrm_tag_find(pinfo) != NULL)
         {
-            valid_packet = TRUE;
+            valid_packet = true;
         }
     }
     else
@@ -1524,7 +1524,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                 if ((pinfo->destport >= lbtrm_dest_port_low) && (pinfo->destport <= lbtrm_dest_port_high))
                 {
                     /* Must be one of ours. */
-                    valid_packet = TRUE;
+                    valid_packet = true;
                 }
             }
             else if ((dest_addr_h == mim_incoming_mc_address_host) || (dest_addr_h == mim_outgoing_mc_address_host))
@@ -1534,7 +1534,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                     || ((dest_addr_h == mim_outgoing_mc_address_host) && (pinfo->destport == mim_outgoing_dest_port)))
                 {
                     /* Must be one of ours. */
-                    valid_packet = TRUE;
+                    valid_packet = true;
                 }
             }
         }
@@ -1543,7 +1543,7 @@ static bool test_lbtrm_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
             /* Not multicast, might be a unicast UDP NAK. Check the destination port. */
             if ((pinfo->destport >= lbtrm_src_port_low) && (pinfo->destport <= lbtrm_src_port_high))
             {
-                valid_packet = TRUE;
+                valid_packet = true;
             }
         }
     }
@@ -1675,7 +1675,7 @@ void proto_register_lbtrm(void)
         { &hf_lbtrm_analysis_sm_duplicate,
             { "Duplicate SM frame", "lbtrm.transport.sm_duplicate", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbtrm,
         &ett_lbtrm_hdr,
@@ -1708,7 +1708,7 @@ void proto_register_lbtrm(void)
         { &ei_lbtrm_analysis_sm_dup, { "lbtrm.analysis.sm.dup", PI_SEQUENCE, PI_NOTE, "Duplicate SM", EXPFILL } },
     };
     module_t * lbtrm_module;
-    guint32 addr;
+    uint32_t addr;
     uat_t * tag_uat;
     expert_module_t * expert_lbtrm;
 
@@ -1827,7 +1827,7 @@ void proto_register_lbtrm(void)
     tag_uat = uat_new("LBT-RM tag definitions",
         sizeof(lbtrm_tag_entry_t),
         "lbtrm_domains",
-        TRUE,
+        true,
         (void * *)&lbtrm_tag_entry,
         &lbtrm_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -1850,10 +1850,10 @@ void proto_register_lbtrm(void)
 /* The registration hand-off routine */
 void proto_reg_handoff_lbtrm(void)
 {
-    static gboolean already_registered = FALSE;
-    guint32 addr;
-    guint32 dest_addr_h_low;
-    guint32 dest_addr_h_high;
+    static bool already_registered = false;
+    uint32_t addr;
+    uint32_t dest_addr_h_low;
+    uint32_t dest_addr_h_high;
 
     if (!already_registered)
     {
@@ -1903,7 +1903,7 @@ void proto_reg_handoff_lbtrm(void)
 
     lbtrm_use_tag = global_lbtrm_use_tag;
 
-    already_registered = TRUE;
+    already_registered = true;
 }
 
 /*
diff --git a/epan/dissectors/packet-lbtrm.h b/epan/dissectors/packet-lbtrm.h
index 30a0a4cff0..9b9409ee0f 100644
--- a/epan/dissectors/packet-lbtrm.h
+++ b/epan/dissectors/packet-lbtrm.h
@@ -16,11 +16,11 @@
 typedef struct
 {
     address source_address;
-    guint16 source_port;
-    guint32 session_id;
+    uint16_t source_port;
+    uint32_t session_id;
     address multicast_group;
-    guint16 dest_port;
-    guint64 channel;
+    uint16_t dest_port;
+    uint64_t channel;
     wmem_tree_t * frame;
     lbm_transport_frame_t * last_frame;
     lbm_transport_frame_t * last_data_frame;
@@ -29,12 +29,12 @@ typedef struct
     lbm_transport_frame_t * last_ncf_frame;
     wmem_tree_t * data_sqn;
     wmem_tree_t * sm_sqn;
-    guint32 data_high_sqn;
-    guint32 sm_high_sqn;
+    uint32_t data_high_sqn;
+    uint32_t sm_high_sqn;
 } lbtrm_transport_t;
 
-lbtrm_transport_t * lbtrm_transport_add(const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port, guint32 frame);
-char * lbtrm_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id, const address * multicast_group, guint16 dest_port);
+lbtrm_transport_t * lbtrm_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port, uint32_t frame);
+char * lbtrm_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id, const address * multicast_group, uint16_t dest_port);
 
 #endif
 
diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c
index 29d85d360a..1c47ffb7fe 100644
--- a/epan/dissectors/packet-lbtru.c
+++ b/epan/dissectors/packet-lbtru.c
@@ -39,7 +39,7 @@ static int lbtru_tap_handle = -1;
 
 static const address lbtru_null_address = ADDRESS_INIT_NONE;
 
-static lbtru_transport_t * lbtru_transport_find(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame)
+static lbtru_transport_t * lbtru_transport_find(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame)
 {
     lbtru_transport_t * entry = NULL;
     wmem_tree_t * session_tree = NULL;
@@ -68,7 +68,7 @@ static lbtru_transport_t * lbtru_transport_find(const address * source_address,
     return (entry);
 }
 
-lbtru_transport_t * lbtru_transport_add(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame)
+lbtru_transport_t * lbtru_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame)
 {
     lbtru_transport_t * entry = NULL;
     wmem_tree_t * session_tree = NULL;
@@ -112,7 +112,7 @@ lbtru_transport_t * lbtru_transport_add(const address * source_address, guint16
     return (entry);
 }
 
-static lbtru_client_transport_t * lbtru_client_transport_find(lbtru_transport_t * transport, const address * receiver_address, guint16 receiver_port, guint32 frame)
+static lbtru_client_transport_t * lbtru_client_transport_find(lbtru_transport_t * transport, const address * receiver_address, uint16_t receiver_port, uint32_t frame)
 {
     lbtru_client_transport_t * entry = NULL;
     conversation_t * client_conv = NULL;
@@ -135,7 +135,7 @@ static lbtru_client_transport_t * lbtru_client_transport_find(lbtru_transport_t
     return (entry);
 }
 
-static lbtru_client_transport_t * lbtru_client_transport_add(lbtru_transport_t * transport, const address * receiver_address, guint16 receiver_port, guint32 frame)
+static lbtru_client_transport_t * lbtru_client_transport_add(lbtru_transport_t * transport, const address * receiver_address, uint16_t receiver_port, uint32_t frame)
 {
     lbtru_client_transport_t * entry = NULL;
     conversation_t * client_conv = NULL;
@@ -193,7 +193,7 @@ static lbtru_client_transport_t * lbtru_client_transport_add(lbtru_transport_t *
     return (entry);
 }
 
-static lbm_transport_sqn_t * lbtru_client_transport_sqn_find(lbtru_client_transport_t * client, guint8 type, guint32 sqn)
+static lbm_transport_sqn_t * lbtru_client_transport_sqn_find(lbtru_client_transport_t * client, uint8_t type, uint32_t sqn)
 {
     lbm_transport_sqn_t * sqn_entry = NULL;
 
@@ -245,12 +245,12 @@ static lbm_transport_sqn_t * lbtru_client_transport_sqn_add(lbtru_client_transpo
     return (sqn_entry);
 }
 
-static lbm_transport_frame_t * lbtru_client_transport_frame_find(lbtru_client_transport_t * client, guint32 frame)
+static lbm_transport_frame_t * lbtru_client_transport_frame_find(lbtru_client_transport_t * client, uint32_t frame)
 {
     return ((lbm_transport_frame_t *) wmem_tree_lookup32(client->frame, frame));
 }
 
-static lbm_transport_frame_t * lbtru_client_transport_frame_add(lbtru_client_transport_t * client, guint8 type, guint32 frame, guint32 sqn, gboolean retransmission)
+static lbm_transport_frame_t * lbtru_client_transport_frame_add(lbtru_client_transport_t * client, uint8_t type, uint32_t frame, uint32_t sqn, bool retransmission)
 {
     lbm_transport_sqn_t * dup_sqn_entry = NULL;
     lbm_transport_frame_t * frame_entry = NULL;
@@ -284,7 +284,7 @@ static lbm_transport_frame_t * lbtru_client_transport_frame_add(lbtru_client_tra
                         /* Out of order */
                         if (dup_sqn_entry != NULL)
                         {
-                            frame_entry->duplicate = TRUE;
+                            frame_entry->duplicate = true;
                         }
                         if (frame_entry->sqn != client->data_high_sqn)
                         {
@@ -322,7 +322,7 @@ static lbm_transport_frame_t * lbtru_client_transport_frame_add(lbtru_client_tra
                     dup_sqn_entry = lbtru_client_transport_sqn_find(client, type, frame_entry->sqn);
                     if (dup_sqn_entry != NULL)
                     {
-                        frame_entry->duplicate = TRUE;
+                        frame_entry->duplicate = true;
                     }
                     if (frame_entry->sqn != client->sm_high_sqn)
                     {
@@ -391,7 +391,7 @@ static lbm_transport_frame_t * lbtru_client_transport_frame_add(lbtru_client_tra
     return (frame_entry);
 }
 
-static char * lbtru_transport_source_string_format(wmem_allocator_t *scope, const address * source_address, guint16 source_port, guint32 session_id)
+static char * lbtru_transport_source_string_format(wmem_allocator_t *scope, const address * source_address, uint16_t source_port, uint32_t session_id)
 {
     char * bufptr = NULL;
 
@@ -406,7 +406,7 @@ static char * lbtru_transport_source_string_format(wmem_allocator_t *scope, cons
     return (bufptr);
 }
 
-char * lbtru_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id)
+char * lbtru_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id)
 {
     /* Returns a file-scoped string. */
     return lbtru_transport_source_string_format(wmem_file_scope(), source_address, source_port, session_id);
@@ -434,7 +434,7 @@ typedef struct
 #define L_LBTRU_HDR_T_NEXT_HDR SIZEOF(lbtru_hdr_t, next_hdr)
 #define O_LBTRU_HDR_T_FLAGS_OR_RES OFFSETOF(lbtru_hdr_t, flags_or_res)
 #define L_LBTRU_HDR_T_FLAGS_OR_RES SIZEOF(lbtru_hdr_t, flags_or_res)
-#define L_LBTRU_HDR_T (gint) sizeof(lbtru_hdr_t)
+#define L_LBTRU_HDR_T (int) sizeof(lbtru_hdr_t)
 
 #define LBTRU_VERSION 0x00
 #define LBTRU_HDR_VER(x) (x >> 4)
@@ -454,7 +454,7 @@ typedef struct
 #define L_LBTRU_DATA_HDR_T_SQN SIZEOF(lbtru_data_hdr_t, sqn)
 #define O_LBTRU_DATA_HDR_T_TRAIL_SQN OFFSETOF(lbtru_data_hdr_t, trail_sqn)
 #define L_LBTRU_DATA_HDR_T_TRAIL_SQN SIZEOF(lbtru_data_hdr_t, trail_sqn)
-#define L_LBTRU_DATA_HDR_T (gint) (sizeof(lbtru_data_hdr_t))
+#define L_LBTRU_DATA_HDR_T (int) (sizeof(lbtru_data_hdr_t))
 
 /* LBT-RU Session Message header */
 typedef struct
@@ -469,7 +469,7 @@ typedef struct
 #define L_LBTRU_SM_HDR_T_LEAD_SQN SIZEOF(lbtru_sm_hdr_t, lead_sqn)
 #define O_LBTRU_SM_HDR_T_TRAIL_SQN OFFSETOF(lbtru_sm_hdr_t, trail_sqn)
 #define L_LBTRU_SM_HDR_T_TRAIL_SQN SIZEOF(lbtru_sm_hdr_t, trail_sqn)
-#define L_LBTRU_SM_HDR_T (gint) (sizeof(lbtru_sm_hdr_t))
+#define L_LBTRU_SM_HDR_T (int) (sizeof(lbtru_sm_hdr_t))
 
 #define LBTRU_SM_SYN_FLAG 0x8000
 
@@ -483,7 +483,7 @@ typedef struct
 #define L_LBTRU_NAK_HDR_T_NUM_NAKS SIZEOF(lbtru_nak_hdr_t, num_naks)
 #define O_LBTRU_NAK_HDR_T_FORMAT OFFSETOF(lbtru_nak_hdr_t, format)
 #define L_LBTRU_NAK_HDR_T_FORMAT SIZEOF(lbtru_nak_hdr_t, format)
-#define L_LBTRU_NAK_HDR_T (gint) (sizeof(lbtru_nak_hdr_t))
+#define L_LBTRU_NAK_HDR_T (int) (sizeof(lbtru_nak_hdr_t))
 
 #define LBTRU_NAK_SELECTIVE_FORMAT 0x0
 #define LBTRU_NAK_HDR_FORMAT_MASK 0x000F
@@ -505,7 +505,7 @@ typedef struct
 #define L_LBTRU_NCF_HDR_T_RESERVED SIZEOF(lbtru_ncf_hdr_t, reserved)
 #define O_LBTRU_NCF_HDR_T_REASON_FORMAT OFFSETOF(lbtru_ncf_hdr_t, reason_format)
 #define L_LBTRU_NCF_HDR_T_REASON_FORMAT SIZEOF(lbtru_ncf_hdr_t, reason_format)
-#define L_LBTRU_NCF_HDR_T (gint) (sizeof(lbtru_ncf_hdr_t))
+#define L_LBTRU_NCF_HDR_T (int) (sizeof(lbtru_ncf_hdr_t))
 
 #define LBTRU_NCF_SELECTIVE_FORMAT 0x0
 #define LBTRU_NCF_HDR_REASON(x) ((x & 0xF0) >> 4)
@@ -520,7 +520,7 @@ typedef struct
 } lbtru_ack_hdr_t;
 #define O_LBTRU_ACK_HDR_T_ACK_SQN OFFSETOF(lbtru_ack_hdr_t, ack_sqn)
 #define L_LBTRU_ACK_HDR_T_ACK_SQN SIZEOF(lbtru_ack_hdr_t, ack_sqn)
-#define L_LBTRU_ACK_HDR_T (gint) (sizeof(lbtru_ack_hdr_t))
+#define L_LBTRU_ACK_HDR_T (int) (sizeof(lbtru_ack_hdr_t))
 
 /* LBT-RU basic option header */
 typedef struct
@@ -535,7 +535,7 @@ typedef struct
 #define L_LBTRU_BASIC_OPT_T_HDR_LEN SIZEOF(lbtru_basic_opt_t, hdr_len)
 #define O_LBTRU_BASIC_OPT_T_RES OFFSETOF(lbtru_basic_opt_t, res)
 #define L_LBTRU_BASIC_OPT_T_RES SIZEOF(lbtru_basic_opt_t, res)
-#define L_LBTRU_BASIC_OPT_T (gint) (sizeof(lbtru_basic_opt_t))
+#define L_LBTRU_BASIC_OPT_T (int) (sizeof(lbtru_basic_opt_t))
 
 /* LBT-RU Session ID option header */
 typedef struct
@@ -544,7 +544,7 @@ typedef struct
 } lbtru_sid_opt_t;
 #define O_LBTRU_SID_OPT_T_SESSION_ID OFFSETOF(lbtru_sid_opt_t, session_id)
 #define L_LBTRU_SID_OPT_T_SESSION_ID SIZEOF(lbtru_sid_opt_t, session_id)
-#define L_LBTRU_SID_OPT_T (gint) (sizeof(lbtru_sid_opt_t))
+#define L_LBTRU_SID_OPT_T (int) (sizeof(lbtru_sid_opt_t))
 
 /* LBT-RU Client ID option header */
 typedef struct
@@ -553,7 +553,7 @@ typedef struct
 } lbtru_cid_opt_t;
 #define O_LBTRU_CID_OPT_T_CLIENT_SID OFFSETOF(lbtru_cid_opt_t, client_sid)
 #define L_LBTRU_CID_OPT_T_CLIENT_SID SIZEOF(lbtru_cid_opt_t, client_sid)
-#define L_LBTRU_CID_OPT_T (gint) (sizeof(lbtru_cid_opt_t))
+#define L_LBTRU_CID_OPT_T (int) (sizeof(lbtru_cid_opt_t))
 
 #define LBTRU_OPT_IGNORE 0x8000
 
@@ -629,24 +629,24 @@ static const value_string lbtru_next_header[] =
 #define LBTRU_DEFAULT_RECEIVER_PORT_HIGH 14379
 
 /* Global preferences variables (altered by the preferences dialog). */
-static guint32 global_lbtru_source_port_low = LBTRU_DEFAULT_SOURCE_PORT_LOW;
-static guint32 global_lbtru_source_port_high = LBTRU_DEFAULT_SOURCE_PORT_HIGH;
-static guint32 global_lbtru_receiver_port_low = LBTRU_DEFAULT_RECEIVER_PORT_LOW;
-static guint32 global_lbtru_receiver_port_high = LBTRU_DEFAULT_RECEIVER_PORT_HIGH;
+static uint32_t global_lbtru_source_port_low = LBTRU_DEFAULT_SOURCE_PORT_LOW;
+static uint32_t global_lbtru_source_port_high = LBTRU_DEFAULT_SOURCE_PORT_HIGH;
+static uint32_t global_lbtru_receiver_port_low = LBTRU_DEFAULT_RECEIVER_PORT_LOW;
+static uint32_t global_lbtru_receiver_port_high = LBTRU_DEFAULT_RECEIVER_PORT_HIGH;
 static bool global_lbtru_expert_separate_naks;
 static bool global_lbtru_expert_separate_ncfs;
 static bool global_lbtru_use_tag;
 static bool global_lbtru_sequence_analysis;
 
 /* Local preferences variables (used by the dissector). */
-static guint32 lbtru_source_port_low = LBTRU_DEFAULT_SOURCE_PORT_LOW;
-static guint32 lbtru_source_port_high = LBTRU_DEFAULT_SOURCE_PORT_HIGH;
-static guint32 lbtru_receiver_port_low = LBTRU_DEFAULT_RECEIVER_PORT_LOW;
-static guint32 lbtru_receiver_port_high = LBTRU_DEFAULT_RECEIVER_PORT_HIGH;
-static gboolean lbtru_expert_separate_naks;
-static gboolean lbtru_expert_separate_ncfs;
-static gboolean lbtru_use_tag;
-static gboolean lbtru_sequence_analysis;
+static uint32_t lbtru_source_port_low = LBTRU_DEFAULT_SOURCE_PORT_LOW;
+static uint32_t lbtru_source_port_high = LBTRU_DEFAULT_SOURCE_PORT_HIGH;
+static uint32_t lbtru_receiver_port_low = LBTRU_DEFAULT_RECEIVER_PORT_LOW;
+static uint32_t lbtru_receiver_port_high = LBTRU_DEFAULT_RECEIVER_PORT_HIGH;
+static bool lbtru_expert_separate_naks;
+static bool lbtru_expert_separate_ncfs;
+static bool lbtru_use_tag;
+static bool lbtru_sequence_analysis;
 
 /*----------------------------------------------------------------------------*/
 /* Tag management.                                                            */
@@ -654,14 +654,14 @@ static gboolean lbtru_sequence_analysis;
 typedef struct
 {
     char * name;
-    guint32 source_port_low;
-    guint32 source_port_high;
-    guint32 receiver_port_low;
-    guint32 receiver_port_high;
+    uint32_t source_port_low;
+    uint32_t source_port_high;
+    uint32_t receiver_port_low;
+    uint32_t receiver_port_high;
 } lbtru_tag_entry_t;
 
 static lbtru_tag_entry_t * lbtru_tag_entry;
-static guint lbtru_tag_count;
+static unsigned lbtru_tag_count;
 
 UAT_CSTRING_CB_DEF(lbtru_tag, name, lbtru_tag_entry_t)
 UAT_DEC_CB_DEF(lbtru_tag, source_port_low, lbtru_tag_entry_t)
@@ -688,7 +688,7 @@ static bool lbtru_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -696,10 +696,10 @@ static bool lbtru_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbtru_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -728,7 +728,7 @@ static void lbtru_tag_free_cb(void * record)
 
 static char * lbtru_tag_find(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     lbtru_tag_entry_t * tag = NULL;
 
     if (!lbtru_use_tag)
@@ -760,22 +760,22 @@ static char * lbtru_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbtru;
-static gint ett_lbtru_channel;
-static gint ett_lbtru_hdr;
-static gint ett_lbtru_hdr_flags;
-static gint ett_lbtru_data;
-static gint ett_lbtru_sm;
-static gint ett_lbtru_nak;
-static gint ett_lbtru_nak_list;
-static gint ett_lbtru_ncf;
-static gint ett_lbtru_ncf_list;
-static gint ett_lbtru_ack;
-static gint ett_lbtru_opt;
-static gint ett_lbtru_opt_sid_flags;
-static gint ett_lbtru_opt_cid_flags;
-static gint ett_lbtru_transport;
-static gint ett_lbtru_transport_sqn;
+static int ett_lbtru;
+static int ett_lbtru_channel;
+static int ett_lbtru_hdr;
+static int ett_lbtru_hdr_flags;
+static int ett_lbtru_data;
+static int ett_lbtru_sm;
+static int ett_lbtru_nak;
+static int ett_lbtru_nak_list;
+static int ett_lbtru_ncf;
+static int ett_lbtru_ncf_list;
+static int ett_lbtru_ack;
+static int ett_lbtru_opt;
+static int ett_lbtru_opt_sid_flags;
+static int ett_lbtru_opt_cid_flags;
+static int ett_lbtru_transport;
+static int ett_lbtru_transport_sqn;
 
 /* Dissector field handles */
 static int hf_lbtru_channel;
@@ -880,7 +880,7 @@ static expert_field ei_lbtru_analysis_sm_dup;
 /*----------------------------------------------------------------------------*/
 /* LBT-RU data payload dissection functions.                                  */
 /*----------------------------------------------------------------------------*/
-static int dissect_lbtru_data_contents(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, guint64 channel)
+static int dissect_lbtru_data_contents(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, const char * tag_name, uint64_t channel)
 {
     tvbuff_t * next_tvb;
 
@@ -939,14 +939,14 @@ static int dissect_lbtru_ncf_list(tvbuff_t * tvb, int offset, packet_info * pinf
 static int dissect_lbtru_ncf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, lbm_lbtru_tap_info_t * tap_info)
 {
     int len_dissected;
-    guint8 reason_format;
+    uint8_t reason_format;
     proto_tree * ncf_tree = NULL;
     proto_item * ncf_item = NULL;
-    guint16 num_ncfs = 0;
+    uint16_t num_ncfs = 0;
 
     ncf_item = proto_tree_add_item(tree, hf_lbtru_ncf, tvb, offset, -1, ENC_NA);
     ncf_tree = proto_item_add_subtree(ncf_item, ett_lbtru_ncf);
-    reason_format = tvb_get_guint8(tvb, offset + O_LBTRU_NCF_HDR_T_REASON_FORMAT);
+    reason_format = tvb_get_uint8(tvb, offset + O_LBTRU_NCF_HDR_T_REASON_FORMAT);
     num_ncfs = tvb_get_ntohs(tvb, offset + O_LBTRU_NCF_HDR_T_NUM_NCFS);
     proto_tree_add_item(ncf_tree, hf_lbtru_ncf_trail_sqn, tvb, offset + O_LBTRU_NCF_HDR_T_TRAIL_SQN, L_LBTRU_NCF_HDR_T_TRAIL_SQN, ENC_BIG_ENDIAN);
     proto_tree_add_item(ncf_tree, hf_lbtru_ncf_num, tvb, offset + O_LBTRU_NCF_HDR_T_NUM_NCFS, L_LBTRU_NCF_HDR_T_NUM_NCFS, ENC_BIG_ENDIAN);
@@ -960,7 +960,7 @@ static int dissect_lbtru_ncf(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
     }
     tap_info->ncf_reason = LBTRU_NCF_HDR_REASON(reason_format);
     tap_info->num_sqns = num_ncfs;
-    tap_info->sqns = wmem_alloc_array(pinfo->pool, guint32, num_ncfs);
+    tap_info->sqns = wmem_alloc_array(pinfo->pool, uint32_t, num_ncfs);
     len_dissected += dissect_lbtru_ncf_list(tvb, offset + L_LBTRU_NCF_HDR_T, pinfo, ncf_tree, num_ncfs, LBTRU_NCF_HDR_REASON(reason_format), tap_info);
     proto_item_set_len(ncf_item, len_dissected);
     return (len_dissected);
@@ -1002,7 +1002,7 @@ static int dissect_lbtru_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
     int len_dissected;
     proto_tree * nak_tree = NULL;
     proto_item * nak_item = NULL;
-    guint16 num_naks = 0;
+    uint16_t num_naks = 0;
 
     nak_item = proto_tree_add_item(tree, hf_lbtru_nak, tvb, offset, -1, ENC_NA);
     nak_tree = proto_item_add_subtree(nak_item, ett_lbtru_nak);
@@ -1015,7 +1015,7 @@ static int dissect_lbtru_nak(tvbuff_t * tvb, int offset, packet_info * pinfo, pr
         expert_add_info(pinfo, nak_item, &ei_lbtru_analysis_nak);
     }
     tap_info->num_sqns = num_naks;
-    tap_info->sqns = wmem_alloc_array(pinfo->pool, guint32, num_naks);
+    tap_info->sqns = wmem_alloc_array(pinfo->pool, uint32_t, num_naks);
     len_dissected += dissect_lbtru_nak_list(tvb, offset + L_LBTRU_NAK_HDR_T, pinfo, nak_tree, num_naks, tap_info);
     proto_item_set_len(nak_item, len_dissected);
     return (len_dissected);
@@ -1070,7 +1070,7 @@ typedef struct
 {
     proto_tree * tree;
     tvbuff_t * tvb;
-    guint32 current_frame;
+    uint32_t current_frame;
 } lbtru_sqn_frame_list_callback_data_t;
 
 static bool dissect_lbtru_sqn_frame_list_callback(const void *key _U_, void * frame, void * user_data)
@@ -1091,7 +1091,7 @@ static bool dissect_lbtru_sqn_frame_list_callback(const void *key _U_, void * fr
         }
         proto_item_set_generated(transport_item);
     }
-    return FALSE;
+    return false;
 }
 
 static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data _U_)
@@ -1109,7 +1109,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
         NULL
     };
     int ofs = 0;
-    guint32 session_id = 0;
+    uint32_t session_id = 0;
     char * tag_name = NULL;
     int dissected_len;
     int total_dissected_len = 0;
@@ -1117,24 +1117,24 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     proto_item * header_item = NULL;
     proto_tree * transport_tree = NULL;
     proto_item * transport_item = NULL;
-    gboolean from_source = TRUE;
-    guint8 packet_type = 0;
+    bool from_source = true;
+    uint8_t packet_type = 0;
     address source_address;
     address receiver_address;
-    guint16 source_port = 0;
-    guint16 receiver_port = 0;
+    uint16_t source_port = 0;
+    uint16_t receiver_port = 0;
     lbtru_transport_t * transport = NULL;
     lbtru_client_transport_t * client = NULL;
-    guint64 channel = LBM_CHANNEL_NO_CHANNEL;
+    uint64_t channel = LBM_CHANNEL_NO_CHANNEL;
     proto_tree * channel_tree = NULL;
     proto_item * channel_item = NULL;
-    guint8 ver_type = 0;
-    guint8 next_hdr = 0;
-    guint32 packet_sqn = 0;
-    guint16 flags_or_res = 0;
-    guint16 num_naks = 0;
-    guint16 num_ncfs = 0;
-    gboolean retransmission = FALSE;
+    uint8_t ver_type = 0;
+    uint8_t next_hdr = 0;
+    uint32_t packet_sqn = 0;
+    uint16_t flags_or_res = 0;
+    uint16_t num_naks = 0;
+    uint16_t num_ncfs = 0;
+    bool retransmission = false;
     proto_item * fld_item = NULL;
     proto_item * ei_item = NULL;
     proto_item * type_item = NULL;
@@ -1153,8 +1153,8 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
     }
     col_set_fence(pinfo->cinfo, COL_INFO);
 
-    ver_type = tvb_get_guint8(tvb, O_LBTRU_HDR_T_VER_TYPE);
-    next_hdr = tvb_get_guint8(tvb, O_LBTRU_HDR_T_NEXT_HDR);
+    ver_type = tvb_get_uint8(tvb, O_LBTRU_HDR_T_VER_TYPE);
+    next_hdr = tvb_get_uint8(tvb, O_LBTRU_HDR_T_NEXT_HDR);
     flags_or_res = tvb_get_ntohs(tvb, O_LBTRU_HDR_T_FLAGS_OR_RES);
     packet_type = LBTRU_HDR_TYPE(ver_type);
     if (tag_name != NULL)
@@ -1195,8 +1195,8 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
             packet_sqn = tvb_get_ntohl(tvb, L_LBTRU_HDR_T + O_LBTRU_DATA_HDR_T_SQN);
             if ((flags_or_res & LBTRU_RETRANSMISSION_FLAG) != 0)
             {
-                retransmission = TRUE;
-                tapinfo->retransmission = TRUE;
+                retransmission = true;
+                tapinfo->retransmission = true;
             }
             if (retransmission)
             {
@@ -1206,7 +1206,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
             {
                 col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "DATA sqn 0x%x", packet_sqn);
             }
-            from_source = TRUE;
+            from_source = true;
             break;
         case LBTRU_PACKET_TYPE_SM:
             packet_sqn = tvb_get_ntohl(tvb, L_LBTRU_HDR_T + O_LBTRU_SM_HDR_T_SM_SQN);
@@ -1218,30 +1218,30 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
             {
                 col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "SM sqn 0x%x", packet_sqn);
             }
-            from_source = TRUE;
+            from_source = true;
             break;
         case LBTRU_PACKET_TYPE_NAK:
             num_naks = tvb_get_ntohs(tvb, L_LBTRU_HDR_T + O_LBTRU_NAK_HDR_T_NUM_NAKS);
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "NAK %" PRIu16 " naks", num_naks);
-            from_source = FALSE;
+            from_source = false;
             break;
         case LBTRU_PACKET_TYPE_NCF:
             num_ncfs = tvb_get_ntohs(tvb, L_LBTRU_HDR_T + O_LBTRU_NCF_HDR_T_NUM_NCFS);
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "NCF %" PRIu16 " ncfs", num_ncfs);
-            from_source = TRUE;
+            from_source = true;
             break;
         case LBTRU_PACKET_TYPE_ACK:
             packet_sqn = tvb_get_ntohl(tvb, L_LBTRU_HDR_T + O_LBTRU_ACK_HDR_T_ACK_SQN);
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "ACK sqn 0x%x", packet_sqn);
-            from_source = FALSE;
+            from_source = false;
             break;
         case LBTRU_PACKET_TYPE_CREQ:
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "CREQ %s", val_to_str(flags_or_res, lbtru_creq_request, "Unknown (0x%02x)"));
-            from_source = FALSE;
+            from_source = false;
             break;
         case LBTRU_PACKET_TYPE_RST:
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "RST %s", val_to_str(flags_or_res, lbtru_rst_reason, "Unknown (0x%02x)"));
-            from_source = TRUE;
+            from_source = true;
             break;
         default:
             col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ",  "Unknown (0x%02x)", LBTRU_HDR_TYPE(ver_type));
@@ -1338,10 +1338,10 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
             NULL
         };
         int hdrlen;
-        guint8 cur_next_hdr;
+        uint8_t cur_next_hdr;
 
-        cur_next_hdr = tvb_get_guint8(tvb, ofs + O_LBTRU_BASIC_OPT_T_NEXT_HDR);
-        hdrlen = (int)tvb_get_guint8(tvb, ofs + O_LBTRU_BASIC_OPT_T_HDR_LEN);
+        cur_next_hdr = tvb_get_uint8(tvb, ofs + O_LBTRU_BASIC_OPT_T_NEXT_HDR);
+        hdrlen = (int)tvb_get_uint8(tvb, ofs + O_LBTRU_BASIC_OPT_T_HDR_LEN);
         switch (next_hdr)
         {
             case LBTRU_NHDR_SID:
@@ -1499,7 +1499,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                         }
                         if (frame->retransmission)
                         {
-                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_retransmission, tvb, 0, 0, TRUE);
+                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_retransmission, tvb, 0, 0, true);
                             proto_item_set_generated(transport_item);
                             expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_data_rx);
                         }
@@ -1518,7 +1518,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                         }
                         if (frame->duplicate)
                         {
-                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_duplicate, tvb, 0, 0, TRUE);
+                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_data_duplicate, tvb, 0, 0, true);
                             proto_item_set_generated(transport_item);
                             expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_data_dup);
                         }
@@ -1567,7 +1567,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                         }
                         if (frame->duplicate)
                         {
-                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_sm_duplicate, tvb, 0, 0, TRUE);
+                            transport_item = proto_tree_add_boolean(transport_tree, hf_lbtru_analysis_sm_duplicate, tvb, 0, 0, true);
                             proto_item_set_generated(transport_item);
                             expert_add_info(pinfo, transport_item, &ei_lbtru_analysis_sm_dup);
                         }
@@ -1647,7 +1647,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
 static bool test_lbtru_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * user_data)
 {
-    gboolean valid_packet = FALSE;
+    bool valid_packet = false;
 
     /* Must be a UDP packet. */
     if (pinfo->ptype != PT_UDP)
@@ -1664,7 +1664,7 @@ static bool test_lbtru_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     {
         if (lbtru_tag_find(pinfo) != NULL)
         {
-            valid_packet = TRUE;
+            valid_packet = true;
         }
     }
     else
@@ -1683,7 +1683,7 @@ static bool test_lbtru_packet(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                 && (pinfo->srcport <= lbtru_source_port_high)))
         {
             /* One of ours. */
-            valid_packet = TRUE;
+            valid_packet = true;
         }
     }
     if (valid_packet)
@@ -1855,7 +1855,7 @@ void proto_register_lbtru(void)
         { &hf_lbtru_analysis_sm_duplicate,
             { "Duplicate SM Frame", "lbtru.analysis.sm_duplicate", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbtru,
         &ett_lbtru_channel,
@@ -1969,7 +1969,7 @@ void proto_register_lbtru(void)
     tag_uat = uat_new("LBT-RU tag definitions",
         sizeof(lbtru_tag_entry_t),
         "lbtru_domains",
-        TRUE,
+        true,
         (void * *)&lbtru_tag_entry,
         &lbtru_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -1990,7 +1990,7 @@ void proto_register_lbtru(void)
 /* The registration hand-off routine */
 void proto_reg_handoff_lbtru(void)
 {
-    static gboolean already_registered = FALSE;
+    static bool already_registered = false;
 
     if (!already_registered)
     {
@@ -2019,7 +2019,7 @@ void proto_reg_handoff_lbtru(void)
 
     lbtru_use_tag = global_lbtru_use_tag;
 
-    already_registered = TRUE;
+    already_registered = true;
 }
 
 /*
diff --git a/epan/dissectors/packet-lbtru.h b/epan/dissectors/packet-lbtru.h
index a98fff621d..f41b7d7ea9 100644
--- a/epan/dissectors/packet-lbtru.h
+++ b/epan/dissectors/packet-lbtru.h
@@ -16,18 +16,18 @@
 typedef struct
 {
     address source_address;
-    guint16 source_port;
-    guint32 session_id;
-    guint64 channel;
-    guint32 next_client_id;
+    uint16_t source_port;
+    uint32_t session_id;
+    uint64_t channel;
+    uint32_t next_client_id;
     wmem_list_t * client_list;
 } lbtru_transport_t;
 
 typedef struct
 {
     address receiver_address;
-    guint16 receiver_port;
-    guint32 id;
+    uint16_t receiver_port;
+    uint32_t id;
     lbtru_transport_t * transport;
     wmem_tree_t * frame;
     lbm_transport_frame_t * last_frame;
@@ -40,12 +40,12 @@ typedef struct
     lbm_transport_frame_t * last_rst_frame;
     wmem_tree_t * data_sqn;
     wmem_tree_t * sm_sqn;
-    guint32 data_high_sqn;
-    guint32 sm_high_sqn;
+    uint32_t data_high_sqn;
+    uint32_t sm_high_sqn;
 } lbtru_client_transport_t;
 
-lbtru_transport_t * lbtru_transport_add(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame);
-char * lbtru_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id);
+lbtru_transport_t * lbtru_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame);
+char * lbtru_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id);
 
 #endif
 
diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c
index 40db210eac..3eee43bec5 100644
--- a/epan/dissectors/packet-lbttcp.c
+++ b/epan/dissectors/packet-lbttcp.c
@@ -41,7 +41,7 @@ typedef struct
 
 static const address lbttcp_null_address = ADDRESS_INIT_NONE;
 
-lbttcp_transport_t * lbttcp_transport_find(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame)
+lbttcp_transport_t * lbttcp_transport_find(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame)
 {
     lbttcp_transport_t * entry = NULL;
     conversation_t * conv = NULL;
@@ -59,7 +59,7 @@ lbttcp_transport_t * lbttcp_transport_find(const address * source_address, guint
     return (entry);
 }
 
-static lbttcp_transport_t * lbttcp_transport_create(const address * source_address, guint16 source_port, guint32 session_id)
+static lbttcp_transport_t * lbttcp_transport_create(const address * source_address, uint16_t source_port, uint32_t session_id)
 {
     lbttcp_transport_t * transport = NULL;
 
@@ -73,7 +73,7 @@ static lbttcp_transport_t * lbttcp_transport_create(const address * source_addre
     return (transport);
 }
 
-lbttcp_transport_t * lbttcp_transport_add(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame)
+lbttcp_transport_t * lbttcp_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame)
 {
     lbttcp_transport_t * entry = NULL;
     conversation_t * conv = NULL;
@@ -103,7 +103,7 @@ lbttcp_transport_t * lbttcp_transport_add(const address * source_address, guint1
     return (entry);
 }
 
-static lbttcp_client_transport_t * lbttcp_client_transport_find(lbttcp_transport_t * transport, const address * receiver_address, guint16 receiver_port, guint32 frame)
+static lbttcp_client_transport_t * lbttcp_client_transport_find(lbttcp_transport_t * transport, const address * receiver_address, uint16_t receiver_port, uint32_t frame)
 {
     lbttcp_client_transport_t * entry = NULL;
     conversation_t * client_conv = NULL;
@@ -126,7 +126,7 @@ static lbttcp_client_transport_t * lbttcp_client_transport_find(lbttcp_transport
     return (entry);
 }
 
-static lbttcp_client_transport_t * lbttcp_client_transport_add(lbttcp_transport_t * transport, const address * receiver_address, guint16 receiver_port, guint32 frame)
+static lbttcp_client_transport_t * lbttcp_client_transport_add(lbttcp_transport_t * transport, const address * receiver_address, uint16_t receiver_port, uint32_t frame)
 {
     lbttcp_client_transport_t * entry;
     conversation_t * client_conv = NULL;
@@ -167,7 +167,7 @@ static lbttcp_client_transport_t * lbttcp_client_transport_add(lbttcp_transport_
     return (entry);
 }
 
-char * lbttcp_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id)
+char * lbttcp_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id)
 {
     char * bufptr = NULL;
 
@@ -182,7 +182,7 @@ char * lbttcp_transport_source_string(const address * source_address, guint16 so
     return (bufptr);
 }
 
-gboolean lbttcp_transport_sid_find(const address * source_address, guint16 source_port, guint32 frame, guint32 * session_id)
+bool lbttcp_transport_sid_find(const address * source_address, uint16_t source_port, uint32_t frame, uint32_t * session_id)
 {
     conversation_t * conv = NULL;
     lbttcp_transport_conv_data_t * conv_data = NULL;
@@ -191,27 +191,27 @@ gboolean lbttcp_transport_sid_find(const address * source_address, guint16 sourc
     conv = find_conversation(frame, source_address, &lbttcp_null_address, CONVERSATION_TCP, source_port, 0, 0);
     if (conv == NULL)
     {
-        return FALSE;
+        return false;
     }
     conv_data = (lbttcp_transport_conv_data_t *) conversation_get_proto_data(conv, proto_lbttcp);
     if (conv_data == NULL)
     {
-        return FALSE;
+        return false;
     }
     if (conv_data->frame_tree == NULL)
     {
-        return FALSE;
+        return false;
     }
     transport = (lbttcp_transport_t *)wmem_tree_lookup32_le(conv_data->frame_tree, frame);
     if (transport == NULL)
     {
-        return FALSE;
+        return false;
     }
     *session_id = transport->session_id;
-    return TRUE;
+    return true;
 }
 
-void lbttcp_transport_sid_add(const address * source_address, guint16 source_port, guint32 frame, guint32 session_id)
+void lbttcp_transport_sid_add(const address * source_address, uint16_t source_port, uint32_t frame, uint32_t session_id)
 {
     conversation_t * conv = NULL;
     lbttcp_transport_conv_data_t * conv_data = NULL;
@@ -260,37 +260,37 @@ void lbttcp_transport_sid_add(const address * source_address, guint16 source_por
 #define LBTTCP_DEFAULT_STORE_PORT_HIGH 0
 
 /* Global preferences variables (altered by the preferences dialog). */
-static guint32 global_lbttcp_source_port_low = LBTTCP_DEFAULT_SOURCE_PORT_LOW;
-static guint32 global_lbttcp_source_port_high  = LBTTCP_DEFAULT_SOURCE_PORT_HIGH;
-static guint32 global_lbttcp_request_port_low = LBTTCP_DEFAULT_REQUEST_PORT_LOW;
-static guint32 global_lbttcp_request_port_high = LBTTCP_DEFAULT_REQUEST_PORT_HIGH;
-static guint32 global_lbttcp_store_port_low = LBTTCP_DEFAULT_STORE_PORT_LOW;
-static guint32 global_lbttcp_store_port_high = LBTTCP_DEFAULT_STORE_PORT_HIGH;
+static uint32_t global_lbttcp_source_port_low = LBTTCP_DEFAULT_SOURCE_PORT_LOW;
+static uint32_t global_lbttcp_source_port_high  = LBTTCP_DEFAULT_SOURCE_PORT_HIGH;
+static uint32_t global_lbttcp_request_port_low = LBTTCP_DEFAULT_REQUEST_PORT_LOW;
+static uint32_t global_lbttcp_request_port_high = LBTTCP_DEFAULT_REQUEST_PORT_HIGH;
+static uint32_t global_lbttcp_store_port_low = LBTTCP_DEFAULT_STORE_PORT_LOW;
+static uint32_t global_lbttcp_store_port_high = LBTTCP_DEFAULT_STORE_PORT_HIGH;
 static bool global_lbttcp_use_tag;
 
 /* Local preferences variables (used by the dissector). */
-static guint32 lbttcp_source_port_low = LBTTCP_DEFAULT_SOURCE_PORT_LOW;
-static guint32 lbttcp_source_port_high = LBTTCP_DEFAULT_SOURCE_PORT_HIGH;
-static guint32 lbttcp_request_port_low = LBTTCP_DEFAULT_REQUEST_PORT_LOW;
-static guint32 lbttcp_request_port_high = LBTTCP_DEFAULT_REQUEST_PORT_HIGH;
-static guint32 lbttcp_store_port_low = LBTTCP_DEFAULT_STORE_PORT_LOW;
-static guint32 lbttcp_store_port_high = LBTTCP_DEFAULT_STORE_PORT_HIGH;
-static gboolean lbttcp_use_tag;
+static uint32_t lbttcp_source_port_low = LBTTCP_DEFAULT_SOURCE_PORT_LOW;
+static uint32_t lbttcp_source_port_high = LBTTCP_DEFAULT_SOURCE_PORT_HIGH;
+static uint32_t lbttcp_request_port_low = LBTTCP_DEFAULT_REQUEST_PORT_LOW;
+static uint32_t lbttcp_request_port_high = LBTTCP_DEFAULT_REQUEST_PORT_HIGH;
+static uint32_t lbttcp_store_port_low = LBTTCP_DEFAULT_STORE_PORT_LOW;
+static uint32_t lbttcp_store_port_high = LBTTCP_DEFAULT_STORE_PORT_HIGH;
+static bool lbttcp_use_tag;
 
 /* Tag definitions. */
 typedef struct
 {
     char * name;
-    guint32 source_port_low;
-    guint32 source_port_high;
-    guint32 request_port_low;
-    guint32 request_port_high;
-    guint32 store_port_low;
-    guint32 store_port_high;
+    uint32_t source_port_low;
+    uint32_t source_port_high;
+    uint32_t request_port_low;
+    uint32_t request_port_high;
+    uint32_t store_port_low;
+    uint32_t store_port_high;
 } lbttcp_tag_entry_t;
 
 static lbttcp_tag_entry_t * lbttcp_tag_entry;
-static guint lbttcp_tag_count;
+static unsigned lbttcp_tag_count;
 
 UAT_CSTRING_CB_DEF(lbttcp_tag, name, lbttcp_tag_entry_t)
 UAT_DEC_CB_DEF(lbttcp_tag, source_port_low, lbttcp_tag_entry_t)
@@ -321,7 +321,7 @@ static bool lbttcp_tag_update_cb(void * record, char * * error_string)
     if (tag->name == NULL)
     {
         *error_string = g_strdup("Tag name can't be empty");
-        return FALSE;
+        return false;
     }
     else
     {
@@ -329,10 +329,10 @@ static bool lbttcp_tag_update_cb(void * record, char * * error_string)
         if (tag->name[0] == 0)
         {
             *error_string = g_strdup("Tag name can't be empty");
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 static void * lbttcp_tag_copy_cb(void * destination, const void * source, size_t length _U_)
@@ -363,7 +363,7 @@ static void lbttcp_tag_free_cb(void * record)
 
 static const lbttcp_tag_entry_t * lbttcp_tag_locate(packet_info * pinfo)
 {
-    guint idx;
+    unsigned idx;
     const lbttcp_tag_entry_t * tag = NULL;
 
     if (!lbttcp_use_tag)
@@ -409,8 +409,8 @@ static char * lbttcp_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbttcp;
-static gint ett_lbttcp_channel;
+static int ett_lbttcp;
+static int ett_lbttcp_channel;
 
 /* Dissector field handles */
 static int hf_lbttcp_tag;
@@ -418,49 +418,49 @@ static int hf_lbttcp_channel;
 static int hf_lbttcp_channel_id;
 static int hf_lbttcp_channel_client;
 
-static gboolean lbttcp_packet_is_transport_source(packet_info * pinfo, const lbttcp_tag_entry_t * tag)
+static bool lbttcp_packet_is_transport_source(packet_info * pinfo, const lbttcp_tag_entry_t * tag)
 {
-    gboolean is_transport_source_packet = FALSE;
+    bool is_transport_source_packet = false;
 
     if (tag == NULL)
     {
         if ((pinfo->srcport >= lbttcp_source_port_low) && (pinfo->srcport <= lbttcp_source_port_high))
         {
-            is_transport_source_packet = TRUE;
+            is_transport_source_packet = true;
         }
     }
     else
     {
         if ((pinfo->srcport >= tag->source_port_low) && (pinfo->srcport <= tag->source_port_high))
         {
-            is_transport_source_packet = TRUE;
+            is_transport_source_packet = true;
         }
     }
     return (is_transport_source_packet);
 }
 
-static gboolean lbttcp_packet_is_transport_client(packet_info * pinfo, const lbttcp_tag_entry_t * tag)
+static bool lbttcp_packet_is_transport_client(packet_info * pinfo, const lbttcp_tag_entry_t * tag)
 {
-    gboolean is_transport_client_packet = FALSE;
+    bool is_transport_client_packet = false;
 
     if (tag == NULL)
     {
         if ((pinfo->destport >= lbttcp_source_port_low) && (pinfo->destport <= lbttcp_source_port_high))
         {
-            is_transport_client_packet = TRUE;
+            is_transport_client_packet = true;
         }
     }
     else
     {
         if ((pinfo->destport >= tag->source_port_low) && (pinfo->destport <= tag->source_port_high))
         {
-            is_transport_client_packet = TRUE;
+            is_transport_client_packet = true;
         }
     }
     return (is_transport_client_packet);
 }
 
-static guint get_lbttcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb,
+static unsigned get_lbttcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb,
                                    int offset, void *data _U_)
 {
     return lbmc_get_message_length(tvb, offset);
@@ -473,10 +473,10 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     char * tag_name = NULL;
     int len_dissected;
     const lbttcp_tag_entry_t * tag = NULL;
-    guint64 channel = LBM_CHANNEL_NO_CHANNEL;
-    guint32 client_id = 0;
-    gboolean from_source = FALSE;
-    gboolean transport_packet = FALSE;
+    uint64_t channel = LBM_CHANNEL_NO_CHANNEL;
+    uint32_t client_id = 0;
+    bool from_source = false;
+    bool transport_packet = false;
 
     if (lbttcp_use_tag)
     {
@@ -501,21 +501,21 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
     }
     if (lbttcp_packet_is_transport_source(pinfo, tag))
     {
-        from_source = TRUE;
-        transport_packet = TRUE;
+        from_source = true;
+        transport_packet = true;
     }
     else if (lbttcp_packet_is_transport_client(pinfo, tag))
     {
-        from_source = FALSE;
-        transport_packet = TRUE;
+        from_source = false;
+        transport_packet = true;
     }
     if (transport_packet)
     {
         address source_address;
         address client_address;
-        guint16 srcport;
-        guint16 clntport;
-        guint32 sid = 0;
+        uint16_t srcport;
+        uint16_t clntport;
+        uint32_t sid = 0;
         lbttcp_transport_t * transport = NULL;
         lbttcp_client_transport_t * client = NULL;
 
@@ -627,7 +627,7 @@ static int dissect_lbttcp_real(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         col_add_fstr(pinfo->cinfo, COL_INFO, "[Tag: %s]", tag_name);
     }
     col_set_fence(pinfo->cinfo, COL_INFO);
-    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, lbmc_get_minimum_length(), /* Need at least the msglen */
+    tcp_dissect_pdus(tvb, pinfo, tree, true, lbmc_get_minimum_length(), /* Need at least the msglen */
         get_lbttcp_pdu_length, dissect_lbttcp_pdu, NULL);
 
     return tvb_captured_length(tvb);
@@ -701,7 +701,7 @@ void proto_register_lbttcp(void)
         { &hf_lbttcp_channel_client,
             { "Channel Client", "lbttcp.channel.client", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
     };
-    static gint * ett[] =
+    static int * ett[] =
     {
         &ett_lbttcp,
         &ett_lbttcp_channel
@@ -767,7 +767,7 @@ void proto_register_lbttcp(void)
     tag_uat = uat_new("LBT-TCP tag definitions",
         sizeof(lbttcp_tag_entry_t),
         "lbttcp_domains",
-        TRUE,
+        true,
         (void * *)&lbttcp_tag_entry,
         &lbttcp_tag_count,
         UAT_AFFECTS_DISSECTION,
@@ -788,7 +788,7 @@ void proto_register_lbttcp(void)
 /* The registration hand-off routine */
 void proto_reg_handoff_lbttcp(void)
 {
-    static gboolean already_registered = FALSE;
+    static bool already_registered = false;
 
     if (!already_registered)
     {
@@ -819,7 +819,7 @@ void proto_reg_handoff_lbttcp(void)
 
     lbttcp_use_tag = global_lbttcp_use_tag;
 
-    already_registered = TRUE;
+    already_registered = true;
 }
 
 /*
diff --git a/epan/dissectors/packet-lbttcp.h b/epan/dissectors/packet-lbttcp.h
index 7279d68e3c..7efc0691ad 100644
--- a/epan/dissectors/packet-lbttcp.h
+++ b/epan/dissectors/packet-lbttcp.h
@@ -16,26 +16,26 @@
 typedef struct
 {
     address source_address;
-    guint16 source_port;
-    guint32 session_id;
-    guint64 channel;
-    guint32 next_client_id;
+    uint16_t source_port;
+    uint32_t session_id;
+    uint64_t channel;
+    uint32_t next_client_id;
     wmem_list_t * client_list;
 } lbttcp_transport_t;
 
 typedef struct
 {
     address receiver_address;
-    guint16 receiver_port;
-    guint32 id;
+    uint16_t receiver_port;
+    uint32_t id;
     lbttcp_transport_t * transport;
 } lbttcp_client_transport_t;
 
-lbttcp_transport_t * lbttcp_transport_find(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame);
-lbttcp_transport_t * lbttcp_transport_add(const address * source_address, guint16 source_port, guint32 session_id, guint32 frame);
-char * lbttcp_transport_source_string(const address * source_address, guint16 source_port, guint32 session_id);
-gboolean lbttcp_transport_sid_find(const address * source_address, guint16 source_port, guint32 frame, guint32 * session_id);
-void lbttcp_transport_sid_add(const address * source_address, guint16 source_port, guint32 frame, guint32 session_id);
+lbttcp_transport_t * lbttcp_transport_find(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame);
+lbttcp_transport_t * lbttcp_transport_add(const address * source_address, uint16_t source_port, uint32_t session_id, uint32_t frame);
+char * lbttcp_transport_source_string(const address * source_address, uint16_t source_port, uint32_t session_id);
+bool lbttcp_transport_sid_find(const address * source_address, uint16_t source_port, uint32_t frame, uint32_t * session_id);
+void lbttcp_transport_sid_add(const address * source_address, uint16_t source_port, uint32_t frame, uint32_t session_id);
 
 #endif
 
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 639e83f666..dc32170a62 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -1073,15 +1073,15 @@ static const true_false_string tlv_upstr_sbit_vals = {
 #define PW_PSN_PW_EGRESS_TRANS_FAULT    0x00000010
 
 static void
-dissect_subtlv_interface_parameters(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, int *interface_parameters_hf[]);
+dissect_subtlv_interface_parameters(tvbuff_t *tvb, unsigned offset, proto_tree *tree, int rem, int *interface_parameters_hf[]);
 
 static void
-dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem);
+dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem);
 
 /* Dissect FEC TLV */
 
 static void
-dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     static int *interface_params_header_fields[] = {
         &hf_ldp_tlv_fec_vc_intparam_length ,
@@ -1127,20 +1127,20 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
 
     proto_tree *ti, *ti2, *val_tree, *fec_tree=NULL;
     proto_tree *agi_tree=NULL, *saii_tree=NULL, *taii_tree=NULL;
-    guint16     family, ix=1, ax;
-    guint16     op_length = tvb_get_bits16(tvb, ((offset+8)*8), 16, ENC_BIG_ENDIAN);
-    guint8      addr_size=0, *addr, implemented, prefix_len_octets, prefix_len, host_len, vc_len;
-    guint8      intparam_len, aai_type = 0;
-    guint32     pwid_len, agi_aii_len;
+    uint16_t    family, ix=1, ax;
+    uint16_t    op_length = tvb_get_bits16(tvb, ((offset+8)*8), 16, ENC_BIG_ENDIAN);
+    uint8_t     addr_size=0, *addr, implemented, prefix_len_octets, prefix_len, host_len, vc_len;
+    uint8_t     intparam_len, aai_type = 0;
+    uint32_t    pwid_len, agi_aii_len;
     const char *str;
-    guint8 gen_fec_id_len = 0;
+    uint8_t gen_fec_id_len = 0;
     address_type addr_type;
     address      addr_str;
 
     val_tree=proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_tlv_val, NULL, "FEC Elements");
 
     while (rem > 0){
-        switch (tvb_get_guint8(tvb, offset)) {
+        switch (tvb_get_uint8(tvb, offset)) {
         case WILDCARD_FEC:
         case CRLSP_FEC:
             fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 1,
@@ -1156,7 +1156,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 return;
             }
             family=tvb_get_ntohs(tvb, offset+1);
-            prefix_len=tvb_get_guint8(tvb, offset+3);
+            prefix_len=tvb_get_uint8(tvb, offset+3);
             prefix_len_octets=(prefix_len+7)/8;
 
             implemented=1;
@@ -1175,7 +1175,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             }
 
             if ( !implemented ) {
-                guint16 noctets;
+                uint16_t noctets;
 
                 noctets= rem>4+prefix_len_octets?4+prefix_len_octets:rem;
                 proto_tree_add_expert(val_tree, pinfo, &ei_ldp_address_family_not_implemented, tvb, offset, noctets);
@@ -1211,10 +1211,10 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 break;
             }
 
-            addr=(guint8 *)wmem_alloc0(pinfo->pool, addr_size);
+            addr=(uint8_t *)wmem_alloc0(pinfo->pool, addr_size);
 
             for(ax=0; ax+1 <= prefix_len_octets; ax++)
-                addr[ax]=tvb_get_guint8(tvb, offset+ax);
+                addr[ax]=tvb_get_uint8(tvb, offset+ax);
             if ( prefix_len % 8 )
                 addr[ax-1] = addr[ax-1]&(0xFF<<(8-prefix_len%8));
 
@@ -1233,7 +1233,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 return;
             }
             family=tvb_get_ntohs(tvb, offset+1);
-            host_len=tvb_get_guint8(tvb, offset+3);
+            host_len=tvb_get_uint8(tvb, offset+3);
 
             implemented=1;
             switch(family) {
@@ -1251,7 +1251,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             }
 
             if ( !implemented ) {
-                guint16 noctets;
+                uint16_t noctets;
 
                 noctets= rem>4+host_len?4+host_len:rem;
                 proto_tree_add_expert(val_tree, pinfo, &ei_ldp_address_family_not_implemented, tvb, offset, noctets);
@@ -1286,10 +1286,10 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 break;
             }
 
-            addr=(guint8 *)wmem_alloc0(pinfo->pool, addr_size);
+            addr=(uint8_t *)wmem_alloc0(pinfo->pool, addr_size);
 
             for(ax=0; ax+1 <= host_len; ax++)
-                addr[ax]=tvb_get_guint8(tvb, offset+ax);
+                addr[ax]=tvb_get_uint8(tvb, offset+ax);
 
             set_address(&addr_str, addr_type, addr_size, addr);
             str = address_to_str(pinfo->pool, &addr_str);
@@ -1305,7 +1305,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 proto_tree_add_expert_format(val_tree, pinfo, &ei_ldp_tlv_fec, tvb, offset, rem, "Error in FEC Element %u", ix);
                 return;
             }
-            vc_len = tvb_get_guint8 (tvb, offset+3);
+            vc_len = tvb_get_uint8 (tvb, offset+3);
 
 
             fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 8+vc_len, ett_ldp_fec, &ti, "FEC Element %u", ix);
@@ -1330,7 +1330,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             offset += 4;
 
             while ( (vc_len > 1) && (rem > 1) ) {   /* enough to include id and length */
-                intparam_len = tvb_get_guint8(tvb, offset+1);
+                intparam_len = tvb_get_uint8(tvb, offset+1);
                 if (intparam_len < 2){ /* At least Type and Len, protect against len = 0 */
                     proto_tree_add_expert(fec_tree, pinfo, &ei_ldp_malformed_interface_parameter, tvb, offset +1, 1);
                     return;
@@ -1355,7 +1355,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 proto_tree_add_expert_format(val_tree, pinfo, &ei_ldp_tlv_fec, tvb, offset, rem, "Error in FEC Element %u", ix);
                 return;
             }
-            vc_len = tvb_get_guint8 (tvb, offset+3);
+            vc_len = tvb_get_uint8 (tvb, offset+3);
 
             /* Add the FEC to the tree */
             fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 8+vc_len, ett_ldp_fec, NULL, "FEC Element %u", ix);
@@ -1367,7 +1367,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             offset += 4;
 
             if ( (vc_len > 1) && ( rem > 1 ) ) { /* there is enough room for AGI */
-                gen_fec_id_len = tvb_get_guint8 (tvb, offset+1);
+                gen_fec_id_len = tvb_get_uint8 (tvb, offset+1);
                 /* Add AGI to the tree */
                 agi_tree = proto_tree_add_subtree_format(fec_tree, tvb, offset, 2 + gen_fec_id_len, ett_ldp_gen_agi, NULL, "AGI");
                 proto_tree_add_item(agi_tree, hf_ldp_tlv_fec_gen_agi_type,tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -1386,9 +1386,9 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             }
 
             if ( (vc_len > 1) && ( rem > 1 ) ) { /* there is enough room for SAII */
-                gen_fec_id_len = tvb_get_guint8 (tvb, offset+1);
+                gen_fec_id_len = tvb_get_uint8 (tvb, offset+1);
                 /* Add SAII to the tree */
-                aai_type = tvb_get_guint8(tvb, offset);
+                aai_type = tvb_get_uint8(tvb, offset);
                 if ( aai_type == 2 && gen_fec_id_len != 12)
                 {
                     /* According to RFC 5003, for Type 2 AAI, the length should be 12 bytes */
@@ -1441,9 +1441,9 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             }
 
             if ( (vc_len > 1) && ( rem > 1 ) ) { /* there is enough room for TAII */
-                gen_fec_id_len = tvb_get_guint8 (tvb, offset+1);
+                gen_fec_id_len = tvb_get_uint8 (tvb, offset+1);
                 /* Add TAII to the tree */
-                aai_type = tvb_get_guint8(tvb, offset);
+                aai_type = tvb_get_uint8(tvb, offset);
                 if ( aai_type == 2 && gen_fec_id_len != 12)
                 {
                     /* According to RFC 5003, for Type 2 AAI, the length should be 12 bytes */
@@ -1506,7 +1506,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 return;
             }
 
-            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 4+tvb_get_guint8 (tvb, offset+1),
+            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 4+tvb_get_uint8 (tvb, offset+1),
                                                             ett_ldp_fec, NULL, "FEC Element %u", ix);
             proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
@@ -1535,7 +1535,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 return;
             }
 
-            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 8+tvb_get_guint8 (tvb, offset+3),
+            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 8+tvb_get_uint8 (tvb, offset+3),
                                                             ett_ldp_fec, NULL, "FEC Element %u", ix);
             proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_pw_controlword, tvb, offset+1, 1, ENC_BIG_ENDIAN);
@@ -1553,14 +1553,14 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
             }
 
             while ( (pwid_len > 1) && (rem > 1) ) {   /* enough to include id and length */
-                intparam_len = tvb_get_guint8(tvb, offset+1);
+                intparam_len = tvb_get_uint8(tvb, offset+1);
                 if (intparam_len < 2){ /* At least Type and Len, protect against len = 0 */
                     proto_tree_add_expert(fec_tree, pinfo, &ei_ldp_malformed_interface_parameter, tvb, offset +1, 1);
                     return;
                 }
 
-                if ( ((guint32)intparam_len > pwid_len) && (rem -intparam_len) <0 ) { /* error condition */
-                    proto_tree_add_expert(fec_tree, pinfo, &ei_ldp_malformed_data, tvb, offset +2, MIN(pwid_len,(guint32)rem));
+                if ( ((uint32_t)intparam_len > pwid_len) && (rem -intparam_len) <0 ) { /* error condition */
+                    proto_tree_add_expert(fec_tree, pinfo, &ei_ldp_malformed_data, tvb, offset +2, MIN(pwid_len,(uint32_t)rem));
                     return;
                 }
                 dissect_subtlv_interface_parameters(tvb, offset, fec_tree, intparam_len, interface_params_header_fields);
@@ -1582,7 +1582,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
                 return;
             }
 
-            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 4+tvb_get_guint8 (tvb, offset+3),
+            fec_tree = proto_tree_add_subtree_format(val_tree, tvb, offset, 4+tvb_get_uint8 (tvb, offset+3),
                                                             ett_ldp_fec, NULL, "FEC Element %u", ix);
             proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_wc, tvb, offset, 1, ENC_BIG_ENDIAN);
             proto_tree_add_item(fec_tree, hf_ldp_tlv_fec_pw_controlword, tvb, offset+1, 1, ENC_BIG_ENDIAN);
@@ -1646,11 +1646,11 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
 /* Dissect Address List TLV */
 
 static void
-dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint16     family, ix;
-    guint8      addr_size, *addr;
+    uint16_t    family, ix;
+    uint8_t     addr_size, *addr;
     const char *str;
     address_type addr_type;
     address      addr_str;
@@ -1682,7 +1682,7 @@ dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_
     offset+=2; rem-=2;
     val_tree=proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_tlv_val, NULL, "Addresses");
 
-    addr=(guint8 *)wmem_alloc(pinfo->pool, addr_size);
+    addr=(uint8_t *)wmem_alloc(pinfo->pool, addr_size);
 
     for(ix=1; rem >= addr_size; ix++, offset += addr_size,
             rem -= addr_size) {
@@ -1703,11 +1703,11 @@ dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_
 /* Dissect Path Vector TLV */
 
 static void
-dissect_tlv_path_vector(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_path_vector(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint8      ix;
-    guint32 addr;
+    uint8_t     ix;
+    uint32_t addr;
 
     val_tree=proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_tlv_val, NULL, "LSR IDs");
 
@@ -1725,7 +1725,7 @@ dissect_tlv_path_vector(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
 /* Dissect ATM Label TLV */
 
 static void
-dissect_tlv_atm_label(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_atm_label(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -1745,10 +1745,10 @@ dissect_tlv_atm_label(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
 /* Dissect FRAME RELAY Label TLV */
 
 static void
-dissect_tlv_frame_label(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_frame_label(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint8      len;
+    uint8_t     len;
 
     if (rem != 4){
         proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem,
@@ -1758,7 +1758,7 @@ dissect_tlv_frame_label(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
     }
     val_tree=proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_tlv_val, NULL, "Frame Relay Label");
 
-    len=(guint8)(tvb_get_ntohs(tvb, offset)>>7) & 0x03;
+    len=(uint8_t)(tvb_get_ntohs(tvb, offset)>>7) & 0x03;
     proto_tree_add_uint_format_value(val_tree, hf_ldp_tlv_fr_label_len, tvb, offset, 2, len,
                                "%s (%u)", val_to_str_const(len, tlv_fr_len_vals, "Unknown Length"), len);
 
@@ -1769,10 +1769,10 @@ dissect_tlv_frame_label(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
 /* Dissect STATUS TLV */
 
 static void
-dissect_tlv_status(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_status(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint32     data;
+    uint32_t    data;
 
     if (rem != 10){
         proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem,
@@ -1797,7 +1797,7 @@ dissect_tlv_status(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *
 /* Dissect Returned PDU TLV */
 
 static void
-dissect_tlv_returned_pdu(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_returned_pdu(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -1825,10 +1825,10 @@ dissect_tlv_returned_pdu(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_
 /* Dissect Returned MESSAGE TLV */
 
 static void
-dissect_tlv_returned_message(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_returned_message(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint16     type;
+    uint16_t    type;
 
     if (rem < 4) {
         proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem,
@@ -1874,9 +1874,9 @@ dissect_tlv_returned_message(tvbuff_t *tvb, packet_info *pinfo, guint offset, pr
 
 static void
 #if 0
-dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 #else
-dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree)
+dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree)
 #endif
 {
 #if 0
@@ -1884,7 +1884,7 @@ dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset,
 #endif
     proto_tree *val_tree;
     proto_item *gtsm_flag_item;
-    guint16 gtsm_flag_buffer;
+    uint16_t gtsm_flag_buffer;
 #if 0
     ti = proto_tree_add_item(tree, hf_ldp_tlv_value, tvb, offset, rem, ENC_NA);
     val_tree = proto_item_add_subtree(ti, ett_ldp_tlv_val);
@@ -1918,7 +1918,7 @@ dissect_tlv_common_hello_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset,
 /* Dissect MAC TLV */
 
 static void
-dissect_tlv_mac(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_mac(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree   *val_tree;
 
@@ -1936,7 +1936,7 @@ dissect_tlv_mac(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre
 /* Dissect the common session params */
 
 static void
-dissect_tlv_common_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_common_session_parms(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -1974,10 +1974,10 @@ dissect_tlv_common_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset
 /* Dissect the atm session params */
 
 static void
-dissect_tlv_atm_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_atm_session_parms(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree, *lbl_tree;
-    guint8      numlr, ix;
+    uint8_t     numlr, ix;
 
     if (rem < 4) {
         proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem,
@@ -1991,7 +1991,7 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, p
     proto_tree_add_item(val_tree, hf_ldp_tlv_sess_atm_merge,tvb, offset, 1, ENC_BIG_ENDIAN);
 
     /*get the number of label ranges*/
-    numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F;
+    numlr=(tvb_get_uint8(tvb, offset)>>2) & 0x0F;
     proto_tree_add_uint_format(val_tree, hf_ldp_tlv_sess_atm_lr,
                                tvb, offset, 1, numlr, "Number of Label Range components: %u",
                                numlr);
@@ -2033,10 +2033,10 @@ dissect_tlv_atm_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, p
 /* Dissect the frame relay session params */
 
 static void
-dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree, *lbl_tree;
-    guint8      numlr, ix, len;
+    uint8_t     numlr, ix, len;
 
     if(rem < 4) {
         proto_tree_add_expert_format(tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset, rem,
@@ -2051,7 +2051,7 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint o
                         tvb, offset, 1, ENC_BIG_ENDIAN);
 
     /*get the number of label ranges*/
-    numlr=(tvb_get_guint8(tvb, offset)>>2) & 0x0F;
+    numlr=(tvb_get_uint8(tvb, offset)>>2) & 0x0F;
     proto_tree_add_uint_format(val_tree, hf_ldp_tlv_sess_fr_lr,
                                tvb, offset, 1, numlr, "Number of Label Range components: %u",
                                numlr);
@@ -2070,7 +2070,7 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint o
         lbl_tree=proto_tree_add_subtree_format(val_tree, tvb, offset, 8,
                                ett_ldp_tlv_val, NULL, "Frame Relay Label Range Component %u", ix);
 
-        len=(guint8)(tvb_get_ntohs(tvb, offset)>>7) & 0x03;
+        len=(uint8_t)(tvb_get_ntohs(tvb, offset)>>7) & 0x03;
         proto_tree_add_uint_format_value(lbl_tree, hf_ldp_tlv_sess_fr_len, tvb, offset, 2, len,
                                    "%s (%u)", val_to_str_const(len, tlv_fr_len_vals, "Unknown Length"), len);
 
@@ -2088,10 +2088,10 @@ dissect_tlv_frame_relay_session_parms(tvbuff_t *tvb, packet_info *pinfo, guint o
 /* Dissect the Fault Tolerant (FT) Session TLV */
 
 static void
-dissect_tlv_ft_session(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_ft_session(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *ti, *val_tree, *flags_tree;
-    guint16 flags;
+    uint16_t flags;
 
     if(rem != 12){
         /* error, length must be 12 bytes */
@@ -2130,7 +2130,7 @@ dissect_tlv_ft_session(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tr
 }
 
 static void
-dissect_tlv_lspid(tvbuff_t *tvb, packet_info *pinfo, guint offset,proto_tree *tree, int rem)
+dissect_tlv_lspid(tvbuff_t *tvb, packet_info *pinfo, unsigned offset,proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2154,7 +2154,7 @@ dissect_tlv_lspid(tvbuff_t *tvb, packet_info *pinfo, guint offset,proto_tree *tr
 }
 
 static void
-dissect_tlv_er_hop_ipv4(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_er_hop_ipv4(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2179,7 +2179,7 @@ dissect_tlv_er_hop_ipv4(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
 }
 
 static void
-dissect_tlv_er_hop_ipv6(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_er_hop_ipv6(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2204,7 +2204,7 @@ dissect_tlv_er_hop_ipv6(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_t
 }
 
 static void
-dissect_tlv_er_hop_as(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_er_hop_as(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2226,7 +2226,7 @@ dissect_tlv_er_hop_as(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
 }
 
 static void
-dissect_tlv_er_hop_lspid(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_er_hop_lspid(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2251,10 +2251,10 @@ dissect_tlv_er_hop_lspid(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_
 }
 
 static void
-dissect_tlv_traffic(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_traffic(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
-    guint8  val_8;
+    uint8_t val_8;
     float   val_f;
     proto_item *pi;
 
@@ -2286,7 +2286,7 @@ dissect_tlv_traffic(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
 
         /* weight */
         pi = proto_tree_add_item(val_tree, hf_ldp_tlv_weight, tvb, offset, 1, ENC_BIG_ENDIAN);
-        val_8 = tvb_get_guint8(tvb, offset);
+        val_8 = tvb_get_uint8(tvb, offset);
         if (val_8 == 0)
             proto_item_set_text(pi, "Weight: Not applicable");
         offset ++;
@@ -2323,7 +2323,7 @@ dissect_tlv_traffic(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
 }
 
 static void
-dissect_tlv_route_pinning(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_route_pinning(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2343,7 +2343,7 @@ dissect_tlv_route_pinning(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto
 
 
 static void
-dissect_tlv_resource_class(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_resource_class(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2363,7 +2363,7 @@ dissect_tlv_resource_class(tvbuff_t *tvb, packet_info *pinfo, guint offset, prot
 
 
 static void
-dissect_tlv_preemption(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_preemption(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2386,7 +2386,7 @@ dissect_tlv_preemption(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tr
 
 
 static void
-dissect_tlv_diffserv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_diffserv(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     static int *hfindexes[] = {
         &hf_ldp_tlv_diffserv_map,
@@ -2397,7 +2397,7 @@ dissect_tlv_diffserv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
         &hf_ldp_tlv_diffserv_phbid_bit14,
         &hf_ldp_tlv_diffserv_phbid_bit15
     };
-    static gint *etts[] = {
+    static int *etts[] = {
         &ett_ldp_diffserv_map,
         &ett_ldp_diffserv_map_phbid
     };
@@ -2409,13 +2409,13 @@ dissect_tlv_diffserv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
         return;
     }
     proto_tree_add_uint(tree, hf_ldp_tlv_diffserv_type, tvb, offset, 1,
-                        type = tvb_get_guint8(tvb, offset));
+                        type = tvb_get_uint8(tvb, offset));
     type = (type >> 7) + 1;
     if (type == 1) {
         /* E-LSP */
         offset += 3;
         proto_tree_add_uint(tree, hf_ldp_tlv_diffserv_mapnb, tvb, offset,
-                            1, mapnb = tvb_get_guint8(tvb, offset) & 15);
+                            1, mapnb = tvb_get_uint8(tvb, offset) & 15);
         offset += 1;
         for (count = 0; count < mapnb; count++) {
             dissect_diffserv_mpls_common(tvb, tree, type, offset, hfindexes, etts);
@@ -2430,11 +2430,11 @@ dissect_tlv_diffserv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
 
 
 static int
-dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem);
+dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem);
 
 static void
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_tlv_er(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_er(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
     int len;
@@ -2452,14 +2452,14 @@ dissect_tlv_er(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree
 
 
 static void
-dissect_tlv_pw_status(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem);
+dissect_tlv_pw_status(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem);
 
 static void
-dissect_tlv_pw_grouping(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem);
+dissect_tlv_pw_grouping(tvbuff_t *tvb, unsigned offset, proto_tree *tree, int rem);
 
 /* Dissect Upstream Label Assignment Capability TLV */
 static void
-dissect_tlv_upstrm_lbl_ass_cap(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_upstrm_lbl_ass_cap(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2477,7 +2477,7 @@ dissect_tlv_upstrm_lbl_ass_cap(tvbuff_t *tvb, packet_info *pinfo, guint offset,
 }
 /*Dissect Upstream Assigned Label Request TLV*/
 static void
-dissect_tlv_upstrm_ass_lbl_req(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_upstrm_ass_lbl_req(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     if ( rem != 4)
     {
@@ -2493,7 +2493,7 @@ dissect_tlv_upstrm_ass_lbl_req(tvbuff_t *tvb, packet_info *pinfo, guint offset,
 
 /*Dissect Upstream Assigned Label TLV*/
 static void
-dissect_tlv_upstrm_ass_lbl(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_upstrm_ass_lbl(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2516,7 +2516,7 @@ dissect_tlv_upstrm_ass_lbl(tvbuff_t *tvb, packet_info *pinfo, guint offset, prot
 /*Dissect IPv4 Interface ID TLV*/
 static void
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_tlv_ipv4_interface_id(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_ipv4_interface_id(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree, *sub_tree;
 
@@ -2549,7 +2549,7 @@ dissect_tlv_ipv4_interface_id(tvbuff_t *tvb, packet_info *pinfo, guint offset, p
 }
 /*Dissect IP Multicast Tunnel TLV*/
 static void
-dissect_tlv_ip_multicast_tunnel(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
+dissect_tlv_ip_multicast_tunnel(tvbuff_t *tvb, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2561,7 +2561,7 @@ dissect_tlv_ip_multicast_tunnel(tvbuff_t *tvb, guint offset, proto_tree *tree, i
 
 static void
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_tlv_mpls_context_lbl(tvbuff_t *tvb,packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_mpls_context_lbl(tvbuff_t *tvb,packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *val_tree;
 
@@ -2571,10 +2571,10 @@ dissect_tlv_mpls_context_lbl(tvbuff_t *tvb,packet_info *pinfo, guint offset, pro
 }
 
 static void
-dissect_tlv_ldp_p2mp_lsp(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_tlv_ldp_p2mp_lsp(tvbuff_t *tvb, unsigned offset, proto_tree *tree)
 {
-    guint16 addr_length = tvb_get_bits16(tvb, ((offset+3)*8), 8, ENC_BIG_ENDIAN);
-    guint16 opcode_length = tvb_get_bits16(tvb, ((offset + 4 + addr_length)*8), 16, ENC_BIG_ENDIAN);
+    uint16_t addr_length = tvb_get_bits16(tvb, ((offset+3)*8), 8, ENC_BIG_ENDIAN);
+    uint16_t opcode_length = tvb_get_bits16(tvb, ((offset + 4 + addr_length)*8), 16, ENC_BIG_ENDIAN);
 
     proto_tree_add_item(tree, hf_ldp_tlv_ldp_p2mp_lsptype, tvb,offset, 1, ENC_BIG_ENDIAN);
     proto_tree_add_item(tree, hf_ldp_tlv_ldp_p2mp_addrfam, tvb,offset + 1, 2, ENC_BIG_ENDIAN);
@@ -2585,7 +2585,7 @@ dissect_tlv_ldp_p2mp_lsp(tvbuff_t *tvb, guint offset, proto_tree *tree)
 }
 
 static void
-dissect_tlv_rsvp_te_p2mp_lsp(tvbuff_t *tvb, guint offset, proto_tree *tree)
+dissect_tlv_rsvp_te_p2mp_lsp(tvbuff_t *tvb, unsigned offset, proto_tree *tree)
 {
 
     proto_tree_add_item(tree, hf_ldp_tlv_rsvp_te_p2mp_id, tvb,offset, 4, ENC_BIG_ENDIAN);
@@ -2598,9 +2598,9 @@ dissect_tlv_rsvp_te_p2mp_lsp(tvbuff_t *tvb, guint offset, proto_tree *tree)
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
-    guint16 type, typebak;
+    uint16_t type, typebak;
     int length;
 
     length=tvb_reported_length_remaining(tvb, offset);
@@ -2687,7 +2687,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, i
                                     "Error processing Generic Label TLV: length is %d, should be 4",
                                     length);
             else {
-                guint32 label=tvb_get_ntohl(tvb, offset+4) & 0x000FFFFF;
+                uint32_t label=tvb_get_ntohl(tvb, offset+4) & 0x000FFFFF;
 
                 proto_tree_add_uint(tlv_tree, hf_ldp_tlv_generic_label,
                                            tvb, offset+4, length, label);
@@ -2724,7 +2724,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, i
             break;
 
         case TLV_EXTENDED_STATUS:
-            if( length != 4 ) /*error, need only status_code(guint32)*/
+            if( length != 4 ) /*error, need only status_code(uint32_t)*/
                 proto_tree_add_expert_format(tlv_tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset + 4, length,
                                     "Error processing Extended Status TLV: length is %d, should be 4",
                                     length);
@@ -2760,7 +2760,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, i
             break;
 
         case TLV_CONFIGURATION_SEQUENCE_NUMBER:
-            if( length != 4 ) /*error, need only seq_num(guint32)*/
+            if( length != 4 ) /*error, need only seq_num(uint32_t)*/
                 proto_tree_add_expert_format(tlv_tree, pinfo, &ei_ldp_tlv_fec_len, tvb, offset + 4, length,
                                     "Error processing Configuration Sequence Number TLV: length is %d, should be 4",
                                     length);
@@ -2951,7 +2951,7 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, i
             int vc_len = length;
             offset += 4;
             while ( (vc_len > 1) && (rem > 1) ) {       /* enough to include id and length */
-                int intparam_len = tvb_get_guint8(tvb, offset+1);
+                int intparam_len = tvb_get_uint8(tvb, offset+1);
                 if (intparam_len < 2){ /* At least Type and Len, protect against len = 0 */
                     proto_tree_add_expert(tlv_tree, pinfo, &ei_ldp_malformed_interface_parameter, tvb, offset +1, 1);
                     break;
@@ -3014,10 +3014,10 @@ dissect_tlv(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, i
 /* Dissect a Message and return the number of bytes consumed ... */
 
 static int
-dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree)
+dissect_msg(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree)
 {
-    guint16     type, typebak;
-    guint8      extra=0;
+    uint16_t    type, typebak;
+    uint8_t     extra=0;
     int length, rem, ao=0, co;
     proto_tree *msg_tree = NULL;
 
@@ -3193,7 +3193,7 @@ dissect_ldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 }
 
 static void
-dissect_tlv_pw_status(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_tlv_pw_status(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *ti, *val_tree;
 
@@ -3216,13 +3216,13 @@ dissect_tlv_pw_status(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre
 }
 
 static void
-dissect_tlv_pw_grouping(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem _U_)
+dissect_tlv_pw_grouping(tvbuff_t *tvb, unsigned offset, proto_tree *tree, int rem _U_)
 {
     proto_tree_add_item(tree,hf_ldp_tlv_pw_grouping_value,tvb,offset,4,ENC_BIG_ENDIAN);
 }
 
 static void
-dissect_subtlv_interface_parameters(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem, int *interface_parameters_hf[])
+dissect_subtlv_interface_parameters(tvbuff_t *tvb, unsigned offset, proto_tree *tree, int rem, int *interface_parameters_hf[])
 {
 #if 0
     static int interface_parameters_hf[] = {
@@ -3271,11 +3271,11 @@ dissect_subtlv_interface_parameters(tvbuff_t *tvb, guint offset, proto_tree *tre
     proto_tree *cepopt_tree=NULL, *vccvtype_tree=NULL;
     proto_tree *vcintparam_tree = proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_fec_vc_interfaceparam, &ti, "Interface Parameter");
 
-    guint8  intparam_len = rem;
+    uint8_t intparam_len = rem;
     proto_tree_add_item(vcintparam_tree,*interface_parameters_hf[3],tvb,offset,1,ENC_BIG_ENDIAN);
     proto_tree_add_item(vcintparam_tree,*interface_parameters_hf[0],tvb, offset+1, 1, ENC_BIG_ENDIAN);
 
-    switch (tvb_get_guint8(tvb, offset)) {
+    switch (tvb_get_uint8(tvb, offset)) {
     case FEC_VC_INTERFACEPARAM_MTU:
         proto_item_append_text(ti,": MTU %u", tvb_get_ntohs(tvb,offset+2));
         proto_tree_add_item(vcintparam_tree,*interface_parameters_hf[1],tvb, offset+2, 2, ENC_BIG_ENDIAN);
@@ -3371,7 +3371,7 @@ dissect_subtlv_interface_parameters(tvbuff_t *tvb, guint offset, proto_tree *tre
 }
 
 static void
-dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree, int rem)
+dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, packet_info *pinfo, unsigned offset, proto_tree *tree, int rem)
 {
     proto_tree *aai_param_tree = proto_tree_add_subtree(tree, tvb, offset, rem, ett_ldp_gen_aai_type2, NULL, "AAI");
     /* check if the remaining length is 12 bytes or not... */
@@ -3392,10 +3392,10 @@ dissect_genpwid_fec_aai_type2_parameter(tvbuff_t *tvb, packet_info *pinfo, guint
 static int
 dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    volatile gboolean   first = TRUE;
+    volatile bool       first = true;
     volatile int        offset = 0;
     int                 length_remaining;
-    guint16             plen;
+    uint16_t            plen;
     int                 length;
     tvbuff_t *volatile  next_tvb;
     while (tvb_reported_length_remaining(tvb, offset) != 0) {
@@ -3426,7 +3426,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
                  */
                 return 0;
             }
-            first = FALSE;
+            first = false;
         }
 
         /*
@@ -3447,7 +3447,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
                  */
                 pinfo->desegment_offset = offset;
                 pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
-                return -((gint32) pinfo->desegment_len);
+                return -((int32_t) pinfo->desegment_len);
             }
         }
 
@@ -3474,7 +3474,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
                  */
                 pinfo->desegment_offset = offset;
                 pinfo->desegment_len = (plen + 4) - length_remaining;
-                return -((gint32) pinfo->desegment_len);
+                return -((int32_t) pinfo->desegment_len);
             }
         }
 
@@ -4552,7 +4552,7 @@ proto_register_ldp(void)
             NULL, 0x0, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_ldp,
         &ett_ldp_header,
         &ett_ldp_ldpid,
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 376ec7f8a6..f7e582db79 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -104,42 +104,42 @@ static const value_string ldss_compression_value[] = {
 /* Info about a broadcaster */
 typedef struct _ldss_broadcaster_t {
 	address addr;
-	guint16 port;
+	uint16_t port;
 } ldss_broadcaster_t;
 
 /* Info about a file */
 typedef struct _ldss_file_t {
-	guint8 *digest;
-	guint8 digest_type;
+	uint8_t *digest;
+	uint8_t digest_type;
 } ldss_file_t;
 
 /* Info about a broadcast packet */
 typedef struct _ldss_broadcast_t {
-	guint32 num;
+	uint32_t num;
 	nstime_t ts;
-	guint16 message_id;
-	guint16 message_detail;
-	guint16 port;
-	guint64 size;
-	guint64 offset;
-	guint8 compression;
+	uint16_t message_id;
+	uint16_t message_detail;
+	uint16_t port;
+	uint64_t size;
+	uint64_t offset;
+	uint8_t compression;
 	ldss_file_t *file;
 	ldss_broadcaster_t *broadcaster;
 } ldss_broadcast_t;
 
 /* Info about a file as seen in a file request */
 typedef struct _ldss_file_req_t {
-	guint32 num;
+	uint32_t num;
 	nstime_t ts;
-	guint64 size;
-	guint64 offset;
-	guint8 compression;
+	uint64_t size;
+	uint64_t offset;
+	uint8_t compression;
 	ldss_file_t *file;
 } ldss_file_request_t;
 
 /* Info attached to a file transfer conversation */
 typedef struct _ldss_transfer_info_t {
-	guint32 resp_num;
+	uint32_t resp_num;
 	nstime_t resp_ts;
 	/* Refers either to the file in the request (for pull)
 	 * or the file in the broadcast (for push) */
@@ -248,27 +248,27 @@ prepare_ldss_transfer_conv(ldss_broadcast_t *broadcast)
 static int
 dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	guint16	messageID;
-	guint8 digest_type;
-	guint8 compression;
-	guint32 cookie;
-	guint8 *digest;
-	guint64	size;
-	guint64	offset;
-	guint32	targetTime;
-	guint16 port;
-	guint16	rate;
-	guint16 messageDetail = INFERRED_NONE;
+	uint16_t	messageID;
+	uint8_t digest_type;
+	uint8_t compression;
+	uint32_t cookie;
+	uint8_t *digest;
+	uint64_t	size;
+	uint64_t	offset;
+	uint32_t	targetTime;
+	uint16_t port;
+	uint16_t	rate;
+	uint16_t messageDetail = INFERRED_NONE;
 
 	proto_tree	*ti, *ldss_tree;
 
-	const gchar *packet_type, *packet_detail;
+	const char *packet_type, *packet_detail;
 
 	messageID   = tvb_get_ntohs  (tvb,  0);
-	digest_type = tvb_get_guint8 (tvb,  2);
-	compression = tvb_get_guint8 (tvb,  3);
+	digest_type = tvb_get_uint8 (tvb,  2);
+	compression = tvb_get_uint8 (tvb,  3);
 	cookie      = tvb_get_ntohl  (tvb,  4);
-	digest      = (guint8 *)tvb_memdup (wmem_file_scope(), tvb,  8, DIGEST_LEN);
+	digest      = (uint8_t *)tvb_memdup (wmem_file_scope(), tvb,  8, DIGEST_LEN);
 	size	    = tvb_get_ntoh64 (tvb, 40);
 	offset	    = tvb_get_ntoh64 (tvb, 48);
 	targetTime  = tvb_get_ntohl  (tvb, 56);
@@ -325,7 +325,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree_add_item(ldss_tree, hf_ldss_compression,
 			tvb, 3,	    1,	ENC_BIG_ENDIAN);
 	proto_tree_add_uint_format_value(ldss_tree, hf_ldss_cookie,
-			tvb, 4,	    4,	FALSE,
+			tvb, 4,	    4,	false,
 			"0x%x%s",
 			cookie,
 			(cookie == 0)
@@ -338,7 +338,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree_add_item(ldss_tree, hf_ldss_offset,
 			tvb, 48,    8,	ENC_BIG_ENDIAN);
 	proto_tree_add_uint_format_value(ldss_tree, hf_ldss_target_time,
-			tvb, 56,    4,	FALSE,
+			tvb, 56,    4,	false,
 			"%d:%02d:%02d",
 			(int)(targetTime / 3600),
 			(int)((targetTime / 60) % 60),
@@ -346,7 +346,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree_add_item(ldss_tree, hf_ldss_reserved_1,
 			tvb, 60,    4,	ENC_BIG_ENDIAN);
 	proto_tree_add_uint_format_value(ldss_tree, hf_ldss_port,
-			tvb, 64,    2,	FALSE,
+			tvb, 64,    2,	false,
 			"%d%s",
 			port,
 			(messageID == MESSAGE_ID_WILLSEND &&
@@ -357,7 +357,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				? " - file can be pushed to this TCP port"
 				: ""));
 	proto_tree_add_uint_format_value(ldss_tree, hf_ldss_rate,
-			tvb, 66,    2,	FALSE,
+			tvb, 66,    2,	false,
 			"%ld",
 			(rate > 0)
 			? (long)floor(exp(rate * G_LN2 / 2048))
@@ -465,7 +465,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 		 * Start: 0
 		 * Compression: 0
 		 * (remote end sends the file identified by the digest) */
-		guint offset = 0;
+		unsigned offset = 0;
 
 		col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)");
 
@@ -484,12 +484,12 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 		/* Grab each line from the packet, there should be 4 but lets
 		 * not walk off the end looking for more. */
 		while (tvb_offset_exists(tvb, offset)) {
-			gint next_offset;
-			const guint8 *line;
+			int next_offset;
+			const uint8_t *line;
 			int linelen;
-			guint digest_type_len = 0;
+			unsigned digest_type_len = 0;
 
-			linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+			linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
 
 			/* Include new-line in line */
 			line = tvb_get_string_enc(pinfo->pool, tvb, offset, linelen, ENC_ASCII);
@@ -533,7 +533,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 			else if (strncmp(line, "Compression: ", 13)==0) {
 				/* Sample compression line:
 				 * Compression: 0\n */
-				transfer_info->req->compression = (gint8)strtol(line+13, NULL, 10); /* XXX - bad cast */
+				transfer_info->req->compression = (int8_t)strtol(line+13, NULL, 10); /* XXX - bad cast */
 				ti = proto_tree_add_uint(line_tree, hf_ldss_compression,
 						tvb, offset+13, linelen-13, transfer_info->req->compression);
 				proto_item_set_generated(ti);
@@ -553,15 +553,15 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 					digest_bytes = g_byte_array_new();
 					hex_str_to_bytes(
 							tvb_get_ptr(tvb, offset+digest_type_len, linelen-digest_type_len),
-							digest_bytes, FALSE);
+							digest_bytes, false);
 
 					if(digest_bytes->len >= DIGEST_LEN)
 						digest_bytes->len = (DIGEST_LEN-1);
 					/* Ensure the digest is zero-padded */
-					transfer_info->file->digest = (guint8 *)wmem_alloc0(wmem_file_scope(), DIGEST_LEN);
+					transfer_info->file->digest = (uint8_t *)wmem_alloc0(wmem_file_scope(), DIGEST_LEN);
 					memcpy(transfer_info->file->digest, digest_bytes->data, digest_bytes->len);
 
-					g_byte_array_free(digest_bytes, TRUE);
+					g_byte_array_free(digest_bytes, true);
 				}
 
 				tii = proto_tree_add_uint(line_tree, hf_ldss_digest_type,
@@ -588,9 +588,9 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 	}
 	/* Remaining packets are the file response */
 	else {
-		guint64 size;
-		guint64 offset;
-		guint8 compression;
+		uint64_t size;
+		uint64_t offset;
+		uint8_t compression;
 
 		/* size, digest, compression come from the file request for a pull but
 		 * they come from the broadcast for a push. Pushes don't bother
@@ -732,10 +732,10 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 	return tvb_captured_length(tvb);
 }
 
-static gboolean
+static bool
 is_broadcast(address* addr)
 {
-	static const guint8 broadcast_addr_bytes[6] = {
+	static const uint8_t broadcast_addr_bytes[6] = {
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 	};
 	static const address broadcast_addr = ADDRESS_INIT(AT_ETHER, 6, broadcast_addr_bytes);
@@ -903,7 +903,7 @@ proto_register_ldss (void) {
 		}
 	};
 
-	static gint  *ett[] = { &ett_ldss_broadcast, &ett_ldss_transfer, &ett_ldss_transfer_req };
+	static int   *ett[] = { &ett_ldss_broadcast, &ett_ldss_transfer, &ett_ldss_transfer_req };
 
 	static ei_register_info ei[] = {
 		{ &ei_ldss_unrecognized_line, { "ldss.unrecognized_line", PI_PROTOCOL, PI_WARN, "Unrecognized line ignored", EXPFILL }},
diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c
index 4ccacdb31d..621912873f 100644
--- a/epan/dissectors/packet-lg8979.c
+++ b/epan/dissectors/packet-lg8979.c
@@ -135,11 +135,11 @@ static int hf_lg8979_disallowed_func;
 static int hf_lg8979_crc16;
 
 /* Initialize the subtree pointers */
-static gint ett_lg8979;
-static gint ett_lg8979_flags;
-static gint ett_lg8979_funccode;
-static gint ett_lg8979_point;
-static gint ett_lg8979_ts;
+static int ett_lg8979;
+static int ett_lg8979_flags;
+static int ett_lg8979_funccode;
+static int ett_lg8979_point;
+static int ett_lg8979_ts;
 
 /* Globals for L&G 8979 Protocol Preferences */
 static bool lg8979_desegment = true;
@@ -350,7 +350,7 @@ static const value_string lg8979_pul_output_rl_vals[] = {
 static int
 classify_lg8979_packet(tvbuff_t *tvb)
 {
-    guint8 func, len, data_len, flags;
+    uint8_t func, len, data_len, flags;
 
     len = tvb_reported_length(tvb);
     /* If TVB length is equal to 5, this is classified as a 'short response message' */
@@ -362,7 +362,7 @@ classify_lg8979_packet(tvbuff_t *tvb)
     /* If TVB length is greater than 5, let's dig deeper */
     if (len > 5) {
 
-        flags = tvb_get_guint8(tvb, 1);
+        flags = tvb_get_uint8(tvb, 1);
 
         /* Flags vary between message types, so let's try those first to determine the message direction  */
         /* If both bit 3 and bit 4 are set, this is almost certainly a RTU->Master message */
@@ -374,8 +374,8 @@ classify_lg8979_packet(tvbuff_t *tvb)
             return LG8979_DIR_RTU_TO_MASTER;
         }
 
-        func = tvb_get_guint8(tvb, 3) & 0x7F;
-        data_len = tvb_get_guint8(tvb, 4);
+        func = tvb_get_uint8(tvb, 3) & 0x7F;
+        data_len = tvb_get_uint8(tvb, 4);
 
         /* If we have more data in the tvb then should be there, this is a stacked RTU->Master response */
         if (len > (data_len + 5 + 2)) {
@@ -477,12 +477,12 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
     proto_tree    *lg8979_tree, *lg8979_fc_tree = NULL;
     proto_tree    *lg8979_point_tree = NULL, *lg8979_ts_tree = NULL;
     int           offset = 0;
-    guint8        rtu_addr, func, packet_type, data_len, ptnum8, tripclose, rl, exp_code, num_chassis;
-    guint8        ts_mon, ts_day, ts_hr, ts_min, ts_sec;
-    guint16       ptnum, ptval, ana12_val;
-    guint16       ts_ms;
-    gint          num_points = 0, cnt = 0, cnt1 = 0;
-    gboolean      shr, new_status, change;
+    uint8_t       rtu_addr, func, packet_type, data_len, ptnum8, tripclose, rl, exp_code, num_chassis;
+    uint8_t       ts_mon, ts_day, ts_hr, ts_min, ts_sec;
+    uint16_t      ptnum, ptval, ana12_val;
+    uint16_t      ts_ms;
+    int           num_points = 0, cnt = 0, cnt1 = 0;
+    bool          shr, new_status, change;
 
     /* Make entries in Protocol column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "L&G 8979");
@@ -510,13 +510,13 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
         col_add_str(pinfo->cinfo, COL_INFO, "Master -> RTU");
 
         /* Add Flags to Protocol Tree */
-        shr = tvb_get_guint8(tvb, offset) & 0x80;
+        shr = tvb_get_uint8(tvb, offset) & 0x80;
 
         proto_tree_add_bitmask(lg8979_tree, tvb, offset, hf_lg8979_flags, ett_lg8979_flags, request_flags, ENC_LITTLE_ENDIAN);
         offset += 1;
 
         /* Add RTU Address to Protocol Tree */
-        rtu_addr = tvb_get_guint8(tvb, offset);
+        rtu_addr = tvb_get_uint8(tvb, offset);
         col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Address: %d", rtu_addr);
 
         proto_tree_add_item(lg8979_tree, hf_lg8979_address, tvb, offset, 1, ENC_LITTLE_ENDIAN);
@@ -525,7 +525,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
         if (!shr) {
             /* Add Function Code & last Mark Block to Protocol Tree */
             /* Function code is 7 lower bits of byte , LMB is 8th bit*/
-            func = tvb_get_guint8(tvb, offset) & 0x7f;
+            func = tvb_get_uint8(tvb, offset) & 0x7f;
 
             col_append_sep_str(pinfo->cinfo, COL_INFO, NULL,
                                 val_to_str_const(func, lg8979_funccode_vals, "Unknown Function Code"));
@@ -539,7 +539,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
             proto_tree_add_item(lg8979_fc_tree, hf_lg8979_funccode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
             offset += 1;
 
-            data_len = tvb_get_guint8(tvb, offset);
+            data_len = tvb_get_uint8(tvb, offset);
             proto_tree_add_item(lg8979_tree, hf_lg8979_length, tvb, offset, 1, ENC_LITTLE_ENDIAN);
             offset += 1;
 
@@ -581,8 +581,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_SBO_SELECT:
 
                     /* Get 8-bit point number and trip/close command-code */
-                    ptnum = tvb_get_guint8(tvb, offset);
-                    tripclose = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
+                    ptnum = tvb_get_uint8(tvb, offset);
+                    tripclose = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
 
                     lg8979_point_tree = proto_tree_add_subtree_format(
                         lg8979_tree, tvb, offset, 2,
@@ -606,7 +606,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_SBO_OPERATE:
 
                     /* Get 8-bit point number */
-                    ptnum = tvb_get_guint8(tvb, offset);
+                    ptnum = tvb_get_uint8(tvb, offset);
 
                     /* Update the Information Column with Command Details */
                     col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Output: %u", ptnum);
@@ -628,8 +628,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 /* Function Code 25 Pulse Output */
                 case LG8979_FC_PUL_OUTPUT:
 
-                    ptnum = tvb_get_guint8(tvb, offset);
-                    rl = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
+                    ptnum = tvb_get_uint8(tvb, offset);
+                    rl = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
 
                     lg8979_point_tree = proto_tree_add_subtree_format(lg8979_tree, tvb, offset, 2,
                                         ett_lg8979_point, NULL, "Pulse Output, Pt.Num: %u, Code: %s",
@@ -647,11 +647,11 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_TIME_SYNC:
 
                     /* Add 7-byte time-sync value to tree */
-                    ts_mon = tvb_get_guint8(tvb, offset);
-                    ts_day = tvb_get_guint8(tvb, offset+1);
-                    ts_hr  = tvb_get_guint8(tvb, offset+2);
-                    ts_min = tvb_get_guint8(tvb, offset+3);
-                    ts_sec = tvb_get_guint8(tvb, offset+4);
+                    ts_mon = tvb_get_uint8(tvb, offset);
+                    ts_day = tvb_get_uint8(tvb, offset+1);
+                    ts_hr  = tvb_get_uint8(tvb, offset+2);
+                    ts_min = tvb_get_uint8(tvb, offset+3);
+                    ts_sec = tvb_get_uint8(tvb, offset+4);
                     ts_ms  = tvb_get_letohs(tvb, offset+5);
 
                     lg8979_ts_tree = proto_tree_add_subtree_format(lg8979_tree, tvb, offset, 7, ett_lg8979_ts, NULL,
@@ -685,7 +685,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
                     for (cnt=0; cnt<num_points; cnt++) {
 
-                        ptval = tvb_get_guint8(tvb, offset);
+                        ptval = tvb_get_uint8(tvb, offset);
                         proto_tree_add_uint_format(lg8979_tree, hf_lg8979_ang_deadband, tvb, offset, 1,
                                                    ptnum, "Point Number %u: New Deadband: %u", ptnum, ptval);
                         ptnum  += 1;
@@ -719,7 +719,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
                     for (cnt=0; cnt<num_points; cnt++) {
 
-                        ptnum8 = tvb_get_guint8(tvb, offset);
+                        ptnum8 = tvb_get_uint8(tvb, offset);
                         ptval  = tvb_get_letohs(tvb, offset+1);
                         proto_tree_add_uint_format(lg8979_tree, hf_lg8979_acc_preset, tvb, offset, 3,
                                                    ptnum8, "Acc Point Number %u: Preset: %u", ptnum8, ptval);
@@ -754,13 +754,13 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
         col_add_str(pinfo->cinfo, COL_INFO, "RTU -> Master");
 
         /* Retrieve and add Flags to Protocol Tree */
-        shr = tvb_get_guint8(tvb, offset) & 0x80;
+        shr = tvb_get_uint8(tvb, offset) & 0x80;
 
         proto_tree_add_bitmask(lg8979_tree, tvb, offset, hf_lg8979_flags, ett_lg8979_flags, response_flags, ENC_LITTLE_ENDIAN);
         offset += 1;
 
         /* Add RTU Address to Protocol Tree */
-        rtu_addr = tvb_get_guint8(tvb, offset);
+        rtu_addr = tvb_get_uint8(tvb, offset);
         col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Address: %d", rtu_addr);
 
         proto_tree_add_item(lg8979_tree, hf_lg8979_address, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -771,7 +771,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
             /* Add Function Code & last Mark Block to Protocol Tree */
             /* Function code is 7 lower bits of byte , LMB is 8th bit*/
-            func = tvb_get_guint8(tvb, offset) & 0x7f;
+            func = tvb_get_uint8(tvb, offset) & 0x7f;
             col_append_sep_str(pinfo->cinfo, COL_INFO, NULL,
                                 val_to_str_const(func, lg8979_funccode_vals, "Unknown Function Code"));
 
@@ -783,7 +783,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
             proto_tree_add_item(lg8979_fc_tree, hf_lg8979_funccode,  tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
-            data_len = tvb_get_guint8(tvb, offset);
+            data_len = tvb_get_uint8(tvb, offset);
             proto_tree_add_item(lg8979_tree, hf_lg8979_length, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
 
@@ -797,8 +797,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
                     for (cnt=0; cnt<num_points; cnt++) {
 
-                        ptnum = ( tvb_get_guint8(tvb, offset) | ((tvb_get_guint8(tvb, offset+1) & 0x0F) << 8) );
-                        ptval = ( ((tvb_get_guint8(tvb, offset+1) & 0xF0) >> 4) | (tvb_get_guint8(tvb, offset+2) << 4) );
+                        ptnum = ( tvb_get_uint8(tvb, offset) | ((tvb_get_uint8(tvb, offset+1) & 0x0F) << 8) );
+                        ptval = ( ((tvb_get_uint8(tvb, offset+1) & 0xF0) >> 4) | (tvb_get_uint8(tvb, offset+2) << 4) );
                         proto_tree_add_uint_format(lg8979_tree, hf_lg8979_ang_point, tvb, offset, 3, ptnum,
                                                    "Point Number %u: %u", ptnum, ptval);
                         offset += 3;
@@ -834,7 +834,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                     for (cnt=0; cnt < num_points; cnt++) {
                         if (cnt%2 == 0) {
 
-                            ana12_val = ( tvb_get_guint8(tvb, offset) | ((tvb_get_guint8(tvb, offset+1) & 0x0F) << 8) );
+                            ana12_val = ( tvb_get_uint8(tvb, offset) | ((tvb_get_uint8(tvb, offset+1) & 0x0F) << 8) );
                             proto_tree_add_uint_format(lg8979_tree, hf_lg8979_ang_point, tvb, offset, 2, ptnum,
                                                        "Point Number %u: %u", ptnum, ana12_val);
                             offset += 1;
@@ -846,7 +846,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                         }
                         else {
 
-                            ana12_val = ( ((tvb_get_guint8(tvb, offset) & 0xF0) >> 4) | (tvb_get_guint8(tvb, offset+1) << 4) );
+                            ana12_val = ( ((tvb_get_uint8(tvb, offset) & 0xF0) >> 4) | (tvb_get_uint8(tvb, offset+1) << 4) );
                             proto_tree_add_uint_format(lg8979_tree, hf_lg8979_ang_point, tvb, offset, 2, ptnum,
                                                        "Point Number %u: %u", ptnum, ana12_val);
                             offset += 2;
@@ -864,16 +864,16 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                     offset += 2;
 
                     /* Retrieve the 0 and -90% references */
-                    ana12_val = ( tvb_get_guint8(tvb, offset) | ((tvb_get_guint8(tvb, offset+1) & 0x0F) << 8) );
+                    ana12_val = ( tvb_get_uint8(tvb, offset) | ((tvb_get_uint8(tvb, offset+1) & 0x0F) << 8) );
                     proto_tree_add_uint(lg8979_tree, hf_lg8979_adc_ref_zero, tvb, offset, 2, ana12_val);
 
-                    ana12_val = ( ((tvb_get_guint8(tvb, offset+1) & 0xF0) >> 4) | (tvb_get_guint8(tvb, offset+2) << 4) );
+                    ana12_val = ( ((tvb_get_uint8(tvb, offset+1) & 0xF0) >> 4) | (tvb_get_uint8(tvb, offset+2) << 4) );
                     proto_tree_add_uint(lg8979_tree, hf_lg8979_adc_ref_neg90, tvb, offset+1, 2, ana12_val);
 
                     offset += 3;
 
                     /* Retrieve the +90% reference */
-                    ana12_val = ( tvb_get_guint8(tvb, offset) | ((tvb_get_guint8(tvb, offset+1) & 0x0F) << 8) );
+                    ana12_val = ( tvb_get_uint8(tvb, offset) | ((tvb_get_uint8(tvb, offset+1) & 0x0F) << 8) );
                     proto_tree_add_uint(lg8979_tree, hf_lg8979_adc_ref_pos90, tvb, offset, 2, ana12_val);
                     offset += 2;
 
@@ -887,8 +887,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                     for (cnt=0; cnt<num_points; cnt++) {
                         /* Get 12-bit point number and new status / change bits */
                         ptnum = tvb_get_letohs(tvb, offset) & 0xFFF;
-                        new_status = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
-                        change = (tvb_get_guint8(tvb, offset+1) & 0x40) >> 6;
+                        new_status = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
+                        change = (tvb_get_uint8(tvb, offset+1) & 0x40) >> 6;
 
                         lg8979_point_tree = proto_tree_add_subtree_format(lg8979_tree, tvb, offset, 2, ett_lg8979_point, NULL,
                            "Indication Change Report, Point Number: %u, Status: %u, Change %u", ptnum, new_status, change);
@@ -951,8 +951,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                     for (cnt=0; cnt<num_points; cnt++) {
                         /* Get 12-bit point number and new status / change bits */
                         ptnum = tvb_get_letohs(tvb, offset) & 0xFFF;
-                        new_status = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
-                        change = (tvb_get_guint8(tvb, offset+1) & 0x40) >> 6;
+                        new_status = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
+                        change = (tvb_get_uint8(tvb, offset+1) & 0x40) >> 6;
 
                         lg8979_point_tree = proto_tree_add_subtree_format(lg8979_tree, tvb, offset, 2, ett_lg8979_point, NULL,
                            "SOE Change Report, Point Number: %u, Status: %u, Change %u", ptnum, new_status, change);
@@ -1010,7 +1010,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 /* Function Code 11 Digital Input Force Report */
                 case LG8979_FC_DIG_FRCRPT:
 
-                    ptnum8 = tvb_get_guint8(tvb, offset);
+                    ptnum8 = tvb_get_uint8(tvb, offset);
                     proto_tree_add_item(lg8979_tree, hf_lg8979_start_ptnum8, tvb, offset, 1, ENC_LITTLE_ENDIAN);
                     offset += 1;
 
@@ -1051,7 +1051,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_ACC_CHGRPT:
                 case LG8979_FC_ACC_FRCRPT:
 
-                    ptnum8 = tvb_get_guint8(tvb, offset);
+                    ptnum8 = tvb_get_uint8(tvb, offset);
                     proto_tree_add_item(lg8979_tree, hf_lg8979_start_ptnum8, tvb, offset, 1, ENC_LITTLE_ENDIAN);
                     offset += 1;
 
@@ -1080,7 +1080,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 
                         /* Get 12-bit point number and new status bit */
                         ptnum = tvb_get_letohs(tvb, offset) & 0xFFF;
-                        new_status = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
+                        new_status = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
 
                         lg8979_point_tree = proto_tree_add_subtree_format(lg8979_tree, tvb, offset, 9, ett_lg8979_point, NULL,
                            "SOE Log Change Report, Point Number: %u, New Status: %u", ptnum, new_status);
@@ -1091,11 +1091,11 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                         offset += 2;
 
                         /* Add 7-byte time-stamp to tree */
-                        ts_mon = tvb_get_guint8(tvb, offset);
-                        ts_day = tvb_get_guint8(tvb, offset+1);
-                        ts_hr = tvb_get_guint8(tvb, offset+2);
-                        ts_min = tvb_get_guint8(tvb, offset+3);
-                        ts_sec = tvb_get_guint8(tvb, offset+4);
+                        ts_mon = tvb_get_uint8(tvb, offset);
+                        ts_day = tvb_get_uint8(tvb, offset+1);
+                        ts_hr = tvb_get_uint8(tvb, offset+2);
+                        ts_min = tvb_get_uint8(tvb, offset+3);
+                        ts_sec = tvb_get_uint8(tvb, offset+4);
                         ts_ms = tvb_get_letohs(tvb, offset+5);
 
                         lg8979_ts_tree = proto_tree_add_subtree_format(lg8979_point_tree, tvb, offset, 7, ett_lg8979_ts, NULL,
@@ -1116,8 +1116,8 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_SBO_SELECT:
 
                     /* Get 8-bit point number and trip/close command-code */
-                    ptnum = tvb_get_guint8(tvb, offset);
-                    tripclose = (tvb_get_guint8(tvb, offset+1) & 0x80) >> 7;
+                    ptnum = tvb_get_uint8(tvb, offset);
+                    tripclose = (tvb_get_uint8(tvb, offset+1) & 0x80) >> 7;
 
                     lg8979_point_tree = proto_tree_add_subtree_format(
                         lg8979_tree, tvb, offset, 2,
@@ -1141,7 +1141,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_SBO_OPERATE:
 
                     /* Get 8-bit point number */
-                    ptnum = tvb_get_guint8(tvb, offset);
+                    ptnum = tvb_get_uint8(tvb, offset);
 
                     /* Update the Information Column with Command Details */
                     col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Output: %u", ptnum);
@@ -1155,7 +1155,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 case LG8979_FC_RTU_CONFIG:
 
                     /* Number of IO Chassis */
-                    num_chassis = tvb_get_guint8(tvb, offset);
+                    num_chassis = tvb_get_uint8(tvb, offset);
                     proto_tree_add_item(lg8979_tree, hf_lg8979_rtucfg_num_chassis, tvb, offset, 1, ENC_LITTLE_ENDIAN);
                     offset += 1;
 
@@ -1193,7 +1193,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
                 /* If the code byte is 0x09 (Function Code), the parameter byte is the value of the disallowed function code */
                 case LG8979_FC_EXP_RPT:
 
-                    exp_code = tvb_get_guint8(tvb, offset);
+                    exp_code = tvb_get_uint8(tvb, offset);
 
                     proto_tree_add_item(lg8979_tree, hf_lg8979_exprpt_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
                     proto_tree_add_item(lg8979_tree, hf_lg8979_exprpt_parm, tvb, offset+1, 1, ENC_LITTLE_ENDIAN);
@@ -1229,11 +1229,11 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
 /******************************************************************************************************/
 /* Return length of L&G 8979 Protocol over TCP message (used for re-assembly)                         */
 /******************************************************************************************************/
-static guint
+static unsigned
 get_lg8979_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset _U_, void *data _U_)
 {
 
-    guint len;
+    unsigned len;
     len = tvb_reported_length(tvb);  /* XXX: should really be some minimum length ?? */
 
     return len;
@@ -1246,10 +1246,10 @@ static int
 dissect_lg8979_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
 
-    gint length = tvb_reported_length(tvb);
+    int length = tvb_reported_length(tvb);
 
     /* Check for a L&G8979 packet.  It should begin with 0xFF */
-    if(length < 2 || tvb_get_guint8(tvb, 0) != 0xFF) {
+    if(length < 2 || tvb_get_uint8(tvb, 0) != 0xFF) {
         /* Not a L&G 8979 Protocol packet, just happened to use the same port */
         return 0;
     }
@@ -1267,10 +1267,10 @@ dissect_lg8979_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
 static int
 dissect_lg8979_simple(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    gint length = tvb_reported_length(tvb);
+    int length = tvb_reported_length(tvb);
 
     /* Check for a L&G8979 packet.  It should begin with 0xFF */
-    if(length < 2 || tvb_get_guint8(tvb, 0) != 0xFF) {
+    if(length < 2 || tvb_get_uint8(tvb, 0) != 0xFF) {
         /* Not a L&G 8979 Protocol packet ... */
         return 0;
     }
@@ -1518,7 +1518,7 @@ proto_register_lg8979(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lg8979,
         &ett_lg8979_flags,
         &ett_lg8979_funccode,
@@ -1542,7 +1542,7 @@ proto_register_lg8979(void)
     /* Register required preferences for L&G 8979 register decoding */
     lg8979_module = prefs_register_protocol(proto_lg8979, NULL);
 
-    /*  L&G 8979 - Desegmentmentation; defaults to TRUE for TCP desegmentation*/
+    /*  L&G 8979 - Desegmentmentation; defaults to true for TCP desegmentation*/
     prefs_register_bool_preference(lg8979_module, "desegment",
                                   "Desegment all L&G 8979 Protocol packets spanning multiple TCP segments",
                                   "Whether the L&G 8979 dissector should desegment all messages spanning multiple TCP segments",
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index 4c096ba183..a7c8a54d9a 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -55,7 +55,7 @@ static int
 dissect_lge_monitor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
 	int offset = 0;
-	guint32 lge_monitor_proto_id;
+	uint32_t lge_monitor_proto_id;
 	tvbuff_t* next_tvb = NULL;
 	proto_tree* header_tree;
 
@@ -140,7 +140,7 @@ proto_register_lge_monitor(void)
 	};
 
 /* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lge_monitor,
 		&ett_lge_header
 	};
diff --git a/epan/dissectors/packet-li5g.c b/epan/dissectors/packet-li5g.c
index 6f8d911746..ddfda0f271 100644
--- a/epan/dissectors/packet-li5g.c
+++ b/epan/dissectors/packet-li5g.c
@@ -34,8 +34,8 @@ static int hf_li5g_pld;
 /* the min header length */
 #define LI_5G_HEADER_LEN_MIN 40
 
-static gint ett_li5g;
-static gint ett_attrContents[LI_5G_ATTR_TYPE_MAX];
+static int ett_li5g;
+static int ett_attrContents[LI_5G_ATTR_TYPE_MAX];
 static int hf_li5g_attrContents[LI_5G_ATTR_TYPE_MAX];
 static dissector_handle_t li5g_handle;
 
@@ -114,14 +114,14 @@ dissect_li5g(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
     proto_item  *ti, *attr_ti;
     tvbuff_t    *payload_tvb;
     int offset = LI_5G_HEADER_LEN_MIN, hf_attr = -1;
-    guint32 headerLen, payloadLen, pduType;
-    guint16 payloadFormat, attrType, attrLen;
+    uint32_t headerLen, payloadLen, pduType;
+    uint16_t payloadFormat, attrType, attrLen;
     const char* info;
 
     address src_addr;
     address dst_addr;
-    guint32 src_port;
-    guint32 dst_port;
+    uint32_t src_port;
+    uint32_t dst_port;
 
     headerLen = tvb_get_ntohl(tvb, 4);
     payloadLen = tvb_get_ntohl(tvb, 8);
@@ -267,7 +267,7 @@ proto_register_li5g(void)
         { &hf_li5g_pld, { "Payload", "li5g.pld", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_li5g,
         &ett_attrContents[1],
         &ett_attrContents[2],
diff --git a/epan/dissectors/packet-lin.c b/epan/dissectors/packet-lin.c
index d62f98e9fe..ad3bcf85bd 100644
--- a/epan/dissectors/packet-lin.c
+++ b/epan/dissectors/packet-lin.c
@@ -58,9 +58,9 @@ static int hf_lin_err_invalidid;
 static int hf_lin_err_overflow;
 static int hf_lin_event_id;
 
-static gint ett_lin;
-static gint ett_lin_pid;
-static gint ett_errors;
+static int ett_lin;
+static int ett_lin_pid;
+static int ett_errors;
 
 static int * const error_fields[] = {
     &hf_lin_err_overflow,
@@ -114,9 +114,9 @@ void proto_register_lin(void);
 
 /* Interface Config UAT */
 typedef struct _interface_config {
-    guint     interface_id;
-    gchar    *interface_name;
-    guint     bus_id;
+    unsigned  interface_id;
+    char     *interface_name;
+    unsigned  bus_id;
 } interface_config_t;
 
 #define DATAFILE_LIN_INTERFACE_MAPPING "LIN_interface_mapping"
@@ -124,7 +124,7 @@ typedef struct _interface_config {
 static GHashTable *data_lin_interfaces_by_id;
 static GHashTable *data_lin_interfaces_by_name;
 static interface_config_t* interface_configs;
-static guint interface_config_num;
+static unsigned interface_config_num;
 
 UAT_HEX_CB_DEF(interface_configs, interface_id, interface_config_t)
 UAT_CSTRING_CB_DEF(interface_configs, interface_name, interface_config_t)
@@ -148,16 +148,16 @@ update_interface_config(void *r, char **err) {
     if (rec->interface_id > 0xffffffff) {
         *err = ws_strdup_printf("We currently only support 32 bit identifiers (ID: 0x%x  Name: %s)",
                                rec->interface_id, rec->interface_name);
-        return FALSE;
+        return false;
     }
 
     if (rec->bus_id > 0xffff) {
         *err = ws_strdup_printf("We currently only support 16 bit bus identifiers (ID: 0x%x  Name: %s  Bus-ID: 0x%x)",
                                 rec->interface_id, rec->interface_name, rec->bus_id);
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 static void
@@ -186,9 +186,9 @@ ht_lookup_interface_config_by_id(unsigned int identifier) {
 }
 
 static interface_config_t *
-ht_lookup_interface_config_by_name(const gchar *name) {
+ht_lookup_interface_config_by_name(const char *name) {
     interface_config_t *tmp = NULL;
-    gchar              *key = NULL;
+    char               *key = NULL;
 
     if (interface_configs == NULL) {
         return NULL;
@@ -202,15 +202,15 @@ ht_lookup_interface_config_by_name(const gchar *name) {
 }
 
 static void
-lin_free_key(gpointer key) {
+lin_free_key(void *key) {
     wmem_free(wmem_epan_scope(), key);
 }
 
 static void
 post_update_lin_interfaces_cb(void) {
-    guint  i;
+    unsigned  i;
     int   *key_id = NULL;
-    gchar *key_name = NULL;
+    char *key_name = NULL;
 
     /* destroy old hash tables, if they exist */
     if (data_lin_interfaces_by_id) {
@@ -250,13 +250,13 @@ post_update_lin_interfaces_cb(void) {
  * - interface_name = ""    and interface_id matches
  */
 
-static guint
+static unsigned
 get_bus_id(packet_info *pinfo) {
     if (!(pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID)) {
         return 0;
     }
 
-    guint32             interface_id = pinfo->rec->rec_header.packet_header.interface_id;
+    uint32_t            interface_id = pinfo->rec->rec_header.packet_header.interface_id;
     unsigned            section_number = pinfo->rec->presence_flags & WTAP_HAS_SECTION_NUMBER ? pinfo->rec->section_number : 0;
     const char         *interface_name = epan_get_interface_name(pinfo->epan, interface_id, section_number);
     interface_config_t *tmp = NULL;
@@ -283,17 +283,17 @@ get_bus_id(packet_info *pinfo) {
 
 /* Senders and Receivers UAT */
 typedef struct _sender_receiver_config {
-    guint     bus_id;
-    guint     lin_id;
-    gchar    *sender_name;
-    gchar    *receiver_name;
+    unsigned  bus_id;
+    unsigned  lin_id;
+    char     *sender_name;
+    char     *receiver_name;
 } sender_receiver_config_t;
 
 #define DATAFILE_LIN_SENDER_RECEIVER "LIN_senders_receivers"
 
 static GHashTable *data_sender_receiver;
 static sender_receiver_config_t* sender_receiver_configs;
-static guint sender_receiver_config_num;
+static unsigned sender_receiver_config_num;
 
 UAT_HEX_CB_DEF(sender_receiver_configs, bus_id, sender_receiver_config_t)
 UAT_HEX_CB_DEF(sender_receiver_configs, lin_id, sender_receiver_config_t)
@@ -318,15 +318,15 @@ update_sender_receiver_config(void *r, char **err) {
 
     if (rec->lin_id > 0x3f) {
         *err = ws_strdup_printf("LIN IDs need to be between 0x00 and 0x3f (Bus ID: %i  LIN ID: %i)", rec->bus_id, rec->lin_id);
-        return FALSE;
+        return false;
     }
 
     if (rec->bus_id > 0xffff) {
         *err = ws_strdup_printf("We currently only support 16 bit bus identifiers (Bus ID: %i  LIN ID: %i)", rec->bus_id, rec->lin_id);
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 static void
@@ -339,15 +339,15 @@ free_sender_receiver_config_cb(void *r) {
     rec->receiver_name = NULL;
 }
 
-static guint64
-sender_receiver_key(guint16 bus_id, guint32 lin_id) {
-    return ((guint64)bus_id << 32) | lin_id;
+static uint64_t
+sender_receiver_key(uint16_t bus_id, uint32_t lin_id) {
+    return ((uint64_t)bus_id << 32) | lin_id;
 }
 
 static sender_receiver_config_t *
-ht_lookup_sender_receiver_config(guint16 bus_id, guint32 lin_id) {
+ht_lookup_sender_receiver_config(uint16_t bus_id, uint32_t lin_id) {
     sender_receiver_config_t *tmp = NULL;
-    guint64                   key = 0;
+    uint64_t                  key = 0;
 
     if (sender_receiver_configs == NULL) {
         return NULL;
@@ -365,14 +365,14 @@ ht_lookup_sender_receiver_config(guint16 bus_id, guint32 lin_id) {
 }
 
 static void
-sender_receiver_free_key(gpointer key) {
+sender_receiver_free_key(void *key) {
     wmem_free(wmem_epan_scope(), key);
 }
 
 static void
 post_update_sender_receiver_cb(void) {
-    guint    i;
-    guint64 *key_id = NULL;
+    unsigned i;
+    uint64_t *key_id = NULL;
 
     /* destroy old hash table, if it exist */
     if (data_sender_receiver) {
@@ -388,13 +388,13 @@ post_update_sender_receiver_cb(void) {
     }
 
     for (i = 0; i < sender_receiver_config_num; i++) {
-        key_id = wmem_new(wmem_epan_scope(), guint64);
+        key_id = wmem_new(wmem_epan_scope(), uint64_t);
         *key_id = sender_receiver_key(sender_receiver_configs[i].bus_id, sender_receiver_configs[i].lin_id);
         g_hash_table_insert(data_sender_receiver, key_id, &sender_receiver_configs[i]);
     }
 }
 
-gboolean
+bool
 lin_set_source_and_destination_columns(packet_info* pinfo, lin_info_t *lininfo) {
     sender_receiver_config_t *tmp = ht_lookup_sender_receiver_config(lininfo->bus_id, lininfo->id);
 
@@ -422,10 +422,10 @@ dissect_lin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
     proto_tree *lin_id_tree;
     tvbuff_t   *next_tvb;
 
-    guint payload_length;
-    guint msg_type;
+    unsigned payload_length;
+    unsigned msg_type;
     lin_info_t lininfo;
-    guint64 errors;
+    uint64_t errors;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, LIN_NAME);
     col_clear(pinfo->cinfo, COL_INFO);
@@ -449,7 +449,7 @@ dissect_lin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
         proto_tree_add_item(lin_tree, hf_lin_checksum, tvb, 6, 1, ENC_BIG_ENDIAN);
 
-        lininfo.bus_id = (guint16)get_bus_id(pinfo);
+        lininfo.bus_id = (uint16_t)get_bus_id(pinfo);
         lininfo.len = 0;
         lin_set_source_and_destination_columns(pinfo, &lininfo);
     }
@@ -465,7 +465,7 @@ dissect_lin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
     switch (msg_type) {
     case LIN_MSG_TYPE_EVENT: {
-        guint event_id;
+        unsigned event_id;
         proto_tree_add_item_ret_uint(lin_tree, hf_lin_event_id, tvb, 8, 4, ENC_BIG_ENDIAN, &event_id);
         col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", val_to_str(event_id, lin_event_type_names, "0x%08x"));
         proto_item_set_end(ti_root, tvb, 12);
@@ -477,11 +477,11 @@ dissect_lin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
         if (payload_length > 0) {
             next_tvb = tvb_new_subset_length(tvb, 8, payload_length);
             proto_item_set_end(ti_root, tvb, 8 + payload_length);
-            lininfo.len = (guint16)payload_length;
+            lininfo.len = (uint16_t)payload_length;
 
-            guint32 bus_frame_id = lininfo.id | (lininfo.bus_id << 16);
-            if (!dissector_try_uint_new(subdissector_table, bus_frame_id, next_tvb, pinfo, tree, TRUE, &lininfo)) {
-                if (!dissector_try_uint_new(subdissector_table, lininfo.id, next_tvb, pinfo, tree, TRUE, &lininfo)) {
+            uint32_t bus_frame_id = lininfo.id | (lininfo.bus_id << 16);
+            if (!dissector_try_uint_new(subdissector_table, bus_frame_id, next_tvb, pinfo, tree, true, &lininfo)) {
+                if (!dissector_try_uint_new(subdissector_table, lininfo.id, next_tvb, pinfo, tree, true, &lininfo)) {
                     if (!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree, &heur_dtbl_entry, &lininfo)) {
                         call_data_dissector(next_tvb, pinfo, tree);
                     }
@@ -563,7 +563,7 @@ proto_register_lin(void) {
             FT_UINT32, BASE_HEX_DEC, VALS(lin_event_type_names), 0x00, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lin,
         &ett_lin_pid,
         &ett_errors,
@@ -591,7 +591,7 @@ proto_register_lin(void) {
     lin_interface_uat = uat_new("LIN Interface Mapping",
         sizeof(interface_config_t),             /* record size           */
         DATAFILE_LIN_INTERFACE_MAPPING,         /* filename              */
-        TRUE,                                   /* from profile          */
+        true,                                   /* from profile          */
         (void**)&interface_configs,             /* data_ptr              */
         &interface_config_num,                  /* numitems_ptr          */
         UAT_AFFECTS_DISSECTION,                 /* but not fields        */
@@ -618,7 +618,7 @@ proto_register_lin(void) {
     sender_receiver_uat = uat_new("Sender Receiver Config",
         sizeof(sender_receiver_config_t),       /* record size           */
         DATAFILE_LIN_SENDER_RECEIVER,           /* filename              */
-        TRUE,                                   /* from profile          */
+        true,                                   /* from profile          */
         (void**)&sender_receiver_configs,       /* data_ptr              */
         &sender_receiver_config_num,            /* numitems_ptr          */
         UAT_AFFECTS_DISSECTION,                 /* but not fields        */
diff --git a/epan/dissectors/packet-lin.h b/epan/dissectors/packet-lin.h
index 993226f07b..b6c4ecefcc 100644
--- a/epan/dissectors/packet-lin.h
+++ b/epan/dissectors/packet-lin.h
@@ -20,14 +20,14 @@
 
 /* bus_id 0 means ANY Bus */
 struct lin_info {
-    guint32 id;
-    guint16 bus_id;
-    guint16 len;
+    uint32_t id;
+    uint16_t bus_id;
+    uint16_t len;
 };
 
 typedef struct lin_info lin_info_t;
 
-gboolean lin_set_source_and_destination_columns(packet_info* pinfo, lin_info_t *lininfo);
+bool lin_set_source_and_destination_columns(packet_info* pinfo, lin_info_t *lininfo);
 
 #endif /* __PACKET_LIN_H__ */
 
diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c
index fc07c4d779..592dac226d 100644
--- a/epan/dissectors/packet-link16.c
+++ b/epan/dissectors/packet-link16.c
@@ -179,13 +179,13 @@ const value_string Link16_NPG_Strings[] = {
 
 static int proto_link16;
 
-static gint hf_link16_wordformat;
-static gint hf_link16_label;
-static gint hf_link16_sublabel;
-static gint hf_link16_mli;
-static gint hf_link16_contlabel;
+static int hf_link16_wordformat;
+static int hf_link16_label;
+static int hf_link16_sublabel;
+static int hf_link16_mli;
+static int hf_link16_contlabel;
 
-static gint ett_link16;
+static int ett_link16;
 
 static int * const link16_initial_word_fields[] = {
     &hf_link16_wordformat,
@@ -218,8 +218,8 @@ static int dissect_link16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
     Link16State *state = (Link16State *)data;
     proto_item *link16_item = NULL;
     proto_tree *link16_tree = NULL;
-    guint16 cache;
-    guint8 wordformat, contlabel;
+    uint16_t cache;
+    uint8_t wordformat, contlabel;
 
     if (!state)
         REPORT_DISSECTOR_BUG("Link 16 dissector state missing");
@@ -282,7 +282,7 @@ void proto_register_link16(void)
           { "Continuation Word Label", "link16.contlabel", FT_UINT16, BASE_DEC, NULL, 0x7C,
             NULL, HFILL }}
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_link16,
     };
 
diff --git a/epan/dissectors/packet-link16.h b/epan/dissectors/packet-link16.h
index b992728734..3b770fb5bf 100644
--- a/epan/dissectors/packet-link16.h
+++ b/epan/dissectors/packet-link16.h
@@ -12,9 +12,9 @@
 extern const value_string Link16_NPG_Strings[];
 
 typedef struct {
-    gint label;
-    gint sublabel;
-    gint extension;
+    int label;
+    int sublabel;
+    int extension;
 } Link16State;
 
 #endif /* __PACKET_LINK16_H__ */
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index d9fe6b9417..4eefec7663 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -59,7 +59,7 @@ static int hf_linx_main_version;
 static int hf_linx_main_reserved;
 static int hf_linx_main_connection;
 static int hf_linx_main_bundle;
-static int hf_linx_main_pkgsize;
+static int hf_linx_main_pkg_size;
 
 /* UDATA */
 static int hf_linx_udata_reserved;
@@ -133,13 +133,13 @@ static int hf_linx_tcp_payload;
 
 static int rlnh_version;
 
-static gint ett_linx;
-static gint ett_linx_multicore;
-static gint ett_linx_main;
-static gint ett_linx_error;
-static gint ett_linx_udata;
-static gint ett_linx_ack;
-static gint ett_linx_tcp;
+static int ett_linx;
+static int ett_linx_multicore;
+static int ett_linx_main;
+static int ett_linx_error;
+static int ett_linx_udata;
+static int ett_linx_ack;
+static int ett_linx_tcp;
 
 static expert_field ei_linx_version;
 static expert_field ei_linx_rlnh_msg;
@@ -269,7 +269,7 @@ static const value_string linx_conn_cmd[] = {
 static int
 dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	guint32 dword;
+	uint32_t dword;
 	int	offset = 0;
 	int	nexthdr;
 	int	thishdr;
@@ -347,7 +347,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 		proto_tree_add_item(main_header_tree, hf_linx_main_reserved  , tvb, offset, 4, ENC_BIG_ENDIAN);
 		proto_tree_add_item(main_header_tree, hf_linx_main_connection, tvb, offset, 4, ENC_BIG_ENDIAN);
 		proto_tree_add_item(main_header_tree, hf_linx_main_bundle    , tvb, offset, 4, ENC_BIG_ENDIAN);
-		proto_tree_add_item(main_header_tree, hf_linx_main_pkgsize   , tvb, offset, 4, ENC_BIG_ENDIAN);
+		proto_tree_add_item(main_header_tree, hf_linx_main_pkg_size  , tvb, offset, 4, ENC_BIG_ENDIAN);
 		offset += 4;
 
 		/* Supports version 2 and 3 so far */
@@ -661,7 +661,7 @@ proto_register_linx(void)
 		{ &hf_linx_main_bundle, /* in ETHCM_MAIN */
 			{ "Bundle", "linx.bundle", FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00004000, NULL, HFILL },
 		},
-		{ &hf_linx_main_pkgsize, /* in ETHCM_MAIN */
+		{ &hf_linx_main_pkg_size, /* in ETHCM_MAIN */
 			{ "Package Size", "linx.pcksize", FT_UINT32, BASE_DEC, NULL, 0x00003fff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_reserved, /* in ETHCM_UDATA */
@@ -785,7 +785,7 @@ proto_register_linx(void)
 	};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_linx,
 		&ett_linx_multicore,
 		&ett_linx_main,
@@ -831,7 +831,7 @@ proto_reg_handoff_linx(void)
 static int
 dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	guint32 dword;
+	uint32_t dword;
 	int offset = 0;
 	proto_item *ti, *ver_item, *msg_item;
 	proto_tree *linx_tcp_tree;
@@ -1030,7 +1030,7 @@ proto_register_linx_tcp(void)
 		}
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_linx_tcp,
 	};
 
diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c
index 9e968e83b4..47b3c92189 100644
--- a/epan/dissectors/packet-lisp-data.c
+++ b/epan/dissectors/packet-lisp-data.c
@@ -56,9 +56,9 @@ static int hf_lisp_data_lsb;
 static int hf_lisp_data_lsb8;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp_data;
-static gint ett_lisp_data_flags;
-static gint ett_lisp_data_mapver;
+static int ett_lisp_data;
+static int ett_lisp_data_flags;
+static int ett_lisp_data_mapver;
 
 static expert_field ei_lisp_data_flags_en_invalid;
 static expert_field ei_lisp_data_flags_nv_invalid;
@@ -72,9 +72,9 @@ static dissector_handle_t lisp_data_handle;
 static int
 dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    gint        offset = 0;
-    guint8      flags;
-    guint8      ip_ver;
+    int         offset = 0;
+    uint8_t     flags;
+    uint8_t     ip_ver;
     tvbuff_t   *next_tvb;
     proto_item *ti;
     proto_item *tif;
@@ -118,7 +118,7 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
     proto_tree_add_item(lisp_data_flags_tree,
             hf_lisp_data_flags_res, tvb, offset, 1, ENC_BIG_ENDIAN);
 
-    flags = tvb_get_guint8(tvb, offset);
+    flags = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     if (flags&LISP_DATA_FLAG_E && !(flags&LISP_DATA_FLAG_N)) {
@@ -242,7 +242,7 @@ proto_register_lisp_data(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lisp_data,
         &ett_lisp_data_flags,
         &ett_lisp_data_mapver
diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c
index 8bbe3349e9..ea6cd6edae 100644
--- a/epan/dissectors/packet-lisp-tcp.c
+++ b/epan/dissectors/packet-lisp-tcp.c
@@ -38,7 +38,7 @@ void proto_reg_handoff_lisp_tcp(void);
 /* Registration refresh message flags */
 #define REFRESH_FLAG_R      0x8000
 
-static gboolean lisp_tcp_desegment = TRUE;
+static bool lisp_tcp_desegment = true;
 
 /* Initialize the protocol and registered fields */
 static int proto_lisp_tcp;
@@ -76,10 +76,10 @@ static int hf_lisp_tcp_message_rid;
 static int hf_lisp_tcp_message_end_marker;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp_tcp;
-static gint ett_lisp_tcp_lcaf;
-static gint ett_lisp_tcp_eid_prefix;
-static gint ett_lisp_tcp_map_register;
+static int ett_lisp_tcp;
+static int ett_lisp_tcp_lcaf;
+static int ett_lisp_tcp_eid_prefix;
+static int ett_lisp_tcp_map_register;
 
 /* Initialize expert fields */
 static expert_field ei_lisp_tcp_undecoded;
@@ -137,17 +137,17 @@ static const value_string lisp_tcp_registration_refresh_scope[] = {
  * Dissector for EID prefixes
  */
 
-static guint
+static unsigned
 dissect_lisp_tcp_message_eid_prefix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *message_tree,
-        guint offset, proto_item *tim)
+        unsigned offset, proto_item *tim)
 {
     proto_tree *prefix_tree, *lcaf_tree;
-    gint str_len;
-    guint8 prefix_length;
-    guint16 prefix_afi, addr_len = 0;
-    const gchar *prefix;
+    int str_len;
+    uint8_t prefix_length;
+    uint16_t prefix_afi, addr_len = 0;
+    const char *prefix;
 
-    prefix_length = tvb_get_guint8(tvb, offset);
+    prefix_length = tvb_get_uint8(tvb, offset);
     prefix_afi = tvb_get_ntohs(tvb, offset + 1);
 
     prefix = get_addr_str(tvb, pinfo, offset + 3, prefix_afi, &addr_len);
@@ -204,21 +204,21 @@ dissect_lisp_tcp_message_eid_prefix(tvbuff_t *tvb, packet_info *pinfo, proto_tre
  * Dissector for Reliable Transport messages
  */
 
-static guint
+static unsigned
 dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *message_tree,
-        guint offset, guint16 type, guint16 data_len, proto_item *tim)
+        unsigned offset, uint16_t type, uint16_t data_len, proto_item *tim)
 {
-    guint initial_offset = offset;
+    unsigned initial_offset = offset;
     proto_tree *map_register_tree;
-    guint8 reject_reason, scope, err;
-    guint16 refresh_flags, offending_msg_type;
+    uint8_t reject_reason, scope, err;
+    uint16_t refresh_flags, offending_msg_type;
 
     switch (type) {
 
     /* Error Notification */
     case TRANSPORT_BASE:
         /* Error code (1 byte) */
-        err = tvb_get_guint8(tvb, offset);
+        err = tvb_get_uint8(tvb, offset);
         proto_tree_add_item(message_tree, hf_lisp_tcp_message_err_code, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset += 1;
         data_len -= 1;
@@ -259,7 +259,7 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
         /* Map-Register */
         map_register_tree = proto_tree_add_subtree(message_tree, tvb, offset, data_len,
                 ett_lisp_tcp_map_register, NULL, "Map-Register");
-        offset = dissect_lisp_map_register(tvb, pinfo, map_register_tree, offset, tim, FALSE);
+        offset = dissect_lisp_map_register(tvb, pinfo, map_register_tree, offset, tim, false);
         data_len -= offset - initial_offset;
         break;
 
@@ -273,7 +273,7 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
     /* Registration Reject */
     case TRANSPORT_BASE + 3:
         /* Reason (1 byte) */
-        reject_reason = tvb_get_guint8(tvb, offset);
+        reject_reason = tvb_get_uint8(tvb, offset);
         proto_tree_add_item(message_tree, hf_lisp_tcp_message_registration_reject_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset += 1;
         proto_item_append_text(tim, ", Reason: %s",
@@ -291,7 +291,7 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
     /* Registration Refresh */
     case TRANSPORT_BASE + 4:
         /* Reason (1 byte) */
-        scope = tvb_get_guint8(tvb, offset);
+        scope = tvb_get_uint8(tvb, offset);
         proto_tree_add_item(message_tree, hf_lisp_tcp_message_registration_refresh_scope, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset += 1;
         proto_item_append_text(tim, ", Scope: %s",
@@ -331,7 +331,7 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
         offset += LISP_SITEID_LEN;
 
         /* Mapping Record */
-        offset = dissect_lisp_mapping(tvb, pinfo, message_tree, 0, 1, FALSE, offset, tim);
+        offset = dissect_lisp_mapping(tvb, pinfo, message_tree, 0, 1, false, offset, tim);
         data_len -= offset - initial_offset;
         break;
     }
@@ -350,14 +350,14 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
  * Dissector for Membership messages
  */
 
-static guint
+static unsigned
 dissect_lisp_tcp_membership_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *message_tree,
-        guint offset, guint16 type, guint16 data_len, proto_item *tim)
+        unsigned offset, uint16_t type, uint16_t data_len, proto_item *tim)
 {
-    guint32 iid, sid, rid;
-    guint8 err;
-    guint64 siteid;
-    guint16 afi;
+    uint32_t iid, sid, rid;
+    uint8_t err;
+    uint64_t siteid;
+    uint16_t afi;
 
     /* EID AFI (2 bytes) */
     proto_tree_add_item(message_tree, hf_lisp_tcp_message_eid_afi, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -384,7 +384,7 @@ dissect_lisp_tcp_membership_message(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 
         if (type == MEMBERSHIP_BASE + 2) {
             /* Error code (1 byte) */
-            err = tvb_get_guint8(tvb, offset);
+            err = tvb_get_uint8(tvb, offset);
             proto_tree_add_item(message_tree, hf_lisp_tcp_message_err, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset += 1;
             data_len -= 1;
@@ -456,9 +456,9 @@ dissect_lisp_tcp_membership_message(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 static int
 dissect_lisp_tcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    guint offset = 0;
-    guint16 type, len, data_len;
-    guint32 id, marker;
+    unsigned offset = 0;
+    uint16_t type, len, data_len;
+    uint32_t id, marker;
     proto_item *tim, *til, *tiem;
     proto_tree *message_tree;
 
@@ -523,11 +523,11 @@ dissect_lisp_tcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
  * Get message length, needed by tcp_dissect_pdus()
  */
 
-static guint
+static unsigned
 get_lisp_tcp_message_len(packet_info *pinfo _U_, tvbuff_t *tvb,
                          int offset, void *data _U_)
 {
-    guint16 mlen;
+    uint16_t mlen;
 
     /* Get length of membership message */
     mlen = tvb_get_ntohs(tvb, offset + 2);
@@ -666,7 +666,7 @@ proto_register_lisp_tcp(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lisp_tcp,
         &ett_lisp_tcp_lcaf,
         &ett_lisp_tcp_eid_prefix,
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index fccc4fe9b2..c9b23c8771 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -380,32 +380,32 @@ static int hf_lisp_ecm_flags_ddt;
 static int hf_lisp_ecm_res;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp;
-static gint ett_lisp_mr;
-static gint ett_lisp_mreq_flags;
-static gint ett_lisp_mapping;
-static gint ett_lisp_itr;
-static gint ett_lisp_record;
-static gint ett_lisp_lcaf;
-static gint ett_lisp_lcaf_header;
-static gint ett_lisp_lcaf_geo_lat;
-static gint ett_lisp_lcaf_geo_lon;
-static gint ett_lisp_lcaf_natt_rloc;
-static gint ett_lisp_lcaf_mcinfo_flags;
-static gint ett_lisp_lcaf_mcinfo_src;
-static gint ett_lisp_lcaf_mcinfo_grp;
-static gint ett_lisp_lcaf_elp_hop;
-static gint ett_lisp_lcaf_elp_hop_flags;
-static gint ett_lisp_lcaf_srcdst_src;
-static gint ett_lisp_lcaf_srcdst_dst;
-static gint ett_lisp_lcaf_rle_entry;
-static gint ett_lisp_lcaf_kv_key;
-static gint ett_lisp_lcaf_kv_value;
-static gint ett_lisp_lcaf_vendor;
-static gint ett_lisp_loc;
-static gint ett_lisp_loc_flags;
-static gint ett_lisp_info_prefix;
-static gint ett_lisp_afi_list;
+static int ett_lisp;
+static int ett_lisp_mr;
+static int ett_lisp_mreq_flags;
+static int ett_lisp_mapping;
+static int ett_lisp_itr;
+static int ett_lisp_record;
+static int ett_lisp_lcaf;
+static int ett_lisp_lcaf_header;
+static int ett_lisp_lcaf_geo_lat;
+static int ett_lisp_lcaf_geo_lon;
+static int ett_lisp_lcaf_natt_rloc;
+static int ett_lisp_lcaf_mcinfo_flags;
+static int ett_lisp_lcaf_mcinfo_src;
+static int ett_lisp_lcaf_mcinfo_grp;
+static int ett_lisp_lcaf_elp_hop;
+static int ett_lisp_lcaf_elp_hop_flags;
+static int ett_lisp_lcaf_srcdst_src;
+static int ett_lisp_lcaf_srcdst_dst;
+static int ett_lisp_lcaf_rle_entry;
+static int ett_lisp_lcaf_kv_key;
+static int ett_lisp_lcaf_kv_value;
+static int ett_lisp_lcaf_vendor;
+static int ett_lisp_loc;
+static int ett_lisp_loc_flags;
+static int ett_lisp_info_prefix;
+static int ett_lisp_afi_list;
 
 static expert_field ei_lisp_undecoded;
 static expert_field ei_lisp_expected_field;
@@ -417,8 +417,8 @@ static dissector_handle_t lisp_handle;
 static dissector_handle_t ipv4_handle;
 static dissector_handle_t ipv6_handle;
 
-static gboolean encapsulated;
-static gboolean ddt_originated;
+static bool encapsulated;
+static bool ddt_originated;
 
 static const value_string lisp_typevals[] = {
     { LISP_MAP_REQUEST,     "Map-Request" },
@@ -492,14 +492,14 @@ static const value_string oui_vals[] = {
 };
 
 static int
-get_lcaf_data(tvbuff_t *tvb, gint offset, guint8 *lcaf_type, guint16 *len)
+get_lcaf_data(tvbuff_t *tvb, int offset, uint8_t *lcaf_type, uint16_t *len)
 {
     /* Jump over Rsvd1 and Flags (16 bits) */
     offset += 2;
 
     /* Type (8 bits) */
     if (lcaf_type)
-        *lcaf_type = tvb_get_guint8(tvb, offset);
+        *lcaf_type = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Jump over Rsvd2 bits (8 bits) */
@@ -514,15 +514,15 @@ get_lcaf_data(tvbuff_t *tvb, gint offset, guint8 *lcaf_type, guint16 *len)
     return offset;
 }
 
-const gchar *
+const char *
 // NOLINTNEXTLINE(misc-no-recursion)
-get_addr_str(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint16 afi, guint16 *addr_len)
+get_addr_str(tvbuff_t *tvb, packet_info *pinfo, int offset, uint16_t afi, uint16_t *addr_len)
 {
-    const gchar       *notset_str = "not set";
-    const gchar       *addr_str;
-    guint8             lcaf_type;
-    guint32            iid, asn;
-    guint16            cur_len;
+    const char        *notset_str = "not set";
+    const char        *addr_str;
+    uint8_t            lcaf_type;
+    uint32_t           iid, asn;
+    uint16_t           cur_len;
 
     switch (afi) {
         case AFNUM_RESERVED:
@@ -573,11 +573,11 @@ get_addr_str(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint16 afi, guint1
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_natt_rloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, const gchar *str, int idx)
+        int offset, const char *str, int idx)
 {
-    guint16      addr_len = 0;
-    guint16      rloc_afi;
-    const gchar *rloc_str;
+    uint16_t     addr_len = 0;
+    uint16_t     rloc_afi;
+    const char *rloc_str;
     proto_item  *ti;
     proto_tree  *rloc_tree;
 
@@ -624,12 +624,12 @@ dissect_lcaf_natt_rloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, int idx, proto_item *tip)
+        int offset, int idx, proto_item *tip)
 {
-    guint16      addr_len = 0;
-    guint16      hop_afi;
-    guint16      hop_flags;
-    const gchar *hop_str;
+    uint16_t     addr_len = 0;
+    uint16_t     hop_afi;
+    uint16_t     hop_flags;
+    const char *hop_str;
     proto_item  *ti, *ti_flags;
     proto_tree  *hop_tree, *flags_tree;
 
@@ -697,12 +697,12 @@ dissect_lcaf_elp_hop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, int idx, proto_item *tip)
+        int offset, int idx, proto_item *tip)
 {
-    guint8       level;
-    guint16      addr_len = 0;
-    guint16      entry_afi;
-    const gchar *entry_str;
+    uint8_t      level;
+    uint16_t     addr_len = 0;
+    uint16_t     entry_afi;
+    const char *entry_str;
     proto_item  *ti;
     proto_tree  *entry_tree;
 
@@ -715,7 +715,7 @@ dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Level Value (1 byte) */
     proto_tree_add_item(entry_tree, hf_lisp_lcaf_rle_entry_level, tvb, offset, 1, ENC_BIG_ENDIAN);
-    level = tvb_get_guint8(tvb, offset);
+    level = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* AFI (2 bytes) */
@@ -766,17 +766,17 @@ dissect_lcaf_rle_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint old_offset;
-    gint remaining = length;
-    gint i = 1;
-    gint str_len;
-
-    guint16            addr_len = 0;
-    guint16            afi;
-    const gchar       *lcaf_str;
-    gchar             *disp_str;
+    int old_offset;
+    int remaining = length;
+    int i = 1;
+    int str_len;
+
+    uint16_t           addr_len = 0;
+    uint16_t           afi;
+    const char        *lcaf_str;
+    char              *disp_str;
     proto_item        *tir;
     proto_tree        *lisp_afi_list_tree;
 
@@ -858,11 +858,11 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *ip_address;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *ip_address;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* Instance ID (4 bytes) */
     proto_tree_add_item(tree, hf_lisp_lcaf_iid, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -933,11 +933,11 @@ dissect_lcaf_iid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *addr;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *addr;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* AS Number (4 bytes) */
     proto_tree_add_item(tree, hf_lisp_lcaf_asn, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -1012,17 +1012,17 @@ dissect_lcaf_asn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tir)
+dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tir)
 {
-    guint16 addr_len = 0;
-    gboolean north, east;
-    guint16 deg;
-    guint8 min, sec;
-    guint32 alt;
-    guint16 afi;
-    gint str_len;
-    const gchar *ip_address;
-    const guint16 mask = 0x7FFF;   /* prepare mask for N or E bit */
+    uint16_t addr_len = 0;
+    bool north, east;
+    uint16_t deg;
+    uint8_t min, sec;
+    uint32_t alt;
+    uint16_t afi;
+    int str_len;
+    const char *ip_address;
+    const uint16_t mask = 0x7FFF;   /* prepare mask for N or E bit */
     proto_item *ti_lat, *ti_lon, *ti_alt;
     proto_tree *lat_tree, *lon_tree;
 
@@ -1044,7 +1044,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Minutes (1 byte) */
     proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_min, tvb, offset, 1, ENC_BIG_ENDIAN);
-    min = tvb_get_guint8(tvb, offset);
+    min = tvb_get_uint8(tvb, offset);
     if (min > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid latitude minutes value (%d)", min);
@@ -1052,7 +1052,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Seconds (1 byte) */
     proto_tree_add_item(lat_tree, hf_lisp_lcaf_geo_lat_sec, tvb, offset, 1, ENC_BIG_ENDIAN);
-    sec = tvb_get_guint8(tvb, offset);
+    sec = tvb_get_uint8(tvb, offset);
     if (sec > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid latitude seconds value (%d)", min);
@@ -1081,7 +1081,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Minutes (1 byte) */
     proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_min, tvb, offset, 1, ENC_BIG_ENDIAN);
-    min = tvb_get_guint8(tvb, offset);
+    min = tvb_get_uint8(tvb, offset);
     if (min > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid longitude minutes value (%d)", min);
@@ -1089,7 +1089,7 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 
     /* Seconds (1 byte) */
     proto_tree_add_item(lon_tree, hf_lisp_lcaf_geo_lon_sec, tvb, offset, 1, ENC_BIG_ENDIAN);
-    sec = tvb_get_guint8(tvb, offset);
+    sec = tvb_get_uint8(tvb, offset);
     if (sec > 60)
         expert_add_info_format(pinfo, tree, &ei_lisp_invalid_field,
                 "Invalid longitude seconds value (%d)", min);
@@ -1187,15 +1187,15 @@ dissect_lcaf_geo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offse
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_natt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint         i;
-    gint         len;
-    gint         remaining   = length;
-    const gchar *global_etr  = " of Global ETR: %s";
-    const gchar *ms          = " of MS: %s";
-    const gchar *private_etr = " of Private ETR: %s";
-    const gchar *rtr         = " of RTR %d: %s";
+    int          i;
+    int          len;
+    int          remaining   = length;
+    const char *global_etr  = " of Global ETR: %s";
+    const char *ms          = " of MS: %s";
+    const char *private_etr = " of Private ETR: %s";
+    const char *rtr         = " of RTR %d: %s";
 
     remaining -= 4;
 
@@ -1249,11 +1249,11 @@ dissect_lcaf_natt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    const gchar *addr;
-    guint16 afi, addr_len = 0;
-    gint str_len;
+    const char *addr;
+    uint16_t afi, addr_len = 0;
+    int str_len;
 
     /* Reserved (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_nonce_loc_res, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -1334,12 +1334,12 @@ dissect_lcaf_nonce_loc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, proto_item *tir)
+        int offset, proto_item *tir)
 {
-    guint8       src_masklen, grp_masklen;
-    guint16      afi, addr_len = 0;
-    guint32      iid;
-    const gchar *src_str, *grp_str;
+    uint8_t      src_masklen, grp_masklen;
+    uint16_t     afi, addr_len = 0;
+    uint32_t     iid;
+    const char *src_str, *grp_str;
     proto_item  *ti_src, *ti_grp;
     proto_tree  *src_tree, *grp_tree;
 
@@ -1354,12 +1354,12 @@ dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Source Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    src_masklen = tvb_get_guint8(tvb, offset);
+    src_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Group Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_grp_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    grp_masklen = tvb_get_guint8(tvb, offset);
+    grp_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_src   = proto_tree_add_item(tree, hf_lisp_lcaf_mcinfo_src, tvb, offset, 2, ENC_NA);
@@ -1458,11 +1458,11 @@ dissect_lcaf_mcast_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_elp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length, proto_item *tir)
+        int offset, uint16_t length, proto_item *tir)
 {
-    gint len;
-    gint remaining = length;
-    gint i = 1;
+    int len;
+    int remaining = length;
+    int i = 1;
 
     while (remaining > 0) {
         len = dissect_lcaf_elp_hop(tvb, pinfo, tree, offset, i, tir);
@@ -1497,11 +1497,11 @@ dissect_lcaf_elp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, proto_item *tir)
+        int offset, proto_item *tir)
 {
-    guint8       src_masklen, dst_masklen;
-    guint16      afi, addr_len = 0;
-    const gchar *src_str, *dst_str;
+    uint8_t      src_masklen, dst_masklen;
+    uint16_t     afi, addr_len = 0;
+    const char *src_str, *dst_str;
     proto_item  *ti_src, *ti_dst;
     proto_tree  *src_tree, *dst_tree;
 
@@ -1511,12 +1511,12 @@ dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     /* Source Prefix Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    src_masklen = tvb_get_guint8(tvb, offset);
+    src_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* Destination Prefix Mask Length (1 byte) */
     proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_dst_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    dst_masklen = tvb_get_guint8(tvb, offset);
+    dst_masklen = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_src   = proto_tree_add_item(tree, hf_lisp_lcaf_srcdst_src, tvb, offset, 2, ENC_NA);
@@ -1626,11 +1626,11 @@ dissect_lcaf_src_dst_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_rle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length, proto_item *tir)
+        int offset, uint16_t length, proto_item *tir)
 {
-    gint len;
-    gint remaining = length;
-    gint i = 1;
+    int len;
+    int remaining = length;
+    int i = 1;
 
     while (remaining > 0) {
         len = dissect_lcaf_rle_entry(tvb, pinfo, tree, offset, i, tir);
@@ -1663,13 +1663,13 @@ dissect_lcaf_rle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset)
+        int offset)
 {
-    guint16      afi, addr_len = 0;
-    const gchar *key_str, *value_str;
+    uint16_t     afi, addr_len = 0;
+    const char *key_str, *value_str;
     proto_item  *ti_key, *ti_value;
     proto_tree  *key_tree, *value_tree;
-    gint         str_len;
+    int          str_len;
 
     ti_key   = proto_tree_add_item(tree, hf_lisp_lcaf_kv_key, tvb, offset, 2, ENC_NA);
     key_tree = proto_item_add_subtree(ti_key, ett_lisp_lcaf_kv_key);
@@ -1782,9 +1782,9 @@ dissect_lcaf_kv_addr_pair(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_lcaf_vendor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        gint offset, guint16 length)
+        int offset, uint16_t length)
 {
-    gint len;
+    int len;
     proto_item  *ti_vendor;
     proto_tree  *vendor_tree;
 
@@ -1841,10 +1841,10 @@ dissect_lcaf_vendor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 int
 // NOLINTNEXTLINE(misc-no-recursion)
-dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip)
+dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip)
 {
-    guint8       lcaf_type;
-    guint16      len;
+    uint8_t      lcaf_type;
+    uint16_t     len;
     proto_item  *tir, *ti_header, *ti_flags, *ti;
     proto_tree  *lcaf_tree, *lcaf_header_tree, *flags_tree;
     tvbuff_t    *payload_tvb;
@@ -1867,7 +1867,7 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p
 
     /* Type (8 bits) */
     proto_tree_add_item(lcaf_header_tree, hf_lisp_lcaf_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-    lcaf_type = tvb_get_guint8(tvb, offset);
+    lcaf_type = tvb_get_uint8(tvb, offset);
     proto_item_append_text(tir, ": %s", val_to_str(lcaf_type, lcaf_typevals, "Unknown (%d)"));
     offset += 1;
 
@@ -1962,15 +1962,15 @@ dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, p
 static int
 dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping_tree, int rec)
 {
-    gint         offset   = 0;
-    guint16      addr_len = 0;
-    guint8       prio;
-    guint8       weight;
-    guint8       m_prio;
-    guint8       m_weight;
-    guint16      flags;
-    guint16      loc_afi;
-    const gchar *locator;
+    int          offset   = 0;
+    uint16_t     addr_len = 0;
+    uint8_t      prio;
+    uint8_t      weight;
+    uint8_t      m_prio;
+    uint8_t      m_weight;
+    uint16_t     flags;
+    uint16_t     loc_afi;
+    const char *locator;
     proto_item  *tir, *ti_flags;
     proto_tree  *lisp_lcaf_tree, *lisp_loc_tree, *lisp_flags_tree;
 
@@ -1979,19 +1979,19 @@ dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping
     lisp_loc_tree = proto_item_add_subtree(tir, ett_lisp_loc);
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_priority, tvb, offset, 1, ENC_BIG_ENDIAN);
-    prio = tvb_get_guint8(tvb, offset);
+    prio = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_weight, tvb, offset, 1, ENC_BIG_ENDIAN);
-    weight = tvb_get_guint8(tvb, offset);
+    weight = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_mpriority, tvb, offset, 1, ENC_BIG_ENDIAN);
-    m_prio = tvb_get_guint8(tvb, offset);
+    m_prio = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_mweight, tvb, offset, 1, ENC_BIG_ENDIAN);
-    m_weight = tvb_get_guint8(tvb, offset);
+    m_weight = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     ti_flags = proto_tree_add_item(lisp_loc_tree, hf_lisp_loc_flags, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -2056,20 +2056,20 @@ dissect_lisp_locator(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_mapping
 
 int
 dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        guint8 rec_cnt, int rec, gboolean referral, gint offset, proto_item *tim)
+        uint8_t rec_cnt, int rec, bool referral, int offset, proto_item *tim)
 {
     int          i;
-    gint         str_len;
-    guint16      addr_len      = 0;
-    guint8       prefix_mask, loc_cnt;
-    guint16      flags;
-    guint16      act;
-    guint16      prefix_afi, eid_afi;
-    const gchar *prefix;
+    int          str_len;
+    uint16_t     addr_len      = 0;
+    uint8_t      prefix_mask, loc_cnt;
+    uint16_t     flags;
+    uint16_t     act;
+    uint16_t     prefix_afi, eid_afi;
+    const char *prefix;
     proto_item  *tir;
     proto_tree  *lisp_mapping_tree, *lcaf_prefix_tree;
 
-    prefix_mask   = tvb_get_guint8(tvb, offset + 5);
+    prefix_mask   = tvb_get_uint8(tvb, offset + 5);
     flags         = tvb_get_ntohs(tvb, offset + 6);
     prefix_afi    = tvb_get_ntohs(tvb, offset + 10);
 
@@ -2108,7 +2108,7 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
 
     /* Locator count (8 bits) */
     proto_tree_add_item(lisp_mapping_tree, hf_lisp_mapping_loccnt, tvb, offset, 1, ENC_BIG_ENDIAN);
-    loc_cnt = tvb_get_guint8(tvb, offset);
+    loc_cnt = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     /* EID mask length (8 bits) */
@@ -2229,18 +2229,18 @@ static void
 dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int                i;
-    guint16            addr_len    = 0;
-    gint               offset      = 0;
-    guint16            flags;
-    gboolean           mrep;
-    gboolean           smr;
-    gboolean           probe;
-    gboolean           pitr;
-    gboolean           smr_invoked;
-    guint8             itr_rec_cnt = 0;
-    guint8             rec_cnt     = 0;
-    guint16            src_eid_afi;
-    const gchar       *src_eid;
+    uint16_t           addr_len    = 0;
+    int                offset      = 0;
+    uint16_t           flags;
+    bool               mrep;
+    bool               smr;
+    bool               probe;
+    bool               pitr;
+    bool               smr_invoked;
+    uint8_t            itr_rec_cnt = 0;
+    uint8_t            rec_cnt     = 0;
+    uint16_t           src_eid_afi;
+    const char        *src_eid;
     proto_item        *ti_flags;
     proto_tree        *flags_tree, *lcaf_src_eid_tree, *lcaf_prefix_tree;
     tvbuff_t          *next_tvb;
@@ -2278,12 +2278,12 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
     proto_tree_add_item(lisp_tree, hf_lisp_mreq_res, tvb, offset, 3, ENC_BIG_ENDIAN);
 
     /* ITR record count (5 bits) */
-    itr_rec_cnt = tvb_get_guint8(tvb, offset + 2) & 0x1F;
+    itr_rec_cnt = tvb_get_uint8(tvb, offset + 2) & 0x1F;
     proto_tree_add_item(lisp_tree, hf_lisp_irc, tvb, offset, 3, ENC_BIG_ENDIAN);
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2333,7 +2333,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
 
     /* ITR records */
     for(i=0; i < itr_rec_cnt+1; i++) {
-        guint16 itr_afi;
+        uint16_t itr_afi;
         proto_item *tir;
         proto_tree *lisp_itr_tree;
 
@@ -2367,15 +2367,15 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
 
     /* Query records */
     for(i=0; i < rec_cnt; i++) {
-        gint str_len;
-        guint16 prefix_mask;
-        guint16 prefix_afi;
-        const gchar *prefix;
+        int str_len;
+        uint16_t prefix_mask;
+        uint16_t prefix_afi;
+        const char *prefix;
         proto_item *tir;
         proto_tree *lisp_record_tree;
 
         addr_len = 0;
-        prefix_mask = tvb_get_guint8(tvb, offset + 1);
+        prefix_mask = tvb_get_uint8(tvb, offset + 1);
         prefix_afi = tvb_get_ntohs(tvb, offset + 2);
         prefix = get_addr_str(tvb, pinfo, offset + 4, prefix_afi, &addr_len);
 
@@ -2439,7 +2439,7 @@ dissect_lisp_map_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tre
         tim = proto_tree_add_item(lisp_tree, hf_lisp_mrep_record, tvb, offset, -1, ENC_NA);
         lisp_mr_tree = proto_item_add_subtree(tim, ett_lisp_mr);
 
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_mr_tree, 0, 1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_mr_tree, 0, 1, false, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2480,14 +2480,14 @@ static void
 dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    gboolean  probe;
-    guint8    flags;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    bool      probe;
+    uint8_t   flags;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
 
     /* Flags (2 bits) */
-    flags = tvb_get_guint8(tvb, offset);
+    flags = tvb_get_uint8(tvb, offset);
     probe = flags & (MAP_REP_FLAG_P >> 16);
     proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_probe, tvb, offset, 3, ENC_BIG_ENDIAN);
     proto_tree_add_item(lisp_tree, hf_lisp_mrep_flags_enlr, tvb, offset, 3, ENC_BIG_ENDIAN);
@@ -2503,7 +2503,7 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2513,7 +2513,7 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 
     /* Reply records */
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2554,17 +2554,17 @@ dissect_lisp_map_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
  *
  */
 
-gint
+int
 dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        gint offset, proto_item *tim, gboolean keep_going)
+        int offset, proto_item *tim, bool keep_going)
 {
     int       i;
-    guint8    rec_cnt = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
-    guint16   authlen = 0;
-    guint16   flags;
-    gboolean  xtrid;
-    gboolean  rtr;
+    uint16_t  authlen = 0;
+    uint16_t  flags;
+    bool      xtrid;
+    bool      rtr;
 
     /* Flags (1 bit) */
     proto_tree_add_item(lisp_tree, hf_lisp_mreg_flags_pmr, tvb, offset, 3, ENC_BIG_ENDIAN);
@@ -2591,7 +2591,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2614,7 +2614,7 @@ dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += authlen;
 
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, tim);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, tim);
     }
 
     /* If I bit is set, we have an xTR-ID and a site-ID field */
@@ -2672,13 +2672,13 @@ static void
 dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
-    guint16   authlen = 0;
-    guint16   flags;
-    gboolean  xtrid;
-    gboolean  rtr;
+    uint16_t  authlen = 0;
+    uint16_t  flags;
+    bool      xtrid;
+    bool      rtr;
 
     /* Flags defined in NAT Traversal draft (2 bits) */
     flags = tvb_get_ntohs(tvb, offset);
@@ -2696,7 +2696,7 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2719,7 +2719,7 @@ dissect_lisp_map_notify(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree
     offset += authlen;
 
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, FALSE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, false, offset, NULL);
     }
 
     /* If I bit is set, we have an xTR-ID and a site-ID field */
@@ -2783,8 +2783,8 @@ static void
 dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
     int       i;
-    gint      offset  = 0;
-    guint8    rec_cnt = 0;
+    int       offset  = 0;
+    uint8_t   rec_cnt = 0;
     tvbuff_t *next_tvb;
 
     /* Reserved bits (20 bits) */
@@ -2792,7 +2792,7 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
     offset += 3;
 
     /* Record count (8 bits) */
-    rec_cnt = tvb_get_guint8(tvb, offset);
+    rec_cnt = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(lisp_tree, hf_lisp_records, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
 
@@ -2802,7 +2802,7 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
 
     /* Referral records */
     for(i=0; i < rec_cnt; i++) {
-        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, TRUE, offset, NULL);
+        offset = dissect_lisp_mapping(tvb, pinfo, lisp_tree, rec_cnt, i+1, true, offset, NULL);
     }
 
     next_tvb = tvb_new_subset_remaining(tvb, offset);
@@ -2840,20 +2840,20 @@ dissect_lisp_map_referral(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tr
 static void
 dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
 {
-    gint         offset   = 0;
+    int          offset   = 0;
     tvbuff_t    *next_tvb;
-    guint8       flags;
-    gboolean     reply;
-    guint16      authlen  = 0;
-    guint8       prefix_mask;
-    guint16      prefix_afi, afi;
-    const gchar *prefix;
-    guint16      addr_len = 0;
+    uint8_t      flags;
+    bool         reply;
+    uint16_t     authlen  = 0;
+    uint8_t      prefix_mask;
+    uint16_t     prefix_afi, afi;
+    const char *prefix;
+    uint16_t     addr_len = 0;
     proto_item  *tir, *ti_prefix;
     proto_tree  *prefix_tree;
 
     /* Flags (1 bit) */
-    flags = tvb_get_guint8(tvb, offset);
+    flags = tvb_get_uint8(tvb, offset);
     reply = flags & (INFO_FLAG_R >> 16);
 
     if (reply)
@@ -2896,7 +2896,7 @@ dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree)
     prefix_tree = proto_tree_add_subtree(lisp_tree, tvb, offset, 3, ett_lisp_info_prefix, &ti_prefix, "EID Prefix: ");
 
     proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_masklen, tvb, offset, 1, ENC_BIG_ENDIAN);
-    prefix_mask = tvb_get_guint8(tvb, offset); offset += 1;
+    prefix_mask = tvb_get_uint8(tvb, offset); offset += 1;
 
     proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_afi, tvb, offset, 2, ENC_BIG_ENDIAN);
     prefix_afi = tvb_get_ntohs(tvb, offset);  offset += 2;
@@ -2966,11 +2966,11 @@ static void
 dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *lisp_tree)
 {
     tvbuff_t *next_tvb;
-    guint8    flags;
-    guint8    ip_ver;
+    uint8_t   flags;
+    uint8_t   ip_ver;
 
     /* Flags (2 bits) */
-    flags = tvb_get_guint8(tvb, 0);
+    flags = tvb_get_uint8(tvb, 0);
     ddt_originated = flags & (ECM_FLAG_D >> 24);
 
     proto_tree_add_item(lisp_tree, hf_lisp_ecm_flags_sec, tvb, 0, 4, ENC_BIG_ENDIAN);
@@ -2992,7 +2992,7 @@ dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
             call_data_dissector(next_tvb, pinfo, tree);
             break;
     }
-    encapsulated = FALSE;
+    encapsulated = false;
 }
 
 
@@ -3003,7 +3003,7 @@ dissect_lisp_ecm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree
 static int
 dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    guint8 type;
+    uint8_t type;
 
     proto_tree *lisp_tree = NULL;
 
@@ -3025,7 +3025,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 
     if (ddt_originated) {
         col_append_str(pinfo->cinfo, COL_INFO, " (DDT-originated)");
-        ddt_originated = FALSE;
+        ddt_originated = false;
     }
 
     if (tree) {
@@ -3052,7 +3052,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         dissect_lisp_map_reply(tvb, pinfo, lisp_tree);
         break;
     case LISP_MAP_REGISTER:
-        dissect_lisp_map_register(tvb, pinfo, lisp_tree, 0, NULL, TRUE);
+        dissect_lisp_map_register(tvb, pinfo, lisp_tree, 0, NULL, true);
         break;
     case LISP_MAP_NOTIFY:
         dissect_lisp_map_notify(tvb, pinfo, lisp_tree);
@@ -3064,7 +3064,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
         dissect_lisp_info(tvb, pinfo, lisp_tree);
         break;
     case LISP_ECM:
-        encapsulated = TRUE;
+        encapsulated = true;
         dissect_lisp_ecm(tvb, pinfo, tree, lisp_tree);
         break;
     default:
@@ -3707,7 +3707,7 @@ proto_register_lisp(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lisp,
         &ett_lisp_mr,
         &ett_lisp_mreq_flags,
diff --git a/epan/dissectors/packet-lisp.h b/epan/dissectors/packet-lisp.h
index 5a61c63ac8..bc20543b06 100644
--- a/epan/dissectors/packet-lisp.h
+++ b/epan/dissectors/packet-lisp.h
@@ -22,11 +22,11 @@
 
 #define LISP_CONTROL_PORT   4342
 
-const gchar * get_addr_str(tvbuff_t *tvb, packet_info *pinfo, gint offset, guint16 afi, guint16 *addr_len);
-int dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, proto_item *tip);
+const char * get_addr_str(tvbuff_t *tvb, packet_info *pinfo, int offset, uint16_t afi, uint16_t *addr_len);
+int dissect_lcaf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *tip);
 int dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        guint8 rec_cnt, int rec, gboolean referral, gint offset, proto_item *tim);
-gint dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
-        gint offset, proto_item *tim, gboolean keep_going);
+        uint8_t rec_cnt, int rec, bool referral, int offset, proto_item *tim);
+int dissect_lisp_map_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree,
+        int offset, proto_item *tim, bool keep_going);
 
 #endif /* __PACKET_LISP_H__ */
diff --git a/epan/dissectors/packet-lithionics.c b/epan/dissectors/packet-lithionics.c
index bf8b59fec0..d462091469 100644
--- a/epan/dissectors/packet-lithionics.c
+++ b/epan/dissectors/packet-lithionics.c
@@ -59,8 +59,8 @@ static int hf_lithionics_system_status_overcurrent_state;
 static int hf_lithionics_system_status_reserved;
 static int hf_lithionics_temination;
 
-static gint ett_lithionics;
-static gint ett_lithionics_system_status;
+static int ett_lithionics;
+static int ett_lithionics_system_status;
 
 static int* const system_status_flags[] = {
 	&hf_lithionics_system_status_high_voltage_state,
@@ -111,7 +111,7 @@ dissect_lithionics(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
 	int				offset = 0;
 	char*			str;
 	float			f;
-	guint32			value;
+	uint32_t			value;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Lithionics");
 	col_clear(pinfo->cinfo, COL_INFO);
@@ -120,7 +120,7 @@ dissect_lithionics(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
 	lithionics_tree = proto_item_add_subtree(ti, ett_lithionics);
 
 	//just put the whole packet string (minus newlines) in the Info column
-	col_set_str(pinfo->cinfo, COL_INFO, (const gchar*)tvb_get_string_enc(pinfo->pool, tvb, offset, tvb_reported_length_remaining(tvb, offset)-2, ENC_ASCII));
+	col_set_str(pinfo->cinfo, COL_INFO, (const char*)tvb_get_string_enc(pinfo->pool, tvb, offset, tvb_reported_length_remaining(tvb, offset)-2, ENC_ASCII));
 
 	str = (char*)tvb_get_string_enc(pinfo->pool, tvb, offset + 1, 1, ENC_ASCII);
 	if (!ws_strtou32(str, NULL, &value))
@@ -284,7 +284,7 @@ proto_register_lithionics(void)
 
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lithionics,
 		&ett_lithionics_system_status,
 	};
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 7a80b61dde..0c43aef32e 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -66,11 +66,11 @@ static int hf_llc_xid_format;
 static int hf_llc_xid_types;
 static int hf_llc_xid_wsize;
 
-static gint ett_llc;
-static gint ett_llc_dsap;
-static gint ett_llc_ssap;
-static gint ett_llc_ctrl;
-static gint ett_llc_basicxid;
+static int ett_llc;
+static int ett_llc_dsap;
+static int ett_llc_ssap;
+static int ett_llc_ctrl;
+static int ett_llc_basicxid;
 
 static dissector_table_t dsap_subdissector_table;
 static dissector_table_t xid_subdissector_table;
@@ -207,7 +207,7 @@ static wmem_map_t *oui_info_table;
  */
 
 static void
-llc_sap_value( gchar *result, guint32 sap )
+llc_sap_value( char *result, uint32_t sap )
 {
 	snprintf( result, ITEM_LABEL_LENGTH, "%s", val_to_str_const(sap<<1, sap_vals, "Unknown"));
 }
@@ -216,7 +216,7 @@ llc_sap_value( gchar *result, guint32 sap )
  * Add an entry for a new OUI.
  */
 void
-llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name,
+llc_add_oui(uint32_t oui, const char *table_name, const char *table_ui_name,
 	    hf_register_info *hf_item, const int proto)
 {
 	oui_info_t *new_info;
@@ -238,13 +238,13 @@ llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name,
 }
 
 static bool
-capture_snap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
+capture_snap(const unsigned char *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
 {
-	guint32		oui;
-	guint16		etype;
+	uint32_t		oui;
+	uint16_t		etype;
 
 	if (!BYTES_ARE_IN_FRAME(offset, len, 5))
-		return FALSE;
+		return false;
 
 	oui = pd[offset] << 16 | pd[offset+1] << 8 | pd[offset+2];
 	etype = pntoh16(&pd[offset+3]);
@@ -267,18 +267,18 @@ capture_snap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinf
 		return try_capture_dissector("ethertype", etype, pd, offset+5+5, len, cpinfo, pseudo_header);
 	}
 
-	return FALSE;
+	return false;
 }
 
 static bool
-capture_llc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
+capture_llc(const unsigned char *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
 
 	int		is_snap;
-	guint16		control;
+	uint16_t		control;
 	int		llc_header_len;
 
 	if (!BYTES_ARE_IN_FRAME(offset, len, 2))
-		return FALSE;
+		return false;
 
 	is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
 	llc_header_len = 2;	/* DSAP + SSAP */
@@ -290,12 +290,12 @@ capture_llc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo
 	 * whether it's basic or extended operation; is that the case?
 	 */
 	control = get_xdlc_control(pd, offset+2, pd[offset+1] & SSAP_CR_BIT);
-	llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
+	llc_header_len += XDLC_CONTROL_LEN(control, true);
 	if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len))
-		return FALSE;
+		return false;
 
 	if (!XDLC_IS_INFORMATION(control))
-		return FALSE;
+		return false;
 
 	if (is_snap)
 		return capture_snap(pd, offset+llc_header_len, len, cpinfo, pseudo_header);
@@ -335,12 +335,12 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
 {
 	proto_tree	*xid_tree = NULL;
 	proto_item	*ti = NULL;
-	guint8		format, types, wsize;
+	uint8_t		format, types, wsize;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	format = tvb_get_guint8(tvb, 0);
+	format = tvb_get_uint8(tvb, 0);
 
 	ti = proto_tree_add_item(tree, proto_basicxid, tvb, 0, -1, ENC_NA);
 	xid_tree = proto_item_add_subtree(ti, ett_llc_basicxid);
@@ -348,7 +348,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
 
 	col_append_str(pinfo->cinfo, COL_INFO, "Basic Format");
 
-	types = tvb_get_guint8(tvb, 1);
+	types = tvb_get_uint8(tvb, 1);
 	proto_tree_add_uint(xid_tree, hf_llc_xid_types, tvb, 1,
 			1, types & TYPES_MASK);
 
@@ -356,7 +356,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
 		    "; %s", val_to_str(types & TYPES_MASK, type_vals, "0x%02x")
 		);
 
-	wsize = tvb_get_guint8(tvb, 2);
+	wsize = tvb_get_uint8(tvb, 2);
 	proto_tree_add_uint(xid_tree, hf_llc_xid_wsize, tvb, 2,
 			1, (wsize & 0xFE) >> 1);
 
@@ -378,15 +378,15 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 	proto_tree	*field_tree;
 	proto_item	*ti, *sap_item;
 	int		is_snap;
-	guint16		control;
+	uint16_t		control;
 	int		llc_header_len;
-	guint8		dsap, ssap, format;
+	uint8_t		dsap, ssap, format;
 	tvbuff_t	*next_tvb;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	dsap = tvb_get_guint8(tvb, 0);
+	dsap = tvb_get_uint8(tvb, 0);
 
 	ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, ENC_NA);
 	llc_tree = proto_item_add_subtree(ti, ett_llc);
@@ -396,7 +396,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 	proto_tree_add_item(field_tree, hf_llc_dsap_sap, tvb, 0, 1, ENC_BIG_ENDIAN);
 	proto_tree_add_item(field_tree, hf_llc_dsap_ig, tvb, 0, 1, ENC_NA);
 
-	ssap = tvb_get_guint8(tvb, 1);
+	ssap = tvb_get_uint8(tvb, 1);
 	sap_item = proto_tree_add_item(llc_tree, hf_llc_ssap, tvb, 1, 1, ENC_BIG_ENDIAN);
 	field_tree = proto_item_add_subtree(sap_item, ett_llc_ssap);
 	proto_tree_add_item(field_tree, hf_llc_ssap_sap, tvb, 1, 1, ENC_BIG_ENDIAN);
@@ -414,8 +414,8 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 	control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
 				hf_llc_ctrl, ett_llc_ctrl,
 				&llc_cf_items, &llc_cf_items_ext,
-				NULL, NULL, ssap & SSAP_CR_BIT, TRUE, FALSE);
-	llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
+				NULL, NULL, ssap & SSAP_CR_BIT, true, false);
+	llc_header_len += XDLC_CONTROL_LEN(control, true);
 	if (is_snap)
 		llc_header_len += 5;	/* 3 bytes of OUI, 2 bytes of protocol ID */
 
@@ -423,7 +423,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 		proto_item_set_len(ti, llc_header_len);
 
 	if (is_snap) {
-		dissect_snap(tvb, 2+XDLC_CONTROL_LEN(control, TRUE), pinfo, tree, llc_tree, control,
+		dissect_snap(tvb, 2+XDLC_CONTROL_LEN(control, true), pinfo, tree, llc_tree, control,
 		    hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
 	}
 	else {
@@ -455,7 +455,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 				 * Non-SNAP XID frame.
 				 * Test for LLC basic format first
 				 */
-				format = tvb_get_guint8(next_tvb, 0);
+				format = tvb_get_uint8(next_tvb, 0);
 				if (format == 0x81) {
 					dissect_basicxid(next_tvb, pinfo, tree, data);
 				} else {
@@ -489,9 +489,9 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 	     proto_tree *snap_tree, int control, int hf_oui, int hf_type, int hf_pid,
 	     int bridge_pad)
 {
-	guint32		oui;
-	const gchar *oui_str;
-	guint16		etype;
+	uint32_t		oui;
+	const char *oui_str;
+	uint16_t		etype;
 	tvbuff_t	*next_tvb;
 	oui_info_t	*oui_info;
 	dissector_table_t subdissector_table;
@@ -693,7 +693,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
  * if there isn't one.
  */
 oui_info_t *
-get_snap_oui_info(guint32 oui)
+get_snap_oui_info(uint32_t oui)
 {
 	if (oui_info_table != NULL) {
 		return (oui_info_t *)wmem_map_lookup(oui_info_table,
@@ -711,7 +711,7 @@ dissect_epd_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 {
 	proto_tree	*llc_tree;
 	proto_item	*ti;
-	guint32		etype;
+	uint32_t		etype;
 	tvbuff_t	*next_tvb;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
@@ -823,7 +823,7 @@ proto_register_llc(void)
 		{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
 			NULL, 0x0, NULL, HFILL }}
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_llc,
 		&ett_llc_dsap,
 		&ett_llc_ssap,
@@ -866,7 +866,7 @@ proto_register_basicxid(void)
 		{ "Receive Window Size", "basicxid.llc.xid.wsize", FT_UINT8, BASE_DEC,
 			NULL, 0x0, NULL, HFILL }}
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_llc_basicxid
 	};
 
@@ -878,7 +878,7 @@ proto_register_basicxid(void)
 }
 
 static void
-register_hf(gpointer key _U_, gpointer value, gpointer user_data _U_)
+register_hf(void *key _U_, void *value, void *user_data _U_)
 {
 	oui_info_t *info = (oui_info_t *)value;
 
diff --git a/epan/dissectors/packet-llc.h b/epan/dissectors/packet-llc.h
index 98c65286fa..966c4deb4e 100644
--- a/epan/dissectors/packet-llc.h
+++ b/epan/dissectors/packet-llc.h
@@ -21,7 +21,7 @@ void dissect_snap(tvbuff_t *, int, packet_info *, proto_tree *,
  * Add an entry for a new OUI.
  */
 WS_DLL_PUBLIC
-void llc_add_oui(guint32, const char *, const char *, hf_register_info *, const int);
+void llc_add_oui(uint32_t, const char *, const char *, hf_register_info *, const int);
 
 /*
  * SNAP information about the PID for a particular OUI:
@@ -38,6 +38,6 @@ typedef struct {
  * Return the oui_info_t for the PID for a particular OUI value, or NULL
  * if there isn't one.
  */
-oui_info_t *get_snap_oui_info(guint32);
+oui_info_t *get_snap_oui_info(uint32_t);
 
 #endif
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index 07d4bb664f..4ac4443607 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -47,15 +47,15 @@
 /* Structure for general station information */
 typedef struct _profinet_lldp_column_info {
 	/* general information */
-	gchar    *chassis_id_mac;
-	gchar    *chassis_id_locally_assigned;
-	gchar    *port_id_locally_assigned;
-	gboolean is_nos_assigned;
-	gboolean is_port_id_assigned;
+	char     *chassis_id_mac;
+	char     *chassis_id_locally_assigned;
+	char     *port_id_locally_assigned;
+	bool is_nos_assigned;
+	bool is_port_id_assigned;
 }profinet_lldp_column_info;
 
-static gint column_info_selection = DEFAULT_COLUMN_INFO;
-static bool assume_unrecognized_tlv = FALSE;
+static int column_info_selection = DEFAULT_COLUMN_INFO;
+static bool assume_unrecognized_tlv = false;
 
 static dissector_handle_t lldp_handle;
 
@@ -488,88 +488,88 @@ static int hf_onos_port;
 static int hf_onos_ttl;
 
 /* Initialize the subtree pointers */
-static gint ett_lldp;
-static gint ett_chassis_id;
-static gint ett_port_id;
-static gint ett_time_to_live;
-static gint ett_end_of_lldpdu;
-static gint ett_port_description;
-static gint ett_system_name;
-static gint ett_system_desc;
-static gint ett_system_cap;
-static gint ett_system_cap_summary;
-static gint ett_system_cap_enabled;
-static gint ett_management_address;
-static gint ett_unknown_tlv;
-static gint ett_org_spc_def;
-static gint ett_org_spc_dcbx_cin;
-static gint ett_org_spc_dcbx_cee;
-static gint ett_org_spc_dcbx_cee_1;
-static gint ett_org_spc_dcbx_cee_2;
-static gint ett_org_spc_dcbx_cee_3;
-static gint ett_org_spc_dcbx_cee_4;
-static gint ett_org_spc_dcbx_cin_6;
-static gint ett_org_spc_dcbx_cee_app;
-static gint ett_org_spc_ieee_802_1_1;
-static gint ett_org_spc_ieee_802_1_2;
-static gint ett_org_spc_ieee_802_1_3;
-static gint ett_org_spc_ieee_802_1_4;
-static gint ett_org_spc_ieee_802_1_8;
-static gint ett_org_spc_ieee_802_1_9;
-static gint ett_org_spc_ieee_802_1_a;
-static gint ett_org_spc_ieee_802_1_b;
-static gint ett_org_spc_ieee_802_1_c;
-static gint ett_org_spc_ieee_dcbx_app;
-
-static gint ett_org_spc_ieee_802_3_1;
-static gint ett_org_spc_ieee_802_3_2;
-static gint ett_org_spc_ieee_802_3_3;
-static gint ett_org_spc_ieee_802_3_4;
-static gint ett_org_spc_ieee_802_3_5;
-static gint ett_org_spc_ieee_802_3_7;
-
-static gint ett_org_spc_media_1;
-static gint ett_org_spc_media_2;
-static gint ett_org_spc_media_3;
-static gint ett_org_spc_media_4;
-static gint ett_org_spc_media_5;
-static gint ett_org_spc_media_6;
-static gint ett_org_spc_media_7;
-static gint ett_org_spc_media_8;
-static gint ett_org_spc_media_9;
-static gint ett_org_spc_media_10;
-static gint ett_org_spc_media_11;
-
-static gint ett_ex_avayaSubTypes_11;
-static gint ett_ex_avayaSubTypes_12;
-static gint ett_ex_avaya2SubTypes_4;
-static gint ett_org_spc_ProfinetSubTypes_1;
-static gint ett_org_spc_ProfinetSubTypes_2;
-static gint ett_org_spc_ProfinetSubTypes_3;
-static gint ett_org_spc_ProfinetSubTypes_4;
-static gint ett_org_spc_ProfinetSubTypes_5;
-static gint ett_org_spc_ProfinetSubTypes_6;
-static gint ett_org_spc_tlv;
-static gint ett_port_vlan_flags;
-static gint ett_802_3_flags;
-static gint ett_802_3_autoneg_advertised;
-static gint ett_802_3_power;
-static gint ett_802_3_bt_power;
-static gint ett_802_3_bt_system_setup;
-static gint ett_802_3_bt_autoclass;
-static gint ett_802_3_bt_power_down;
-static gint ett_802_3_aggregation;
-static gint ett_802_1_aggregation;
-static gint ett_802_1qbg_capabilities_flags;
-static gint ett_802_3br_capabilities_flags;
-static gint ett_media_capabilities;
-static gint ett_profinet_period;
-static gint ett_cisco_upoe_tlv;
-static gint ett_avaya_ipphone_tlv;
-static gint ett_org_spc_hytec_subtype_transceiver;
-static gint ett_org_spc_hytec_subtype_trace;
-static gint ett_org_spc_hytec_trace_request;
-static gint ett_org_spc_hytec_trace_reply;
+static int ett_lldp;
+static int ett_chassis_id;
+static int ett_port_id;
+static int ett_time_to_live;
+static int ett_end_of_lldpdu;
+static int ett_port_description;
+static int ett_system_name;
+static int ett_system_desc;
+static int ett_system_cap;
+static int ett_system_cap_summary;
+static int ett_system_cap_enabled;
+static int ett_management_address;
+static int ett_unknown_tlv;
+static int ett_org_spc_def;
+static int ett_org_spc_dcbx_cin;
+static int ett_org_spc_dcbx_cee;
+static int ett_org_spc_dcbx_cee_1;
+static int ett_org_spc_dcbx_cee_2;
+static int ett_org_spc_dcbx_cee_3;
+static int ett_org_spc_dcbx_cee_4;
+static int ett_org_spc_dcbx_cin_6;
+static int ett_org_spc_dcbx_cee_app;
+static int ett_org_spc_ieee_802_1_1;
+static int ett_org_spc_ieee_802_1_2;
+static int ett_org_spc_ieee_802_1_3;
+static int ett_org_spc_ieee_802_1_4;
+static int ett_org_spc_ieee_802_1_8;
+static int ett_org_spc_ieee_802_1_9;
+static int ett_org_spc_ieee_802_1_a;
+static int ett_org_spc_ieee_802_1_b;
+static int ett_org_spc_ieee_802_1_c;
+static int ett_org_spc_ieee_dcbx_app;
+
+static int ett_org_spc_ieee_802_3_1;
+static int ett_org_spc_ieee_802_3_2;
+static int ett_org_spc_ieee_802_3_3;
+static int ett_org_spc_ieee_802_3_4;
+static int ett_org_spc_ieee_802_3_5;
+static int ett_org_spc_ieee_802_3_7;
+
+static int ett_org_spc_media_1;
+static int ett_org_spc_media_2;
+static int ett_org_spc_media_3;
+static int ett_org_spc_media_4;
+static int ett_org_spc_media_5;
+static int ett_org_spc_media_6;
+static int ett_org_spc_media_7;
+static int ett_org_spc_media_8;
+static int ett_org_spc_media_9;
+static int ett_org_spc_media_10;
+static int ett_org_spc_media_11;
+
+static int ett_ex_avayaSubTypes_11;
+static int ett_ex_avayaSubTypes_12;
+static int ett_ex_avaya2SubTypes_4;
+static int ett_org_spc_ProfinetSubTypes_1;
+static int ett_org_spc_ProfinetSubTypes_2;
+static int ett_org_spc_ProfinetSubTypes_3;
+static int ett_org_spc_ProfinetSubTypes_4;
+static int ett_org_spc_ProfinetSubTypes_5;
+static int ett_org_spc_ProfinetSubTypes_6;
+static int ett_org_spc_tlv;
+static int ett_port_vlan_flags;
+static int ett_802_3_flags;
+static int ett_802_3_autoneg_advertised;
+static int ett_802_3_power;
+static int ett_802_3_bt_power;
+static int ett_802_3_bt_system_setup;
+static int ett_802_3_bt_autoclass;
+static int ett_802_3_bt_power_down;
+static int ett_802_3_aggregation;
+static int ett_802_1_aggregation;
+static int ett_802_1qbg_capabilities_flags;
+static int ett_802_3br_capabilities_flags;
+static int ett_media_capabilities;
+static int ett_profinet_period;
+static int ett_cisco_upoe_tlv;
+static int ett_avaya_ipphone_tlv;
+static int ett_org_spc_hytec_subtype_transceiver;
+static int ett_org_spc_hytec_subtype_trace;
+static int ett_org_spc_hytec_trace_request;
+static int ett_org_spc_hytec_trace_reply;
 
 static expert_field ei_lldp_bad_length;
 static expert_field ei_lldp_bad_length_excess;
@@ -1430,12 +1430,12 @@ static const value_string ieee_802_1qbg_subtypes[] = {
 static const unit_name_string units_m = { " m", NULL };
 
 static void
-mdi_power_base(gchar *buf, guint32 value) {
+mdi_power_base(char *buf, uint32_t value) {
 	snprintf(buf, ITEM_LABEL_LENGTH, "%u.%u. Watt", value/10, value%10);
 }
 
 static void
-media_power_base(gchar *buf, guint32 value) {
+media_power_base(char *buf, uint32_t value) {
 	snprintf(buf, ITEM_LABEL_LENGTH, "%u mW", value * 100);
 }
 
@@ -1443,11 +1443,11 @@ media_power_base(gchar *buf, guint32 value) {
 // Returns true if the value is negative (so if
 // it returns false, there is no conversion).
 //  bitSize: number of bits of the variable.
-static gboolean
-get2sComplementAbsoluteValue(guint64 * value, guint bitSize){
-	const guint64 signMask = G_GINT64_CONSTANT(0x1) << (bitSize - 1);
+static bool
+get2sComplementAbsoluteValue(uint64_t * value, unsigned bitSize){
+	const uint64_t signMask = INT64_C(0x1) << (bitSize - 1);
 
-	guint64 signedMask = G_GINT64_CONSTANT(0x1) << bitSize;
+	uint64_t signedMask = INT64_C(0x1) << bitSize;
 	signedMask--;
 	signedMask = ~signedMask;
 
@@ -1457,21 +1457,21 @@ get2sComplementAbsoluteValue(guint64 * value, guint bitSize){
 		// Convert to absolute value
 		*value = ~(*value);
 		(*value)++;
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
-static guint64
-getUint64MaskedValue(guint64 value, guint bitSize){
-	guint64 mask = G_GINT64_CONSTANT(0x1) << bitSize;
+static uint64_t
+getUint64MaskedValue(uint64_t value, unsigned bitSize){
+	uint64_t mask = INT64_C(0x1) << bitSize;
 	mask--;
 	return value & mask;
 }
 
-static guint64
-pow10_uint64(gint exponent){
-	guint64 val = 1;
+static uint64_t
+pow10_uint64(int exponent){
+	uint64_t val = 1;
 
 	while(exponent > 0){
 		val *= 10;
@@ -1486,21 +1486,21 @@ pow10_uint64(gint exponent){
 }
 
 // Decode uint fractional variable
-static guint64
-convertFractionalToFixedSizeDecimal(guint64 value, guint fractionalBitSize, guint numberOfDigitToDisplay){
-	const guint64 resolution = G_GINT64_CONSTANT(0x1) << fractionalBitSize;
+static uint64_t
+convertFractionalToFixedSizeDecimal(uint64_t value, unsigned fractionalBitSize, unsigned numberOfDigitToDisplay){
+	const uint64_t resolution = INT64_C(0x1) << fractionalBitSize;
 	// => 0x02000000 for 25-bits
 	// => 0x00000100 for 8-bits
 
-	const guint64 fractionalPortionMask = resolution - 1;
+	const uint64_t fractionalPortionMask = resolution - 1;
 	value &= fractionalPortionMask;
 
 	// Maximum value for numberOfDigitToDisplay is :
-	// log10(G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF) / fractionalPortionMask);
+	// log10(INT64_C(0xFFFFFFFFFFFFFFFF) / fractionalPortionMask);
 	// => if result is stored in 32-bits, numberOfDigitToDisplay max = 9
-	const guint64 displayMultiplier = pow10_uint64(numberOfDigitToDisplay);
+	const uint64_t displayMultiplier = pow10_uint64(numberOfDigitToDisplay);
 	value *= displayMultiplier;
-	guint64 moduloValue = value % resolution;
+	uint64_t moduloValue = value % resolution;
 	value /= resolution;
     if(moduloValue >= (resolution/2)){
         value++; // rounded value
@@ -1517,7 +1517,7 @@ convertFractionalToFixedSizeDecimal(guint64 value, guint fractionalBitSize, guin
 		option = 1 -> Longitude
 */
 static void
-get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
+get_latitude_or_longitude(char *buf, int option, uint64_t unmasked_value)
 {
 	/* The latitude and longitude are 34 bit fixed point value consisting
 	   of 9 bits of integer and 25 bits of fraction.
@@ -1528,24 +1528,24 @@ get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
 	   Longitude values outside the range of -180 to 180 decimal degrees or latitude values
 	   outside the range of -90 to 90 degrees MUST be considered invalid.
 	*/
-	const guint variableBitSize = 34;
-	const guint fractionalBitSize = 25;
-	const guint64 maxlatitude = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) * G_GINT64_CONSTANT(90);   // 90 degrees
-	const guint64 maxlongitude = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) * G_GINT64_CONSTANT(180); // 180 degrees
+	const unsigned variableBitSize = 34;
+	const unsigned fractionalBitSize = 25;
+	const uint64_t maxlatitude = (INT64_C(0x1) << fractionalBitSize) * INT64_C(90);   // 90 degrees
+	const uint64_t maxlongitude = (INT64_C(0x1) << fractionalBitSize) * INT64_C(180); // 180 degrees
 
-	guint64 masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 34-bit value
+	uint64_t masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 34-bit value
 
 	// Get absolute value of a 34-bit 2's variable
 	// => value is 33-bit
-	guint64 absolute_value = masked_value;
-	gboolean isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
+	uint64_t absolute_value = masked_value;
+	bool isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
 
 	// Get unsigned integer 8-bit value
-	guint32 integerPortion = (guint32)(absolute_value >> fractionalBitSize);
+	uint32_t integerPortion = (uint32_t)(absolute_value >> fractionalBitSize);
 
 	// Get fractional 25-bit value
-	const guint numberOfDigitToDisplay = 4;
-	guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
+	const unsigned numberOfDigitToDisplay = 4;
+	uint64_t fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
 
 	const char *direction;
 	const char *err_str = "";
@@ -1571,7 +1571,7 @@ get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
 		}
 	}
 
-	const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) - 1;
+	const uint64_t fractionalMask = (INT64_C(0x1) << fractionalBitSize) - 1;
 
 	// %04 correspond to numberOfDigitToDisplay
 	snprintf(buf, ITEM_LABEL_LENGTH, "%s%u.%04" PRIu64 " degrees %s (0x%010" PRIX64 " - %u-bit integer part 0x%04" PRIX64 " / %u-bit fractional part 0x%08" PRIX64 ")",
@@ -1583,17 +1583,17 @@ get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
 }
 
 static void
-latitude_base(gchar *buf, guint64 value) {
+latitude_base(char *buf, uint64_t value) {
 	get_latitude_or_longitude(buf, 0, value);
 }
 
 static void
-longitude_base(gchar *buf, guint64 value) {
+longitude_base(char *buf, uint64_t value) {
 	get_latitude_or_longitude(buf, 1, value);
 }
 
 static void
-altitude_base(gchar *buf, guint32 unmasked_value) {
+altitude_base(char *buf, uint32_t unmasked_value) {
 	// RFC6225
 	// Altitude: A 30-bit value defined by the AType field.
 	// In some cases, the altitude of the location might not be provided.
@@ -1616,22 +1616,22 @@ altitude_base(gchar *buf, guint32 unmasked_value) {
 	// high-order altitude bits that should be considered valid.
 	// Values above 30 (decimal) are undefined and reserved.
 
-	const guint variableBitSize = 30;
-	const guint fractionalBitSize = 8;
+	const unsigned variableBitSize = 30;
+	const unsigned fractionalBitSize = 8;
 
-	guint64 masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 30-bit value
+	uint64_t masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 30-bit value
 
 	// Get absolute value of a 30-bit 2's variable
 	// => value is 29-bit
-	guint64 absolute_value = masked_value;
-	gboolean isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
+	uint64_t absolute_value = masked_value;
+	bool isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
 
 	// Get unsigned integer 8-bit value
-	guint32 integerPortion = (guint32)(absolute_value >> fractionalBitSize);
+	uint32_t integerPortion = (uint32_t)(absolute_value >> fractionalBitSize);
 
 	// Get fractional 8-bit value
-	const guint numberOfDigitToDisplay = 4;
-	guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
+	const unsigned numberOfDigitToDisplay = 4;
+	uint64_t fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
 
 	const char * sign;
 	if (isNegative){
@@ -1641,7 +1641,7 @@ altitude_base(gchar *buf, guint32 unmasked_value) {
 	}
 
 
-	const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) - 1;
+	const uint64_t fractionalMask = (INT64_C(0x1) << fractionalBitSize) - 1;
 
 	// %04 correspond to numberOfDigitToDisplay
 	snprintf(buf, ITEM_LABEL_LENGTH, "%s%u.%04" PRIu64 " (0x%08" PRIX64 " - %u-bit integer part 0x%06" PRIX64 " / %u-bit fractional part 0x%02" PRIX64 ")",
@@ -1652,13 +1652,13 @@ altitude_base(gchar *buf, guint32 unmasked_value) {
 }
 
 static void
-latitude_or_longitude_resolution(gchar *buf, guint8 value) {
+latitude_or_longitude_resolution(char *buf, uint8_t value) {
 	// formula, where x is the encoded integer value:
 	//      Uncertainty = 2 ^ ( 8 - x )
 
-	gint32 masked_value = value & 0x3F;
+	int32_t masked_value = value & 0x3F;
 	double resolution = 1.0;
-	gint32 i = 8 - masked_value;
+	int32_t i = 8 - masked_value;
 	while(i > 0){
 		resolution *= 2.0;
 		i--;
@@ -1679,7 +1679,7 @@ latitude_or_longitude_resolution(gchar *buf, guint8 value) {
 }
 
 static void
-altitude_resolution(gchar *buf, guint8 value) {
+altitude_resolution(char *buf, uint8_t value) {
 	// The encoded altitude of 000000000000000010000110110011 decodes to
 	// 33.69921875.  The encoded uncertainty of 15 gives a value of 64;
 	// therefore, the final uncertainty is 33.69921875 +/- 64 (or the range
@@ -1689,9 +1689,9 @@ altitude_resolution(gchar *buf, guint8 value) {
 	//      Uncertainty = 2 ^ ( 21 - x )
 	//                  = 2 ^ ( 21 - 15 ) = 2 ^ 6 = 64
 
-	gint32 masked_value = value & 0x3F;
+	int32_t masked_value = value & 0x3F;
 	double resolution = 1.0;
-	gint32 i = 21 - masked_value;
+	int32_t i = 21 - masked_value;
 	while(i > 0){
 		resolution *= 2.0;
 		i--;
@@ -1713,16 +1713,16 @@ altitude_resolution(gchar *buf, guint8 value) {
 
 
 /* Dissect Chassis Id TLV (Mandatory) */
-static gint32
-dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset,
+static int32_t
+dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset,
 	profinet_lldp_column_info *pn_lldp_column_info)
 {
-	guint8 tlvsubType;
-	guint16 tempShort;
-	guint32 dataLen = 0;
+	uint8_t tlvsubType;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
 	const char *strPtr=NULL;
         const char *idType=NULL;
-	guint8 addr_family = 0;
+	uint8_t addr_family = 0;
 
 	proto_tree	*chassis_tree = NULL;
 	proto_item	*tf = NULL, *lf = NULL;
@@ -1741,7 +1741,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
 	/* Get tlv length */
 	dataLen = TLV_INFO_LEN(tempShort);
 	/* Get tlv subtype */
-	tlvsubType = tvb_get_guint8(tvb, (offset+2));
+	tlvsubType = tvb_get_uint8(tvb, (offset+2));
 
 	/* Set chassis tree */
 	chassis_tree = proto_tree_add_subtree_format(tree, tvb, offset, (dataLen + 2), ett_chassis_id, &tf, "Chassis Subtype = %s",
@@ -1787,7 +1787,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
 	{
 		/* Get network address family */
 		proto_tree_add_item(chassis_tree, hf_lldp_network_address_family, tvb, offset, 1, ENC_BIG_ENDIAN);
-		addr_family = tvb_get_guint8(tvb,offset);
+		addr_family = tvb_get_uint8(tvb,offset);
 
 		offset++;
 
@@ -1891,16 +1891,16 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
 }
 
 /* Dissect Port Id TLV (Mandatory) */
-static gint32
-dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset,
+static int32_t
+dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset,
 	profinet_lldp_column_info *pn_lldp_column_info)
 {
-	guint8 tlvsubType;
-	guint16 tempShort;
-	guint32 dataLen = 0;
+	uint8_t tlvsubType;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
 	const char *strPtr=NULL;
 	const char *idType=NULL;
-	guint8 addr_family = 0;
+	uint8_t addr_family = 0;
 
 	proto_tree	*port_tree = NULL;
 	proto_item	*tf = NULL, *lf = NULL;
@@ -1918,7 +1918,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3
 
 	/* Get tlv length and subtype */
 	dataLen = TLV_INFO_LEN(tempShort);
-	tlvsubType = tvb_get_guint8(tvb, (offset+2));
+	tlvsubType = tvb_get_uint8(tvb, (offset+2));
 
 	/* Set port tree */
 	port_tree = proto_tree_add_subtree_format(tree, tvb, offset, (dataLen + 2), ett_port_id, &tf, "Port Subtype = %s",
@@ -1959,7 +1959,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3
 		break;
 	case 4: /* Network address */
 		/* Get network address family */
-		addr_family = tvb_get_guint8(tvb,offset);
+		addr_family = tvb_get_uint8(tvb,offset);
 		proto_tree_add_item(port_tree, hf_lldp_network_address_family, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 		offset++;
@@ -2058,12 +2058,12 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3
 }
 
 /* Dissect Time To Live TLV (Mandatory) */
-static gint32
-dissect_lldp_time_to_live(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset, guint16 *isShutdown)
+static int32_t
+dissect_lldp_time_to_live(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset, uint16_t *isShutdown)
 {
-	guint8 tlvsubType;
-	guint16 tempShort;
-	guint32 dataLen = 0;
+	uint8_t tlvsubType;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
 
 	proto_tree	*time_to_live_tree;
 	proto_item	*ti;
@@ -2118,12 +2118,12 @@ dissect_lldp_time_to_live(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
  * affirmatively determine that an LLDPDU has ended.  Depending on where a capture is collected,
  * additional data may follow the LLDPDU (FCS, diagnostic trailers, non-zero padding, etc...)
  */
-static gint32
-dissect_lldp_end_of_lldpdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_end_of_lldpdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint8 tlvType;
-	guint16 dataLen;
-	guint16 tempShort;
+	uint8_t tlvType;
+	uint16_t dataLen;
+	uint16_t tempShort;
 
 	proto_tree	*end_of_lldpdu_tree, *lf;
 
@@ -2161,11 +2161,11 @@ dissect_lldp_end_of_lldpdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 }
 
 /* Dissect Port Description TLV */
-static gint32
-dissect_lldp_port_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_port_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint16 tempShort;
-	guint32 dataLen = 0;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
 	const char *strPtr;
 
 	proto_tree	*port_desc_tree;
@@ -2195,12 +2195,12 @@ dissect_lldp_port_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 }
 
 /* Dissect System Name and description TLV */
-static gint32
-dissect_lldp_system_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_system_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint16 tempShort;
-	guint32 dataLen = 0;
-	guint8 tlvsubType;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
+	uint8_t tlvsubType;
 	const char *strPtr;
 
 	proto_tree	*system_subtree;
@@ -2248,11 +2248,11 @@ dissect_lldp_system_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 }
 
 /* Dissect System Capabilities TLV */
-static gint32
-dissect_lldp_system_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_system_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint16 tempShort;
-	guint32 dataLen = 0;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
 
 	proto_tree	*system_capabilities_tree;
 	proto_tree	*capabilities_summary_tree;
@@ -2313,13 +2313,13 @@ dissect_lldp_system_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 }
 
 /* Dissect Management Address TLV */
-static gint32
-dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint16 tempShort;
-	guint32 dataLen = 0;
-	guint8  subtypeByte;
-	guint8  stringLen = 0;
+	uint16_t tempShort;
+	uint32_t dataLen = 0;
+	uint8_t subtypeByte;
+	uint8_t stringLen = 0;
 
 	proto_tree	*system_mgm_addr;
 
@@ -2338,13 +2338,13 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 	offset += 2;
 
 	/* Get management address string length */
-	stringLen = tvb_get_guint8(tvb, offset);
+	stringLen = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(system_mgm_addr, hf_mgn_address_len, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	offset++;
 
 	/* Get management address subtype */
-	subtypeByte = tvb_get_guint8(tvb, offset);
+	subtypeByte = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(system_mgm_addr, hf_mgn_address_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	offset++;
@@ -2377,7 +2377,7 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 	offset += 4;
 
 	/* Get OID string length */
-	stringLen = tvb_get_guint8(tvb, offset);
+	stringLen = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(system_mgm_addr, hf_mgn_oid_len, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 	offset++;
@@ -2397,11 +2397,11 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 static void
 dissect_dcbx_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 offset = 0;
-	guint8 priomaskByte, prioCounter, appCount = 0;
-	guint16 dataLen;
-	guint16 tempShort;
+	uint8_t subType;
+	uint32_t offset = 0;
+	uint8_t priomaskByte, prioCounter, appCount = 0;
+	uint16_t dataLen;
+	uint16_t tempShort;
 
 	proto_tree	*subtlv_tree = NULL;
 	proto_tree	*apptlv_tree = NULL;
@@ -2574,7 +2574,7 @@ dissect_dcbx_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 
 					offset += 3;
 
-					priomaskByte = tvb_get_guint8(tvb, offset);
+					priomaskByte = tvb_get_uint8(tvb, offset);
 
 					for (prioCounter = 0; prioCounter < 8; prioCounter++)
 						if(priomaskByte & (0x1 << prioCounter)) {
@@ -2606,10 +2606,10 @@ dissect_dcbx_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static int
 dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 offset = 0;
-	guint8 tempByte;
-	guint16 dcbApp, appCount;
+	uint8_t subType;
+	uint32_t offset = 0;
+	uint8_t tempByte;
+	uint16_t dcbApp, appCount;
 
 	proto_tree	*vlan_flags_tree = NULL;
 	proto_tree	*mac_phy_flags = NULL;
@@ -2617,7 +2617,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	proto_item	*tf = NULL;
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	proto_tree_add_item(tree, hf_ieee_802_1_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 
@@ -2657,7 +2657,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		offset += 2;
 
 		/* Get vlan name length */
-		tempByte = tvb_get_guint8(tvb, offset);
+		tempByte = tvb_get_uint8(tvb, offset);
 		proto_tree_add_item(tree, hf_ieee_802_1_vlan_name_length, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 		offset++;
@@ -2674,7 +2674,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	case 0x04:	/* Protocol ID */
 	{
 		/* Get protocol id length */
-		tempByte = tvb_get_guint8(tvb, offset);
+		tempByte = tvb_get_uint8(tvb, offset);
 		proto_tree_add_item(tree, hf_ieee_802_1_proto_id_length, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 		offset++;
@@ -2762,7 +2762,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 		proto_tree_add_item(tree, hf_ieee_8021az_feature_flag_willing, tvb, offset, 1, ENC_BIG_ENDIAN);
 		proto_tree_add_item(tree, hf_ieee_8021az_feature_flag_cbs, tvb, offset, 1, ENC_BIG_ENDIAN);
 
-		tempByte = (tvb_get_guint8(tvb, offset) & 0x7);
+		tempByte = (tvb_get_uint8(tvb, offset) & 0x7);
 		/* 0 implies 8 traffic classes supported */
 		proto_tree_add_uint_format_value(tree, hf_ieee_8021az_maxtcs, tvb, offset, 1, tempByte, "%u (0x%X)", tempByte ? tempByte : 8, tempByte);
 
@@ -3005,13 +3005,13 @@ dissect_oui_default_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_ieee_802_1qbg_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 offset = 0;
+	uint8_t subType;
+	uint32_t offset = 0;
 
 	proto_tree *evb_capabilities_subtree = NULL;
 
 	proto_item *tf = NULL;
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	proto_tree_add_item(tree, hf_ieee_802_1qbg_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 
@@ -3061,11 +3061,11 @@ dissect_ieee_802_1qbg_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 
 /* Dissect extreme avaya ap tlv*/
 static int
-dissect_extreme_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint16 dataLen)
+dissect_extreme_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint16_t dataLen)
 {
-	guint8 subType;
-	guint32 i, loopCount;
-	guint32 offset = 0;
+	uint8_t subType;
+	uint32_t i, loopCount;
+	uint32_t offset = 0;
 
 	/*
 	Element TLV:
@@ -3084,7 +3084,7 @@ dissect_extreme_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 	*/
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(tree, hf_ex_avaya_tlv_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 	switch (subType)
@@ -3126,9 +3126,9 @@ dissect_extreme_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
 static int
 dissect_extreme_avaya2_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 numbvlans, sysidlength;
-	guint32 offset = 0;
+	uint8_t subType;
+	uint32_t numbvlans, sysidlength;
+	uint32_t offset = 0;
 
 	/*
 	Fabric TLV:
@@ -3140,7 +3140,7 @@ dissect_extreme_avaya2_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
         */
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(tree, hf_ex_avaya2_tlv_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 	switch (subType) {
@@ -3166,10 +3166,10 @@ dissect_extreme_avaya2_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 static int
 dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 offset = 0;
-	guint8 tempByte;
-	guint16 tlvLen = tvb_reported_length(tvb)-offset;
+	uint8_t subType;
+	uint32_t offset = 0;
+	uint8_t tempByte;
+	uint16_t tlvLen = tvb_reported_length(tvb)-offset;
 
 	proto_tree	*mac_phy_flags = NULL;
 	proto_tree	*autoneg_advertised_subtree = NULL;
@@ -3177,7 +3177,7 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	proto_item	*tf = NULL, *subitem;
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	subitem = proto_tree_add_item(tree, hf_ieee_802_3_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 
@@ -3272,7 +3272,7 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 			break;
 
 		/* Get first byte */
-		tempByte = tvb_get_guint8(tvb, offset);
+		tempByte = tvb_get_uint8(tvb, offset);
 
 		/* Determine power type */
 		subType = ((tempByte & 0xC0) >> 6);
@@ -3449,16 +3449,16 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	guint16 tlvLen = tvb_reported_length(tvb);
-	guint8 subType;
-	guint32 offset = 0;
-	guint8 tempByte;
-	guint32 LCI_Length;
+	uint16_t tlvLen = tvb_reported_length(tvb);
+	uint8_t subType;
+	uint32_t offset = 0;
+	uint8_t tempByte;
+	uint32_t LCI_Length;
 
 	proto_tree	*media_flags = NULL;
 	proto_item	*tf = NULL;
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 	proto_tree_add_item(tree, hf_media_tlv_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
 	tlvLen--;
@@ -3546,7 +3546,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			return;
 		}
 
-		tempByte = tvb_get_guint8(tvb, offset);
+		tempByte = tvb_get_uint8(tvb, offset);
 		proto_tree_add_item(tree, hf_media_loc_data_format, tvb, offset, 1, ENC_BIG_ENDIAN);
 
 		offset++;
@@ -3623,7 +3623,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			}
 
 			/* Get LCI length */
-			tempByte = tvb_get_guint8(tvb, offset);
+			tempByte = tvb_get_uint8(tvb, offset);
 			tlvLen--;
 			if (tempByte > tlvLen)
 			{
@@ -3634,7 +3634,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 			proto_tree_add_item(tree, hf_media_civic_lci_length, tvb, offset, 1 , ENC_BIG_ENDIAN);
 
-			LCI_Length = (guint32)tempByte;
+			LCI_Length = (uint32_t)tempByte;
 
 			offset++;
 
@@ -3676,7 +3676,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					proto_tree_add_expert(tree, pinfo, &ei_lldp_bad_length, tvb, offset, tlvLen);
 					return;
 				}
-				tempByte = tvb_get_guint8(tvb, offset);
+				tempByte = tvb_get_uint8(tvb, offset);
 
 				proto_tree_add_item(tree, hf_media_civic_addr_len, tvb, offset, 1, ENC_BIG_ENDIAN);
 
@@ -3715,7 +3715,7 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	case 4: /* Extended Power-via-MDI */
 	{
 		/* Get first byte */
-		tempByte = tvb_get_guint8(tvb, offset);
+		tempByte = tvb_get_uint8(tvb, offset);
 
 		/* Determine power type */
 		subType = ((tempByte & 0xC0) >> 6);
@@ -3833,10 +3833,10 @@ dissect_media_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 
-static guint32
-dissect_profinet_period(tvbuff_t *tvb, proto_tree *tree, guint32 offset, const gchar *name, int hf_valid, int hf_value)
+static uint32_t
+dissect_profinet_period(tvbuff_t *tvb, proto_tree *tree, uint32_t offset, const char *name, int hf_valid, int hf_value)
 {
-	guint32 period;
+	uint32_t period;
 	proto_tree	*period_tree;
 
 	period = tvb_get_ntohl(tvb, offset);
@@ -3857,14 +3857,14 @@ select_source_of_name_of_station
 {
 	if (pn_lldp_column_info->chassis_id_locally_assigned != NULL)
 	{
-		pn_lldp_column_info->is_nos_assigned = TRUE;
+		pn_lldp_column_info->is_nos_assigned = true;
 		col_append_fstr(pinfo->cinfo, COL_INFO, "NoS = %s ", pn_lldp_column_info->chassis_id_locally_assigned);
 	}
 	else
 	{
 		if (pn_lldp_column_info->chassis_id_mac != NULL)
 		{
-			pn_lldp_column_info->is_nos_assigned = TRUE;
+			pn_lldp_column_info->is_nos_assigned = true;
 			col_append_fstr(pinfo->cinfo, COL_INFO, "NoS = %s ", pn_lldp_column_info->chassis_id_mac);
 		}
 	}
@@ -3876,19 +3876,19 @@ set_name_of_station_for_profinet_specialized_column_info
 {
 	const char *delimForProfinetv23 = ".";
 	char* foundDot = NULL;
-	gchar* tokenPortId = NULL;
-	gchar* tokenNameOfStation = NULL;
-	gchar* lldpPortIdCombinedWithNameOfStation = NULL;
+	char* tokenPortId = NULL;
+	char* tokenNameOfStation = NULL;
+	char* lldpPortIdCombinedWithNameOfStation = NULL;
 
-	if (pn_lldp_column_info->is_nos_assigned != TRUE)
+	if (pn_lldp_column_info->is_nos_assigned != true)
 	{
 		if (pn_lldp_column_info->port_id_locally_assigned != NULL)
 		{
 			foundDot = strstr(pn_lldp_column_info->port_id_locally_assigned, delimForProfinetv23);
 			if (foundDot != NULL)
 			{
-				pn_lldp_column_info->is_nos_assigned = TRUE;
-				pn_lldp_column_info->is_port_id_assigned = TRUE;
+				pn_lldp_column_info->is_nos_assigned = true;
+				pn_lldp_column_info->is_port_id_assigned = true;
 				lldpPortIdCombinedWithNameOfStation = wmem_strdup(pinfo->pool, pn_lldp_column_info->port_id_locally_assigned);
 				tokenPortId = strtok(lldpPortIdCombinedWithNameOfStation, delimForProfinetv23);
 				tokenNameOfStation = strtok(NULL, delimForProfinetv23);
@@ -3911,11 +3911,11 @@ static void
 set_port_id_for_profinet_specialized_column_info
 (packet_info *pinfo _U_, profinet_lldp_column_info *pn_lldp_column_info)
 {
-	if (pn_lldp_column_info->is_port_id_assigned != TRUE)
+	if (pn_lldp_column_info->is_port_id_assigned != true)
 	{
 	if (pn_lldp_column_info->port_id_locally_assigned != NULL)
 		{
-			pn_lldp_column_info->is_port_id_assigned = TRUE;
+			pn_lldp_column_info->is_port_id_assigned = true;
 			col_append_fstr(pinfo->cinfo, COL_INFO, "Port Id = %s ", pn_lldp_column_info->port_id_locally_assigned);
 		}
 	}
@@ -3925,19 +3925,19 @@ set_port_id_for_profinet_specialized_column_info
 static void
 dissect_profinet_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, profinet_lldp_column_info *pn_lldp_column_info)
 {
-	guint8 subType;
-	guint32 offset = 0;
+	uint8_t subType;
+	uint32_t offset = 0;
 	proto_item	*tf = NULL;
-	guint32 class3_PortStatus;
-	guint32 port_rx_delay_local;
-	guint32 port_rx_delay_remote;
-	guint32 port_tx_delay_local;
-	guint32 port_tx_delay_remote;
-	guint32 cable_delay_local;
+	uint32_t class3_PortStatus;
+	uint32_t port_rx_delay_local;
+	uint32_t port_rx_delay_remote;
+	uint32_t port_tx_delay_local;
+	uint32_t port_tx_delay_remote;
+	uint32_t cable_delay_local;
 
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint(tree, hf_profinet_tlv_subtype, tvb, offset, 1, subType);
 	offset++;
 
@@ -4058,8 +4058,8 @@ dissect_profinet_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr
 	}
 	case 10:	/* LLDP_PNIO_TSNNMEManagementAddr */
 	{
-		guint8 management_string_length = 0;
-		management_string_length = tvb_get_guint8(tvb, offset);
+		uint8_t management_string_length = 0;
+		management_string_length = tvb_get_uint8(tvb, offset);
 
 		/* Management Address String Length */
 		proto_tree_add_item(tree, hf_profinet_tsn_nme_management_addr_str_length, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -4113,9 +4113,9 @@ dissect_profinet_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr
 static void
 dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subType;
-	guint32 offset = 0;
-	guint length = tvb_reported_length(tvb);
+	uint8_t subType;
+	uint32_t offset = 0;
+	unsigned length = tvb_reported_length(tvb);
 
 	proto_tree *upoe_data = NULL;
 	proto_item *tf = NULL;
@@ -4124,7 +4124,7 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 	if (tree == NULL) return;
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	proto_tree_add_item(tree, hf_cisco_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
@@ -4282,20 +4282,20 @@ dissect_cisco_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8 subtype, group, identifier;
-	gint32 bit_offset, msg_len, expected_data_length, maximum_data_length, temp_gint32;
+	uint8_t subtype, group, identifier;
+	int32_t bit_offset, msg_len, expected_data_length, maximum_data_length, temp_gint32;
 	proto_tree *hytec_data = NULL;
 	proto_item *tf = NULL;
 	proto_item *group_proto_item, *identifier_proto_item;
 	float float_value = 0.0f;
-	guint32 offset = 0;
+	uint32_t offset = 0;
 
-	subtype = tvb_get_guint8(tvb, offset);
+	subtype = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint(tree, hf_hytec_tlv_subtype, tvb, offset, 1, subtype);
 	offset++;
 
 	/* get the group and identifier of the chosen subtype */
-	bit_offset = (gint32)(offset *8);
+	bit_offset = (int32_t)(offset *8);
 	group = tvb_get_bits8(tvb, bit_offset + HYTEC_GROUP_MASK_OFFSET, HYTEC_GROUP_MASK_SIZE);
 	identifier = tvb_get_bits8(tvb, bit_offset + HYTEC_IDENTIFIER_MASK_OFFSET, HYTEC_IDENTIFIER_MASK_SIZE);
 
@@ -4579,14 +4579,14 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint8  subType;
-	guint32 offset = 0;
+	uint8_t subType;
+	uint32_t offset = 0;
 
 	proto_tree *avaya_data = NULL;
 	proto_item *tf = NULL;
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	proto_tree_add_item(tree, hf_avaya_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 
@@ -4638,12 +4638,12 @@ dissect_avaya_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_iana_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint16 msg_len;
-	guint8  subType;
-	guint32 offset = 0;
+	uint16_t msg_len;
+	uint8_t subType;
+	uint32_t offset = 0;
 
 	/* Get subtype */
-	subType = tvb_get_guint8(tvb, offset);
+	subType = tvb_get_uint8(tvb, offset);
 
 	proto_tree_add_item(tree, hf_iana_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
 	offset++;
@@ -4665,9 +4665,9 @@ dissect_iana_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 static void
 dissect_onos_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint16 msg_len;
-	guint32  subType;
-	guint32 offset = 0;
+	uint16_t msg_len;
+	uint32_t subType;
+	uint32_t offset = 0;
 
 	proto_tree_add_item_ret_uint(tree, hf_onos_subtype, tvb, offset, 1, ENC_BIG_ENDIAN, &subType);
 	offset++;
@@ -4692,14 +4692,14 @@ dissect_onos_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 
 
 /* Dissect Organizational Specific TLV */
-static gint32
-dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset, profinet_lldp_column_info *pn_lldp_column_info)
+static int32_t
+dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset, profinet_lldp_column_info *pn_lldp_column_info)
 {
-	guint16 dataLen;
-	guint16 tempShort;
-	gint    tempTree;
-	guint32 oui, tLength = tvb_reported_length(tvb);
-	guint8 subType;
+	uint16_t dataLen;
+	uint16_t tempShort;
+	int     tempTree;
+	uint32_t oui, tLength = tvb_reported_length(tvb);
+	uint8_t subType;
 	tvbuff_t *vendor_tvb;
 	const char *ouiStr;
 	const char *subTypeStr;
@@ -4713,7 +4713,7 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 	dataLen = TLV_INFO_LEN(tempShort);
 	/* Get OUI value */
 	oui = tvb_get_ntoh24(tvb, (offset+2));
-	subType = tvb_get_guint8(tvb, (offset+5));
+	subType = tvb_get_uint8(tvb, (offset+5));
 
 	/* check for registered dissectors for the OUI  If none found continue, else call dissector */
 	if( dissector_try_uint(oui_unique_code_table, oui, tvb, pinfo, tree) ) {
@@ -4945,11 +4945,11 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 }
 
 /* Dissect Unknown TLV */
-static gint32
-dissect_lldp_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
+static int32_t
+dissect_lldp_unknown_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, uint32_t offset)
 {
-	guint16 dataLen;
-	guint16 tempShort;
+	uint16_t dataLen;
+	uint16_t tempShort;
 
 	proto_tree	*unknown_tlv_tree;
 
@@ -4979,12 +4979,12 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 	proto_item *ti;
 	proto_tree *lldp_tree = NULL;
 	tvbuff_t *new_tvb = NULL;
-	guint32 offset = 0;
-	guint16 isShutdown;
-	gint32 rtnValue = 0;
-	guint16 tempShort;
-	guint8 tlvType;
-	guint32 tvbLen;
+	uint32_t offset = 0;
+	uint16_t isShutdown;
+	int32_t rtnValue = 0;
+	uint16_t tempShort;
+	uint8_t tlvType;
+	uint32_t tvbLen;
 	profinet_lldp_column_info *pn_lldp_column_info = NULL;
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP");
 
@@ -6817,7 +6817,7 @@ proto_register_lldp(void)
 	};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lldp,
 		&ett_chassis_id,
 		&ett_port_id,
@@ -6926,7 +6926,7 @@ proto_register_lldp(void)
 		"Which Information will be showed at Column Information is decided by the selection",
 		&column_info_selection,
 		column_info_options,
-		FALSE);
+		false);
 
 	prefs_register_bool_preference(lldp_module,
 		"assume_unrecognized_tlv",
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c
index 17ec2ea4ff..3a9ac8e048 100644
--- a/epan/dissectors/packet-llrp.c
+++ b/epan/dissectors/packet-llrp.c
@@ -292,8 +292,8 @@ static int hf_llrp_impinj_hub_fault_type;
 static int hf_llrp_impinj_hub_connected_type;
 
 /* Initialize the subtree pointers */
-static gint ett_llrp;
-static gint ett_llrp_param;
+static int ett_llrp;
+static int ett_llrp_param;
 
 static expert_field ei_llrp_req_conf;
 static expert_field ei_llrp_invalid_length;
@@ -1445,14 +1445,14 @@ static const value_string unique_all_gpo_ports[] = {
 };
 
 
-static guint
+static unsigned
 dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        guint offset, const guint end, const guint depth);
+        unsigned offset, const unsigned end, const unsigned depth);
 
-static guint dissect_llrp_utf8_parameter(tvbuff_t * const tvb, packet_info *pinfo,
-        proto_tree * const tree, const guint hfindex, const guint offset)
+static unsigned dissect_llrp_utf8_parameter(tvbuff_t * const tvb, packet_info *pinfo,
+        proto_tree * const tree, const unsigned hfindex, const unsigned offset)
 {
-    gint len;
+    int len;
 
     len = tvb_get_ntohs(tvb, offset);
     if(tvb_reported_length_remaining(tvb, offset) < len) {
@@ -1467,10 +1467,10 @@ static guint dissect_llrp_utf8_parameter(tvbuff_t * const tvb, packet_info *pinf
     return offset + len + 2;
 }
 
-static guint dissect_llrp_bit_field(tvbuff_t * const tvb,
-        proto_tree * const tree, const guint hfindex, const guint offset)
+static unsigned dissect_llrp_bit_field(tvbuff_t * const tvb,
+        proto_tree * const tree, const unsigned hfindex, const unsigned offset)
 {
-    guint len;
+    unsigned len;
 
     len = tvb_get_ntohs(tvb, offset);
     len = (len + 7) / 8;
@@ -1481,10 +1481,10 @@ static guint dissect_llrp_bit_field(tvbuff_t * const tvb,
     return offset + len + 2;
 }
 
-static guint dissect_llrp_word_array(tvbuff_t * const tvb,
-        proto_tree * const tree, const guint hfindex, const guint offset)
+static unsigned dissect_llrp_word_array(tvbuff_t * const tvb,
+        proto_tree * const tree, const unsigned hfindex, const unsigned offset)
 {
-    guint len;
+    unsigned len;
 
     len = tvb_get_ntohs(tvb, offset);
     len *= 2;
@@ -1495,17 +1495,17 @@ static guint dissect_llrp_word_array(tvbuff_t * const tvb,
     return offset + len + 2;
 }
 
-static guint dissect_llrp_item_array(tvbuff_t * const tvb, packet_info *pinfo,
-        proto_tree * const tree, const guint hfindex_number,
-        const guint hfindex_item, const guint item_size, guint offset)
+static unsigned dissect_llrp_item_array(tvbuff_t * const tvb, packet_info *pinfo,
+        proto_tree * const tree, const unsigned hfindex_number,
+        const unsigned hfindex_item, const unsigned item_size, unsigned offset)
 {
-    guint num;
+    unsigned num;
 
     num = tvb_get_ntohs(tvb, offset);
     proto_tree_add_item(tree, hfindex_number, tvb,
             offset, 2, ENC_BIG_ENDIAN);
     offset += 2;
-    if(tvb_reported_length_remaining(tvb, offset) < ((gint)(num*item_size))) {
+    if(tvb_reported_length_remaining(tvb, offset) < ((int)(num*item_size))) {
         expert_add_info_format(pinfo, tree, &ei_llrp_invalid_length,
                 "Array longer than message");
         return offset + tvb_reported_length_remaining(tvb, offset);
@@ -1518,12 +1518,12 @@ static guint dissect_llrp_item_array(tvbuff_t * const tvb, packet_info *pinfo,
     return offset;
 }
 
-static guint
+static unsigned
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *param_tree,
-        guint suboffset, const guint param_end)
+        unsigned suboffset, const unsigned param_end)
 {
-    guint32 subtype;
+    uint32_t subtype;
 
     subtype = tvb_get_ntohl(tvb, suboffset);
     proto_item_append_text(param_tree, " (Impinj - %s)",
@@ -1806,22 +1806,22 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par
     return dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, 0);
 }
 
-static guint
+static unsigned
 // NOLINTNEXTLINE(misc-no-recursion)
 dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        guint offset, const guint end, const guint depth)
+        unsigned offset, const unsigned end, const unsigned depth)
 {
-    guint8      has_length;
-    guint16     len, type;
-    guint       real_len, param_end;
-    guint       suboffset;
-    guint       num;
+    uint8_t     has_length;
+    uint16_t    len, type;
+    unsigned    real_len, param_end;
+    unsigned    suboffset;
+    unsigned    num;
     proto_item *ti;
     proto_tree *param_tree;
 
-    while (((gint)(end - offset)) > 0)
+    while (((int)(end - offset)) > 0)
     {
-        has_length = !(tvb_get_guint8(tvb, offset) & 0x80);
+        has_length = !(tvb_get_uint8(tvb, offset) & 0x80);
 
         if (has_length)
         {
@@ -2520,7 +2520,7 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         }
         else
         {
-            type = tvb_get_guint8(tvb, offset) & 0x7F;
+            type = tvb_get_uint8(tvb, offset) & 0x7F;
 
             switch (type)
             {
@@ -2648,12 +2648,12 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     return offset;
 }
 
-static guint
-dissect_llrp_impinj_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset)
+static unsigned
+dissect_llrp_impinj_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned offset)
 {
-    guint8 subtype;
+    uint8_t subtype;
 
-    subtype = tvb_get_guint8(tvb, offset);
+    subtype = tvb_get_uint8(tvb, offset);
 
     col_append_fstr(pinfo->cinfo, COL_INFO, " (Impinj - %s)",
             val_to_str_ext(subtype, &impinj_msg_subtype_ext, "Unknown Type: %d"));
@@ -2682,16 +2682,16 @@ dissect_llrp_impinj_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 static void
 dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-        guint16 type, guint offset)
+        uint16_t type, unsigned offset)
 {
-    gboolean    ends_with_parameters;
-    guint8      requested_data;
-    guint32     vendor;
+    bool        ends_with_parameters;
+    uint8_t     requested_data;
+    uint32_t    vendor;
     proto_item *request_item, *antenna_item, *gpi_item, *gpo_item;
-    guint (*dissect_custom_message)(tvbuff_t *tvb,
-            packet_info *pinfo, proto_tree *tree, guint offset) = NULL;
+    unsigned (*dissect_custom_message)(tvbuff_t *tvb,
+            packet_info *pinfo, proto_tree *tree, unsigned offset) = NULL;
 
-    ends_with_parameters = FALSE;
+    ends_with_parameters = false;
     switch (type)
     {
         /* Simple cases just have normal TLV or TV parameters */
@@ -2722,7 +2722,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         case LLRP_TYPE_GET_ACCESSSPECS_RESPONSE:
         case LLRP_TYPE_GET_REPORT:
         case LLRP_TYPE_ENABLE_EVENTS_AND_REPORTS:
-            ends_with_parameters = TRUE;
+            ends_with_parameters = true;
             break;
         /* Some just have an ROSpec ID */
         case LLRP_TYPE_START_ROSPEC:
@@ -2743,14 +2743,14 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         case LLRP_TYPE_GET_READER_CAPABILITIES:
             proto_tree_add_item(tree, hf_llrp_req_cap, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset++;
-            ends_with_parameters = TRUE;
+            ends_with_parameters = true;
             break;
         /* GET_READER_CONFIG is more complicated */
         case LLRP_TYPE_GET_READER_CONFIG:
             antenna_item = proto_tree_add_item(tree, hf_llrp_antenna_id, tvb, offset, 2, ENC_BIG_ENDIAN);
             offset += 2;
 
-            requested_data = tvb_get_guint8(tvb, offset);
+            requested_data = tvb_get_uint8(tvb, offset);
             request_item = proto_tree_add_item(tree, hf_llrp_req_conf, tvb,
                     offset, 1, ENC_BIG_ENDIAN);
             offset++;
@@ -2808,14 +2808,14 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                     proto_item_append_text(gpo_item, " (Ignored)");
                     break;
             };
-            ends_with_parameters = TRUE;
+            ends_with_parameters = true;
             break;
         /* END GET_READER_CONFIG */
         /* Misc */
         case LLRP_TYPE_SET_READER_CONFIG:
             proto_tree_add_item(tree, hf_llrp_rest_fact, tvb, offset, 1, ENC_NA);
             offset++;
-            ends_with_parameters = TRUE;
+            ends_with_parameters = true;
             break;
         case LLRP_TYPE_SET_PROTOCOL_VERSION:
             proto_tree_add_item(tree, hf_llrp_version, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -2825,7 +2825,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             offset++;
             proto_tree_add_item(tree, hf_llrp_sup_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
             offset++;
-            ends_with_parameters = TRUE;
+            ends_with_parameters = true;
             break;
         case LLRP_TYPE_CUSTOM_MESSAGE:
             vendor = tvb_get_ntohl(tvb, offset);
@@ -2835,7 +2835,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             switch(vendor) {
             case LLRP_VENDOR_IMPINJ:
                 dissect_custom_message = dissect_llrp_impinj_message;
-                ends_with_parameters = TRUE;
+                ends_with_parameters = true;
                 break;
             }
             if (dissect_custom_message)
@@ -2869,9 +2869,9 @@ dissect_llrp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
 {
     proto_item *ti;
     proto_tree *llrp_tree;
-    guint16     type;
-    guint32     len;
-    guint       offset = 0;
+    uint16_t    type;
+    uint32_t    len;
+    unsigned    offset = 0;
 
     /* Check that there's enough data */
     if (tvb_reported_length(tvb) < LLRP_HEADER_LENGTH) {
@@ -2915,18 +2915,18 @@ dissect_llrp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
 }
 
 /* Determine length of LLRP message */
-static guint
+static unsigned
 get_llrp_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
     /* Peek into the header to determine the total message length */
-    return (guint)tvb_get_ntohl(tvb, offset+2);
+    return (unsigned)tvb_get_ntohl(tvb, offset+2);
 }
 
 /* The main dissecting routine */
 static int
 dissect_llrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, LLRP_HEADER_LENGTH,
+    tcp_dissect_pdus(tvb, pinfo, tree, true, LLRP_HEADER_LENGTH,
         get_llrp_message_len, dissect_llrp_packet, data);
     return tvb_captured_length(tvb);
 }
@@ -3987,7 +3987,7 @@ proto_register_llrp(void)
     };
 
     /* Setup protocol subtree array */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_llrp,
         &ett_llrp_param
     };
diff --git a/epan/dissectors/packet-lls-slt.c b/epan/dissectors/packet-lls-slt.c
index 8c43e86e66..38ae297c68 100644
--- a/epan/dissectors/packet-lls-slt.c
+++ b/epan/dissectors/packet-lls-slt.c
@@ -28,23 +28,23 @@
 wmem_map_t *lls_slt_table;
 
 /* Hash functions */
-static gint
-lls_slt_key_equal(gconstpointer v, gconstpointer w)
+static int
+lls_slt_key_equal(const void *v, const void *w)
 {
     const lls_slt_key_t *v1 = (const lls_slt_key_t *)v;
     const lls_slt_key_t *v2 = (const lls_slt_key_t *)w;
-    gint result;
+    int result;
     result = (v1->src_ip == v2->src_ip &&
               v1->dst_ip == v2->dst_ip &&
               v1->dst_port == v2->dst_port);
     return result;
 }
 
-static guint
-lls_slt_key_hash(gconstpointer v)
+static unsigned
+lls_slt_key_hash(const void *v)
 {
     const lls_slt_key_t *key = (const lls_slt_key_t *)v;
-    guint hash_val = key->src_ip ^ key->dst_ip ^ (((guint32)(key->dst_port)) << 16);
+    unsigned hash_val = key->src_ip ^ key->dst_ip ^ (((uint32_t)(key->dst_port)) << 16);
     return hash_val;
 }
 
@@ -56,12 +56,12 @@ lls_check_init_slt_table(void) {
     }
 }
 
-static gchar *
+static char *
 xml_value_to_gchar(xml_frame_t *xml_frame, wmem_allocator_t *scope) {
-    gchar *value = NULL;
+    char *value = NULL;
     if (xml_frame->value != NULL) {
-        guint l = tvb_reported_length(xml_frame->value);
-        value = (gchar *)wmem_alloc0(scope, l + 1);
+        unsigned l = tvb_reported_length(xml_frame->value);
+        value = (char *)wmem_alloc0(scope, l + 1);
         tvb_memcpy(xml_frame->value, value, 0, l);
     }
     return value;
@@ -108,7 +108,7 @@ lls_extract_save_slt_table(packet_info *pinfo, dissector_handle_t xml_handle)
         slt_val.major_channel_num = -1;
         slt_val.minor_channel_num = -1;
         while (service_entry) {
-            gchar *value = xml_value_to_gchar(service_entry, pinfo->pool);
+            char *value = xml_value_to_gchar(service_entry, pinfo->pool);
             if (service_entry->type == XML_FRAME_ATTRIB && value != NULL) {
                 if(g_strcmp0("serviceId", service_entry->name_orig_case) == 0) {
                     ws_strtou16(value, NULL, &slt_val.service_id);
@@ -172,9 +172,9 @@ get_lls_slt_val(packet_info *pinfo) {
 
     /* Prepare for lookup in LLS SLT table */
     lls_slt_key_t slt_key;
-    slt_key.src_ip = *(guint32 *)pinfo->net_src.data;
-    slt_key.dst_ip = *(guint32 *)pinfo->net_dst.data;
-    slt_key.dst_port = (guint16)pinfo->destport;
+    slt_key.src_ip = *(uint32_t *)pinfo->net_src.data;
+    slt_key.dst_ip = *(uint32_t *)pinfo->net_dst.data;
+    slt_key.dst_port = (uint16_t)pinfo->destport;
 
     /* Try to lookup by src_ip + dst_ip + dst_port */
     lls_slt_value_t *slt_val = (lls_slt_value_t *)wmem_map_lookup(lls_slt_table, (const void *)(&slt_key));
@@ -192,33 +192,33 @@ get_lls_slt_val(packet_info *pinfo) {
 }
 
 /* Heuristics test. Checks if packet is ALC using LLS SLT table */
-gboolean
+bool
 test_alc_over_slt(packet_info *pinfo, tvbuff_t *tvb _U_, int offset _U_, void *data _U_)
 {
     lls_slt_value_t *slt_val = get_lls_slt_val(pinfo);
     if (slt_val == NULL)
-        return FALSE;
+        return false;
 
     if (slt_val->sls_protocol == 1) {
         /* slsProtocol=1 is ALC/LCT ROUTE/DASH */
-        return TRUE;
+        return true;
     } else {
         /* ACL/LCT is used only for ROUTE/DASH so return false */
-        return FALSE;
+        return false;
     }
 }
 
 /* Returns channel info or NULL if no info in SLT table*/
-gchar *
+char *
 get_slt_channel_info(packet_info *pinfo)
 {
     lls_slt_value_t *slt_val = get_lls_slt_val(pinfo);
     if (slt_val == NULL)
         return NULL;
 
-    gint32 major_channel_num = slt_val->major_channel_num;
-    gint32 minor_channel_num = slt_val->minor_channel_num;
-    gchar *ret;
+    int32_t major_channel_num = slt_val->major_channel_num;
+    int32_t minor_channel_num = slt_val->minor_channel_num;
+    char *ret;
     if (major_channel_num > 0 && minor_channel_num > 0) {
         ret = wmem_strdup_printf(pinfo->pool, "ServiceID: %u Channel: %d.%d", slt_val->service_id,
             major_channel_num, minor_channel_num);
diff --git a/epan/dissectors/packet-lls.c b/epan/dissectors/packet-lls.c
index e6a7b7d0ce..3600f085dc 100644
--- a/epan/dissectors/packet-lls.c
+++ b/epan/dissectors/packet-lls.c
@@ -32,11 +32,11 @@ void proto_reg_handoff_lls(void);
 void proto_register_lls(void);
 
 static int proto_lls;
-static gint ett_lls;
-static gint ett_lls_smt_entry;
-static gint ett_lls_smt_signature;
-static gint ett_lls_table_payload;
-static gint ett_lls_table_payload_xml;
+static int ett_lls;
+static int ett_lls_smt_entry;
+static int ett_lls_smt_signature;
+static int ett_lls_table_payload;
+static int ett_lls_table_payload_xml;
 
 static dissector_handle_t lls_handle;
 static dissector_handle_t xml_handle;
@@ -92,7 +92,7 @@ static int hf_lls_smt_signature;
 
 
 static void
-dissect_lls_table_payload(guint8 lls_table_id, tvbuff_t *tvb, packet_info *pinfo, gint offset, gint len, proto_tree *tree)
+dissect_lls_table_payload(uint8_t lls_table_id, tvbuff_t *tvb, packet_info *pinfo, int offset, int len, proto_tree *tree)
 {
     proto_item *ti = proto_tree_add_item(tree, hf_lls_table_payload, tvb, offset, len, ENC_NA);
 
@@ -105,10 +105,10 @@ dissect_lls_table_payload(guint8 lls_table_id, tvbuff_t *tvb, packet_info *pinfo
     tvbuff_t *uncompress_tvb = tvb_uncompress_zlib(tvb, offset, len);
     proto_tree *xml_tree = NULL;
     if (uncompress_tvb) {
-        const gchar *table_type_short = val_to_str_const(lls_table_id, hf_lls_table_type_short_vals, "Unknown");
-        gchar *source_name = wmem_strdup_printf(pinfo->pool, "Table ID %u (%s)", lls_table_id, table_type_short);
+        const char *table_type_short = val_to_str_const(lls_table_id, hf_lls_table_type_short_vals, "Unknown");
+        char *source_name = wmem_strdup_printf(pinfo->pool, "Table ID %u (%s)", lls_table_id, table_type_short);
         add_new_data_source(pinfo, uncompress_tvb, source_name);
-        guint decomp_length = tvb_captured_length(uncompress_tvb);
+        unsigned decomp_length = tvb_captured_length(uncompress_tvb);
 
         proto_item *ti_uncomp = proto_tree_add_item(uncompress_tree, hf_lls_table_payload_uncompressed, uncompress_tvb, 0, decomp_length, ENC_ASCII);
         proto_item_set_generated(ti_uncomp);
@@ -135,9 +135,9 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     proto_item *ti = proto_tree_add_item(tree, proto_lls, tvb, 0, -1, ENC_NA);
     proto_tree *lls_tree = proto_item_add_subtree(ti, ett_lls);
 
-    gint offset = 0;
+    int offset = 0;
 
-    guint8 lls_table_id = tvb_get_guint8(tvb, offset);
+    uint8_t lls_table_id = tvb_get_uint8(tvb, offset);
     col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(lls_table_id, hf_lls_table_type_vals, "Unknown"));
     proto_tree_add_item(lls_tree, hf_lls_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
@@ -145,7 +145,7 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     proto_tree_add_item(lls_tree, hf_lls_group_id, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
 
-    guint16 lls_group_count = tvb_get_guint8(tvb, offset) + 1;
+    uint16_t lls_group_count = tvb_get_uint8(tvb, offset) + 1;
     PROTO_ITEM_SET_GENERATED(
         proto_tree_add_uint(lls_tree, hf_lls_group_count, tvb, offset, 1, lls_group_count)
     );
@@ -155,17 +155,17 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     offset++;
 
     if (lls_table_id == LLS_TABLE_TYPE_SIGNED_MULTI_TABLE) {
-        guint8 smt_payload_count = tvb_get_guint8(tvb, offset);
+        uint8_t smt_payload_count = tvb_get_uint8(tvb, offset);
         proto_tree_add_item(lls_tree, hf_lls_smt_payload_count, tvb, offset, 1, ENC_BIG_ENDIAN);
         offset++;
 
-        for(guint8 i = 0; i < smt_payload_count; i++) {
-            guint16 smt_entry_payload_length = tvb_get_guint16(tvb, offset + 2, ENC_BIG_ENDIAN);
+        for(uint8_t i = 0; i < smt_payload_count; i++) {
+            uint16_t smt_entry_payload_length = tvb_get_uint16(tvb, offset + 2, ENC_BIG_ENDIAN);
             proto_item *smt_entry_item = proto_tree_add_item(lls_tree, hf_lls_smt_entry, tvb, offset, smt_entry_payload_length + 4, ENC_NA);
             proto_tree *smt_entry_tree = proto_item_add_subtree(smt_entry_item, ett_lls_smt_entry);
 
-            guint8 smt_entry_table_id = tvb_get_guint8(tvb, offset);
-            const gchar *table_type_short = val_to_str_const(smt_entry_table_id, hf_lls_table_type_short_vals, "Unknown");
+            uint8_t smt_entry_table_id = tvb_get_uint8(tvb, offset);
+            const char *table_type_short = val_to_str_const(smt_entry_table_id, hf_lls_table_type_short_vals, "Unknown");
             proto_item_append_text(smt_entry_item, " (%u) Table ID=%u (%s)", i, smt_entry_table_id, table_type_short);
             col_append_fstr(pinfo->cinfo, COL_INFO, "/%s", table_type_short);
             proto_tree_add_item(smt_entry_tree, hf_lls_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -181,7 +181,7 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             offset += smt_entry_payload_length;
         }
 
-        guint16 smt_signature_length = tvb_get_guint16(tvb, offset, ENC_BIG_ENDIAN);
+        uint16_t smt_signature_length = tvb_get_uint16(tvb, offset, ENC_BIG_ENDIAN);
         proto_tree_add_item(lls_tree, hf_lls_smt_signature_length, tvb, offset, 2, ENC_BIG_ENDIAN);
         offset += 2;
 
@@ -191,8 +191,8 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             tvbuff_t *cms_tvb = tvb_new_subset_length(tvb, offset, smt_signature_length);
 
             /* CMS dissector removes useful info from Protocol and Info columns so store it */
-            gchar *col_info_text = wmem_strdup(pinfo->pool, col_get_text(pinfo->cinfo, COL_INFO));
-            gchar *col_protocol_text = wmem_strdup(pinfo->pool, col_get_text(pinfo->cinfo, COL_PROTOCOL));
+            char *col_info_text = wmem_strdup(pinfo->pool, col_get_text(pinfo->cinfo, COL_INFO));
+            char *col_protocol_text = wmem_strdup(pinfo->pool, col_get_text(pinfo->cinfo, COL_PROTOCOL));
 
             call_dissector(cms_handle, cms_tvb, pinfo, cms_tree);
 
@@ -201,7 +201,7 @@ dissect_lls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             col_set_str(pinfo->cinfo, COL_PROTOCOL, col_protocol_text);
         }
     } else {
-        gint table_payload_length = tvb_captured_length(tvb) - 4;
+        int table_payload_length = tvb_captured_length(tvb) - 4;
         dissect_lls_table_payload(lls_table_id, tvb, pinfo, offset, table_payload_length, lls_tree);
     }
 
@@ -262,7 +262,7 @@ proto_register_lls(void)
         } },
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lls,
         &ett_lls_smt_entry,
         &ett_lls_table_payload,
diff --git a/epan/dissectors/packet-lls.h b/epan/dissectors/packet-lls.h
index 04a48d0ff1..f269782023 100644
--- a/epan/dissectors/packet-lls.h
+++ b/epan/dissectors/packet-lls.h
@@ -14,23 +14,23 @@
 #define __PACKET_LLS_H__
 
 typedef struct {
-    guint32 src_ip;
-    guint32 dst_ip;
-    guint16 dst_port;
+    uint32_t src_ip;
+    uint32_t dst_ip;
+    uint16_t dst_port;
 } lls_slt_key_t;
 
 typedef struct {
-    guint8 service_category;
-    guint8 sls_protocol;
-    guint16 service_id;
-    gint32 major_channel_num;
-    gint32 minor_channel_num;
+    uint8_t service_category;
+    uint8_t sls_protocol;
+    uint16_t service_id;
+    int32_t major_channel_num;
+    int32_t minor_channel_num;
 } lls_slt_value_t;
 
 /* SLT Table Routines */
 
 void lls_extract_save_slt_table(packet_info *pinfo, dissector_handle_t xml_handle);
-gboolean test_alc_over_slt(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data);
-gchar *get_slt_channel_info(packet_info *pinfo);
+bool test_alc_over_slt(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data);
+char *get_slt_channel_info(packet_info *pinfo);
 
 #endif
diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c
index b3fa24a3ee..da5dce179f 100644
--- a/epan/dissectors/packet-llt.c
+++ b/epan/dissectors/packet-llt.c
@@ -26,7 +26,7 @@ static const value_string message_type_vs[] = {
 };
 
 /* Variables for our preferences */
-static guint preference_alternate_ethertype = 0x0;
+static unsigned preference_alternate_ethertype = 0x0;
 
 /* Initialize the protocol and registered fields */
 static int proto_llt;
@@ -40,7 +40,7 @@ static int hf_llt_dst_node_id;
 static int hf_llt_src_node_id;
 
 /* Initialize the subtree pointers */
-static gint ett_llt;
+static int ett_llt;
 
 /* Code to actually dissect the packets */
 static int
@@ -49,13 +49,13 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 	/* Set up structures needed to add the protocol subtree and manage it */
 	proto_item *ti;
 	proto_tree *llt_tree;
-	guint8 message_type;
-        guint16 magic;
+	uint8_t message_type;
+        uint16_t magic;
 
 	/* Make entries in Protocol column and Info column on summary display */
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLT");
 
-	magic = tvb_get_guint16(tvb, 0, ENC_BIG_ENDIAN);
+	magic = tvb_get_uint16(tvb, 0, ENC_BIG_ENDIAN);
 	if(magic == 0x0602){ /* v2 ? */
 
 		ti = proto_tree_add_item(tree, proto_llt, tvb, 0, -1, ENC_NA);
@@ -66,7 +66,7 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 		proto_tree_add_item(llt_tree, hf_llt_src_node_id, tvb, 8, 1, ENC_LITTLE_ENDIAN);
 
 	} else {
-		message_type = tvb_get_guint8(tvb, 3);
+		message_type = tvb_get_uint8(tvb, 3);
 
 		col_add_fstr(pinfo->cinfo, COL_INFO, "Message type: %s", val_to_str(message_type, message_type_vs, "Unknown (0x%02x)"));
 
@@ -121,7 +121,7 @@ proto_register_llt(void)
 	};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_llt,
 	};
 
@@ -148,12 +148,12 @@ proto_register_llt(void)
 void
 proto_reg_handoff_llt(void)
 {
-	static gboolean initialized = FALSE;
-	static guint preference_alternate_ethertype_last;
+	static bool initialized = false;
+	static unsigned preference_alternate_ethertype_last;
 
 	if (!initialized) {
 		dissector_add_uint("ethertype", ETHERTYPE_LLT, llt_handle);
-		initialized = TRUE;
+		initialized = true;
 	} else {
 		if (preference_alternate_ethertype_last != 0x0) {
 			dissector_delete_uint("ethertype", preference_alternate_ethertype_last, llt_handle);
diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c
index 261677ca9e..98cee9a2c4 100644
--- a/epan/dissectors/packet-lltd.c
+++ b/epan/dissectors/packet-lltd.c
@@ -120,22 +120,22 @@ static int hf_lltd_qos_snapshot_bytes_sent;
 static int hf_lltd_qos_snapshot_packets_sent;
 
 
-static gint ett_lltd;
-static gint ett_base_header;
-static gint ett_discover_stations;
-static gint ett_tlv;
-static gint ett_tlv_item;
-static gint ett_characteristics;
-static gint ett_qos_characteristics;
-static gint ett_repeater_ap_lineage;
-static gint ett_emitee_descs;
-static gint ett_emitee_descs_item;
-static gint ett_recvee_descs;
-static gint ett_recvee_descs_item;
-static gint ett_qos_event_descs;
-static gint ett_qos_event_item;
-static gint ett_qos_snapshot_list;
-static gint ett_qos_snapshot_item;
+static int ett_lltd;
+static int ett_base_header;
+static int ett_discover_stations;
+static int ett_tlv;
+static int ett_tlv_item;
+static int ett_characteristics;
+static int ett_qos_characteristics;
+static int ett_repeater_ap_lineage;
+static int ett_emitee_descs;
+static int ett_emitee_descs_item;
+static int ett_recvee_descs;
+static int ett_recvee_descs_item;
+static int ett_qos_event_descs;
+static int ett_qos_event_item;
+static int ett_qos_snapshot_list;
+static int ett_qos_snapshot_item;
 
 static expert_field ei_lltd_tlv_length_invalid;
 static expert_field ei_lltd_too_many_paths;
@@ -310,26 +310,26 @@ static const true_false_string tfs_full_half_duplex = { "Full Duplex", "Half Dup
 
 
 static int
-dissect_lltd_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset, gboolean* end)
+dissect_lltd_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset, bool* end)
 {
-    guint8     type, length = 0;
+    uint8_t    type, length = 0;
     proto_item *tlv_item, *type_item;
     proto_tree *tlv_tree, *type_tree;
-    guint32 i, temp32;
+    uint32_t i, temp32;
 
-    type = tvb_get_guint8(tvb, offset);
+    type = tvb_get_uint8(tvb, offset);
     if (type == 0)
     {
         /* End of Property type doesn't have length */
         tlv_tree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_tlv_item, &tlv_item, "TLV Item (End of Property List)");
-        *end = TRUE;
+        *end = true;
     }
     else
     {
-        length = tvb_get_guint8(tvb, offset+1);
+        length = tvb_get_uint8(tvb, offset+1);
         tlv_tree = proto_tree_add_subtree_format(tree, tvb, offset, length+2, ett_tlv_item, &tlv_item,
                     "TLV Item (%s)", val_to_str(type, lltd_tlv_type_vals, "Unknown (0x%02x)"));
-        *end = FALSE;
+        *end = false;
     }
 
     proto_tree_add_item(tlv_tree, hf_lltd_tlv_type, tvb, offset, 1, ENC_NA);
@@ -340,7 +340,7 @@ dissect_lltd_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 of
     if ((type != 0) && (length > tvb_reported_length_remaining(tvb, offset+2)))
     {
         expert_add_info_format(pinfo, tlv_item, &ei_lltd_tlv_length_invalid, "TLV Length field too big");
-        *end = TRUE;
+        *end = true;
         return 2;
     }
 
@@ -549,12 +549,12 @@ dissect_lltd_discovery(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 {
     proto_item *header_item, *func_item;
     proto_tree *header_tree, *func_tree, *func_subtree;
-    guint8     func;
-    guint16    temp16;
-    gboolean   end_tlv = FALSE;
+    uint8_t    func;
+    uint16_t   temp16;
+    bool       end_tlv = false;
     int loop_offset, start_offset;
 
-    func = tvb_get_guint8(tvb, offset);
+    func = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(tree, hf_lltd_discovery_func, tvb, offset, 1, ENC_NA);
     col_add_str(pinfo->cinfo, COL_INFO, val_to_str(func, lltd_discovery_vals, "Unknown (0x%02x)"));
     offset++;
@@ -589,7 +589,7 @@ dissect_lltd_discovery(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
 
         func_tree = proto_tree_add_subtree(tree, tvb, offset+28, 0, ett_tlv, &func_item, "TLVs");
         start_offset = loop_offset = offset+28;
-        while ((end_tlv == FALSE) && (tvb_reported_length_remaining(tvb, loop_offset) >= 1))
+        while ((end_tlv == false) && (tvb_reported_length_remaining(tvb, loop_offset) >= 1))
         {
             loop_offset += dissect_lltd_tlv(tvb, pinfo, func_tree, loop_offset, &end_tlv);
         }
@@ -667,11 +667,11 @@ dissect_lltd_qos(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
 {
     proto_item *header_item;
     proto_tree *header_tree, *func_tree, *func_subtree;
-    guint8     func;
-    guint16    seq_num, temp16;
+    uint8_t    func;
+    uint16_t   seq_num, temp16;
     int loop_offset;
 
-    func = tvb_get_guint8(tvb, offset);
+    func = tvb_get_uint8(tvb, offset);
     proto_tree_add_item(tree, hf_lltd_qos_diag_func, tvb, offset, 1, ENC_NA);
     col_add_str(pinfo->cinfo, COL_INFO, val_to_str(func, lltd_qos_diag_vals, "Unknown (0x%02x)"));
     offset++;
@@ -743,7 +743,7 @@ dissect_lltd_qos(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
         proto_tree_add_item(tree, hf_lltd_qos_counter_result_byte_scale, tvb, offset+15, 1, ENC_BIG_ENDIAN);
         proto_tree_add_item(tree, hf_lltd_qos_counter_result_packet_scale, tvb, offset+16, 1, ENC_BIG_ENDIAN);
         proto_tree_add_item(tree, hf_lltd_qos_counter_result_history_size, tvb, offset+17, 1, ENC_BIG_ENDIAN);
-        temp16 = tvb_get_guint8(tvb, offset+17);
+        temp16 = tvb_get_uint8(tvb, offset+17);
         if (temp16 > 0)
         {
             func_tree = proto_tree_add_subtree(tree, tvb, offset+18, temp16*4, ett_qos_snapshot_list, NULL, "Snapshot List");
@@ -772,7 +772,7 @@ dissect_lltd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 {
     proto_item *ti;
     proto_tree *lltd_tree;
-    guint8     tos;
+    uint8_t    tos;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLTD");
     col_clear(pinfo->cinfo, COL_INFO);
@@ -782,7 +782,7 @@ dissect_lltd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 
     proto_tree_add_item(lltd_tree, hf_lltd_version, tvb, 0, 1, ENC_NA);
     proto_tree_add_item(lltd_tree, hf_lltd_type_of_service, tvb, 1, 1, ENC_NA);
-    tos = tvb_get_guint8(tvb, 1);
+    tos = tvb_get_uint8(tvb, 1);
     proto_tree_add_item(lltd_tree, hf_lltd_reserved, tvb, 2, 1, ENC_NA);
 
     switch(tos)
@@ -907,7 +907,7 @@ proto_register_lltd(void)
         { &hf_lltd_qos_snapshot_packets_sent, {"Packets Sent", "lltd.qos_snapshot.packets_sent", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lltd,
         &ett_base_header,
         &ett_discover_stations,
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 73a803d729..065542d621 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -44,8 +44,8 @@ static int hf_lmi_dlci_low;
 static int hf_lmi_new;
 static int hf_lmi_act;
 
-static gint ett_lmi;
-static gint ett_lmi_ele;
+static int ett_lmi;
+static int ett_lmi_ele;
 
 #ifdef _OLD_
 /*
@@ -128,8 +128,8 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
     proto_tree    *lmi_tree, *lmi_subtree;
     proto_item    *ti;
     int           offset = 2, len;
-    guint8        msg_type;
-    guint8        ele_id;
+    uint8_t       msg_type;
+    uint8_t       ele_id;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMI");
     col_clear(pinfo->cinfo, COL_INFO);
@@ -139,7 +139,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
     proto_tree_add_item(lmi_tree, hf_lmi_call_ref, tvb, 0, 1, ENC_BIG_ENDIAN);
 
-    msg_type = tvb_get_guint8( tvb, 1);
+    msg_type = tvb_get_uint8( tvb, 1);
     col_add_str(pinfo->cinfo, COL_INFO,
             val_to_str(msg_type, msg_type_str, "Unknown message type (0x%02x)"));
 
@@ -147,8 +147,8 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
     /* Display the LMI elements */
     while (tvb_reported_length_remaining(tvb, offset) > 0) {
-        ele_id = tvb_get_guint8( tvb, offset);
-        len =  tvb_get_guint8( tvb, offset + 1);
+        ele_id = tvb_get_uint8( tvb, offset);
+        len =  tvb_get_uint8( tvb, offset + 1);
 
         lmi_subtree = proto_tree_add_subtree_format(lmi_tree, tvb, offset, len + 2,
                 ett_lmi_ele, NULL, "Information Element: %s",
@@ -212,7 +212,7 @@ proto_register_lmi(void)
             { "DLCI Active","lmi.dlci_act", FT_UINT8, BASE_DEC, VALS(pvc_status_act_str), 0x02,
                 "DLCI Active Flag", HFILL }},
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lmi,
         &ett_lmi_ele,
     };
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 91be2049cb..07bfb354bb 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -656,7 +656,7 @@ enum {
 
 #define NUM_LMP_SUBTREES (LMP_TREE_CLASS_START + LMP_CLASS_MAX)
 
-static gint lmp_subtree[NUM_LMP_SUBTREES];
+static int lmp_subtree[NUM_LMP_SUBTREES];
 
 static int lmp_class_to_subtree(int lmp_class)
 {
@@ -693,7 +693,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     proto_tree *lmp_subobj_tree;
     proto_item *hidden_item, *msg_item;
 
-    guint8 message_type;
+    uint8_t message_type;
     vec_t cksum_vec[1];
     int j, k, l, len;
     int msg_length;
@@ -704,7 +704,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMP");
     col_clear(pinfo->cinfo, COL_INFO);
 
-    message_type = tvb_get_guint8(tvb, offset+3);
+    message_type = tvb_get_uint8(tvb, offset+3);
     col_add_str(pinfo->cinfo, COL_INFO,
          val_to_str(message_type, message_type_vals, "Unknown (%u). "));
 
@@ -760,9 +760,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
     offset += 8;
     len = 8;
     while (len < msg_length) {
-        guint8 lmp_class;
-        guint8 type;
-        guint8 negotiable;
+        uint8_t lmp_class;
+        uint8_t type;
+        uint8_t negotiable;
         int filter_num;
         proto_item* trace_item;
 
@@ -771,8 +771,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             proto_tree_add_expert(tree, pinfo, &ei_lmp_obj_len, tvb, offset+2, 2);
             break;
         }
-        lmp_class = tvb_get_guint8(tvb, offset+1);
-        type = tvb_get_guint8(tvb, offset);
+        lmp_class = tvb_get_uint8(tvb, offset+1);
+        type = tvb_get_uint8(tvb, offset);
         negotiable = (type >> 7); type &= 0x7f;
         hidden_item = proto_tree_add_uint(lmp_tree, hf_lmp_filter[LMPF_OBJECT], tvb,
                                           offset, 1, lmp_class);
@@ -1076,7 +1076,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             };
 
             ti2 = proto_tree_add_bitmask(lmp_object_tree, tvb, offset2, hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS], lmp_subtree[LMP_TREE_TE_LINK_FLAGS], link_flags, ENC_NA);
-            l = tvb_get_guint8(tvb, offset2);
+            l = tvb_get_uint8(tvb, offset2);
             proto_item_append_text(ti2, ": %s%s",
                                    (l&0x01) ? "Fault-Mgmt-Supported " : "",
                                    (l&0x02) ? "Link-Verification-Supported " : "");
@@ -1136,7 +1136,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             };
 
             ti2 = proto_tree_add_bitmask(lmp_object_tree, tvb, offset2, hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS], lmp_subtree[LMP_TREE_DATA_LINK_FLAGS], link_flags, ENC_NA);
-            l = tvb_get_guint8(tvb, offset2);
+            l = tvb_get_uint8(tvb, offset2);
             proto_item_append_text(ti2, ": %s%s",
                                    (l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ",
                                    (l&0x02) ? "Allocated " : "Unallocated ");
@@ -1186,7 +1186,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             while (l < obj_length - 4) {
                 float bandwidth;
 
-                mylen = tvb_get_guint8(tvb, offset2+l+1);
+                mylen = tvb_get_uint8(tvb, offset2+l+1);
                 ti2 = proto_tree_add_item(lmp_object_tree,
                                           hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
                                           tvb, offset2+l, mylen, ENC_NA);
@@ -1195,16 +1195,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                 proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_type, tvb, offset2+l, 1, ENC_BIG_ENDIAN);
 
                 proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_BIG_ENDIAN);
-                switch(tvb_get_guint8(tvb, offset2+l)) {
+                switch(tvb_get_uint8(tvb, offset2+l)) {
 
                 case 1:
 
                     proto_item_set_text(ti2, "Interface Switching Capability: "
                                         "Switching Cap: %s, Encoding Type: %s, "
                                         "Min BW: %.3f Mbps, Max BW: %.3f Mbps",
-                                        rval_to_str(tvb_get_guint8(tvb, offset2+l+2),
+                                        rval_to_str(tvb_get_uint8(tvb, offset2+l+2),
                                                     gmpls_switching_type_rvals, "Unknown (%d)"),
-                                        rval_to_str(tvb_get_guint8(tvb, offset2+l+3),
+                                        rval_to_str(tvb_get_uint8(tvb, offset2+l+3),
                                                     gmpls_lsp_enc_rvals, "Unknown (%d)"),
                                         tvb_get_ntohieee_float(tvb, offset2+l+4)*8/1000000,
                                         tvb_get_ntohieee_float(tvb, offset2+l+8)*8/1000000);
@@ -1230,13 +1230,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 
                 default:
                     proto_tree_add_item(lmp_subobj_tree, hf_lmp_data, tvb, offset2+l,
-                                        tvb_get_guint8(tvb, offset2+l+1), ENC_NA);
+                                        tvb_get_uint8(tvb, offset2+l+1), ENC_NA);
                     break;
                 }
-                if (tvb_get_guint8(tvb, offset2+l+1) == 0)
+                if (tvb_get_uint8(tvb, offset2+l+1) == 0)
                     break;
 
-                l += tvb_get_guint8(tvb, offset2+l+1);
+                l += tvb_get_uint8(tvb, offset2+l+1);
             }
         }
         break;
@@ -1301,11 +1301,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                 proto_tree_add_item(lmp_subobj_tree, hf_lmp_link, tvb, offset2+l, 4, ENC_NA);
                 if (j < 4)
                     proto_item_append_text(ti, "-%s,%s], ",
-                                           tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Act" : "NA",
+                                           tvb_get_uint8(tvb, offset2+l) & 0x80 ? "Act" : "NA",
                                            val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
                                                       channel_status_short_str, "UNK (%u)."));
                 proto_item_append_text(ti2, ": %s, ",
-                                       tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active");
+                                       tvb_get_uint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active");
                 proto_tree_add_item(lmp_subobj_tree, hf_lmp_channel_status, tvb, offset2+l, 4, ENC_BIG_ENDIAN);
                 proto_item_append_text(ti2, "%s", val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
                                                              channel_status_str, "Unknown (%u). "));
@@ -1531,7 +1531,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 
                 /* Signaling Protocols */
                 proto_tree_add_bitmask(lmp_object_tree, tvb, offset2, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS], lmp_subtree[LMP_TREE_SERVICE_CONFIG_SP_FLAGS], sp_flags, ENC_NA);
-                l = tvb_get_guint8(tvb, offset2);
+                l = tvb_get_uint8(tvb, offset2);
 
                 proto_item_append_text(ti2, ": %s %s",
                                        (l & 0x01) ? "RSVP-based UNI signaling supported " : "",
@@ -1562,18 +1562,18 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                 proto_tree_add_item(lmp_object_tree, hf_lmp_link_type, tvb, offset2, 1, ENC_BIG_ENDIAN);
 
                 proto_item_append_text(lmp_object_tree, "%s",
-                                       val_to_str(tvb_get_guint8(tvb, offset2),
+                                       val_to_str(tvb_get_uint8(tvb, offset2),
                                                   service_attribute_link_type_str,
                                                   "Unknown (%u). "));
 
-                l = tvb_get_guint8(tvb, offset2+1);
+                l = tvb_get_uint8(tvb, offset2+1);
                 /* Signal type for SDH */
                 if (l == LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SDH) {
                     /* Signal types for an SDH link */
                     proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sdh, tvb, offset2+1, 1, ENC_BIG_ENDIAN);
 
                     proto_item_append_text(lmp_object_tree, "%s",
-                                           val_to_str(tvb_get_guint8(tvb, offset2+1),
+                                           val_to_str(tvb_get_uint8(tvb, offset2+1),
                                                       service_attribute_signal_types_sdh_str,
                                                       "Unknown (%u).   "));
                 }
@@ -1583,7 +1583,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                     proto_tree_add_item(lmp_object_tree, hf_lmp_signal_types_sonet, tvb, offset2+1, 1, ENC_BIG_ENDIAN);
 
                     proto_item_append_text(lmp_object_tree, "%s",
-                                           val_to_str(tvb_get_guint8(tvb, offset2+1),
+                                           val_to_str(tvb_get_uint8(tvb, offset2+1),
                                                       service_attribute_signal_types_sonet_str,
                                                       "Unknown (%u).   "));
                 }
@@ -1591,7 +1591,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                 /* TP Transparency */
                 proto_tree_add_bitmask(lmp_object_tree, tvb, offset2+2, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS], lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_TP_FLAGS], tp_flags, ENC_NA);
 
-                l = tvb_get_guint8(tvb, offset2+2);
+                l = tvb_get_uint8(tvb, offset2+2);
                 proto_item_append_text(ti2, ": %s%s%s",
                                        (l & 0x01) ? "Path/VC Overhead Transparency " : "",
                                        (l & 0x02) ? "Line/MS Overhead Transparency " : "",
@@ -1660,7 +1660,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 
                 /* TCM Monitoring */
                 proto_tree_add_bitmask(lmp_object_tree, tvb, offset2+7, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS], lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_TCM_FLAGS], tcm_flags, ENC_BIG_ENDIAN);
-                l = tvb_get_guint8(tvb, offset2+7);
+                l = tvb_get_uint8(tvb, offset2+7);
                 proto_item_append_text(ti2, ": %s",
                                        (l & 0x01) ? "Transparent Support of TCM available " :  "");
                 }
@@ -1677,7 +1677,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 
                 /* Network Diversity Object */
                 proto_tree_add_bitmask(lmp_object_tree, tvb, offset2+3, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS], lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS], diversity_flags, ENC_BIG_ENDIAN);
-                l = tvb_get_guint8(tvb,offset2+3);
+                l = tvb_get_uint8(tvb,offset2+3);
                 proto_item_append_text(ti2, ": %s%s%s",
                                        (l & 0x01) ? "Node Diversity is supported " :  "",
                                        (l & 0x02) ? "Link Diversity is supported " : "",
@@ -1739,7 +1739,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                                     tvb, offset2+20, 4, ENC_BIG_ENDIAN);
                 l = 24;
                 while (l < obj_length - 4) {
-                    mylen = tvb_get_guint8(tvb, offset2+l+1);
+                    mylen = tvb_get_uint8(tvb, offset2+l+1);
                     ti2 = proto_tree_add_item(lmp_object_tree,
                                               hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
                                               tvb, offset2+l, mylen, ENC_NA);
@@ -1755,7 +1755,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                     else
                         proto_tree_add_item(lmp_subobj_tree, hf_lmp_subobject_length, tvb, offset2+l+1, 1, ENC_BIG_ENDIAN);
 
-                    switch(tvb_get_guint8(tvb, offset2+l)) {
+                    switch(tvb_get_uint8(tvb, offset2+l)) {
 
                     case 250:
                         proto_item_set_text(ti2, "Primary Routing Controller: "
@@ -1796,9 +1796,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                     case 252:
                         proto_item_set_text(ti2, "SONET/SDH Layer Capability: "
                                             "Switching Cap: %s, Encoding Type: %s",
-                                            rval_to_str(tvb_get_guint8(tvb, offset2+l+4),
+                                            rval_to_str(tvb_get_uint8(tvb, offset2+l+4),
                                                         gmpls_switching_type_rvals, "Unknown (%d)"),
-                                            rval_to_str(tvb_get_guint8(tvb, offset2+l+5),
+                                            rval_to_str(tvb_get_uint8(tvb, offset2+l+5),
                                                         gmpls_lsp_enc_rvals, "Unknown (%d)"));
                         proto_tree_add_item(lmp_subobj_tree,
                                             hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
@@ -1810,7 +1810,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
                         for (j = 0; j < (mylen - 8) / 4; j++) {
                             proto_tree_add_uint_format(lmp_subobj_tree, hf_lmp_free_timeslots, tvb, offset2+l+8+(j*4), 4,
                                                 tvb_get_ntoh24(tvb, offset2+l+9+(j*4)), "%s: %d free timeslots",
-                                                val_to_str_ext(tvb_get_guint8(tvb, offset2+l+8+(j*4)),
+                                                val_to_str_ext(tvb_get_uint8(tvb, offset2+l+8+(j*4)),
                                                                &gmpls_sonet_signal_type_str_ext,
                                                                "Unknown Signal Type (%d)"),
                                                 tvb_get_ntoh24(tvb, offset2+l+9+(j*4)));
@@ -1819,13 +1819,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 
                     default:
                         proto_tree_add_item(lmp_subobj_tree, hf_lmp_data, tvb, offset2+l,
-                                            tvb_get_guint8(tvb, offset2+l+1), ENC_NA);
+                                            tvb_get_uint8(tvb, offset2+l+1), ENC_NA);
                         break;
                     }
-                    if (tvb_get_guint8(tvb, offset2+l+1) == 0)
+                    if (tvb_get_uint8(tvb, offset2+l+1) == 0)
                         break;
 
-                    l += tvb_get_guint8(tvb, offset2+l+1);
+                    l += tvb_get_uint8(tvb, offset2+l+1);
                 }
 
                 break;
@@ -1868,7 +1868,7 @@ register_lmp_prefs (void)
 void
 proto_register_lmp(void)
 {
-    static gint *ett[NUM_LMP_SUBTREES];
+    static int *ett[NUM_LMP_SUBTREES];
     int i;
 
     static hf_register_info lmpf_info[] = {
diff --git a/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c
index a5af862ff4..112dbc0795 100644
--- a/epan/dissectors/packet-lnet.c
+++ b/epan/dissectors/packet-lnet.c
@@ -100,11 +100,11 @@ static int hf_lnet_rdma_frag_size;
 static int hf_lnet_rdma_frag_addr;
 
 /* Initialize the subtree pointers */
-static gint ett_lnet;
-static gint ett_lnet_nid;
-static gint ett_lnet_o2ib_connparams;
-static gint ett_lnet_rdma_desc;
-static gint ett_lnet_rdma_frag;
+static int ett_lnet;
+static int ett_lnet_nid;
+static int ett_lnet_o2ib_connparams;
+static int ett_lnet_rdma_desc;
+static int ett_lnet_rdma_frag;
 
 static expert_field ei_lnet_buflen;
 static expert_field ei_lnet_type;
@@ -243,7 +243,7 @@ typedef struct _lnet_conv_info_t {
 } lnet_conv_info_t;
 
 static struct lnet_trans_info *
-get_lnet_conv(packet_info *pinfo, guint64 match_bits) {
+get_lnet_conv(packet_info *pinfo, uint64_t match_bits) {
     conversation_t *conversation;
 
     struct lnet_trans_info *info;
@@ -315,7 +315,7 @@ dissect_struct_rdma_desc(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
 {
     proto_tree *tree, *ftree;
     int old_offset;
-    guint32 frags, i;
+    uint32_t frags, i;
 
     proto_item *item;
 
@@ -355,7 +355,7 @@ lnet_dissect_struct_nid(tvbuff_t * tvb, proto_tree *parent_tree, int offset, int
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 ip, interface, proto;
+    uint32_t ip, interface, proto;
 
     item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, 8, ENC_NA);
     tree = proto_item_add_subtree(item, ett_lnet_nid);
@@ -384,9 +384,9 @@ lnet_dissect_struct_nid(tvbuff_t * tvb, proto_tree *parent_tree, int offset, int
 \********************************************************************/
 
 static int
-dissect_csum(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, guint lnd_type)
+dissect_csum(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, unsigned lnd_type)
 {
-    guint32 csum;
+    uint32_t csum;
     proto_item *ti;
 
     csum = tvb_get_letohl(tvb, offset);
@@ -420,7 +420,7 @@ dissect_csum(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, g
 \********************************************************************/
 
 static int
-dissect_lnet_put(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint64 *match)
+dissect_lnet_put(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, uint64_t *match)
 {
     /* typedef struct lnet_put {
        lnet_handle_wire_t  ack_wmd;
@@ -430,7 +430,7 @@ dissect_lnet_put(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
        __u32               offset;
        } WIRE_ATTR lnet_put_t; */
     const char *port;
-    guint32 ptl_index;
+    uint32_t ptl_index;
 
     proto_tree_add_item(tree, hf_dst_wmd_interface, tvb, offset, 8, ENC_LITTLE_ENDIAN);
     offset += 8;
@@ -456,7 +456,7 @@ dissect_lnet_put(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset
 }
 
 static int
-dissect_lnet_get(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, guint64 *match)
+dissect_lnet_get(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, uint64_t *match)
 {
     /* typedef struct lnet_get {
        lnet_handle_wire_t  return_wmd;
@@ -467,7 +467,7 @@ dissect_lnet_get(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offse
        } WIRE_ATTR lnet_get_t;
     */
     const char *port;
-    guint32 ptl_index;
+    uint32_t ptl_index;
 
     proto_tree_add_item(tree, hf_dst_wmd_interface, tvb, offset, 8, ENC_LITTLE_ENDIAN);
     offset += 8;
@@ -522,7 +522,7 @@ dissect_lnet_hello(tvbuff_t * tvb, proto_tree *tree, int offset)
 }
 
 static int
-dissect_lnet_ack(tvbuff_t * tvb, proto_tree *tree, int offset, guint64 *match)
+dissect_lnet_ack(tvbuff_t * tvb, proto_tree *tree, int offset, uint64_t *match)
 {
     /* typedef struct lnet_ack {
        lnet_handle_wire_t  dst_wmd;
@@ -551,7 +551,7 @@ static int
 dissect_ksock_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 {
     proto_item *ti;
-    guint64 val;
+    uint64_t val;
 
     proto_tree_add_item(tree, hf_lnet_ksm_type, tvb, offset, 4, ENC_LITTLE_ENDIAN);
     offset += 4;
@@ -573,7 +573,7 @@ dissect_ksock_msg_noop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 }
 
 static int
-dissect_ib_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint32 *msg_type, guint32 *msg_length)
+dissect_ib_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, uint32_t *msg_type, uint32_t *msg_length)
 {
     /* typedef struct
      * {
@@ -640,16 +640,16 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
 
     proto_tree *lnet_tree;
     /* Other misc. local variables. */
-    guint offset = 0;
-    guint32 msg_length = 0;
-    guint32 payload_length = 0;
-    gint32 msg_filler_length = 0;
+    unsigned offset = 0;
+    uint32_t msg_length = 0;
+    uint32_t payload_length = 0;
+    int32_t msg_filler_length = 0;
 
-    guint64 match;
-    guint32 msg_type = 0;
-    guint32 ib_msg_type = 0;
-    guint extra_bytes = GPOINTER_TO_UINT(data);
-    gboolean ib_msg_payload = FALSE;
+    uint64_t match;
+    uint32_t msg_type = 0;
+    uint32_t ib_msg_type = 0;
+    unsigned extra_bytes = GPOINTER_TO_UINT(data);
+    bool ib_msg_payload = false;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LNET");
     col_clear(pinfo->cinfo, COL_INFO);
@@ -668,14 +668,14 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
                         val_to_str(ib_msg_type, lnet_ib_type, "Unknown(%d)"));
             offset = dissect_struct_o2ib_connparam(tvb, lnet_tree, offset);
             msg_filler_length = tvb_reported_length_remaining(tvb, offset);
-            ib_msg_payload = TRUE;
+            ib_msg_payload = true;
             break;
 
         case IBLND_MSG_NOOP:
             // No further data
             col_add_fstr(pinfo->cinfo, COL_INFO, "LNET %s",
                         val_to_str(ib_msg_type, lnet_ib_type, "Unknown(%d)"));
-            ib_msg_payload = TRUE;
+            ib_msg_payload = true;
             break;
 
         case IBLND_MSG_IMMEDIATE:
@@ -697,7 +697,7 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
             proto_tree_add_item(lnet_tree, hf_lnet_o2ib_dest_cookie, tvb, offset, 8, ENC_LITTLE_ENDIAN);
             offset+=8;
             offset = dissect_struct_rdma_desc(tvb, lnet_tree, offset);
-            ib_msg_payload = TRUE;
+            ib_msg_payload = true;
             break;
 
         case IBLND_MSG_GET_REQ:
@@ -716,7 +716,7 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
             offset+=8;
             proto_tree_add_item(lnet_tree, hf_lnet_o2ib_status, tvb, offset, 4, ENC_LITTLE_ENDIAN);
             offset+=4;
-            ib_msg_payload = TRUE;
+            ib_msg_payload = true;
             break;
         }
 
@@ -809,7 +809,7 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
             conv = get_lnet_conv(pinfo, match);
 
             offset += dissector_try_uint_new(subdissector_table, tvb_get_letohl(tvb, LNET_PTL_INDEX_OFFSET_PUT),
-                                             next_tvb, pinfo, tree, TRUE, conv);
+                                             next_tvb, pinfo, tree, true, conv);
             break;
         default:
             /* display of payload */
@@ -833,10 +833,10 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
  *
 \********************************************************************/
 #if 0
-static guint
+static unsigned
 get_lnet_ib_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-    guint32 plen;
+    uint32_t plen;
 
     /* Ensure this is an LNET IB segment */
     if (tvb_get_letohl(tvb, 0) != LNET_PROTO_IB_MAGIC)
@@ -850,11 +850,11 @@ get_lnet_ib_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *dat
 }
 #endif
 
-static guint
+static unsigned
 get_lnet_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-    guint32 plen;
-    guint extra_bytes = GPOINTER_TO_UINT(data);
+    uint32_t plen;
+    unsigned extra_bytes = GPOINTER_TO_UINT(data);
 
     /* Get the payload length:
      * 24 = ksm header,
@@ -868,7 +868,7 @@ get_lnet_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *da
     return plen + 72 + 24 + extra_bytes;
 }
 
-static guint
+static unsigned
 get_noop_message_len(packet_info *pinfo _U_, tvbuff_t *tvb _U_,
                      int offset _U_, void *data _U_)
 {
@@ -886,12 +886,12 @@ dissect_lnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 {
     switch (tvb_get_letohl(tvb, 0)) {
     case KSOCK_MSG_NOOP:
-        tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 0,
+        tcp_dissect_pdus(tvb, pinfo, tree, true, 0,
                          get_noop_message_len,
                          dissect_ksock_msg_noop, GUINT_TO_POINTER(0));
         break;
     case KSOCK_MSG_LNET:
-        tcp_dissect_pdus(tvb, pinfo, tree, TRUE, LNET_HEADER_LEN,
+        tcp_dissect_pdus(tvb, pinfo, tree, true, LNET_HEADER_LEN,
                          get_lnet_message_len,
                          dissect_lnet_message, GUINT_TO_POINTER(0));
         break;
@@ -1031,7 +1031,7 @@ proto_register_lnet(void)
           { "RDMA Frag Address", "lnet.rdma_frag.addr", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lnet,
         &ett_lnet_nid,
         &ett_lnet_o2ib_connparams,
diff --git a/epan/dissectors/packet-lnet.h b/epan/dissectors/packet-lnet.h
index 69f11c1350..218c3075ed 100644
--- a/epan/dissectors/packet-lnet.h
+++ b/epan/dissectors/packet-lnet.h
@@ -51,7 +51,7 @@ VALUE_STRING_ENUM2(portal_index);
 //VALUE_STRING_ARRAY2(portal_index);
 
 struct lnet_trans_info {
-    guint64 match_bits;
+    uint64_t match_bits;
 };
 
 int lnet_dissect_struct_nid(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int hf_index);
diff --git a/epan/dissectors/packet-locamation-im.c b/epan/dissectors/packet-locamation-im.c
index a8f5db2b63..ced34bfc0c 100644
--- a/epan/dissectors/packet-locamation-im.c
+++ b/epan/dissectors/packet-locamation-im.c
@@ -122,32 +122,32 @@ static const value_string company_pid_vals[] = {
 
 /*
  * struct _sample_set_t {
- * 	guint16 ranges;
- * 	gint32 sample_1;
- * 	gint32 sample_2;
- * 	gint32 sample_3;
- * 	gint32 sample_4;
- * 	gint32 sample_5;
- * 	gint32 sample_6;
- * 	gint32 sample_7;
- * 	gint32 sample_8;
+ * 	uint16_t ranges;
+ * 	int32_t sample_1;
+ * 	int32_t sample_2;
+ * 	int32_t sample_3;
+ * 	int32_t sample_4;
+ * 	int32_t sample_5;
+ * 	int32_t sample_6;
+ * 	int32_t sample_7;
+ * 	int32_t sample_8;
  * };
  */
 #define SAMPLE_SET_SIZE 34
 
 /*
  * struct _timestamp_t {
- * 	guint8 sync_status;
- * 	guint8 additional_status;
- * 	guint32 sec;
- * 	guint32 nsec;
+ * 	uint8_t sync_status;
+ * 	uint8_t additional_status;
+ * 	uint32_t sec;
+ * 	uint32_t nsec;
  * };
  */
 #define TIMESTAMP_SIZE 10
 
 /*
  * struct _timestamps_t {
- * 	guint8 version;
+ * 	uint8_t version;
  * 	guint24 reserved;
  * 	struct _timestamp_t timestamps[8];
  * };
@@ -166,7 +166,7 @@ static void add_split_lines(packet_info *pinfo, tvbuff_t *tvb, int tvb_offset, p
 	int offset = tvb_offset;
 	int next_offset;
 	while (tvb_offset_exists(tvb, offset)) {
-		int len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+		int len = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
 		if (len == -1) {
 			break;
 		}
@@ -236,8 +236,8 @@ static ei_register_info ei_calibration[] = {
 
 static int h_protocol_calibration = -1;
 
-static gint ett_protocol_calibration;
-static gint ett_calibration_lines;
+static int ett_protocol_calibration;
+static int ett_calibration_lines;
 
 static int dissect_calibration(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORTNAME_CALIBRATION);
@@ -246,12 +246,12 @@ static int dissect_calibration(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 	proto_item *calibration_item = proto_tree_add_item(tree, h_protocol_calibration, tvb, 0, -1, ENC_NA);
 	proto_tree *calibration_item_subtree = proto_item_add_subtree(calibration_item, ett_protocol_calibration);
 
-	gint tvb_offset = 0;
+	int tvb_offset = 0;
 
 	/* Sequence Number */
-	gint item_size = 2;
+	int item_size = 2;
 	tvb_ensure_bytes_exist(tvb, tvb_offset, item_size);
-	guint16 sequence_number = tvb_get_guint16(tvb, 0, ENC_BIG_ENDIAN);
+	uint16_t sequence_number = tvb_get_uint16(tvb, 0, ENC_BIG_ENDIAN);
 	if (sequence_number == 0) {
 		expert_add_info(pinfo, calibration_item, &ei_calibration_header);
 	}
@@ -320,8 +320,8 @@ static hf_register_info protocol_registration_ident[] = {
 
 static int h_protocol_ident = -1;
 
-static gint ett_protocol_ident;
-static gint ett_ident_lines;
+static int ett_protocol_ident;
+static int ett_ident_lines;
 
 static int dissect_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORTNAME_IDENT);
@@ -358,8 +358,8 @@ static expert_field ei_samples_ranges_sample_6_invalid;
 static expert_field ei_samples_ranges_sample_7_invalid;
 static expert_field ei_samples_ranges_sample_8_invalid;
 
-static void check_ranges(tvbuff_t *tvb, packet_info *pinfo, gint tvb_offset, proto_item *item) {
-	guint16 ranges = tvb_get_guint16(tvb, tvb_offset, ENC_BIG_ENDIAN);
+static void check_ranges(tvbuff_t *tvb, packet_info *pinfo, int tvb_offset, proto_item *item) {
+	uint16_t ranges = tvb_get_uint16(tvb, tvb_offset, ENC_BIG_ENDIAN);
 
 	if ((ranges & MASK_RANGES_SAMPLE_8) == MASK_RANGES_SAMPLE_8) {
 		expert_add_info(pinfo, item, &ei_samples_ranges_sample_8_invalid);
@@ -387,7 +387,7 @@ static void check_ranges(tvbuff_t *tvb, packet_info *pinfo, gint tvb_offset, pro
 	}
 }
 
-static gint ett_samples_sample_set_ranges;
+static int ett_samples_sample_set_ranges;
 
 static int hf_samples_sample_set_ranges;
 
@@ -420,8 +420,8 @@ static int hf_samples_sample_set_sample_6;
 static int hf_samples_sample_set_sample_7;
 static int hf_samples_sample_set_sample_8;
 
-static void add_sample_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset, int hf, proto_tree *tree) {
-	gint item_size = SAMPLE_SET_SIZE;
+static void add_sample_set(tvbuff_t *tvb, packet_info *pinfo, int *tvb_offset, int hf, proto_tree *tree) {
+	int item_size = SAMPLE_SET_SIZE;
 	tvb_ensure_bytes_exist(tvb, *tvb_offset, item_size);
 	proto_item *sample_set_item = proto_tree_add_item(tree, hf, tvb, *tvb_offset, item_size, ENC_BIG_ENDIAN);
 
@@ -446,31 +446,31 @@ static void add_sample_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset,
 	    hf_samples_sample_set_sample_8};
 
 	item_size = 4;
-	for (guint index_sample = 0; index_sample < array_length(hfs); index_sample++) {
+	for (unsigned index_sample = 0; index_sample < array_length(hfs); index_sample++) {
 		tvb_ensure_bytes_exist(tvb, *tvb_offset, item_size);
 		proto_tree_add_item(sample_set_item_subtree, hfs[index_sample], tvb, *tvb_offset, item_size, ENC_BIG_ENDIAN);
 		*tvb_offset += item_size;
 	}
 }
 
-static void add_sample_sets(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset, int *hfs, guint hfs_size, proto_tree *tree) {
-	for (guint index_sample_set = 0; index_sample_set < hfs_size; index_sample_set++) {
+static void add_sample_sets(tvbuff_t *tvb, packet_info *pinfo, int *tvb_offset, int *hfs, unsigned hfs_size, proto_tree *tree) {
+	for (unsigned index_sample_set = 0; index_sample_set < hfs_size; index_sample_set++) {
 		add_sample_set(tvb, pinfo, tvb_offset, hfs[index_sample_set], tree);
 	}
 }
 
-static void add_rms_values(tvbuff_t *tvb, gint *tvb_offset, int *hfs, guint hfs_size, proto_tree *tree) {
-	gint item_size = 4;
-	for (guint index_rms_value = 0; index_rms_value < hfs_size; index_rms_value++) {
+static void add_rms_values(tvbuff_t *tvb, int *tvb_offset, int *hfs, unsigned hfs_size, proto_tree *tree) {
+	int item_size = 4;
+	for (unsigned index_rms_value = 0; index_rms_value < hfs_size; index_rms_value++) {
 		tvb_ensure_bytes_exist(tvb, *tvb_offset, item_size);
 		proto_tree_add_item(tree, hfs[index_rms_value], tvb, *tvb_offset, item_size, ENC_BIG_ENDIAN);
 		*tvb_offset += item_size;
 	}
 }
 
-static gint ett_samples_timestamps_sample;
-static gint ett_samples_timestamps_sample_reserved;
-static gint ett_samples_timestamps_sample_timestamp;
+static int ett_samples_timestamps_sample;
+static int ett_samples_timestamps_sample_reserved;
+static int ett_samples_timestamps_sample_timestamp;
 
 static int hf_samples_timestamps_sample_sync_status;
 static int hf_samples_timestamps_sample_additional_status;
@@ -493,24 +493,24 @@ static int *const timestamp_additional_status_bits[] = {
 
 static expert_field ei_samples_timestamp_sync_status_invalid;
 
-static void add_timestamp_sample(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset_previous, gint *tvb_offset, int hf, proto_tree *tree) {
-	gint item_size = TIMESTAMP_SIZE;
+static void add_timestamp_sample(tvbuff_t *tvb, packet_info *pinfo, int *tvb_offset_previous, int *tvb_offset, int hf, proto_tree *tree) {
+	int item_size = TIMESTAMP_SIZE;
 	tvb_ensure_bytes_exist(tvb, *tvb_offset, item_size);
 
 	/* Get the timestamp components */
-	guint8 sync_status = tvb_get_guint8(tvb, *tvb_offset);
-	guint32 seconds = tvb_get_guint32(tvb, *tvb_offset + 2, ENC_BIG_ENDIAN);
-	guint32 nanoseconds = tvb_get_guint32(tvb, *tvb_offset + 6, ENC_BIG_ENDIAN);
+	uint8_t sync_status = tvb_get_uint8(tvb, *tvb_offset);
+	uint32_t seconds = tvb_get_uint32(tvb, *tvb_offset + 2, ENC_BIG_ENDIAN);
+	uint32_t nanoseconds = tvb_get_uint32(tvb, *tvb_offset + 6, ENC_BIG_ENDIAN);
 
 	/* Convert the timestamp seconds to a split time type */
 	time_t sample_time = (time_t)seconds;
 	struct tm *sample_time_split = gmtime(&sample_time);
 
 	/* Construct the readable sync status */
-	const gchar *sync_status_buf = val_to_str(sync_status, samples_timestamps_sample_sync_status, "Unknown (%u)");
+	const char *sync_status_buf = val_to_str(sync_status, samples_timestamps_sample_sync_status, "Unknown (%u)");
 
 	/* Construct the readable timestamp */
-	gchar timestamp_buf[ITEM_LABEL_LENGTH];
+	char timestamp_buf[ITEM_LABEL_LENGTH];
 	size_t timestamp_length = 0;
 	if (sample_time_split != NULL) {
 		timestamp_length += strftime(&timestamp_buf[timestamp_length], ITEM_LABEL_LENGTH - timestamp_length, "%Y-%m-%d %H:%M:%S.", sample_time_split);
@@ -525,12 +525,12 @@ static void add_timestamp_sample(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_of
 	title_length += snprintf(&title_buf[title_length], ITEM_LABEL_LENGTH - title_length, "%s (Sync: %s", timestamp_buf, sync_status_buf);
 	if (tvb_offset_previous != NULL) {
 		/* Get the previous timestamp components and calculate the time difference */
-		guint32 seconds_previous = tvb_get_guint32(tvb, *tvb_offset_previous + 2, ENC_BIG_ENDIAN);
-		guint32 nanoseconds_previous = tvb_get_guint32(tvb, *tvb_offset_previous + 6, ENC_BIG_ENDIAN);
-		guint64 time_previous = ((guint64)seconds_previous * 1000000000) + nanoseconds_previous;
-		guint64 time_now = ((guint64)seconds * 1000000000) + nanoseconds;
-		guint64 time_diff = 0;
-		gchar time_difference_sign[2] = {'\0', '\0'};
+		uint32_t seconds_previous = tvb_get_uint32(tvb, *tvb_offset_previous + 2, ENC_BIG_ENDIAN);
+		uint32_t nanoseconds_previous = tvb_get_uint32(tvb, *tvb_offset_previous + 6, ENC_BIG_ENDIAN);
+		uint64_t time_previous = ((uint64_t)seconds_previous * 1000000000) + nanoseconds_previous;
+		uint64_t time_now = ((uint64_t)seconds * 1000000000) + nanoseconds;
+		uint64_t time_diff = 0;
+		char time_difference_sign[2] = {'\0', '\0'};
 		if (time_now > time_previous) {
 			time_diff = time_now - time_previous;
 			time_difference_sign[0] = '\0';
@@ -589,10 +589,10 @@ static void add_timestamp_sample(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_of
 	*tvb_offset += item_size;
 }
 
-static void add_timestamps_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset, int *hfs, guint hfs_size, proto_tree *tree) {
-	gint tvb_offset_previous = 0;
-	for (guint index_timestamp = 0; index_timestamp < hfs_size; index_timestamp++) {
-		gint tvb_offset_saved = *tvb_offset;
+static void add_timestamps_set(tvbuff_t *tvb, packet_info *pinfo, int *tvb_offset, int *hfs, unsigned hfs_size, proto_tree *tree) {
+	int tvb_offset_previous = 0;
+	for (unsigned index_timestamp = 0; index_timestamp < hfs_size; index_timestamp++) {
+		int tvb_offset_saved = *tvb_offset;
 		add_timestamp_sample(tvb, pinfo, (index_timestamp == 0) ? NULL : &tvb_offset_previous, tvb_offset, hfs[index_timestamp], tree);
 		tvb_offset_previous = tvb_offset_saved;
 	}
@@ -748,14 +748,14 @@ static void add_timestamps_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offs
  *     Nanoseconds  4 bytes, unsigned
  */
 
-static gint ett_protocol_samples;
-static gint ett_samples_control;
-static gint ett_samples_sets;
-static gint ett_samples_sets_set;
-static gint ett_samples_rms;
-static gint ett_samples_rms_values;
-static gint ett_samples_timestamps;
-static gint ett_samples_timestamps_set;
+static int ett_protocol_samples;
+static int ett_samples_control;
+static int ett_samples_sets;
+static int ett_samples_sets_set;
+static int ett_samples_rms;
+static int ett_samples_rms_values;
+static int ett_samples_timestamps;
+static int ett_samples_timestamps_set;
 
 static expert_field ei_samples_im_version_invalid;
 
@@ -809,17 +809,17 @@ static int hf_samples_timestamps_sample_6;
 static int hf_samples_timestamps_sample_7;
 static int hf_samples_timestamps_sample_8;
 
-static int dissect_samples_im(gboolean im1, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_, int h_protocol_samples) {
+static int dissect_samples_im(bool im1, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_, int h_protocol_samples) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, im1 ? PROTOCOL_SHORTNAME_SAMPLES_IM1 : PROTOCOL_SHORTNAME_SAMPLES_IM2R0);
 	col_set_str(pinfo->cinfo, COL_INFO, im1 ? PROTOCOL_NAME_SAMPLES_IM1 : PROTOCOL_NAME_SAMPLES_IM2R0);
 
 	proto_item *samples_item = proto_tree_add_item(tree, h_protocol_samples, tvb, 0, -1, ENC_NA);
 	proto_tree *samples_item_subtree = proto_item_add_subtree(samples_item, ett_protocol_samples);
 
-	gint tvb_offset = 0;
+	int tvb_offset = 0;
 
 	/* Transport Delay */
-	gint item_size = 2;
+	int item_size = 2;
 	tvb_ensure_bytes_exist(tvb, tvb_offset, item_size);
 	proto_tree_add_item(samples_item_subtree, hf_samples_transport_delay, tvb, tvb_offset, item_size, ENC_BIG_ENDIAN);
 	tvb_offset += item_size;
@@ -831,10 +831,10 @@ static int dissect_samples_im(gboolean im1, tvbuff_t *tvb, packet_info *pinfo, p
 	tvb_offset += item_size;
 
 	/* Get Control */
-	guint8 control = tvb_get_guint8(tvb, tvb_offset);
-	gboolean isIM1 = ((control & MASK_SAMPLES_CONTROL_VERSION) == 0);
-	gboolean isIM2R0 = ((control & MASK_SAMPLES_CONTROL_VERSION) == MASK_SAMPLES_CONTROL_VERSION);
-	gboolean isCIM = ((control & MASK_SAMPLES_CONTROL_TYPE) == 0);
+	uint8_t control = tvb_get_uint8(tvb, tvb_offset);
+	bool isIM1 = ((control & MASK_SAMPLES_CONTROL_VERSION) == 0);
+	bool isIM2R0 = ((control & MASK_SAMPLES_CONTROL_VERSION) == MASK_SAMPLES_CONTROL_VERSION);
+	bool isCIM = ((control & MASK_SAMPLES_CONTROL_TYPE) == 0);
 
 	/* Control */
 	item_size = 1;
@@ -1039,7 +1039,7 @@ static int dissect_samples_im(gboolean im1, tvbuff_t *tvb, packet_info *pinfo, p
  * ########################################################################
  */
 
-static void samples_transport_delay(gchar *result, guint16 transport_delay) {
+static void samples_transport_delay(char *result, uint16_t transport_delay) {
 	snprintf(result, ITEM_LABEL_LENGTH, "%u ns", transport_delay * 10);
 }
 
@@ -1060,11 +1060,11 @@ static const value_string samples_control_version_vals[] = {
     {3, "IM2R0"},
     {0, NULL}};
 
-static void samples_sequence_number(gchar *result, guint8 sequence_number) {
+static void samples_sequence_number(char *result, uint8_t sequence_number) {
 	snprintf(result, ITEM_LABEL_LENGTH, "%u", sequence_number);
 }
 
-static void samples_temperature(gchar *result, gint16 temperature) {
+static void samples_temperature(char *result, int16_t temperature) {
 	snprintf(result, ITEM_LABEL_LENGTH, "%.2f C", (0.25f * temperature));
 }
 
@@ -1135,7 +1135,7 @@ static ei_register_info ei_samples_im1[] = {
 static int h_protocol_samples_im1 = -1;
 
 static int dissect_samples_im1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
-	return dissect_samples_im(TRUE, tvb, pinfo, tree, data, h_protocol_samples_im1);
+	return dissect_samples_im(true, tvb, pinfo, tree, data, h_protocol_samples_im1);
 }
 
 /*
@@ -1173,7 +1173,7 @@ static ei_register_info ei_samples_im2r0[] = {
 static int h_protocol_samples_im2r0 = -1;
 
 static int dissect_samples_im2r0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
-	return dissect_samples_im(FALSE, tvb, pinfo, tree, data, h_protocol_samples_im2r0);
+	return dissect_samples_im(false, tvb, pinfo, tree, data, h_protocol_samples_im2r0);
 }
 
 /*
@@ -1197,7 +1197,7 @@ static hf_register_info llc_registration[] = {
  * ########################################################################
  */
 
-static gint *protocol_subtree[] = {
+static int *protocol_subtree[] = {
     &ett_protocol_calibration,
     &ett_calibration_lines,
 
diff --git a/epan/dissectors/packet-log3gpp.c b/epan/dissectors/packet-log3gpp.c
index 5662d670c0..b389bd92b9 100644
--- a/epan/dissectors/packet-log3gpp.c
+++ b/epan/dissectors/packet-log3gpp.c
@@ -71,11 +71,11 @@ static const value_string direction_vals[] = {
     { 0,   NULL },
 };
 /* Pseudo header functions*/
-typedef gboolean (*pseudo_hdr_func_ptr_t) (char *, packet_info *pinfo, guint16, packet_direction_t);
+typedef bool (*pseudo_hdr_func_ptr_t) (char *, packet_info *pinfo, uint16_t, packet_direction_t);
 
-static gboolean lte_mac_pseudo_hdr(char *, packet_info *pinfo, guint16, packet_direction_t);
-static gboolean lte_rlc_pseudo_hdr(char *, packet_info *pinfo, guint16, packet_direction_t);
-static gboolean lte_pdcp_pseudo_hdr(char *, packet_info *pinfo, guint16, packet_direction_t);
+static bool lte_mac_pseudo_hdr(char *, packet_info *pinfo, uint16_t, packet_direction_t);
+static bool lte_rlc_pseudo_hdr(char *, packet_info *pinfo, uint16_t, packet_direction_t);
+static bool lte_pdcp_pseudo_hdr(char *, packet_info *pinfo, uint16_t, packet_direction_t);
 
 typedef struct
 {
@@ -237,8 +237,8 @@ update_dissector_name(const char* protocol_name, packet_direction_t direction, c
  * RNTI type (M): "NO_RNTI" or "P_RNTI" or "RA_RNTI" or "C_RNTI" or "SI_RNT" followed by rnti value in decimal format
  * subframe number (M): "SFN" followed by the subframe number in decimal format
  */
-static gboolean
-lte_mac_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_direction_t direction)
+static bool
+lte_mac_pseudo_hdr(char* option_str, packet_info* pinfo, uint16_t length, packet_direction_t direction)
 {
     struct mac_lte_info* p_mac_lte_info;
     char* par_opt_field;
@@ -354,8 +354,8 @@ lte_mac_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_
  * UM Sequence nb length (O): "SN_5b" or "SN_10b"
  */
 
-static gboolean
-lte_rlc_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_direction_t direction)
+static bool
+lte_rlc_pseudo_hdr(char* option_str, packet_info* pinfo, uint16_t length, packet_direction_t direction)
 {
     struct rlc_lte_info* p_rlc_lte_info;
     char* par_opt_field;
@@ -459,8 +459,8 @@ lte_rlc_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_
  * Plane: "SRB" or "DRB"
  * Sequence number length: "SN_7b" or "SN_12b"
  */
-static gboolean
-lte_pdcp_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length _U_, packet_direction_t direction)
+static bool
+lte_pdcp_pseudo_hdr(char* option_str, packet_info* pinfo, uint16_t length _U_, packet_direction_t direction)
 {
     struct pdcp_lte_info* p_pdcp_lte_info;
     char* par_opt_field;
@@ -538,20 +538,20 @@ dissect_log3gpp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data
 {
     proto_tree* prot3gpp_tree = NULL;
     proto_item* ti = NULL;
-    gint        offset = 0;
-    gint        protocol_name_start;
-    gint        protocol_name_length;
-    gint        protocol_option_start;
-    gint        protocol_option_length;
-    gint        timestamp_start;
-    gint        timestamp_length;
+    int         offset = 0;
+    int         protocol_name_start;
+    int         protocol_name_length;
+    int         protocol_option_start;
+    int         protocol_option_length;
+    int         timestamp_start;
+    int         timestamp_length;
     packet_direction_t      direction;
     tvbuff_t* next_tvb;
     dissector_handle_t protocol_handle = 0;
     int sub_dissector_result = 0;
     char* protocol_name;
     char* protocol_option;
-    gboolean is_hex_data;
+    bool is_hex_data;
 
     /* Clear Info */
     col_clear(pinfo->cinfo, COL_INFO);
@@ -585,7 +585,7 @@ dissect_log3gpp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data
     offset += protocol_name_length;
 
     /* Direction */
-    direction = (packet_direction_t)tvb_get_guint8(tvb, offset);
+    direction = (packet_direction_t)tvb_get_uint8(tvb, offset);
     if (prot3gpp_tree) {
         proto_tree_add_item(prot3gpp_tree, hf_log3gpp_direction, tvb, offset, 1, ENC_BIG_ENDIAN);
     }
@@ -689,15 +689,15 @@ dissect_log3gpp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data
 /******************************************************************************/
 void proto_reg_handoff_log3gpp(void)
 {
-    static gboolean init = FALSE;
+    static bool init = false;
 
-    if (init == FALSE)
+    if (init == false)
     {
         dissector_handle_t log3gpp_handle;
 
         log3gpp_handle = find_dissector("prot3gpp");
         dissector_add_uint("wtap_encap", WTAP_ENCAP_LOG_3GPP, log3gpp_handle);
-        init = TRUE;
+        init = true;
     }
     if (lte_rrc_prot_version == REL8)
     {
@@ -783,7 +783,7 @@ void proto_register_log3gpp(void)
         },
     };
 
-    static gint *ett[] =
+    static int *ett[] =
     {
         &ett_log3gpp
     };
@@ -803,7 +803,7 @@ void proto_register_log3gpp(void)
                                    "If they are present they should be listed here.",
                                    &lte_rrc_prot_version,
                                    lte_rrc_dissector_version,
-                                   FALSE);
+                                   false);
 
     prefs_register_enum_preference(log3gpp_module,
                                    "nas_eps_release_version",
@@ -812,7 +812,7 @@ void proto_register_log3gpp(void)
                                    "If they are present they should be listed here.",
                                    &nas_eps_prot_version,
                                    nas_eps_dissector_version,
-                                   FALSE);
+                                   false);
 
     /* Allow dissector to find be found by name. */
     register_dissector("prot3gpp", dissect_log3gpp, proto_log3gpp);
diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c
index 9ece2b4211..a0e01b7cd8 100644
--- a/epan/dissectors/packet-logcat-text.c
+++ b/epan/dissectors/packet-logcat-text.c
@@ -31,7 +31,7 @@ static int hf_logcat_text_priority;
 static int hf_logcat_text_tag;
 static int hf_logcat_text_log;
 
-static gint ett_logcat;
+static int ett_logcat;
 
 static expert_field ei_malformed_time;
 static expert_field ei_malformed_token;
@@ -44,7 +44,7 @@ static dissector_handle_t logcat_text_thread_handle;
 static dissector_handle_t logcat_text_threadtime_handle;
 static dissector_handle_t logcat_text_long_handle;
 
-static gint exported_pdu_tap = -1;
+static int exported_pdu_tap = -1;
 
 static GRegex *special_regex;
 static GRegex *brief_regex;
@@ -55,24 +55,24 @@ static GRegex *thread_regex;
 static GRegex *threadtime_regex;
 static GRegex *long_regex;
 
-static const gchar dissector_name[] = "Logcat Text";
+static const char dissector_name[] = "Logcat Text";
 
-typedef int (*tGETTER) (const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo);
+typedef int (*tGETTER) (const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo);
 
 typedef struct {
     GRegex **regex;
     const tGETTER *getters;
-    guint no_of_getters;
+    unsigned no_of_getters;
 } dissect_info_t;
 
 void proto_register_logcat_text(void);
 void proto_reg_handoff_logcat_text(void);
 
-static int get_priority(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo _U_) {
+static int get_priority(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo _U_) {
     int prio;
-    gchar *p = g_strstr_len(frame + start_offset, -1, token);
+    char *p = g_strstr_len(frame + start_offset, -1, token);
     int offset = (int)(p - frame);
 
     switch (*p) {
@@ -102,12 +102,12 @@ static int get_priority(const gchar *frame, const gchar *token, tvbuff_t *tvb,
     return offset + 1;
 }
 
-static int get_tag(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo) {
-    gchar *p = g_strstr_len(frame + start_offset, -1, token);
+static int get_tag(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo) {
+    char *p = g_strstr_len(frame + start_offset, -1, token);
     int offset = (int)(p - frame);
-    guint8 *src_addr = wmem_strdup(pinfo->pool, token);
-    gint tok_len = (gint)strlen(token);
+    uint8_t *src_addr = wmem_strdup(pinfo->pool, token);
+    int tok_len = (int)strlen(token);
 
     proto_tree_add_string(maintree, hf_logcat_text_tag, tvb, offset, tok_len,
             token);
@@ -116,29 +116,29 @@ static int get_tag(const gchar *frame, const gchar *token, tvbuff_t *tvb,
     return offset + tok_len;
 }
 
-static int get_ptid(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint header_field, gint start_offset) {
-    gchar *p = g_strstr_len(frame + start_offset, -1, token);
+static int get_ptid(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int header_field, int start_offset) {
+    char *p = g_strstr_len(frame + start_offset, -1, token);
     int offset = (int)(p - frame);
 
-    proto_tree_add_uint(maintree, header_field, tvb, offset, (gint)strlen(token),
-            (guint32)g_ascii_strtoull(token, NULL, 10));
+    proto_tree_add_uint(maintree, header_field, tvb, offset, (int)strlen(token),
+            (uint32_t)g_ascii_strtoull(token, NULL, 10));
     return offset + (int)strlen(token);
 }
 
-static int get_pid(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo _U_) {
+static int get_pid(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo _U_) {
     return get_ptid(frame, token, tvb, maintree, hf_logcat_text_pid, start_offset);
 }
 
-static int get_tid(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo _U_) {
+static int get_tid(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo _U_) {
     return get_ptid(frame, token, tvb, maintree, hf_logcat_text_tid, start_offset);
 }
 
-static int get_log(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo) {
-    gchar *p = g_strstr_len(frame + start_offset, -1, token);
+static int get_log(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo) {
+    char *p = g_strstr_len(frame + start_offset, -1, token);
     int offset = (int)(p - frame);
 
     proto_tree_add_string(maintree, hf_logcat_text_log, tvb, offset,
@@ -147,11 +147,11 @@ static int get_log(const gchar *frame, const gchar *token, tvbuff_t *tvb,
     return offset + (int)strlen(token);
 }
 
-static int get_time(const gchar *frame, const gchar *token, tvbuff_t *tvb,
-        proto_tree *maintree, gint start_offset, packet_info *pinfo) {
-    gint offset;
-    gchar *p;
-    gint ms;
+static int get_time(const char *frame, const char *token, tvbuff_t *tvb,
+        proto_tree *maintree, int start_offset, packet_info *pinfo) {
+    int offset;
+    char *p;
+    int ms;
     struct tm date;
     time_t seconds;
     nstime_t ts;
@@ -177,13 +177,13 @@ static int get_time(const gchar *frame, const gchar *token, tvbuff_t *tvb,
 
 static int dissect_logcat_text(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
         const dissect_info_t *dinfo) {
-    gchar **tokens;
-    guint i;
-    gchar *frame = tvb_get_string_enc(pinfo->pool, tvb, 0, tvb_captured_length(tvb),
+    char **tokens;
+    unsigned i;
+    char *frame = tvb_get_string_enc(pinfo->pool, tvb, 0, tvb_captured_length(tvb),
             ENC_UTF_8);
     proto_item *mainitem = proto_tree_add_item(tree, proto_logcat_text, tvb, 0, -1, ENC_NA);
     proto_tree *maintree = proto_item_add_subtree(mainitem, ett_logcat);
-    gint offset = 0;
+    int offset = 0;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, dissector_name);
 
@@ -355,7 +355,7 @@ void proto_register_logcat_text(void) {
             { &ei_malformed_token, { "logcat_text.malformed_token", PI_PROTOCOL, PI_ERROR, "Failed to decode one or more tokens", EXPFILL }},
     };
 
-    static gint *ett[] = { &ett_logcat};
+    static int *ett[] = { &ett_logcat};
 
     proto_logcat_text = proto_register_protocol("Android Logcat Text", dissector_name,
             "logcat_text");
diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c
index 2042009a3c..e54d179d38 100644
--- a/epan/dissectors/packet-logcat.c
+++ b/epan/dissectors/packet-logcat.c
@@ -35,14 +35,14 @@ static int hf_logcat_priority;
 static int hf_logcat_tag;
 static int hf_logcat_log;
 
-static gint ett_logcat;
-static gint ett_logcat_timestamp;
-static gint ett_logcat_log;
+static int ett_logcat;
+static int ett_logcat_timestamp;
+static int ett_logcat_log;
 
 static dissector_handle_t logcat_handle;
 static dissector_handle_t data_text_lines_handle;
 
-static gint exported_pdu_tap = -1;
+static int exported_pdu_tap = -1;
 
 static expert_field ei_invalid_payload_length;
 
@@ -64,9 +64,9 @@ const value_string priority_vals[] = {
 void proto_register_logcat(void);
 void proto_reg_handoff_logcat(void);
 
-static gint detect_version(tvbuff_t *tvb, gint offset) {
-    guint16         payload_length;
-    guint16         try_header_size;
+static int detect_version(tvbuff_t *tvb, int offset) {
+    uint16_t        payload_length;
+    uint16_t        try_header_size;
 
     payload_length  = tvb_get_letohs(tvb, offset);
     try_header_size = tvb_get_letohs(tvb, offset + 2);
@@ -83,17 +83,17 @@ static gint detect_version(tvbuff_t *tvb, gint offset) {
 static int
 dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    gint         offset = 0;
+    int          offset = 0;
     proto_tree  *maintree;
     proto_item  *mainitem;
     proto_tree  *subtree;
     proto_item  *subitem;
-    guint16      length;
-    guint16      check_length;
-    guint32      string_length;
-    gint         logger_version;
-    guint8      *log;
-    gchar       *c;
+    uint16_t     length;
+    uint16_t     check_length;
+    uint32_t     string_length;
+    int          logger_version;
+    uint8_t     *log;
+    char        *c;
     tvbuff_t    *next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Logcat");
@@ -262,7 +262,7 @@ proto_register_logcat(void)
         }
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_logcat,
         &ett_logcat_timestamp,
         &ett_logcat_log
diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c
index b879e3b064..4650a9b290 100644
--- a/epan/dissectors/packet-lon.c
+++ b/epan/dissectors/packet-lon.c
@@ -111,91 +111,91 @@ static const value_string nd_code_vs[]=
 	{0, NULL}
 };
 
-static gint hf_lon_ppdu;
-static gint hf_lon_ppdu_prio;
-static gint hf_lon_ppdu_alt;
-static gint hf_lon_ppdu_deltabl;
-static gint hf_lon_npdu;
-static gint hf_lon_npdu_version;
-static gint hf_lon_npdu_pdu_fmt;
-static gint hf_lon_npdu_addr_fmt;
-static gint hf_lon_npdu_dom_len;
-static gint hf_lon_addr_srcsub;
-static gint hf_lon_addr_srcnode;
-static gint hf_lon_addr_dstsub;
-static gint hf_lon_addr_dstgrp;
-static gint hf_lon_addr_dstnode;
-static gint hf_lon_addr_grp;
-static gint hf_lon_addr_grpmem;
-static gint hf_lon_addr_uid;
-static gint hf_lon_name;
-static gint hf_lon_domain;
-static gint hf_lon_tpdu;
-static gint hf_lon_auth;
-static gint hf_lon_tpdu_tpdu_type;
-static gint hf_lon_trans_no;
-static gint hf_lon_spdu;
-static gint hf_lon_spdu_spdu_type;
-static gint hf_lon_mlen;
-static gint hf_lon_mlist;
-static gint hf_lon_authpdu;
-static gint hf_lon_authpdu_fmt;
-static gint hf_lon_authpdu_authpdu_type;
-static gint hf_lon_nv_dir;
-static gint hf_lon_nv_selector;
-static gint hf_lon_app_code;
-static gint hf_lon_nm_code;
-static gint hf_lon_nd_code;
-static gint hf_lon_ff_code;
-static gint hf_lon_nv;
-static gint hf_lon_app;
-static gint hf_lon_nm;
-static gint hf_lon_nd;
-static gint hf_lon_ff;
-/* static gint hf_lon_checksum; */
-static gint proto_lon;
-
-
-static gint ett_lon;
-static gint ett_ppdu;
-static gint ett_npdu;
-static gint ett_tpdu;
-static gint ett_spdu;
-static gint ett_authpdu;
-static gint ett_apdu;
-static gint ett_nv;
-static gint ett_app;
-static gint ett_nm;
-static gint ett_nd;
-static gint ett_ff;
-
-static gint ett_address;
+static int hf_lon_ppdu;
+static int hf_lon_ppdu_prio;
+static int hf_lon_ppdu_alt;
+static int hf_lon_ppdu_deltabl;
+static int hf_lon_npdu;
+static int hf_lon_npdu_version;
+static int hf_lon_npdu_pdu_fmt;
+static int hf_lon_npdu_addr_fmt;
+static int hf_lon_npdu_dom_len;
+static int hf_lon_addr_srcsub;
+static int hf_lon_addr_srcnode;
+static int hf_lon_addr_dstsub;
+static int hf_lon_addr_dstgrp;
+static int hf_lon_addr_dstnode;
+static int hf_lon_addr_grp;
+static int hf_lon_addr_grpmem;
+static int hf_lon_addr_uid;
+static int hf_lon_name;
+static int hf_lon_domain;
+static int hf_lon_tpdu;
+static int hf_lon_auth;
+static int hf_lon_tpdu_tpdu_type;
+static int hf_lon_trans_no;
+static int hf_lon_spdu;
+static int hf_lon_spdu_spdu_type;
+static int hf_lon_mlen;
+static int hf_lon_mlist;
+static int hf_lon_authpdu;
+static int hf_lon_authpdu_fmt;
+static int hf_lon_authpdu_authpdu_type;
+static int hf_lon_nv_dir;
+static int hf_lon_nv_selector;
+static int hf_lon_app_code;
+static int hf_lon_nm_code;
+static int hf_lon_nd_code;
+static int hf_lon_ff_code;
+static int hf_lon_nv;
+static int hf_lon_app;
+static int hf_lon_nm;
+static int hf_lon_nd;
+static int hf_lon_ff;
+/* static int hf_lon_checksum; */
+static int proto_lon;
+
+
+static int ett_lon;
+static int ett_ppdu;
+static int ett_npdu;
+static int ett_tpdu;
+static int ett_spdu;
+static int ett_authpdu;
+static int ett_apdu;
+static int ett_nv;
+static int ett_app;
+static int ett_nm;
+static int ett_nd;
+static int ett_ff;
+
+static int ett_address;
 
 static expert_field ei_lon_tpdu_tpdu_type_unknown;
 static expert_field ei_lon_tpdu_spdu_type_unknown;
 static expert_field ei_lon_tpdu_authpdu_type_unknown;
 static expert_field ei_lon_tpdu_apdu_dest_type;
 
-static gint dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
-		gint offset);
+static int dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
+		int offset);
 
-static gint
+static int
 dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	gint offset = 0;
+	int offset = 0;
 
-	gint pdu_fmt, addr_fmt, dom_len, pdutype, length;
-	gint addr_a;
+	int pdu_fmt, addr_fmt, dom_len, pdutype, length;
+	int addr_a;
 
 	proto_tree *ti;
 	proto_tree *lon_tree;
-	gint npdu, type;
+	int npdu, type;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LON");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	npdu = tvb_get_guint8(tvb, 0);
-	type = tvb_get_guint8(tvb, 1);
+	npdu = tvb_get_uint8(tvb, 0);
+	type = tvb_get_uint8(tvb, 1);
 	type = (type&0x30)>>4;
 	col_add_fstr(pinfo->cinfo, COL_INFO,
 			     "%sDelta_BL: %i Type: %s",
@@ -228,9 +228,9 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_npdu,
 					ett_npdu, npdu_fields, ENC_BIG_ENDIAN);
 
-		pdu_fmt  = (tvb_get_guint8(tvb, offset) >> 4) & 0x03;
-		addr_fmt = (tvb_get_guint8(tvb, offset) >> 2) & 0x03;
-		dom_len  = tvb_get_guint8(tvb, offset) & 0x03;
+		pdu_fmt  = (tvb_get_uint8(tvb, offset) >> 4) & 0x03;
+		addr_fmt = (tvb_get_uint8(tvb, offset) >> 2) & 0x03;
+		dom_len  = tvb_get_uint8(tvb, offset) & 0x03;
 		offset++;
 	}
 	/* Address part */
@@ -251,7 +251,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		offset += 3;
 		break;
 	case 2: /* Unicast/Multicast */
-		addr_a = tvb_get_guint8(tvb, offset+1) >> 7;
+		addr_a = tvb_get_uint8(tvb, offset+1) >> 7;
 		if (addr_a) { /* Type 2a */
 			ti = proto_tree_add_subtree(lon_tree, tvb, offset, 4, ett_address, NULL, "Address type 2a (unicast)");
 			proto_tree_add_item(ti, hf_lon_addr_srcsub, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -314,7 +314,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_tpdu,
 					ett_tpdu, tpdu_fields, ENC_BIG_ENDIAN);
 
-		pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x07;
+		pdutype = (tvb_get_uint8(tvb, offset)>>4)& 0x07;
 		offset++;
 		switch(pdutype)
 		{
@@ -325,14 +325,14 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		case 2: /* ACK */
 			break;
 		case 4: /* REMINDER */
-			length = tvb_get_guint8(tvb, offset);
+			length = tvb_get_uint8(tvb, offset);
 			proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN);
 			offset++;
 			proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN);
 			offset += length;
 			break;
 		case 5: /* REM/MSG */
-			length = tvb_get_guint8(tvb, offset);
+			length = tvb_get_uint8(tvb, offset);
 			proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN);
 			offset++;
 			if (length > 0)
@@ -356,7 +356,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		};
 		proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_spdu,
 					ett_spdu, spdu_fields, ENC_BIG_ENDIAN);
-		pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x07;
+		pdutype = (tvb_get_uint8(tvb, offset)>>4)& 0x07;
 		offset++;
 		switch(pdutype)
 		{
@@ -367,14 +367,14 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 			offset += dissect_apdu(lon_tree, pinfo, tvb, offset);
 			break;
 		case 4: /* REMINDER */
-			length = tvb_get_guint8(tvb, offset);
+			length = tvb_get_uint8(tvb, offset);
 			proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN);
 			offset++;
 			proto_tree_add_item(lon_tree, hf_lon_mlist, tvb, offset, length, ENC_BIG_ENDIAN);
 			offset += length;
 			break;
 		case 5: /* REM/MSG */
-			length = tvb_get_guint8(tvb, offset);
+			length = tvb_get_uint8(tvb, offset);
 			proto_tree_add_item(lon_tree, hf_lon_mlen, tvb, offset, 1, ENC_BIG_ENDIAN);
 			offset++;
 			if (length > 0)
@@ -400,7 +400,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 		proto_tree_add_bitmask(lon_tree, tvb, offset, hf_lon_authpdu,
 					ett_authpdu, authpdu_fields, ENC_BIG_ENDIAN);
 
-		pdutype = (tvb_get_guint8(tvb, offset)>>4)& 0x03;
+		pdutype = (tvb_get_uint8(tvb, offset)>>4)& 0x03;
 		offset++;
 		switch(pdutype)
 		{
@@ -423,14 +423,14 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 	return offset;
 }
 
-static gint
+static int
 dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
-		gint offset)
+		int offset)
 {
 	tvbuff_t *next_tvb;
-	gint old_offset = offset, dest_type;
+	int old_offset = offset, dest_type;
 
-	dest_type = tvb_get_guint8(tvb, offset);
+	dest_type = tvb_get_uint8(tvb, offset);
 
 	if ((dest_type&0x80) == 0x80) { /* Network variable */
 		static int * const nv_fields[] = {
@@ -709,7 +709,7 @@ proto_register_lon(void)
 #endif
 	};
 
-	static gint *ett[] =
+	static int *ett[] =
 	{
 		&ett_lon,
 		&ett_address,
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index a2980a18c1..9a575263cb 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -37,7 +37,7 @@ static int hf_loop_relevant_function;
 static int hf_loop_receipt_number;
 static int hf_loop_forwarding_address;
 
-static gint ett_loop;
+static int ett_loop;
 
 #define FUNC_REPLY              1
 #define FUNC_FORWARD_DATA       2
@@ -53,11 +53,11 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 {
   proto_tree  *loop_tree = NULL;
   proto_item  *ti;
-  guint16     function;
+  uint16_t    function;
   int         offset = 0;
   int         skip_offset;
-  gboolean    set_info = TRUE;
-  gboolean    more_function;
+  bool        set_info = true;
+  bool        more_function;
   tvbuff_t    *next_tvb;
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "LOOP");
@@ -79,7 +79,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
                     val_to_str(function, function_vals, "Unknown function (%u)"));
 
       proto_tree_add_uint(loop_tree, hf_loop_relevant_function, tvb, offset, 2, function);
-      set_info = FALSE;
+      set_info = false;
     }
     proto_tree_add_uint(loop_tree, hf_loop_function, tvb, offset, 2, function);
     offset += 2;
@@ -89,18 +89,18 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
       proto_tree_add_item(loop_tree, hf_loop_receipt_number, tvb, offset, 2,
                             ENC_LITTLE_ENDIAN);
       offset += 2;
-      more_function = FALSE;
+      more_function = false;
       break;
 
     case FUNC_FORWARD_DATA:
       proto_tree_add_item(loop_tree, hf_loop_forwarding_address, tvb, offset,
                             6, ENC_NA);
       offset += 6;
-      more_function = TRUE;
+      more_function = true;
       break;
 
     default:
-      more_function = FALSE;
+      more_function = false;
       break;
     }
   } while (more_function);
@@ -146,7 +146,7 @@ proto_register_loop(void)
     FT_ETHER,   BASE_NONE,      NULL,   0x0,
       NULL, HFILL }},
   };
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_loop,
   };
 
diff --git a/epan/dissectors/packet-loratap.c b/epan/dissectors/packet-loratap.c
index 3e3e1315e0..400941f811 100644
--- a/epan/dissectors/packet-loratap.c
+++ b/epan/dissectors/packet-loratap.c
@@ -66,10 +66,10 @@ static int * const hfx_loratap_header_flags[] = {
 	NULL
 };
 
-static gint ett_loratap;
-static gint ett_loratap_flags;
-static gint ett_loratap_channel;
-static gint ett_loratap_rssi;
+static int ett_loratap;
+static int ett_loratap_flags;
+static int ett_loratap_channel;
+static int ett_loratap_rssi;
 
 static const value_string channel_bandwidth[] = {
 	{ 1, "125 kHz" },
@@ -101,7 +101,7 @@ static const value_string crc_state[] = {
 };
 
 static void
-rssi_base_custom(gchar *buffer, guint32 value)
+rssi_base_custom(char *buffer, uint32_t value)
 {
 	if (value == 255) {
 		snprintf(buffer, ITEM_LABEL_LENGTH, "N/A");
@@ -111,18 +111,18 @@ rssi_base_custom(gchar *buffer, guint32 value)
 }
 
 static void
-snr_base_custom(gchar *buffer, guint32 value)
+snr_base_custom(char *buffer, uint32_t value)
 {
-	snprintf(buffer, ITEM_LABEL_LENGTH, "%.1f dB", ((gint8)value) / 4.);
+	snprintf(buffer, ITEM_LABEL_LENGTH, "%.1f dB", ((int8_t)value) / 4.);
 }
 
 static void
-loratap_prompt(packet_info *pinfo, gchar* result)
+loratap_prompt(packet_info *pinfo, char* result)
 {
 	snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "LoRaTap syncword 0x%02x as", GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_loratap, 0)));
 }
 
-static gpointer
+static void *
 loratap_value(packet_info *pinfo)
 {
 	return p_get_proto_data(pinfo->pool, pinfo, proto_loratap, 0);
@@ -133,17 +133,17 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d
 {
 	proto_item *ti, *channel_item, *rssi_item;
 	proto_tree *loratap_tree, *channel_tree, *rssi_tree;
-	gint32 current_offset = 0;
-	gint32 header_v1_offset = 15;
-	guint16 length;
-	guint32 lt_length, lt_version;
-	gboolean try_dissect;
-	guint32 syncword;
+	int32_t current_offset = 0;
+	int32_t header_v1_offset = 15;
+	uint16_t length;
+	uint32_t lt_length, lt_version;
+	bool try_dissect;
+	uint32_t syncword;
 	tvbuff_t *next_tvb;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LoRaTap");
 	col_clear(pinfo->cinfo, COL_INFO);
-	length = tvb_get_guint16(tvb, 2, ENC_BIG_ENDIAN);
+	length = tvb_get_uint16(tvb, 2, ENC_BIG_ENDIAN);
 
 	ti = proto_tree_add_item(tree, proto_loratap, tvb, 0, length, ENC_NA);
 	loratap_tree = proto_item_add_subtree(ti, ett_loratap);
@@ -162,7 +162,7 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d
 		proto_tree_add_item(loratap_tree, hf_loratap_header_timestamp_type, tvb, header_v1_offset, 4, ENC_NA);
 		header_v1_offset += 4;
 		proto_tree_add_bitmask(loratap_tree, tvb, header_v1_offset, hf_loratap_header_flags_type, ett_loratap_flags, hfx_loratap_header_flags, ENC_NA);
-		try_dissect = (tvb_get_guint8(tvb, header_v1_offset) & 0x28); /* Only try the next dissector for CRC OK and No CRC packets with v1 encapsulation */
+		try_dissect = (tvb_get_uint8(tvb, header_v1_offset) & 0x28); /* Only try the next dissector for CRC OK and No CRC packets with v1 encapsulation */
 		header_v1_offset++;
 	} else {
 		try_dissect = true; /* Always try the next dissector for v0 encapsulation */
@@ -208,10 +208,10 @@ dissect_loratap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d
 	length = tvb_reported_length_remaining(tvb, lt_length);
 	proto_tree_add_bytes_format_value(loratap_tree, hf_loratap_header_payload_type, tvb, current_offset, length, NULL, "%d bytes", length);
 
-	p_add_proto_data(pinfo->pool, pinfo, proto_loratap, 0, GUINT_TO_POINTER((guint)syncword));
+	p_add_proto_data(pinfo->pool, pinfo, proto_loratap, 0, GUINT_TO_POINTER((unsigned)syncword));
 	next_tvb = tvb_new_subset_length(tvb, current_offset, length);
 
-	if (!try_dissect || !dissector_try_uint_new(loratap_dissector_table, syncword, next_tvb, pinfo, tree, TRUE, NULL)) {
+	if (!try_dissect || !dissector_try_uint_new(loratap_dissector_table, syncword, next_tvb, pinfo, tree, true, NULL)) {
 		call_data_dissector(next_tvb, pinfo, tree);
 	}
 
@@ -399,7 +399,7 @@ proto_register_loratap(void)
 	static decode_as_t loratap_da = {"loratap", "loratap.syncword", 1, 0, &loratap_da_values, NULL, NULL, decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_loratap,
 		&ett_loratap_flags,
 		&ett_loratap_channel,
diff --git a/epan/dissectors/packet-lorawan.c b/epan/dissectors/packet-lorawan.c
index d077155432..9b8742d067 100644
--- a/epan/dissectors/packet-lorawan.c
+++ b/epan/dissectors/packet-lorawan.c
@@ -180,22 +180,22 @@ static int * const hfx_lorawan_join_accept_dlsettings[] = {
 	NULL
 };
 
-static gint ett_lorawan;
-static gint ett_lorawan_mac_header;
-static gint ett_lorawan_mac_commands;
-static gint ett_lorawan_mac_command;
-static gint ett_lorawan_mac_command_link_check_ans;
-static gint ett_lorawan_mac_command_link_adr_req_channel;
-static gint ett_lorawan_mac_command_rx_setup_ans;
-static gint ett_lorawan_mac_command_new_channel_ans;
-static gint ett_lorawan_join_request;
-static gint ett_lorawan_join_accept;
-static gint ett_lorawan_join_accept_dlsettings;
-static gint ett_lorawan_frame_header;
-static gint ett_lorawan_frame_header_control;
-static gint ett_lorawan_frame_payload_decrypted;
-static gint ett_lorawan_beacon;
-static gint ett_lorawan_beacon_gwspecific;
+static int ett_lorawan;
+static int ett_lorawan_mac_header;
+static int ett_lorawan_mac_commands;
+static int ett_lorawan_mac_command;
+static int ett_lorawan_mac_command_link_check_ans;
+static int ett_lorawan_mac_command_link_adr_req_channel;
+static int ett_lorawan_mac_command_rx_setup_ans;
+static int ett_lorawan_mac_command_new_channel_ans;
+static int ett_lorawan_join_request;
+static int ett_lorawan_join_accept;
+static int ett_lorawan_join_accept_dlsettings;
+static int ett_lorawan_frame_header;
+static int ett_lorawan_frame_header_control;
+static int ett_lorawan_frame_payload_decrypted;
+static int ett_lorawan_beacon;
+static int ett_lorawan_beacon_gwspecific;
 
 #define LORAWAN_MAC_FTYPE_MASK						0xE0
 #define LORAWAN_MAC_FTYPE(ftype)					(((ftype) & LORAWAN_MAC_FTYPE_MASK) >> 5)
@@ -354,31 +354,31 @@ static const value_string lorawan_mac_downlink_commandnames[] = {
 
 
 typedef struct _root_keys_t {
-	gchar		*deveui_string;
-	gchar		*appkey_string;
+	char		*deveui_string;
+	char		*appkey_string;
 	GByteArray	*deveui;
 	GByteArray	*appkey;
 } root_key_t;
 
 typedef struct _session_keys_t {
-	gchar		*dev_addr_string;
-	gchar		*nwkskey_string;
-	gchar		*appskey_string;
-	guint32		dev_addr;
+	char		*dev_addr_string;
+	char		*nwkskey_string;
+	char		*appskey_string;
+	uint32_t		dev_addr;
 	GByteArray	*nwkskey;
 	GByteArray	*appskey;
 } session_key_t;
 
 static root_key_t *root_keys;
 static session_key_t *session_keys;
-static guint root_num_keys;
-static guint session_num_keys;
+static unsigned root_num_keys;
+static unsigned session_num_keys;
 
 static void
 byte_array_reverse(GByteArray *arr)
 {
-	for (guint i = 0; i < arr->len / 2; i++) {
-		gint8 b = arr->data[i];
+	for (unsigned i = 0; i < arr->len / 2; i++) {
+		int8_t b = arr->data[i];
 		arr->data[i] = arr->data[(arr->len - 1) - i];
 		arr->data[(arr->len - 1) - i] = b;
 	}
@@ -391,39 +391,39 @@ root_keys_update_cb(void *r, char **err)
 
 	if (rec->deveui_string == NULL) {
 		*err = g_strdup("End-device identifier can't be empty");
-		return FALSE;
+		return false;
 	}
 	if (!rec->deveui) {
 		rec->deveui = g_byte_array_new();
 	}
-	if (!hex_str_to_bytes(rec->deveui_string, rec->deveui, FALSE)) {
+	if (!hex_str_to_bytes(rec->deveui_string, rec->deveui, false)) {
 		*err = g_strdup("End-device identifier must be hexadecimal");
-		return FALSE;
+		return false;
 	}
 	if (rec->deveui->len != 8) {
 		*err = g_strdup("End-device identifier must be 8 bytes hexadecimal");
-		return FALSE;
+		return false;
 	}
 	byte_array_reverse(rec->deveui);
 
 	if (rec->appkey_string == NULL) {
 		*err = g_strdup("Application key can't be empty");
-		return FALSE;
+		return false;
 	}
 	if (!rec->appkey) {
 		rec->appkey = g_byte_array_new();
 	}
-	if (!hex_str_to_bytes(rec->appkey_string, rec->appkey, FALSE)) {
+	if (!hex_str_to_bytes(rec->appkey_string, rec->appkey, false)) {
 		*err = g_strdup("Application key must be hexadecimal");
-		return FALSE;
+		return false;
 	}
 	if (rec->appkey->len != 16) {
 		*err = g_strdup("Application key must be 16 bytes hexadecimal");
-		return FALSE;
+		return false;
 	}
 
 	*err = NULL;
-	return TRUE;
+	return true;
 }
 
 static void *
@@ -435,7 +435,7 @@ root_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 	if (old_rec->deveui_string) {
 		new_rec->deveui_string = g_strdup(old_rec->deveui_string);
 		new_rec->deveui = g_byte_array_new();
-		hex_str_to_bytes(new_rec->deveui_string, new_rec->deveui, FALSE);
+		hex_str_to_bytes(new_rec->deveui_string, new_rec->deveui, false);
 		byte_array_reverse(new_rec->deveui);
 	} else {
 		new_rec->deveui_string = NULL;
@@ -445,7 +445,7 @@ root_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 	if (old_rec->appkey_string) {
 		new_rec->appkey_string = g_strdup(old_rec->appkey_string);
 		new_rec->appkey = g_byte_array_new();
-		hex_str_to_bytes(new_rec->appkey_string, new_rec->appkey, FALSE);
+		hex_str_to_bytes(new_rec->appkey_string, new_rec->appkey, false);
 	}
 	else {
 		new_rec->appkey_string = NULL;
@@ -461,9 +461,9 @@ root_keys_free_cb(void *r)
 	root_key_t *rec = (root_key_t*)r;
 
 	g_free(rec->deveui_string);
-	g_byte_array_free(rec->deveui, TRUE);
+	g_byte_array_free(rec->deveui, true);
 	g_free(rec->appkey_string);
-	g_byte_array_free(rec->appkey, TRUE);
+	g_byte_array_free(rec->appkey, true);
 }
 
 static bool
@@ -473,57 +473,57 @@ session_keys_update_cb(void *r, char **err)
 
 	if (rec->dev_addr_string == NULL) {
 		*err = g_strdup("Device address can't be empty");
-		return FALSE;
+		return false;
 	}
 	GByteArray *addr = g_byte_array_new();
-	if (!hex_str_to_bytes(rec->dev_addr_string, addr, FALSE)) {
-		g_byte_array_free(addr, TRUE);
+	if (!hex_str_to_bytes(rec->dev_addr_string, addr, false)) {
+		g_byte_array_free(addr, true);
 		*err = g_strdup("Device address must be hexadecimal");
-		return FALSE;
+		return false;
 	}
 	if (addr->len != 4) {
-		g_byte_array_free(addr, TRUE);
+		g_byte_array_free(addr, true);
 		*err = g_strdup("Device address must be 4 bytes hexadecimal");
-		return FALSE;
+		return false;
 	}
 	byte_array_reverse(addr);
 	memcpy(&rec->dev_addr, addr->data, sizeof(rec->dev_addr));
-	g_byte_array_free(addr, TRUE);
+	g_byte_array_free(addr, true);
 
 	if (rec->nwkskey_string == NULL) {
 		*err = g_strdup("Network session key can't be empty");
-		return FALSE;
+		return false;
 	}
 	if (!rec->nwkskey) {
 		rec->nwkskey = g_byte_array_new();
 	}
-	if (!hex_str_to_bytes(rec->nwkskey_string, rec->nwkskey, FALSE)) {
+	if (!hex_str_to_bytes(rec->nwkskey_string, rec->nwkskey, false)) {
 		*err = g_strdup("Network session key must be hexadecimal");
-		return FALSE;
+		return false;
 	}
 	if (rec->nwkskey->len != 16) {
 		*err = g_strdup("Network session key must be 16 bytes hexadecimal");
-		return FALSE;
+		return false;
 	}
 
 	if (rec->appskey_string == NULL) {
 		*err = g_strdup("Application session key can't be empty");
-		return FALSE;
+		return false;
 	}
 	if (!rec->appskey) {
 		rec->appskey = g_byte_array_new();
 	}
-	if (!hex_str_to_bytes(rec->appskey_string, rec->appskey, FALSE)) {
+	if (!hex_str_to_bytes(rec->appskey_string, rec->appskey, false)) {
 		*err = g_strdup("Application session key must be hexadecimal");
-		return FALSE;
+		return false;
 	}
 	if (rec->appskey->len != 16) {
 		*err = g_strdup("Application session key must be 16 bytes hexadecimal");
-		return FALSE;
+		return false;
 	}
 
 	*err = NULL;
-	return TRUE;
+	return true;
 }
 
 static void *
@@ -535,7 +535,7 @@ session_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 	if (old_rec->dev_addr_string) {
 		new_rec->dev_addr_string = g_strdup(old_rec->dev_addr_string);
 		GByteArray *addr = g_byte_array_new();
-		if (hex_str_to_bytes(new_rec->dev_addr_string, addr, FALSE)) {
+		if (hex_str_to_bytes(new_rec->dev_addr_string, addr, false)) {
 			if (addr->len == 4) {
 				byte_array_reverse(addr);
 				memcpy(&new_rec->dev_addr, addr->data, sizeof(new_rec->dev_addr));
@@ -543,7 +543,7 @@ session_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 				new_rec->dev_addr = 0;
 			}
 		}
-		g_byte_array_free(addr, TRUE);
+		g_byte_array_free(addr, true);
 	} else {
 		new_rec->dev_addr_string = NULL;
 		new_rec->dev_addr = 0;
@@ -552,7 +552,7 @@ session_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 	if (old_rec->nwkskey_string) {
 		new_rec->nwkskey_string = g_strdup(old_rec->nwkskey_string);
 		new_rec->nwkskey = g_byte_array_new();
-		hex_str_to_bytes(new_rec->nwkskey_string, new_rec->nwkskey, FALSE);
+		hex_str_to_bytes(new_rec->nwkskey_string, new_rec->nwkskey, false);
 	} else {
 		new_rec->nwkskey_string = NULL;
 		new_rec->nwkskey = NULL;
@@ -561,7 +561,7 @@ session_keys_copy_cb(void *n, const void *o, size_t siz _U_)
 	if (old_rec->appskey_string) {
 		new_rec->appskey_string = g_strdup(old_rec->appskey_string);
 		new_rec->appskey = g_byte_array_new();
-		hex_str_to_bytes(new_rec->appskey_string, new_rec->appskey, FALSE);
+		hex_str_to_bytes(new_rec->appskey_string, new_rec->appskey, false);
 	} else {
 		new_rec->appskey_string = NULL;
 		new_rec->appskey = NULL;
@@ -577,9 +577,9 @@ session_keys_free_cb(void *r)
 
 	g_free(rec->dev_addr_string);
 	g_free(rec->nwkskey_string);
-	g_byte_array_free(rec->nwkskey, TRUE);
+	g_byte_array_free(rec->nwkskey, true);
 	g_free(rec->appskey_string);
-	g_byte_array_free(rec->appskey, TRUE);
+	g_byte_array_free(rec->appskey, true);
 }
 
 UAT_CSTRING_CB_DEF(root_keys, deveui_string, root_key_t)
@@ -589,9 +589,9 @@ UAT_CSTRING_CB_DEF(session_keys, nwkskey_string, session_key_t)
 UAT_CSTRING_CB_DEF(session_keys, appskey_string, session_key_t)
 
 static session_key_t *
-get_session_key(guint32 dev_addr)
+get_session_key(uint32_t dev_addr)
 {
-	guint i;
+	unsigned i;
 	for (i = 0; i < session_num_keys; i++) {
 		if (session_keys[i].dev_addr == dev_addr) {
 			return &session_keys[i];
@@ -601,9 +601,9 @@ get_session_key(guint32 dev_addr)
 }
 
 static root_key_t *
-get_root_key(const guint8 *deveui)
+get_root_key(const uint8_t *deveui)
 {
-	guint i;
+	unsigned i;
 	for (i = 0; i < root_num_keys; i++) {
 		if (root_keys[i].deveui != NULL && memcmp(root_keys[i].deveui->data, deveui, 8) == 0) {
 			return &root_keys[i];
@@ -612,15 +612,15 @@ get_root_key(const guint8 *deveui)
 	return NULL;
 }
 
-static guint32
-calculate_mic(const guint8 *in, guint8 length, const guint8 *key)
+static uint32_t
+calculate_mic(const uint8_t *in, uint8_t length, const uint8_t *key)
 {
 	/*
 	 * cmac = aes128_cmac(key, in)
 	 * MIC = cmac[0..3]
 	 */
 	gcry_mac_hd_t mac_hd;
-	guint32 mac;
+	uint32_t mac;
 	size_t read_digest_length = 4;
 
 	if (gcry_mac_open(&mac_hd, GCRY_MAC_CMAC_AES, 0, NULL)) {
@@ -646,10 +646,10 @@ calculate_mic(const guint8 *in, guint8 length, const guint8 *key)
 }
 
 static nstime_t
-gps_to_utctime(const guint32 gpstime)
+gps_to_utctime(const uint32_t gpstime)
 {
 	nstime_t utctime;
-	utctime.secs = (guint64)gpstime;
+	utctime.secs = (uint64_t)gpstime;
 	utctime.secs += 315964800; /* difference between Unix epoch and GPS epoch */
 	utctime.secs -= 18; /* leap seconds valid after 2017-01-01 */
 	utctime.nsecs = 0;
@@ -657,82 +657,82 @@ gps_to_utctime(const guint32 gpstime)
 }
 
 static void
-cf_coords_lat_custom(gchar *buffer, guint32 value)
+cf_coords_lat_custom(char *buffer, uint32_t value)
 {
-	gint32 coord_int = (value < 0x00800000) ? ((gint32)value) : ((gint32)value - 0x01000000);
-	gdouble coord_double = coord_int * 90. / 0x00800000;
+	int32_t coord_int = (value < 0x00800000) ? ((int32_t)value) : ((int32_t)value - 0x01000000);
+	double coord_double = coord_int * 90. / 0x00800000;
 
 	snprintf(buffer, ITEM_LABEL_LENGTH, "%.5f%c", fabs(coord_double), (coord_double >= 0) ? 'N' : 'S');
 }
 
 static void
-cf_coords_lng_custom(gchar *buffer, guint32 value)
+cf_coords_lng_custom(char *buffer, uint32_t value)
 {
-	gint32 coord_int = (value < 0x00800000) ? ((gint32)value) : ((gint32)value - 0x01000000);
-	gdouble coord_double = coord_int * 180. / 0x00800000;
+	int32_t coord_int = (value < 0x00800000) ? ((int32_t)value) : ((int32_t)value - 0x01000000);
+	double coord_double = coord_int * 180. / 0x00800000;
 
 	snprintf(buffer, ITEM_LABEL_LENGTH, "%.5f%c", fabs(coord_double), (coord_double >= 0) ? 'E' : 'W');
 }
 
-static gboolean
-aes128_lorawan_encrypt(const guint8 *key, const guint8 *data_in, guint8 *data_out, gint length)
+static bool
+aes128_lorawan_encrypt(const uint8_t *key, const uint8_t *data_in, uint8_t *data_out, int length)
 {
 	gcry_cipher_hd_t cipher;
 	if (gcry_cipher_open(&cipher, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_ECB, 0)) {
-		return FALSE;
+		return false;
 	}
 	if (gcry_cipher_setkey(cipher, key, LORAWAN_AES_BLOCK_LENGTH)) {
 		gcry_cipher_close(cipher);
-		return FALSE;
+		return false;
 	}
 	if (gcry_cipher_encrypt(cipher, data_out, length, data_in, length)) {
 		gcry_cipher_close(cipher);
-		return FALSE;
+		return false;
 	}
 	gcry_cipher_close(cipher);
-	return TRUE;
+	return true;
 }
 
 /* length should be a multiple of 16, in should be padded to get to a multiple of 16 */
-static gboolean
-decrypt_lorawan_frame_payload(const guint8 *in, gint length, guint8 *out, const guint8 * key, guint8 dir, guint32 dev_addr, guint32 fcnt)
+static bool
+decrypt_lorawan_frame_payload(const uint8_t *in, int length, uint8_t *out, const uint8_t * key, uint8_t dir, uint32_t dev_addr, uint32_t fcnt)
 {
 	gcry_cipher_hd_t cipher;
-	guint8 iv[LORAWAN_AES_BLOCK_LENGTH] = {0x01, 0x00, 0x00, 0x00, 0x00, dir, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+	uint8_t iv[LORAWAN_AES_BLOCK_LENGTH] = {0x01, 0x00, 0x00, 0x00, 0x00, dir, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
 	memcpy(iv + 6, &dev_addr, 4);
 	memcpy(iv + 10, &fcnt, 4);
 	if (gcry_cipher_open(&cipher, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CTR, 0)) {
-		return FALSE;
+		return false;
 	}
 	if (gcry_cipher_setkey(cipher, key, LORAWAN_AES_BLOCK_LENGTH)) {
 		gcry_cipher_close(cipher);
-		return FALSE;
+		return false;
 	}
 	if (gcry_cipher_setctr(cipher, iv, 16)) {
 		gcry_cipher_close(cipher);
-		return FALSE;
+		return false;
 	}
 	if (gcry_cipher_encrypt(cipher, out, length, in, length)) {
 		gcry_cipher_close(cipher);
-		return FALSE;
+		return false;
 	}
 	gcry_cipher_close(cipher);
-	return TRUE;
+	return true;
 }
 
 static int
-dissect_lorawan_mac_commands(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, gboolean uplink)
+dissect_lorawan_mac_commands(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, bool uplink)
 {
 	proto_item *ti, *tf;
 	proto_tree *mac_command_tree, *field_tree;
-	guint8 command;
-	gint32 current_offset = 0;
+	uint8_t command;
+	int32_t current_offset = 0;
 
 	ti = proto_tree_add_item(tree, hf_lorawan_mac_commands_type, tvb, 0, -1, ENC_NA);
 	mac_command_tree = proto_item_add_subtree(ti, ett_lorawan_mac_commands);
 
 	do {
-		command = tvb_get_guint8(tvb, current_offset);
+		command = tvb_get_uint8(tvb, current_offset);
 		if (uplink) {
 			tf = proto_tree_add_item(mac_command_tree, hf_lorawan_mac_command_uplink_type, tvb, current_offset, 1, ENC_NA);
 			current_offset++;
@@ -898,9 +898,9 @@ dissect_lorawan_beacon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _
 {
 	proto_item *ti;
 	proto_tree *gwspecific_tree;
-	gint32 current_offset = 0;
-	guint length = tvb_reported_length(tvb);
-	guint16 calc_crc1, calc_crc2;
+	int32_t current_offset = 0;
+	unsigned length = tvb_reported_length(tvb);
+	uint16_t calc_crc1, calc_crc2;
 	nstime_t utctime;
 
 	proto_tree_add_string(tree, hf_lorawan_msgtype_type, tvb, current_offset, 0, val_to_str_const(LORAWAN_MAC_BEACON, lorawan_ftypenames, "RFU"));
@@ -916,7 +916,7 @@ dissect_lorawan_beacon(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _
 		proto_tree_add_item(tree, hf_lorawan_beacon_rfu1_type, tvb, current_offset, 3, ENC_NA);
 		current_offset += 3;
 	}
-	utctime = gps_to_utctime(tvb_get_guint32(tvb, current_offset, ENC_LITTLE_ENDIAN));
+	utctime = gps_to_utctime(tvb_get_uint32(tvb, current_offset, ENC_LITTLE_ENDIAN));
 	proto_tree_add_time(tree, hf_lorawan_beacon_time_type, tvb, current_offset, 4, &utctime);
 	current_offset += 4;
 	proto_tree_add_checksum(tree, tvb, current_offset, hf_lorawan_beacon_crc1_type, hf_lorawan_beacon_crc1_status_type, NULL, pinfo, calc_crc1, ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
@@ -945,7 +945,7 @@ dissect_lorawan_join_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
 {
 	proto_item *tf;
 	proto_tree *field_tree;
-	gint32 current_offset = 1;
+	int32_t current_offset = 1;
 
 	tf = proto_tree_add_item(tree, hf_lorawan_join_request_type, tvb, current_offset, 18, ENC_NA);
 	field_tree = proto_item_add_subtree(tf, ett_lorawan_join_request);
@@ -978,10 +978,10 @@ dissect_lorawan_join_accept(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
 {
 	proto_item *tf;
 	proto_tree *field_tree;
-	gint32 current_offset = 1;
+	int32_t current_offset = 1;
 	root_key_t *root_key = NULL;
 
-	gint length = tvb_captured_length_remaining(tvb, current_offset);
+	int length = tvb_captured_length_remaining(tvb, current_offset);
 	tf = proto_tree_add_item(tree, hf_lorawan_join_accept_type, tvb, current_offset, 12, ENC_NA);
 	field_tree = proto_item_add_subtree(tf, ett_lorawan_join_accept);
 
@@ -993,12 +993,12 @@ dissect_lorawan_join_accept(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
 	}
 
 	/* Iterate through all available root keys for Join-Accept */
-	guint8 *decrypted_buffer = (guint8 *)wmem_alloc0(pinfo->pool, length);
-	guint8 *mic_buffer = (guint8 *)wmem_alloc0(pinfo->pool, length - 4 + 1);
-	guint32 mic_check;
-	for (guint key_idx = 0; key_idx < root_num_keys; key_idx++) {
+	uint8_t *decrypted_buffer = (uint8_t *)wmem_alloc0(pinfo->pool, length);
+	uint8_t *mic_buffer = (uint8_t *)wmem_alloc0(pinfo->pool, length - 4 + 1);
+	uint32_t mic_check;
+	for (unsigned key_idx = 0; key_idx < root_num_keys; key_idx++) {
 		if (aes128_lorawan_encrypt(root_keys[key_idx].appkey->data, tvb_get_ptr(tvb, current_offset, length), decrypted_buffer, length)) {
-			mic_buffer[0] = tvb_get_guint8(tvb, current_offset - 1); // unencrypted MHDR
+			mic_buffer[0] = tvb_get_uint8(tvb, current_offset - 1); // unencrypted MHDR
 			memcpy(&mic_buffer[1], decrypted_buffer, length - 4); // decrypted Join-Accept
 			memcpy(&mic_check, &decrypted_buffer[length - 4], 4); // decrypted MIC
 
@@ -1041,24 +1041,24 @@ dissect_lorawan_join_accept(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
 }
 
 static int
-dissect_lorawan_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, gboolean uplink)
+dissect_lorawan_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, bool uplink)
 {
 	proto_item *ti = NULL, *tf;
 	proto_tree *field_tree;
-	gint32 current_offset = 1;
-	guint8 fopts_length = (tvb_get_guint8(tvb, current_offset + 4) & LORAWAN_FRAME_FOPTSLEN_MASK);
-	guint8 fport = 0;
+	int32_t current_offset = 1;
+	uint8_t fopts_length = (tvb_get_uint8(tvb, current_offset + 4) & LORAWAN_FRAME_FOPTSLEN_MASK);
+	uint8_t fport = 0;
 
 	/* Frame header */
 	tf = proto_tree_add_item(tree, hf_lorawan_frame_header_type, tvb, current_offset, 7 + fopts_length, ENC_NA);
 	field_tree = proto_item_add_subtree(tf, ett_lorawan_frame_header);
 	proto_tree_add_item(field_tree, hf_lorawan_frame_header_address_type, tvb, current_offset, 4, ENC_LITTLE_ENDIAN);
-	guint32 dev_address = tvb_get_guint32(tvb, current_offset, ENC_LITTLE_ENDIAN);
+	uint32_t dev_address = tvb_get_uint32(tvb, current_offset, ENC_LITTLE_ENDIAN);
 	current_offset += 4;
 	proto_tree_add_bitmask(field_tree, tvb, current_offset, hf_lorawan_frame_header_frame_control_type, ett_lorawan_frame_header_control, hfx_lorawan_frame_header_frame_control, ENC_NA);
 	current_offset++;
 	proto_tree_add_item(field_tree, hf_lorawan_frame_header_frame_counter_type, tvb, current_offset, 2, ENC_LITTLE_ENDIAN);
-	guint32 fcnt = tvb_get_guint16(tvb, current_offset, ENC_LITTLE_ENDIAN);
+	uint32_t fcnt = tvb_get_uint16(tvb, current_offset, ENC_LITTLE_ENDIAN);
 	current_offset += 2;
 
 	/*
@@ -1075,7 +1075,7 @@ dissect_lorawan_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_
 	if (tvb_captured_length_remaining(tvb, current_offset) > 4) {
 		/* FPort present */
 		proto_tree_add_item(tree, hf_lorawan_frame_fport_type, tvb, current_offset, 1, ENC_NA);
-		fport = tvb_get_guint8(tvb, current_offset);
+		fport = tvb_get_uint8(tvb, current_offset);
 		current_offset++;
 	}
 
@@ -1083,16 +1083,16 @@ dissect_lorawan_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_
 		/* TODO?: error, not allowed */
 	}
 
-	guint8 frmpayload_length = tvb_captured_length_remaining(tvb, current_offset) - 4;
+	uint8_t frmpayload_length = tvb_captured_length_remaining(tvb, current_offset) - 4;
 	if (frmpayload_length > 0) {
 		ti = proto_tree_add_item(tree, hf_lorawan_frame_payload_type, tvb, current_offset, frmpayload_length, ENC_NA);
 	}
 
 	session_key_t *session_key = get_session_key(dev_address);
 	if (session_key && frmpayload_length > 0) {
-		guint8 padded_length = LORAWAN_AES_PADDEDSIZE(frmpayload_length);
-		guint8 *decrypted_buffer = (guint8 *)wmem_alloc0(pinfo->pool, padded_length);
-		guint8 *encrypted_buffer = (guint8 *)wmem_alloc0(pinfo->pool, padded_length);
+		uint8_t padded_length = LORAWAN_AES_PADDEDSIZE(frmpayload_length);
+		uint8_t *decrypted_buffer = (uint8_t *)wmem_alloc0(pinfo->pool, padded_length);
+		uint8_t *encrypted_buffer = (uint8_t *)wmem_alloc0(pinfo->pool, padded_length);
 		tvb_memcpy(tvb, encrypted_buffer, current_offset, frmpayload_length);
 		if (decrypt_lorawan_frame_payload(encrypted_buffer, padded_length, decrypted_buffer, (fport == 0) ? session_key->nwkskey->data : session_key->appskey->data, !uplink, dev_address, fcnt)) {
 			tvbuff_t *next_tvb = tvb_new_child_real_data(tvb, decrypted_buffer, frmpayload_length, frmpayload_length);
@@ -1123,8 +1123,8 @@ dissect_lorawan_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_
 	 * B0 = 0x49 | 0x00 | 0x00 | 0x00 | 0x00 | dir | devAddr | fcntup/fcntdown | len(msg)
 	 */
 	if (session_key) {
-		gint frame_length = current_offset;
-		guint8 *msg = (guint8 *)wmem_alloc0(pinfo->pool, frame_length + 16);
+		int frame_length = current_offset;
+		uint8_t *msg = (uint8_t *)wmem_alloc0(pinfo->pool, frame_length + 16);
 		msg[0] = 0x49;
 		msg[5] = uplink ? 0 : 1;
 		memcpy(msg + 6, &dev_address, 4);
@@ -1146,7 +1146,7 @@ dissect_lorawan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d
 {
 	proto_item *ti, *tf;
 	proto_tree *lorawan_tree, *field_tree;
-	gint32 current_offset = 0;
+	int32_t current_offset = 0;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LoRaWAN");
 	col_clear(pinfo->cinfo,COL_INFO);
@@ -1156,22 +1156,22 @@ dissect_lorawan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d
 	/* Detect and dissect Class-B beacon frames
 	 * common mark: beacon is 17B or 19B long and begins with 2 bytes of zeroed RFU
 	 */
-	guint16 classb_rfu = tvb_get_guint16(tvb, current_offset, ENC_LITTLE_ENDIAN);
-	guint classb_length = tvb_reported_length(tvb);
+	uint16_t classb_rfu = tvb_get_uint16(tvb, current_offset, ENC_LITTLE_ENDIAN);
+	unsigned classb_length = tvb_reported_length(tvb);
 	if (classb_rfu == 0x0000 && (classb_length == 17 || classb_length == 19)) {
 		return dissect_lorawan_beacon(tvb, pinfo, lorawan_tree);
 	}
 
 	/* MAC header */
-	guint8 mac_ftype = LORAWAN_MAC_FTYPE(tvb_get_guint8(tvb, current_offset));
+	uint8_t mac_ftype = LORAWAN_MAC_FTYPE(tvb_get_uint8(tvb, current_offset));
 	proto_tree_add_string(lorawan_tree, hf_lorawan_msgtype_type, tvb, current_offset, 0, val_to_str_const(mac_ftype, lorawan_ftypenames, "RFU"));
 	tf = proto_tree_add_item(lorawan_tree, hf_lorawan_mac_header_type, tvb, current_offset, 1, ENC_NA);
 	proto_item_append_text(tf, " (Message Type: %s, Major Version: %s)",
 						   val_to_str_const(mac_ftype, lorawan_ftypenames, "RFU"),
-						   val_to_str_const(LORAWAN_MAC_MAJOR(tvb_get_guint8(tvb, current_offset)), lorawan_majornames, "RFU"));
+						   val_to_str_const(LORAWAN_MAC_MAJOR(tvb_get_uint8(tvb, current_offset)), lorawan_majornames, "RFU"));
 
 	/* Validate MHDR fields for LoRaWAN packet, do not dissect malformed packets */
-	if ((tvb_get_guint8(tvb, current_offset) & (LORAWAN_MAC_MAJOR_MASK | LORAWAN_MAC_RFU_MASK)) != LORAWAN_MAC_MAJOR_R1) {
+	if ((tvb_get_uint8(tvb, current_offset) & (LORAWAN_MAC_MAJOR_MASK | LORAWAN_MAC_RFU_MASK)) != LORAWAN_MAC_MAJOR_R1) {
 		expert_add_info(pinfo, lorawan_tree, &ei_lorawan_mhdr_error);
 		mac_ftype = LORAWAN_MAC_FTYPE_RFU;
 	}
@@ -1810,7 +1810,7 @@ proto_register_lorawan(void)
 	};
 
 	/* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lorawan,
 		&ett_lorawan_mac_header,
 		&ett_lorawan_mac_commands,
@@ -1868,7 +1868,7 @@ proto_register_lorawan(void)
 	uat_t *root_keys_uat = uat_new("LoRaWAN Root Keys",
 		sizeof(root_key_t),
 		"root_keys_lorawan",
-		TRUE,
+		true,
 		&root_keys,
 		&root_num_keys,
 		UAT_AFFECTS_DISSECTION | UAT_AFFECTS_FIELDS,
@@ -1883,7 +1883,7 @@ proto_register_lorawan(void)
 	uat_t *session_keys_uat = uat_new("LoRaWAN Session Keys",
 		sizeof(session_key_t),
 		"session_keys_lorawan",
-		TRUE,
+		true,
 		&session_keys,
 		&session_num_keys,
 		UAT_AFFECTS_DISSECTION | UAT_AFFECTS_FIELDS,
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index 2dd3cc1add..04aa14aba3 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -27,11 +27,11 @@ static int hf_lpd_client_code;
 static int hf_lpd_printer_option;
 static int hf_lpd_response_code;
 
-static gint ett_lpd;
+static int ett_lpd;
 
 enum lpr_type { request, response, unknown };
 
-static gint find_printer_string(tvbuff_t *tvb, int offset);
+static int find_printer_string(tvbuff_t *tvb, int offset);
 
 /* This information comes from the LPRng HOWTO, which also describes
 	RFC 1179. http://www.astart.com/lprng/LPRng-HOWTO.html */
@@ -61,14 +61,14 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 	proto_tree	*lpd_tree;
 	proto_item	*ti, *hidden_item;
 	enum lpr_type	lpr_packet_type;
-	guint8		code;
-	gint		printer_len;
+	uint8_t		code;
+	int		printer_len;
 
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD");
 	col_clear(pinfo->cinfo, COL_INFO);
 
 	/* rfc1179 states that all responses are 1 byte long */
-	code = tvb_get_guint8(tvb, 0);
+	code = tvb_get_uint8(tvb, 0);
 	if (tvb_reported_length(tvb) == 1) {
 		lpr_packet_type = response;
 	}
@@ -94,10 +94,10 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
 		if (lpr_packet_type == response) {
 		  hidden_item = proto_tree_add_boolean(lpd_tree, hf_lpd_response,
-		  				tvb, 0, 0, TRUE);
+						tvb, 0, 0, true);
 		} else {
 		  hidden_item = proto_tree_add_boolean(lpd_tree, hf_lpd_request,
-		  				tvb, 0, 0, TRUE);
+						tvb, 0, 0, true);
 		}
 		proto_item_set_hidden(hidden_item);
 
@@ -129,7 +129,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 }
 
 
-static gint
+static int
 find_printer_string(tvbuff_t *tvb, int offset)
 {
 	int	i;
@@ -151,12 +151,12 @@ proto_register_lpd(void)
 		{ &hf_lpd_response,
 		  { "Response",           "lpd.response",
 		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "TRUE if LPD response", HFILL }},
+		    "true if LPD response", HFILL }},
 
 		{ &hf_lpd_request,
 		  { "Request",            "lpd.request",
 		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "TRUE if LPD request", HFILL }},
+		    "true if LPD request", HFILL }},
 
 		{ &hf_lpd_client_code,
 		  { "Client code",            "lpd.client_code",
@@ -173,7 +173,7 @@ proto_register_lpd(void)
 		    FT_UINT8, BASE_DEC, VALS(lpd_server_code), 0x0,
 		    NULL, HFILL }},
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_lpd,
 	};
 
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 86d76f9f17..14244b074a 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -114,7 +114,7 @@ static int hf_lsc_scale_denom;
 static int hf_lsc_mode;
 
 /* Initialize the subtree pointers */
-static gint ett_lsc;
+static int ett_lsc;
 
 static dissector_handle_t lsc_udp_handle;
 static dissector_handle_t lsc_tcp_handle;
@@ -125,9 +125,9 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
 {
   proto_item *ti;
   proto_tree *lsc_tree;
-  guint8 op_code;
-  guint32 stream;
-  guint expected_len;
+  uint8_t op_code;
+  uint32_t stream;
+  unsigned expected_len;
 
   /* Too little data? */
   if (tvb_captured_length(tvb) < LSC_MIN_LEN)
@@ -138,7 +138,7 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
   col_clear(pinfo->cinfo, COL_INFO);
 
   /* Get the op code */
-  op_code = tvb_get_guint8(tvb, 2);
+  op_code = tvb_get_uint8(tvb, 2);
   /* And the stream handle */
   stream = tvb_get_ntohl(tvb, 4);
 
@@ -254,14 +254,14 @@ dissect_lsc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 }
 
 /* Determine length of LSC message */
-static guint
+static unsigned
 get_lsc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-  guint8 op_code;
-  guint pdu_len;
+  uint8_t op_code;
+  unsigned pdu_len;
 
   /* Get the op code */
-  op_code = tvb_get_guint8(tvb, offset + 2);
+  op_code = tvb_get_uint8(tvb, offset + 2);
 
   switch (op_code)
     {
@@ -305,7 +305,7 @@ get_lsc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U
 static int
 dissect_lsc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-  tcp_dissect_pdus(tvb, pinfo, tree, TRUE, LSC_OPCODE_LEN, get_lsc_pdu_len,
+  tcp_dissect_pdus(tvb, pinfo, tree, true, LSC_OPCODE_LEN, get_lsc_pdu_len,
                    dissect_lsc_common, data);
   return tvb_captured_length(tvb);
 }
@@ -374,7 +374,7 @@ proto_register_lsc(void)
   };
 
   /* Setup protocol subtree array */
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_lsc,
   };
 
diff --git a/epan/dissectors/packet-lsd.c b/epan/dissectors/packet-lsd.c
index 905e8d3824..ac4cfa4d40 100644
--- a/epan/dissectors/packet-lsd.c
+++ b/epan/dissectors/packet-lsd.c
@@ -31,22 +31,22 @@ static int hf_lsd_port;
 static int hf_lsd_infohash;
 static int hf_lsd_cookie;
 
-static gint ett_lsd;
+static int ett_lsd;
 
 static expert_field ei_lsd_field;
 
-static gboolean
+static bool
 parse_string_field(proto_tree *tree, int hf, packet_info *pinfo, tvbuff_t *tvb, int offset, int* next_offset, int* linelen)
 {
-  guint8 *str;
+  uint8_t *str;
   header_field_info* hf_info = proto_registrar_get_nth(hf);
-  gchar **field_and_value;
+  char **field_and_value;
   proto_item* ti;
-  gchar *p;
+  char *p;
 
-  *linelen = tvb_find_line_end(tvb, offset, -1, next_offset, FALSE);
+  *linelen = tvb_find_line_end(tvb, offset, -1, next_offset, false);
   if (*linelen < 0)
-    return FALSE;
+    return false;
 
   str = tvb_get_string_enc(pinfo->pool, tvb, offset, *linelen, ENC_ASCII);
   if (g_ascii_strncasecmp(str, hf_info->name, strlen(hf_info->name)) == 0)
@@ -57,13 +57,13 @@ parse_string_field(proto_tree *tree, int hf, packet_info *pinfo, tvbuff_t *tvb,
         while(g_ascii_isspace(*p))
           p++;
         proto_tree_add_string(tree, hf, tvb, offset, *linelen, p);
-        return TRUE;
+        return true;
       }
   }
   ti = proto_tree_add_string_format(tree, hf, tvb, offset, *linelen, str, "%s", str);
   expert_add_info_format(pinfo, ti, &ei_lsd_field, "%s field malformed", hf_info->name);
 
-  return TRUE;
+  return true;
 }
 
 static int
@@ -72,12 +72,12 @@ dissect_lsd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
   proto_item *ti = NULL;
   proto_tree *lsd_tree;
   int offset = 0, next_offset = 0, linelen;
-  guint8 *str;
-  gchar **field_and_value;
-  guint16 port;
-  gboolean valid;
+  uint8_t *str;
+  char **field_and_value;
+  uint16_t port;
+  bool valid;
 
-  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
   if (linelen < 0)
       return 0;
 
@@ -95,7 +95,7 @@ dissect_lsd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
       return offset+linelen;
 
   offset = next_offset;
-  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
   if (linelen < 0)
       return offset+linelen;
   str = tvb_get_string_enc(pinfo->pool, tvb, offset, linelen, ENC_ASCII);
@@ -121,7 +121,7 @@ dissect_lsd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
       return offset+linelen;
 
   offset = next_offset;
-  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+  linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, false);
   if (linelen < 0)
       return offset+linelen;
   /* Cookie is optional */
@@ -172,7 +172,7 @@ proto_register_lsd(void)
     },
   };
 
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_lsd,
   };
 
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c
index b569ba0780..6a223c1a0b 100644
--- a/epan/dissectors/packet-ltp.c
+++ b/epan/dissectors/packet-ltp.c
@@ -55,15 +55,15 @@ static dissector_handle_t ltp_handle;
 /// Unique session identifier
 typedef struct {
 	/// Session originator
-	guint64 orig_eng_id;
+	uint64_t orig_eng_id;
 	/// Session number
-	guint64 sess_num;
+	uint64_t sess_num;
 } ltp_session_id_t;
 
 /** Function to match the GHashFunc signature.
  */
-static guint
-ltp_session_id_hash(gconstpointer ptr)
+static unsigned
+ltp_session_id_hash(const void *ptr)
 {
 	const ltp_session_id_t *obj = ptr;
 	return (
@@ -75,7 +75,7 @@ ltp_session_id_hash(gconstpointer ptr)
 /** Function to match the GEqualFunc signature.
  */
 static gboolean
-ltp_session_id_equal(gconstpointer a, gconstpointer b)
+ltp_session_id_equal(const void *a, const void *b)
 {
 	const ltp_session_id_t *aobj = a;
 	const ltp_session_id_t *bobj = b;
@@ -86,8 +86,8 @@ ltp_session_id_equal(gconstpointer a, gconstpointer b)
 }
 
 /// Reassembly function
-static gpointer
-ltp_session_new_key(const packet_info *pinfo _U_, const guint32 id _U_,
+static void *
+ltp_session_new_key(const packet_info *pinfo _U_, const uint32_t id _U_,
 		const void *data)
 {
 	const ltp_session_id_t *obj = data;
@@ -96,19 +96,19 @@ ltp_session_new_key(const packet_info *pinfo _U_, const guint32 id _U_,
 	key->orig_eng_id = obj->orig_eng_id;
 	key->sess_num = obj->sess_num;
 
-	return (gpointer)key;
+	return (void *)key;
 }
 
 /// Reassembly function
 static void
-ltp_session_free_key(gpointer ptr)
+ltp_session_free_key(void *ptr)
 {
 	ltp_session_id_t *key = (ltp_session_id_t *)ptr;
 	g_slice_free(ltp_session_id_t, key);
 }
 
 typedef struct {
-	guint32 frame_num;
+	uint32_t frame_num;
 	nstime_t abs_ts;
 } ltp_frame_info_t;
 
@@ -123,8 +123,8 @@ ltp_frame_info_new(const packet_info *pinfo)
 
 /** Function to match the GCompareFunc signature.
  */
-static gint
-ltp_frame_info_find_pinfo(gconstpointer a, gconstpointer b)
+static int
+ltp_frame_info_find_pinfo(const void *a, const void *b)
 {
 	const ltp_frame_info_t *aobj = a;
 	const packet_info *bobj = b;
@@ -137,27 +137,27 @@ ltp_frame_info_find_pinfo(gconstpointer a, gconstpointer b)
 typedef struct {
 	/** Map from first-seen segment data ranges to data frame info (ltp_frame_info_t*) */
 	wmem_itree_t *data_segs;
-	/** Map from report ID (guint64) to tree (wmem_itree_t*) of
+	/** Map from report ID (uint64_t) to tree (wmem_itree_t*) of
 	 * first-seen segment data ranges to data frame info (ltp_frame_info_t*) */
 	wmem_map_t *rpt_segs;
 	/** Set after seeing EORP */
-	guint64 *red_size;
+	uint64_t *red_size;
 	/** Set after seeing EOB */
-	guint64 *block_size;
+	uint64_t *block_size;
 
-	/** Map from checkpoint ID (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from checkpoint ID (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *checkpoints;
-	/** Map from checkpoint ID (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from checkpoint ID (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *chkp_acks;
-	/** Map from report ID (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from report ID (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *reports;
-	/** Map from report ID (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from report ID (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *rpt_acks;
-	/** Map from report ID (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from report ID (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *rpt_datas;
-	/** Map from cancel segment type (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from cancel segment type (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *cancels;
-	/** Map from cancel segment type (guint64) to wmem_list_t of frame info (ltp_frame_info_t*) */
+	/** Map from cancel segment type (uint64_t) to wmem_list_t of frame info (ltp_frame_info_t*) */
 	wmem_map_t *cancel_acks;
 } ltp_session_data_t;
 
@@ -166,17 +166,17 @@ typedef struct {
 	/// Associated session context (optional)
 	ltp_session_data_t *session;
 	/// Segment type
-	guint8 seg_type;
+	uint8_t seg_type;
 	/// Session ID
 	ltp_session_id_t sess_id;
 	/// Text form of session name, scoped to file
 	const char *sess_name;
 	/// Full segment size
-	guint seg_size;
+	unsigned seg_size;
 	/// If non-zero, the size of the contained block
-	guint block_size;
+	unsigned block_size;
 	/// For red data segment or report, is this original
-	gboolean corr_orig;
+	bool corr_orig;
 } ltp_tap_info_t;
 
 /* For reassembling LTP segments */
@@ -361,21 +361,21 @@ static const val64_string client_service_id_info[] = {
 #define LTP_PORT    1113
 
 /* Initialize the subtree pointers */
-static gint ett_ltp;
-static gint ett_ltp_hdr;
-static gint ett_hdr_session;
-static gint ett_hdr_extn;
-static gint ett_frame_ref;
-static gint ett_data_segm;
-static gint ett_block;
-static gint ett_rpt_segm;
-static gint ett_rpt_clm;
-static gint ett_rpt_gap;
-static gint ett_rpt_ack_segm;
-static gint ett_session_mgmt;
-static gint ett_trl_extn;
-static gint ett_ltp_fragment;
-static gint ett_ltp_fragments;
+static int ett_ltp;
+static int ett_ltp_hdr;
+static int ett_hdr_session;
+static int ett_hdr_extn;
+static int ett_frame_ref;
+static int ett_data_segm;
+static int ett_block;
+static int ett_rpt_segm;
+static int ett_rpt_clm;
+static int ett_rpt_gap;
+static int ett_rpt_ack_segm;
+static int ett_session_mgmt;
+static int ett_trl_extn;
+static int ett_ltp_fragment;
+static int ett_ltp_fragments;
 
 static const fragment_items ltp_frag_items = {
 	/*Fragment subtrees*/
@@ -406,12 +406,12 @@ static const fragment_items ltp_frag_items = {
  * @param pinfo The source frame of the value.
  */
 static void
-ltp_ref_src(wmem_map_t *map, guint64 ref_num, const packet_info *pinfo)
+ltp_ref_src(wmem_map_t *map, uint64_t ref_num, const packet_info *pinfo)
 {
 	wmem_list_t *found = wmem_map_lookup(map, &ref_num);
 	if (!found)
 	{
-		guint64 *key = wmem_new(wmem_file_scope(), guint64);
+		uint64_t *key = wmem_new(wmem_file_scope(), uint64_t);
 		*key = ref_num;
 		found = wmem_list_new(wmem_file_scope());
 		wmem_map_insert(map, key, found);
@@ -436,7 +436,7 @@ ltp_ref_src(wmem_map_t *map, guint64 ref_num, const packet_info *pinfo)
  * be later in time than the referenced segment.
  */
 static void
-ltp_ref_use(wmem_map_t *map, guint64 ref_num, packet_info *pinfo, proto_tree *tree, int hf_ref, expert_field *ei_notfound, int hf_time, ltp_tap_info_t *tap)
+ltp_ref_use(wmem_map_t *map, uint64_t ref_num, packet_info *pinfo, proto_tree *tree, int hf_ref, expert_field *ei_notfound, int hf_time, ltp_tap_info_t *tap)
 {
 	const wmem_list_t *found = wmem_map_lookup(map, &ref_num);
 	if (!found)
@@ -485,7 +485,7 @@ ltp_ref_use(wmem_map_t *map, guint64 ref_num, packet_info *pinfo, proto_tree *tr
 }
 
 static proto_item *
-add_sdnv64_to_tree(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, int offset, int hf_sdnv, guint64 *retval, gint *lenretval)
+add_sdnv64_to_tree(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, int offset, int hf_sdnv, uint64_t *retval, int *lenretval)
 {
 	proto_item *ti;
 	ti = proto_tree_add_item_ret_varint(tree, hf_sdnv, tvb, offset, -1, ENC_VARINT_SDNV, retval, lenretval);
@@ -503,13 +503,13 @@ typedef struct {
 	/// Tree of the data segment
 	proto_tree *ltp_data_tree;
 	/// The first offset of this segment
-	guint64 data_fst;
+	uint64_t data_fst;
 	/// The last offset of this segment
-	guint64 data_lst;
+	uint64_t data_lst;
 } ltp_data_seg_info_t;
 
 static void
-ltp_data_seg_find_report(gpointer key _U_, gpointer value, gpointer user_data)
+ltp_data_seg_find_report(void *key _U_, void *value, void *user_data)
 {
 	wmem_itree_t *rpt_clms = value;
 	const ltp_data_seg_info_t *data_seg = user_data;
@@ -541,12 +541,12 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 {
 	ltp_session_data_t *session = tap->session;
 	int ltp_type = tap->seg_type;
-	guint64 client_id;
-	guint64 data_offset;
-	guint64 data_length;
-	guint64 chkp_sno = 0;
-	guint64 rpt_sno = 0;
-	guint64 sda_client_id = 0;
+	uint64_t client_id;
+	uint64_t data_offset;
+	uint64_t data_length;
+	uint64_t chkp_sno = 0;
+	uint64_t rpt_sno = 0;
+	uint64_t sda_client_id = 0;
 
 	unsigned segment_size = 0;
 
@@ -589,9 +589,9 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 	}
 	*data_len = (int) data_length;
 
-	const guint64 data_fst = data_offset;
-	const guint64 data_lst = data_offset + data_length - 1;
-	gboolean newdata = TRUE;
+	const uint64_t data_fst = data_offset;
+	const uint64_t data_lst = data_offset + data_length - 1;
+	bool newdata = true;
 	if (ltp_analyze_sequence && session)
 	{
 		if (data_fst <= data_lst)
@@ -669,24 +669,24 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 			ltp_ref_use(session->reports, rpt_sno, pinfo, proto_item_add_subtree(ti, ett_frame_ref), hf_ltp_data_rpt_ref, &ei_ltp_data_rptno_norpt, hf_ltp_data_rpt_time, tap);
 		}
 	}
-	const gboolean is_green = (ltp_type >= 4) && (ltp_type <= 7);
-	const gboolean is_eorp = (ltp_type == 2) || (ltp_type == 3);
-	const gboolean is_eob = (ltp_type == 3) || (ltp_type == 7);
+	const bool is_green = (ltp_type >= 4) && (ltp_type <= 7);
+	const bool is_eorp = (ltp_type == 2) || (ltp_type == 3);
+	const bool is_eob = (ltp_type == 3) || (ltp_type == 7);
 	if (session)
 	{
 		if ((is_green && (data_offset == 0)) && !(session->red_size))
 		{
-			session->red_size = wmem_new(wmem_file_scope(), guint64);
+			session->red_size = wmem_new(wmem_file_scope(), uint64_t);
 			*(session->red_size) = 0;
 		}
 		if (is_eorp && !(session->red_size))
 		{
-			session->red_size = wmem_new(wmem_file_scope(), guint64);
+			session->red_size = wmem_new(wmem_file_scope(), uint64_t);
 			*(session->red_size) = data_offset + data_length;
 		}
 		if (is_eob && !(session->block_size))
 		{
-			session->block_size = wmem_new(wmem_file_scope(), guint64);
+			session->block_size = wmem_new(wmem_file_scope(), uint64_t);
 			*(session->block_size) = data_offset + data_length;
 		}
 	}
@@ -702,7 +702,7 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 		frag_msg = fragment_add_check(
 			&ltp_reassembly_table,
 			tvb, frame_offset, pinfo, 0, &(tap->sess_id),
-			(guint32)data_offset, (guint32)data_length, !is_eob
+			(uint32_t)data_offset, (uint32_t)data_length, !is_eob
 		);
 	}
 	if(frag_msg)
@@ -726,7 +726,7 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 
 	if(new_tvb)
 	{
-		guint64 data_count = 0;
+		uint64_t data_count = 0;
 		int parse_length = tvb_reported_length(new_tvb);
 		int parse_offset = 0;
 		proto_tree *root_tree = proto_tree_get_parent_tree(ltp_tree);
@@ -738,13 +738,13 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 
 		if (session && session->red_size && session->block_size)
 		{
-			guint64 red_size = *(session->red_size);
-			guint64 green_size = *(session->block_size) - *(session->red_size);
+			uint64_t red_size = *(session->red_size);
+			uint64_t green_size = *(session->block_size) - *(session->red_size);
 			PROTO_ITEM_SET_GENERATED(
-				proto_tree_add_uint64(block_tree, hf_ltp_block_red_size, new_tvb, 0, (gint)red_size, red_size)
+				proto_tree_add_uint64(block_tree, hf_ltp_block_red_size, new_tvb, 0, (int)red_size, red_size)
 			);
 			PROTO_ITEM_SET_GENERATED(
-				proto_tree_add_uint64(block_tree, hf_ltp_block_green_size, new_tvb, (gint)red_size, (gint)green_size, green_size)
+				proto_tree_add_uint64(block_tree, hf_ltp_block_green_size, new_tvb, (int)red_size, (int)green_size, green_size)
 			);
 		}
 
@@ -799,9 +799,9 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int
 
 static void
 ltp_check_reception_gap(proto_tree *ltp_rpt_tree, packet_info *pinfo,
-		ltp_session_data_t *session, guint64 prec_lst, guint64 next_fst,
-		int *gap_count, guint64 *gap_total) {
-	const guint64 gap_len = next_fst - (prec_lst + 1);
+		ltp_session_data_t *session, uint64_t prec_lst, uint64_t next_fst,
+		int *gap_count, uint64_t *gap_total) {
+	const uint64_t gap_len = next_fst - (prec_lst + 1);
 	if (gap_len <= 0) {
 		return;
 	}
@@ -817,8 +817,8 @@ ltp_check_reception_gap(proto_tree *ltp_rpt_tree, packet_info *pinfo,
 	{
 		proto_tree *gap_tree = proto_item_add_subtree(gap_item, ett_rpt_gap);
 
-		const guint64 gap_fst = prec_lst + 1;
-		const guint64 gap_lst = next_fst - 1;
+		const uint64_t gap_fst = prec_lst + 1;
+		const uint64_t gap_lst = next_fst - 1;
 		PROTO_ITEM_SET_GENERATED(
 			proto_tree_add_uint64(gap_tree, hf_ltp_rpt_gap_fst, NULL, 0, 0, gap_fst)
 		);
@@ -846,14 +846,14 @@ ltp_check_reception_gap(proto_tree *ltp_rpt_tree, packet_info *pinfo,
 static int
 dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree, int frame_offset, ltp_tap_info_t *tap) {
 	ltp_session_data_t *session = tap->session;
-	gint64 rpt_sno;
-	gint64 chkp_sno;
-	guint64 upper_bound;
-	guint64 lower_bound;
-	guint64 rcpt_clm_cnt;
-	guint64 offset;
-	guint64 length;
-	guint64 clm_fst, clm_lst;
+	int64_t rpt_sno;
+	int64_t chkp_sno;
+	uint64_t upper_bound;
+	uint64_t lower_bound;
+	uint64_t rcpt_clm_cnt;
+	uint64_t offset;
+	uint64_t length;
+	uint64_t clm_fst, clm_lst;
 
 	int rpt_sno_size;
 	int chkp_sno_size;
@@ -865,7 +865,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree,
 
 	int segment_offset = 0;
 	int gap_count = 0;
-	guint64 gap_total = 0;
+	uint64_t gap_total = 0;
 
 	proto_item *ltp_rpt_item;
 	proto_item *ltp_rpt_clm_cnt;
@@ -918,17 +918,17 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree,
 		"range %" G_GINT64_MODIFIER "u-%" G_GINT64_MODIFIER "u",
 		lower_bound, upper_bound-1);
 
-	gboolean newdata = TRUE;
+	bool newdata = true;
 	if (ltp_analyze_sequence && session)
 	{
-		const guint64 data_fst = lower_bound;
-		const guint64 data_lst = upper_bound - 1;
+		const uint64_t data_fst = lower_bound;
+		const uint64_t data_lst = upper_bound - 1;
 
 		// All segments for a single report ID
 		wmem_itree_t *rpt = wmem_map_lookup(session->rpt_segs, &rpt_sno);
 		if (!rpt)
 		{
-			guint64 *key = wmem_new(wmem_file_scope(), guint64);
+			uint64_t *key = wmem_new(wmem_file_scope(), uint64_t);
 			*key = rpt_sno;
 			rpt = wmem_itree_new(wmem_file_scope());
 			wmem_map_insert(session->rpt_segs, key, rpt);
@@ -965,7 +965,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree,
 	 * max number of claims we can possibly squeeze into the remaining tvbuff, then
 	 * the packet is malformed.
 	 */
-	if (rcpt_clm_cnt > (guint64)tvb_captured_length_remaining(tvb, frame_offset + segment_offset) / 2) {
+	if (rcpt_clm_cnt > (uint64_t)tvb_captured_length_remaining(tvb, frame_offset + segment_offset) / 2) {
 		expert_add_info_format(pinfo, ltp_rpt_clm_cnt, &ei_ltp_mal_reception_claim,
 				"Reception claim count impossibly large: %" G_GINT64_MODIFIER "d > %d", rcpt_clm_cnt,
 				tvb_captured_length_remaining(tvb, frame_offset + segment_offset) / 2);
@@ -975,7 +975,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree,
 	clm_lst = lower_bound - 1;
 
 	/* There can be multiple reception claims in the same report segment */
-	for(guint64 ix = 0; ix < rcpt_clm_cnt; ix++){
+	for(uint64_t ix = 0; ix < rcpt_clm_cnt; ix++){
 		/* Peek at the offset to see if there is a preceding gap */
 		tvb_get_varint(tvb, frame_offset + segment_offset, FT_VARINT_MAX_LEN, &offset, ENC_VARINT_SDNV);
 		clm_fst = lower_bound + offset;
@@ -1035,7 +1035,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree,
 static int
 dissect_report_ack_segment(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo, int frame_offset, ltp_tap_info_t *tap){
 	ltp_session_data_t *session = tap->session;
-	gint64 rpt_sno;
+	int64_t rpt_sno;
 	int rpt_sno_size;
 	int segment_offset = 0;
 
@@ -1069,7 +1069,7 @@ dissect_cancel_segment(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo,
 	ltp_session_data_t *session = tap->session;
 
 	/* The cancel segment has only one byte, which contains the reason code. */
-	guint8 reason_code = tvb_get_guint8(tvb,frame_offset);
+	uint8_t reason_code = tvb_get_uint8(tvb,frame_offset);
 
 	/* Creating tree for the cancel segment */
 	proto_tree *tree_cancel = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, 1, ett_session_mgmt, NULL, "Cancel Segment");
@@ -1078,7 +1078,7 @@ dissect_cancel_segment(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo,
 
 	if (ltp_analyze_sequence && session)
 	{
-		const guint64 cancel_type = tap->seg_type;
+		const uint64_t cancel_type = tap->seg_type;
 		ltp_ref_src(session->cancels, cancel_type, pinfo);
 		ltp_ref_use(session->cancels, cancel_type, pinfo, tree_cancel, hf_ltp_cancel_dupe_ref, NULL, -1, NULL);
 		ltp_ref_use(session->cancel_acks, cancel_type, pinfo, tree_cancel, hf_ltp_cancel_ref, &ei_ltp_cancel_noack, hf_ltp_cancel_time, NULL);
@@ -1096,7 +1096,7 @@ dissect_cancel_ack_segment(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pin
 
 	if (ltp_analyze_sequence && session)
 	{
-		const guint64 cancel_type = tap->seg_type - 1;
+		const uint64_t cancel_type = tap->seg_type - 1;
 		ltp_ref_src(session->cancel_acks, cancel_type, pinfo);
 		ltp_ref_use(session->cancel_acks, cancel_type, pinfo, tree_ack, hf_ltp_cancel_ack_dupe_ref, NULL, -1, NULL);
 		ltp_ref_use(session->cancels, cancel_type, pinfo, tree_ack, hf_ltp_cancel_ack_ref, &ei_ltp_cancel_ack_nocancel, hf_ltp_cancel_ack_time, tap);
@@ -1107,7 +1107,7 @@ dissect_cancel_ack_segment(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pin
 
 static int
 dissect_header_extn(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo, int frame_offset,int hdr_extn_cnt){
-	gint64 length;
+	int64_t length;
 	int length_size;
 
 	int extn_offset = 0;
@@ -1138,7 +1138,7 @@ dissect_header_extn(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo, int
 
 static int
 dissect_trailer_extn(proto_tree *ltp_tree, tvbuff_t *tvb, packet_info *pinfo, int frame_offset,int trl_extn_cnt){
-	gint64 length;
+	int64_t length;
 	int length_size;
 
 	int extn_offset = 0;
@@ -1173,10 +1173,10 @@ dissect_ltp_segment(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 	int segment_offset = 0;
 	int data_len = 0;
 
-	gint    ltp_type;
-	guint64 bitsval;
-	gint    hdr_extn_cnt;
-	gint    trl_extn_cnt;
+	int     ltp_type;
+	uint64_t bitsval;
+	int     hdr_extn_cnt;
+	int     trl_extn_cnt;
 
 	int engine_id_size;
 	int session_num_size;
@@ -1247,7 +1247,7 @@ dissect_ltp_segment(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 		conv_key[2].type = CE_CONVERSATION_TYPE;
 		conv_key[2].conversation_type_val = CONVERSATION_LTP;
 
-		pinfo->use_conv_addr_port_endpoints = FALSE;
+		pinfo->use_conv_addr_port_endpoints = false;
 		pinfo->conv_addr_port_endpoints = NULL;
 		pinfo->conv_elements = conv_key;
 		conversation_t *convo = find_or_create_conversation(pinfo);
@@ -1495,16 +1495,16 @@ ltp_endp_packet(void *tapdata _U_, packet_info *pinfo _U_, epan_dissect_t *edt _
 	address *diraddr = wmem_new0(pinfo->pool, address);
 
 	set_address(diraddr, AT_NUMERIC, (int) sizeof(ltp->sess_id.orig_eng_id), &(ltp->sess_id.orig_eng_id));
-	gboolean sender;
+	bool sender;
 	switch (ltp->seg_type) {
 	case 0x8:
 	case 0xd:
 	case 0xe:
 		// report, cancel ack to sender, cancel from receiver
-		sender = FALSE;
+		sender = false;
 		break;
 	default:
-		sender = TRUE;
+		sender = true;
 		break;
 	}
 
@@ -1520,10 +1520,10 @@ ltp_filter_valid(packet_info *pinfo, void *user_data _U_)
 	return proto_is_frame_protocol(pinfo->layers, "ltp");
 }
 
-static gchar*
+static char*
 ltp_build_filter(packet_info *pinfo, void *user_data _U_)
 {
-	gchar *result = NULL;
+	char *result = NULL;
 	int layer_num = 1;
 	for (wmem_list_frame_t *protos = wmem_list_head(pinfo->layers);
 		protos != NULL; protos = wmem_list_frame_next(protos), ++layer_num)
@@ -1539,14 +1539,14 @@ ltp_build_filter(packet_info *pinfo, void *user_data _U_)
 			continue;
 		}
 
-		gchar *filter = g_strdup_printf(
+		char *filter = g_strdup_printf(
 			"ltp.session.name == \"%s\"",
 			sess_name
 		);
 
 		if (result)
 		{
-			gchar *oldresult = result;
+			char *oldresult = result;
 			result = g_strjoin(" || ", oldresult, filter, NULL);
 			g_free(oldresult);
 			g_free(filter);
@@ -1560,17 +1560,17 @@ ltp_build_filter(packet_info *pinfo, void *user_data _U_)
 	return result;
 }
 
-static const gchar* st_str_segs = "Segment Size (by Type)";
-static const gchar* st_str_red = "Red Data";
-static const gchar* st_str_corr_orig = "Original";
-static const gchar* st_str_corr_ret = "Retransmission seen";
-static const gchar* st_str_green = "Green Data";
-static const gchar* st_str_rpt = "Report";
-static const gchar* st_str_canc_src = "Cancel by Sender";
-static const gchar* st_str_canc_dst = "Cancel by Receiver";
-static const gchar* st_str_ack = "Report/Cancel Ack";
-static const gchar* st_str_engs = "Segment Addr (by Engine ID)";
-static const gchar* st_str_blks = "Block Size (by Engine ID)";
+static const char* st_str_segs = "Segment Size (by Type)";
+static const char* st_str_red = "Red Data";
+static const char* st_str_corr_orig = "Original";
+static const char* st_str_corr_ret = "Retransmission seen";
+static const char* st_str_green = "Green Data";
+static const char* st_str_rpt = "Report";
+static const char* st_str_canc_src = "Cancel by Sender";
+static const char* st_str_canc_dst = "Cancel by Receiver";
+static const char* st_str_ack = "Report/Cancel Ack";
+static const char* st_str_engs = "Segment Addr (by Engine ID)";
+static const char* st_str_blks = "Block Size (by Engine ID)";
 static int st_node_segs = -1;
 static int st_node_red = -1;
 static int st_node_green = -1;
@@ -1663,7 +1663,7 @@ ltp_stats_tree_packet(stats_tree *st, packet_info *pinfo _U_, epan_dissect_t *ed
 		eng_addr = &(pinfo->dst);
 		break;
 	}
-	const gchar *eng_addr_str = eng_addr ? address_to_display(pinfo->pool, eng_addr) : NULL;
+	const char *eng_addr_str = eng_addr ? address_to_display(pinfo->pool, eng_addr) : NULL;
 	if (eng_addr_str)
 	{
 		tick_stat_node(st, eng_addr_str, st_eng_id, false);
@@ -1984,7 +1984,7 @@ proto_register_ltp(void)
 	};
 
 /* Setup protocol subtree array */
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_ltp,
 		&ett_ltp_hdr,
 		&ett_hdr_session,
@@ -2047,7 +2047,7 @@ proto_register_ltp(void)
 	ltp_handle = register_dissector("ltp", dissect_ltp, proto_ltp);
 
 	set_address(&ltp_addr_receiver, AT_STRINGZ, (int) strlen(ltp_conv_receiver) + 1, ltp_conv_receiver);
-	register_conversation_table(proto_ltp, TRUE, ltp_conv_packet, ltp_endp_packet);
+	register_conversation_table(proto_ltp, true, ltp_conv_packet, ltp_endp_packet);
 	register_conversation_filter("ltp", "LTP", ltp_filter_valid, ltp_build_filter, NULL);
 	ltp_tap = register_tap("ltp");
 
diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c
index ffd81f8c99..52570f9f6f 100644
--- a/epan/dissectors/packet-lustre.c
+++ b/epan/dissectors/packet-lustre.c
@@ -724,110 +724,110 @@ static int hf_lustre_lfsck_reply_padding;
 static int hf_lustre_lfsck_reply_repaired;
 
 /* Ett declarations */
-static gint ett_lustre;
-static gint ett_lustre_lustre_handle_cookie;
-static gint ett_lustre_lustre_msg_v1;
-static gint ett_lustre_lustre_handle_v1;
-static gint ett_lustre_lustre_msg_v2;
-static gint ett_lustre_ptlrpc_body;
-static gint ett_lustre_lustre_handle_v2;
-static gint ett_lustre_obd_connect_data;
-static gint ett_lustre_lov_ost_data_v1;
-static gint ett_lustre_obd_statfs;
-static gint ett_lustre_obd_ioobj;
-static gint ett_lustre_niobuf_remote;
-static gint ett_lustre_rcs;
-static gint ett_lustre_fid_array;
-static gint ett_lustre_ost_lvb;
-static gint ett_lustre_lu_fid;
-static gint ett_lustre_mdc_swap_layouts;
-static gint ett_lustre_mdt_body;
-static gint ett_lustre_mdt_rec_reint;
-static gint ett_lustre_obd_quotactl;
-static gint ett_lustre_obd_dqinfo;
-static gint ett_lustre_obd_dqblk;
-static gint ett_lustre_quota_adjust_qunit;
-static gint ett_lustre_lov_desc;
-static gint ett_lustre_obd_uuid;
-static gint ett_lustre_ldlm_res_id;
-static gint ett_lustre_ldlm_extent;
-static gint ett_lustre_ldlm_inodebits;
-static gint ett_lustre_ldlm_flock;
-static gint ett_lustre_ldlm_intent_opc;
-static gint ett_lustre_ldlm_resource_desc;
-static gint ett_lustre_ldlm_lock_desc;
-static gint ett_lustre_ldlm_request;
-static gint ett_lustre_lustre_handle;
-static gint ett_lustre_ldlm_reply;
-static gint ett_lustre_ldlm_gl_barrier_desc;
-static gint ett_lustre_ldlm_gl_lquota_desc;
-static gint ett_lustre_mgs_target_info;
-static gint ett_lustre_mgs_config_body;
-static gint ett_lustre_mgs_config_res;
-static gint ett_lustre_llog_rec;
-static gint ett_lustre_llog_rec_hdr;
-static gint ett_lustre_llog_rec_tail;
-static gint ett_lustre_llog_logid_rec;
-static gint ett_lustre_llog_logid;
-static gint ett_lustre_lmv_mds_md;
-static gint ett_lustre_lmv_user_md_v1;
-static gint ett_lustre_lmv_user_mds_data;
-static gint ett_lustre_lov_mds_md;
-static gint ett_lustre_llog_unlink_rec;
-static gint ett_lustre_llog_unlink64_rec;
-static gint ett_lustre_llog_setattr_rec;
-static gint ett_lustre_llog_setattr64_rec;
-static gint ett_lustre_llog_size_change_rec;
-static gint ett_lustre_llog_gen_rec;
-static gint ett_lustre_llog_changelog_rec;
-static gint ett_lustre_llog_log_hdr;
-static gint ett_lustre_llog_hdr_flags;
-static gint ett_lustre_llog_cookie;
-static gint ett_lustre_llogd_body;
-static gint ett_lustre_llogd_conn_body;
-static gint ett_lustre_llog_gen;
-static gint ett_lustre_changelog_rec;
-static gint ett_lustre_lustre_cfg;
-static gint ett_lustre_cfg_marker;
-static gint ett_lustre_obdo;
-static gint ett_lustre_ost_body;
-static gint ett_lustre_ldlm_lock_flags;
-static gint ett_lustre_seq_range;
-static gint ett_lustre_mdt_ioepoch;
-static gint ett_lustre_capa;
-static gint ett_lustre_idx_info;
-static gint ett_lustre_close_data;
-static gint ett_lustre_acl;
-static gint ett_lustre_ladvise_hdr;
-static gint ett_lustre_ladvise;
-static gint ett_lustre_hsm_request;
-static gint ett_lustre_hsm_archive;
-static gint ett_lustre_hsm_current_action;
-static gint ett_lustre_hsm_user_item;
-static gint ett_lustre_hsm_extent;
-static gint ett_lustre_hsm_state_set;
-static gint ett_lustre_hsm_progress;
-static gint ett_lustre_hsm_user_state;
-static gint ett_lustre_quota_body;
-static gint ett_lustre_lquota_id;
-static gint ett_lustre_layout_intent;
-static gint ett_lustre_xattrs;
-static gint ett_lustre_xattr_item;
-static gint ett_lustre_ost_id;
-static gint ett_lustre_ost_id_oi;
-static gint ett_lustre_ost_layout;
-static gint ett_lustre_eadata;
-static gint ett_lustre_out_update_header;
-static gint ett_lustre_out_update_header_data;
-static gint ett_lustre_out_update_buffer;
-static gint ett_lustre_obj_update_reply;
-static gint ett_lustre_obj_update_result;
-static gint ett_lustre_object_update_request;
-static gint ett_lustre_object_update;
-static gint ett_lustre_object_update_param;
-static gint ett_lustre_lfsck_request;
-static gint ett_lustre_lfsck_reply;
-static gint ett_lustre_barrier_lvb;
+static int ett_lustre;
+static int ett_lustre_lustre_handle_cookie;
+static int ett_lustre_lustre_msg_v1;
+static int ett_lustre_lustre_handle_v1;
+static int ett_lustre_lustre_msg_v2;
+static int ett_lustre_ptlrpc_body;
+static int ett_lustre_lustre_handle_v2;
+static int ett_lustre_obd_connect_data;
+static int ett_lustre_lov_ost_data_v1;
+static int ett_lustre_obd_statfs;
+static int ett_lustre_obd_ioobj;
+static int ett_lustre_niobuf_remote;
+static int ett_lustre_rcs;
+static int ett_lustre_fid_array;
+static int ett_lustre_ost_lvb;
+static int ett_lustre_lu_fid;
+static int ett_lustre_mdc_swap_layouts;
+static int ett_lustre_mdt_body;
+static int ett_lustre_mdt_rec_reint;
+static int ett_lustre_obd_quotactl;
+static int ett_lustre_obd_dqinfo;
+static int ett_lustre_obd_dqblk;
+static int ett_lustre_quota_adjust_qunit;
+static int ett_lustre_lov_desc;
+static int ett_lustre_obd_uuid;
+static int ett_lustre_ldlm_res_id;
+static int ett_lustre_ldlm_extent;
+static int ett_lustre_ldlm_inodebits;
+static int ett_lustre_ldlm_flock;
+static int ett_lustre_ldlm_intent_opc;
+static int ett_lustre_ldlm_resource_desc;
+static int ett_lustre_ldlm_lock_desc;
+static int ett_lustre_ldlm_request;
+static int ett_lustre_lustre_handle;
+static int ett_lustre_ldlm_reply;
+static int ett_lustre_ldlm_gl_barrier_desc;
+static int ett_lustre_ldlm_gl_lquota_desc;
+static int ett_lustre_mgs_target_info;
+static int ett_lustre_mgs_config_body;
+static int ett_lustre_mgs_config_res;
+static int ett_lustre_llog_rec;
+static int ett_lustre_llog_rec_hdr;
+static int ett_lustre_llog_rec_tail;
+static int ett_lustre_llog_logid_rec;
+static int ett_lustre_llog_logid;
+static int ett_lustre_lmv_mds_md;
+static int ett_lustre_lmv_user_md_v1;
+static int ett_lustre_lmv_user_mds_data;
+static int ett_lustre_lov_mds_md;
+static int ett_lustre_llog_unlink_rec;
+static int ett_lustre_llog_unlink64_rec;
+static int ett_lustre_llog_setattr_rec;
+static int ett_lustre_llog_setattr64_rec;
+static int ett_lustre_llog_size_change_rec;
+static int ett_lustre_llog_gen_rec;
+static int ett_lustre_llog_changelog_rec;
+static int ett_lustre_llog_log_hdr;
+static int ett_lustre_llog_hdr_flags;
+static int ett_lustre_llog_cookie;
+static int ett_lustre_llogd_body;
+static int ett_lustre_llogd_conn_body;
+static int ett_lustre_llog_gen;
+static int ett_lustre_changelog_rec;
+static int ett_lustre_lustre_cfg;
+static int ett_lustre_cfg_marker;
+static int ett_lustre_obdo;
+static int ett_lustre_ost_body;
+static int ett_lustre_ldlm_lock_flags;
+static int ett_lustre_seq_range;
+static int ett_lustre_mdt_ioepoch;
+static int ett_lustre_capa;
+static int ett_lustre_idx_info;
+static int ett_lustre_close_data;
+static int ett_lustre_acl;
+static int ett_lustre_ladvise_hdr;
+static int ett_lustre_ladvise;
+static int ett_lustre_hsm_request;
+static int ett_lustre_hsm_archive;
+static int ett_lustre_hsm_current_action;
+static int ett_lustre_hsm_user_item;
+static int ett_lustre_hsm_extent;
+static int ett_lustre_hsm_state_set;
+static int ett_lustre_hsm_progress;
+static int ett_lustre_hsm_user_state;
+static int ett_lustre_quota_body;
+static int ett_lustre_lquota_id;
+static int ett_lustre_layout_intent;
+static int ett_lustre_xattrs;
+static int ett_lustre_xattr_item;
+static int ett_lustre_ost_id;
+static int ett_lustre_ost_id_oi;
+static int ett_lustre_ost_layout;
+static int ett_lustre_eadata;
+static int ett_lustre_out_update_header;
+static int ett_lustre_out_update_header_data;
+static int ett_lustre_out_update_buffer;
+static int ett_lustre_obj_update_reply;
+static int ett_lustre_obj_update_result;
+static int ett_lustre_object_update_request;
+static int ett_lustre_object_update;
+static int ett_lustre_object_update_param;
+static int ett_lustre_lfsck_request;
+static int ett_lustre_lfsck_reply;
+static int ett_lustre_barrier_lvb;
 
 static expert_field ei_lustre_buflen;
 static expert_field ei_lustre_badopc;
@@ -1621,7 +1621,7 @@ VALUE_STRING_ARRAY2(lfsck_type_vals);
 static int
 add_extra_padding(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * tree)
 {
-    guint32 padding_len;
+    uint32_t padding_len;
 
     padding_len = buffer_padding_length(offset);
     if (padding_len) {
@@ -1643,9 +1643,9 @@ typedef struct _lustre_conv_info_t {
 } lustre_conv_info_t;
 
 typedef struct lustre_trans {
-    guint32 opcode;
-    guint64 sub_opcode; /* i.e. intent, reint */
-    guint64 match_bits;
+    uint32_t opcode;
+    uint64_t sub_opcode; /* i.e. intent, reint */
+    uint64_t match_bits;
 } lustre_trans_t;
 
 static lustre_trans_t *
@@ -1697,10 +1697,10 @@ lustre_get_trans(packet_info *pinfo, struct lnet_trans_info *info)
 \********************************************************************/
 
 static int
-display_buffer_data(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *parent_tree, guint32 buf_num, const gchar *msg)
+display_buffer_data(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, uint32_t buf_num, const char *msg)
 {
     proto_item *item;
-    guint32 data_len;
+    uint32_t data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -1718,9 +1718,9 @@ display_buffer_data(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *
 }
 
 static int
-display_buffer_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gint offset, int hf_index, guint32 buf_num)
+display_buffer_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset, int hf_index, uint32_t buf_num)
 {
-    guint32 string_len;
+    uint32_t string_len;
 
     string_len = LUSTRE_BUFFER_LEN(buf_num);
     if (string_len == 0)
@@ -1741,9 +1741,9 @@ display_buffer_string(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 \********************************************************************/
 
 static void
-lustre_fmt_ver( gchar *result, guint32 version )
+lustre_fmt_ver( char *result, uint32_t version )
 {
-   guint32 major, minor, patch, fix;
+   uint32_t major, minor, patch, fix;
 
     fix = version & 0xff;
     version >>= 8;
@@ -1756,7 +1756,7 @@ lustre_fmt_ver( gchar *result, guint32 version )
 }
 
 static int
-dissect_struct_lustre_handle(tvbuff_t *tvb, gint offset, proto_tree *parent_tree, int hf_index)
+dissect_struct_lustre_handle(tvbuff_t *tvb, int offset, proto_tree *parent_tree, int hf_index)
 {
     proto_tree *tree;
     proto_item *item;
@@ -1775,8 +1775,8 @@ dissect_struct_lu_fid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, int hf
 {
     proto_tree *tree;
     proto_item *item;
-    guint64 seq;
-    guint32 val;
+    uint64_t seq;
+    uint32_t val;
 
     /* struct lu_fid { */
     /*     __u64 f_seq; */
@@ -1890,7 +1890,7 @@ dissect_struct_obdo(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
     proto_tree *tree;
     proto_item *item;
-    gint old_offset;
+    int old_offset;
 
     old_offset = offset;
 
@@ -2049,7 +2049,7 @@ dissect_struct_llog_rec_hdr(tvbuff_t *tvb, int offset, proto_tree *parent_tree,
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 ind, type;
+    uint32_t ind, type;
 
     item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, 16, ENC_NA);
     tree = proto_item_add_subtree(item, ett_lustre_llog_rec_hdr);
@@ -2119,8 +2119,8 @@ dissect_struct_object_update(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 {
     proto_tree *tree, *ptree;
     proto_item *item;
-    guint count, i, len;
-    gint old_offset;
+    unsigned count, i, len;
+    int old_offset;
 
     old_offset = offset;
 
@@ -2180,7 +2180,7 @@ dissect_struct_object_update_request(tvbuff_t *tvb, int offset, packet_info *pin
 {
     proto_tree *tree;
     proto_item *item;
-    guint count, i, magic;
+    unsigned count, i, magic;
     int old_offset;
 
     old_offset = offset;
@@ -2268,7 +2268,7 @@ dissect_struct_changelog_rec(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
     proto_tree *tree;
     proto_item *item;
-    guint namelen, flags, type;
+    unsigned namelen, flags, type;
     int old_offset = offset;
 
     /* struct changelog_rec { */
@@ -2381,7 +2381,7 @@ dissect_struct_lustre_cfg(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
     proto_tree *tree;
     proto_item *item;
     int old_offset, buf_offset;
-    guint count, i, cmd, len;
+    unsigned count, i, cmd, len;
 
     old_offset = offset;
 
@@ -2454,12 +2454,12 @@ dissect_struct_lustre_cfg(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
  *
  */
 static int
-dissect_struct_ldlm_lock_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint64 *ltype)
+dissect_struct_ldlm_lock_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint64_t *ltype)
 {
     proto_tree *tree, *res_tree, *id_tree, *l_tree;
     proto_item *item;
-    gint i;
-    guint32 type;
+    int i;
+    uint32_t type;
 
     /* struct ldlm_lock_desc { */
     /*     struct ldlm_resource_desc l_resource; */
@@ -2589,11 +2589,11 @@ dissect_struct_ldlm_lock_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 }
 
 static int
-dissect_struct_seq_range(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_seq_range(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    gint data_len;
+    int data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2622,11 +2622,11 @@ dissect_struct_seq_range(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gui
 }
 
 static int
-dissect_struct_ldlm_gl_barrier_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_ldlm_gl_barrier_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2652,11 +2652,11 @@ dissect_struct_ldlm_gl_barrier_desc(tvbuff_t *tvb, int offset, proto_tree *paren
 }
 
 static int
-dissect_struct_ldlm_gl_lquota_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_ldlm_gl_lquota_desc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2693,9 +2693,9 @@ dissect_struct_ldlm_gl_lquota_desc(tvbuff_t *tvb, int offset, proto_tree *parent
 }
 
 static int
-dissect_struct_ldlm_gl_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, lustre_trans_t *trans, guint buf_num)
+dissect_struct_ldlm_gl_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, lustre_trans_t *trans, unsigned buf_num)
 {
-    guint data_len;
+    unsigned data_len;
     int old_offset;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
@@ -2730,11 +2730,11 @@ dissect_struct_ldlm_gl_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 }
 
 static int
-dissect_struct_ldlm_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint64 *type, guint buf_num)
+dissect_struct_ldlm_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint64_t *type, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint old_offset, data_len, count, i;
+    unsigned old_offset, data_len, count, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2771,11 +2771,11 @@ dissect_struct_ldlm_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 }
 
 static int
-dissect_struct_ldlm_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint64 *type, guint buf_num)
+dissect_struct_ldlm_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint64_t *type, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    gint data_len;
+    int data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2879,11 +2879,11 @@ dissect_struct_mgs_config_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 }
 
 static int
-dissect_struct_mgs_target_info(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_mgs_target_info(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 data_len, old_offset, i, count;
+    uint32_t data_len, old_offset, i, count;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -2949,7 +2949,7 @@ dissect_struct_mgs_target_info(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
 \********************************************************************/
 
 static int
-dissect_struct_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -2971,7 +2971,7 @@ dissect_struct_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa
 }
 
 static int
-dissect_struct_mdt_ioepoch(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_mdt_ioepoch(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -3004,7 +3004,7 @@ dissect_struct_mdt_ioepoch(tvbuff_t *tvb, int offset, proto_tree *parent_tree, g
 }
 
 static int
-dissect_struct_close_data(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_close_data(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -3036,11 +3036,11 @@ dissect_struct_close_data(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gu
 }
 
 static int
-dissect_struct_mdt_rec_reint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_mdt_rec_reint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_tree *item;
-    guint data_len, opcode;
+    unsigned data_len, opcode;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -3221,11 +3221,11 @@ dissect_struct_mdt_rec_reint(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 }
 
 static int
-dissect_struct_lmv_mds_md_v1(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_lmv_mds_md_v1(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint old_offset, count, i, magic;
+    unsigned old_offset, count, i, magic;
 
     count = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -3307,11 +3307,11 @@ dissect_struct_lmv_user_mds_data(tvbuff_t *tvb, int offset, proto_tree *parent_t
 }
 
 static int
-dissect_struct_lmv_user_md(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_lmv_user_md(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint old_offset, buf_len, i, magic, count;
+    unsigned old_offset, buf_len, i, magic, count;
 
     buf_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -3359,7 +3359,7 @@ dissect_struct_lmv_user_md(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_
     proto_tree_add_item(tree, hf_lustre_lmv_user_md_v1_pool_name, tvb, offset, 16, ENC_ASCII);
     offset += 16;
 
-    if (buf_len + old_offset >= (guint)offset + 24) {
+    if (buf_len + old_offset >= (unsigned)offset + 24) {
         for (i = 0; i < count && magic == LMV_USER_MAGIC; ++i)
             offset = dissect_struct_lmv_user_mds_data(tvb, offset, tree, hf_lustre_lmv_user_md_v1_objects);
     } else {
@@ -3374,12 +3374,12 @@ dissect_struct_lmv_user_md(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_
 }
 
 static int
-dissect_struct_lov_mds_md(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_lov_mds_md(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree, *ost_tree;
     proto_item *item, *lov_item;
-    guint data_len, old_offset, stripe_count, i;
-    guint32 magic;
+    unsigned data_len, old_offset, stripe_count, i;
+    uint32_t magic;
 
     old_offset = offset;
     data_len = LUSTRE_BUFFER_LEN(buf_num);
@@ -3482,11 +3482,11 @@ dissect_struct_lov_mds_md(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 }
 
 static int
-dissect_struct_llog_cookie_array(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_llog_cookie_array(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -3515,11 +3515,11 @@ dissect_struct_llog_cookie_array(tvbuff_t *tvb, int offset, proto_tree *parent_t
 }
 
 static int
-dissect_struct_mdc_swap_layouts(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_mdc_swap_layouts(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -3626,11 +3626,11 @@ dissect_struct_hsm_progress(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 }
 
 static int
-dissect_struct_hsm_user_state(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_hsm_user_state(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -3672,11 +3672,11 @@ dissect_struct_hsm_user_state(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 }
 
 static int
-dissect_struct_hsm_state_set(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_hsm_state_set(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -3710,11 +3710,11 @@ dissect_struct_hsm_state_set(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 }
 
 static int
-dissect_struct_hsm_user_item_array(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_hsm_user_item_array(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -3737,11 +3737,11 @@ dissect_struct_hsm_user_item_array(tvbuff_t *tvb, int offset, proto_tree *parent
 }
 
 static int
-dissect_struct_hsm_current_action(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_hsm_current_action(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -3769,11 +3769,11 @@ dissect_struct_hsm_current_action(tvbuff_t *tvb, int offset, proto_tree *parent_
 }
 
 static int
-dissect_hsm_archive(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_hsm_archive(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -3797,12 +3797,12 @@ dissect_hsm_archive(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint bu
  */
 
 static int
-dissect_struct_out_update_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_out_update_header(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree, *data_tree;
     proto_item *item;
-    guint i, count, magic, length;
-    gint old_offset, data_len;
+    unsigned i, count, magic, length;
+    int old_offset, data_len;
 
     old_offset = offset;
 
@@ -3864,11 +3864,11 @@ dissect_struct_out_update_header(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static int
-dissect_struct_out_update_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_out_update_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
     int old_offset;
 
     old_offset = offset;
@@ -3904,7 +3904,7 @@ dissect_struct_obj_update_result(tvbuff_t *tvb, int offset, proto_tree *parent_t
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
     int old_offset;
 
     old_offset = offset;
@@ -3933,11 +3933,11 @@ dissect_struct_obj_update_result(tvbuff_t *tvb, int offset, proto_tree *parent_t
 }
 
 static int
-dissect_struct_obj_update_reply(tvbuff_t *tvb, int offset, packet_info * pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_obj_update_reply(tvbuff_t *tvb, int offset, packet_info * pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i, magic, count;
+    unsigned data_len, i, magic, count;
     int old_offset;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
@@ -3977,7 +3977,7 @@ dissect_struct_obj_update_reply(tvbuff_t *tvb, int offset, packet_info * pinfo,
         offset = dissect_struct_obj_update_result(tvb, offset, tree);
     }
 
-    if (data_len > (guint)(offset-old_offset)) {
+    if (data_len > (unsigned)(offset-old_offset)) {
         expert_add_info(pinfo, tree, &ei_lustre_buflen);
         offset = old_offset + data_len;
     }
@@ -3993,11 +3993,11 @@ dissect_struct_obj_update_reply(tvbuff_t *tvb, int offset, packet_info * pinfo,
  */
 
 static int
-dissect_struct_obd_ioobj(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_obd_ioobj(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -4027,11 +4027,11 @@ dissect_struct_obd_ioobj(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gui
 }
 
 static int
-dissect_struct_niobuf_remote(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_niobuf_remote(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -4059,11 +4059,11 @@ dissect_struct_niobuf_remote(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 }
 
 static int
-dissect_rc_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_rc_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i;
+    unsigned data_len, i;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
 
@@ -4079,11 +4079,11 @@ dissect_rc_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pare
 }
 
 static int
-dissect_struct_fid_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint buf_num)
+dissect_struct_fid_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len, i, num;
+    unsigned data_len, i, num;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -4102,11 +4102,11 @@ dissect_struct_fid_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 }
 
 static int
-dissect_struct_quota_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint buf_num)
+dissect_struct_quota_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, unsigned buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint data_len;
+    unsigned data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -4240,7 +4240,7 @@ dissect_struct_lu_ladvise_hdr(tvbuff_t *tvb, int offset,  packet_info *pinfo, pr
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 val;
+    uint32_t val;
 
     /* struct ladvise_hdr { */
     /*     __u32            lah_magic;    /\* LADVISE_MAGIC *\/ */
@@ -4325,12 +4325,12 @@ dissect_struct_lu_ladvise(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
  * because they're needed to dissect further buffers.
  */
 static int
-dissect_struct_ptlrpc_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gint offset, guint buf_len,
-                           lustre_trans_t *trans, guint32 *pb_type)
+dissect_struct_ptlrpc_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset, unsigned buf_len,
+                           lustre_trans_t *trans, uint32_t *pb_type)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 pb_version, opcode, i, old_offset;
+    uint32_t pb_version, opcode, i, old_offset;
 
     old_offset = offset;
 
@@ -4446,7 +4446,7 @@ dissect_struct_ptlrpc_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
 }
 
 static int
-dissect_struct_ost_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_ost_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4494,7 +4494,7 @@ dissect_struct_ost_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint
 }
 
 static int
-dissect_struct_capa(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_capa(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4542,7 +4542,7 @@ dissect_struct_capa(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32
 }
 
 static int
-dissect_struct_llogd_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_llogd_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4592,7 +4592,7 @@ dissect_struct_llogd_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gu
 }
 
 static int
-dissect_struct_llogd_conn_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_llogd_conn_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4621,11 +4621,11 @@ dissect_struct_llogd_conn_body(tvbuff_t *tvb, int offset, proto_tree *parent_tre
 }
 
 static int
-dissect_struct_llog_log_hdr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_llog_log_hdr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 len, data_len, old_offset, i;
+    uint32_t len, data_len, old_offset, i;
 
     static int * const flags[] = {
         &hf_lustre_llog_hdr_flag_zap_when_empty,
@@ -4708,7 +4708,7 @@ dissect_struct_llog_log_hdr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 }
 
 static int
-dissect_struct_idx_info(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_idx_info(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4777,10 +4777,10 @@ dissect_struct_idx_info(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guin
 }
 
 static int
-dissect_struct_ldlm_intent(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *parent_tree, lustre_trans_t *trans, guint32 buf_num)
+dissect_struct_ldlm_intent(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, lustre_trans_t *trans, uint32_t buf_num)
 {
     //proto_tree *tree;
-    guint32 data_len;
+    uint32_t data_len;
 
     static int * const flags[] = {
          &hf_lustre_ldlm_intent_opc_open,
@@ -4846,7 +4846,7 @@ dissect_struct_ldlm_intent(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto
 }
 
 static int
-dissect_struct_quota_adjust_qunit(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_quota_adjust_qunit(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4882,7 +4882,7 @@ dissect_struct_quota_adjust_qunit(tvbuff_t *tvb, int offset, proto_tree *parent_
 }
 
 static int
-dissect_xattr_buffers(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree, guint32 buff_num)
+dissect_xattr_buffers(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree, uint32_t buff_num)
 {
     /* ldlm_intent_getxattr_server : [eadata][eavals][eavals_lens] *
      * array length == sizeof(eavals_lens)/sizeof(uint32)
@@ -4946,7 +4946,7 @@ dissect_xattr_buffers(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 }
 
 static int
-dissect_struct_barrier_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_barrier_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -4976,9 +4976,9 @@ dissect_struct_barrier_lvb(tvbuff_t *tvb, int offset, proto_tree *parent_tree, g
 }
 
 static int
-dissect_struct_eadata(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_eadata(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint32_t buf_num)
 {
-    guint32 data_len;
+    uint32_t data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -4993,11 +4993,11 @@ dissect_struct_eadata(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree
 }
 
 static int
-dissect_struct_layout_intent(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_layout_intent(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 data_len;
+    uint32_t data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -5033,7 +5033,7 @@ dissect_struct_ost_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
     proto_tree *tree;
     proto_item *item;
-    gint old_offset;
+    int old_offset;
 
     old_offset = offset;
 
@@ -5051,11 +5051,11 @@ dissect_struct_ost_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 }
 
 static int
-dissect_struct_mdt_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_mdt_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 data_len;
+    uint32_t data_len;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -5171,11 +5171,11 @@ dissect_struct_mdt_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guin
 }
 
 static int
-dissect_struct_obd_statfs(tvbuff_t *tvb, gint offset, proto_tree *parent_tree)
+dissect_struct_obd_statfs(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 i;
+    uint32_t i;
 
     item = proto_tree_add_item(parent_tree, hf_lustre_obd_statfs, tvb, offset, 144, ENC_NA);
     tree = proto_item_add_subtree(item, ett_lustre_obd_statfs);
@@ -5243,8 +5243,8 @@ dissect_struct_obd_connect_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 version;
-    gint old_offset, len;
+    uint32_t version;
+    int old_offset, len;
 
     old_offset = offset;
     item = proto_tree_add_item(parent_tree, hf_lustre_obd_connect_data, tvb, offset, -1, ENC_NA);
@@ -5366,12 +5366,12 @@ dissect_struct_obd_connect_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 }
 
 static int
-dissect_struct_lfsck_request(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_lfsck_request(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
     int data_len;
-    guint32 valid;
+    uint32_t valid;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -5442,7 +5442,7 @@ dissect_struct_lfsck_request(tvbuff_t *tvb, int offset, proto_tree *parent_tree,
 }
 
 static int
-dissect_struct_lfsck_reply(tvbuff_t *tvb, int offset, proto_tree *parent_tree, guint32 buf_num)
+dissect_struct_lfsck_reply(tvbuff_t *tvb, int offset, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
@@ -5466,11 +5466,11 @@ dissect_struct_lfsck_reply(tvbuff_t *tvb, int offset, proto_tree *parent_tree, g
 }
 
 static int
-dissect_llog_eadata(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint32 buf_num)
+dissect_llog_eadata(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, uint32_t buf_num)
 {
     proto_tree *tree;
     proto_item *item;
-    guint32 data_len, opcode, len, old_offset;
+    uint32_t data_len, opcode, len, old_offset;
 
     data_len = LUSTRE_BUFFER_LEN(buf_num);
     if (data_len == 0)
@@ -5772,7 +5772,7 @@ dissect_generic_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 \********************************************************************/
 
 static int
-process_opcode_ost(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_ost(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode){
     case OST_REPLY: /* obsolete so nothing */
@@ -6030,7 +6030,7 @@ process_opcode_reint_rep(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 }
 
 static int
-process_opcode_mds(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_mds(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode) {
     case MDS_GETATTR_NAME:
@@ -6433,7 +6433,7 @@ process_ldlm_intent_rep(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 }
 
 static int
-process_opcode_ldlm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_ldlm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     if (pb_type == PTL_RPC_MSG_REQUEST)
         switch (trans->opcode) {
@@ -6504,7 +6504,7 @@ process_opcode_ldlm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 }
 
 static int
-process_opcode_mgs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_mgs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode){
     case MGS_CONNECT:
@@ -6551,7 +6551,7 @@ process_opcode_mgs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 
 
 static int
-process_opcode_obd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_obd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode) {
     case OBD_PING:
@@ -6578,7 +6578,7 @@ process_opcode_obd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 }
 
 static int
-process_opcode_llog(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_llog(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode) {
     case LLOG_ORIGIN_HANDLE_CREATE:
@@ -6635,7 +6635,7 @@ process_opcode_llog(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 }
 
 static int
-process_opcode_quota(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_quota(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     switch (trans->opcode) {
     case QUOTA_DQACQ:
@@ -6653,7 +6653,7 @@ process_opcode_quota(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 }
 
 static int
-process_opcode_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     int buffer = LUSTRE_REC_OFF;
     switch (trans->opcode) {
@@ -6676,7 +6676,7 @@ process_opcode_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 }
 
 static int
-process_opcode_fld(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_fld(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     int buffer = LUSTRE_REC_OFF;
     switch (trans->opcode) {
@@ -6707,7 +6707,7 @@ process_opcode_fld(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 }
 
 static int
-process_opcode_out_update(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_out_update(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     int buffer = LUSTRE_REC_OFF;
     switch (trans->opcode) {
@@ -6728,7 +6728,7 @@ process_opcode_out_update(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 }
 
 static int
-process_opcode_lfsck(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, guint32 pb_type)
+process_opcode_lfsck(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     int buffer = LUSTRE_REC_OFF;
     switch (trans->opcode) {
@@ -6760,7 +6760,7 @@ process_opcode_lfsck(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 /* process lustre opcode :
    check if opcode is in range_opcode, and call the corresponding opcode process function */
 static int
-lustre_opcode_process(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, guint32 pb_type)
+lustre_opcode_process(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * tree, lustre_trans_t *trans, uint32_t pb_type)
 {
     /* No more buffers to process */
     if (LUSTRE_BUFCOUNT == 1)
@@ -6825,7 +6825,7 @@ static int
 dissect_struct_msg_v1(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, lustre_trans_t *trans)
 {
     //proto_item *item = NULL;
-    guint32 bufcount, i;
+    uint32_t bufcount, i;
     int old_offset;
 
     old_offset = offset;
@@ -6889,12 +6889,12 @@ dissect_struct_msg_v1(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 static int
 dissect_struct_msg_v2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, lustre_trans_t *trans)
 {
-    guint32 bufcount;
+    uint32_t bufcount;
     int old_offset;
-    guint32 i;
-    guint32 buf_len_offset;
-    guint32 current_buf_len;
-    guint32 pb_type;
+    uint32_t i;
+    uint32_t buf_len_offset;
+    uint32_t current_buf_len;
+    uint32_t pb_type;
 
     old_offset = offset;
 
@@ -6959,8 +6959,8 @@ dissect_struct_msg_v2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_lustre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    guint32 magic_number;
-    guint offset = 0;
+    uint32_t magic_number;
+    unsigned offset = 0;
     proto_item *ti  = NULL;
     proto_tree *lustre_tree = NULL;
     struct lnet_trans_info *info = (struct lnet_trans_info *)data;
@@ -8704,7 +8704,7 @@ proto_register_lustre(void)
           { "name", "lustre.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lustre,
         &ett_lustre_lustre_handle_cookie,
         &ett_lustre_lustre_msg_v1,
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index abc4e7ee55..3cca19e947 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -32,29 +32,29 @@ static dissector_handle_t lwapp_handle;
 #define LWAPP_FLAGS_F 0x02
 #define LWAPP_FLAGS_FT 0x01
 
-static gint proto_lwapp;
-static gint proto_lwapp_l3;
-static gint proto_lwapp_control;
-static gint ett_lwapp;
-static gint ett_lwapp_l3;
-static gint ett_lwapp_flags;
-static gint ett_lwapp_control;
-
-static gint hf_lwapp_version;
-static gint hf_lwapp_slotid;
-static gint hf_lwapp_flags;
-static gint hf_lwapp_flags_type;
-static gint hf_lwapp_flags_fragment;
-static gint hf_lwapp_flags_fragment_type;
-static gint hf_lwapp_fragment_id;
-static gint hf_lwapp_length;
-static gint hf_lwapp_rssi;
-static gint hf_lwapp_snr;
-/* static gint hf_lwapp_control; */
-static gint hf_lwapp_control_mac;
-static gint hf_lwapp_control_type;
-static gint hf_lwapp_control_seq_no;
-static gint hf_lwapp_control_length;
+static int proto_lwapp;
+static int proto_lwapp_l3;
+static int proto_lwapp_control;
+static int ett_lwapp;
+static int ett_lwapp_l3;
+static int ett_lwapp_flags;
+static int ett_lwapp_control;
+
+static int hf_lwapp_version;
+static int hf_lwapp_slotid;
+static int hf_lwapp_flags;
+static int hf_lwapp_flags_type;
+static int hf_lwapp_flags_fragment;
+static int hf_lwapp_flags_fragment_type;
+static int hf_lwapp_fragment_id;
+static int hf_lwapp_length;
+static int hf_lwapp_rssi;
+static int hf_lwapp_snr;
+/* static int hf_lwapp_control; */
+static int hf_lwapp_control_mac;
+static int hf_lwapp_control_type;
+static int hf_lwapp_control_seq_no;
+static int hf_lwapp_control_length;
 
 #define LWAPP_MAX_NESTED_ENCAP 10
 
@@ -68,22 +68,22 @@ static dissector_handle_t wlan_bsfc_handle;
 static bool swap_frame_control;
 
 typedef struct {
-    guint8  flags;
-    guint8  fragmentId;
-    guint16 length;
-    guint8  rssi;
-    guint8  snr;
+    uint8_t flags;
+    uint8_t fragmentId;
+    uint16_t length;
+    uint8_t rssi;
+    uint8_t snr;
 } LWAPP_Header;
 
 typedef struct {
-    guint8   tag;
-    guint16  length;
+    uint8_t  tag;
+    uint16_t length;
 } CNTL_Data_Header;
 
 typedef struct {
-    guint8  type;
-    guint8  seqNo;
-    guint16 length;
+    uint8_t type;
+    uint8_t seqNo;
+    uint16_t length;
 } CNTL_Header;
 
 #if 0
@@ -259,7 +259,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo,
 
     /* Set up structures needed to add the protocol subtree and manage it */
     proto_item      *ti;
-    gint             offset=0;
+    int              offset=0;
 
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
@@ -267,7 +267,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo,
                     "CNTL ");
 
     /* Copy our header */
-    tvb_memcpy(tvb, (guint8*) &header, offset, sizeof(header));
+    tvb_memcpy(tvb, (uint8_t*) &header, offset, sizeof(header));
 
     /*
      * Fix the length (network byte ordering), and set our version &
@@ -317,7 +317,7 @@ dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo,
     /* Set up structures needed to add the protocol subtree and manage it */
     proto_item *ti;
     proto_tree *lwapp_tree;
-    gint        offset = 0;
+    int         offset = 0;
     tvbuff_t   *next_client;
 
     /* Make entries in Protocol column and Info column on summary display */
@@ -348,23 +348,23 @@ dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo,
                         proto_tree *tree, void* data _U_)
 {
     LWAPP_Header header;
-    guint8       slotId;
-    guint8       version;
+    uint8_t      slotId;
+    uint8_t      version;
     proto_tree  *lwapp_tree;
     tvbuff_t    *next_client;
-    guint8       dest_mac[6];
-    guint8       have_destmac=0;
+    uint8_t      dest_mac[6];
+    uint8_t      have_destmac=0;
     static int * const flags[] = {
         &hf_lwapp_flags_type,
         &hf_lwapp_flags_fragment,
         &hf_lwapp_flags_fragment_type,
         NULL
     };
-    guint encap_nested_count;
+    unsigned encap_nested_count;
 
     /* Set up structures needed to add the protocol subtree and manage it */
     proto_item      *ti;
-    gint             offset=0;
+    int              offset=0;
 
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
@@ -378,11 +378,11 @@ dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo,
         have_destmac = 1;
 
         /* Copy our header */
-        tvb_memcpy(tvb, (guint8*) &header, offset + 6, sizeof(header));
+        tvb_memcpy(tvb, (uint8_t*) &header, offset + 6, sizeof(header));
     } else {
 
         /* Copy our header */
-        tvb_memcpy(tvb, (guint8*) &header, offset, sizeof(header));
+        tvb_memcpy(tvb, (uint8_t*) &header, offset, sizeof(header));
     }
 
 
@@ -514,7 +514,7 @@ proto_register_lwapp(void)
           { "Control Length","lwapp.control.length", FT_UINT16, BASE_DEC,
             NULL, 0x0, NULL, HFILL }},
     };
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lwapp_l3,
         &ett_lwapp,
         &ett_lwapp_control,
diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c
index c7b486622c..d71e983f90 100644
--- a/epan/dissectors/packet-lwm.c
+++ b/epan/dissectors/packet-lwm.c
@@ -84,9 +84,9 @@ void proto_register_lwm(void);
 void proto_reg_handoff_lwm(void);
 
 /* User string with the decryption key. */
-static const gchar *lwmes_key_str;
-static gboolean     lwmes_key_valid;
-static guint8       lwmes_key[16];
+static const char *lwmes_key_str;
+static bool         lwmes_key_valid;
+static uint8_t      lwmes_key[16];
 
 /* Dissection Routines. */
 static int  dissect_lwm                       (tvbuff_t *, packet_info *, proto_tree *, void *data);
@@ -125,10 +125,10 @@ static int hf_lwm_cmd_forwlinkquality;
 static int hf_lwm_cmd_revlinkquality;
 
 /* Initialize protocol subtrees. */
-static gint ett_lwm;
-static gint ett_lwm_fcf;
-static gint ett_lwm_cmd_tree;
-static gint ett_lwm_multi_tree;
+static int ett_lwm;
+static int ett_lwm_fcf;
+static int ett_lwm_cmd_tree;
+static int ett_lwm_multi_tree;
 
 static expert_field ei_lwm_mal_error;
 static expert_field ei_lwm_n_src_broad;
@@ -169,10 +169,10 @@ static const value_string lwm_cmd_multi_names[] = {
 static bool
 dissect_lwm_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    guint8 endpt, srcep, dstep;
+    uint8_t endpt, srcep, dstep;
 
     /* 1) first byte must have bits 0000xxxx */
-    if(tvb_get_guint8(tvb, 0) & LWM_FCF_RESERVED)
+    if(tvb_get_uint8(tvb, 0) & LWM_FCF_RESERVED)
         return false;
 
     /* The header should be at least long enough for the base header. */
@@ -180,7 +180,7 @@ dissect_lwm_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
         return false;
 
     /* The endpoints should either both be zero, or both non-zero. */
-    endpt = tvb_get_guint8(tvb, 6);
+    endpt = tvb_get_uint8(tvb, 6);
     srcep = (endpt & LWM_SRC_ENDP_MASK) >> LWM_SRC_ENDP_OFFSET;
     dstep = (endpt & LWM_DST_ENDP_MASK) >> LWM_DST_ENDP_OFFSET;
     if ((srcep == 0) && (dstep != 0))
@@ -207,19 +207,19 @@ dissect_lwm_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
  */
 static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    guint       lwm_header_len;
+    unsigned    lwm_header_len;
 
-    guint8      lwm_fcf;
-    gboolean    lwm_fcf_security;
-    gboolean    lwm_fcf_multicast;
+    uint8_t     lwm_fcf;
+    bool        lwm_fcf_security;
+    bool        lwm_fcf_multicast;
 
 
-    guint8      lwm_seq;
-    guint16     lwm_src_addr;
-    guint16     lwm_dst_addr;
-    guint8      lwm_endp_field;
-    guint8      lwm_src_endp;
-    guint8      lwm_dst_endp;
+    uint8_t     lwm_seq;
+    uint16_t    lwm_src_addr;
+    uint16_t    lwm_dst_addr;
+    uint8_t     lwm_endp_field;
+    uint8_t     lwm_src_endp;
+    uint8_t     lwm_dst_endp;
 
     proto_tree *lwm_tree        = NULL;
     proto_item *ti_proto        = NULL;
@@ -255,7 +255,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     /*--------------------------------------------------*/
 
     /*Frame control fields*/
-    lwm_fcf = tvb_get_guint8(tvb, 0);
+    lwm_fcf = tvb_get_uint8(tvb, 0);
 
     lwm_fcf_security  = (lwm_fcf & LWM_FCF_SEC_EN);
     lwm_fcf_multicast = (lwm_fcf & LWM_FCF_MULTICAST);
@@ -274,7 +274,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     }
 
     /*Sequence number*/
-    lwm_seq = tvb_get_guint8(tvb, 1);
+    lwm_seq = tvb_get_uint8(tvb, 1);
     proto_item_append_text(ti_proto, ", Sequence Number: %i", lwm_seq);
     proto_tree_add_uint(lwm_tree, hf_lwm_seq, tvb, 1, 1, lwm_seq);
 
@@ -322,7 +322,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     col_append_fstr(pinfo->cinfo, COL_INFO, ", Nwk_Dst: 0x%04x, Nwk_Src: 0x%04x", lwm_dst_addr, lwm_src_addr);
 
     /*Endpoints*/
-    lwm_endp_field = tvb_get_guint8(tvb, 6);
+    lwm_endp_field = tvb_get_uint8(tvb, 6);
     lwm_src_endp   = (lwm_endp_field & LWM_SRC_ENDP_MASK) >> LWM_SRC_ENDP_OFFSET;
     lwm_dst_endp   = (lwm_endp_field & LWM_DST_ENDP_MASK) >> LWM_DST_ENDP_OFFSET;
 
@@ -355,7 +355,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 
         if(tree){
             proto_tree *multi_tree;
-            guint16     lwm_multi_header;
+            uint16_t    lwm_multi_header;
 
             lwm_multi_header =  tvb_get_letohs(tvb, 7);
             multi_tree = proto_tree_add_subtree(lwm_tree, tvb, 7, 2, ett_lwm_multi_tree, NULL, "Multicast Header");
@@ -392,9 +392,9 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 
     /*Encrypted data*/
     if(lwm_fcf_security){
-        guint rlen;
-        gint  start;
-        guint32 lwm_mic;
+        unsigned rlen;
+        int   start;
+        uint32_t lwm_mic;
 
         /*MIC field*/
         rlen = tvb_reported_length(new_tvb);
@@ -405,32 +405,32 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
         if(lwmes_key_valid)
         {
             ieee802154_packet *ieee_packet = NULL;
-            gint payload_length = 0;
-            gint length = 0;
-            gint payload_offset = 0;
-            guint8 block;
+            int payload_length = 0;
+            int length = 0;
+            int payload_offset = 0;
+            uint8_t block;
             tvbuff_t *decrypted_tvb;
             gcry_cipher_hd_t cypher_hd;
-            guint8* vector = NULL;
-            guint8* text =NULL;
-            guint8* text_dec =NULL;
-            guint8 i;
-            guint32 vmic;
-            guint32 nwkSecurityVector[4];
+            uint8_t* vector = NULL;
+            uint8_t* text =NULL;
+            uint8_t* text_dec =NULL;
+            uint8_t i;
+            uint32_t vmic;
+            uint32_t nwkSecurityVector[4];
             int gcrypt_err;
 
             ieee_packet = (ieee802154_packet *)data;
 
             memset(&nwkSecurityVector, 0, sizeof(nwkSecurityVector));
             nwkSecurityVector[0] = lwm_seq;
-            nwkSecurityVector[1] = ((guint32)lwm_dst_addr<< 16) | lwm_dst_endp;
-            nwkSecurityVector[2]= ((guint32) lwm_src_addr<< 16) | lwm_src_endp;
-            nwkSecurityVector[3] = ((guint32)ieee_packet->dst_pan << 16) | (guint8)lwm_fcf;
+            nwkSecurityVector[1] = ((uint32_t)lwm_dst_addr<< 16) | lwm_dst_endp;
+            nwkSecurityVector[2]= ((uint32_t) lwm_src_addr<< 16) | lwm_src_endp;
+            nwkSecurityVector[3] = ((uint32_t)ieee_packet->dst_pan << 16) | (uint8_t)lwm_fcf;
 
             payload_length=tvb_reported_length(new_tvb) - LWM_MIC_LEN;
 
             /* ECB - Nwk security vector*/
-            text = (guint8 *)tvb_memdup(pinfo->pool, new_tvb, 0, payload_length);
+            text = (uint8_t *)tvb_memdup(pinfo->pool, new_tvb, 0, payload_length);
             payload_offset=0;
 
             gcrypt_err = gcry_cipher_open(&cypher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_ECB, 0);
@@ -438,10 +438,10 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
             while(payload_length>0)
             {
                 if(gcrypt_err == 0) {
-                    gcrypt_err = gcry_cipher_setkey(cypher_hd,(guint8 *)lwmes_key, 16);
+                    gcrypt_err = gcry_cipher_setkey(cypher_hd,(uint8_t *)lwmes_key, 16);
                 }
                 if(gcrypt_err == 0) {
-                    gcrypt_err = gcry_cipher_encrypt(cypher_hd,(guint8 *)nwkSecurityVector,16,(guint8 *)nwkSecurityVector,16);
+                    gcrypt_err = gcry_cipher_encrypt(cypher_hd,(uint8_t *)nwkSecurityVector,16,(uint8_t *)nwkSecurityVector,16);
                 }
 
                 if(gcrypt_err)
@@ -455,7 +455,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
                 }
 
                 text_dec = &text[payload_offset];
-                vector = (guint8 *)nwkSecurityVector;
+                vector = (uint8_t *)nwkSecurityVector;
                 block =  (payload_length < 16) ? payload_length : 16;
 
                 for (i = 0; i < block; i++)
@@ -511,15 +511,15 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
     /*stack command endpoint 0 and not secured*/
     else if( (lwm_src_endp == 0) && (lwm_dst_endp == 0) ){
         proto_tree *lwm_cmd_tree;
-        guint8      lwm_cmd;
-        guint       len;
+        uint8_t     lwm_cmd;
+        unsigned    len;
 
         /*----------------------------------------------------------------------*/
         /*                                                                      */
         /*  Call command dissector (depends on value of first byte of payload)  */
         /*                                                                      */
         /*----------------------------------------------------------------------*/
-        lwm_cmd = tvb_get_guint8(new_tvb, 0);
+        lwm_cmd = tvb_get_uint8(new_tvb, 0);
 
         col_clear(pinfo->cinfo, COL_INFO);  /*XXX: why ?*/
         col_add_str(pinfo->cinfo, COL_INFO,
@@ -592,10 +592,10 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
  */
 static int dissect_lwm_cmd_frame_ack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lwm_cmd_tree)
 {
-    guint8 lwm_seq;
+    uint8_t lwm_seq;
 
     /*Get fields*/
-    lwm_seq = tvb_get_guint8(tvb, 1);
+    lwm_seq = tvb_get_uint8(tvb, 1);
 
     col_append_fstr(pinfo->cinfo, COL_INFO, ", Sequence number: %d", lwm_seq);
 
@@ -631,7 +631,7 @@ static int dissect_lwm_cmd_frame_route_err(tvbuff_t *tvb, packet_info *pinfo _U_
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_src, tvb, 1, 2, ENC_LITTLE_ENDIAN);
         ti = proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_dst, tvb, 3, 2, ENC_LITTLE_ENDIAN);
 
-        if(tvb_get_guint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
+        if(tvb_get_uint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
             proto_item_append_text(ti, " %s", LWM_MULTI_GROUP_STRING);
         }else{
             proto_item_append_text(ti, " %s", LWM_MULTI_UNICAST_STRING);
@@ -662,12 +662,12 @@ static int dissect_lwm_cmd_frame_route_req(tvbuff_t *tvb, packet_info *pinfo _U_
 {
     if(lwm_cmd_tree){
         proto_item *ti;
-        guint8      lwm_linkqual;
+        uint8_t     lwm_linkqual;
 
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_src, tvb, 1, 2, ENC_LITTLE_ENDIAN);
         ti = proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_dst, tvb, 3, 2, ENC_LITTLE_ENDIAN);
 
-        if(tvb_get_guint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
+        if(tvb_get_uint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
             proto_item_append_text(ti, " %s", LWM_MULTI_GROUP_STRING);
         }else{
             proto_item_append_text(ti, " %s", LWM_MULTI_UNICAST_STRING);
@@ -675,7 +675,7 @@ static int dissect_lwm_cmd_frame_route_req(tvbuff_t *tvb, packet_info *pinfo _U_
 
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_multi, tvb, 5, 1, ENC_NA);
 
-        lwm_linkqual  = tvb_get_guint8(tvb, 6);
+        lwm_linkqual  = tvb_get_uint8(tvb, 6);
         ti = proto_tree_add_uint(lwm_cmd_tree, hf_lwm_cmd_linkquality, tvb, 6, 1, lwm_linkqual);
         if(lwm_linkqual == 255){
             proto_item_append_text(ti, " %s", LWM_CMD_LINKQ_STRING);
@@ -704,12 +704,12 @@ static int dissect_lwm_cmd_frame_route_reply(tvbuff_t *tvb, packet_info *pinfo _
 {
     if(lwm_cmd_tree){
         proto_item *ti;
-        guint8      lwm_revlinkqual;
+        uint8_t     lwm_revlinkqual;
 
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_src, tvb, 1, 2, ENC_LITTLE_ENDIAN);
         ti = proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_dst, tvb, 3, 2, ENC_LITTLE_ENDIAN);
 
-        if(tvb_get_guint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
+        if(tvb_get_uint8(tvb, 5) == LWM_CMD_MULTI_ADDR_TRUE){
             proto_item_append_text(ti, " %s", LWM_MULTI_GROUP_STRING);
         }else{
             proto_item_append_text(ti, " %s", LWM_MULTI_UNICAST_STRING);
@@ -718,7 +718,7 @@ static int dissect_lwm_cmd_frame_route_reply(tvbuff_t *tvb, packet_info *pinfo _
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_route_multi, tvb, 5, 1, ENC_NA);
         proto_tree_add_item(lwm_cmd_tree, hf_lwm_cmd_forwlinkquality, tvb, 6, 1, ENC_NA);
 
-        lwm_revlinkqual = tvb_get_guint8(tvb, 7);
+        lwm_revlinkqual = tvb_get_uint8(tvb, 7);
         ti = proto_tree_add_uint(lwm_cmd_tree, hf_lwm_cmd_revlinkquality, tvb, 7, 1, lwm_revlinkqual);
         if(lwm_revlinkqual == 255){
             proto_item_append_text(ti, " %s", LWM_CMD_LINKQ_STRING);
@@ -866,7 +866,7 @@ void proto_register_lwm(void)
     };
 
     /* Subtrees */
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lwm,
         &ett_lwm_fcf,
         &ett_lwm_multi_tree,
@@ -921,25 +921,25 @@ void proto_register_lwm(void)
  */
 void proto_reg_handoff_lwm(void)
 {
-    static gboolean initialized = FALSE;
+    static bool initialized = false;
     GByteArray      *bytes;
-    gboolean         res;
+    bool             res;
 
     if (!initialized) {
         /* Register our dissector with IEEE 802.15.4 */
         dissector_add_for_decode_as(IEEE802154_PROTOABBREV_WPAN_PANID, lwm_handle);
         heur_dissector_add(IEEE802154_PROTOABBREV_WPAN, dissect_lwm_heur, "Lightweight Mesh over IEEE 802.15.4", "lwm_wlan", proto_lwm, HEURISTIC_ENABLE);
 
-        initialized = TRUE;
+        initialized = true;
     }
     /* Convert key to raw bytes */
     bytes = g_byte_array_new();
-    res = hex_str_to_bytes(lwmes_key_str, bytes, FALSE);
+    res = hex_str_to_bytes(lwmes_key_str, bytes, false);
     lwmes_key_valid = (res && bytes->len >= IEEE802154_CIPHER_SIZE);
     if (lwmes_key_valid) {
         memcpy(lwmes_key, bytes->data, IEEE802154_CIPHER_SIZE);
     }
-    g_byte_array_free(bytes, TRUE);
+    g_byte_array_free(bytes, true);
 
 } /* proto_reg_handoff_lwm */
 
diff --git a/epan/dissectors/packet-lwm2mtlv.c b/epan/dissectors/packet-lwm2mtlv.c
index 7d20f0bbe6..1087872cf4 100644
--- a/epan/dissectors/packet-lwm2mtlv.c
+++ b/epan/dissectors/packet-lwm2mtlv.c
@@ -58,13 +58,13 @@ static int hf_lwm2mtlv_resource_instance;
 static int hf_lwm2mtlv_resource_array;
 static int hf_lwm2mtlv_resource;
 
-static gint ett_lwm2mtlv;
-static gint ett_lwm2mtlv_header;
-static gint ett_lwm2mtlv_resource;
-static gint ett_lwm2mtlv_resource_instance;
-static gint ett_lwm2mtlv_resource_array;
-static gint ett_lwm2mtlv_object_instance;
-static gint ett_lwm2mtlv_location_velocity;
+static int ett_lwm2mtlv;
+static int ett_lwm2mtlv_header;
+static int ett_lwm2mtlv_resource;
+static int ett_lwm2mtlv_resource_instance;
+static int ett_lwm2mtlv_resource_array;
+static int ett_lwm2mtlv_object_instance;
+static int ett_lwm2mtlv_location_velocity;
 
 typedef enum {
 	OBJECT_INSTANCE   = 0,
@@ -97,31 +97,31 @@ static const value_string length_type[] = {
 
 typedef struct
 {
-	guint type;
-	guint length_of_identifier;
-	guint length_of_length;
-	guint length_of_value;
-	guint identifier;
-	guint length;
-	guint totalLength;
+	unsigned type;
+	unsigned length_of_identifier;
+	unsigned length_of_length;
+	unsigned length_of_value;
+	unsigned identifier;
+	unsigned length;
+	unsigned totalLength;
 } lwm2mElement_t;
 
 typedef struct _lwm2m_object_name_t {
-	guint   object_id;
+	unsigned   object_id;
 	char   *name;
 } lwm2m_object_name_t;
 
 typedef struct _lwm2m_resource_t {
-	guint   object_id;
-	guint   resource_id;
+	unsigned   object_id;
+	unsigned   resource_id;
 	char   *name;
-	guint   data_type;
-	gint   *hf_id;
-	gint    ett_id;
+	unsigned   data_type;
+	int    *hf_id;
+	int     ett_id;
 	char   *field_name;
 } lwm2m_resource_t;
 
-static void parseArrayOfElements(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, gint object_id, gint resource_id);
+static void parseArrayOfElements(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, int object_id, int resource_id);
 
 /* RESOURCE_FILL initializes all the dynamic fields in a lwm2m_resource_t. */
 #define RESOURCE_FILL NULL, -1, NULL
@@ -299,14 +299,14 @@ static lwm2m_resource_t lwm2m_oma_resources[] =
 	{ 21, 4, "HMAC Algorithm", DATA_TYPE_INTEGER, RESOURCE_FILL },
 	{ 21, 5, "Master Salt", DATA_TYPE_STRING, RESOURCE_FILL },
 };
-static const guint num_lwm2m_oma_resources = array_length(lwm2m_oma_resources);
+static const unsigned num_lwm2m_oma_resources = array_length(lwm2m_oma_resources);
 
 typedef struct _lwm2m_allocated_fields_t {
 	hf_register_info *hf;
-	guint             hf_size;
+	unsigned          hf_size;
 	GArray           *ett;
 	lwm2m_resource_t *float_resources;
-	guint             num_float_resources;
+	unsigned          num_float_resources;
 } lwm2m_allocated_fields_t;
 
 static lwm2m_allocated_fields_t oma_allocated_fields;
@@ -314,9 +314,9 @@ static lwm2m_allocated_fields_t uat_allocated_fields;
 
 /* LwM2M Objects defined by User */
 static lwm2m_object_name_t *lwm2m_uat_object_names;
-static guint num_lwm2m_uat_object_names;
+static unsigned num_lwm2m_uat_object_names;
 static lwm2m_resource_t *lwm2m_uat_resources;
-static guint num_lwm2m_uat_resources;
+static unsigned num_lwm2m_uat_resources;
 
 static bool lwm2m_object_name_update_cb(void *record, char **error)
 {
@@ -324,17 +324,17 @@ static bool lwm2m_object_name_update_cb(void *record, char **error)
 
 	if (rec->name == NULL) {
 		*error = g_strdup("Object Name can't be empty");
-		return FALSE;
+		return false;
 	}
 
 	g_strstrip(rec->name);
 	if (rec->name[0] == 0) {
 		*error = g_strdup("Object Name can't be empty");
-		return FALSE;
+		return false;
 	}
 
 	*error = NULL;
-	return TRUE;
+	return true;
 }
 
 static void *lwm2m_object_name_copy_cb(void *dest, const void *source, size_t len _U_)
@@ -365,13 +365,13 @@ static bool lwm2m_resource_update_cb(void *record, char **error)
 
 	if (rec->name == NULL) {
 		*error = g_strdup("Resource Name can't be empty");
-		return FALSE;
+		return false;
 	}
 
 	g_strstrip(rec->name);
 	if (rec->name[0] == 0) {
 		*error = g_strdup("Resource Name can't be empty");
-		return FALSE;
+		return false;
 	}
 
 	g_free(rec->field_name);
@@ -386,11 +386,11 @@ static bool lwm2m_resource_update_cb(void *record, char **error)
 	c = proto_check_field_name(rec->field_name);
 	if (c) {
 		*error = ws_strdup_printf("Resource Name can't contain '%c'", c);
-		return FALSE;
+		return false;
 	}
 
 	*error = NULL;
-	return TRUE;
+	return true;
 }
 
 static void *lwm2m_resource_copy_cb(void *dest, const void *source, size_t len _U_)
@@ -415,12 +415,12 @@ static void lwm2m_resource_free_cb(void *record)
 	g_free(rec->field_name);
 }
 
-static void lwm2m_add_resource(lwm2m_resource_t *resource, hf_register_info *hf, gboolean float_as_double)
+static void lwm2m_add_resource(lwm2m_resource_t *resource, hf_register_info *hf, bool float_as_double)
 {
-	gchar *resource_abbrev;
-	gint *hf_id;
+	char *resource_abbrev;
+	int *hf_id;
 
-	hf_id = g_new(gint,1);
+	hf_id = g_new(int,1);
 	*hf_id = -1;
 
 	if (resource->field_name) {
@@ -481,12 +481,12 @@ static void lwm2m_add_resource(lwm2m_resource_t *resource, hf_register_info *hf,
 	HFILL_INIT(*hf);
 }
 
-static void lwm2m_allocate_fields(lwm2m_allocated_fields_t *fields, lwm2m_resource_t *lwm2m_resources, guint num_lwm2m_resources)
+static void lwm2m_allocate_fields(lwm2m_allocated_fields_t *fields, lwm2m_resource_t *lwm2m_resources, unsigned num_lwm2m_resources)
 {
-	guint resource_index;
+	unsigned resource_index;
 
 	fields->num_float_resources = 0;
-	for (guint i = 0; i < num_lwm2m_resources; i++) {
+	for (unsigned i = 0; i < num_lwm2m_resources; i++) {
 		if (lwm2m_resources[i].data_type == DATA_TYPE_FLOAT) {
 			fields->num_float_resources++;
 		}
@@ -494,28 +494,28 @@ static void lwm2m_allocate_fields(lwm2m_allocated_fields_t *fields, lwm2m_resour
 
 	fields->hf_size = num_lwm2m_resources + fields->num_float_resources;
 	fields->hf = g_new0(hf_register_info, fields->hf_size);
-	fields->ett = g_array_new(TRUE, TRUE, sizeof(gint*));
+	fields->ett = g_array_new(true, true, sizeof(int*));
 	fields->float_resources = g_new0(lwm2m_resource_t, fields->num_float_resources);
 
 	resource_index = 0;
-	for (guint i = 0; i < num_lwm2m_resources; i++) {
-		gint *ettp = &(lwm2m_resources[i].ett_id);
-		lwm2m_add_resource(&lwm2m_resources[i], &fields->hf[i], FALSE);
+	for (unsigned i = 0; i < num_lwm2m_resources; i++) {
+		int *ettp = &(lwm2m_resources[i].ett_id);
+		lwm2m_add_resource(&lwm2m_resources[i], &fields->hf[i], false);
 		g_array_append_val(fields->ett, ettp);
 
 		/* 8 bytes Float is handled as Double, allocate a separate resource for FT_DOUBLE */
 		if (lwm2m_resources[i].data_type == DATA_TYPE_FLOAT) {
-			guint hf_index = num_lwm2m_resources + resource_index;
+			unsigned hf_index = num_lwm2m_resources + resource_index;
 			memcpy(&fields->float_resources[resource_index], &lwm2m_resources[i], sizeof(lwm2m_resource_t));
-			lwm2m_add_resource(&fields->float_resources[resource_index++], &fields->hf[hf_index], TRUE);
+			lwm2m_add_resource(&fields->float_resources[resource_index++], &fields->hf[hf_index], true);
 		}
 	}
 
 	proto_register_field_array(proto_lwm2mtlv, fields->hf, fields->hf_size);
-	proto_register_subtree_array((gint**)(void*)fields->ett->data, fields->ett->len);
+	proto_register_subtree_array((int**)(void*)fields->ett->data, fields->ett->len);
 
 	resource_index = 0;
-	for (guint i = 0; i < num_lwm2m_resources; i++) {
+	for (unsigned i = 0; i < num_lwm2m_resources; i++) {
 		/* Reuse the same ETT for Float and Double resources */
 		if (lwm2m_resources[i].data_type == DATA_TYPE_FLOAT) {
 			fields->float_resources[resource_index++].ett_id = lwm2m_resources[i].ett_id;
@@ -523,12 +523,12 @@ static void lwm2m_allocate_fields(lwm2m_allocated_fields_t *fields, lwm2m_resour
 	}
 }
 
-static const lwm2m_resource_t *lwm2m_search_float_resources(guint object_id, guint resource_id,
+static const lwm2m_resource_t *lwm2m_search_float_resources(unsigned object_id, unsigned resource_id,
 						     const lwm2m_allocated_fields_t *fields)
 {
 	const lwm2m_resource_t *resource = NULL;
 
-	for (guint i = 0; i < fields->num_float_resources; i++) {
+	for (unsigned i = 0; i < fields->num_float_resources; i++) {
 		if ((object_id == fields->float_resources[i].object_id) &&
 		    (resource_id == fields->float_resources[i].resource_id))
 		{
@@ -540,13 +540,13 @@ static const lwm2m_resource_t *lwm2m_search_float_resources(guint object_id, gui
 	return resource;
 }
 
-static const lwm2m_resource_t *lwm2m_search_fields(guint object_id, guint resource_id, guint length_of_value,
+static const lwm2m_resource_t *lwm2m_search_fields(unsigned object_id, unsigned resource_id, unsigned length_of_value,
 					    const lwm2m_allocated_fields_t *fields,
-					    const lwm2m_resource_t *lwm2m_resources, guint num_lwm2m_resources)
+					    const lwm2m_resource_t *lwm2m_resources, unsigned num_lwm2m_resources)
 {
 	const lwm2m_resource_t *resource = NULL;
 
-	for (guint i = 0; i < num_lwm2m_resources; i++) {
+	for (unsigned i = 0; i < num_lwm2m_resources; i++) {
 		if ((object_id == lwm2m_resources[i].object_id) &&
 		    (resource_id == lwm2m_resources[i].resource_id))
 		{
@@ -567,7 +567,7 @@ static void lwm2m_free_fields(lwm2m_allocated_fields_t *fields)
 {
 	if (fields->hf) {
 		/* Deregister all fields */
-		for (guint i = 0; i < fields->hf_size; i++) {
+		for (unsigned i = 0; i < fields->hf_size; i++) {
 			proto_deregister_field(proto_lwm2mtlv, *(fields->hf[i].p_id));
 			g_free (fields->hf[i].p_id);
 		}
@@ -578,7 +578,7 @@ static void lwm2m_free_fields(lwm2m_allocated_fields_t *fields)
 	}
 
 	if (fields->ett) {
-		g_array_free(fields->ett, TRUE);
+		g_array_free(fields->ett, true);
 		fields->ett = NULL;
 	}
 
@@ -603,13 +603,13 @@ static void lwm2m_resource_reset_cb(void)
 	lwm2m_free_fields(&uat_allocated_fields);
 }
 
-static gint64
-decodeVariableInt(tvbuff_t *tvb, const gint offset, const guint length)
+static int64_t
+decodeVariableInt(tvbuff_t *tvb, const int offset, const unsigned length)
 {
 	switch(length)
 	{
 	case 1:
-		return tvb_get_gint8(tvb, offset);
+		return tvb_get_int8(tvb, offset);
 	case 2:
 		return tvb_get_ntohis(tvb, offset);
 	case 3:
@@ -632,7 +632,7 @@ decodeVariableInt(tvbuff_t *tvb, const gint offset, const guint length)
 UAT_DEC_CB_DEF(resource, object_id, lwm2m_resource_t)
 UAT_DEC_CB_DEF(resource, resource_id, lwm2m_resource_t)
 UAT_CSTRING_CB_DEF(resource, name, lwm2m_resource_t)
-UAT_VS_DEF(resource, data_type, lwm2m_resource_t, guint, DATA_TYPE_NONE, "None")
+UAT_VS_DEF(resource, data_type, lwm2m_resource_t, unsigned, DATA_TYPE_NONE, "None")
 
 static void
 addTlvHeaderElements(tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element)
@@ -659,7 +659,7 @@ addTlvHeaderTree(tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element)
 	proto_item *item = NULL;
 	proto_tree *header_tree = NULL;
 
-	guint valueOffset = 1 + element->length_of_identifier + element->length_of_length;
+	unsigned valueOffset = 1 + element->length_of_identifier + element->length_of_length;
 
 	item = proto_tree_add_item(tlv_tree, hf_lwm2mtlv_header, tvb, 0, valueOffset, ENC_NA);
 	header_tree = proto_item_add_subtree(item, ett_lwm2mtlv_header);
@@ -670,8 +670,8 @@ static proto_tree*
 addElementTree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, const lwm2m_resource_t *resource)
 {
 	proto_item *item = NULL;
-	gchar *identifier = NULL;
-	gint ett_id;
+	char *identifier = NULL;
+	int ett_id;
 
 	if (resource) {
 		identifier = wmem_strdup_printf(pinfo->pool, "[%02u] %s", element->identifier, resource->name);
@@ -709,7 +709,7 @@ addElementTree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mEle
 static void
 addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, const lwm2m_resource_t *resource)
 {
-	guint valueOffset;
+	unsigned valueOffset;
 	if ( element->length_of_value == 0 ) return;
 
 	valueOffset = 1 + element->length_of_identifier + element->length_of_length;
@@ -719,7 +719,7 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 		case DATA_TYPE_STRING:
 		case DATA_TYPE_CORELNK:
 		{
-			const guint8 *strval;
+			const uint8_t *strval;
 			proto_tree_add_item_ret_string(tlv_tree, *resource->hf_id, tvb, valueOffset, element->length_of_value, ENC_UTF_8, pinfo->pool, &strval);
 			proto_item_append_text(tlv_tree, ": %s", format_text(pinfo->pool, strval, strlen(strval)));
 			break;
@@ -730,7 +730,7 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 			break;
 		case DATA_TYPE_UNSIGNED_INTEGER:
 		{
-			guint64 value;
+			uint64_t value;
 			proto_tree_add_item_ret_uint64(tlv_tree, *resource->hf_id, tvb, valueOffset, element->length_of_value, ENC_BIG_ENDIAN, &value);
 			proto_item_append_text(tlv_tree, ": %" PRIu64, value);
 			break;
@@ -756,13 +756,13 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 			ts.secs = (time_t)decodeVariableInt(tvb, valueOffset, element->length_of_value);
 			ts.nsecs = 0;
 			proto_tree_add_time(tlv_tree, *resource->hf_id, tvb, valueOffset, element->length_of_value, &ts);
-			proto_item_append_text(tlv_tree, ": %s", abs_time_to_str(pinfo->pool, &ts, ABSOLUTE_TIME_LOCAL, FALSE));
+			proto_item_append_text(tlv_tree, ": %s", abs_time_to_str(pinfo->pool, &ts, ABSOLUTE_TIME_LOCAL, false));
 			break;
 		}
 		case DATA_TYPE_OBJLNK:
 		{
-			guint16 lnk1 = tvb_get_guint16(tvb, valueOffset, ENC_BIG_ENDIAN);
-			guint16 lnk2 = tvb_get_guint16(tvb, valueOffset + 2, ENC_BIG_ENDIAN);
+			uint16_t lnk1 = tvb_get_uint16(tvb, valueOffset, ENC_BIG_ENDIAN);
+			uint16_t lnk2 = tvb_get_uint16(tvb, valueOffset + 2, ENC_BIG_ENDIAN);
 			proto_tree_add_bytes_format(tlv_tree, *resource->hf_id, tvb, valueOffset, element->length_of_value, NULL, "%u:%u", lnk1, lnk2);
 			proto_item_append_text(tlv_tree, ": %u:%u", lnk1, lnk2);
 			break;
@@ -782,7 +782,7 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 		}
 		}
 	} else {
-		guint8 *str = tvb_get_string_enc(pinfo->pool, tvb, valueOffset, element->length_of_value, ENC_UTF_8);
+		uint8_t *str = tvb_get_string_enc(pinfo->pool, tvb, valueOffset, element->length_of_value, ENC_UTF_8);
 		if (isprint_utf8_string(str, element->length_of_value)) {
 			proto_tree_add_item(tlv_tree, hf_lwm2mtlv_value_string, tvb, valueOffset, element->length_of_value, ENC_UTF_8);
 		} else {
@@ -794,7 +794,7 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 		case 0x01:
 			proto_tree_add_item(tlv_tree, hf_lwm2mtlv_value_integer, tvb, valueOffset, element->length_of_value, ENC_BIG_ENDIAN);
 			proto_tree_add_item(tlv_tree, hf_lwm2mtlv_value_unsigned_integer, tvb, valueOffset, element->length_of_value, ENC_BIG_ENDIAN);
-			if (tvb_get_guint8(tvb, valueOffset) < 2) {
+			if (tvb_get_uint8(tvb, valueOffset) < 2) {
 				proto_tree_add_item(tlv_tree, hf_lwm2mtlv_value_boolean, tvb, valueOffset, element->length_of_value, ENC_BIG_ENDIAN);
 			}
 			break;
@@ -821,9 +821,9 @@ addValueInterpretations(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree,
 
 static void
 // NOLINTNEXTLINE(misc-no-recursion)
-addValueTree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, gint object_id, gint resource_id, const lwm2m_resource_t *resource)
+addValueTree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, int object_id, int resource_id, const lwm2m_resource_t *resource)
 {
-	guint valueOffset = 1 + element->length_of_identifier + element->length_of_length;
+	unsigned valueOffset = 1 + element->length_of_identifier + element->length_of_length;
 
 	if (resource && (element->type == RESOURCE || element->type == RESOURCE_ARRAY)) {
 		proto_item *ti = proto_tree_add_string(tlv_tree, hf_lwm2mtlv_resource_name, tvb, 0, 0, resource->name);
@@ -841,7 +841,7 @@ addValueTree(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mEleme
 
 static void
 // NOLINTNEXTLINE(misc-no-recursion)
-addTlvElement(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, gint object_id, gint resource_id)
+addTlvElement(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElement_t *element, int object_id, int resource_id)
 {
 	proto_tree *element_tree = NULL;
 	const lwm2m_resource_t *resource = NULL;
@@ -863,13 +863,13 @@ addTlvElement(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, lwm2mElem
 	addValueTree(pinfo, tvb, element_tree, element, object_id, resource_id, resource);
 }
 
-static guint64
-decodeVariableUInt(tvbuff_t *tvb, const gint offset, const guint length)
+static uint64_t
+decodeVariableUInt(tvbuff_t *tvb, const int offset, const unsigned length)
 {
 	switch(length)
 	{
 	case 1:
-		return tvb_get_guint8(tvb, offset);
+		return tvb_get_uint8(tvb, offset);
 	case 2:
 		return tvb_get_ntohs(tvb, offset);
 	case 3:
@@ -889,18 +889,18 @@ decodeVariableUInt(tvbuff_t *tvb, const gint offset, const guint length)
 	}
 }
 
-static guint parseTLVHeader(tvbuff_t *tvb, lwm2mElement_t *element)
+static unsigned parseTLVHeader(tvbuff_t *tvb, lwm2mElement_t *element)
 {
-	guint type_field = tvb_get_guint8(tvb, 0);
+	unsigned type_field = tvb_get_uint8(tvb, 0);
 	element->type                 = (( type_field >> 6 ) & 0x03 );
 	element->length_of_identifier = (( type_field >> 5 ) & 0x01 ) + 1;
 	element->length_of_length     = (( type_field >> 3 ) & 0x03 );
 	element->length_of_value      = (( type_field >> 0 ) & 0x07 );
 
 	/* It is ok to shorten identifier and length_of_value, they are never more than 24 bits long */
-	element->identifier = (guint) decodeVariableUInt(tvb, 1, element->length_of_identifier);
+	element->identifier = (unsigned) decodeVariableUInt(tvb, 1, element->length_of_identifier);
 	if ( element->length_of_length > 0 ) {
-		element->length_of_value = (guint) decodeVariableUInt(tvb, 1 + element->length_of_identifier, element->length_of_length);
+		element->length_of_value = (unsigned) decodeVariableUInt(tvb, 1 + element->length_of_identifier, element->length_of_length);
 	}
 
 	element->totalLength = 1 + element->length_of_identifier + element->length_of_length + element->length_of_value;
@@ -909,12 +909,12 @@ static guint parseTLVHeader(tvbuff_t *tvb, lwm2mElement_t *element)
 }
 
 // NOLINTNEXTLINE(misc-no-recursion)
-static void parseArrayOfElements(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, gint object_id, gint resource_id)
+static void parseArrayOfElements(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tlv_tree, int object_id, int resource_id)
 {
-	guint length;
-	guint offset = 0;
-	guint elementLength = 0;
-	guint element_count = 0;
+	unsigned length;
+	unsigned offset = 0;
+	unsigned elementLength = 0;
+	unsigned element_count = 0;
 	lwm2mElement_t element;
 
 	length = tvb_reported_length(tvb);
@@ -924,7 +924,7 @@ static void parseArrayOfElements(packet_info *pinfo, tvbuff_t *tvb, proto_tree *
 		tvbuff_t* sub = tvb_new_subset_length(tvb, offset, length);
 		elementLength = parseTLVHeader(sub, &element);
 		if (element.type == RESOURCE || element.type == RESOURCE_ARRAY) {
-			resource_id = (gint)element.identifier;
+			resource_id = (int)element.identifier;
 		}
 		addTlvElement(pinfo, sub, tlv_tree, &element, object_id, resource_id);
 		element_count++;
@@ -947,11 +947,11 @@ dissect_lwm2mtlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 	proto_tree* lwm2mtlv_tree;
 	proto_item* lwm2mtlv_item;
 	media_content_info_t *content_info = (media_content_info_t *) data;
-	gint object_id = -1;
-	gint resource_id = -1;
+	int object_id = -1;
+	int resource_id = -1;
 
 	if (content_info && content_info->media_str && content_info->media_str[0]) {
-		gchar **ids = wmem_strsplit(pinfo->pool, content_info->media_str, "/", 5);
+		char **ids = wmem_strsplit(pinfo->pool, content_info->media_str, "/", 5);
 
 		/* URI path is defined as:
 		 *  ids[1] = Object ID
@@ -960,10 +960,10 @@ dissect_lwm2mtlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 		 *  ids[4] = Resource Instance
 		 */
 		if (ids && ids[0] && ids[1]) {
-			object_id = (gint)strtol(ids[1], NULL, 10);
+			object_id = (int)strtol(ids[1], NULL, 10);
 
 			if (ids[2] && ids[3]) {
-				resource_id = (gint)strtol(ids[1], NULL, 10);
+				resource_id = (int)strtol(ids[1], NULL, 10);
 			}
 		}
 	}
@@ -973,10 +973,10 @@ dissect_lwm2mtlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 		lwm2mtlv_tree = proto_item_add_subtree(lwm2mtlv_item, ett_lwm2mtlv);
 
 		if (object_id != -1) {
-			const gchar *object_name = NULL;
+			const char *object_name = NULL;
 
-			for (guint i = 0; i < num_lwm2m_uat_object_names; i++) {
-				if ((guint)object_id == lwm2m_uat_object_names[i].object_id) {
+			for (unsigned i = 0; i < num_lwm2m_uat_object_names; i++) {
+				if ((unsigned)object_id == lwm2m_uat_object_names[i].object_id) {
 					object_name = lwm2m_uat_object_names[i].name;
 					break;
 				}
@@ -1118,7 +1118,7 @@ void proto_register_lwm2mtlv(void)
 		},
 	};
 
-	static gint* ett[] = {
+	static int* ett[] = {
 		&ett_lwm2mtlv,
 		&ett_lwm2mtlv_header,
 		&ett_lwm2mtlv_resource,
@@ -1145,7 +1145,7 @@ void proto_register_lwm2mtlv(void)
 	uat_t *object_name_uat = uat_new("User Object Names",
 	                                 sizeof(lwm2m_object_name_t),
 	                                 "lwm2m_object_names",
-	                                 TRUE,
+	                                 true,
 	                                 &lwm2m_uat_object_names,
 	                                 &num_lwm2m_uat_object_names,
 	                                 UAT_AFFECTS_DISSECTION,
@@ -1160,7 +1160,7 @@ void proto_register_lwm2mtlv(void)
 	uat_t *resource_uat = uat_new("User Resource Names",
 	                              sizeof(lwm2m_resource_t),
 	                              "lwm2m_resource_names",
-	                              TRUE,
+	                              true,
 	                              &lwm2m_uat_resources,
 	                              &num_lwm2m_uat_resources,
 	                              UAT_AFFECTS_DISSECTION|UAT_AFFECTS_FIELDS,
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index e7bc947d0c..9daf1b09b7 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -187,8 +187,8 @@ static const value_string message_types_values[] = {
 
 static void dissect_getnamebyaddr_request(tvbuff_t* tvb, packet_info *pinfo, proto_tree* lwres_tree)
 {
-    guint32 flags,family;
-    guint   addrlen, slen;
+    uint32_t flags,family;
+    unsigned   addrlen, slen;
     const char* addrs;
 
     proto_tree* nba_request_tree;
@@ -221,9 +221,9 @@ static void dissect_getnamebyaddr_request(tvbuff_t* tvb, packet_info *pinfo, pro
 
 static void dissect_getnamebyaddr_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree* lwres_tree)
 {
-    guint32 i, offset;
-    guint16 naliases,realnamelen,aliaslen;
-    gchar *aliasname;
+    uint32_t i, offset;
+    uint16_t naliases,realnamelen,aliaslen;
+    char *aliasname;
 
     proto_tree* nba_resp_tree;
     proto_tree* alias_tree;
@@ -296,7 +296,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, packet_info *pinfo, pr
 
 static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree)
 {
-    guint16 namelen;
+    uint16_t namelen;
 
     proto_tree* adn_request_tree;
 
@@ -314,21 +314,21 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree
                 hf_adn_flags,
                 tvb,
                 LWRES_LWPACKET_LENGTH+0,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 ENC_BIG_ENDIAN);
 
     proto_tree_add_item(adn_request_tree,
                 hf_adn_addrtype,
                 tvb,
                 LWRES_LWPACKET_LENGTH+4,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 ENC_BIG_ENDIAN);
 
     proto_tree_add_item(adn_request_tree,
                 hf_adn_namelen,
                 tvb,
                 LWRES_LWPACKET_LENGTH+8,
-                sizeof(guint16),
+                sizeof(uint16_t),
                 ENC_BIG_ENDIAN);
 
     proto_tree_add_item(adn_request_tree,
@@ -343,11 +343,11 @@ static void dissect_getaddrsbyname_request(tvbuff_t* tvb, proto_tree* lwres_tree
 
 static void dissect_getaddrsbyname_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree* lwres_tree)
 {
-    guint32 family ,i, offset;
-    guint16 naliases, naddrs, realnamelen, length, aliaslen;
-    const gchar* addrs;
-    guint slen;
-    gchar *aliasname;
+    uint32_t family ,i, offset;
+    uint16_t naliases, naddrs, realnamelen, length, aliaslen;
+    const char* addrs;
+    unsigned slen;
+    char *aliasname;
 
     proto_tree *adn_resp_tree;
     proto_tree *alias_tree;
@@ -430,10 +430,10 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, packet_info *pinfo, p
 
 }
 
-static void dissect_a_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree,guint32 nrec,int offset)
+static void dissect_a_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree,uint32_t nrec,int offset)
 {
-    guint32 i, curr;
-    const gchar* addrs;
+    uint32_t i, curr;
+    const char* addrs;
     proto_tree* a_rec_tree;
     proto_tree* addr_tree;
 
@@ -441,13 +441,13 @@ static void dissect_a_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tre
         return;
 
     a_rec_tree = proto_tree_add_subtree(tree,tvb,offset,
-                (int)((sizeof(guint32) + sizeof(guint16)) * nrec),
+                (int)((sizeof(uint32_t) + sizeof(uint16_t)) * nrec),
                 ett_a_rec, NULL, "A records");
 
     for(i=0; i<nrec; i++)
     {
 
-        curr = offset + (int)((sizeof(guint32)+sizeof(guint16)) * i);
+        curr = offset + (int)((sizeof(uint32_t)+sizeof(uint16_t)) * i);
 
         addrs = tvb_ip_to_str(pinfo->pool, tvb, curr+2);
 
@@ -455,20 +455,20 @@ static void dissect_a_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tre
                             6, ett_a_rec_addr, NULL, "Address %s", addrs);
 
         proto_tree_add_item(addr_tree, hf_a_rec_len, tvb, curr,
-                    sizeof(guint16), ENC_BIG_ENDIAN);
+                    sizeof(uint16_t), ENC_BIG_ENDIAN);
 
         proto_tree_add_item(addr_tree, hf_a_record, tvb, curr + 2, 4, ENC_BIG_ENDIAN);
     }
 
 }
 
-static void dissect_srv_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree,guint32 nrec,int offset)
+static void dissect_srv_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree,uint32_t nrec,int offset)
 {
-    guint32 i, curr;
-    guint16 /*len, namelen,*/ priority, weight, port;
-    gint dlen;
-    guint used_bytes;
-    const gchar *dname;
+    uint32_t i, curr;
+    uint16_t /*len, namelen,*/ priority, weight, port;
+    int dlen;
+    unsigned used_bytes;
+    const char *dname;
 
     proto_item* srv_rec_tree, *rec_tree;
 
@@ -529,14 +529,14 @@ static void dissect_srv_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* t
 
 }
 
-static void dissect_mx_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree, guint32 nrec, int offset)
+static void dissect_mx_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree, uint32_t nrec, int offset)
 {
 
-    guint i, curr;
-    guint priority;
-    gint dlen;
-    guint used_bytes;
-    const gchar *dname;
+    unsigned i, curr;
+    unsigned priority;
+    int dlen;
+    unsigned used_bytes;
+    const char *dname;
 
     proto_tree* mx_rec_tree, *rec_tree;
 
@@ -581,12 +581,12 @@ static void dissect_mx_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tr
 
 }
 
-static void dissect_ns_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree, guint32 nrec, int offset)
+static void dissect_ns_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tree, uint32_t nrec, int offset)
 {
-    guint i, curr;
-    gint dlen;
-    const gchar *dname;
-    guint used_bytes;
+    unsigned i, curr;
+    int dlen;
+    const char *dname;
+    unsigned used_bytes;
 
     proto_tree* ns_rec_tree, *rec_tree;
 
@@ -622,7 +622,7 @@ static void dissect_ns_records(tvbuff_t* tvb, packet_info *pinfo, proto_tree* tr
 
 static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree)
 {
-    guint16 namelen;
+    uint16_t namelen;
 
     proto_tree* rdata_request_tree;
 
@@ -638,28 +638,28 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree)
             hf_rflags,
             tvb,
             LWRES_LWPACKET_LENGTH+0,
-            sizeof(guint32),
+            sizeof(uint32_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_request_tree,
             hf_rdclass,
             tvb,
             LWRES_LWPACKET_LENGTH+4,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_request_tree,
             hf_rdtype,
             tvb,
             LWRES_LWPACKET_LENGTH+6,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_request_tree,
             hf_namelen,
             tvb,
             LWRES_LWPACKET_LENGTH+8,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_request_tree,
@@ -673,8 +673,8 @@ static void dissect_rdata_request(tvbuff_t* tvb, proto_tree* lwres_tree)
 
 static void dissect_rdata_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree* lwres_tree)
 {
-    guint offset;
-    guint rdtype, nrdatas, realnamelen;
+    unsigned offset;
+    unsigned rdtype, nrdatas, realnamelen;
 
     proto_tree* rdata_resp_tree;
 
@@ -693,49 +693,49 @@ static void dissect_rdata_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree
                         hf_rflags,
                         tvb,
                         LWRES_LWPACKET_LENGTH+0,
-                        sizeof(guint32),
+                        sizeof(uint32_t),
                         ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
                         hf_rdclass,
                         tvb,
                         LWRES_LWPACKET_LENGTH+4,
-                        sizeof(guint16),
+                        sizeof(uint16_t),
                         ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
                         hf_rdtype,
                         tvb,
                         LWRES_LWPACKET_LENGTH+6,
-                        sizeof(guint16),
+                        sizeof(uint16_t),
                         ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
             hf_ttl,
             tvb,
             LWRES_LWPACKET_LENGTH+8,
-            sizeof(guint32),
+            sizeof(uint32_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
             hf_nrdatas,
             tvb,
             LWRES_LWPACKET_LENGTH+12,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
             hf_nsigs,
             tvb,
             LWRES_LWPACKET_LENGTH+14,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
             hf_realnamelen,
             tvb,
             LWRES_LWPACKET_LENGTH+16,
-            sizeof(guint16),
+            sizeof(uint16_t),
             ENC_BIG_ENDIAN);
 
     proto_tree_add_item(rdata_resp_tree,
@@ -768,7 +768,7 @@ static void dissect_rdata_response(tvbuff_t* tvb, packet_info *pinfo, proto_tree
 
 static void dissect_noop(tvbuff_t* tvb, proto_tree* lwres_tree)
 {
-    guint16 datalen;
+    uint16_t datalen;
 
     proto_tree* noop_tree;
 
@@ -780,7 +780,7 @@ static void dissect_noop(tvbuff_t* tvb, proto_tree* lwres_tree)
     noop_tree = proto_tree_add_subtree(lwres_tree, tvb, LWRES_LWPACKET_LENGTH, 10, ett_noop, NULL, "Noop record");
 
     proto_tree_add_uint(noop_tree, hf_length, tvb,
-                LWRES_LWPACKET_LENGTH, sizeof(guint16), datalen);
+                LWRES_LWPACKET_LENGTH, sizeof(uint16_t), datalen);
 
     tvb_ensure_bytes_exist(tvb, LWRES_LWPACKET_LENGTH, datalen);
 
@@ -813,9 +813,9 @@ static void dissect_getrdatabyname(tvbuff_t* tvb, packet_info *pinfo _U_, proto_
 static int
 dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-    guint16 version, flags, authtype, authlength ;
-    guint32 length, opcode, result, recvlength, serial;
-    guint32 message_type;
+    uint16_t version, flags, authtype, authlength ;
+    uint32_t length, opcode, result, recvlength, serial;
+    uint32_t message_type;
 
     proto_item* lwres_item;
     proto_tree* lwres_tree;
@@ -837,7 +837,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
     {
         col_add_fstr(pinfo->cinfo, COL_INFO,
             "%s, opcode=%s, serial=0x%x, result=%s",
-                val_to_str_const((guint32)message_type,message_types_values,"unknown"),
+                val_to_str_const((uint32_t)message_type,message_types_values,"unknown"),
                 val_to_str_const(opcode, opcode_values, "unknown"),
                 serial,
                 val_to_str_const(result,result_values,"unknown"));
@@ -846,7 +846,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
     {
         col_add_fstr(pinfo->cinfo, COL_INFO,
                 "%s, opcode=%s, serial=0x%x",
-                val_to_str_const((guint32)message_type,message_types_values,"unknown"),
+                val_to_str_const((uint32_t)message_type,message_types_values,"unknown"),
                 val_to_str_const(opcode, opcode_values, "unknown"),
         serial);
     }
@@ -861,7 +861,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
             hf_length,
             tvb,
             LW_LENGTH_OFFSET,
-            sizeof(guint32),
+            sizeof(uint32_t),
             length);
 
 
@@ -869,7 +869,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
                 hf_version,
                 tvb,
                 LW_VERSION_OFFSET,
-                sizeof(guint16),
+                sizeof(uint16_t),
                 version);
 
 
@@ -879,49 +879,49 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
                 hf_flags,
                 tvb,
                 LW_PKTFLASG_OFFSET,
-                sizeof(guint16),
+                sizeof(uint16_t),
                 flags);
 
     proto_tree_add_uint(lwres_tree,
                 hf_serial,
                 tvb,
                 LW_SERIAL_OFFSET,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 serial);
 
     proto_tree_add_uint(lwres_tree,
                 hf_opcode,
                 tvb,
                 LW_OPCODE_OFFSET,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 opcode);
 
     proto_tree_add_uint(lwres_tree,
                 hf_result,
                 tvb,
                 LW_RESULT_OFFSET,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 result);
 
     proto_tree_add_uint(lwres_tree,
                 hf_recvlen,
                 tvb,
                 LW_RECVLEN_OFFSET,
-                sizeof(guint32),
+                sizeof(uint32_t),
                 recvlength);
 
     proto_tree_add_uint(lwres_tree,
                 hf_authtype,
                 tvb,
                 LW_AUTHTYPE_OFFSET,
-                sizeof(guint16),
+                sizeof(uint16_t),
                 authtype);
 
     proto_tree_add_uint(lwres_tree,
                 hf_authlen,
                 tvb,
                 LW_AUTHLEN_OFFSET,
-                sizeof(guint16),
+                sizeof(uint16_t),
                 authlength);
 
     if(!result)
@@ -1103,7 +1103,7 @@ proto_register_lwres(void)
         /* Add more fields here */
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_lwres,
         &ett_rdata_req,
         &ett_rdata_resp,