Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 95c47767f9669a11d10f6b7cb3e1ceca40b9788b)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision d0febca9f86b5690d11fec7c645836a758567fe6)
@@ -36,5 +36,5 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <cpu.h>
-#include <arch/sun4u/cpu_family.h>
+#include <arch/cpu_family.h>
 #include <arch/cpu.h>
 #include <arch.h>
@@ -45,5 +45,5 @@
 #include <synch/waitq.h>
 #include <print.h>
-#include <arch/sun4u/cpu_node.h>
+#include <arch/cpu_node.h>
 
 /**
@@ -62,5 +62,5 @@
 {
 	ofw_tree_node_t *node;
-	count_t cnt = 0;
+	unsigned int cnt = 0;
 	
 	if (is_us() || is_us_iii()) {