vboot: fix up some includes

These header files need to make use of vb2_shared_data.
Remove the last vestiges of vboot1 data structures in coreboot.

BUG=b:124141368, chromium:1038260
TEST=Build locally with CL:2054269
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38884
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

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)

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

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