X11: Replace VALUEXX macros and handle endianness "natively."

Change-Id: I45d4557377a445c981e6b7cfc1dbe57f586252e5
Reviewed-on: https://code.wireshark.org/review/21210
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

3 files changed, 892 insertions, 881 deletions

diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index d8b6c62fd4..76ec62f84c 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -92,9 +92,7 @@ void proto_reg_handoff_x11(void);
 #define LastExtensionError      255
 #define LastExtensionEvent      127
 
-#define BYTE_ORDER_BE           0
-#define BYTE_ORDER_LE           1
-#define BYTE_ORDER_UNKNOWN      -1
+#define BYTE_ORDER_UNKNOWN      0xFFFFFFFF
 
 static const char *modifiers[] = {
       "Shift",
@@ -138,7 +136,7 @@ typedef struct _x11_conv_data {
       int       sequencenumber;   /* sequencenumber of current packet.       */
       guint32   iconn_frame;      /* frame # of initial connection request   */
       guint32   iconn_reply;      /* frame # of initial connection reply     */
-      int       byte_order;       /* byte order of connection */
+      guint        byte_order;       /* byte order of connection */
       gboolean  resync;           /* resynchronization of sequence number performed */
 
       int       *keycodemap[256]; /* keycode to keysymvalue map. */
@@ -1083,14 +1081,6 @@ static const value_string zero_is_none_vals[] = {
  ***           F I E L D   D E C O D I N G   M A C R O S              ***
  ***                                                                  ***
  ************************************************************************/
-
-#define VALUE8(tvb, offset) (tvb_get_guint8(tvb, offset))
-#define VALUE16(tvb, offset) (byte_order == ENC_BIG_ENDIAN ? tvb_get_ntohs(tvb, offset) : tvb_get_letohs(tvb, offset))
-#define VALUE32(tvb, offset) (byte_order == ENC_BIG_ENDIAN ? tvb_get_ntohl(tvb, offset) : tvb_get_letohl(tvb, offset))
-#define VALUE64(tvb, offset) (byte_order == ENC_BIG_ENDIAN ? tvb_get_ntoh64(tvb, offset) : tvb_get_letoh64(tvb, offset))
-#define FLOAT(tvb, offset) (byte_order == ENC_BIG_ENDIAN ? tvb_get_ntohieee_float(tvb, offset) : tvb_get_letohieee_float(tvb, offset))
-#define DOUBLE(tvb, offset) (byte_order == ENC_BIG_ENDIAN ? tvb_get_ntohieee_double(tvb, offset) : tvb_get_letohieee_double(tvb, offset))
-
 #define FIELD8(name)  (field8(tvb, offsetp, t, hf_x11_##name, byte_order))
 #define FIELD16(name) (field16(tvb, offsetp, t, hf_x11_##name, byte_order))
 #define FIELD32(name) (field32(tvb, offsetp, t, hf_x11_##name, byte_order))
@@ -1172,7 +1162,7 @@ static const value_string zero_is_none_vals[] = {
 #define LISTofTEXTITEM8(name) { listOfTextItem(tvb, offsetp, t, hf_x11_##name, FALSE, next_offset, byte_order); }
 #define LISTofTEXTITEM16(name) { listOfTextItem(tvb, offsetp, t, hf_x11_##name, TRUE, next_offset, byte_order); }
 #define OPCODE() {                                                \
-      opcode = VALUE8(tvb, *offsetp);                             \
+      opcode = tvb_get_guint8(tvb, *offsetp);                             \
       proto_tree_add_uint(t, hf_x11_opcode, tvb, *offsetp,        \
             1, opcode);                                           \
       *offsetp += 1;                                              \
@@ -1192,7 +1182,7 @@ static const value_string zero_is_none_vals[] = {
 #define PAD()          { if (next_offset - *offsetp > 0) proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, next_offset - *offsetp, ENC_NA); *offsetp = next_offset; }
 #define WINDOW(name)   { FIELD32(name); }
 
-#define VISUALID(name) { gint32 v = VALUE32(tvb, *offsetp); \
+#define VISUALID(name) { gint32 v = tvb_get_guint32(tvb, *offsetp, byte_order); \
     proto_tree_add_uint_format(t, hf_x11_##name, tvb, *offsetp, 4, v, "Visualid: 0x%08x%s", v, \
                                v ? "" : " (CopyFromParent)"); *offsetp += 4; }
 #define REPLY(name)       FIELD8(name);
@@ -1213,7 +1203,7 @@ static const value_string zero_is_none_vals[] = {
 #define SEQUENCENUMBER_REPLY(name) do {                                       \
       guint16 seqno;                                                          \
                                                                               \
-      seqno = VALUE16(tvb, *offsetp);                                         \
+      seqno = tvb_get_guint16(tvb, *offsetp, byte_order);                     \
       proto_tree_add_uint_format(t, hf_x11_reply_##name, tvb,                 \
       *offsetp, 2, seqno,                                                     \
       "sequencenumber: %d (%s)",                                              \
@@ -1309,7 +1299,7 @@ static void atom(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 {
       const char *interpretation = NULL;
 
-      guint32 v = VALUE32(tvb, *offsetp);
+      guint32 v = tvb_get_guint32(tvb, *offsetp, byte_order);
       if (v >= 1 && v < array_length(atom_predefined_interpretation))
             interpretation = atom_predefined_interpretation[v];
       else if (v)
@@ -1327,7 +1317,7 @@ static void atom(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 
 static guint32 add_boolean(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf)
 {
-      guint32 v = VALUE8(tvb, *offsetp);
+      guint32 v = tvb_get_guint8(tvb, *offsetp);
       proto_tree_add_boolean(t, hf, tvb, *offsetp, 1, v);
       *offsetp += 1;
       return v;
@@ -1335,7 +1325,7 @@ static guint32 add_boolean(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf)
 
 static void colorFlags(tvbuff_t *tvb, int *offsetp, proto_tree *t)
 {
-      guint do_red_green_blue = VALUE8(tvb, *offsetp);
+      guint do_red_green_blue = tvb_get_guint8(tvb, *offsetp);
       proto_item *ti;
       proto_tree *tt;
 
@@ -1392,12 +1382,12 @@ static void listOfArc(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 8, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_arc);
       while(length--) {
-            gint16 x = VALUE16(tvb, *offsetp);
-            gint16 y = VALUE16(tvb, *offsetp + 2);
-            guint16 width = VALUE16(tvb, *offsetp + 4);
-            guint16 height = VALUE16(tvb, *offsetp + 6);
-            gint16 angle1 = VALUE16(tvb, *offsetp + 8);
-            gint16 angle2 = VALUE16(tvb, *offsetp + 10);
+            gint16 x = tvb_get_guint16(tvb, *offsetp, byte_order);
+            gint16 y = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
+            guint16 width = tvb_get_guint16(tvb, *offsetp + 4, byte_order);
+            guint16 height = tvb_get_guint16(tvb, *offsetp + 6, byte_order);
+            gint16 angle1 = tvb_get_guint16(tvb, *offsetp + 8, byte_order);
+            gint16 angle2 = tvb_get_guint16(tvb, *offsetp + 10, byte_order);
 
             proto_item *tti = proto_tree_add_none_format(tt, hf_x11_arc, tvb, *offsetp, 12,
                                                              "arc: %dx%d+%d+%d, angle %d -> %d (%f degrees -> %f degrees)",
@@ -1442,7 +1432,7 @@ static void listOfCard16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 2, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_uint(tt, hf_item, tvb, *offsetp, 2, VALUE16(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
       }
 }
@@ -1453,7 +1443,7 @@ static void listOfInt16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 2, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_int(tt, hf_item, tvb, *offsetp, 2, VALUE16(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
       }
 }
@@ -1464,7 +1454,7 @@ static void listOfCard32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 4, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_uint(tt, hf_item, tvb, *offsetp, 4, VALUE32(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
       }
 }
@@ -1475,7 +1465,7 @@ static void listOfInt32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 4, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_int(tt, hf_item, tvb, *offsetp, 4, VALUE32(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
       }
 }
@@ -1487,7 +1477,7 @@ static void listOfCard64(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 8, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_uint(tt, hf_item, tvb, *offsetp, 8, VALUE64(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 8, byte_order);
             *offsetp += 8;
       }
 }
@@ -1498,7 +1488,7 @@ static void listOfInt64(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 8, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_card32);
       while(length--) {
-            proto_tree_add_int(tt, hf_item, tvb, *offsetp, 8, VALUE64(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 8, byte_order);
             *offsetp += 8;
       }
 }
@@ -1510,7 +1500,7 @@ static void listOfFloat(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 4, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_float);
       while(length--) {
-            proto_tree_add_float(tt, hf_item, tvb, *offsetp, 4, FLOAT(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
       }
 }
@@ -1521,7 +1511,7 @@ static void listOfDouble(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       proto_item *ti = proto_tree_add_item(t, hf, tvb, *offsetp, length * 8, byte_order);
       proto_tree *tt = proto_item_add_subtree(ti, ett_x11_list_of_double);
       while(length--) {
-            proto_tree_add_double(tt, hf_item, tvb, *offsetp, 8, DOUBLE(tvb, *offsetp));
+            proto_tree_add_item(tt, hf_item, tvb, *offsetp, 8, byte_order);
             *offsetp += 8;
       }
 }
@@ -1541,10 +1531,10 @@ static void listOfColorItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 
             buffer=wmem_strbuf_new_label(wmem_packet_scope());
             wmem_strbuf_append(buffer, "colorItem ");
-            red = VALUE16(tvb, *offsetp + 4);
-            green = VALUE16(tvb, *offsetp + 6);
-            blue = VALUE16(tvb, *offsetp + 8);
-            do_red_green_blue = VALUE8(tvb, *offsetp + 10);
+            red = tvb_get_guint16(tvb, *offsetp + 4, byte_order);
+            green = tvb_get_guint16(tvb, *offsetp + 6, byte_order);
+            blue = tvb_get_guint16(tvb, *offsetp + 8, byte_order);
+            do_red_green_blue = tvb_get_guint8(tvb, *offsetp + 10);
 
             sep = "";
             if (do_red_green_blue & 0x1) {
@@ -1946,7 +1936,7 @@ static void listOfKeysyms(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
 
             for(i = 0; i < keysyms_per_keycode; ++i) {
                   /* keysymvalue = byte3 * 256 + byte4. */
-                  guint32 v = VALUE32(tvb, *offsetp);
+                  guint32 v = tvb_get_guint32(tvb, *offsetp, byte_order);
 
                   proto_item_append_text(tti, " %s", keysymString(v));
                   proto_tree_add_uint_format(ttt, hf_x11_keysyms_item_keysym,
@@ -1998,8 +1988,8 @@ static void listOfPoint(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             proto_item *tti;
             proto_tree *ttt;
 
-            x = VALUE16(tvb, *offsetp);
-            y = VALUE16(tvb, *offsetp + 2);
+            x = tvb_get_guint16(tvb, *offsetp, byte_order);
+            y = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
 
             tti = proto_tree_add_none_format(tt, hf_x11_point, tvb, *offsetp, 4, "point: (%d,%d)", x, y);
             ttt = proto_item_add_subtree(tti, ett_x11_point);
@@ -2021,10 +2011,10 @@ static void listOfRectangle(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             proto_item *tti;
             proto_tree *ttt;
 
-            x = VALUE16(tvb, *offsetp);
-            y = VALUE16(tvb, *offsetp + 2);
-            width = VALUE16(tvb, *offsetp + 4);
-            height = VALUE16(tvb, *offsetp + 6);
+            x = tvb_get_guint16(tvb, *offsetp, byte_order);
+            y = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
+            width = tvb_get_guint16(tvb, *offsetp + 4, byte_order);
+            height = tvb_get_guint16(tvb, *offsetp + 6, byte_order);
 
             tti = proto_tree_add_none_format(tt, hf_x11_rectangle, tvb, *offsetp, 8,
                                                  "rectangle: %dx%d+%d+%d", width, height, x, y);
@@ -2050,10 +2040,10 @@ static void listOfSegment(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             proto_item *tti;
             proto_tree *ttt;
 
-            x1 = VALUE16(tvb, *offsetp);
-            y1 = VALUE16(tvb, *offsetp + 2);
-            x2 = VALUE16(tvb, *offsetp + 4);
-            y2 = VALUE16(tvb, *offsetp + 6);
+            x1 = tvb_get_guint16(tvb, *offsetp, byte_order);
+            y1 = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
+            x2 = tvb_get_guint16(tvb, *offsetp + 4, byte_order);
+            y2 = tvb_get_guint16(tvb, *offsetp + 6, byte_order);
 
             tti = proto_tree_add_none_format(tt, hf_x11_segment, tvb, *offsetp, 8,
                                                  "segment: (%d,%d)-(%d,%d)", x1, y1, x2, y2);
@@ -2102,7 +2092,7 @@ static void listOfVisualTypes(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf
 static void listOfDepth(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
                         int length, guint byte_order)
 {
-      guint8 number_of_visualtypes;
+      guint16 number_of_visualtypes;
       proto_item *ti;
       proto_tree *tt;
 
@@ -2111,7 +2101,7 @@ static void listOfDepth(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       while(length--) {
             proto_item *tti;
             proto_tree *ttt;
-            number_of_visualtypes = VALUE16(tvb, *offsetp + 2);
+            number_of_visualtypes = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
 
             tti = proto_tree_add_none_format(tt, hf_x11_depth_detail, tvb, *offsetp, 8 + 24 * number_of_visualtypes,
                                              "depth-detail");
@@ -2141,10 +2131,10 @@ static void listOfScreen(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             proto_item *tti;
             proto_tree *ttt;
 
-            screen_root = VALUE32(tvb, *offsetp);
-            width_in_pixels = VALUE16(tvb, *offsetp + 20);
-            height_in_pixels = VALUE16(tvb, *offsetp + 22);
-            root_depth = VALUE8(tvb, *offsetp + 38);
+            screen_root = tvb_get_guint32(tvb, *offsetp, byte_order);
+            width_in_pixels = tvb_get_guint16(tvb, *offsetp + 20, byte_order);
+            height_in_pixels = tvb_get_guint16(tvb, *offsetp + 22, byte_order);
+            root_depth = tvb_get_guint8(tvb, *offsetp + 38);
             tti = proto_tree_add_none_format(tt, hf_x11_screen, tvb, *offsetp, 0,
                                                  "screen (%08x: %d x %d x %d)", screen_root,
                                                  width_in_pixels, height_in_pixels, root_depth);
@@ -2179,7 +2169,7 @@ static void listOfScreen(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             *offsetp += 1;
             proto_tree_add_item(ttt, hf_x11_screen_root_depth, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
-            number_of_depths = VALUE8(tvb, *offsetp);
+            number_of_depths = tvb_get_guint8(tvb, *offsetp);
             proto_tree_add_item(ttt, hf_x11_screen_allowed_depths_len, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
             listOfDepth(tvb, offsetp, ttt, hf_x11_depth_detail, number_of_depths, byte_order);
@@ -2229,7 +2219,7 @@ static void listOfString8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       tt = proto_item_add_subtree(ti, ett_x11_list_of_string8);
 
       while(length--) {
-            guint l = VALUE8(tvb, *offsetp);
+            guint l = tvb_get_guint8(tvb, *offsetp);
             s = tvb_get_string_enc(wmem_packet_scope(), tvb, *offsetp + 1, l, ENC_ASCII);
             proto_tree_add_string_format(tt, hf_item, tvb, *offsetp, l + 1, s, "\"%s\"", s);
             *offsetp += l + 1;
@@ -2295,7 +2285,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
       tt = proto_item_add_subtree(ti, ett_x11_list_of_text_item);
 
       while(n--) {
-            guint l = VALUE8(tvb, *offsetp);
+            guint l = tvb_get_guint8(tvb, *offsetp);
             if (l == 255) { /* Item is a font */
                   fid = tvb_get_ntohl(tvb, *offsetp + 1);
                   proto_tree_add_uint(tt, hf_x11_textitem_font, tvb, *offsetp, 5, fid);
@@ -2303,7 +2293,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
             } else { /* Item is a string */
                   proto_item *tti;
                   proto_tree *ttt;
-                  gint8 delta = VALUE8(tvb, *offsetp + 1);
+                  gint8 delta = tvb_get_guint8(tvb, *offsetp + 1);
                   if (sizeIs16) {
                         if (stringIsActuallyAn8BitString(tvb, *offsetp + 2, l)) {
                               s = tvb_get_ascii_string16(tvb, *offsetp + 2, l);
@@ -2342,7 +2332,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 static guint32 field8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
                       guint byte_order)
 {
-      guint32 v = VALUE8(tvb, *offsetp);
+      guint32 v = tvb_get_guint8(tvb, *offsetp);
       header_field_info *hfi = proto_registrar_get_nth(hf);
       const gchar *enumValue = NULL;
 
@@ -2361,7 +2351,7 @@ static guint32 field8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 static guint32 field16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
                        guint byte_order)
 {
-      guint32 v = VALUE16(tvb, *offsetp);
+      guint32 v = tvb_get_guint16(tvb, *offsetp, byte_order);
       header_field_info *hfi = proto_registrar_get_nth(hf);
       const gchar *enumValue = NULL;
 
@@ -2380,7 +2370,7 @@ static guint32 field16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 static guint32 field32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
                        guint byte_order)
 {
-      guint32 v = VALUE32(tvb, *offsetp);
+      guint32 v = tvb_get_guint32(tvb, *offsetp, byte_order);
       header_field_info *hfi = proto_registrar_get_nth(hf);
       const gchar *enumValue = NULL;
       const gchar *nameAsChar = hfi -> name;
@@ -2570,8 +2560,8 @@ static void gcMask(tvbuff_t *tvb, int *offsetp, proto_tree *t,
 static guint32 requestLength(tvbuff_t *tvb, int *offsetp, proto_tree *t,
                              guint byte_order)
 {
-      guint32 res = VALUE16(tvb, *offsetp);
-      proto_tree_add_uint(t, hf_x11_request_length, tvb, *offsetp, 2, res);
+      guint32 res;
+      proto_tree_add_item_ret_uint(t, hf_x11_request_length, tvb, *offsetp, 2, byte_order, &res);
       *offsetp += 2;
       return res * 4;
 }
@@ -2644,7 +2634,7 @@ static void setOfKeyButMask(tvbuff_t *tvb, int *offsetp, proto_tree *t,
       int bitmask_size;
       proto_tree *bitmask_tree;
 
-      bitmask_value = VALUE16(tvb, *offsetp);
+      bitmask_value = tvb_get_guint16(tvb, *offsetp, byte_order);
       bitmask_offset = *offsetp;
       bitmask_size = 2;
 
@@ -2730,7 +2720,7 @@ static void string16(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
 static void timestamp(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf,
                       guint byte_order)
 {
-      guint32 v = VALUE32(tvb, *offsetp);
+      guint32 v = tvb_get_guint32(tvb, *offsetp, byte_order);
 
       if (!v)
             proto_tree_add_uint_format(t, hf, tvb, *offsetp, 4, 0, "%s: 0 (CurrentTime)",
@@ -2892,7 +2882,7 @@ static int rounded4(int n)
 
 /* We assume the order to be consistent, until proven wrong. */
 
-static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint16 (*v16)(tvbuff_t *, const gint))
+static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, int encoding)
 {
       switch(tvb_get_guint8(tvb, offset)) {
             case X_CreateWindow:
@@ -2953,7 +2943,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
 
             case X_InternAtom:
             case X_QueryExtension:
-                  return !tvb_bytes_exist(tvb, offset, 6) || length == 2 + rounded4(v16(tvb, offset + 4));
+                  return !tvb_bytes_exist(tvb, offset, 6) || length == 2 + rounded4(tvb_get_guint16(tvb, offset + 4, encoding));
 
             case X_ChangeProperty:
             {
@@ -2963,7 +2953,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
                   if (type != 8 && type != 16 && type != 32) return FALSE;
                   multiplier = type == 8 ? 1 : type == 16 ? 2 : 4;
                   if (!tvb_bytes_exist(tvb, offset, 24)) return TRUE;
-                  return length == 6 + rounded4((v16 == tvb_get_letohs ? tvb_get_letohl : tvb_get_ntohl)(tvb, offset + 20) * multiplier);
+                  return length == 6 + rounded4(tvb_get_guint32(tvb, offset + 20, encoding) * multiplier);
             }
 
             case X_DeleteProperty:
@@ -3008,7 +2998,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
             case X_OpenFont:
             case X_AllocNamedColor:
             case X_LookupColor:
-                  return !tvb_bytes_exist(tvb, offset, 10) || length == 3 + rounded4(v16(tvb, offset + 8));
+                  return !tvb_bytes_exist(tvb, offset, 10) || length == 3 + rounded4(tvb_get_guint16(tvb, offset + 8, encoding));
 
             case X_QueryTextExtents:
                   return length >= 2;
@@ -3016,18 +3006,18 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
             case X_ListFonts:
             case X_ListFontsWithInfo:
             case X_ChangeHosts:
-                  return !tvb_bytes_exist(tvb, offset, 8) || length == 2 + rounded4(v16(tvb, offset + 6));
+                  return !tvb_bytes_exist(tvb, offset, 8) || length == 2 + rounded4(tvb_get_guint16(tvb, offset + 6, encoding));
 
             case X_SetFontPath:
                   if (length < 2) return FALSE;
                   if (!tvb_bytes_exist(tvb, offset, 8)) return TRUE;
-                  return listOfStringLengthConsistent(tvb, offset + 8, (length - 2) * 4, v16(tvb, offset + 4));
+                  return listOfStringLengthConsistent(tvb, offset + 8, (length - 2) * 4, tvb_get_guint16(tvb, offset + 4, encoding));
 
             case X_CreateGC:
                   return !tvb_bytes_exist(tvb, offset, 16) || length == 4 + numberOfBitSet(tvb, offset + 12, 4);
 
             case X_SetDashes:
-                  return !tvb_bytes_exist(tvb, offset, 12) || length == 3 + rounded4(v16(tvb, offset + 10));
+                  return !tvb_bytes_exist(tvb, offset, 12) || length == 3 + rounded4(tvb_get_guint16(tvb, offset + 10, encoding));
 
             case X_SetClipRectangles:
             case X_PolySegment:
@@ -3078,7 +3068,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
                   return length > 2 && (length - 2) % 3 == 0;
 
             case X_StoreNamedColor:
-                  return !tvb_bytes_exist(tvb, offset, 14) || length == 4 + rounded4(v16(tvb, offset + 12));
+                  return !tvb_bytes_exist(tvb, offset, 14) || length == 4 + rounded4(tvb_get_guint16(tvb, offset + 12, encoding));
 
             case X_QueryColors:
                   return length >= 2;
@@ -3090,7 +3080,7 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
                   return !tvb_bytes_exist(tvb, offset, 6) || length == 2 + numberOfBitSet(tvb, offset + 4, 2);
 
             case X_RotateProperties:
-                  return !tvb_bytes_exist(tvb, offset, 10) || length == 3 + v16(tvb, offset + 8);
+                  return !tvb_bytes_exist(tvb, offset, 10) || length == 3 + tvb_get_guint16(tvb, offset + 8, encoding);
 
             case X_SetPointerMapping:
                   return length == 1 + rounded4(tvb_get_guint8(tvb, 1));
@@ -3108,17 +3098,19 @@ static gboolean consistentWithOrder(int length, tvbuff_t *tvb, int offset, guint
 
 /* -1 means doesn't match, +1 means match, 0 means don't know */
 
-static int x_endian_match(tvbuff_t *tvb, guint16 (*v16)(tvbuff_t *, const gint))
+static int x_endian_match(tvbuff_t *tvb, int encoding)
 {
       int offset, nextoffset;
       int atLeastOne = 0;
 
       for(offset = 0; tvb_bytes_exist(tvb, offset, 4); offset = nextoffset) {
             int length;
-            length = v16(tvb, offset + 2);
-            if (!length) return -1;
+            length = tvb_get_guint16(tvb, offset + 2, encoding);
+            if (!length)
+                return -1;
             nextoffset = offset + length * 4;
-            if (!consistentWithOrder(length, tvb, offset, v16)) return -1;
+            if (!consistentWithOrder(length, tvb, offset, encoding))
+                return -1;
             atLeastOne = 1;
       }
       return atLeastOne;
@@ -3134,9 +3126,9 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo,
       int le, be;
       guint decision;
 
-      if (state->byte_order == BYTE_ORDER_BE)
+      if (state->byte_order == ENC_BIG_ENDIAN)
             return ENC_BIG_ENDIAN;    /* known to be big-endian */
-      else if (state->byte_order == BYTE_ORDER_LE)
+      else if (state->byte_order == ENC_LITTLE_ENDIAN)
             return ENC_LITTLE_ENDIAN; /* known to be little-endian */
 
       if (pinfo->srcport == pinfo->match_uint) {
@@ -3147,8 +3139,8 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo,
             return ENC_LITTLE_ENDIAN;
       }
 
-      le = x_endian_match(tvb, tvb_get_letohs);
-      be = x_endian_match(tvb, tvb_get_ntohs);
+      le = x_endian_match(tvb, ENC_LITTLE_ENDIAN);
+      be = x_endian_match(tvb, ENC_BIG_ENDIAN);
 
       if (le == be) {
             /* We have no reason to believe it's little- rather than
@@ -3179,7 +3171,7 @@ guess_byte_ordering(tvbuff_t *tvb, packet_info *pinfo,
             /*
              * Remember the decision.
              */
-            state->byte_order = (decision == ENC_BIG_ENDIAN) ? BYTE_ORDER_BE : BYTE_ORDER_LE;
+            state->byte_order = decision;
       }
 
       return decision;
@@ -3386,7 +3378,7 @@ static void tryGenericExtensionEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t,
       const gchar *extname;
       int extension, length;
 
-      extension = VALUE8(tvb, *offsetp);
+      extension = tvb_get_guint8(tvb, *offsetp);
       (*offsetp)++;
       extname = try_val_to_str(extension, state->opcode_vals);
 
@@ -3409,7 +3401,7 @@ static void tryGenericExtensionEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t,
           if (info) {
               int i;
 
-              int opcode = VALUE16(tvb, *offsetp);
+              int opcode = tvb_get_guint16(tvb, *offsetp, byte_order);
 
               for (i = 0; info[i].dissect != NULL; i++) {
                   if (info[i].minor == opcode) {
@@ -3498,7 +3490,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo,
       gint left;
       gchar *name;
 
-      length = VALUE16(tvb, 2) * 4;
+      length = tvb_get_guint16(tvb, 2, byte_order) * 4;
 
       if (length < 4) {
             /* Bogus message length? */
@@ -3532,7 +3524,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo,
 
                   /* necessary processing even if tree == NULL */
 
-                  v16 = VALUE16(tvb, 4);
+                  v16 = tvb_get_guint16(tvb, 4, byte_order);
                   name = tvb_get_string_enc(wmem_file_scope(), tvb, 8, v16, ENC_ASCII);
 
                   /* store string of extension, opcode will be set at reply */
@@ -4898,8 +4890,8 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo,
             /*
              * Get the opcode and length of the putative X11 request.
              */
-            opcode = VALUE8(tvb, 0);
-            plen = VALUE16(tvb, offset + 2);
+            opcode = tvb_get_guint8(tvb, 0);
+            plen = tvb_get_guint16(tvb, offset + 2, byte_order);
 
             if (plen == 0) {
                   /*
@@ -4953,14 +4945,12 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo,
                               /*
                                * Big-endian.
                                */
-                              state->byte_order = BYTE_ORDER_BE;
-                              byte_order = ENC_BIG_ENDIAN;
+                              byte_order = state->byte_order = ENC_BIG_ENDIAN;
                         } else {
                               /*
                                * Little-endian.
                                */
-                              state->byte_order = BYTE_ORDER_LE;
-                              byte_order = ENC_LITTLE_ENDIAN;
+                              byte_order = state->byte_order = ENC_LITTLE_ENDIAN;
                         }
                   }
 
@@ -4992,8 +4982,8 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo,
                    * Get the lengths of the authorization protocol and
                    * the authorization data.
                    */
-                  auth_proto_len = VALUE16(tvb, offset + 6);
-                  auth_data_len = VALUE16(tvb, offset + 8);
+                  auth_proto_len = tvb_get_guint16(tvb, offset + 6, byte_order);
+                  auth_data_len = tvb_get_guint16(tvb, offset + 8, byte_order);
                   plen = 12 + ROUND_LENGTH(auth_proto_len) +
                         ROUND_LENGTH(auth_data_len);
             } else {
@@ -5232,7 +5222,7 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                    * That means this is the initial connection
                    * reply.
                    */
-                  plen = 8 + VALUE16(tvb, offset + 6) * 4;
+                  plen = 8 + tvb_get_guint16(tvb, offset + 6, byte_order) * 4;
 
                   HANDLE_REPLY(plen, length_remaining,
                                "Initial connection reply",
@@ -5262,7 +5252,7 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                               int tmp_plen;
 
                               /* replylength is in units of four. */
-                              tmp_plen = plen = 32 + VALUE32(tvb, offset + 4) * 4;
+                              tmp_plen = plen = 32 + tvb_get_guint32(tvb, offset + 4, byte_order) * 4;
                               /* If tmp_plen < 32, we got an overflow;
                                * the reply length is too long. */
                               THROW_ON(tmp_plen < 32, ReportedBoundsError);
@@ -5320,7 +5310,7 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
        * packets are lost, but there's nothing you can do to fix that.
        */
 
-      sequence_number = VALUE16(tvb, offset + 2);
+      sequence_number = tvb_get_guint16(tvb, offset + 2, byte_order);
       opcode = GPOINTER_TO_INT(wmem_map_lookup(state->seqtable,
                                                    GINT_TO_POINTER(sequence_number)));
 
@@ -5371,7 +5361,7 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                    * store opcode of extension in value_string of
                    * opcodes
                    */
-                  if (!VALUE8(tvb, offset + 8)) {
+                  if (!tvb_get_guint8(tvb, offset + 8)) {
                         /* not present */
                         break;
                   }
@@ -5379,9 +5369,9 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                   vals_p = (value_string *)wmem_map_lookup(state->valtable,
                                                GINT_TO_POINTER(sequence_number));
                   if (vals_p != NULL) {
-                        major_opcode = VALUE8(tvb, offset + 9);
-                        first_event = VALUE8(tvb, offset + 10);
-                        first_error = VALUE8(tvb, offset + 11);
+                        major_opcode = tvb_get_guint8(tvb, offset + 9);
+                        first_event = tvb_get_guint8(tvb, offset + 10);
+                        first_error = tvb_get_guint8(tvb, offset + 11);
 
                         register_extension(state, vals_p, major_opcode, first_event, first_error);
                         wmem_map_remove(state->valtable,
@@ -5698,7 +5688,7 @@ same_screen_focus(tvbuff_t *tvb, int *offsetp, proto_tree *t)
       int bitmask_size;
       proto_tree *bitmask_tree;
 
-      bitmask_value = VALUE8(tvb, *offsetp);
+      bitmask_value = tvb_get_guint8(tvb, *offsetp);
       bitmask_offset = *offsetp;
       bitmask_size = 1;
 
@@ -5766,8 +5756,8 @@ decode_x11_event(tvbuff_t *tvb, unsigned char eventcode, const char *sent,
                   int code, mask;
 
                   /* need to do some prefetching here ... */
-                  code = VALUE8(tvb, offset);
-                  mask = VALUE16(tvb, 28);
+                  code = tvb_get_guint8(tvb, offset);
+                  mask = tvb_get_guint16(tvb, 28, byte_order);
 
                   KEYCODE_DECODED(keycode, code, mask);
                   CARD16(event_sequencenumber);
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index 6c6cf2d7eb..0f29063c9d 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -35,10 +35,10 @@ static void mesa_CallLists(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
 {
     int n;
     int type;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CallLists_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    type = VALUE32(tvb, *offsetp);
+    type = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CallLists_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     switch(type) {
@@ -1336,7 +1336,7 @@ static void mesa_PixelMapfv(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint by
     int mapsize;
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapfv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    mapsize = VALUE32(tvb, *offsetp);
+    mapsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapfv_mapsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_PixelMapfv_values, hf_x11_glx_render_PixelMapfv_values_item, mapsize, byte_order);
@@ -1347,7 +1347,7 @@ static void mesa_PixelMapuiv(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b
     int mapsize;
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapuiv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    mapsize = VALUE32(tvb, *offsetp);
+    mapsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapuiv_mapsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_render_PixelMapuiv_values, hf_x11_glx_render_PixelMapuiv_values_item, mapsize, byte_order);
@@ -1358,7 +1358,7 @@ static void mesa_PixelMapusv(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b
     int mapsize;
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapusv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    mapsize = VALUE32(tvb, *offsetp);
+    mapsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_PixelMapusv_mapsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard16(tvb, offsetp, t, hf_x11_glx_render_PixelMapusv_values, hf_x11_glx_render_PixelMapusv_values_item, mapsize, byte_order);
@@ -1738,7 +1738,7 @@ static void mesa_BindTexture(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b
 static void mesa_PrioritizeTextures(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int n;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_PrioritizeTextures_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_render_PrioritizeTextures_textures, hf_x11_glx_render_PrioritizeTextures_textures_item, n, byte_order);
@@ -2267,7 +2267,7 @@ static void mesa_CompressedTexImage3D(tvbuff_t *tvb, int *offsetp, proto_tree *t
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage3D_border, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage3D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexImage3D_data, imageSize, byte_order);
@@ -2288,7 +2288,7 @@ static void mesa_CompressedTexImage2D(tvbuff_t *tvb, int *offsetp, proto_tree *t
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage2D_border, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage2D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexImage2D_data, imageSize, byte_order);
@@ -2307,7 +2307,7 @@ static void mesa_CompressedTexImage1D(tvbuff_t *tvb, int *offsetp, proto_tree *t
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage1D_border, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexImage1D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexImage1D_data, imageSize, byte_order);
@@ -2334,7 +2334,7 @@ static void mesa_CompressedTexSubImage3D(tvbuff_t *tvb, int *offsetp, proto_tree
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage3D_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage3D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexSubImage3D_data, imageSize, byte_order);
@@ -2357,7 +2357,7 @@ static void mesa_CompressedTexSubImage2D(tvbuff_t *tvb, int *offsetp, proto_tree
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage2D_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage2D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexSubImage2D_data, imageSize, byte_order);
@@ -2376,7 +2376,7 @@ static void mesa_CompressedTexSubImage1D(tvbuff_t *tvb, int *offsetp, proto_tree
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage1D_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    imageSize = VALUE32(tvb, *offsetp);
+    imageSize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_CompressedTexSubImage1D_imageSize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CompressedTexSubImage1D_data, imageSize, byte_order);
@@ -2494,7 +2494,7 @@ static void mesa_BlendEquationSeparate(tvbuff_t *tvb, int *offsetp, proto_tree *
 static void mesa_DrawBuffers(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int n;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_DrawBuffers_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_render_DrawBuffers_bufs, hf_x11_glx_render_DrawBuffers_bufs_item, n, byte_order);
@@ -2670,7 +2670,7 @@ static void mesa_CurrentPaletteMatrixARB(tvbuff_t *tvb, int *offsetp, proto_tree
 static void mesa_MatrixIndexubvARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int size;
-    size = VALUE32(tvb, *offsetp);
+    size = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_MatrixIndexubvARB_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_MatrixIndexubvARB_indices, size, byte_order);
@@ -2679,7 +2679,7 @@ static void mesa_MatrixIndexubvARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, g
 static void mesa_MatrixIndexusvARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int size;
-    size = VALUE32(tvb, *offsetp);
+    size = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_MatrixIndexusvARB_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard16(tvb, offsetp, t, hf_x11_glx_render_MatrixIndexusvARB_indices, hf_x11_glx_render_MatrixIndexusvARB_indices_item, size, byte_order);
@@ -2688,7 +2688,7 @@ static void mesa_MatrixIndexusvARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, g
 static void mesa_MatrixIndexuivARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int size;
-    size = VALUE32(tvb, *offsetp);
+    size = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_MatrixIndexuivARB_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_render_MatrixIndexuivARB_indices, hf_x11_glx_render_MatrixIndexuivARB_indices_item, size, byte_order);
@@ -2729,7 +2729,7 @@ static void mesa_ProgramStringARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, gu
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_ProgramStringARB_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    len = VALUE32(tvb, *offsetp);
+    len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_ProgramStringARB_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_ProgramStringARB_string, len, byte_order);
@@ -2794,7 +2794,7 @@ static void mesa_TexFilterFuncSGIS(tvbuff_t *tvb, int *offsetp, proto_tree *t, g
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_TexFilterFuncSGIS_filter, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_TexFilterFuncSGIS_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_TexFilterFuncSGIS_weights, hf_x11_glx_render_TexFilterFuncSGIS_weights_item, n, byte_order);
@@ -2889,7 +2889,7 @@ static void mesa_DetailTexFuncSGIS(tvbuff_t *tvb, int *offsetp, proto_tree *t, g
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_DetailTexFuncSGIS_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_DetailTexFuncSGIS_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_DetailTexFuncSGIS_points, hf_x11_glx_render_DetailTexFuncSGIS_points_item, n, byte_order);
@@ -2900,7 +2900,7 @@ static void mesa_SharpenTexFuncSGIS(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_SharpenTexFuncSGIS_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_SharpenTexFuncSGIS_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_SharpenTexFuncSGIS_points, hf_x11_glx_render_SharpenTexFuncSGIS_points_item, n, byte_order);
@@ -2938,7 +2938,7 @@ static void mesa_ReferencePlaneSGIX(tvbuff_t *tvb, int *offsetp, proto_tree *t,
 static void mesa_FogFuncSGIS(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int n;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_FogFuncSGIS_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_FogFuncSGIS_points, hf_x11_glx_render_FogFuncSGIS_points_item, n, byte_order);
@@ -3075,7 +3075,7 @@ static void mesa_LoadProgramNV(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_LoadProgramNV_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    len = VALUE32(tvb, *offsetp);
+    len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_LoadProgramNV_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_LoadProgramNV_program, len, byte_order);
@@ -3088,7 +3088,7 @@ static void mesa_ProgramParameters4dvNV(tvbuff_t *tvb, int *offsetp, proto_tree
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_ProgramParameters4dvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    num = VALUE32(tvb, *offsetp);
+    num = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_ProgramParameters4dvNV_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfDouble(tvb, offsetp, t, hf_x11_glx_render_ProgramParameters4dvNV_params, hf_x11_glx_render_ProgramParameters4dvNV_params_item, num, byte_order);
@@ -3101,7 +3101,7 @@ static void mesa_ProgramParameters4fvNV(tvbuff_t *tvb, int *offsetp, proto_tree
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_ProgramParameters4fvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    num = VALUE32(tvb, *offsetp);
+    num = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_ProgramParameters4fvNV_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_ProgramParameters4fvNV_params, hf_x11_glx_render_ProgramParameters4fvNV_params_item, num, byte_order);
@@ -3110,7 +3110,7 @@ static void mesa_ProgramParameters4fvNV(tvbuff_t *tvb, int *offsetp, proto_tree
 static void mesa_RequestResidentProgramsNV(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int n;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_RequestResidentProgramsNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_render_RequestResidentProgramsNV_ids, hf_x11_glx_render_RequestResidentProgramsNV_ids_item, n, byte_order);
@@ -3224,7 +3224,7 @@ static void mesa_VertexAttribs1svNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1svNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1svNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt16(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs1svNV_v, hf_x11_glx_render_VertexAttribs1svNV_v_item, n, byte_order);
@@ -3235,7 +3235,7 @@ static void mesa_VertexAttribs2svNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2svNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2svNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt16(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs2svNV_v, hf_x11_glx_render_VertexAttribs2svNV_v_item, n, byte_order);
@@ -3246,7 +3246,7 @@ static void mesa_VertexAttribs3svNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3svNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3svNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt16(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs3svNV_v, hf_x11_glx_render_VertexAttribs3svNV_v_item, n, byte_order);
@@ -3257,7 +3257,7 @@ static void mesa_VertexAttribs4svNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4svNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4svNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt16(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs4svNV_v, hf_x11_glx_render_VertexAttribs4svNV_v_item, n, byte_order);
@@ -3268,7 +3268,7 @@ static void mesa_VertexAttribs1fvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1fvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1fvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs1fvNV_v, hf_x11_glx_render_VertexAttribs1fvNV_v_item, n, byte_order);
@@ -3279,7 +3279,7 @@ static void mesa_VertexAttribs2fvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2fvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2fvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs2fvNV_v, hf_x11_glx_render_VertexAttribs2fvNV_v_item, n, byte_order);
@@ -3290,7 +3290,7 @@ static void mesa_VertexAttribs3fvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3fvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3fvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs3fvNV_v, hf_x11_glx_render_VertexAttribs3fvNV_v_item, n, byte_order);
@@ -3301,7 +3301,7 @@ static void mesa_VertexAttribs4fvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4fvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4fvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfFloat(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs4fvNV_v, hf_x11_glx_render_VertexAttribs4fvNV_v_item, n, byte_order);
@@ -3312,7 +3312,7 @@ static void mesa_VertexAttribs1dvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1dvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs1dvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfDouble(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs1dvNV_v, hf_x11_glx_render_VertexAttribs1dvNV_v_item, n, byte_order);
@@ -3323,7 +3323,7 @@ static void mesa_VertexAttribs2dvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2dvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs2dvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfDouble(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs2dvNV_v, hf_x11_glx_render_VertexAttribs2dvNV_v_item, n, byte_order);
@@ -3334,7 +3334,7 @@ static void mesa_VertexAttribs3dvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3dvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs3dvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfDouble(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs3dvNV_v, hf_x11_glx_render_VertexAttribs3dvNV_v_item, n, byte_order);
@@ -3345,7 +3345,7 @@ static void mesa_VertexAttribs4dvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4dvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4dvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfDouble(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs4dvNV_v, hf_x11_glx_render_VertexAttribs4dvNV_v_item, n, byte_order);
@@ -3356,7 +3356,7 @@ static void mesa_VertexAttribs4ubvNV(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     int n;
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4ubvNV_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    n = VALUE32(tvb, *offsetp);
+    n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_VertexAttribs4ubvNV_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_VertexAttribs4ubvNV_v, n, byte_order);
@@ -3373,7 +3373,7 @@ static void mesa_ProgramNamedParameter4fvNV(tvbuff_t *tvb, int *offsetp, proto_t
     int len;
     proto_tree_add_item(t, hf_x11_glx_render_ProgramNamedParameter4fvNV_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    len = VALUE32(tvb, *offsetp);
+    len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_ProgramNamedParameter4fvNV_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_ProgramNamedParameter4fvNV_name, len, byte_order);
@@ -3385,7 +3385,7 @@ static void mesa_ProgramNamedParameter4dvNV(tvbuff_t *tvb, int *offsetp, proto_t
     int len;
     proto_tree_add_item(t, hf_x11_glx_render_ProgramNamedParameter4dvNV_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    len = VALUE32(tvb, *offsetp);
+    len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_render_ProgramNamedParameter4dvNV_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_ProgramNamedParameter4dvNV_name, len, byte_order);
@@ -3773,9 +3773,9 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
         proto_item *ti;
         proto_tree *tt;
 
-        len = VALUE16(tvb, *offsetp);
+        len = tvb_get_guint16(tvb, *offsetp, byte_order);
 
-        op = VALUE16(tvb, *offsetp + 2);
+        op = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
         ti = proto_tree_add_uint(t, hf_x11_glx_render_op_name, tvb, *offsetp, len, op);
 
         tt = proto_item_add_subtree(ti, ett_x11_list_of_rectangle);
@@ -4902,7 +4902,7 @@ static void bigreqEnable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (bigreq-Enable)", sequence_number);
     *offsetp += 2;
@@ -4970,7 +4970,7 @@ static int struct_size_xproto_STR(tvbuff_t *tvb _U_, int *offsetp _U_, guint byt
 {
     int size = 0;
     int f_name_len;
-    f_name_len = VALUE8(tvb, *offsetp + size + 0);
+    f_name_len = tvb_get_guint8(tvb, *offsetp + size + 0);
     size += f_name_len * 1;
     return size + 1;
 }
@@ -4985,7 +4985,7 @@ static void struct_xproto_STR(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui
 
         item = proto_tree_add_item(root, hf_x11_struct_xproto_STR, tvb, *offsetp, struct_size_xproto_STR(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
-        f_name_len = VALUE8(tvb, *offsetp);
+        f_name_len = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_struct_xproto_STR_name_len, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xproto_STR_name, f_name_len, byte_order);
@@ -5062,7 +5062,7 @@ static int struct_size_render_PICTDEPTH(tvbuff_t *tvb _U_, int *offsetp _U_, gui
 {
     int size = 0;
     int f_num_visuals;
-    f_num_visuals = VALUE16(tvb, *offsetp + size + 2);
+    f_num_visuals = tvb_get_guint16(tvb, *offsetp + size + 2, byte_order);
     size += f_num_visuals * 8;
     return size + 8;
 }
@@ -5081,7 +5081,7 @@ static void struct_render_PICTDEPTH(tvbuff_t *tvb, int *offsetp, proto_tree *roo
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
         *offsetp += 1;
-        f_num_visuals = VALUE16(tvb, *offsetp);
+        f_num_visuals = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_render_PICTDEPTH_num_visuals, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
@@ -5095,7 +5095,7 @@ static int struct_size_render_PICTSCREEN(tvbuff_t *tvb _U_, int *offsetp _U_, gu
     int size = 0;
     int i, off;
     int f_num_depths;
-    f_num_depths = VALUE32(tvb, *offsetp + size + 0);
+    f_num_depths = tvb_get_guint32(tvb, *offsetp + size + 0, byte_order);
     for (i = 0; i < f_num_depths; i++) {
         off = (*offsetp) + size + 8;
         size += struct_size_render_PICTDEPTH(tvb, &off, byte_order);
@@ -5113,7 +5113,7 @@ static void struct_render_PICTSCREEN(tvbuff_t *tvb, int *offsetp, proto_tree *ro
 
         item = proto_tree_add_item(root, hf_x11_struct_render_PICTSCREEN, tvb, *offsetp, struct_size_render_PICTSCREEN(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
-        f_num_depths = VALUE32(tvb, *offsetp);
+        f_num_depths = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_render_PICTSCREEN_num_depths, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         proto_tree_add_item(t, hf_x11_struct_render_PICTSCREEN_fallback, tvb, *offsetp, 4, byte_order);
@@ -5345,7 +5345,7 @@ static void compositeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (composite-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -5425,7 +5425,7 @@ static void compositeGetOverlayWindow_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (composite-GetOverlayWindow)", sequence_number);
     *offsetp += 2;
@@ -5526,7 +5526,7 @@ static void damageQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (damage-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -5639,7 +5639,7 @@ static void dpmsGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dpms-GetVersion)", sequence_number);
     *offsetp += 2;
@@ -5663,7 +5663,7 @@ static void dpmsCapable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dpms-Capable)", sequence_number);
     *offsetp += 2;
@@ -5687,7 +5687,7 @@ static void dpmsGetTimeouts_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dpms-GetTimeouts)", sequence_number);
     *offsetp += 2;
@@ -5738,7 +5738,7 @@ static void dpmsInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dpms-Info)", sequence_number);
     *offsetp += 2;
@@ -5868,7 +5868,7 @@ static void dri2QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -5897,16 +5897,16 @@ static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-Connect)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_driver_name_length = VALUE32(tvb, *offsetp);
+    f_driver_name_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_dri2_Connect_reply_driver_name_length, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_device_name_length = VALUE32(tvb, *offsetp);
+    f_device_name_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_dri2_Connect_reply_device_name_length, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA);
@@ -5932,7 +5932,7 @@ static void dri2Authenticate_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-Authenticate)", sequence_number);
     *offsetp += 2;
@@ -5972,7 +5972,7 @@ static void dri2GetBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-GetBuffers)", sequence_number);
     *offsetp += 2;
@@ -5982,7 +5982,7 @@ static void dri2GetBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
+    f_count = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_reply_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -6010,7 +6010,7 @@ static void dri2CopyRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-CopyRegion)", sequence_number);
     *offsetp += 2;
@@ -6036,7 +6036,7 @@ static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-GetBuffersWithFormat)", sequence_number);
     *offsetp += 2;
@@ -6046,7 +6046,7 @@ static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
+    f_count = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_reply_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -6080,7 +6080,7 @@ static void dri2SwapBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-SwapBuffers)", sequence_number);
     *offsetp += 2;
@@ -6106,7 +6106,7 @@ static void dri2GetMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-GetMSC)", sequence_number);
     *offsetp += 2;
@@ -6152,7 +6152,7 @@ static void dri2WaitMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-WaitMSC)", sequence_number);
     *offsetp += 2;
@@ -6190,7 +6190,7 @@ static void dri2WaitSBC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-WaitSBC)", sequence_number);
     *offsetp += 2;
@@ -6234,7 +6234,7 @@ static void dri2GetParam_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_reply_is_param_recognized, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri2-GetParam)", sequence_number);
     *offsetp += 2;
@@ -6369,7 +6369,7 @@ static void dri3QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri3-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -6397,7 +6397,7 @@ static void dri3Open_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_dri3_Open_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri3-Open)", sequence_number);
     *offsetp += 2;
@@ -6441,7 +6441,7 @@ static void dri3BufferFromPixmap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri3-BufferFromPixmap)", sequence_number);
     *offsetp += 2;
@@ -6491,7 +6491,7 @@ static void dri3FDFromFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_dri3_FDFromFence_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (dri3-FDFromFence)", sequence_number);
     *offsetp += 2;
@@ -6574,7 +6574,7 @@ static void geQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (ge-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -6662,7 +6662,7 @@ static void glxRenderLarge(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_glx_RenderLarge_request_total, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_data_len = VALUE32(tvb, *offsetp);
+    f_data_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_RenderLarge_data_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_RenderLarge_data, f_data_len, byte_order);
@@ -6709,7 +6709,7 @@ static void glxMakeCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-MakeCurrent)", sequence_number);
     *offsetp += 2;
@@ -6735,7 +6735,7 @@ static void glxIsDirect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-IsDirect)", sequence_number);
     *offsetp += 2;
@@ -6763,7 +6763,7 @@ static void glxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -6850,11 +6850,11 @@ static void glxGetVisualConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetVisualConfigs)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetVisualConfigs_reply_num_visuals, tvb, *offsetp, 4, byte_order);
@@ -6899,11 +6899,11 @@ static void glxVendorPrivateWithReply_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-VendorPrivateWithReply)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_VendorPrivateWithReply_reply_retval, tvb, *offsetp, 4, byte_order);
@@ -6926,7 +6926,7 @@ static void glxQueryExtensionsString_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-QueryExtensionsString)", sequence_number);
     *offsetp += 2;
@@ -6957,7 +6957,7 @@ static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-QueryServerString)", sequence_number);
     *offsetp += 2;
@@ -6965,7 +6965,7 @@ static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_str_len = VALUE32(tvb, *offsetp);
+    f_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_QueryServerString_reply_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA);
@@ -6980,7 +6980,7 @@ static void glxClientInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, p
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_ClientInfo_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_str_len = VALUE32(tvb, *offsetp);
+    f_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_ClientInfo_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_ClientInfo_string, f_str_len, byte_order);
@@ -7002,11 +7002,11 @@ static void glxGetFBConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetFBConfigs)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetFBConfigs_reply_num_FB_configs, tvb, *offsetp, 4, byte_order);
@@ -7029,7 +7029,7 @@ static void glxCreatePixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_glx_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_CreatePixmap_attribs, hf_x11_glx_CreatePixmap_attribs_item, (f_num_attribs * 2), byte_order);
@@ -7075,13 +7075,13 @@ static void glxQueryContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-QueryContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_QueryContext_reply_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -7109,7 +7109,7 @@ static void glxMakeContextCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-MakeContextCurrent)", sequence_number);
     *offsetp += 2;
@@ -7130,7 +7130,7 @@ static void glxCreatePbuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_CreatePbuffer_pbuffer, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_CreatePbuffer_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_CreatePbuffer_attribs, hf_x11_glx_CreatePbuffer_attribs_item, (f_num_attribs * 2), byte_order);
@@ -7158,13 +7158,13 @@ static void glxGetDrawableAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetDrawableAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetDrawableAttributes_reply_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -7177,7 +7177,7 @@ static void glxChangeDrawableAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, i
     int f_num_attribs;
     proto_tree_add_item(t, hf_x11_glx_ChangeDrawableAttributes_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_ChangeDrawableAttributes_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_ChangeDrawableAttributes_attribs, hf_x11_glx_ChangeDrawableAttributes_attribs_item, (f_num_attribs * 2), byte_order);
@@ -7195,7 +7195,7 @@ static void glxCreateWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_glx_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_CreateWindow_attribs, hf_x11_glx_CreateWindow_attribs_item, (f_num_attribs * 2), byte_order);
@@ -7217,13 +7217,13 @@ static void glxSetClientInfoARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_versions = VALUE32(tvb, *offsetp);
+    f_num_versions = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_num_versions, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gl_str_len = VALUE32(tvb, *offsetp);
+    f_gl_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_gl_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glx_str_len = VALUE32(tvb, *offsetp);
+    f_glx_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_glx_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_SetClientInfoARB_gl_versions, hf_x11_glx_SetClientInfoARB_gl_versions_item, (f_num_versions * 2), byte_order);
@@ -7249,7 +7249,7 @@ static void glxCreateContextAttribsARB(tvbuff_t *tvb, packet_info *pinfo _U_, in
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
     *offsetp += 3;
-    f_num_attribs = VALUE32(tvb, *offsetp);
+    f_num_attribs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_num_attribs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_CreateContextAttribsARB_attribs, hf_x11_glx_CreateContextAttribsARB_attribs_item, (f_num_attribs * 2), byte_order);
@@ -7265,13 +7265,13 @@ static void glxSetClientInfo2ARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_versions = VALUE32(tvb, *offsetp);
+    f_num_versions = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_num_versions, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gl_str_len = VALUE32(tvb, *offsetp);
+    f_gl_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_gl_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glx_str_len = VALUE32(tvb, *offsetp);
+    f_glx_str_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_glx_str_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_SetClientInfo2ARB_gl_versions, hf_x11_glx_SetClientInfo2ARB_gl_versions_item, (f_num_versions * 3), byte_order);
@@ -7324,7 +7324,7 @@ static void glxGenLists_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GenLists)", sequence_number);
     *offsetp += 2;
@@ -7369,7 +7369,7 @@ static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-RenderMode)", sequence_number);
     *offsetp += 2;
@@ -7377,7 +7377,7 @@ static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_new_mode, tvb, *offsetp, 4, byte_order);
@@ -7401,7 +7401,7 @@ static void glxFinish_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-Finish)", sequence_number);
     *offsetp += 2;
@@ -7460,11 +7460,11 @@ static void glxReadPixels_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-ReadPixels)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -7489,7 +7489,7 @@ static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetBooleanv)", sequence_number);
     *offsetp += 2;
@@ -7497,7 +7497,7 @@ static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_reply_datum, tvb, *offsetp, 1, byte_order);
@@ -7524,11 +7524,11 @@ static void glxGetClipPlane_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetClipPlane)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -7553,7 +7553,7 @@ static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetDoublev)", sequence_number);
     *offsetp += 2;
@@ -7561,7 +7561,7 @@ static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_reply_datum, tvb, *offsetp, 8, byte_order);
@@ -7585,7 +7585,7 @@ static void glxGetError_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetError)", sequence_number);
     *offsetp += 2;
@@ -7612,7 +7612,7 @@ static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetFloatv)", sequence_number);
     *offsetp += 2;
@@ -7620,7 +7620,7 @@ static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7647,7 +7647,7 @@ static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetIntegerv)", sequence_number);
     *offsetp += 2;
@@ -7655,7 +7655,7 @@ static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7684,7 +7684,7 @@ static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetLightfv)", sequence_number);
     *offsetp += 2;
@@ -7692,7 +7692,7 @@ static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7721,7 +7721,7 @@ static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetLightiv)", sequence_number);
     *offsetp += 2;
@@ -7729,7 +7729,7 @@ static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7758,7 +7758,7 @@ static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMapdv)", sequence_number);
     *offsetp += 2;
@@ -7766,7 +7766,7 @@ static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_reply_datum, tvb, *offsetp, 8, byte_order);
@@ -7795,7 +7795,7 @@ static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMapfv)", sequence_number);
     *offsetp += 2;
@@ -7803,7 +7803,7 @@ static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7832,7 +7832,7 @@ static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMapiv)", sequence_number);
     *offsetp += 2;
@@ -7840,7 +7840,7 @@ static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7869,7 +7869,7 @@ static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMaterialfv)", sequence_number);
     *offsetp += 2;
@@ -7877,7 +7877,7 @@ static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7906,7 +7906,7 @@ static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMaterialiv)", sequence_number);
     *offsetp += 2;
@@ -7914,7 +7914,7 @@ static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7941,7 +7941,7 @@ static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetPixelMapfv)", sequence_number);
     *offsetp += 2;
@@ -7949,7 +7949,7 @@ static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -7976,7 +7976,7 @@ static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetPixelMapuiv)", sequence_number);
     *offsetp += 2;
@@ -7984,7 +7984,7 @@ static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8011,7 +8011,7 @@ static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetPixelMapusv)", sequence_number);
     *offsetp += 2;
@@ -8019,7 +8019,7 @@ static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_reply_datum, tvb, *offsetp, 2, byte_order);
@@ -8046,11 +8046,11 @@ static void glxGetPolygonStipple_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetPolygonStipple)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -8075,7 +8075,7 @@ static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetString)", sequence_number);
     *offsetp += 2;
@@ -8083,7 +8083,7 @@ static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetString_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA);
@@ -8110,7 +8110,7 @@ static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexEnvfv)", sequence_number);
     *offsetp += 2;
@@ -8118,7 +8118,7 @@ static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8147,7 +8147,7 @@ static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexEnviv)", sequence_number);
     *offsetp += 2;
@@ -8155,7 +8155,7 @@ static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8184,7 +8184,7 @@ static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexGendv)", sequence_number);
     *offsetp += 2;
@@ -8192,7 +8192,7 @@ static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_reply_datum, tvb, *offsetp, 8, byte_order);
@@ -8221,7 +8221,7 @@ static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexGenfv)", sequence_number);
     *offsetp += 2;
