diff --git a/ase/awk/awk_i.h b/ase/awk/awk_i.h
index d6a1e30f..0e6df148 100644
--- a/ase/awk/awk_i.h
+++ b/ase/awk/awk_i.h
@@ -1,5 +1,5 @@
 /*
- * $Id: awk_i.h,v 1.53 2006-09-01 06:22:11 bacon Exp $
+ * $Id: awk_i.h,v 1.54 2006-09-01 07:18:39 bacon Exp $
  */
 
 #ifndef _XP_AWK_AWKI_H_
@@ -23,16 +23,6 @@ typedef struct xp_awk_tree_t xp_awk_tree_t;
 	#include <stdarg.h>
 	#include <assert.h>
 
-	#ifdef XP_CHAR_IS_MCHAR
-		#include <ctype.h>
-	#else
-		#include <ctype.h>
-		#include <wchar.h>
-		#if !defined(__BEOS__)
-			#include <wctype.h>
-		#endif
-	#endif
-
 	#define xp_assert assert
 
 	#define xp_memset(dst,fill,len)  memset(dst,fill,len)
diff --git a/ase/awk/extio.c b/ase/awk/extio.c
index f788dabc..71d2246f 100644
--- a/ase/awk/extio.c
+++ b/ase/awk/extio.c
@@ -1,13 +1,11 @@
 /*
- * $Id: extio.c,v 1.44 2006-09-01 06:22:11 bacon Exp $
+ * $Id: extio.c,v 1.45 2006-09-01 07:18:39 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
 #include <xp/bas/assert.h>
-#include <xp/bas/string.h>
-#include <xp/bas/memory.h>
 #endif
 
 enum
@@ -289,7 +287,7 @@ int xp_awk_readextio (
 			const xp_char_t* match_ptr;
 			xp_size_t match_len;
 
-			xp_assert (run->extio.rs_rex != NULL);
+			xp_assert (run->extio.rs_rex != XP_NULL);
 
 			/* TODO: safematchrex */
 			n = xp_awk_matchrex (
@@ -417,7 +415,7 @@ static int __writeextio (
 
 		/* TOOD: consider using a shared buffer when calling
 		 *       xp_awk_valtostr. maybe run->shared_buf.extio */
-		str = xp_awk_valtostr (run, v, xp_true, NULL, &len);
+		str = xp_awk_valtostr (run, v, xp_true, XP_NULL, &len);
 		if (str == XP_NULL) return -1;
 	}
 
diff --git a/ase/awk/func.c b/ase/awk/func.c
index 3fd04488..50d83b59 100644
--- a/ase/awk/func.c
+++ b/ase/awk/func.c
@@ -1,5 +1,5 @@
 /*
- * $Id: func.c,v 1.41 2006-09-01 06:45:05 bacon Exp $
+ * $Id: func.c,v 1.42 2006-09-01 07:18:39 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
@@ -51,9 +51,9 @@ static xp_awk_bfn_t __sys_bfn[] =
 };
 
 xp_awk_bfn_t* xp_awk_addbfn (
-	xp_awk_t* awk, const xp_char_t* name, size_t name_len, int when_valid, 
-	xp_size_t min_args, xp_size_t max_args, const xp_char_t* arg_spec,
-	int (*handler)(xp_awk_t*,void*))
+	xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len, 
+	int when_valid, xp_size_t min_args, xp_size_t max_args, 
+	const xp_char_t* arg_spec, int (*handler)(xp_awk_t*,void*))
 {
 	xp_awk_bfn_t* p;
 
@@ -77,7 +77,7 @@ xp_awk_bfn_t* xp_awk_addbfn (
 	return p;
 }
 
-int xp_awk_delbfn (xp_awk_t* awk, const xp_char_t* name, size_t name_len)
+int xp_awk_delbfn (xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len)
 {
 	xp_awk_bfn_t* p, * pp = XP_NULL;
 
@@ -115,7 +115,7 @@ void xp_awk_clrbfn (xp_awk_t* awk)
 }
 
 xp_awk_bfn_t* xp_awk_getbfn (
-	xp_awk_t* awk, const xp_char_t* name, size_t name_len)
+	xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len)
 {
 	xp_awk_bfn_t* p;
 
diff --git a/ase/awk/func.h b/ase/awk/func.h
index 0b6b16eb..21ba8042 100644
--- a/ase/awk/func.h
+++ b/ase/awk/func.h
@@ -1,5 +1,5 @@
 /*
- * $Id: func.h,v 1.10 2006-09-01 06:22:11 bacon Exp $
+ * $Id: func.h,v 1.11 2006-09-01 07:18:39 bacon Exp $
  */
 
 #ifndef _XP_AWK_FUNC_H_
@@ -42,16 +42,16 @@ extern "C" {
 #endif
 
 xp_awk_bfn_t* xp_awk_addbfn (
-	xp_awk_t* awk, const xp_char_t* name, size_t name_len, int when_valid, 
-	xp_size_t min_args, xp_size_t max_args, const xp_char_t* arg_spec,
-	int (*handler)(xp_awk_t*,void*));
+	xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len, 
+	int when_valid, xp_size_t min_args, xp_size_t max_args, 
+	const xp_char_t* arg_spec, int (*handler)(xp_awk_t*,void*));
 
-int xp_awk_delbfn (xp_awk_t* awk, const xp_char_t* name, size_t name_len);
+int xp_awk_delbfn (xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len);
 
 void xp_awk_clrbfn (xp_awk_t* awk);
 
 xp_awk_bfn_t* xp_awk_getbfn (
-	xp_awk_t* awk, const xp_char_t* name, size_t name_len);
+	xp_awk_t* awk, const xp_char_t* name, xp_size_t name_len);
 
 #ifdef __cplusplus
 }
