diff --git a/ase/awk/aseawk.dsp b/ase/awk/aseawk.dsp
index ccdeefac..c9067d5e 100644
--- a/ase/awk/aseawk.dsp
+++ b/ase/awk/aseawk.dsp
@@ -123,10 +123,6 @@ SOURCE=.\rec.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rex.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\run.c
 # End Source File
 # Begin Source File
@@ -167,10 +163,6 @@ SOURCE=.\parse.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\rex.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\run.h
 # End Source File
 # Begin Source File
diff --git a/ase/awk/aseawk.vcproj b/ase/awk/aseawk.vcproj
index 176257f7..212e1a5e 100644
--- a/ase/awk/aseawk.vcproj
+++ b/ase/awk/aseawk.vcproj
@@ -587,46 +587,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="rex.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="run.c"
 				>
@@ -812,10 +772,6 @@
 				RelativePath="parse.h"
 				>
 			</File>
-			<File
-				RelativePath="rex.h"
-				>
-			</File>
 			<File
 				RelativePath="run.h"
 				>
diff --git a/ase/awk/descrip.mms b/ase/awk/descrip.mms
index 0623de56..a5c13001 100644
--- a/ase/awk/descrip.mms
+++ b/ase/awk/descrip.mms
@@ -2,7 +2,7 @@
 # OpenVMS MMS/MMK
 #
 
-objects = awk.obj,err.obj,tree.obj,str.obj,tab.obj,map.obj,parse.obj,run.obj,rec.obj,val.obj,func.obj,misc.obj,extio.obj,rex.obj
+objects = awk.obj,err.obj,tree.obj,str.obj,tab.obj,map.obj,parse.obj,run.obj,rec.obj,val.obj,func.obj,misc.obj,extio.obj
 
 CFLAGS = /include="../.."
 #CFLAGS = /pointer_size=long /include="../.."
@@ -25,4 +25,3 @@ val.obj depends_on val.c
 func.obj depends_on func.c
 misc.obj depends_on misc.c
 extio.obj depends_on extio.c
-rex.obj depends_on rex.c
diff --git a/ase/awk/msw-bcc.mak b/ase/awk/msw-bcc.mak
index ddcdd4e1..20482249 100644
--- a/ase/awk/msw-bcc.mak
+++ b/ase/awk/msw-bcc.mak
@@ -56,8 +56,7 @@ OBJ_FILES_LIB = \
 	$(TMP_DIR)\val.obj \
 	$(TMP_DIR)\func.obj \
 	$(TMP_DIR)\misc.obj \
-	$(TMP_DIR)\extio.obj \
-	$(TMP_DIR)\rex.obj
+	$(TMP_DIR)\extio.obj 
 
 OBJ_FILES_JNI = $(TMP_DIR)\jni.obj 
 
@@ -144,9 +143,6 @@ $(TMP_DIR)\misc.obj: misc.c
 $(TMP_DIR)\extio.obj: extio.c
 	$(CC) $(CFLAGS) -o$@ -c extio.c
 
-$(TMP_DIR)\rex.obj: rex.c
-	$(CC) $(CFLAGS) -o$@ -c rex.c
-
 $(TMP_DIR)\jni.obj: jni.c
 	$(CC) $(CFLAGS) $(JNI_INC) -o$@ -c jni.c
 
diff --git a/ase/awk/msw-cl.mak b/ase/awk/msw-cl.mak
index a5543dfe..c488cb4a 100644
--- a/ase/awk/msw-cl.mak
+++ b/ase/awk/msw-cl.mak
@@ -56,8 +56,7 @@ OBJ_FILES_LIB = \
 	$(TMP_DIR)\val.obj \
 	$(TMP_DIR)\func.obj \
 	$(TMP_DIR)\misc.obj \
-	$(TMP_DIR)\extio.obj \
-	$(TMP_DIR)\rex.obj
+	$(TMP_DIR)\extio.obj 
 
 OBJ_FILES_JNI = $(TMP_DIR)\jni.obj 
 
@@ -154,9 +153,6 @@ $(TMP_DIR)\misc.obj: misc.c
 $(TMP_DIR)\extio.obj: extio.c
 	$(CC) $(CFLAGS) /Fo$@ /c extio.c
 
-$(TMP_DIR)\rex.obj: rex.c
-	$(CC) $(CFLAGS) /Fo$@ /c rex.c
-
 $(TMP_DIR)\jni.obj: jni.c
 	$(CC) $(CFLAGS) $(JNI_INC) /Fo$@ /c jni.c
 
diff --git a/ase/awk/msw-dmc.mak b/ase/awk/msw-dmc.mak
index 5fbc641b..9d2f4a8c 100644
--- a/ase/awk/msw-dmc.mak
+++ b/ase/awk/msw-dmc.mak
@@ -32,8 +32,7 @@ OBJ_FILES_LIB = \
 	$(TMP_DIR)\val.obj \
 	$(TMP_DIR)\func.obj \
 	$(TMP_DIR)\misc.obj \
