diff --git a/include/bbnow_priv.hpp b/include/bbnow_priv.hpp
index 9975d29..c8f0684 100644
--- a/include/bbnow_priv.hpp
+++ b/include/bbnow_priv.hpp
@@ -3,4 +3,17 @@
 #ifndef _BBNOW_PRIV_H
 #define _BBNOW_PRIV_H
 
+#include <stdint.h>
+
+#define EXPANDER_DEVICE_NAME_MAX_LEN 32
+
+/// The packet type for `BBNowPubPacket`s.
+enum class BBNowPrivPacketType: uint16_t {
+    NONE = 0,
+    ACK = 1,
+    DISCOVERY_RESPONSE = 2,
+    EXPANDER_MESSAGE = 3,
+    MAX = 3,
+};
+
 #endif /* _BBNOW_PRIV_H */
diff --git a/include/bbnow_pub.hpp b/include/bbnow_pub.hpp
index 8264e99..9a7a7e1 100644
--- a/include/bbnow_pub.hpp
+++ b/include/bbnow_pub.hpp
@@ -19,7 +19,6 @@ struct BlkBoxNowPubDiscoveryData {
     BlkBoxExpantion expantion_type{};
 };
 
-
 ///////////////////////////////////////
 // PUB PACKET                       //
 /////////////////////////////////////
diff --git a/include/bbnow.hpp b/include/bbnow_types.hpp
similarity index 64%
rename from include/bbnow.hpp
rename to include/bbnow_types.hpp
index b831af3..de06d19 100644
--- a/include/bbnow.hpp
+++ b/include/bbnow_types.hpp
@@ -1,9 +1,9 @@
 /// Types for the BLK_BOX NOW protocol
 
-#ifndef _BBNOW_H
-#define _BBNOW_H
+#ifndef _BBNOW_TYPES_H
+#define _BBNOW_TYPES_H
 
 #include "bbnow_pub.hpp" // IWYU pragma: keep
 #include "bbnow_priv.hpp" // IWYU pragma: keep
 
-#endif /* _BBNOW_H */
+#endif /* _BBNOW_TYPES_H */