More cleanup

Review URL: http://codereview.chromium.org/2718012

vboot_firmware/lib/include/vboot_kernel.h

@@ -12,12 +12,7 @@
 #include <stdint.h>
 
 #include "cgptlib.h"
-#include "cryptolib.h"
 #include "load_kernel_fw.h"
-#include "vboot_common.h"
-
-/* TODO: temporary hack */
-void FakePartitionAttributes(GptData* gpt);
 
 /* Allocates and reads GPT data from the drive.  The sector_bytes and
  * drive_sectors fields should be filled on input.  The primary and
@@ -28,7 +23,7 @@ int AllocAndReadGptData(GptData* gptdata);
 
 /* Writes any changes for the GPT data back to the drive, then frees the
  * buffers. */
-void WriteAndFreeGptData(GptData* gptdata);
+int WriteAndFreeGptData(GptData* gptdata);
 
 /* Alternate LoadKernel() implementation; see load_kernel_fw.h */
 int LoadKernel2(LoadKernelParams* params);