3 files changed, 6 insertions, 7 deletions
diff --git a/firmware/lib/include/load_kernel_fw.h b/firmware/lib/include/load_kernel_fw.h
index a710ee5d..dd6e1a84 100644
--- a/firmware/lib/include/load_kernel_fw.h
+++ b/firmware/lib/include/load_kernel_fw.h
@@ -74,7 +74,7 @@ typedef struct LoadKernelParams {
  * Returns VBERROR_SUCCESS if successful.  If unsuccessful, sets a recovery
  * reason via VbNvStorage and returns an error code.
  */
-VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams);
+VbError_t LoadKernel(LoadKernelParams *params);
 
 /*
  * The bootloader is loaded using the EFI LoadImage() and StartImage() calls.
diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h
index c35f6697..17ce48b8 100644
--- a/firmware/lib/include/vboot_display.h
+++ b/firmware/lib/include/vboot_display.h
@@ -43,6 +43,11 @@ void VbRenderTextAtPos(const char *text, int right_to_left,
 const char *RecoveryReasonString(uint8_t code);
 
 /**
+ * Return a fixed string representing the HWID.
+ */
+const char *VbHWID(VbCommonParams *cparams);
+
+/**
  * Get the number of localizations in the GBB bitmap data.
  */
 VbError_t VbGetLocalizationCount(VbCommonParams *cparams, uint32_t *count);
diff --git a/firmware/lib/include/vboot_kernel.h b/firmware/lib/include/vboot_kernel.h
index 48e12536..1243cb84 100644
--- a/firmware/lib/include/vboot_kernel.h
+++ b/firmware/lib/include/vboot_kernel.h
@@ -11,7 +11,6 @@
 
 #include "cgptlib.h"
 #include "load_firmware_fw.h"
-#include "load_kernel_fw.h"
 #include "vboot_api.h"
 
 /**
@@ -34,11 +33,6 @@ int WriteAndFreeGptData(VbExDiskHandle_t disk_handle, GptData *gptdata);
 VbNvContext *VbApiKernelGetVnc(void);
 
 /**
- * Exported for unit tests only - frees memory used by VbSelectAndLoadKernel()
- */
-void VbApiKernelFree(VbCommonParams *cparams);
-
-/**
  * Try to load a kernel.
  */
 uint32_t VbTryLoadKernel(VbCommonParams *cparams, LoadKernelParams *p,