Index: branches/xZenu/src/modules/klibc/strndup.c
===================================================================
--- branches/xZenu/src/modules/klibc/strndup.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/strndup.c	(revision 1295)
@@ -2,7 +2,8 @@
  * strndup.c
  */
 
-#include "libsaio.h"
+#include <stdlib.h>
+#include <string.h>
 
 char *strndup(const char *s, size_t n)
 {
Index: branches/xZenu/src/modules/klibc/onexit.c
===================================================================
--- branches/xZenu/src/modules/klibc/onexit.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/onexit.c	(revision 1295)
@@ -2,7 +2,7 @@
  * onexit.c
  */
 
-#include "libsaio.h"
+#include <stdlib.h>
 #include "atexit.h"
 
 int on_exit(void (*fctn) (int, void *), void *arg)
Index: branches/xZenu/src/modules/klibc/vsnprintf.c
===================================================================
--- branches/xZenu/src/modules/klibc/vsnprintf.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/vsnprintf.c	(revision 1295)
@@ -4,12 +4,12 @@
  * vsnprintf(), from which the rest of the printf()
  * family is built
  */
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <limits.h>
+#include <stdint.h>
 
-//#include "libsaio.h"
-//Azi: "UCHAR_MAX" & "UINT_MAX" redefined error - limits.h is also present in i386/include.
-#include "libsa.h"
-#include "limits.h"
-
 enum flags {
 	FL_ZERO		= 0x01,	/* Zero modifier */
 	FL_MINUS	= 0x02,	/* Minus modifier */
Index: branches/xZenu/src/modules/klibc/vsscanf.c
===================================================================
--- branches/xZenu/src/modules/klibc/vsscanf.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/vsscanf.c	(revision 1295)
@@ -4,12 +4,13 @@
  * vsscanf(), from which the rest of the scanf()
  * family is built
  */
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <ctype.h>
+#include <stdint.h>
 
-//#include "libsaio.h"
-//Azi: "UCHAR_MAX" & "UINT_MAX" redefined error - limits.h is also present in i386/include.
-#include "libsa.h"
-#include "limits.h"
-
 extern uintmax_t strntoumax(const char *nptr, char **endptr, int base, size_t n);
 
 #ifndef LONG_BIT
Index: branches/xZenu/src/modules/klibc/snprintf.c
===================================================================
--- branches/xZenu/src/modules/klibc/snprintf.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/snprintf.c	(revision 1295)
@@ -2,7 +2,9 @@
  * snprintf.c
  */
 
-#include "libsaio.h"
+#include <stdio.h>
+#include <stdarg.h>
+
 extern int vsnprintf(char *buffer, size_t n, const char *format, va_list ap);
 
 int snprintf(char *buffer, size_t n, const char *format, ...)
Index: branches/xZenu/src/modules/klibc/sscanf.c
===================================================================
--- branches/xZenu/src/modules/klibc/sscanf.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/sscanf.c	(revision 1295)
@@ -2,8 +2,9 @@
  * sscanf()
  */
 
-#include "libsaio.h"
-extern int vsscanf(const char *buffer, const char *format, va_list ap);
+#include <stdio.h>
+#include <stdarg.h>
+
 int sscanf(const char *str, const char *format, ...)
 {
 	va_list ap;
Index: branches/xZenu/src/modules/klibc/strntoumax.c
===================================================================
--- branches/xZenu/src/modules/klibc/strntoumax.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/strntoumax.c	(revision 1295)
@@ -3,7 +3,9 @@
  *
  * The strntoumax() function and associated
  */
-#include "libsaio.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <ctype.h>
 
 static inline int digitval(int ch)
 {
Index: branches/xZenu/src/modules/klibc/seed48.c
===================================================================
--- branches/xZenu/src/modules/klibc/seed48.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/seed48.c	(revision 1295)
@@ -2,7 +2,7 @@
  * seed48.c
  */
 
-#include "libsaio.h"
+#include <string.h>
 
 unsigned short __rand48_seed[3];
 
Index: branches/xZenu/src/modules/klibc/strxspn.c
===================================================================
--- branches/xZenu/src/modules/klibc/strxspn.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/strxspn.c	(revision 1295)
@@ -3,7 +3,7 @@
  */
 
 #include <limits.h>
-#include "libsaio.h"
+#include <string.h>
 #include "strxspn.h"
 
 
Index: branches/xZenu/src/modules/klibc/calloc.c
===================================================================
--- branches/xZenu/src/modules/klibc/calloc.c	(revision 1294)
+++ branches/xZenu/src/modules/klibc/calloc.c	(revision 1295)
@@ -2,7 +2,8 @@
  * calloc.c
  */
 
-#include "libsaio.h"
+#include <stdlib.h>
+#include <string.h>
 /* FIXME: This should look for multiplication overflow */
 
 void *calloc(size_t nmemb, size_t size)