diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c
index ecceff50f9..f4f9c23976 100644
--- a/src/security/vboot/ec_sync.c
+++ b/src/security/vboot/ec_sync.c
@@ -23,6 +23,7 @@
 #include <timer.h>
 #include <timestamp.h>
 #include <vb2_api.h>
+#include <vboot_api.h>
 
 #define _EC_FILENAME(select, suffix) \
 	(select == VB_SELECT_FIRMWARE_READONLY ? "ecro" suffix : "ecrw" suffix)
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index 2d5b0845d1..324af5ca11 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -18,9 +18,7 @@
 
 #include <assert.h>
 #include <security/vboot/vboot_common.h>
-
-struct vb2_context;
-struct vb2_shared_data;
+#include <vb2_api.h>
 
 /*
  * Source: security/vboot/common.c
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 976c26a70b..57f3475adb 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -17,8 +17,7 @@
 
 #include <commonlib/region.h>
 #include <stdint.h>
-#include <vboot_api.h>
-#include <vboot_struct.h>
+#include <vb2_api.h>
 
 /*
  * Function to check if there is a request to enter recovery mode. Returns