Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/arm32/src/arm32.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -47,5 +47,5 @@
 #include <userspace.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch/ras.h>
 
Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -42,5 +42,5 @@
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia64/src/ia64.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -66,5 +66,5 @@
 #include <print.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 /* NS16550 as a COM 1 */
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/mips32/src/mips32.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -57,5 +57,5 @@
 #include <macros.h>
 #include <config.h>
-#include <string.h>
+#include <str.h>
 #include <arch/drivers/msim.h>
 #include <arch/asm/regname.h>
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ppc32/src/ppc32.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -53,5 +53,5 @@
 #include <align.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/console.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -49,5 +49,5 @@
 #include <arch.h>
 #include <panic.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -43,5 +43,5 @@
 #include <arch/types.h>
 #include <align.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <sysinfo/sysinfo.h>
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -44,10 +44,10 @@
 #include <debug.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <arch/asm.h>
 #include <sysinfo/sysinfo.h>
 
 #define SABRE_INTERNAL_REG	0
-#define PSYCHO_INTERNAL_REG	2	
+#define PSYCHO_INTERNAL_REG	2
 
 #define OBIO_IMR_BASE	0x200
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -43,5 +43,5 @@
 #include <console/console.h>
 #include <arch/types.h>
-#include <string.h>
+#include <str.h>
 #include <align.h>
 #include <print.h>
Index: kernel/arch/sparc64/src/drivers/sgcn.c
===================================================================
--- kernel/arch/sparc64/src/drivers/sgcn.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/drivers/sgcn.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -40,5 +40,5 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <mm/page.h>
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -53,5 +53,5 @@
 #include <time/delay.h>
 #include <arch/smp/sun4v/smp.h>
-#include <string.h>
+#include <str.h>
 
 /** hypervisor code of the "running" state of the CPU */
Index: kernel/arch/sparc64/src/sun4u/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/sun4u/sparc64.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -48,5 +48,5 @@
 #include <userspace.h>
 #include <ddi/irq.h>
-#include <string.h>
+#include <str.h>
 
 bootinfo_t bootinfo;
Index: kernel/arch/sparc64/src/sun4v/md.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/md.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/sun4v/md.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -37,5 +37,5 @@
 #include <func.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <arch/sun4v/md.h>
 #include <arch/sun4v/hypercall.h>
Index: kernel/arch/sparc64/src/sun4v/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
@@ -49,5 +49,5 @@
 #include <userspace.h>
 #include <ddi/irq.h>
-#include <string.h>
+#include <str.h>
 #include <arch/drivers/niagara.h>