diff --git a/ase/ase.dsw b/ase/ase.dsw
new file mode 100644
index 00000000..ed7e5ce6
--- /dev/null
+++ b/ase/ase.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "xpawk"=.\xp\awk\xpawk.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/ase/awk/Makefile.cl b/ase/awk/Makefile.cl
index a4dc9247..12b9f47e 100644
--- a/ase/awk/Makefile.cl
+++ b/ase/awk/Makefile.cl
@@ -14,7 +14,7 @@ lib: $(OBJS)
 <<
 
 dll: $(OBJS)
-	link /dll /def:$(OUT).def /subsystem:console /version:0.1 /release /noentry @<<
+	link /dll /def:awk.def /subsystem:console /version:0.1 /release @<<
 /nologo /out:$(OUT).dll $(OBJS)
 <<
 
diff --git a/ase/awk/awk.def b/ase/awk/awk.def
new file mode 100644
index 00000000..cda9a204
--- /dev/null
+++ b/ase/awk/awk.def
@@ -0,0 +1,16 @@
+LIBRARY	"xpawk.dll"
+EXPORTS
+	xp_awk_open PRIVATE
+	xp_awk_close PRIVATE
+
+	xp_awk_geterrnum PRIVATE
+	xp_awk_geterrstr PRIVATE
+
+	xp_awk_clear PRIVATE
+	xp_awk_setparseopt PRIVATE
+
+	xp_awk_attsrc PRIVATE
+	xp_awk_detsrc PRIVATE
+
+	xp_awk_parse PRIVATE
+	xp_awk_run PRIVATE
diff --git a/ase/awk/awk.dsp b/ase/awk/awk.dsp
new file mode 100644
index 00000000..eb273ace
--- /dev/null
+++ b/ase/awk/awk.dsp
@@ -0,0 +1,190 @@
+# Microsoft Developer Studio Project File - Name="xpawk" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=xpawk - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "xpawk.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "xpawk.mak" CFG="xpawk - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "xpawk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "xpawk - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "xpawk - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AWK_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "__STAND_ALONE" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "xpawk - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AWK_EXPORTS" /Yu"stdafx.h" /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "__STAND_ALONE" /FD /GZ  /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "xpawk - Win32 Release"
+# Name "xpawk - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\awk.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\awk.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\err.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\map.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\run.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\sa.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\tab.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\tree.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# Begin Source File
+
+SOURCE=.\val.c
+# ADD CPP /D "_UNICODE"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\awk.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\awk_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\err.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\run.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sa.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\val.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/ase/types.h b/ase/types.h
index 397242a8..6489b99e 100644
--- a/ase/types.h
+++ b/ase/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h,v 1.40 2006-03-09 04:25:29 bacon Exp $
+ * $Id: types.h,v 1.41 2006-03-31 17:48:17 bacon Exp $
  */
 
 #ifndef _XP_TYPES_H_
@@ -207,12 +207,14 @@ typedef char xp_mchar_t;
 typedef int  xp_mcint_t;
 
 #if defined(_WIN32)
+	/*
 	#include <stddef.h>
 	typedef wchar_t xp_wchar_t;
 	typedef wint_t xp_wcint_t;
-	/*typedef unsigned short xp_wchar_t;*/
+	*/
+	typedef unsigned short xp_wchar_t;
 	/*typedef int xp_wcint_t;*/
-	/*typedef unsigned short xp_wcint_t;*/
+	typedef unsigned short xp_wcint_t;
 #elif defined(vms) || defined(__vms)
 	typedef long xp_wchar_t;
 	typedef long xp_wcint_t;