@@ -8229,7 +8229,7 @@ static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8258,7 +8258,7 @@ static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexGeniv)", sequence_number);
     *offsetp += 2;
@@ -8266,7 +8266,7 @@ static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8301,11 +8301,11 @@ static void glxGetTexImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexImage)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -8340,7 +8340,7 @@ static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexParameterfv)", sequence_number);
     *offsetp += 2;
@@ -8348,7 +8348,7 @@ static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8377,7 +8377,7 @@ static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexParameteriv)", sequence_number);
     *offsetp += 2;
@@ -8385,7 +8385,7 @@ static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8416,7 +8416,7 @@ static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexLevelParameterfv)", sequence_number);
     *offsetp += 2;
@@ -8424,7 +8424,7 @@ static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8455,7 +8455,7 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetTexLevelParameteriv)", sequence_number);
     *offsetp += 2;
@@ -8463,7 +8463,7 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8489,7 +8489,7 @@ static void glxIsEnabled_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-IsEnabled)", sequence_number);
     *offsetp += 2;
@@ -8515,7 +8515,7 @@ static void glxIsList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-IsList)", sequence_number);
     *offsetp += 2;
@@ -8536,7 +8536,7 @@ static void glxAreTexturesResident(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     int f_n;
     proto_tree_add_item(t, hf_x11_glx_AreTexturesResident_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_AreTexturesResident_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_AreTexturesResident_textures, hf_x11_glx_AreTexturesResident_textures_item, f_n, byte_order);
@@ -8552,11 +8552,11 @@ static void glxAreTexturesResident_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-AreTexturesResident)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_AreTexturesResident_reply_ret_val, tvb, *offsetp, 4, byte_order);
@@ -8571,7 +8571,7 @@ static void glxDeleteTextures(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
     int f_n;
     proto_tree_add_item(t, hf_x11_glx_DeleteTextures_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_DeleteTextures_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_DeleteTextures_textures, hf_x11_glx_DeleteTextures_textures_item, f_n, byte_order);
@@ -8595,11 +8595,11 @@ static void glxGenTextures_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GenTextures)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -8623,7 +8623,7 @@ static void glxIsTexture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-IsTexture)", sequence_number);
     *offsetp += 2;