diff --git a/ase/awk/map.c b/ase/awk/map.c
index 5f4c24b2..56e57aca 100644
--- a/ase/awk/map.c
+++ b/ase/awk/map.c
@@ -1,12 +1,10 @@
 /*
- * $Id: map.c,v 1.23 2006-09-01 06:22:12 bacon Exp $
+ * $Id: map.c,v 1.24 2006-09-01 07:18:39 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
-#include <xp/bas/memory.h>
-#include <xp/bas/string.h>
 #include <xp/bas/assert.h>
 #endif
 
diff --git a/ase/awk/misc.c b/ase/awk/misc.c
index 2167d525..b9b439b8 100644
--- a/ase/awk/misc.c
+++ b/ase/awk/misc.c
@@ -1,12 +1,12 @@
 /*
- * $Id: misc.c,v 1.10 2006-09-01 06:42:52 bacon Exp $
+ * $Id: misc.c,v 1.11 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
-#include <xp/bas/ctype.h>
 #include <xp/bas/assert.h>
+#include <xp/bas/stdarg.h>
 #endif
 
 static int __vprintf (
diff --git a/ase/awk/parse.c b/ase/awk/parse.c
index ad917485..b1a31747 100644
--- a/ase/awk/parse.c
+++ b/ase/awk/parse.c
@@ -1,14 +1,11 @@
 /*
- * $Id: parse.c,v 1.176 2006-09-01 06:22:12 bacon Exp $
+ * $Id: parse.c,v 1.177 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
 #include <xp/bas/memory.h>
-#include <xp/bas/ctype.h>
-#include <xp/bas/string.h>
-#include <xp/bas/stdlib.h>
 #include <xp/bas/assert.h>
 #include <xp/bas/stdio.h>
 #endif
diff --git a/ase/awk/rex.c b/ase/awk/rex.c
index 7cb15c76..a037befe 100644
--- a/ase/awk/rex.c
+++ b/ase/awk/rex.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.c,v 1.26 2006-09-01 06:42:52 bacon Exp $
+ * $Id: rex.c,v 1.27 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
@@ -213,14 +213,14 @@ static const xp_byte_t* __print_branch (const xp_byte_t* p);
 static const xp_byte_t* __print_atom (const xp_byte_t* p);
 
 #ifndef XP_AWK_NTDDK
-static struct __char_class_t
+struct __char_class_t
 {
 	const xp_char_t* name;
 	xp_size_t name_len;
 	xp_bool_t (*func) (xp_awk_t* awk, xp_char_t c);
-};
+}; 
 
-static struct __char_class_t __char_class [] =
+static struct __char_class_t __char_class[] =
 {
 	{ XP_T("alnum"),  5, __cc_isalnum },
 	{ XP_T("alpha"),  5, __cc_isalpha },
diff --git a/ase/awk/run.c b/ase/awk/run.c
index 93e50934..88a39890 100644
--- a/ase/awk/run.c
+++ b/ase/awk/run.c
@@ -1,5 +1,5 @@
 /*
- * $Id: run.c,v 1.193 2006-09-01 06:22:12 bacon Exp $
+ * $Id: run.c,v 1.194 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
@@ -9,7 +9,6 @@
 
 #ifndef XP_AWK_STAND_ALONE
 #include <xp/bas/assert.h>
-#include <xp/bas/string.h>
 #include <xp/bas/memory.h>
 #endif
 
diff --git a/ase/awk/str.c b/ase/awk/str.c
index 85436954..a33ae7fd 100644
--- a/ase/awk/str.c
+++ b/ase/awk/str.c
@@ -1,12 +1,11 @@
 /*
- * $Id: str.c,v 1.2 2006-09-01 06:22:13 bacon Exp $
+ * $Id: str.c,v 1.3 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
 #include <xp/bas/memory.h>
-#include <xp/bas/string.h>
 #include <xp/bas/assert.h>
 #endif
 
diff --git a/ase/awk/tab.c b/ase/awk/tab.c
index d7041d7b..cd9142b4 100644
--- a/ase/awk/tab.c
+++ b/ase/awk/tab.c
@@ -1,12 +1,11 @@
 /*
- * $Id: tab.c,v 1.15 2006-09-01 06:22:13 bacon Exp $
+ * $Id: tab.c,v 1.16 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
 #include <xp/bas/memory.h>
-#include <xp/bas/string.h>
 #include <xp/bas/assert.h>
 #endif
 
diff --git a/ase/awk/val.c b/ase/awk/val.c
index 8f49706a..2df13d3b 100644
--- a/ase/awk/val.c
+++ b/ase/awk/val.c
@@ -1,11 +1,10 @@
 /*
- * $Id: val.c,v 1.58 2006-09-01 06:22:13 bacon Exp $
+ * $Id: val.c,v 1.59 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk_i.h>
 
 #ifndef XP_AWK_STAND_ALONE
-#include <xp/bas/string.h>
 #include <xp/bas/memory.h>
 #include <xp/bas/assert.h>
 #include <xp/bas/stdio.h>
diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c
index d9d48b87..e91eb308 100644
--- a/ase/test/awk/awk.c
+++ b/ase/test/awk/awk.c
@@ -1,5 +1,5 @@
 /*
- * $Id: awk.c,v 1.84 2006-09-01 06:23:57 bacon Exp $
+ * $Id: awk.c,v 1.85 2006-09-01 07:18:40 bacon Exp $
  */
 
 #include <xp/awk/awk.h>
@@ -9,6 +9,7 @@
 
 #ifdef XP_CHAR_IS_WCHAR
 	#include <wchar.h>
+	#include <wctype.h>
 #endif
 
 #ifndef __STAND_ALONE