diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0dd738f82a..dbb8b45167 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+19991002-03:20 EDT Paul Tucker <ptucker@sympatico.ca>
+  * buildvc.bat
+    makefile.vc
+    tests\working\buildvc.bat
+    * symbols.asm/obj is now a normal part of the make process and is added
+      to harbour.lib so additional references to this have been removed.
+
 19991001-17:10 GMT+2 Ryszard Glab <rglab@imid.med.pl>
 
     *source/vm/hvm.c
diff --git a/harbour/buildvc.bat b/harbour/buildvc.bat
index 8cb233370a..260269f937 100644
--- a/harbour/buildvc.bat
+++ b/harbour/buildvc.bat
@@ -4,6 +4,5 @@ rem $Id$
 rem 
 
 if exist buildvc.err del buildVC.err
-masm source\vm\symbols.asm obj\symbols.obj obj\symbols.lst obj\symbols.crf > BuildVC.err
-nmake /f makefile.vc %1 >> BuildVC.err
+nmake /f makefile.vc %1 > BuildVC.err
 notepad buildVC.err
\ No newline at end of file
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 7c5e0bcaf3..077a1bdc11 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -111,6 +111,7 @@ HARBOUR_LIB_OBJS = \
     $(OBJ_DIR)\setfunc.obj \
     $(OBJ_DIR)\setkey.obj \
     $(OBJ_DIR)\strings.obj \
+    $(OBJ_DIR)\symbols.obj \
     $(OBJ_DIR)\tbcolumn.obj \
     $(OBJ_DIR)\tbrowse.obj \
     $(OBJ_DIR)\tclass.obj \
@@ -213,7 +214,8 @@ DEBUG_LIB_OBJS = \
 # Our default target
 #
 
-all: $(HARBOUR_EXE) \
+all: $(OBJ_DIR)\symbols.obj \
+     $(HARBOUR_EXE) \
      $(HARBOUR_LIB) \
      $(TOOLS_LIB) \
      $(TERMINAL_LIB) \
@@ -224,6 +226,9 @@ all: $(HARBOUR_EXE) \
      $(RUNNER_LIB) \
      $(RUNNER_EXE)
 
+$(OBJ_DIR)\symbols.obj : $(VM_DIR)\symbols.asm
+    masm $** $@ obj\symbols.lst obj\symbols.crf
+
 $(HBPP_EXE) : \
     $(HBPP_DIR)\stdalone\hbpp.c
     @if exist obj\hbpp.obj del obj\hbpp.obj
@@ -235,7 +240,7 @@ $(RUNNER_EXE) : \
     $(RUNNER_DIR)\stdalone\runner.prg
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\external.prg 
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(RUNNER_DIR)\stdalone\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\runner.prg 
-    $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\stdalone\runner.c $(RUNNER_DIR)\stdalone\external.c -o $(BIN_DIR)\runner /link  $(OBJ_DIR)\symbols.obj $(LIBS)
+    $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\stdalone\runner.c $(RUNNER_DIR)\stdalone\external.c -o $(BIN_DIR)\runner /link  $(LIBS)
     -del external.obj
     -del runner.obj
 
@@ -252,7 +257,7 @@ $(HARBOUR_EXE) : \
     $(HBPP_DIR)\hbpp.c \
     $(HBPP_DIR)\hbppint.c \
     $(HBPP_DIR)\table.c
-    $(CC) $(CFLAGS) $(COMPILER_DIR)\harboury.c $(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.c $(COMPILER_DIR)\genobj32.c $(COMPILER_DIR)\genc.c $(COMPILER_DIR)\genhrb.c $(COMPILER_DIR)\genrc.c $(COMPILER_DIR)\genjava.c $(COMPILER_DIR)\genpas.c $(HBPP_DIR)\hbppint.c $(HBPP_DIR)\hbpp.c $(HBPP_DIR)\table.c -o $(BIN_DIR)\harbour /link $(OBJ_DIR)\symbols.obj 
+    $(CC) $(CFLAGS) $(COMPILER_DIR)\harboury.c $(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.c $(COMPILER_DIR)\genobj32.c $(COMPILER_DIR)\genc.c $(COMPILER_DIR)\genhrb.c $(COMPILER_DIR)\genrc.c $(COMPILER_DIR)\genjava.c $(COMPILER_DIR)\genpas.c $(HBPP_DIR)\hbppint.c $(HBPP_DIR)\hbpp.c $(HBPP_DIR)\table.c -o $(BIN_DIR)\harbour
     @Echo :	Ignore Lnk4033 warning
     -del harboury.obj
     -del harbourl.obj
diff --git a/harbour/tests/working/buildvc.bat b/harbour/tests/working/buildvc.bat
index 9a29eb69fe..c297a4d799 100644
--- a/harbour/tests/working/buildvc.bat
+++ b/harbour/tests/working/buildvc.bat
@@ -4,4 +4,4 @@ rem $Id$
 rem 
 
 ..\..\bin\harbour %1 /n /i..\..\include
-cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_GTAPI -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\obj\symbols.obj ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib ..\..\libs\vc\hbtools.lib ..\..\libs\vc\dbfntx.lib ..\..\libs\vc\debug.lib
+cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib ..\..\libs\vc\hbtools.lib ..\..\libs\vc\dbfntx.lib ..\..\libs\vc\debug.lib