Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision 516ff92eec3001ee20baaf6f01de87b1ffef0b48)
+++ kernel/generic/include/arch.h	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -80,4 +80,5 @@
 extern void reboot(void);
 extern void arch_reboot(void);
+extern void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller);
 
 #endif
Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 516ff92eec3001ee20baaf6f01de87b1ffef0b48)
+++ kernel/generic/include/ddi/irq.h	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -47,6 +47,4 @@
 	CMD_PORT_READ_1,
 	CMD_PORT_WRITE_1,
-	CMD_IA64_GETCHAR,
-	CMD_PPC32_GETCHAR,
 	CMD_LAST
 } irq_cmd_type;
Index: kernel/generic/include/fpu_context.h
===================================================================
--- kernel/generic/include/fpu_context.h	(revision 516ff92eec3001ee20baaf6f01de87b1ffef0b48)
+++ kernel/generic/include/fpu_context.h	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -38,8 +38,4 @@
 #include <arch/fpu_context.h>
 
-#if defined(CONFIG_FPU_LAZY) && !defined(ARCH_HAS_FPU)
-# error "CONFIG_FPU_LAZY defined, but no ARCH_HAS_FPU"
-#endif
-
 extern void fpu_context_save(fpu_context_t *);
 extern void fpu_context_restore(fpu_context_t *);