@@ -8656,11 +8656,11 @@ static void glxGetColorTable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetColorTable)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -8691,7 +8691,7 @@ static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetColorTableParameterfv)", sequence_number);
     *offsetp += 2;
@@ -8699,7 +8699,7 @@ static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8728,7 +8728,7 @@ static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetColorTableParameteriv)", sequence_number);
     *offsetp += 2;
@@ -8736,7 +8736,7 @@ static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8769,11 +8769,11 @@ static void glxGetConvolutionFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetConvolutionFilter)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -8806,7 +8806,7 @@ static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetConvolutionParameterfv)", sequence_number);
     *offsetp += 2;
@@ -8814,7 +8814,7 @@ static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8843,7 +8843,7 @@ static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetConvolutionParameteriv)", sequence_number);
     *offsetp += 2;
@@ -8851,7 +8851,7 @@ static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8884,11 +8884,11 @@ static void glxGetSeparableFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetSeparableFilter)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -8927,11 +8927,11 @@ static void glxGetHistogram_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetHistogram)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -8962,7 +8962,7 @@ static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetHistogramParameterfv)", sequence_number);
     *offsetp += 2;
@@ -8970,7 +8970,7 @@ static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -8999,7 +8999,7 @@ static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetHistogramParameteriv)", sequence_number);
     *offsetp += 2;
@@ -9007,7 +9007,7 @@ static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9042,11 +9042,11 @@ static void glxGetMinmax_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMinmax)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -9073,7 +9073,7 @@ static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMinmaxParameterfv)", sequence_number);
     *offsetp += 2;
@@ -9081,7 +9081,7 @@ static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9110,7 +9110,7 @@ static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetMinmaxParameteriv)", sequence_number);
     *offsetp += 2;
@@ -9118,7 +9118,7 @@ static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9147,11 +9147,11 @@ static void glxGetCompressedTexImageARB_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetCompressedTexImageARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -9168,7 +9168,7 @@ static void glxDeleteQueriesARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_n;
     proto_tree_add_item(t, hf_x11_glx_DeleteQueriesARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_DeleteQueriesARB_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_glx_DeleteQueriesARB_ids, hf_x11_glx_DeleteQueriesARB_ids_item, f_n, byte_order);
