Index: kernel/arch/sparc64/include/mm/sun4v/mmu.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/mmu.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/mm/sun4v/mmu.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm	
+/** @addtogroup sparc64mm
  * @{
  */
Index: kernel/arch/sparc64/include/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm	
+/** @addtogroup sparc64mm
  * @{
  */
Index: kernel/arch/sparc64/include/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup sparc64mm	
+/** @addtogroup sparc64mm
  * @{
  */
Index: kernel/arch/sparc64/include/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64mm	
+/** @addtogroup sparc64mm
  * @{
  */
Index: kernel/arch/sparc64/include/smp/sun4v/smp.h
===================================================================
--- kernel/arch/sparc64/include/smp/sun4v/smp.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/smp/sun4v/smp.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -38,5 +38,8 @@
 #define KERN_sparc64_sun4v_SMP_H_
 
-bool calculate_optimal_nrdy(exec_unit_t *exec_unit);
+#include <typedefs.h>
+#include <arch/sun4v/cpu.h>
+
+extern bool calculate_optimal_nrdy(exec_unit_t *);
 
 #endif
Index: kernel/arch/sparc64/include/sun4v/cpu.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/cpu.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/sun4v/cpu.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -44,4 +44,7 @@
 #ifndef __ASM__
 
+#include <atomic.h>
+#include <synch/spinlock.h>
+
 struct cpu;
 
@@ -51,5 +54,4 @@
 	uint64_t cpuids[MAX_CORE_STRANDS];
 	struct cpu *cpus[MAX_CORE_STRANDS];
-	//cpu_t *cpus[MAX_CORE_STRANDS];
 	atomic_t nrdy;
 	SPINLOCK_DECLARE(proposed_nrdy_lock);
Index: kernel/arch/sparc64/include/sun4v/ipi.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/ipi.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/sun4v/ipi.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -38,7 +38,8 @@
 #define KERN_sparc64_sun4v_IPI_H_
 
-uint64_t ipi_brodcast_to(void (*func)(void), uint16_t cpu_list[MAX_NUM_STRANDS],
-		uint64_t list_size);
-uint64_t ipi_unicast_to(void (*func)(void), uint16_t cpu_id);
+#include <arch/types.h>
+
+extern uint64_t ipi_brodcast_to(void (*)(void), uint16_t cpu_list[], uint64_t);
+extern uint64_t ipi_unicast_to(void (*)(void), uint16_t);
 
 #endif
Index: kernel/arch/sparc64/include/trap/sun4v/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/trap/sun4v/interrupt.h	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/include/trap/sun4v/interrupt.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
@@ -40,6 +40,6 @@
 #ifndef __ASM__
 
-void sun4v_ipi_init(void);
-void cpu_mondo(void);
+extern void sun4v_ipi_init(void);
+extern void cpu_mondo(void);
 
 #endif