Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/console.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -34,5 +34,4 @@
 
 #include <arch/console.h>
-#include <typedefs.h>
 
 #include <arch/drivers/scr.h>
Index: kernel/arch/sparc64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/sparc64/src/debug/stacktrace.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/debug/stacktrace.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -34,6 +34,7 @@
 
 #include <stacktrace.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <syscall/copy.h>
-#include <typedefs.h>
 #include <proc/thread.h>
 
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -42,5 +42,5 @@
 #include <console/chardev.h>
 #include <console/console.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <str.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -41,5 +41,5 @@
 #include <config.h>
 #include <macros.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <log.h>
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -44,5 +44,7 @@
 #include <macros.h>
 #include <func.h>
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <print.h>
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -41,5 +41,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <typedefs.h>
+#include <stdbool.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <debug.h>
 #include <arch/asm.h>
