diff --git a/ase/test/awk/makefile.in b/ase/test/awk/makefile.in
index 5003f66a..b299b235 100644
--- a/ase/test/awk/makefile.in
+++ b/ase/test/awk/makefile.in
@@ -2,11 +2,11 @@ SRCS = awk.c
 OBJS = $(SRCS:.c=.o)
 
 CC = @CC@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. -I$(XPKIT)
-LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk -L$(XPKIT)/xp/bas
-LIBS = @LIBS@ -laseawk -lxpbas -lm
+CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. 
+LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk 
+LIBS = @LIBS@ -laseawk -lm
 
-all: xpkit awk
+all: awk
 
 awk: $(OBJS)
 	$(CC) -o $@ awk.o $(LDFLAGS) $(LIBS)
@@ -14,9 +14,6 @@ awk: $(OBJS)
 clean:
 	rm -rf *.o awk
 
-xpkit:
-	@if [ "$(XPKIT)" = "" ]; then echo "ERROR: XPKIT not set. Check XPKIT first"; return 1; fi
-
 .SUFFIXES: .c .o
 .c.o:
 	$(CC) -c $(CFLAGS) $<
diff --git a/ase/utl/main.c b/ase/utl/main.c
index 1e0bcc2c..807fe04f 100644
--- a/ase/utl/main.c
+++ b/ase/utl/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.3 2007-01-26 16:08:54 bacon Exp $
+ * $Id: main.c,v 1.4 2007-01-26 16:10:32 bacon Exp $
  */
 
 #include <ase/types.h>
@@ -10,7 +10,12 @@
 #include <wchar.h>
 #include <locale.h>
 
-#if defined(ASE_CHAR_IS_WCHAR) && defined(__unix)
+#if defined(_WIN32)
+
+#include <tchar.h>
+#define ase_main _tmain
+
+#elif defined(ASE_CHAR_IS_WCHAR) && defined(__unix)
 
 #ifdef __cplusplus
 extern "C" { int ase_main (...); }
diff --git a/ase/utl/printf.c b/ase/utl/printf.c
index 58fab74d..c4e0a396 100644
--- a/ase/utl/printf.c
+++ b/ase/utl/printf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: printf.c,v 1.3 2007-01-21 13:21:14 bacon Exp $
+ * $Id: printf.c,v 1.4 2007-01-26 16:08:55 bacon Exp $
  */
 
 #include <stdarg.h>
@@ -10,14 +10,24 @@
 #include <ctype.h>
 #include <wctype.h>
 
-#if defined(ASE_CHAR_IS_MCHAR)
-	#define ase_tolower(x) tolower(x)
-	#define ase_isdigit(x) isdigit(x)
-#elif defined(ASE_CHAR_IS_WCHAR)
-	#define ase_tolower(x) towlower(x)
-	#define ase_isdigit(x) iswdigit(x)
+#if defined(_WIN32)
+	#include <tchar.h>
+	#define ase_printf   _tprintf
+	#define ase_vprintf  _vtprintf
+	#define ase_fprintf  _ftprintf
+	#define ase_vfprintf _vftprintf
 #else
-	#error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR
+
+	#if defined(ASE_CHAR_IS_MCHAR)
+		#define ase_tolower(x) tolower(x)
+		#define ase_isdigit(x) isdigit(x)
+	#elif defined(ASE_CHAR_IS_WCHAR)
+		#define ase_tolower(x) towlower(x)
+		#define ase_isdigit(x) iswdigit(x)
+	#else
+		#error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR
+	#endif
+
 #endif
 
 static ase_char_t* __adjust_format (const ase_char_t* format);