-	$(TMP_DIR)\extio.obj \
-	$(TMP_DIR)\rex.obj
+	$(TMP_DIR)\extio.obj
 
 OBJ_FILES_JNI = $(TMP_DIR)\jni.obj 
 
@@ -101,9 +100,6 @@ $(TMP_DIR)\misc.obj: misc.c
 $(TMP_DIR)\extio.obj: extio.c
 	$(CC) $(CFLAGS) -o$@ -c extio.c
 
-$(TMP_DIR)\rex.obj: rex.c
-	$(CC) $(CFLAGS) -o$@ -c rex.c
-
 $(TMP_DIR)\jni.obj: jni.c
 	$(CC) $(CFLAGS) $(JNI_INC) -o$@ -c jni.c
 
diff --git a/ase/cmn/descrip.mms b/ase/cmn/descrip.mms
index 09fd3271..3ffff5c9 100644
--- a/ase/cmn/descrip.mms
+++ b/ase/cmn/descrip.mms
@@ -2,7 +2,7 @@
 # OpenVMS MMS/MMK
 #
 
-objects = mem.obj,str.obj,misc.obj
+objects = mem.obj,str.obj,map.obj,rex.obj,misc.obj
 
 CFLAGS = /include="../.."
 #CFLAGS = /pointer_size=long /include="../.."
@@ -14,4 +14,6 @@ asecmn.olb : $(objects)
 
 mem.obj depends_on mem.c
 str.obj depends_on str.c
+map.obj depends_on map.c
+rex.obj depends_on rex.c
 misc.obj depends_on misc.c
diff --git a/ase/cmn/msw-bcc.mak b/ase/cmn/msw-bcc.mak
index 20f4fb10..9843a758 100644
--- a/ase/cmn/msw-bcc.mak
+++ b/ase/cmn/msw-bcc.mak
@@ -26,6 +26,8 @@ TMP_DIR = $(MODE)
 OBJ_FILES_LIB = \
 	$(TMP_DIR)\mem.obj \
 	$(TMP_DIR)\str.obj \
+	$(TMP_DIR)\map.obj \
+	$(TMP_DIR)\rex.obj \
 	$(TMP_DIR)\misc.obj 
 
 all: lib
@@ -44,6 +46,12 @@ $(TMP_DIR)\mem.obj: mem.c
 $(TMP_DIR)\str.obj: str.c
 	$(CC) $(CFLAGS) -o$@ -c str.c
 
+$(TMP_DIR)\map.obj: map.c
+	$(CC) $(CFLAGS) -o$@ -c map.c
+
+$(TMP_DIR)\rex.obj: rex.c
+	$(CC) $(CFLAGS) -o$@ -c rex.c
+
 $(TMP_DIR)\misc.obj: misc.c
 	$(CC) $(CFLAGS) -o$@ -c misc.c
 
diff --git a/ase/cmn/msw-cl.mak b/ase/cmn/msw-cl.mak
index 1aee6a7c..7a185648 100644
--- a/ase/cmn/msw-cl.mak
+++ b/ase/cmn/msw-cl.mak
@@ -24,6 +24,7 @@ OBJ_FILES_LIB = \
 	$(TMP_DIR)\mem.obj \
 	$(TMP_DIR)\str.obj \
 	$(TMP_DIR)\map.obj \
+	$(TMP_DIR)\rex.obj \
 	$(TMP_DIR)\misc.obj
 
 all: lib
@@ -44,6 +45,9 @@ $(TMP_DIR)\str.obj: str.c
 $(TMP_DIR)\map.obj: map.c
 	$(CC) $(CFLAGS) /Fo$@ /c map.c
 
+$(TMP_DIR)\rex.obj: rex.c
+	$(CC) $(CFLAGS) /Fo$@ /c rex.c
+
 $(TMP_DIR)\misc.obj: misc.c
 	$(CC) $(CFLAGS) /Fo$@ /c misc.c
 
diff --git a/ase/cmn/msw-dmc.mak b/ase/cmn/msw-dmc.mak
index 33b06e77..a210c269 100644
--- a/ase/cmn/msw-dmc.mak
+++ b/ase/cmn/msw-dmc.mak
@@ -19,6 +19,8 @@ TMP_DIR = $(MODE)
 OBJ_FILES_LIB = \
 	$(TMP_DIR)\mem.obj \
 	$(TMP_DIR)\str.obj \
+	$(TMP_DIR)\map.obj \
+	$(TMP_DIR)\rex.obj \
 	$(TMP_DIR)\misc.obj 
 
 all: $(OUT_FILE_LIB) 
@@ -32,6 +34,12 @@ $(TMP_DIR)\mem.obj: mem.c
 $(TMP_DIR)\str.obj: str.c
 	$(CC) $(CFLAGS) -o$@ -c str.c
 
+$(TMP_DIR)\map.obj: map.c
+	$(CC) $(CFLAGS) -o$@ -c map.c
+
+$(TMP_DIR)\rex.obj: rex.c
+	$(CC) $(CFLAGS) -o$@ -c rex.c
+
 $(TMP_DIR)\misc.obj: misc.c
 	$(CC) $(CFLAGS) -o$@ -c misc.c