@@ -9192,11 +9192,11 @@ static void glxGenQueriesARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GenQueriesARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -9220,7 +9220,7 @@ static void glxIsQueryARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-IsQueryARB)", sequence_number);
     *offsetp += 2;
@@ -9249,7 +9249,7 @@ static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetQueryivARB)", sequence_number);
     *offsetp += 2;
@@ -9257,7 +9257,7 @@ static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9286,7 +9286,7 @@ static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetQueryObjectivARB)", sequence_number);
     *offsetp += 2;
@@ -9294,7 +9294,7 @@ static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9323,7 +9323,7 @@ static void glxGetQueryObjectuivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (glx-GetQueryObjectuivARB)", sequence_number);
     *offsetp += 2;
@@ -9331,7 +9331,7 @@ static void glxGetQueryObjectuivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
+    f_n = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_reply_datum, tvb, *offsetp, 4, byte_order);
@@ -9866,7 +9866,7 @@ static int struct_size_randr_RefreshRates(tvbuff_t *tvb _U_, int *offsetp _U_, g
 {
     int size = 0;
     int f_nRates;
-    f_nRates = VALUE16(tvb, *offsetp + size + 0);
+    f_nRates = tvb_get_guint16(tvb, *offsetp + size + 0, byte_order);
     size += f_nRates * 2;
     return size + 2;
 }
@@ -9881,7 +9881,7 @@ static void struct_randr_RefreshRates(tvbuff_t *tvb, int *offsetp, proto_tree *r
 
         item = proto_tree_add_item(root, hf_x11_struct_randr_RefreshRates, tvb, *offsetp, struct_size_randr_RefreshRates(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
-        f_nRates = VALUE16(tvb, *offsetp);
+        f_nRates = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_randr_RefreshRates_nRates, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfCard16(tvb, offsetp, t, hf_x11_struct_randr_RefreshRates_rates, hf_x11_struct_randr_RefreshRates_rates_item, f_nRates, byte_order);
@@ -10113,7 +10113,7 @@ static int struct_size_randr_MonitorInfo(tvbuff_t *tvb _U_, int *offsetp _U_, gu
 {
     int size = 0;
     int f_nOutput;
-    f_nOutput = VALUE16(tvb, *offsetp + size + 6);
+    f_nOutput = tvb_get_guint16(tvb, *offsetp + size + 6, byte_order);
     size += f_nOutput * 4;
     return size + 24;
 }
@@ -10134,7 +10134,7 @@ static void struct_randr_MonitorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_automatic, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nOutput = VALUE16(tvb, *offsetp);
+        f_nOutput = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_nOutput, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_x, tvb, *offsetp, 2, byte_order);
@@ -10173,7 +10173,7 @@ static int struct_size_sync_SYSTEMCOUNTER(tvbuff_t *tvb _U_, int *offsetp _U_, g
 {
     int size = 0;
     int f_name_len;
-    f_name_len = VALUE16(tvb, *offsetp + size + 12);
+    f_name_len = tvb_get_guint16(tvb, *offsetp + size + 12, byte_order);
     size += f_name_len * 1;
     size = (size + 3) & ~3;
     return size + 14;
@@ -10192,7 +10192,7 @@ static void struct_sync_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, proto_tree *r
         proto_tree_add_item(t, hf_x11_struct_sync_SYSTEMCOUNTER_counter, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
-        f_name_len = VALUE16(tvb, *offsetp);
+        f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_sync_SYSTEMCOUNTER_name_len, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfByte(tvb, offsetp, t, hf_x11_struct_sync_SYSTEMCOUNTER_name, f_name_len, byte_order);
@@ -10266,7 +10266,7 @@ static void presentQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (present-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -10361,7 +10361,7 @@ static void presentQueryCapabilities_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (present-QueryCapabilities)", sequence_number);
     *offsetp += 2;
@@ -10531,7 +10531,7 @@ static void randrQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -10580,7 +10580,7 @@ static void randrSetScreenConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-SetScreenConfig)", sequence_number);
     *offsetp += 2;
@@ -10644,7 +10644,7 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_randr_GetScreenInfo_reply_rotations, ett_x11_rectangle, rotations_bits, byte_order);
     }
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetScreenInfo)", sequence_number);
     *offsetp += 2;
@@ -10656,7 +10656,7 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nSizes = VALUE16(tvb, *offsetp);
+    f_nSizes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_nSizes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_sizeID, tvb, *offsetp, 2, byte_order);
@@ -10675,7 +10675,7 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rate, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nInfo = VALUE16(tvb, *offsetp);
+    f_nInfo = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_nInfo, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -10698,7 +10698,7 @@ static void randrGetScreenSizeRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetScreenSizeRange)", sequence_number);
     *offsetp += 2;
@@ -10748,7 +10748,7 @@ static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetScreenResources)", sequence_number);
     *offsetp += 2;
@@ -10758,16 +10758,16 @@ static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_crtcs = VALUE16(tvb, *offsetp);
+    f_num_crtcs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_outputs = VALUE16(tvb, *offsetp);
+    f_num_outputs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_num_outputs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_modes = VALUE16(tvb, *offsetp);
+    f_num_modes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_num_modes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_names_len = VALUE16(tvb, *offsetp);
+    f_names_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_names_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -10797,7 +10797,7 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetOutputInfo)", sequence_number);
     *offsetp += 2;
@@ -10813,18 +10813,18 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     *offsetp += 4;
     field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_connection, byte_order);
     field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_subpixel_order, byte_order);
-    f_num_crtcs = VALUE16(tvb, *offsetp);
+    f_num_crtcs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_modes = VALUE16(tvb, *offsetp);
+    f_num_modes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_modes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_preferred, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_clones = VALUE16(tvb, *offsetp);
+    f_num_clones = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_clones, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_name_len = VALUE16(tvb, *offsetp);
+    f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_name_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_crtcs, hf_x11_randr_GetOutputInfo_reply_crtcs_item, f_num_crtcs, byte_order);
@@ -10848,13 +10848,13 @@ static void randrListOutputProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-ListOutputProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_atoms = VALUE16(tvb, *offsetp);
+    f_num_atoms = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_ListOutputProperties_reply_num_atoms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -10879,11 +10879,11 @@ static void randrQueryOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-QueryOutputProperty)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_reply_pending, tvb, *offsetp, 1, byte_order);
@@ -10922,13 +10922,13 @@ static void randrChangeOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE8(tvb, *offsetp);
+    f_format = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     field8(tvb, offsetp, t, hf_x11_randr_ChangeOutputProperty_mode, byte_order);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
     *offsetp += 2;
-    f_num_units = VALUE32(tvb, *offsetp);
+    f_num_units = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_num_units, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_randr_ChangeOutputProperty_data, ((f_num_units * f_format) / 8), byte_order);
@@ -10970,10 +10970,10 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOutputProperty");
 
     REPLY(reply);
-    f_format = VALUE8(tvb, *offsetp);
+    f_format = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetOutputProperty)", sequence_number);
     *offsetp += 2;
@@ -10982,7 +10982,7 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_reply_type, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -11006,7 +11006,7 @@ static void randrCreateMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-CreateMode)", sequence_number);
     *offsetp += 2;
@@ -11057,7 +11057,7 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetCrtcInfo)", sequence_number);
     *offsetp += 2;
@@ -11099,10 +11099,10 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_randr_GetCrtcInfo_reply_rotations, ett_x11_rectangle, rotations_bits, byte_order);
     }
     *offsetp += 2;
-    f_num_outputs = VALUE16(tvb, *offsetp);
+    f_num_outputs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_num_outputs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_possible_outputs = VALUE16(tvb, *offsetp);
+    f_num_possible_outputs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_num_possible_outputs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_outputs, hf_x11_randr_GetCrtcInfo_reply_outputs_item, f_num_outputs, byte_order);
@@ -11147,7 +11147,7 @@ static void randrSetCrtcConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-SetCrtcConfig)", sequence_number);
     *offsetp += 2;
@@ -11173,7 +11173,7 @@ static void randrGetCrtcGammaSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetCrtcGammaSize)", sequence_number);
     *offsetp += 2;
@@ -11200,13 +11200,13 @@ static void randrGetCrtcGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetCrtcGamma)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE16(tvb, *offsetp);
+    f_size = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcGamma_reply_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -11221,7 +11221,7 @@ static void randrSetCrtcGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
     int f_size;
     proto_tree_add_item(t, hf_x11_randr_SetCrtcGamma_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE16(tvb, *offsetp);
+    f_size = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcGamma_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -11252,7 +11252,7 @@ static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetScreenResourcesCurrent)", sequence_number);
     *offsetp += 2;
@@ -11262,16 +11262,16 @@ static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pin
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_crtcs = VALUE16(tvb, *offsetp);
+    f_num_crtcs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_outputs = VALUE16(tvb, *offsetp);
+    f_num_outputs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_num_outputs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_modes = VALUE16(tvb, *offsetp);
+    f_num_modes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_num_modes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_names_len = VALUE16(tvb, *offsetp);
+    f_names_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_names_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -11288,7 +11288,7 @@ static void randrSetCrtcTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
     proto_tree_add_item(t, hf_x11_randr_SetCrtcTransform_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
-    f_filter_len = VALUE16(tvb, *offsetp);
+    f_filter_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcTransform_filter_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -11321,7 +11321,7 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetCrtcTransform)", sequence_number);
     *offsetp += 2;
@@ -11335,16 +11335,16 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
     *offsetp += 4;
-    f_pending_len = VALUE16(tvb, *offsetp);
+    f_pending_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_pending_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_pending_nparams = VALUE16(tvb, *offsetp);
+    f_pending_nparams = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_pending_nparams, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_current_len = VALUE16(tvb, *offsetp);
+    f_current_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_current_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_current_nparams = VALUE16(tvb, *offsetp);
+    f_current_nparams = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_current_nparams, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_randr_GetCrtcTransform_reply_pending_filter_name, f_pending_len, byte_order);
@@ -11374,7 +11374,7 @@ static void randrGetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetPanning_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetPanning)", sequence_number);
     *offsetp += 2;
@@ -11447,7 +11447,7 @@ static void randrSetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetPanning_reply_status, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-SetPanning)", sequence_number);
     *offsetp += 2;
@@ -11479,7 +11479,7 @@ static void randrGetOutputPrimary_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetOutputPrimary)", sequence_number);
     *offsetp += 2;
@@ -11504,7 +11504,7 @@ static void randrGetProviders_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetProviders)", sequence_number);
     *offsetp += 2;
@@ -11512,7 +11512,7 @@ static void randrGetProviders_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetProviders_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_providers = VALUE16(tvb, *offsetp);
+    f_num_providers = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviders_reply_num_providers, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 18, ENC_NA);
@@ -11540,7 +11540,7 @@ static void randrGetProviderInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_status, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetProviderInfo)", sequence_number);
     *offsetp += 2;
@@ -11558,16 +11558,16 @@ static void randrGetProviderInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_randr_GetProviderInfo_reply_capabilities, ett_x11_rectangle, capabilities_bits, byte_order);
     }
     *offsetp += 4;
-    f_num_crtcs = VALUE16(tvb, *offsetp);
+    f_num_crtcs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_outputs = VALUE16(tvb, *offsetp);
+    f_num_outputs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_outputs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_associated_providers = VALUE16(tvb, *offsetp);
+    f_num_associated_providers = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_associated_providers, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_name_len = VALUE16(tvb, *offsetp);
+    f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_name_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -11614,13 +11614,13 @@ static void randrListProviderProperties_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-ListProviderProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_atoms = VALUE16(tvb, *offsetp);
+    f_num_atoms = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_ListProviderProperties_reply_num_atoms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -11645,11 +11645,11 @@ static void randrQueryProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-QueryProviderProperty)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_reply_pending, tvb, *offsetp, 1, byte_order);
@@ -11688,14 +11688,14 @@ static void randrChangeProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, i
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE8(tvb, *offsetp);
+    f_format = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_mode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
     *offsetp += 2;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_randr_ChangeProviderProperty_data, (f_num_items * (f_format / 8)), byte_order);
@@ -11738,10 +11738,10 @@ static void randrGetProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetProviderProperty");
 
     REPLY(reply);
-    f_format = VALUE8(tvb, *offsetp);
+    f_format = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetProviderProperty)", sequence_number);
     *offsetp += 2;
@@ -11751,7 +11751,7 @@ static void randrGetProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -11811,7 +11811,7 @@ static void randrGetMonitors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (randr-GetMonitors)", sequence_number);
     *offsetp += 2;
@@ -11819,7 +11819,7 @@ static void randrGetMonitors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nMonitors = VALUE32(tvb, *offsetp);
+    f_nMonitors = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_nMonitors, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_nOutputs, tvb, *offsetp, 4, byte_order);
@@ -12144,7 +12144,7 @@ static int struct_size_record_ClientInfo(tvbuff_t *tvb _U_, int *offsetp _U_, gu
 {
     int size = 0;
     int f_num_ranges;
-    f_num_ranges = VALUE32(tvb, *offsetp + size + 4);
+    f_num_ranges = tvb_get_guint32(tvb, *offsetp + size + 4, byte_order);
     size += f_num_ranges * 24;
     return size + 8;
 }
@@ -12161,7 +12161,7 @@ static void struct_record_ClientInfo(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         proto_tree_add_item(t, hf_x11_struct_record_ClientInfo_client_resource, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_num_ranges = VALUE32(tvb, *offsetp);
+        f_num_ranges = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_record_ClientInfo_num_ranges, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         struct_record_Range(tvb, offsetp, t, byte_order, f_num_ranges);
@@ -12184,7 +12184,7 @@ static void recordQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (record-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -12206,10 +12206,10 @@ static void recordCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
     *offsetp += 3;
-    f_num_client_specs = VALUE32(tvb, *offsetp);
+    f_num_client_specs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_CreateContext_num_client_specs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_ranges = VALUE32(tvb, *offsetp);
+    f_num_ranges = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_CreateContext_num_ranges, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_record_CreateContext_client_specs, hf_x11_record_CreateContext_client_specs_item, f_num_client_specs, byte_order);
@@ -12228,10 +12228,10 @@ static void recordRegisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
     *offsetp += 3;
-    f_num_client_specs = VALUE32(tvb, *offsetp);
+    f_num_client_specs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_RegisterClients_num_client_specs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_ranges = VALUE32(tvb, *offsetp);
+    f_num_ranges = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_RegisterClients_num_ranges, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_record_RegisterClients_client_specs, hf_x11_record_RegisterClients_client_specs_item, f_num_client_specs, byte_order);
@@ -12245,7 +12245,7 @@ static void recordUnregisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *
     int f_num_client_specs;
     proto_tree_add_item(t, hf_x11_record_UnregisterClients_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_client_specs = VALUE32(tvb, *offsetp);
+    f_num_client_specs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_UnregisterClients_num_client_specs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_record_UnregisterClients_client_specs, hf_x11_record_UnregisterClients_client_specs_item, f_num_client_specs, byte_order);
@@ -12267,7 +12267,7 @@ static void recordGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (record-GetContext)", sequence_number);
     *offsetp += 2;
@@ -12277,7 +12277,7 @@ static void recordGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
     *offsetp += 3;
-    f_num_intercepted_clients = VALUE32(tvb, *offsetp);
+    f_num_intercepted_clients = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_num_intercepted_clients, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA);
@@ -12300,11 +12300,11 @@ static void recordEnableContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_category, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (record-EnableContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_element_header, tvb, *offsetp, 1, byte_order);
@@ -12416,7 +12416,7 @@ static void renderQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (render-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -12445,23 +12445,23 @@ static void renderQueryPictFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (render-QueryPictFormats)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_formats = VALUE32(tvb, *offsetp);
+    f_num_formats = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_formats, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_screens = VALUE32(tvb, *offsetp);
+    f_num_screens = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_screens, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_depths, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_visuals, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_subpixel = VALUE32(tvb, *offsetp);
+    f_num_subpixel = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_subpixel, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA);
@@ -12486,13 +12486,13 @@ static void renderQueryPictIndexValues_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (render-QueryPictIndexValues)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_values = VALUE32(tvb, *offsetp);
+    f_num_values = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryPictIndexValues_reply_num_values, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -12509,7 +12509,7 @@ static void renderCreatePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_render_CreatePicture_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_mask = VALUE32(tvb, *offsetp);
+    f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* value_mask_bits [] = {
         &hf_x11_render_CreatePicture_value_mask_mask_Repeat,
@@ -12584,7 +12584,7 @@ static void renderChangePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_value_mask;
     proto_tree_add_item(t, hf_x11_render_ChangePicture_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_mask = VALUE32(tvb, *offsetp);
+    f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* value_mask_bits [] = {
         &hf_x11_render_ChangePicture_value_mask_mask_Repeat,
@@ -12798,7 +12798,7 @@ static void renderAddGlyphs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     int f_glyphs_len;
     proto_tree_add_item(t, hf_x11_render_AddGlyphs_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glyphs_len = VALUE32(tvb, *offsetp);
+    f_glyphs_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_AddGlyphs_glyphs_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_render_AddGlyphs_glyphids, hf_x11_render_AddGlyphs_glyphids_item, f_glyphs_len, byte_order);
@@ -12921,16 +12921,16 @@ static void renderQueryFilters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (render-QueryFilters)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_aliases = VALUE32(tvb, *offsetp);
+    f_num_aliases = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryFilters_reply_num_aliases, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_filters = VALUE32(tvb, *offsetp);
+    f_num_filters = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_QueryFilters_reply_num_filters, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 16, ENC_NA);
@@ -12944,7 +12944,7 @@ static void renderSetPictureFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     int f_filter_len;
     proto_tree_add_item(t, hf_x11_render_SetPictureFilter_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_filter_len = VALUE16(tvb, *offsetp);
+    f_filter_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_SetPictureFilter_filter_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -12991,7 +12991,7 @@ static void renderCreateLinearGradient(tvbuff_t *tvb, packet_info *pinfo _U_, in
     *offsetp += 4;
     struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
-    f_num_stops = VALUE32(tvb, *offsetp);
+    f_num_stops = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_CreateLinearGradient_num_stops, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateLinearGradient_stops, hf_x11_render_CreateLinearGradient_stops_item, f_num_stops, byte_order);
@@ -13011,7 +13011,7 @@ static void renderCreateRadialGradient(tvbuff_t *tvb, packet_info *pinfo _U_, in
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_render_CreateRadialGradient_outer_radius, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_stops = VALUE32(tvb, *offsetp);
+    f_num_stops = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_CreateRadialGradient_num_stops, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateRadialGradient_stops, hf_x11_render_CreateRadialGradient_stops_item, f_num_stops, byte_order);
@@ -13028,7 +13028,7 @@ static void renderCreateConicalGradient(tvbuff_t *tvb, packet_info *pinfo _U_, i
     struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_render_CreateConicalGradient_angle, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_stops = VALUE32(tvb, *offsetp);
+    f_num_stops = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_render_CreateConicalGradient_num_stops, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateConicalGradient_stops, hf_x11_render_CreateConicalGradient_stops_item, f_num_stops, byte_order);
@@ -13252,7 +13252,7 @@ static int struct_size_res_ClientIdValue(tvbuff_t *tvb _U_, int *offsetp _U_, gu
 {
     int size = 0;
     int f_length;
-    f_length = VALUE32(tvb, *offsetp + size + 8);
+    f_length = tvb_get_guint32(tvb, *offsetp + size + 8, byte_order);
     size += (f_length / 4) * 4;
     return size + 12;
 }
@@ -13268,7 +13268,7 @@ static void struct_res_ClientIdValue(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         item = proto_tree_add_item(root, hf_x11_struct_res_ClientIdValue, tvb, *offsetp, struct_size_res_ClientIdValue(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         struct_res_ClientIdSpec(tvb, offsetp, t, byte_order, 1);
-        f_length = VALUE32(tvb, *offsetp);
+        f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_res_ClientIdValue_length, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         listOfCard32(tvb, offsetp, t, hf_x11_struct_res_ClientIdValue_value, hf_x11_struct_res_ClientIdValue_value_item, (f_length / 4), byte_order);
@@ -13314,7 +13314,7 @@ static int struct_size_res_ResourceSizeValue(tvbuff_t *tvb _U_, int *offsetp _U_
 {
     int size = 0;
     int f_num_cross_references;
-    f_num_cross_references = VALUE32(tvb, *offsetp + size + 20);
+    f_num_cross_references = tvb_get_guint32(tvb, *offsetp + size + 20, byte_order);
     size += f_num_cross_references * 20;
     return size + 24;
 }
@@ -13330,7 +13330,7 @@ static void struct_res_ResourceSizeValue(tvbuff_t *tvb, int *offsetp, proto_tree
         item = proto_tree_add_item(root, hf_x11_struct_res_ResourceSizeValue, tvb, *offsetp, struct_size_res_ResourceSizeValue(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         struct_res_ResourceSizeSpec(tvb, offsetp, t, byte_order, 1);
-        f_num_cross_references = VALUE32(tvb, *offsetp);
+        f_num_cross_references = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_res_ResourceSizeValue_num_cross_references, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         struct_res_ResourceSizeSpec(tvb, offsetp, t, byte_order, f_num_cross_references);
@@ -13353,7 +13353,7 @@ static void resQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -13378,13 +13378,13 @@ static void resQueryClients_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryClients)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_clients = VALUE32(tvb, *offsetp);
+    f_num_clients = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryClients_reply_num_clients, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -13407,13 +13407,13 @@ static void resQueryClientResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryClientResources)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_types = VALUE32(tvb, *offsetp);
+    f_num_types = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryClientResources_reply_num_types, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -13435,7 +13435,7 @@ static void resQueryClientPixmapBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryClientPixmapBytes)", sequence_number);
     *offsetp += 2;
@@ -13450,7 +13450,7 @@ static void resQueryClientPixmapBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 static void resQueryClientIds(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_num_specs;
-    f_num_specs = VALUE32(tvb, *offsetp);
+    f_num_specs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryClientIds_num_specs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_res_ClientIdSpec(tvb, offsetp, t, byte_order, f_num_specs);
@@ -13466,13 +13466,13 @@ static void resQueryClientIds_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryClientIds)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_ids = VALUE32(tvb, *offsetp);
+    f_num_ids = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryClientIds_reply_num_ids, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -13485,7 +13485,7 @@ static void resQueryResourceBytes(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
     int f_num_specs;
     proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_client, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_specs = VALUE32(tvb, *offsetp);
+    f_num_specs = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_num_specs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_res_ResourceIdSpec(tvb, offsetp, t, byte_order, f_num_specs);
@@ -13501,13 +13501,13 @@ static void resQueryResourceBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (res-QueryResourceBytes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_sizes = VALUE32(tvb, *offsetp);
+    f_num_sizes = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_reply_num_sizes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -13592,7 +13592,7 @@ static void screensaverQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (screensaver-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -13620,7 +13620,7 @@ static void screensaverQueryInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_state, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (screensaver-QueryInfo)", sequence_number);
     *offsetp += 2;
@@ -13673,7 +13673,7 @@ static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_mask = VALUE32(tvb, *offsetp);
+    f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* value_mask_bits [] = {
         &hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixmap,
@@ -13889,7 +13889,7 @@ static void shapeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shape-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -13976,7 +13976,7 @@ static void shapeQueryExtents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shape-QueryExtents)", sequence_number);
     *offsetp += 2;
@@ -14030,7 +14030,7 @@ static void shapeInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_shape_InputSelected_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shape-InputSelected)", sequence_number);
     *offsetp += 2;
@@ -14055,13 +14055,13 @@ static void shapeGetRectangles_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_reply_ordering, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shape-GetRectangles)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_rectangles_len = VALUE32(tvb, *offsetp);
+    f_rectangles_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_shape_GetRectangles_reply_rectangles_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -14150,7 +14150,7 @@ static void shmQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_shared_pixmaps, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shm-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -14256,7 +14256,7 @@ static void shmGetImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_shm_GetImage_reply_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shm-GetImage)", sequence_number);
     *offsetp += 2;
@@ -14318,7 +14318,7 @@ static void shmCreateSegment_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_shm_CreateSegment_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (shm-CreateSegment)", sequence_number);
     *offsetp += 2;
@@ -14408,7 +14408,7 @@ static void syncInitialize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-Initialize)", sequence_number);
     *offsetp += 2;
@@ -14435,13 +14435,13 @@ static void syncListSystemCounters_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-ListSystemCounters)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_counters_len = VALUE32(tvb, *offsetp);
+    f_counters_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_sync_ListSystemCounters_reply_counters_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -14476,7 +14476,7 @@ static void syncQueryCounter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-QueryCounter)", sequence_number);
     *offsetp += 2;
@@ -14509,7 +14509,7 @@ static void syncCreateAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     int f_value_mask;
     proto_tree_add_item(t, hf_x11_sync_CreateAlarm_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_mask = VALUE32(tvb, *offsetp);
+    f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* value_mask_bits [] = {
         &hf_x11_sync_CreateAlarm_value_mask_mask_Counter,
@@ -14549,7 +14549,7 @@ static void syncChangeAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     int f_value_mask;
     proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_mask = VALUE32(tvb, *offsetp);
+    f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* value_mask_bits [] = {
         &hf_x11_sync_ChangeAlarm_value_mask_mask_Counter,
@@ -14604,7 +14604,7 @@ static void syncQueryAlarm_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-QueryAlarm)", sequence_number);
     *offsetp += 2;
@@ -14641,7 +14641,7 @@ static void syncGetPriority_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-GetPriority)", sequence_number);
     *offsetp += 2;
@@ -14693,7 +14693,7 @@ static void syncQueryFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (sync-QueryFence)", sequence_number);
     *offsetp += 2;
@@ -14859,7 +14859,7 @@ static void xc_miscGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xc_misc-GetVersion)", sequence_number);
     *offsetp += 2;
@@ -14883,7 +14883,7 @@ static void xc_miscGetXIDRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xc_misc-GetXIDRange)", sequence_number);
     *offsetp += 2;
@@ -14910,13 +14910,13 @@ static void xc_miscGetXIDList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xc_misc-GetXIDList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ids_len = VALUE32(tvb, *offsetp);
+    f_ids_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xc_misc_GetXIDList_reply_ids_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -14984,7 +14984,7 @@ static void xevieQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xevie-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -15012,7 +15012,7 @@ static void xevieStart_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xevie-Start)", sequence_number);
     *offsetp += 2;
@@ -15036,7 +15036,7 @@ static void xevieEnd_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xevie-End)", sequence_number);
     *offsetp += 2;
@@ -15077,7 +15077,7 @@ static void xevieSend_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xevie-Send)", sequence_number);
     *offsetp += 2;
@@ -15101,7 +15101,7 @@ static void xevieSelectInput_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xevie-SelectInput)", sequence_number);
     *offsetp += 2;
@@ -15197,7 +15197,7 @@ static void xf86driQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -15225,7 +15225,7 @@ static void xf86driQueryDirectRenderingCapable_Reply(tvbuff_t *tvb, packet_info
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-QueryDirectRenderingCapable)", sequence_number);
     *offsetp += 2;
@@ -15250,7 +15250,7 @@ static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-OpenConnection)", sequence_number);
     *offsetp += 2;
