diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index acbd83d545..b62cabf56f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-16 03:40 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * source/vm/hvm.c
+   * source/vm/macro.c
+     + Added missing #include "hbpp.h" to resolve strict compiler warnings.
+
 2001-07-16 03:00 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * source/vm/hvm.c
      + Added call to hb_pp_Free() in hb_vmQuit() to release pp tables if loaded by macro evaluation.
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 9f382e147a..6e2fd253c5 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -87,6 +87,7 @@
 #include "hbvm.h"
 #include "hbpcode.h"
 #include "hbset.h"
+#include "hbpp.h"
 
 typedef struct _SYMBOLS
 {
diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c
index de70fe1fb7..c9a3b7ec9d 100644
--- a/harbour/source/vm/macro.c
+++ b/harbour/source/vm/macro.c
@@ -58,6 +58,7 @@
 #include "hbcomp.h"
 #include "hbstack.h"
 #include "hbmemvar.ch"   /* for values returned by hb_memvarScope() */
+#include "hbpp.h"
 
 /* TODO:
  * include this variable in SET subsystem ?
@@ -444,7 +445,7 @@ void hb_macroGetValue( HB_ITEM_PTR pItem )
       struMacro.status        = HB_MACRO_CONT;
       struMacro.iListElements = 0;
 
-      slen = HB_MIN( szString, HB_PP_STR_SIZE - 1 );
+      slen = HB_MIN( strlen( szString ), HB_PP_STR_SIZE - 1 );
       memcpy( pText, szString, slen );
       pText[ slen ] = 0;
       memset( pOut, 0, HB_PP_STR_SIZE );