Index: kernel/arch/sparc64/include/drivers/fhc.h
===================================================================
--- kernel/arch/sparc64/include/drivers/fhc.h	(revision 8688a6e3018ec48f77ff663f1f31da00cd6b6e2b)
+++ kernel/arch/sparc64/include/drivers/fhc.h	(revision e731b0db7a19a49197d3ed700a60c8131857f598)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64	
+/** @addtogroup sparc64
  * @{
  */
Index: kernel/arch/sparc64/src/drivers/fhc.c
===================================================================
--- kernel/arch/sparc64/src/drivers/fhc.c	(revision 8688a6e3018ec48f77ff663f1f31da00cd6b6e2b)
+++ kernel/arch/sparc64/src/drivers/fhc.c	(revision e731b0db7a19a49197d3ed700a60c8131857f598)
@@ -46,4 +46,5 @@
 #include <arch/types.h>
 #include <genarch/ofw/ofw_tree.h>
+#include <genarch/ofw/fhc.h>
 #include <sysinfo/sysinfo.h>
 
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 8688a6e3018ec48f77ff663f1f31da00cd6b6e2b)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision e731b0db7a19a49197d3ed700a60c8131857f598)
@@ -35,15 +35,6 @@
 #include <arch/drivers/kbd.h>
 #include <genarch/ofw/ofw_tree.h>
-
-#ifdef CONFIG_SUN_KBD
-#include <genarch/kbrd/kbrd.h>
-#endif
-#ifdef CONFIG_Z8530
-#include <genarch/drivers/z8530/z8530.h>
-#endif
-#ifdef CONFIG_NS16550
-#include <genarch/drivers/ns16550/ns16550.h>
-#endif
-
+#include <genarch/ofw/fhc.h>
+#include <genarch/ofw/ebus.h>
 #include <console/console.h>
 #include <ddi/irq.h>
@@ -56,4 +47,16 @@
 
 #ifdef CONFIG_SUN_KBD
+#include <genarch/kbrd/kbrd.h>
+#endif
+
+#ifdef CONFIG_Z8530
+#include <genarch/drivers/z8530/z8530.h>
+#endif
+
+#ifdef CONFIG_NS16550
+#include <genarch/drivers/ns16550/ns16550.h>
+#endif
+
+#ifdef CONFIG_SUN_KBD
 
 #ifdef CONFIG_Z8530
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision 8688a6e3018ec48f77ff663f1f31da00cd6b6e2b)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision e731b0db7a19a49197d3ed700a60c8131857f598)
@@ -37,4 +37,5 @@
 #include <arch/drivers/pci.h>
 #include <genarch/ofw/ofw_tree.h>
+#include <genarch/ofw/upa.h>
 #include <arch/trap/interrupt.h>
 #include <mm/page.h>
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 8688a6e3018ec48f77ff663f1f31da00cd6b6e2b)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision e731b0db7a19a49197d3ed700a60c8131857f598)
@@ -35,4 +35,7 @@
 #include <arch/drivers/scr.h>
 #include <genarch/ofw/ofw_tree.h>
+#include <genarch/ofw/pci.h>
+#include <genarch/ofw/sbus.h>
+#include <genarch/ofw/upa.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>