diff --git a/tools/test/p4src/p4-16/include/defines.p4 b/tools/test/p4src/p4-16/include/defines.p4
index ef258f6..6d37036 100644
--- a/tools/test/p4src/p4-16/include/defines.p4
+++ b/tools/test/p4src/p4-16/include/defines.p4
@@ -2,14 +2,14 @@
 #define DEFINES
 
 #define MAX_PORTS 254
-#define CPU_PORT 9w255
-#define DROP_PORT 9w511
 
-#define ETH_TYPE_IPV4 16w0x0800
+#define ETH_TYPE_IPV4 16w0x800
 #define IP_TYPE_TCP 8w6
 #define IP_TYPE_UDP 8w17
 
-typedef bit<16> group_id_t;
-typedef bit<8> group_size_t;
 typedef bit<9> port_t;
+
+const port_t CPU_PORT = 255;
+const port_t DROP_PORT = 511;
+
 #endif