diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 18493d0d05..8e388b3bce 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,7 +1,12 @@
-19990730-08:50 EDT Paul Tucker <ptucker@sympatico.ca>
+19990730-09:20 EDT Paul Tucker <ptucker@sympatico.ca>
    * makefile.vc
      + added sdf and delim support
      * changed natmsg\msgxxx to msgxxx
+   * source/hbpp/hbpplib.c
+     + added typecasts to 2 xgrab calls
+   * source/rdd/dbcmd.c
+     + added typecasts at line 337 but wrapped this one in an
+       #if defined(_MSC_VER)
 
 19990730-14:55 CET Victor Szel <info@szelvesz.hu>
    ! source/hbpp/preproc.c - defines _pFileName.
diff --git a/harbour/source/hbpp/hbpplib.c b/harbour/source/hbpp/hbpplib.c
index 59c0dbb0f7..bc974db888 100644
--- a/harbour/source/hbpp/hbpplib.c
+++ b/harbour/source/hbpp/hbpplib.c
@@ -59,8 +59,8 @@ HARBOUR HB_PREPROCESS(void)
 {
   if (ISCHAR(1))
   {
-    char *pText = hb_xgrab(STR_SIZE);
-    char *pOut = hb_xgrab(STR_SIZE);
+    char *pText = (char *)hb_xgrab(STR_SIZE);
+    char *pOut = (char *)hb_xgrab(STR_SIZE);
     char *ptr = pText;
 
     int resParse;
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index 7632ac9bc1..64b1a1ec4f 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -333,8 +333,12 @@ ERRCODE hb_rddInherit( PRDDFUNCS pTable, PRDDFUNCS pSubTable, PRDDFUNCS pSuperTa
       memcpy( pTable, &defTable, sizeof( RDDFUNCS ) );
    else
    {
+#if defined(_MSC_VER)
+      szDrvName = (PBYTE)hb_strUpper( (char *)szDrvName, strlen( (const char *)szDrvName ) );
+#else
       szDrvName = hb_strUpper( szDrvName, strlen( szDrvName ) );
-      if( !( pRddNode = hb_FindRddNode( szDrvName ) ) )
+#endif
+      if( !( pRddNode = hb_FindRddNode( (char *)szDrvName ) ) )
 	 return FAILURE;
       memcpy( pTable, &pRddNode->pTable, sizeof( RDDFUNCS ) );
    }