diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 001d1f19b7..c7062d9cda 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+      be done in core PP code and include/hbexpr*.c files to not reduce
+      the speed. Now using HB_PP_MACROLEX for sure will have to cause
+      speed reduction in macro compiler. But if we make necessary
+      modifications then we should keep at least the same speed or
       probably reach noticeable better results.
 
 2006-11-14 16:35 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
diff --git a/harbour/common.mak b/harbour/common.mak
index e7acc481e3..e48f01c972 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -276,7 +276,8 @@ VM_COMMON_LIB_OBJS = \
 
 # Specific VM Objects for building STATIC library
 VM_STATIC_LIB_OBJS = \
-    $(OBJ_DIR)\main.obj
+    $(OBJ_DIR)\mainstd.obj  \
+    $(OBJ_DIR)\mainwin.obj
 
 # Specific VM Objects for building SHARED (DLL) library
 VM_SHARED_LIB_OBJS = \