diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 378326240c..6487ac5ea1 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -99,6 +99,53 @@ void proto_reg_handoff_ipv6(void);
 #define IP6RRPL_BITMASK_PAD       0x00F00000
 #define IP6RRPL_BITMASK_RESERVED  0x000FFFFF
 
+/* SHIM6 control message types */
+#define SHIM6_TYPE_I1           0x01    /* 0 000 0001 */
+#define SHIM6_TYPE_R1           0x02    /* 0 000 0010 */
+#define SHIM6_TYPE_I2           0x03    /* 0 000 0011 */
+#define SHIM6_TYPE_R2           0x04    /* 0 000 0100 */
+#define SHIM6_TYPE_R1BIS        0x05    /* 0 000 0101 */
+#define SHIM6_TYPE_I2BIS        0x06    /* 0 000 0110 */
+#define SHIM6_TYPE_UPD_REQ      0x40    /* 0 100 0000 = 64 */
+#define SHIM6_TYPE_UPD_ACK      0x41    /* 0 100 0001 = 65 */
+#define SHIM6_TYPE_KEEPALIVE    0x42    /* 0 100 0010 = 66 */
+#define SHIM6_TYPE_PROBE        0x43    /* 0 100 0011 = 67 */
+
+/* SHIM6 Options */
+#define SHIM6_OPT_RESPVAL       0x01    /* 0 000 0001 */
+#define SHIM6_OPT_LOCLIST       0x02    /* 0 000 0010 */
+#define SHIM6_OPT_LOCPREF       0x03    /* 0 000 0011 */
+#define SHIM6_OPT_CGAPDM        0x04    /* 0 000 0100 */
+#define SHIM6_OPT_CGASIG        0x05    /* 0 000 0101 */
+#define SHIM6_OPT_ULIDPAIR      0x06    /* 0 000 0110 */
+#define SHIM6_OPT_FII           0x07    /* 0 000 0111 */
+
+/* SHIM6 Bitmasks */
+#define SHIM6_BITMASK_P         0x80    /* 1 000 0000 */
+#define SHIM6_BITMASK_TYPE      0x7F    /* 0 111 1111 */
+#define SHIM6_BITMASK_PROTOCOL  0x01    /* 0 000 0001 */
+#define SHIM6_BITMASK_SPECIFIC  0xFE    /* 1 111 1110 */
+#define SHIM6_BITMASK_R         0x80    /* 1 000 0000 */
+#define SHIM6_BITMASK_CT        0x7F    /* 0 111 1111 */
+#define SHIM6_BITMASK_OPT_TYPE  0xFFFE  /* 1 111 1111    1 111 1110 */
+#define SHIM6_BITMASK_CRITICAL  0x01    /* 0 000 0001 */
+#define SHIM6_BITMASK_PRECVD    0xF0    /* 1 111 0000 */
+#define SHIM6_BITMASK_PSENT     0x0F    /* 0 000 1111 */
+#define SHIM6_BITMASK_STA       0xC0    /* 1 100 0000 */
+
+/* SHIM6 Verification Methods */
+#define SHIM6_VERIF_HBA         0x01    /* 0 000 0001 */
+#define SHIM6_VERIF_CGA         0x02    /* 0 000 0010 */
+
+/* SHIM6 Flags */
+#define SHIM6_FLAG_BROKEN       0x01    /* 0 000 0001 */
+#define SHIM6_FLAG_TEMPORARY    0x02    /* 0 000 0010 */
+
+/* SHIM6 REAP States */
+#define SHIM6_REAP_OPERATIONAL  0x00    /* 0 000 0000 */
+#define SHIM6_REAP_EXPLORING    0x01    /* 0 000 0001 */
+#define SHIM6_REAP_INBOUNDOK    0x02    /* 0 000 0010 */
+
 /* Protocol specific data indices */
 #define IPV6_PROTO_NXT_HDR          0
 #define IPV6_PROTO_VALUE            1
diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index b63518a0fb..7f40c31972 100644
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -105,53 +105,6 @@ struct ip6_frag {
     guint32 ip6f_ident;     /* identification */
 };
 
-/* SHIM6 control message types */
-#define SHIM6_TYPE_I1           0x01 /* 0 000 0001 */
-#define SHIM6_TYPE_R1           0x02 /* 0 000 0010 */
-#define SHIM6_TYPE_I2           0x03 /* 0 000 0011 */
-#define SHIM6_TYPE_R2           0x04 /* 0 000 0100 */
-#define SHIM6_TYPE_R1BIS        0x05 /* 0 000 0101 */
-#define SHIM6_TYPE_I2BIS        0x06 /* 0 000 0110 */
-#define SHIM6_TYPE_UPD_REQ      0x40 /* 0 100 0000 = 64 */
-#define SHIM6_TYPE_UPD_ACK      0x41 /* 0 100 0001 = 65 */
-#define SHIM6_TYPE_KEEPALIVE    0x42 /* 0 100 0010 = 66 */
-#define SHIM6_TYPE_PROBE        0x43 /* 0 100 0011 = 67 */
-
-/* SHIM6 Options */
-#define SHIM6_OPT_RESPVAL       0x01 /* 0 000 0001 */
-#define SHIM6_OPT_LOCLIST       0x02 /* 0 000 0010 */
-#define SHIM6_OPT_LOCPREF       0x03 /* 0 000 0011 */
-#define SHIM6_OPT_CGAPDM        0x04 /* 0 000 0100 */
-#define SHIM6_OPT_CGASIG        0x05 /* 0 000 0101 */
-#define SHIM6_OPT_ULIDPAIR      0x06 /* 0 000 0110 */
-#define SHIM6_OPT_FII           0x07 /* 0 000 0111 */
-
-/* SHIM6 Bitmasks */
-#define SHIM6_BITMASK_P         0x80 /* 1 000 0000 */
-#define SHIM6_BITMASK_TYPE      0x7F /* 0 111 1111 */
-#define SHIM6_BITMASK_PROTOCOL  0x01 /* 0 000 0001 */
-#define SHIM6_BITMASK_SPECIFIC  0xFE /* 1 111 1110 */
-#define SHIM6_BITMASK_R         0x80 /* 1 000 0000 */
-#define SHIM6_BITMASK_CT        0x7F /* 0 111 1111 */
-#define SHIM6_BITMASK_OPT_TYPE  0xFFFE /* 1 111 1111    1 111 1110 */
-#define SHIM6_BITMASK_CRITICAL  0x01 /* 0 000 0001 */
-#define SHIM6_BITMASK_PRECVD    0xF0 /* 1 111 0000 */
-#define SHIM6_BITMASK_PSENT     0x0F /* 0 000 1111 */
-#define SHIM6_BITMASK_STA       0xC0 /* 1 100 0000 */
-
-/* SHIM6 Verification Methods */
-#define SHIM6_VERIF_HBA         0x01 /* 0 000 0001 */
-#define SHIM6_VERIF_CGA         0x02 /* 0 000 0010 */
-
-/* SHIM6 Flags */
-#define SHIM6_FLAG_BROKEN       0x01 /* 0 000 0001 */
-#define SHIM6_FLAG_TEMPORARY    0x02 /* 0 000 0010 */
-
-/* SHIM6 REAP States */
-#define SHIM6_REAP_OPERATIONAL  0x00 /* 0 000 0000 */
-#define SHIM6_REAP_EXPLORING    0x01 /* 0 000 0001 */
-#define SHIM6_REAP_INBOUNDOK    0x02/* 0 000 0010 */
-
 /* SHIM6 header */
 struct ip6_shim {
     guint8  ip6s_nxt; /* next header */