@@ -15260,7 +15260,7 @@ static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86dri_OpenConnection_reply_sarea_handle_high, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_bus_id_len = VALUE32(tvb, *offsetp);
+    f_bus_id_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86dri_OpenConnection_reply_bus_id_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -15289,7 +15289,7 @@ static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-GetClientDriverName)", sequence_number);
     *offsetp += 2;
@@ -15301,7 +15301,7 @@ static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_reply_client_driver_patch_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_driver_name_len = VALUE32(tvb, *offsetp);
+    f_client_driver_name_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_reply_client_driver_name_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 8, ENC_NA);
@@ -15327,7 +15327,7 @@ static void xf86driCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-CreateContext)", sequence_number);
     *offsetp += 2;
@@ -15361,7 +15361,7 @@ static void xf86driCreateDrawable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-CreateDrawable)", sequence_number);
     *offsetp += 2;
@@ -15397,7 +15397,7 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-GetDrawableInfo)", sequence_number);
     *offsetp += 2;
@@ -15415,14 +15415,14 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_H, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_clip_rects = VALUE32(tvb, *offsetp);
+    f_num_clip_rects = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_num_clip_rects, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_back_clip_rects = VALUE32(tvb, *offsetp);
+    f_num_back_clip_rects = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_num_back_clip_rects, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_xf86dri_DrmClipRect(tvb, offsetp, t, byte_order, f_num_clip_rects);
@@ -15444,7 +15444,7 @@ static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
@@ -15460,7 +15460,7 @@ static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_stride, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_device_private_size = VALUE32(tvb, *offsetp);
+    f_device_private_size = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_device_private_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_xf86dri_GetDeviceInfo_reply_device_private, hf_x11_xf86dri_GetDeviceInfo_reply_device_private_item, f_device_private_size, byte_order);
@@ -15482,7 +15482,7 @@ static void xf86driAuthConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86dri-AuthConnection)", sequence_number);
     *offsetp += 2;
@@ -15647,7 +15647,7 @@ static void xf86vidmodeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -15676,7 +15676,7 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetModeLine)", sequence_number);
     *offsetp += 2;
@@ -15725,7 +15725,7 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetModeLine_reply_private, f_privsize, byte_order);
@@ -15777,7 +15777,7 @@ static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_ModModeLine_private, f_privsize, byte_order);
@@ -15812,22 +15812,22 @@ static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetMonitor)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vendor_length = VALUE8(tvb, *offsetp);
+    f_vendor_length = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetMonitor_reply_vendor_length, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_model_length = VALUE8(tvb, *offsetp);
+    f_model_length = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetMonitor_reply_model_length, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_hsync = VALUE8(tvb, *offsetp);
+    f_num_hsync = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetMonitor_reply_num_hsync, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_vsync = VALUE8(tvb, *offsetp);
+    f_num_vsync = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetMonitor_reply_num_vsync, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -15864,13 +15864,13 @@ static void xf86vidmodeGetAllModeLines_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetAllModeLines)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_modecount = VALUE32(tvb, *offsetp);
+    f_modecount = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetAllModeLines_reply_modecount, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -15926,7 +15926,7 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_dotclock, tvb, *offsetp, 4, byte_order);
@@ -16024,7 +16024,7 @@ static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_DeleteModeLine_private, f_privsize, byte_order);
@@ -16079,7 +16079,7 @@ static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, i
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_ValidateModeLine_private, f_privsize, byte_order);
@@ -16094,7 +16094,7 @@ static void xf86vidmodeValidateModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-ValidateModeLine)", sequence_number);
     *offsetp += 2;
@@ -16154,7 +16154,7 @@ static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
     *offsetp += 12;
-    f_privsize = VALUE32(tvb, *offsetp);
+    f_privsize = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_SwitchToMode_private, f_privsize, byte_order);
@@ -16177,7 +16177,7 @@ static void xf86vidmodeGetViewPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetViewPort)", sequence_number);
     *offsetp += 2;
@@ -16221,13 +16221,13 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetDotClocks)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_flags = VALUE32(tvb, *offsetp);
+    f_flags = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* flags_bits [] = {
         &hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable,
@@ -16235,7 +16235,7 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xf86vidmode_GetDotClocks_reply_flags, ett_x11_rectangle, flags_bits, byte_order);
     }
     *offsetp += 4;
-    f_clocks = VALUE32(tvb, *offsetp);
+    f_clocks = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_clocks, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_maxclocks, tvb, *offsetp, 4, byte_order);
@@ -16285,7 +16285,7 @@ static void xf86vidmodeGetGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetGamma)", sequence_number);
     *offsetp += 2;
@@ -16318,13 +16318,13 @@ static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetGammaRamp)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE16(tvb, *offsetp);
+    f_size = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRamp_reply_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -16339,7 +16339,7 @@ static void xf86vidmodeSetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int *
     int f_size;
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGammaRamp_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_size = VALUE16(tvb, *offsetp);
+    f_size = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGammaRamp_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_red, hf_x11_xf86vidmode_SetGammaRamp_red_item, ((f_size + 1) & (~1)), byte_order);
@@ -16366,7 +16366,7 @@ static void xf86vidmodeGetGammaRampSize_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetGammaRampSize)", sequence_number);
     *offsetp += 2;
@@ -16394,7 +16394,7 @@ static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xf86vidmode-GetPermissions)", sequence_number);
     *offsetp += 2;
@@ -16552,7 +16552,7 @@ static void xfixesQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xfixes-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -16637,7 +16637,7 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xfixes-GetCursorImage)", sequence_number);
     *offsetp += 2;
@@ -16647,10 +16647,10 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
+    f_width = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
+    f_height = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_xhot, tvb, *offsetp, 2, byte_order);
@@ -16799,11 +16799,11 @@ static void xfixesFetchRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xfixes-FetchRegion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, 1);
@@ -16853,7 +16853,7 @@ static void xfixesSetCursorName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_nbytes;
     proto_tree_add_item(t, hf_x11_xfixes_SetCursorName_cursor, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nbytes = VALUE16(tvb, *offsetp);
+    f_nbytes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_SetCursorName_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -16877,14 +16877,14 @@ static void xfixesGetCursorName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xfixes-GetCursorName)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorName_reply_atom, byte_order);
-    f_nbytes = VALUE16(tvb, *offsetp);
+    f_nbytes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorName_reply_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 18, ENC_NA);
@@ -16907,7 +16907,7 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xfixes-GetCursorImageAndName)", sequence_number);
     *offsetp += 2;
@@ -16917,10 +16917,10 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
+    f_width = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
+    f_height = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_xhot, tvb, *offsetp, 2, byte_order);
@@ -16930,7 +16930,7 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_serial, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, byte_order);
-    f_nbytes = VALUE16(tvb, *offsetp);
+    f_nbytes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -16952,7 +16952,7 @@ static void xfixesChangeCursorByName(tvbuff_t *tvb, packet_info *pinfo _U_, int
     int f_nbytes;
     proto_tree_add_item(t, hf_x11_xfixes_ChangeCursorByName_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nbytes = VALUE16(tvb, *offsetp);
+    f_nbytes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_ChangeCursorByName_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -17016,7 +17016,7 @@ static void xfixesCreatePointerBarrier(tvbuff_t *tvb, packet_info *pinfo _U_, in
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
     *offsetp += 2;
-    f_num_devices = VALUE16(tvb, *offsetp);
+    f_num_devices = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_num_devices, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfCard16(tvb, offsetp, t, hf_x11_xfixes_CreatePointerBarrier_devices, hf_x11_xfixes_CreatePointerBarrier_devices_item, f_num_devices, byte_order);
@@ -17232,7 +17232,7 @@ static void xineramaQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -17258,7 +17258,7 @@ static void xineramaGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinerama_GetState_reply_state, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-GetState)", sequence_number);
     *offsetp += 2;
@@ -17282,7 +17282,7 @@ static void xineramaGetScreenCount_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenCount_reply_screen_count, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-GetScreenCount)", sequence_number);
     *offsetp += 2;
@@ -17308,7 +17308,7 @@ static void xineramaGetScreenSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-GetScreenSize)", sequence_number);
     *offsetp += 2;
@@ -17336,7 +17336,7 @@ static void xineramaIsActive_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-IsActive)", sequence_number);
     *offsetp += 2;
@@ -17359,13 +17359,13 @@ static void xineramaQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinerama-QueryScreens)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_number = VALUE32(tvb, *offsetp);
+    f_number = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinerama_QueryScreens_reply_number, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -17451,7 +17451,7 @@ static void struct_xinput_FP3232(tvbuff_t *tvb, int *offsetp, proto_tree *root,
 static void xinputGetExtensionVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_name_len;
-    f_name_len = VALUE16(tvb, *offsetp);
+    f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_name_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -17468,7 +17468,7 @@ static void xinputGetExtensionVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetExtensionVersion)", sequence_number);
     *offsetp += 2;
@@ -17558,7 +17558,7 @@ static void struct_xinput_InputInfo(tvbuff_t *tvb, int *offsetp, proto_tree *roo
         }
         if (f_class_id == 2) {
             int f_axes_len;
-            f_axes_len = VALUE8(tvb, *offsetp);
+            f_axes_len = tvb_get_guint8(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Valuator_axes_len, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
             field8(tvb, offsetp, t, hf_x11_struct_xinput_InputInfo_Valuator_mode, byte_order);
@@ -17583,13 +17583,13 @@ static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_ListInputDevices_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-ListInputDevices)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_devices_len = VALUE8(tvb, *offsetp);
+    f_devices_len = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ListInputDevices_reply_devices_len, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 23, ENC_NA);
@@ -17635,13 +17635,13 @@ static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_OpenDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-OpenDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE8(tvb, *offsetp);
+    f_num_classes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_OpenDevice_reply_num_classes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 23, ENC_NA);
@@ -17678,7 +17678,7 @@ static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-SetDeviceMode)", sequence_number);
     *offsetp += 2;
@@ -17694,7 +17694,7 @@ static void xinputSelectExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, in
     int f_num_classes;
     proto_tree_add_item(t, hf_x11_xinput_SelectExtensionEvent_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_SelectExtensionEvent_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -17719,16 +17719,16 @@ static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetSelectedExtensionEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_this_classes = VALUE16(tvb, *offsetp);
+    f_num_this_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_reply_num_this_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_all_classes = VALUE16(tvb, *offsetp);
+    f_num_all_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_reply_num_all_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -17742,7 +17742,7 @@ static void xinputChangeDeviceDontPropagateList(tvbuff_t *tvb, packet_info *pinf
     int f_num_classes;
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_mode, byte_order);
@@ -17767,13 +17767,13 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceDontPropagateList_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceDontPropagateList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceDontPropagateList_reply_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -17824,16 +17824,16 @@ static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceMotionEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_events = VALUE32(tvb, *offsetp);
+    f_num_events = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_events, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_axes = VALUE8(tvb, *offsetp);
+    f_num_axes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, byte_order);
@@ -17858,7 +17858,7 @@ static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_ChangeKeyboardDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-ChangeKeyboardDevice)", sequence_number);
     *offsetp += 2;
@@ -17889,7 +17889,7 @@ static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-ChangePointerDevice)", sequence_number);
     *offsetp += 2;
@@ -17906,7 +17906,7 @@ static void xinputGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     field32(tvb, offsetp, t, hf_x11_xinput_GrabDevice_time, byte_order);
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_this_device_mode, byte_order);
@@ -17929,7 +17929,7 @@ static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GrabDevice)", sequence_number);
     *offsetp += 2;
@@ -17954,7 +17954,7 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_num_classes;
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     {
@@ -18019,7 +18019,7 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_grabbed_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_modifier_device, byte_order);
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     {
@@ -18101,7 +18101,7 @@ static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceFocus)", sequence_number);
     *offsetp += 2;
@@ -18180,7 +18180,7 @@ static void struct_xinput_FeedbackState(tvbuff_t *tvb, int *offsetp, proto_tree
             int f_num_keysyms;
             proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_String_max_symbols, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
-            f_num_keysyms = VALUE16(tvb, *offsetp);
+            f_num_keysyms = tvb_get_guint16(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_String_num_keysyms, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
             listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_String_keysyms, hf_x11_struct_xinput_FeedbackState_String_keysyms_item, f_num_keysyms, byte_order);
@@ -18229,13 +18229,13 @@ static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetFeedbackControl)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_feedbacks = VALUE16(tvb, *offsetp);
+    f_num_feedbacks = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_num_feedbacks, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -18296,7 +18296,7 @@ static void struct_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, proto_tree *r
             int f_num_keysyms;
             proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
             *offsetp += 2;
-            f_num_keysyms = VALUE16(tvb, *offsetp);
+            f_num_keysyms = tvb_get_guint16(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_String_num_keysyms, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
             listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_String_keysyms, hf_x11_struct_xinput_FeedbackCtl_String_keysyms_item, f_num_keysyms, byte_order);
