Index: kernel/arch/sparc64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/sparc64/include/arch/proc/thread.h	(revision 751032650a0af420a9d0763cf66c6c43bdc89800)
+++ kernel/arch/sparc64/include/arch/proc/thread.h	(revision fb4a424279571d50c7676c2c88d543bdf1bf68b7)
@@ -38,4 +38,7 @@
 #include <typedefs.h>
 #include <arch/arch.h>
+#include <mm/slab.h>
+
+extern slab_cache_t *uwb_cache;
 
 typedef struct {
Index: kernel/arch/sparc64/include/arch/trap/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/regwin.h	(revision 751032650a0af420a9d0763cf66c6c43bdc89800)
+++ kernel/arch/sparc64/include/arch/trap/regwin.h	(revision fb4a424279571d50c7676c2c88d543bdf1bf68b7)
@@ -77,5 +77,4 @@
 #define UWB_SIZE	((NWINDOWS - 1) * STACK_WINDOW_SAVE_AREA_SIZE)
 #define UWB_ALIGNMENT	1024
-#define UWB_ASIZE	ALIGN_UP(UWB_SIZE, UWB_ALIGNMENT)
 
 #ifdef __ASM__