diff --git a/src/SerialTypes.h b/src/SerialTypes.h
index 9e4aef5b3b..85aed10bda 100644
--- a/src/SerialTypes.h
+++ b/src/SerialTypes.h
@@ -52,8 +52,6 @@ SERIAL_IS(RE_MATCHER, 0x1400)
 SERIAL_IS(BITVECTOR, 0x1500)
 SERIAL_IS(COUNTERVECTOR, 0x1600)
 SERIAL_IS(BLOOMFILTER, 0x1700)
-SERIAL_IS(BASICBLOOMFILTER, 0x1800)
-SERIAL_IS(COUNTINGBLOOMFILTER, 0x1900)
 
 // These are the externally visible types.
 const SerialType SER_NONE = 0;
@@ -203,6 +201,11 @@ SERIAL_FUNC(BRO_FUNC, 2)
 SERIAL_FUNC(DEBUG_FUNC, 3)
 SERIAL_FUNC(BUILTIN_FUNC, 4)
 
+#define SERIAL_BLOOMFILTER(name, val) SERIAL_CONST(name, val, BLOOMFILTER)
+SERIAL_BLOOMFILTER(BLOOMFILTER, 1)
+SERIAL_BLOOMFILTER(BASICBLOOMFILTER, 2)
+SERIAL_BLOOMFILTER(COUNTINGBLOOMFILTER, 3)
+
 SERIAL_CONST2(ID)
 SERIAL_CONST2(STATE_ACCESS)
 SERIAL_CONST2(CASE)
@@ -210,8 +213,5 @@ SERIAL_CONST2(LOCATION)
 SERIAL_CONST2(RE_MATCHER)
 SERIAL_CONST2(BITVECTOR)
 SERIAL_CONST2(COUNTERVECTOR)
-SERIAL_CONST2(BLOOMFILTER)
-SERIAL_CONST2(BASICBLOOMFILTER)
-SERIAL_CONST2(COUNTINGBLOOMFILTER)
 
 #endif