@@ -18370,11 +18370,11 @@ static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceKeyMapping)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode, tvb, *offsetp, 1, byte_order);
@@ -18392,10 +18392,10 @@ static void xinputChangeDeviceKeyMapping(tvbuff_t *tvb, packet_info *pinfo _U_,
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceKeyMapping_first_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keysyms_per_keycode = VALUE8(tvb, *offsetp);
+    f_keysyms_per_keycode = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_per_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keycode_count = VALUE8(tvb, *offsetp);
+    f_keycode_count = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceKeyMapping_keycode_count, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceKeyMapping_keysyms, hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_item, (f_keycode_count * f_keysyms_per_keycode), byte_order);
@@ -18419,13 +18419,13 @@ static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_keycodes_per_modifier = VALUE8(tvb, *offsetp);
+    f_keycodes_per_modifier = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceModifierMapping_reply_keycodes_per_modifier, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 23, ENC_NA);
@@ -18438,7 +18438,7 @@ static void xinputSetDeviceModifierMapping(tvbuff_t *tvb, packet_info *pinfo _U_
     int f_keycodes_per_modifier;
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keycodes_per_modifier = VALUE8(tvb, *offsetp);
+    f_keycodes_per_modifier = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -18455,7 +18455,7 @@ static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-SetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
@@ -18483,13 +18483,13 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_map_size = VALUE8(tvb, *offsetp);
+    f_map_size = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceButtonMapping_reply_map_size, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 23, ENC_NA);
@@ -18506,7 +18506,7 @@ static void xinputSetDeviceButtonMapping(tvbuff_t *tvb, packet_info *pinfo _U_,
     int f_map_size;
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_map_size = VALUE8(tvb, *offsetp);
+    f_map_size = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_map_size, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -18523,7 +18523,7 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-SetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
@@ -18569,7 +18569,7 @@ static void struct_xinput_InputState(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         }
         if (f_class_id == 2) {
             int f_num_valuators;
-            f_num_valuators = VALUE8(tvb, *offsetp);
+            f_num_valuators = tvb_get_guint8(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Valuator_num_valuators, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
             {
@@ -18602,13 +18602,13 @@ static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-QueryDeviceState)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_classes = VALUE8(tvb, *offsetp);
+    f_num_classes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_reply_num_classes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 23, ENC_NA);
@@ -18635,7 +18635,7 @@ static void xinputSetDeviceValuators(tvbuff_t *tvb, packet_info *pinfo _U_, int
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_first_valuator, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_valuators = VALUE8(tvb, *offsetp);
+    f_num_valuators = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_num_valuators, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
@@ -18652,7 +18652,7 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-SetDeviceValuators)", sequence_number);
     *offsetp += 2;
@@ -18684,7 +18684,7 @@ static void struct_xinput_DeviceState(tvbuff_t *tvb, int *offsetp, proto_tree *r
         *offsetp += 2;
         if (f_control_id == 1) {
             int f_num_valuators;
-            f_num_valuators = VALUE32(tvb, *offsetp);
+            f_num_valuators = tvb_get_guint32(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_resolution_num_valuators, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
             listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_resolution_resolution_values, hf_x11_struct_xinput_DeviceState_resolution_resolution_values_item, f_num_valuators, byte_order);
@@ -18757,7 +18757,7 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceControl)", sequence_number);
     *offsetp += 2;
@@ -18792,7 +18792,7 @@ static void struct_xinput_DeviceCtl(tvbuff_t *tvb, int *offsetp, proto_tree *roo
             int f_num_valuators;
             proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_resolution_first_valuator, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
-            f_num_valuators = VALUE8(tvb, *offsetp);
+            f_num_valuators = tvb_get_guint8(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_resolution_num_valuators, tvb, *offsetp, 1, byte_order);
             *offsetp += 1;
             proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -18864,7 +18864,7 @@ static void xinputChangeDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-ChangeDeviceControl)", sequence_number);
     *offsetp += 2;
@@ -18892,13 +18892,13 @@ static void xinputListDeviceProperties_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-ListDeviceProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_atoms = VALUE16(tvb, *offsetp);
+    f_num_atoms = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_reply_num_atoms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -18920,7 +18920,7 @@ static void xinputChangeDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, in
     field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_mode, byte_order);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     if (f_format == 8) {
@@ -18985,7 +18985,7 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-GetDeviceProperty)", sequence_number);
     *offsetp += 2;
@@ -18995,7 +18995,7 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_format = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_format, byte_order);
@@ -19080,7 +19080,7 @@ static void xinputXIQueryPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIQueryPointer)", sequence_number);
     *offsetp += 2;
@@ -19102,7 +19102,7 @@ static void xinputXIQueryPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_buttons_len = VALUE16(tvb, *offsetp);
+    f_buttons_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_buttons_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
@@ -19165,7 +19165,7 @@ static void struct_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, proto_tre
         *offsetp += 2;
         if (f_type == 1) {
             int f_name_len;
-            f_name_len = VALUE16(tvb, *offsetp);
+            f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_AddMaster_name_len, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
             proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_AddMaster_send_core, tvb, *offsetp, 1, byte_order);
@@ -19201,7 +19201,7 @@ static void struct_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, proto_tre
 static void xinputXIChangeHierarchy(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_num_changes;
-    f_num_changes = VALUE8(tvb, *offsetp);
+    f_num_changes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_XIChangeHierarchy_num_changes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
@@ -19233,7 +19233,7 @@ static void xinputXIGetClientPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIGetClientPointer)", sequence_number);
     *offsetp += 2;
@@ -19252,7 +19252,7 @@ static int struct_size_xinput_EventMask(tvbuff_t *tvb _U_, int *offsetp _U_, gui
 {
     int size = 0;
     int f_mask_len;
-    f_mask_len = VALUE16(tvb, *offsetp + size + 2);
+    f_mask_len = tvb_get_guint16(tvb, *offsetp + size + 2, byte_order);
     size += f_mask_len * 4;
     return size + 4;
 }
@@ -19268,7 +19268,7 @@ static void struct_xinput_EventMask(tvbuff_t *tvb, int *offsetp, proto_tree *roo
         item = proto_tree_add_item(root, hf_x11_struct_xinput_EventMask, tvb, *offsetp, struct_size_xinput_EventMask(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         field16(tvb, offsetp, t, hf_x11_struct_xinput_EventMask_deviceid, byte_order);
-        f_mask_len = VALUE16(tvb, *offsetp);
+        f_mask_len = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xinput_EventMask_mask_len, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_EventMask_mask, hf_x11_struct_xinput_EventMask_mask_item, f_mask_len, byte_order);
@@ -19280,7 +19280,7 @@ static void xinputXISelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
     int f_num_mask;
     proto_tree_add_item(t, hf_x11_xinput_XISelectEvents_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_mask = VALUE16(tvb, *offsetp);
+    f_num_mask = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XISelectEvents_num_mask, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -19305,7 +19305,7 @@ static void xinputXIQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIQueryVersion)", sequence_number);
     *offsetp += 2;
@@ -19342,14 +19342,14 @@ static void struct_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, proto_tree *r
         *offsetp += 2;
         if (f_type == 0) {
             int f_num_keys;
-            f_num_keys = VALUE16(tvb, *offsetp);
+            f_num_keys = tvb_get_guint16(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Key_num_keys, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
             listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Key_keys, hf_x11_struct_xinput_DeviceClass_Key_keys_item, f_num_keys, byte_order);
         }
         if (f_type == 1) {
             int f_num_buttons;
-            f_num_buttons = VALUE16(tvb, *offsetp);
+            f_num_buttons = tvb_get_guint16(tvb, *offsetp, byte_order);
             proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Button_num_buttons, tvb, *offsetp, 2, byte_order);
             *offsetp += 2;
             listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Button_state, hf_x11_struct_xinput_DeviceClass_Button_state_item, ((f_num_buttons + 31) / 32), byte_order);
@@ -19399,8 +19399,8 @@ static int struct_size_xinput_XIDeviceInfo(tvbuff_t *tvb _U_, int *offsetp _U_,
     int i, off;
     int f_name_len;
     int f_num_classes;
-    f_num_classes = VALUE16(tvb, *offsetp + size + 6);
-    f_name_len = VALUE16(tvb, *offsetp + size + 8);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp + size + 6, byte_order);
+    f_name_len = tvb_get_guint16(tvb, *offsetp + size + 8, byte_order);
     size += f_name_len * 1;
     size = (size + 3) & ~3;
     for (i = 0; i < f_num_classes; i++) {
@@ -19424,10 +19424,10 @@ static void struct_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *
         field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_deviceid, byte_order);
         field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_type, byte_order);
         field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_attachment, byte_order);
-        f_num_classes = VALUE16(tvb, *offsetp);
+        f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_num_classes, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_name_len = VALUE16(tvb, *offsetp);
+        f_name_len = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_name_len, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_enabled, tvb, *offsetp, 1, byte_order);
@@ -19459,13 +19459,13 @@ static void xinputXIQueryDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIQueryDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_infos = VALUE16(tvb, *offsetp);
+    f_num_infos = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIQueryDevice_reply_num_infos, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -19498,7 +19498,7 @@ static void xinputXIGetFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIGetFocus)", sequence_number);
     *offsetp += 2;
@@ -19524,7 +19524,7 @@ static void xinputXIGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse
     field8(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_owner_events, byte_order);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_mask_len = VALUE16(tvb, *offsetp);
+    f_mask_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIGrabDevice_mask_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_mask, hf_x11_xinput_XIGrabDevice_mask_item, f_mask_len, byte_order);
@@ -19539,7 +19539,7 @@ static void xinputXIGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIGrabDevice)", sequence_number);
     *offsetp += 2;
@@ -19599,10 +19599,10 @@ static void xinputXIPassiveGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_detail, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     field16(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_deviceid, byte_order);
-    f_num_modifiers = VALUE16(tvb, *offsetp);
+    f_num_modifiers = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_num_modifiers, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mask_len = VALUE16(tvb, *offsetp);
+    f_mask_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_mask_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_grab_type, byte_order);
@@ -19626,13 +19626,13 @@ static void xinputXIPassiveGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIPassiveGrabDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_modifiers = VALUE16(tvb, *offsetp);
+    f_num_modifiers = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_reply_num_modifiers, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -19648,7 +19648,7 @@ static void xinputXIPassiveUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, i
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveUngrabDevice_detail, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     field16(tvb, offsetp, t, hf_x11_xinput_XIPassiveUngrabDevice_deviceid, byte_order);
-    f_num_modifiers = VALUE16(tvb, *offsetp);
+    f_num_modifiers = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIPassiveUngrabDevice_num_modifiers, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveUngrabDevice_grab_type, byte_order);
@@ -19674,13 +19674,13 @@ static void xinputXIListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIListProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_properties = VALUE16(tvb, *offsetp);
+    f_num_properties = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIListProperties_reply_num_properties, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -19699,7 +19699,7 @@ static void xinputXIChangeProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     if (f_format == 8) {
@@ -19762,7 +19762,7 @@ static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIGetProperty)", sequence_number);
     *offsetp += 2;
@@ -19772,7 +19772,7 @@ static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_items = VALUE32(tvb, *offsetp);
+    f_num_items = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_format = field8(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_format, byte_order);
@@ -19812,13 +19812,13 @@ static void xinputXIGetSelectedEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xinput-XIGetSelectedEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_masks = VALUE16(tvb, *offsetp);
+    f_num_masks = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIGetSelectedEvents_reply_num_masks, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -19849,7 +19849,7 @@ static void struct_xinput_BarrierReleasePointerInfo(tvbuff_t *tvb, int *offsetp,
 static void xinputXIBarrierReleasePointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_num_barriers;
-    f_num_barriers = VALUE32(tvb, *offsetp);
+    f_num_barriers = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_XIBarrierReleasePointer_num_barriers, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_xinput_BarrierReleasePointerInfo(tvb, offsetp, t, byte_order, f_num_barriers);
@@ -20037,7 +20037,7 @@ static void xinputDeviceChanged(tvbuff_t *tvb, int length _U_, int *offsetp, pro
                                "DeviceChanged (1)");
     field16(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_time, byte_order);
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_DeviceChanged_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field16(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_sourceid, byte_order);
@@ -20073,10 +20073,10 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_KeyPress_event_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_buttons_len = VALUE16(tvb, *offsetp);
+    f_buttons_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_KeyPress_buttons_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_KeyPress_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field16(tvb, offsetp, t, hf_x11_xinput_KeyPress_sourceid, byte_order);
@@ -20095,7 +20095,7 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_KeyPress_valuator_mask, hf_x11_xinput_KeyPress_valuator_mask_item, f_valuators_len, byte_order);
@@ -20128,10 +20128,10 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_ButtonPress_event_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_buttons_len = VALUE16(tvb, *offsetp);
+    f_buttons_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ButtonPress_buttons_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ButtonPress_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field16(tvb, offsetp, t, hf_x11_xinput_ButtonPress_sourceid, byte_order);
@@ -20150,7 +20150,7 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_valuator_mask, hf_x11_xinput_ButtonPress_valuator_mask_item, f_valuators_len, byte_order);
@@ -20186,7 +20186,7 @@ static void xinputEnter(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xinput_Enter_focus, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_buttons_len = VALUE16(tvb, *offsetp);
+    f_buttons_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_Enter_buttons_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
@@ -20249,7 +20249,7 @@ static void xinputHierarchy(tvbuff_t *tvb, int length _U_, int *offsetp, proto_t
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xinput_Hierarchy_flags, ett_x11_rectangle, flags_bits, byte_order);
     }
     *offsetp += 4;
