diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3fd1fa311..ce972389df 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+19991104-14:30 EDT David G. Holm <dholm@jsd-llc.com>
+
+   * source/pp/stdalone/hbpp.c
+     ! Added third parameter (char *) to Hp_Parse() so that the
+       Microsoft VC++ and IBM Visual Age C++ versions won't try
+       to link in the hbppint module from the pp library.
+
+   * source/rtl/mouse/mouseos2.c
+     ! Changed the type of the static mouse handle variable from
+       int to HMOU (for IBM Visual Age C++, but also works with GCC).
+
 Thu Nov 04 14:32:06 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
 	* source/common/hbtrace.c: 
diff --git a/harbour/source/pp/stdalone/hbpp.c b/harbour/source/pp/stdalone/hbpp.c
index 4d53eb6046..c57c8eb00f 100644
--- a/harbour/source/pp/stdalone/hbpp.c
+++ b/harbour/source/pp/stdalone/hbpp.c
@@ -62,7 +62,7 @@
 extern int pp_strAt( char *, int, char *, int );
 extern void pp_Stuff( char *, char *, int, int, int );
 
-int Hp_Parse( FILE *, FILE * );
+int Hp_Parse( FILE *, FILE *, char * );
 void OutTable( DEFINES *, COMMANDS * );
 void AddSearchPath( char *, PATHNAMES * * ); /* add pathname to a search list */
 
@@ -206,7 +206,7 @@ int main( int argc, char * argv[] )
 
   aCondCompile = ( int * ) hb_xgrab( sizeof( int ) * 5 );
 
-  Hp_Parse( handl_i, handl_o );
+  Hp_Parse( handl_i, handl_o, NULL );
   fclose( handl_i );
   fclose( handl_o );
 
@@ -220,7 +220,7 @@ int main( int argc, char * argv[] )
   return 0;
 }
 
-int Hp_Parse( FILE * handl_i, FILE * handl_o )
+int Hp_Parse( FILE * handl_i, FILE * handl_o, char * szSource )
 {
   char sBuffer[ BUFF_SIZE ];           /* File read buffer */
   char * ptr;
diff --git a/harbour/source/rtl/mouse/mouseos2.c b/harbour/source/rtl/mouse/mouseos2.c
index e2dff88cf6..2ff0096a93 100644
--- a/harbour/source/rtl/mouse/mouseos2.c
+++ b/harbour/source/rtl/mouse/mouseos2.c
@@ -51,7 +51,7 @@
 #include <os2.h>
 #include "mouseapi.h"
 
-static unsigned s_uMouHandle;                   /* mouse logical handle */
+static HMOU s_uMouHandle;                   /* mouse logical handle */
 
 void hb_mouse_Init()
 {