Index: kernel/arch/amd64/src/userspace.c
===================================================================
--- kernel/arch/amd64/src/userspace.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/amd64/src/userspace.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -36,4 +36,5 @@
 #include <arch/cpu.h>
 #include <arch/pm.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <arch.h>
@@ -75,5 +76,5 @@
 
 	/* Unreachable */
-	while (1);
+	while (true);
 }
 
Index: kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
===================================================================
--- kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -44,4 +44,5 @@
 #include <mm/km.h>
 #include <ddi/ddi.h>
+#include <stdbool.h>
 
 static void bbxm_init(void);
@@ -130,5 +131,5 @@
 static void bbxm_cpu_halt(void)
 {
-	while (1)
+	while (true)
 		;
 }
Index: kernel/arch/arm32/src/mach/beaglebone/beaglebone.c
===================================================================
--- kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/arm32/src/mach/beaglebone/beaglebone.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -47,4 +47,5 @@
 #include <ddi/ddi.h>
 #include <mm/km.h>
+#include <stdbool.h>
 
 #define BBONE_MEMORY_START       0x80000000      /* physical */
@@ -159,5 +160,5 @@
 static void bbone_cpu_halt(void)
 {
-	while (1)
+	while (true)
 		;
 }
Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -42,4 +42,5 @@
 #include <genarch/srln/srln.h>
 #include <console/console.h>
+#include <stdbool.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/page.h>
@@ -244,5 +245,5 @@
 void icp_cpu_halt(void)
 {
-	while (1);
+	while (true);
 }
 
Index: kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c
===================================================================
--- kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -47,4 +47,5 @@
 #include <abi/fb/visuals.h>
 #include <genarch/srln/srln.h>
+#include <stdbool.h>
 #include <sysinfo/sysinfo.h>
 #include <interrupt.h>
@@ -128,5 +129,5 @@
 static void raspberrypi_cpu_halt(void)
 {
-	while (1) ;
+	while (true) ;
 }
 
Index: kernel/arch/arm32/src/userspace.c
===================================================================
--- kernel/arch/arm32/src/userspace.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/arm32/src/userspace.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -34,4 +34,5 @@
  */
 
+#include <stdbool.h>
 #include <userspace.h>
 #include <arch/ras.h>
@@ -114,5 +115,5 @@
 
 	/* unreachable */
-	while (1)
+	while (true)
 		;
 }
Index: kernel/arch/ia32/src/userspace.c
===================================================================
--- kernel/arch/ia32/src/userspace.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/ia32/src/userspace.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -35,4 +35,5 @@
 #include <userspace.h>
 #include <arch/pm.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <arch.h>
@@ -79,5 +80,5 @@
 
 	/* Unreachable */
-	while (1);
+	while (true);
 }
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/ia64/src/ia64.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -40,4 +40,5 @@
 #include <arch/interrupt.h>
 #include <macros.h>
+#include <stdbool.h>
 #include <str.h>
 #include <userspace.h>
@@ -252,5 +253,5 @@
 	    (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
-	while (1);
+	while (true);
 }
 
@@ -258,5 +259,5 @@
 {
 	pio_write_8((ioport8_t *)0x64, 0xfe);
-	while (1);
+	while (true);
 }
 
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/mips32/src/mips32.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -42,4 +42,5 @@
 #include <mem.h>
 #include <userspace.h>
+#include <stdbool.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
@@ -172,5 +173,5 @@
 	    (uintptr_t) kernel_uarg->uspace_entry);
 
-	while (1)
+	while (true)
 		;
 }
@@ -195,5 +196,5 @@
 {
 	___halt();
-	while (1)
+	while (true)
 		;
 }
Index: kernel/arch/sparc64/src/sun4u/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -50,4 +50,5 @@
 #include <userspace.h>
 #include <ddi/irq.h>
+#include <stdbool.h>
 #include <str.h>
 #include <sysinfo/sysinfo.h>
@@ -169,5 +170,5 @@
 
 	/* Not reached */
-	while (1)
+	while (true)
 		;
 }
@@ -176,5 +177,5 @@
 {
 	// TODO
-	while (1)
+	while (true)
 		;
 }
Index: kernel/arch/sparc64/src/sun4v/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 9c514be8874674ec5c88ec179201c364acc22f89)
+++ kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 76d0981d8dda2b7d698201a93e0c555e99215ba5)
@@ -51,4 +51,5 @@
 #include <userspace.h>
 #include <ddi/irq.h>
+#include <stdbool.h>
 #include <str.h>
 #include <arch/drivers/niagara.h>
@@ -167,5 +168,5 @@
 
 	/* Not reached */
-	while (1)
+	while (true)
 		;
 }
@@ -174,5 +175,5 @@
 {
 	// TODO
-	while (1)
+	while (true)
 		;
 }