diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f4e6b4dc6d..17bc99008a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+   * source/vm/extend.c
+     * char * HB_EXPORT => char HB_EXPORT *
+   * source/vm/maindll.c
+     * BOOL WINAPI HB_EXPORT => BOOL HB_EXPORT WINAPI
+     * LONG PASCAL HB_EXPORT => LONG HB_EXPORT PASCAL
    * source/vm/maindllh.c
      * BOOL WINAPI HB_EXPORT => BOOL HB_EXPORT WINAPI
    * source/vm/maindllp.c
diff --git a/harbour/hrbdll.bc b/harbour/hrbdll.bc
index c22361aad8..440ffa87c3 100644
--- a/harbour/hrbdll.bc
+++ b/harbour/hrbdll.bc
@@ -364,7 +364,7 @@ HARBOUR_DLL_OBJS = \
   $(OBJ_DIR)\dbgtobj.obj \
   $(OBJ_DIR)\tbrwtext.obj \
   $(OBJ_DIR)\dbgwa.obj \
-  $(OBJ_DIR)\maindll.obj \
+  $(OBJ_DIR)\maindllh.obj \
   $(OBJ_DIR)\hvm.obj \
   \
   $(LIBMISC_OBJ)\hb_f.obj \
@@ -873,7 +873,7 @@ $(HARBOUR_DLL)  : \
   echo. $(OBJ_DIR)\dbgtobj.obj           + >> hdll.tmp
   echo. $(OBJ_DIR)\tbrwtext.obj          + >> hdll.tmp
   echo. $(OBJ_DIR)\dbgwa.obj             + >> hdll.tmp
-  echo. $(OBJ_DIR)\maindll.obj           + >> hdll.tmp
+  echo. $(OBJ_DIR)\maindllh.obj          + >> hdll.tmp
   echo. $(OBJ_DIR)\hvm.obj               + >> hdll.tmp
 
   echo. $(LIBMISC_OBJ)\hb_f.obj          + >> hdll.tmp
@@ -1281,9 +1281,6 @@ $(OBJ_DIR)\itemapi.obj : $(VM_DIR)\itemapi.c
 $(OBJ_DIR)\macro.obj : $(VM_DIR)\macro.c
    $(CC) $(CLIBFLAGS) -o$@ $**
 
-$(OBJ_DIR)\maindll.obj : $(VM_DIR)\maindll.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-
 $(OBJ_DIR)\maindllh.obj : $(VM_DIR)\maindllh.c
    $(CC) $(CLIBFLAGS) -o$@ $**
 
diff --git a/harbour/hrbdll.vc b/harbour/hrbdll.vc
index fdd868e03d..28e4a4a7dc 100644
--- a/harbour/hrbdll.vc
+++ b/harbour/hrbdll.vc
@@ -359,7 +359,7 @@ HARBOUR_DLL_OBJS = \
   $(OBJ_DIR)\dbgtobj.obj \
   $(OBJ_DIR)\tbrwtext.obj \
   $(OBJ_DIR)\dbgwa.obj \
-  $(OBJ_DIR)\maindll.obj \
+  $(OBJ_DIR)\maindllh.obj \
   $(OBJ_DIR)\hvm.obj \
   \
   $(LIBMISC_OBJ)\hb_f.obj \
@@ -782,9 +782,6 @@ $(OBJ_DIR)\itemapi.obj : $(VM_DIR)\itemapi.c
 $(OBJ_DIR)\macro.obj : $(VM_DIR)\macro.c
    $(CC) $(CLIBFLAGS) /Fo$@ $**
 
-$(OBJ_DIR)\maindll.obj : $(VM_DIR)\maindll.c
-   $(CC) $(CLIBFLAGS) /Fo$@ $**
-
 $(OBJ_DIR)\maindllh.obj : $(VM_DIR)\maindllh.c
    $(CC) $(CLIBFLAGS) /Fo$@ $**