diff --git a/libc/charstod.c b/libc/charstod.c
index cbe6d3d..8b2a695 100644
--- a/libc/charstod.c
+++ b/libc/charstod.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /*
diff --git a/libc/dofmt.c b/libc/dofmt.c
index 97bbc92..560d5c8 100644
--- a/libc/dofmt.c
+++ b/libc/dofmt.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /* format the output into f->to and return the number of characters fmted  */
diff --git a/libc/dorfmt.c b/libc/dorfmt.c
index 034dea1..233338a 100644
--- a/libc/dorfmt.c
+++ b/libc/dorfmt.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /* format the output into f->to and return the number of characters fmted  */
diff --git a/libc/fltfmt.c b/libc/fltfmt.c
index 14ad867..2b7a1b7 100644
--- a/libc/fltfmt.c
+++ b/libc/fltfmt.c
@@ -11,17 +11,10 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdio.h>
-#include <math.h>
+#include <u.h>
+#include <libc.h>
 #include <float.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <ctype.h>
-#include <fmt.h>
-#include "plan9.h"
-#include "fmt.h"
 #include "fmtdef.h"
 
 enum
@@ -55,6 +48,7 @@ static double pows10[] =
 	1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159, 
 };
 
+#undef pow10
 #define  pow10(x)  fmtpow10(x)
 
 static double
diff --git a/libc/fmt.c b/libc/fmt.c
index 642de8c..962398e 100644
--- a/libc/fmt.c
+++ b/libc/fmt.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 enum
diff --git a/libc/fmtprint.c b/libc/fmtprint.c
index 5ba59d3..eea5c13 100644
--- a/libc/fmtprint.c
+++ b/libc/fmtprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /*
diff --git a/libc/fmtquote.c b/libc/fmtquote.c
index b6f2e17..ff13d01 100644
--- a/libc/fmtquote.c
+++ b/libc/fmtquote.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /*
diff --git a/libc/fmtrune.c b/libc/fmtrune.c
index b1ddd3b..93008db 100644
--- a/libc/fmtrune.c
+++ b/libc/fmtrune.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/fmtstr.c b/libc/fmtstr.c
index a5f8f8d..1233c75 100644
--- a/libc/fmtstr.c
+++ b/libc/fmtstr.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 char*
diff --git a/libc/fmtvprint.c b/libc/fmtvprint.c
index cb7ffbe..8cfb733 100644
--- a/libc/fmtvprint.c
+++ b/libc/fmtvprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 
diff --git a/libc/pow10.c b/libc/pow10.c
index 5d578f9..73af036 100644
--- a/libc/pow10.c
+++ b/libc/pow10.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 /*
diff --git a/libc/print.c b/libc/print.c
index d038cee..cc62bba 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/runefmtstr.c b/libc/runefmtstr.c
index e17bc16..1252d6a 100644
--- a/libc/runefmtstr.c
+++ b/libc/runefmtstr.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 Rune*
diff --git a/libc/runeseprint.c b/libc/runeseprint.c
index 8e01c07..678cef9 100644
--- a/libc/runeseprint.c
+++ b/libc/runeseprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 Rune*
diff --git a/libc/runesmprint.c b/libc/runesmprint.c
index 03143a9..6dd7bd0 100644
--- a/libc/runesmprint.c
+++ b/libc/runesmprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 Rune*
diff --git a/libc/runesnprint.c b/libc/runesnprint.c
index 2e6ad6c..eed35f7 100644
--- a/libc/runesnprint.c
+++ b/libc/runesnprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/runesprint.c b/libc/runesprint.c
index 1dad4df..a213949 100644
--- a/libc/runesprint.c
+++ b/libc/runesprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/runevseprint.c b/libc/runevseprint.c
index 2359c81..80ef75f 100644
--- a/libc/runevseprint.c
+++ b/libc/runevseprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 Rune*
diff --git a/libc/runevsmprint.c b/libc/runevsmprint.c
index f83dce2..404eb05 100644
--- a/libc/runevsmprint.c
+++ b/libc/runevsmprint.c
@@ -11,22 +11,9 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-/*
- * Plan 9 port version must include libc.h in order to 
- * get Plan 9 debugging malloc, which sometimes returns
- * different pointers than the standard malloc. 
- */
-#ifdef PLAN9PORT
 #include <u.h>
 #include <libc.h>
 #include "fmtdef.h"
-#else
-#include <stdlib.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
-#include "fmtdef.h"
-#endif
 
 static int
 runeFmtStrFlush(Fmt *f)
diff --git a/libc/runevsnprint.c b/libc/runevsnprint.c
index 431868a..a6b18fe 100644
--- a/libc/runevsnprint.c
+++ b/libc/runevsnprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/seprint.c b/libc/seprint.c
index 38bdf5f..c3a3789 100644
--- a/libc/seprint.c
+++ b/libc/seprint.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 char*
diff --git a/libc/smprint.c b/libc/smprint.c
index f46c964..024f0b2 100644
--- a/libc/smprint.c
+++ b/libc/smprint.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 char*
diff --git a/libc/snprint.c b/libc/snprint.c
index 17ce0e2..634f06c 100644
--- a/libc/snprint.c
+++ b/libc/snprint.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/sprint.c b/libc/sprint.c
index 1ab5ce6..7308341 100644
--- a/libc/sprint.c
+++ b/libc/sprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include <fmt.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/strtod.c b/libc/strtod.c
index 1621483..af1c204 100644
--- a/libc/strtod.c
+++ b/libc/strtod.c
@@ -11,14 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdlib.h>
-#include <math.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 static ulong
diff --git a/libc/vfprint.c b/libc/vfprint.c
index e5a7da3..539b189 100644
--- a/libc/vfprint.c
+++ b/libc/vfprint.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int
diff --git a/libc/vseprint.c b/libc/vseprint.c
index b6dfee6..6c6aeca 100644
--- a/libc/vseprint.c
+++ b/libc/vseprint.c
@@ -11,9 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 char*
diff --git a/libc/vsmprint.c b/libc/vsmprint.c
index 6f49373..5f5a4b3 100644
--- a/libc/vsmprint.c
+++ b/libc/vsmprint.c
@@ -11,22 +11,10 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-/*
- * Plan 9 port version must include libc.h in order to 
- * get Plan 9 debugging malloc, which sometimes returns
- * different pointers than the standard malloc. 
- */
-#ifdef PLAN9PORT
+
 #include <u.h>
 #include <libc.h>
 #include "fmtdef.h"
-#else
-#include <stdlib.h>
-#include <string.h>
-#include "plan9.h"
-#include "fmt.h"
-#include "fmtdef.h"
-#endif
 
 static int
 fmtStrFlush(Fmt *f)
diff --git a/libc/vsnprint.c b/libc/vsnprint.c
index ed70325..d80c414 100644
--- a/libc/vsnprint.c
+++ b/libc/vsnprint.c
@@ -11,10 +11,8 @@
  * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include "plan9.h"
-#include "fmt.h"
+#include <u.h>
+#include <libc.h>
 #include "fmtdef.h"
 
 int