Index: boot/arch/ppc64/loader/main.h
===================================================================
--- boot/arch/ppc64/loader/main.h	(revision 63cda71efb0a2f95861470401dbc781d7f284896)
+++ boot/arch/ppc64/loader/main.h	(revision 231fcb23cee33316ea3e310a65aa685ed0fc8538)
@@ -30,5 +30,5 @@
 #define BOOT_ppc64_MAIN_H_
 
-#include <ofw.h>
+#include "ofw.h"
 
 #define TASKMAP_MAX_RECORDS 32
@@ -40,12 +40,13 @@
 
 typedef struct {
-	unsigned int count;
+	unsigned long count;
 	task_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
+	memmap_t memmap;
 	taskmap_t taskmap;
-	memmap_t memmap;
 	screen_t screen;
+	keyboard_t keyboard;
 } bootinfo_t;