diff --git a/bld/as/c/asmsg.c b/bld/as/c/asmsg.c
index 15efed3cd5..eaed0c4893 100644
--- a/bld/as/c/asmsg.c
+++ b/bld/as/c/asmsg.c
@@ -44,7 +44,7 @@
 
 #else
 
-#define TXT_MSG_LANG_SPACING    (ABS_REF_NOT_ALLOWED - AS_MSG_BASE + 1)
+#define TXT_MSG_LANG_SPACING    (ABS_REF_NOT_ALLOWED - MSG_AS_BASE + 1)
 
 // No res file to use. Just compile in the messages...
 static char *asMessages[] = {
@@ -91,7 +91,7 @@ bool AsMsgInit( void )
     msgShift = _WResLanguage() * TXT_MSG_LANG_SPACING;
     if( msgShift >= TXT_MSG_SIZE )
         msgShift = 0;
-    msgShift -= AS_MSG_BASE;
+    msgShift -= MSG_AS_BASE;
     return( true );
 #endif
 }
diff --git a/bld/as/h/msg.rh b/bld/as/h/msg.rh
index bc4c355a1b..6b33c497b2 100644
--- a/bld/as/h/msg.rh
+++ b/bld/as/h/msg.rh
@@ -33,7 +33,7 @@
 
 #define MSG_LANG_SPACING    13000
 
-#define AS_MSG_BASE         1
+#define MSG_AS_BASE         1
 
 #if defined( _STANDALONE_ )
 #include "msg.gh"
diff --git a/bld/as/master.mif b/bld/as/master.mif
index d5f026d443..664b593655 100644
--- a/bld/as/master.mif
+++ b/bld/as/master.mif
@@ -19,9 +19,7 @@ additional_clean = *.c *.h *.re *.y
 
 !include $(owl_dir)/client.mif
 !include $(cpp_dir)/client.mif
-!ifdef test_inline_as
 !include $(as_dir)/client.mif
-!endif
 
 # yacc macros
 #########################
@@ -195,13 +193,13 @@ msg.gh : $(as_dir)/h/as.msg $(__MAKEFILES__)
     @%make echo_cpp
     $(cpp) $(rc_ui_flags) $(cppflags) -D_STANDALONE_ -omsg.tmp $[@
     @%make echo_awk
-    $(awk) -v base=AS_MSG_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. msg.tmp
+    $(awk) -v base=MSG_AS_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. msg.tmp
 
 asi_msg.gh : $(as_dir)/h/as.msg $(__MAKEFILES__)
     @%make echo_cpp
     $(cpp) $(rc_ui_flags) $(cppflags) -oasi_msg.tmp $[@
     @%make echo_awk
-    $(awk) -v base=AS_MSG_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. asi_msg.tmp
+    $(awk) -v base=MSG_AS_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. asi_msg.tmp
 
 wsplice_opts_axp = -kAS_ALPHA
 wsplice_opts_mps = -kAS_MIPS