diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 70f806bf50..579afa60a0 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -148,6 +148,8 @@ struct cbfs_payload {
     Users are welcome to use any other value for their
     components */
 
+#define CBFS_COMPONENT_BOOTBLOCK  0x01
+#define CBFS_COMPONENT_CBFSHEADER 0x02
 #define CBFS_COMPONENT_STAGE      0x10
 #define CBFS_COMPONENT_PAYLOAD    0x20
 #define CBFS_COMPONENT_OPTIONROM  0x30
@@ -181,6 +183,8 @@ struct typedesc_t {
 };
 
 static struct typedesc_t filetypes[] unused = {
+	{CBFS_COMPONENT_BOOTBLOCK, "bootblock"},
+	{CBFS_COMPONENT_CBFSHEADER, "cbfs header"},
 	{CBFS_COMPONENT_STAGE, "stage"},
 	{CBFS_COMPONENT_PAYLOAD, "payload"},
 	{CBFS_COMPONENT_OPTIONROM, "optionrom"},