diff --git a/payloads/coreinfo/bootlog_module.c b/payloads/coreinfo/bootlog_module.c
index 5a87f28340..07fa814ed5 100644
--- a/payloads/coreinfo/bootlog_module.c
+++ b/payloads/coreinfo/bootlog_module.c
@@ -17,7 +17,7 @@ static s32 g_max_cursor_line = 0;
 struct cbmem_console {
 	u32 size;
 	u32 cursor;
-	u8 body[0];
+	u8 body[];
 } __packed;
 
 #define CURSOR_MASK ((1 << 28) - 1)
diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c
index 93c90e7da9..c8fa7e2eb2 100644
--- a/payloads/coreinfo/cbfs_module.c
+++ b/payloads/coreinfo/cbfs_module.c
@@ -31,7 +31,7 @@ struct cbheader {
 	u32 align;
 	u32 offset;
 	u32 architecture;
-	u32 pad[1];
+	u32 pad[];
 } __packed;
 
 struct cbfile {
@@ -40,7 +40,7 @@ struct cbfile {
 	u32 type;
 	u32 checksum;
 	u32 offset;
-	char filename[0];
+	char filename[];
 } __packed;
 
 static int filecount = 0, selected = 0, start_row = 0;