-    f_num_infos = VALUE16(tvb, *offsetp);
+    f_num_infos = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_Hierarchy_num_infos, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 10, ENC_NA);
@@ -20284,7 +20284,7 @@ static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_sourceid, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     {
@@ -20299,7 +20299,7 @@ static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_valuator_mask, hf_x11_xinput_RawKeyPress_valuator_mask_item, f_valuators_len, byte_order);
@@ -20320,7 +20320,7 @@ static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, pr
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_sourceid, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     {
@@ -20335,7 +20335,7 @@ static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, pr
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_valuator_mask, hf_x11_xinput_RawButtonPress_valuator_mask_item, f_valuators_len, byte_order);
@@ -20369,10 +20369,10 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_TouchBegin_event_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_buttons_len = VALUE16(tvb, *offsetp);
+    f_buttons_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_TouchBegin_buttons_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_TouchBegin_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     field16(tvb, offsetp, t, hf_x11_xinput_TouchBegin_sourceid, byte_order);
@@ -20392,7 +20392,7 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_valuator_mask, hf_x11_xinput_TouchBegin_valuator_mask_item, f_valuators_len, byte_order);
@@ -20435,7 +20435,7 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_sourceid, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_valuators_len = VALUE16(tvb, *offsetp);
+    f_valuators_len = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_valuators_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     {
@@ -20451,7 +20451,7 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro
     {
         int i;
         for (i = 0; i < f_valuators_len; i++) {
-            sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4);
+            sumof_valuator_mask += tvb_get_guint32(tvb, *offsetp + i * 4, byte_order);
         }
     }
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_valuator_mask, hf_x11_xinput_RawTouchBegin_valuator_mask_item, f_valuators_len, byte_order);
@@ -20506,10 +20506,10 @@ static void xinputSendExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_propagate, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_classes = VALUE16(tvb, *offsetp);
+    f_num_classes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_events = VALUE8(tvb, *offsetp);
+    f_num_events = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_events, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA);
@@ -21032,7 +21032,7 @@ static int struct_size_xkb_CountedString16(tvbuff_t *tvb _U_, int *offsetp _U_,
 {
     int size = 0;
     int f_length;
-    f_length = VALUE16(tvb, *offsetp + size + 0);
+    f_length = tvb_get_guint16(tvb, *offsetp + size + 0, byte_order);
     size += f_length * 1;
     size += (((f_length + 5) & (~3)) - (f_length + 2)) * 1;
     return size + 2;
@@ -21048,7 +21048,7 @@ static void struct_xkb_CountedString16(tvbuff_t *tvb, int *offsetp, proto_tree *
 
         item = proto_tree_add_item(root, hf_x11_struct_xkb_CountedString16, tvb, *offsetp, struct_size_xkb_CountedString16(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
-        f_length = VALUE16(tvb, *offsetp);
+        f_length = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xkb_CountedString16_length, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_CountedString16_string, f_length, byte_order);
@@ -21131,8 +21131,8 @@ static int struct_size_xkb_KeyType(tvbuff_t *tvb _U_, int *offsetp _U_, guint by
     int size = 0;
     int f_hasPreserve;
     int f_nMapEntries;
-    f_nMapEntries = VALUE8(tvb, *offsetp + size + 5);
-    f_hasPreserve = VALUE8(tvb, *offsetp + size + 6);
+    f_nMapEntries = tvb_get_guint8(tvb, *offsetp + size + 5);
+    f_hasPreserve = tvb_get_guint8(tvb, *offsetp + size + 6);
     size += f_nMapEntries * 8;
     size += (f_hasPreserve * f_nMapEntries) * 4;
     return size + 8;
@@ -21203,10 +21203,10 @@ static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_numLevels, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nMapEntries = VALUE8(tvb, *offsetp);
+        f_nMapEntries = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_hasPreserve = VALUE8(tvb, *offsetp);
+        f_hasPreserve = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_hasPreserve, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
@@ -21220,7 +21220,7 @@ static int struct_size_xkb_KeySymMap(tvbuff_t *tvb _U_, int *offsetp _U_, guint
 {
     int size = 0;
     int f_nSyms;
-    f_nSyms = VALUE16(tvb, *offsetp + size + 6);
+    f_nSyms = tvb_get_guint16(tvb, *offsetp + size + 6, byte_order);
     size += f_nSyms * 4;
     return size + 8;
 }
@@ -21240,7 +21240,7 @@ static void struct_xkb_KeySymMap(tvbuff_t *tvb, int *offsetp, proto_tree *root,
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_struct_xkb_KeySymMap_width, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nSyms = VALUE16(tvb, *offsetp);
+        f_nSyms = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xkb_KeySymMap_nSyms, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_KeySymMap_syms, hf_x11_struct_xkb_KeySymMap_syms_item, f_nSyms, byte_order);
@@ -21517,8 +21517,8 @@ static int struct_size_xkb_SetKeyType(tvbuff_t *tvb _U_, int *offsetp _U_, guint
     int size = 0;
     int f_nMapEntries;
     int f_preserve;
-    f_nMapEntries = VALUE8(tvb, *offsetp + size + 5);
-    f_preserve = VALUE8(tvb, *offsetp + size + 6);
+    f_nMapEntries = tvb_get_guint8(tvb, *offsetp + size + 5);
+    f_preserve = tvb_get_guint8(tvb, *offsetp + size + 6);
     size += f_nMapEntries * 4;
     size += (f_preserve * f_nMapEntries) * 4;
     return size + 8;
@@ -21589,10 +21589,10 @@ static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root,
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_numLevels, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nMapEntries = VALUE8(tvb, *offsetp);
+        f_nMapEntries = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_preserve = VALUE8(tvb, *offsetp);
+        f_preserve = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_preserve, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
@@ -21606,7 +21606,7 @@ static int struct_size_xkb_Listing(tvbuff_t *tvb _U_, int *offsetp _U_, guint by
 {
     int size = 0;
     int f_length;
-    f_length = VALUE16(tvb, *offsetp + size + 2);
+    f_length = tvb_get_guint16(tvb, *offsetp + size + 2, byte_order);
     size += f_length * 1;
     size = (size + 1) & ~1;
     return size + 4;
@@ -21624,7 +21624,7 @@ static void struct_xkb_Listing(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         proto_tree_add_item(t, hf_x11_struct_xkb_Listing_flags, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_length = VALUE16(tvb, *offsetp);
+        f_length = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xkb_Listing_length, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_Listing_string, f_length, byte_order);
@@ -21640,8 +21640,8 @@ static int struct_size_xkb_DeviceLedInfo(tvbuff_t *tvb _U_, int *offsetp _U_, gu
     int size = 0;
     int f_mapsPresent;
     int f_namesPresent;
-    f_namesPresent = VALUE32(tvb, *offsetp + size + 4);
-    f_mapsPresent = VALUE32(tvb, *offsetp + size + 8);
+    f_namesPresent = tvb_get_guint32(tvb, *offsetp + size + 4, byte_order);
+    f_mapsPresent = tvb_get_guint32(tvb, *offsetp + size + 8, byte_order);
     size += popcount(f_namesPresent) * 4;
     size += popcount(f_mapsPresent) * 12;
     return size + 20;
@@ -21660,10 +21660,10 @@ static void struct_xkb_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         field16(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_ledClass, byte_order);
         field16(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_ledID, byte_order);
-        f_namesPresent = VALUE32(tvb, *offsetp);
+        f_namesPresent = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_namesPresent, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_mapsPresent = VALUE32(tvb, *offsetp);
+        f_mapsPresent = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_mapsPresent, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_physIndicators, tvb, *offsetp, 4, byte_order);
@@ -22411,7 +22411,7 @@ static void xkbUseExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_reply_supported, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-UseExtension)", sequence_number);
     *offsetp += 2;
@@ -22432,7 +22432,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     int f_selectAll;
     proto_tree_add_item(t, hf_x11_xkb_SelectEvents_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_affectWhich = VALUE16(tvb, *offsetp);
+    f_affectWhich = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* affectWhich_bits [] = {
         &hf_x11_xkb_SelectEvents_affectWhich_mask_NewKeyboardNotify,
@@ -22451,7 +22451,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_SelectEvents_affectWhich, ett_x11_rectangle, affectWhich_bits, byte_order);
     }
     *offsetp += 2;
-    f_clear = VALUE16(tvb, *offsetp);
+    f_clear = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* clear_bits [] = {
         &hf_x11_xkb_SelectEvents_clear_mask_NewKeyboardNotify,
@@ -22470,7 +22470,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_SelectEvents_clear, ett_x11_rectangle, clear_bits, byte_order);
     }
     *offsetp += 2;
-    f_selectAll = VALUE16(tvb, *offsetp);
+    f_selectAll = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* selectAll_bits [] = {
         &hf_x11_xkb_SelectEvents_selectAll_mask_NewKeyboardNotify,
@@ -22785,7 +22785,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetState)", sequence_number);
     *offsetp += 2;
@@ -23035,7 +23035,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetControls)", sequence_number);
     *offsetp += 2;
@@ -23716,7 +23716,7 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetMap)", sequence_number);
     *offsetp += 2;
@@ -23728,7 +23728,7 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_present = VALUE16(tvb, *offsetp);
+    f_present = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* present_bits [] = {
         &hf_x11_xkb_GetMap_reply_present_mask_KeyTypes,
@@ -23745,7 +23745,7 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
+    f_nTypes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalTypes, tvb, *offsetp, 1, byte_order);
@@ -23754,48 +23754,48 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalSyms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nKeySyms = VALUE8(tvb, *offsetp);
+    f_nKeySyms = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyAction, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalActions = VALUE16(tvb, *offsetp);
+    f_totalActions = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalActions, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nKeyActions = VALUE8(tvb, *offsetp);
+    f_nKeyActions = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
+    f_totalKeyBehaviors = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalKeyExplicit = VALUE8(tvb, *offsetp);
+    f_totalKeyExplicit = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalModMapKeys = VALUE8(tvb, *offsetp);
+    f_totalModMapKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalVModMapKeys = VALUE8(tvb, *offsetp);
+    f_totalVModMapKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_virtualMods = VALUE16(tvb, *offsetp);
+    f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* virtualMods_bits [] = {
         &hf_x11_xkb_GetMap_reply_virtualMods_mask_0,
@@ -23875,7 +23875,7 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
     int f_virtualMods;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_present = VALUE16(tvb, *offsetp);
+    f_present = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* present_bits [] = {
         &hf_x11_xkb_SetMap_present_mask_KeyTypes,
@@ -23904,53 +23904,53 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
+    f_nTypes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeySym, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeySyms = VALUE8(tvb, *offsetp);
+    f_nKeySyms = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalSyms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyAction, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyActions = VALUE8(tvb, *offsetp);
+    f_nKeyActions = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeyActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalActions = VALUE16(tvb, *offsetp);
+    f_totalActions = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalActions, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
+    f_totalKeyBehaviors = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalKeyExplicit = VALUE8(tvb, *offsetp);
+    f_totalKeyExplicit = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalModMapKeys = VALUE8(tvb, *offsetp);
+    f_totalModMapKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalVModMapKeys = VALUE8(tvb, *offsetp);
+    f_totalVModMapKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_virtualMods = VALUE16(tvb, *offsetp);
+    f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* virtualMods_bits [] = {
         &hf_x11_xkb_SetMap_virtualMods_mask_0,
@@ -24051,13 +24051,13 @@ static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetCompatMap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_groupsRtrn = VALUE8(tvb, *offsetp);
+    f_groupsRtrn = tvb_get_guint8(tvb, *offsetp);
     {
         const int* groupsRtrn_bits [] = {
         &hf_x11_xkb_GetCompatMap_reply_groupsRtrn_mask_Group1,
@@ -24072,7 +24072,7 @@ static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_firstSIRtrn, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nSIRtrn = VALUE16(tvb, *offsetp);
+    f_nSIRtrn = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_nSIRtrn, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_nTotalSI, tvb, *offsetp, 2, byte_order);
@@ -24095,7 +24095,7 @@ static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_truncateSI, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groups = VALUE8(tvb, *offsetp);
+    f_groups = tvb_get_guint8(tvb, *offsetp);
     {
         const int* groups_bits [] = {
         &hf_x11_xkb_SetCompatMap_groups_mask_Group1,
@@ -24108,7 +24108,7 @@ static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_firstSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nSI = VALUE16(tvb, *offsetp);
+    f_nSI = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_nSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -24135,7 +24135,7 @@ static void xkbGetIndicatorState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetIndicatorState)", sequence_number);
     *offsetp += 2;
@@ -24166,13 +24166,13 @@ static void xkbGetIndicatorMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetIndicatorMap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_which = VALUE32(tvb, *offsetp);
+    f_which = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_which, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_realIndicators, tvb, *offsetp, 4, byte_order);
@@ -24191,7 +24191,7 @@ static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
     *offsetp += 2;
-    f_which = VALUE32(tvb, *offsetp);
+    f_which = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
@@ -24218,7 +24218,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetNamedIndicator)", sequence_number);
     *offsetp += 2;
@@ -24509,13 +24509,13 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetNames)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_which = VALUE32(tvb, *offsetp);
+    f_which = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* which_bits [] = {
         &hf_x11_xkb_GetNames_reply_which_mask_Keycodes,
@@ -24540,10 +24540,10 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
+    f_nTypes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groupNames = VALUE8(tvb, *offsetp);
+    f_groupNames = tvb_get_guint8(tvb, *offsetp);
     {
         const int* groupNames_bits [] = {
         &hf_x11_xkb_GetNames_reply_groupNames_mask_Group1,
@@ -24554,7 +24554,7 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_GetNames_reply_groupNames, ett_x11_rectangle, groupNames_bits, byte_order);
     }
     *offsetp += 1;
-    f_virtualMods = VALUE16(tvb, *offsetp);
+    f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* virtualMods_bits [] = {
         &hf_x11_xkb_GetNames_reply_virtualMods_mask_0,
@@ -24579,16 +24579,16 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_firstKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeys = VALUE8(tvb, *offsetp);
+    f_nKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_indicators = VALUE32(tvb, *offsetp);
+    f_indicators = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_indicators, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nRadioGroups = VALUE8(tvb, *offsetp);
+    f_nRadioGroups = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nRadioGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyAliases = VALUE8(tvb, *offsetp);
+    f_nKeyAliases = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nKeyAliases, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nKTLevels, tvb, *offsetp, 2, byte_order);
@@ -24627,7 +24627,7 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         {
             int i;
             for (i = 0; i < f_nTypes; i++) {
-                sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+                sumof_nLevelsPerType += tvb_get_guint8(tvb, *offsetp + i * 1);
             }
         }
         listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
@@ -24669,7 +24669,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     int f_nKeyAliases;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_virtualMods = VALUE16(tvb, *offsetp);
+    f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* virtualMods_bits [] = {
         &hf_x11_xkb_SetNames_virtualMods_mask_0,
@@ -24692,7 +24692,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_SetNames_virtualMods, ett_x11_rectangle, virtualMods_bits, byte_order);
     }
     *offsetp += 2;
-    f_which = VALUE32(tvb, *offsetp);
+    f_which = tvb_get_guint32(tvb, *offsetp, byte_order);
     {
         const int* which_bits [] = {
         &hf_x11_xkb_SetNames_which_mask_Keycodes,
@@ -24715,17 +24715,17 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
+    f_nTypes = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstKTLevelt, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nKTLevels, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_indicators = VALUE32(tvb, *offsetp);
+    f_indicators = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_indicators, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_groupNames = VALUE8(tvb, *offsetp);
+    f_groupNames = tvb_get_guint8(tvb, *offsetp);
     {
         const int* groupNames_bits [] = {
         &hf_x11_xkb_SetNames_groupNames_mask_Group1,
@@ -24736,15 +24736,15 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_SetNames_groupNames, ett_x11_rectangle, groupNames_bits, byte_order);
     }
     *offsetp += 1;
-    f_nRadioGroups = VALUE8(tvb, *offsetp);
+    f_nRadioGroups = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nRadioGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeys = VALUE8(tvb, *offsetp);
+    f_nKeys = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyAliases = VALUE8(tvb, *offsetp);
+    f_nKeyAliases = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nKeyAliases, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
@@ -24784,7 +24784,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         {
             int i;
             for (i = 0; i < f_nTypes; i++) {
-                sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+                sumof_nLevelsPerType += tvb_get_guint8(tvb, *offsetp + i * 1);
             }
         }
         listOfByte(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
@@ -24918,7 +24918,7 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-PerClientFlags)", sequence_number);
     *offsetp += 2;
@@ -25010,28 +25010,28 @@ static void xkbListComponents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-ListComponents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nKeymaps = VALUE16(tvb, *offsetp);
+    f_nKeymaps = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nKeymaps, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nKeycodes = VALUE16(tvb, *offsetp);
+    f_nKeycodes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nKeycodes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nTypes = VALUE16(tvb, *offsetp);
+    f_nTypes = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nTypes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nCompatMaps = VALUE16(tvb, *offsetp);
+    f_nCompatMaps = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nCompatMaps, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nSymbols = VALUE16(tvb, *offsetp);
+    f_nSymbols = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nSymbols, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nGeometries = VALUE16(tvb, *offsetp);
+    f_nGeometries = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nGeometries, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_extra, tvb, *offsetp, 2, byte_order);
@@ -25093,7 +25093,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetKbdByName)", sequence_number);
     *offsetp += 2;
@@ -25121,7 +25121,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_GetKbdByName_reply_found, ett_x11_rectangle, found_bits, byte_order);
     }
     *offsetp += 2;
-    f_reported = VALUE16(tvb, *offsetp);
+    f_reported = tvb_get_guint16(tvb, *offsetp, byte_order);
     {
         const int* reported_bits [] = {
         &hf_x11_xkb_GetKbdByName_reply_reported_mask_Types,
@@ -25163,7 +25163,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeMaxKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_present = VALUE16(tvb, *offsetp);
+        f_present = tvb_get_guint16(tvb, *offsetp, byte_order);
         {
             const int* present_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeyTypes,
@@ -25180,7 +25180,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstType, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nTypes = VALUE8(tvb, *offsetp);
+        f_nTypes = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nTypes, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalTypes, tvb, *offsetp, 1, byte_order);
@@ -25189,48 +25189,48 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalSyms, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nKeySyms = VALUE8(tvb, *offsetp);
+        f_nKeySyms = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeySyms, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyAction, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalActions = VALUE16(tvb, *offsetp);
+        f_totalActions = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalActions, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nKeyActions = VALUE8(tvb, *offsetp);
+        f_nKeyActions = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyActions, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
+        f_totalKeyBehaviors = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalKeyExplicit = VALUE8(tvb, *offsetp);
+        f_totalKeyExplicit = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstModMapKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalModMapKeys = VALUE8(tvb, *offsetp);
+        f_totalModMapKeys = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstVModMapKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nVModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalVModMapKeys = VALUE8(tvb, *offsetp);
+        f_totalVModMapKeys = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalVModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
         *offsetp += 1;
-        f_virtualMods = VALUE16(tvb, *offsetp);
+        f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
         {
             const int* virtualMods_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_Types_virtualMods_mask_0,
@@ -25306,7 +25306,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatmap_length, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_groupsRtrn = VALUE8(tvb, *offsetp);
+        f_groupsRtrn = tvb_get_guint8(tvb, *offsetp);
         {
             const int* groupsRtrn_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_CompatMap_groupsRtrn_mask_Group1,
@@ -25321,7 +25321,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_firstSIRtrn, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nSIRtrn = VALUE16(tvb, *offsetp);
+        f_nSIRtrn = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_nSIRtrn, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_nTotalSI, tvb, *offsetp, 2, byte_order);
@@ -25345,7 +25345,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 4;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_realIndicators, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_nIndicators = VALUE8(tvb, *offsetp);
+        f_nIndicators = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_nIndicators, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 15, ENC_NA);
@@ -25369,7 +25369,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyname_length, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_which = VALUE32(tvb, *offsetp);
+        f_which = tvb_get_guint32(tvb, *offsetp, byte_order);
         {
             const int* which_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_KeyNames_which_mask_Keycodes,
@@ -25394,10 +25394,10 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyMaxKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nTypes = VALUE8(tvb, *offsetp);
+        f_nTypes = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nTypes, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_groupNames = VALUE8(tvb, *offsetp);
+        f_groupNames = tvb_get_guint8(tvb, *offsetp);
         {
             const int* groupNames_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_KeyNames_groupNames_mask_Group1,
@@ -25408,7 +25408,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_GetKbdByName_reply_KeyNames_groupNames, ett_x11_rectangle, groupNames_bits, byte_order);
         }
         *offsetp += 1;
-        f_virtualMods = VALUE16(tvb, *offsetp);
+        f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order);
         {
             const int* virtualMods_bits [] = {
                 &hf_x11_xkb_GetKbdByName_reply_KeyNames_virtualMods_mask_0,
@@ -25433,16 +25433,16 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_firstKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nKeys = VALUE8(tvb, *offsetp);
+        f_nKeys = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_indicators = VALUE32(tvb, *offsetp);
+        f_indicators = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_indicators, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_nRadioGroups = VALUE8(tvb, *offsetp);
+        f_nRadioGroups = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nRadioGroups, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nKeyAliases = VALUE8(tvb, *offsetp);
+        f_nKeyAliases = tvb_get_guint8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKeyAliases, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKTLevels, tvb, *offsetp, 2, byte_order);
@@ -25481,7 +25481,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             {
                 int i;
                 for (i = 0; i < f_nTypes; i++) {
-                    sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+                    sumof_nLevelsPerType += tvb_get_guint8(tvb, *offsetp + i * 1);
                 }
             }
             listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
@@ -25587,7 +25587,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
@@ -25626,7 +25626,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_GetDeviceInfo_reply_unsupported, ett_x11_rectangle, unsupported_bits, byte_order);
     }
     *offsetp += 2;
-    f_nDeviceLedFBs = VALUE16(tvb, *offsetp);
+    f_nDeviceLedFBs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nDeviceLedFBs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_firstBtnWanted, tvb, *offsetp, 1, byte_order);
@@ -25635,7 +25635,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_firstBtnRtrn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nBtnsRtrn = VALUE8(tvb, *offsetp);
+    f_nBtnsRtrn = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nBtnsRtrn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_totalBtns, tvb, *offsetp, 1, byte_order);
@@ -25648,7 +25648,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_devType, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nameLen = VALUE16(tvb, *offsetp);
+    f_nameLen = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nameLen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_name, f_nameLen, byte_order);
@@ -25668,7 +25668,7 @@ static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_firstBtn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nBtns = VALUE8(tvb, *offsetp);
+    f_nBtns = tvb_get_guint8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_nBtns, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     {
@@ -25682,7 +25682,7 @@ static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
         proto_tree_add_bitmask(t,  tvb, *offsetp, hf_x11_xkb_SetDeviceInfo_change, ett_x11_rectangle, change_bits, byte_order);
     }
     *offsetp += 2;
-    f_nDeviceLedFBs = VALUE16(tvb, *offsetp);
+    f_nDeviceLedFBs = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_nDeviceLedFBs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     struct_xkb_Action(tvb, offsetp, t, byte_order, f_nBtns);
@@ -25694,7 +25694,7 @@ static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 static void xkbSetDebuggingFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_msgLength;
-    f_msgLength = VALUE16(tvb, *offsetp);
+    f_msgLength = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_msgLength, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA);
@@ -25719,7 +25719,7 @@ static void xkbSetDebuggingFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xkb-SetDebuggingFlags)", sequence_number);
     *offsetp += 2;
@@ -26568,10 +26568,10 @@ static int struct_size_xprint_PRINTER(tvbuff_t *tvb _U_, int *offsetp _U_, guint
     int size = 0;
     int f_descLen;
     int f_nameLen;
-    f_nameLen = VALUE32(tvb, *offsetp + size + 0);
+    f_nameLen = tvb_get_guint32(tvb, *offsetp + size + 0, byte_order);
     size += f_nameLen * 1;
     size = (size + 3) & ~3;
-    f_descLen = VALUE32(tvb, *offsetp + size + 4);
+    f_descLen = tvb_get_guint32(tvb, *offsetp + size + 4, byte_order);
     size += f_descLen * 1;
     size = (size + 3) & ~3;
     return size + 8;
@@ -26588,7 +26588,7 @@ static void struct_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root,
 
         item = proto_tree_add_item(root, hf_x11_struct_xprint_PRINTER, tvb, *offsetp, struct_size_xprint_PRINTER(tvb, offsetp, byte_order), ENC_NA);
         t = proto_item_add_subtree(item, ett_x11_rectangle);
-        f_nameLen = VALUE32(tvb, *offsetp);
+        f_nameLen = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_nameLen, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_name, f_nameLen, byte_order);
@@ -26596,7 +26596,7 @@ static void struct_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root,
             proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, (4 - *offsetp % 4), ENC_NA);
             *offsetp += (4 - *offsetp % 4);
         }
-        f_descLen = VALUE32(tvb, *offsetp);
+        f_descLen = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_descLen, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_description, f_descLen, byte_order);
@@ -26619,7 +26619,7 @@ static void xprintPrintQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintQueryVersion)", sequence_number);
     *offsetp += 2;
@@ -26635,10 +26635,10 @@ static void xprintPrintGetPrinterList(tvbuff_t *tvb, packet_info *pinfo _U_, int
 {
     int f_printerNameLen;
     int f_localeLen;
-    f_printerNameLen = VALUE32(tvb, *offsetp);
+    f_printerNameLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPrinterList_printerNameLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_localeLen = VALUE32(tvb, *offsetp);
+    f_localeLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPrinterList_localeLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintGetPrinterList_printer_name, f_printerNameLen, byte_order);
@@ -26656,13 +26656,13 @@ static void xprintPrintGetPrinterList_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetPrinterList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_listCount = VALUE32(tvb, *offsetp);
+    f_listCount = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPrinterList_reply_listCount, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -26680,10 +26680,10 @@ static void xprintCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_localeLen;
     proto_tree_add_item(t, hf_x11_xprint_CreateContext_context_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_printerNameLen = VALUE32(tvb, *offsetp);
+    f_printerNameLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_CreateContext_printerNameLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_localeLen = VALUE32(tvb, *offsetp);
+    f_localeLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_CreateContext_localeLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xprint_CreateContext_printerName, f_printerNameLen, byte_order);
@@ -26710,7 +26710,7 @@ static void xprintPrintGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetContext)", sequence_number);
     *offsetp += 2;
@@ -26738,7 +26738,7 @@ static void xprintPrintGetScreenOfContext_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetScreenOfContext)", sequence_number);
     *offsetp += 2;
@@ -26779,13 +26779,13 @@ static void xprintPrintPutDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, in
     int f_len_options;
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_len_data = VALUE32(tvb, *offsetp);
+    f_len_data = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_data, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_len_fmt = VALUE16(tvb, *offsetp);
+    f_len_fmt = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_fmt, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_len_options = VALUE16(tvb, *offsetp);
+    f_len_options = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_options, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_data, f_len_data, byte_order);
@@ -26813,7 +26813,7 @@ static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetDocumentData)", sequence_number);
     *offsetp += 2;
@@ -26823,7 +26823,7 @@ static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo,
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_reply_finished_flag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dataLen = VALUE32(tvb, *offsetp);
+    f_dataLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_reply_dataLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 12, ENC_NA);
@@ -26867,7 +26867,7 @@ static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintInputSelected)", sequence_number);
     *offsetp += 2;
@@ -26898,13 +26898,13 @@ static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_stringLen = VALUE32(tvb, *offsetp);
+    f_stringLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_reply_stringLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -26917,7 +26917,7 @@ static void xprintPrintGetOneAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, i
     int f_nameLen;
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nameLen = VALUE32(tvb, *offsetp);
+    f_nameLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_nameLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_pool, tvb, *offsetp, 1, byte_order);
@@ -26937,13 +26937,13 @@ static void xprintPrintGetOneAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetOneAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_valueLen = VALUE32(tvb, *offsetp);
+    f_valueLen = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_reply_valueLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -26980,7 +26980,7 @@ static void xprintPrintGetPageDimensions_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetPageDimensions)", sequence_number);
     *offsetp += 2;
@@ -27013,13 +27013,13 @@ static void xprintPrintQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintQueryScreens)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_listCount = VALUE32(tvb, *offsetp);
+    f_listCount = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xprint_PrintQueryScreens_reply_listCount, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27043,7 +27043,7 @@ static void xprintPrintSetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_reply_status, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintSetImageResolution)", sequence_number);
     *offsetp += 2;
@@ -27067,7 +27067,7 @@ static void xprintPrintGetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xprint-PrintGetImageResolution)", sequence_number);
     *offsetp += 2;
@@ -27245,7 +27245,7 @@ static void xselinuxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -27260,7 +27260,7 @@ static void xselinuxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 static void xselinuxSetDeviceCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetDeviceCreateContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetDeviceCreateContext_context, f_context_len, byte_order);
@@ -27280,13 +27280,13 @@ static void xselinuxGetDeviceCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetDeviceCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetDeviceCreateContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27299,7 +27299,7 @@ static void xselinuxSetDeviceContext(tvbuff_t *tvb, packet_info *pinfo _U_, int
     int f_context_len;
     proto_tree_add_item(t, hf_x11_xselinux_SetDeviceContext_device, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetDeviceContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetDeviceContext_context, f_context_len, byte_order);
@@ -27321,13 +27321,13 @@ static void xselinuxGetDeviceContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetDeviceContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetDeviceContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27338,7 +27338,7 @@ static void xselinuxGetDeviceContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
 static void xselinuxSetWindowCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetWindowCreateContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetWindowCreateContext_context, f_context_len, byte_order);
