diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c
index f4f9c23976..e7b64b2398 100644
--- a/src/security/vboot/ec_sync.c
+++ b/src/security/vboot/ec_sync.c
@@ -23,7 +23,7 @@
 #include <timer.h>
 #include <timestamp.h>
 #include <vb2_api.h>
-#include <vboot_api.h>
+#include <vboot_api.h>  /* for VbExDisplayScreen() and VbScreenData */
 
 #define _EC_FILENAME(select, suffix) \
 	(select == VB_SELECT_FIRMWARE_READONLY ? "ecro" suffix : "ecrw" suffix)
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index 81154550ec..04680c0974 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -22,7 +22,6 @@
 #include <fmap.h>
 #include <security/vboot/vbnv.h>
 #include <security/vboot/vboot_common.h>
-#include <vboot_struct.h>
 
 #include "chromeos.h"
 #include "gnvs.h"