@@ -27358,13 +27358,13 @@ static void xselinuxGetWindowCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetWindowCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetWindowCreateContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27387,13 +27387,13 @@ static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetWindowContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetWindowContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27406,8 +27406,8 @@ static int struct_size_xselinux_ListItem(tvbuff_t *tvb _U_, int *offsetp _U_, gu
     int size = 0;
     int f_data_context_len;
     int f_object_context_len;
-    f_object_context_len = VALUE32(tvb, *offsetp + size + 4);
-    f_data_context_len = VALUE32(tvb, *offsetp + size + 8);
+    f_object_context_len = tvb_get_guint32(tvb, *offsetp + size + 4, byte_order);
+    f_data_context_len = tvb_get_guint32(tvb, *offsetp + size + 8, byte_order);
     size += f_object_context_len * 1;
     size = (size + 3) & ~3;
     size += f_data_context_len * 1;
@@ -27428,10 +27428,10 @@ static void struct_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, proto_tree *ro
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_name, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_object_context_len = VALUE32(tvb, *offsetp);
+        f_object_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_object_context_len, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_data_context_len = VALUE32(tvb, *offsetp);
+        f_data_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_data_context_len, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xselinux_ListItem_object_context, f_object_context_len, byte_order);
@@ -27450,7 +27450,7 @@ static void struct_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, proto_tree *ro
 static void xselinuxSetPropertyCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetPropertyCreateContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetPropertyCreateContext_context, f_context_len, byte_order);
@@ -27470,13 +27470,13 @@ static void xselinuxGetPropertyCreateContext_Reply(tvbuff_t *tvb, packet_info *p
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetPropertyCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyCreateContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27487,7 +27487,7 @@ static void xselinuxGetPropertyCreateContext_Reply(tvbuff_t *tvb, packet_info *p
 static void xselinuxSetPropertyUseContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetPropertyUseContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetPropertyUseContext_context, f_context_len, byte_order);
@@ -27507,13 +27507,13 @@ static void xselinuxGetPropertyUseContext_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetPropertyUseContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyUseContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27538,13 +27538,13 @@ static void xselinuxGetPropertyContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetPropertyContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27569,13 +27569,13 @@ static void xselinuxGetPropertyDataContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetPropertyDataContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyDataContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27598,13 +27598,13 @@ static void xselinuxListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-ListProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_properties_len = VALUE32(tvb, *offsetp);
+    f_properties_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_ListProperties_reply_properties_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27615,7 +27615,7 @@ static void xselinuxListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 static void xselinuxSetSelectionCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetSelectionCreateContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetSelectionCreateContext_context, f_context_len, byte_order);
@@ -27635,13 +27635,13 @@ static void xselinuxGetSelectionCreateContext_Reply(tvbuff_t *tvb, packet_info *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetSelectionCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionCreateContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27652,7 +27652,7 @@ static void xselinuxGetSelectionCreateContext_Reply(tvbuff_t *tvb, packet_info *
 static void xselinuxSetSelectionUseContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_context_len;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_SetSelectionUseContext_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_SetSelectionUseContext_context, f_context_len, byte_order);
@@ -27672,13 +27672,13 @@ static void xselinuxGetSelectionUseContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetSelectionUseContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionUseContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27701,13 +27701,13 @@ static void xselinuxGetSelectionContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetSelectionContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27730,13 +27730,13 @@ static void xselinuxGetSelectionDataContext_Reply(tvbuff_t *tvb, packet_info *pi
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetSelectionDataContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionDataContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27757,13 +27757,13 @@ static void xselinuxListSelections_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-ListSelections)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_selections_len = VALUE32(tvb, *offsetp);
+    f_selections_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_ListSelections_reply_selections_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27786,13 +27786,13 @@ static void xselinuxGetClientContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xselinux-GetClientContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_len = VALUE32(tvb, *offsetp);
+    f_context_len = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xselinux_GetClientContext_reply_context_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -27955,7 +27955,7 @@ static void xtestGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_reply_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xtest-GetVersion)", sequence_number);
     *offsetp += 2;
@@ -27981,7 +27981,7 @@ static void xtestCompareCursor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_xtest_CompareCursor_reply_same, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xtest-CompareCursor)", sequence_number);
     *offsetp += 2;
@@ -28107,8 +28107,8 @@ static int struct_size_xv_AdaptorInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint
     int size = 0;
     int f_name_size;
     int f_num_formats;
-    f_name_size = VALUE16(tvb, *offsetp + size + 4);
-    f_num_formats = VALUE16(tvb, *offsetp + size + 8);
+    f_name_size = tvb_get_guint16(tvb, *offsetp + size + 4, byte_order);
+    f_num_formats = tvb_get_guint16(tvb, *offsetp + size + 8, byte_order);
     size += f_name_size * 1;
     size = (size + 3) & ~3;
     size += f_num_formats * 8;
@@ -28128,12 +28128,12 @@ static void struct_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root,
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_base_id, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_name_size = VALUE16(tvb, *offsetp);
+        f_name_size = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_name_size, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_num_ports, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_num_formats = VALUE16(tvb, *offsetp);
+        f_num_formats = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_num_formats, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         {
@@ -28162,7 +28162,7 @@ static int struct_size_xv_EncodingInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guin
 {
     int size = 0;
     int f_name_size;
-    f_name_size = VALUE16(tvb, *offsetp + size + 4);
+    f_name_size = tvb_get_guint16(tvb, *offsetp + size + 4, byte_order);
     size += f_name_size * 1;
     size = (size + 3) & ~3;
     return size + 20;
@@ -28180,7 +28180,7 @@ static void struct_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root
         t = proto_item_add_subtree(item, ett_x11_rectangle);
         proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_encoding, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_name_size = VALUE16(tvb, *offsetp);
+        f_name_size = tvb_get_guint16(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_name_size, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_width, tvb, *offsetp, 2, byte_order);
@@ -28202,7 +28202,7 @@ static int struct_size_xv_AttributeInfo(tvbuff_t *tvb _U_, int *offsetp _U_, gui
 {
     int size = 0;
     int f_size;
-    f_size = VALUE32(tvb, *offsetp + size + 12);
+    f_size = tvb_get_guint32(tvb, *offsetp + size + 12, byte_order);
     size += f_size * 1;
     size = (size + 3) & ~3;
     return size + 16;
@@ -28230,7 +28230,7 @@ static void struct_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *roo
         *offsetp += 4;
         proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_max, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_size = VALUE32(tvb, *offsetp);
+        f_size = tvb_get_guint32(tvb, *offsetp, byte_order);
         proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_size, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         listOfByte(tvb, offsetp, t, hf_x11_struct_xv_AttributeInfo_name, f_size, byte_order);
@@ -28329,7 +28329,7 @@ static void xvQueryExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryExtension)", sequence_number);
     *offsetp += 2;
@@ -28356,13 +28356,13 @@ static void xvQueryAdaptors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryAdaptors)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_adaptors = VALUE16(tvb, *offsetp);
+    f_num_adaptors = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xv_QueryAdaptors_reply_num_adaptors, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -28385,13 +28385,13 @@ static void xvQueryEncodings_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryEncodings)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_encodings = VALUE16(tvb, *offsetp);
+    f_num_encodings = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xv_QueryEncodings_reply_num_encodings, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 22, ENC_NA);
@@ -28413,7 +28413,7 @@ static void xvGrabPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
 
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_xv_GrabPort_reply_result, byte_order);
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-GrabPort)", sequence_number);
     *offsetp += 2;
@@ -28586,7 +28586,7 @@ static void xvQueryBestSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryBestSize)", sequence_number);
     *offsetp += 2;
@@ -28624,7 +28624,7 @@ static void xvGetPortAttribute_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-GetPortAttribute)", sequence_number);
     *offsetp += 2;
@@ -28649,13 +28649,13 @@ static void xvQueryPortAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryPortAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_attributes = VALUE32(tvb, *offsetp);
+    f_num_attributes = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xv_QueryPortAttributes_reply_num_attributes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xv_QueryPortAttributes_reply_text_size, tvb, *offsetp, 4, byte_order);
@@ -28680,13 +28680,13 @@ static void xvListImageFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-ListImageFormats)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_formats = VALUE32(tvb, *offsetp);
+    f_num_formats = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xv_ListImageFormats_reply_num_formats, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -28715,13 +28715,13 @@ static void xvQueryImageAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xv-QueryImageAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_planes = VALUE32(tvb, *offsetp);
+    f_num_planes = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_num_planes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_data_size, tvb, *offsetp, 4, byte_order);
@@ -28970,7 +28970,7 @@ static void xvmcQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-QueryVersion)", sequence_number);
     *offsetp += 2;
@@ -28997,13 +28997,13 @@ static void xvmcListSurfaceTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-ListSurfaceTypes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num = VALUE32(tvb, *offsetp);
+    f_num = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xvmc_ListSurfaceTypes_reply_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
@@ -29036,11 +29036,11 @@ static void xvmcCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-CreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_reply_width_actual, tvb, *offsetp, 2, byte_order);
@@ -29077,11 +29077,11 @@ static void xvmcCreateSurface_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-CreateSurface)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 24, ENC_NA);
@@ -29118,11 +29118,11 @@ static void xvmcCreateSubpicture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-CreateSubpicture)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
+    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_reply_width_actual, tvb, *offsetp, 2, byte_order);
@@ -29162,13 +29162,13 @@ static void xvmcListSubpictureTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
+    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);
     proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "%d (xvmc-ListSubpictureTypes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num = VALUE32(tvb, *offsetp);
+    f_num = tvb_get_guint32(tvb, *offsetp, byte_order);
     proto_tree_add_item(t, hf_x11_xvmc_ListSubpictureTypes_reply_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 20, ENC_NA);
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index 757050dca9..1cdfdb3f36 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -56,20 +56,20 @@ my @register;
 my $script_name = File::Spec->abs2rel ($0,  $srcdir);
 
 my %basictype = (
-    char =>   { size => 1, encoding => 'ENC_ASCII|ENC_NA', type => 'FT_STRING', base => 'BASE_NONE',    get => 'VALUE8',  list => 'listOfByte', },
-    void =>   { size => 1, encoding => 'ENC_NA',           type => 'FT_BYTES',  base => 'BASE_NONE',    get => 'VALUE8',  list => 'listOfByte', },
-    BYTE =>   { size => 1, encoding => 'ENC_NA',           type => 'FT_BYTES',  base => 'BASE_NONE',    get => 'VALUE8',  list => 'listOfByte', },
-    CARD8 =>  { size => 1, encoding => 'byte_order',       type => 'FT_UINT8',  base => 'BASE_HEX_DEC', get => 'VALUE8',  list => 'listOfByte', },
-    CARD16 => { size => 2, encoding => 'byte_order',       type => 'FT_UINT16', base => 'BASE_HEX_DEC', get => 'VALUE16', list => 'listOfCard16', },
-    CARD32 => { size => 4, encoding => 'byte_order',       type => 'FT_UINT32', base => 'BASE_HEX_DEC', get => 'VALUE32', list => 'listOfCard32', },
-    CARD64 => { size => 8, encoding => 'byte_order',       type => 'FT_UINT64', base => 'BASE_HEX_DEC', get => 'VALUE64', list => 'listOfCard64', },
-    INT8 =>   { size => 1, encoding => 'byte_order',       type => 'FT_INT8',   base => 'BASE_DEC',     get => 'VALUE8',  list => 'listOfByte', },
-    INT16 =>  { size => 2, encoding => 'byte_order',       type => 'FT_INT16',  base => 'BASE_DEC',     get => 'VALUE16', list => 'listOfInt16', },
-    INT32 =>  { size => 4, encoding => 'byte_order',       type => 'FT_INT32',  base => 'BASE_DEC',     get => 'VALUE32', list => 'listOfInt32', },
-    INT64 =>  { size => 8, encoding => 'byte_order',       type => 'FT_INT64',  base => 'BASE_DEC',     get => 'VALUE64', list => 'listOfInt64', },
-    float =>  { size => 4, encoding => 'byte_order',       type => 'FT_FLOAT',  base => 'BASE_NONE',    get => 'FLOAT',   list => 'listOfFloat', },
-    double => { size => 8, encoding => 'byte_order',       type => 'FT_DOUBLE', base => 'BASE_NONE',    get => 'DOUBLE',  list => 'listOfDouble', },
-    BOOL =>   { size => 1, encoding => 'byte_order',       type => 'FT_BOOLEAN',base => 'BASE_NONE',    get => 'VALUE8',  list => 'listOfByte', },
+    char =>   { size => 1, encoding => 'ENC_ASCII|ENC_NA', type => 'FT_STRING', base => 'BASE_NONE',    get => 'tvb_get_guint8',  list => 'listOfByte', },
+    void =>   { size => 1, encoding => 'ENC_NA',           type => 'FT_BYTES',  base => 'BASE_NONE',    get => 'tvb_get_guint8',  list => 'listOfByte', },
+    BYTE =>   { size => 1, encoding => 'ENC_NA',           type => 'FT_BYTES',  base => 'BASE_NONE',    get => 'tvb_get_guint8',  list => 'listOfByte', },
+    CARD8 =>  { size => 1, encoding => 'byte_order',       type => 'FT_UINT8',  base => 'BASE_HEX_DEC', get => 'tvb_get_guint8',  list => 'listOfByte', },
+    CARD16 => { size => 2, encoding => 'byte_order',       type => 'FT_UINT16', base => 'BASE_HEX_DEC', get => 'tvb_get_guint16', list => 'listOfCard16', },
+    CARD32 => { size => 4, encoding => 'byte_order',       type => 'FT_UINT32', base => 'BASE_HEX_DEC', get => 'tvb_get_guint32', list => 'listOfCard32', },
+    CARD64 => { size => 8, encoding => 'byte_order',       type => 'FT_UINT64', base => 'BASE_HEX_DEC', get => 'tvb_get_guint64', list => 'listOfCard64', },
+    INT8 =>   { size => 1, encoding => 'byte_order',       type => 'FT_INT8',   base => 'BASE_DEC',     get => 'tvb_get_guint8',  list => 'listOfByte', },
+    INT16 =>  { size => 2, encoding => 'byte_order',       type => 'FT_INT16',  base => 'BASE_DEC',     get => 'tvb_get_guint16', list => 'listOfInt16', },
+    INT32 =>  { size => 4, encoding => 'byte_order',       type => 'FT_INT32',  base => 'BASE_DEC',     get => 'tvb_get_guint32', list => 'listOfInt32', },
+    INT64 =>  { size => 8, encoding => 'byte_order',       type => 'FT_INT64',  base => 'BASE_DEC',     get => 'tvb_get_guint64', list => 'listOfInt64', },
+    float =>  { size => 4, encoding => 'byte_order',       type => 'FT_FLOAT',  base => 'BASE_NONE',    get => 'tvb_get_ieee_float',   list => 'listOfFloat', },
+    double => { size => 8, encoding => 'byte_order',       type => 'FT_DOUBLE', base => 'BASE_NONE',    get => 'tvb_get_ieee_double',  list => 'listOfDouble', },
+    BOOL =>   { size => 1, encoding => 'byte_order',       type => 'FT_BOOLEAN',base => 'BASE_NONE',    get => 'tvb_get_guint8',  list => 'listOfByte', },
 );
 
 my %simpletype;  # Reset at the beginning of each extension
@@ -212,7 +212,7 @@ sub mesa_type {
     if($name eq 'enum') {
         # enum does not have a direct X equivalent
         $gltype{'GLenum'} = { size => 4, encoding => 'byte_order', type => 'FT_UINT32', base => 'BASE_HEX|BASE_EXT_STRING',
-                              get => 'VALUE32', list => 'listOfCard32',
+                              get => 'tvb_get_guint32', list => 'listOfCard32',
                               val => '&mesa_enum_ext', };
         return;
     }
@@ -409,7 +409,11 @@ eot
             my $get = $info->{'get'};
 
             if ($e->att('counter') or $type_param{$fieldname}) {
-                print $impl "    $fieldname = $get(tvb, *offsetp);\n";
+                if ($get ne "tvb_get_guint8") {
+                    print $impl "    $fieldname = $get(tvb, *offsetp, $encoding);\n";
+                } else {
+                    print $impl "    $fieldname = $get(tvb, *offsetp);\n";
+                }
             }
             print $impl "    proto_tree_add_item(t, $regname, tvb, *offsetp, $size, $encoding);\n";
             print $impl "    *offsetp += $size;\n";
@@ -804,7 +808,11 @@ sub dissect_element($$$$$;$$)
                     say $impl "field$fieldsize(tvb, offsetp, t, $regname, byte_order);";
                 } elsif ($e->att('mask')) {
                     if ($refref->{field}{$fieldname}) {
-                        say $impl $indent."f_$fieldname = $get(tvb, *offsetp);";
+                        if ($get ne "tvb_get_guint8") {
+                            say $impl $indent."f_$fieldname = $get(tvb, *offsetp, byte_order);";
+                        } else {
+                            say $impl $indent."f_$fieldname = $get(tvb, *offsetp);";
+                        }
                     }
                     my $bitmask_field = $fieldname . "_bits";
                     say $impl $indent."{";
@@ -821,7 +829,11 @@ sub dissect_element($$$$$;$$)
                     say $impl $indent."*offsetp += $size;";
                 } else {
                     if ($refref->{field}{$fieldname}) {
-                        say $impl $indent."f_$fieldname = $get(tvb, *offsetp);";
+                        if ($get ne "tvb_get_guint8") {
+                            say $impl $indent."f_$fieldname = $get(tvb, *offsetp, byte_order);";
+                        } else {
+                            say $impl $indent."f_$fieldname = $get(tvb, *offsetp);";
+                        }
                     }
                     print $impl $indent."proto_tree_add_item(t, $regname, tvb, *offsetp, $size, $encoding);\n";
                     print $impl $indent."*offsetp += $size;\n";
@@ -870,7 +882,11 @@ sub dissect_element($$$$$;$$)
                     say $impl $indent."{";
                     say $impl $indent."    int i;";
                     say $impl $indent."    for (i = 0; i < $lencalc; i++) {";
-                    say $impl $indent."        sumof_$fieldname += $get(tvb, *offsetp + i * $size);";
+                    if ($get ne "tvb_get_guint8") {
+                        say $impl $indent."        sumof_$fieldname += $get(tvb, *offsetp + i * $size, byte_order);";
+                    } else {
+                        say $impl $indent."        sumof_$fieldname += $get(tvb, *offsetp + i * $size);";
+                    }
                     say $impl $indent."    }";
                     say $impl $indent."}";
                 }
@@ -1133,7 +1149,12 @@ eot
                 when ('field') {
                     my $fname = $e->att('name');
                     if (defined($refs{$fname})) {
-                        say $impl "    f_$fname = $info->{'get'}(tvb, *offsetp + size + $size);";
+                        my $get = $info->{'get'};
+                        if ($get ne "tvb_get_guint8") {
+                            say $impl "    f_$fname = $info->{'get'}(tvb, *offsetp + size + $size, byte_order);";
+                        } else {
+                            say $impl "    f_$fname = $info->{'get'}(tvb, *offsetp + size + $size);";
+                        }
                     }
                     $size += $info->{'size'};
                 }
@@ -1428,13 +1449,13 @@ eot
             $length = dissect_element($e, $varpat, $humanpat, $length, $refs);
             if ($first) {
                 $first = 0;
-                say $impl '    sequence_number = VALUE16(tvb, *offsetp);';
+                say $impl '    sequence_number = tvb_get_guint16(tvb, *offsetp, byte_order);';
                 say $impl '    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,';
                 say $impl '            "%d ('.$header.'-'.$name.')", sequence_number);';
                 say $impl '    *offsetp += 2;';
 
                 if ($refs->{field}{length}) {
-                    say $impl '    f_length = VALUE32(tvb, *offsetp);';
+                    say $impl '    f_length = tvb_get_guint32(tvb, *offsetp, byte_order);';
                 }
                 if ($refs->{length}) {
                     say $impl '    length = f_length * 4 + 32;';
@@ -1455,7 +1476,7 @@ sub defxid(@) {
     my $name;
     while ($name = shift) {
         my $qualname = qualname($name);
-        $simpletype{$qualname} = { size => 4, encoding => 'byte_order', type => 'FT_UINT32',  base => 'BASE_HEX',  get => 'VALUE32', list => 'listOfCard32', };
+        $simpletype{$qualname} = { size => 4, encoding => 'byte_order', type => 'FT_UINT32',  base => 'BASE_HEX',  get => 'tvb_get_guint32', list => 'listOfCard32', };
         $type_name{$name} = $qualname;
     }
 }
@@ -1857,9 +1878,9 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
         proto_item *ti;
         proto_tree *tt;
 
-        len = VALUE16(tvb, *offsetp);
+        len = tvb_get_guint16(tvb, *offsetp, byte_order);
 
-        op = VALUE16(tvb, *offsetp + 2);
+        op = tvb_get_guint16(tvb, *offsetp + 2, byte_order);
         ti = proto_tree_add_uint(t, hf_x11_glx_render_op_name, tvb, *offsetp, len, op);
 
         tt = proto_item_add_subtree(ti, ett_x11_list_of_rectangle);