diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 13d234c41e..61266f4f35 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+19990820-11:50 EDT Paul Tucker <ptucker@sympatico.ca>
+   * source/rtl/dir.c
+     * corrected case of iDirnameLen
+   * source/rtl/transfrm.c
+     * added casts as required
+   * makefile.vc
+     - remove HARBOUR_USE_GTAPI
+
 19990820-15:05 GMT+2 Ryszard Glab <rglab@imid.med.pl>
 
     *source/rtl/strings.c
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 56310eec65..1d91993d78 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -31,7 +31,7 @@ OBJ_DIR=obj
 #
 
 CC=cl
-CFLAGS=-w -I$(INCLUDE_DIR) -DHARBOUR_USE_GTAPI -DHARBOUR_USE_WIN_GTAPI
+CFLAGS=-w -I$(INCLUDE_DIR) -DHARBOUR_USE_WIN_GTAPI
 CLIBFLAGS=$(CFLAGS) -c /TP
 CLIBFLAGSDEBUG=$(CFLAGS) -c -Zi /TP
 
diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c
index aed9815e61..2fcd1b563b 100644
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -179,7 +179,7 @@ HARBOUR HB_DIRECTORY( void )
    long   fsize;
    time_t ftime;
    char * pos;
-   int    iDirnamelen;
+   int    iDirnameLen;
 
    PHB_ITEM  pdir;
    PHB_ITEM  psubarray;
@@ -216,7 +216,7 @@ HARBOUR HB_DIRECTORY( void )
    {
       strcpy(dirname,".X");
       dirname[1] = OS_PATH_DELIMITER;
-      iDirnamelen =2;
+      iDirnameLen =2;
    }
 
    if (strlen(pattern) > 0)
diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c
index 89e445e8ca..2f256f31b4 100644
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -392,7 +392,7 @@ HARBOUR HB_TRANSFORM( void )
 
       if( *szPic == '@' )                       /* Function marker found    */
       {
-         wPicFlags = PictFunc( &szPic, &lPic ); /* Get length of function   */
+         wPicFlags = PictFunc( &szPic, (ULONG*)&lPic ); /* Get length of function   */
          lPicStart = pPic->item.asString.length - lPic;
                                                 /* Get start of template    */
       }
@@ -528,7 +528,7 @@ HARBOUR HB_TRANSFORM( void )
          case IT_INTEGER:
          {
             szResult = NumPicture( szPic + lPicStart, lPic, wPicFlags,
-                    (double) pExp->item.asInteger.value, &lResultPos,
+                    (double) pExp->item.asInteger.value, (ULONG*)&lResultPos,
                      pExp->item.asInteger.length, 0 );
             hb_retclen( szResult, lResultPos );
             hb_xfree( szResult );
@@ -537,7 +537,7 @@ HARBOUR HB_TRANSFORM( void )
          case IT_LONG:
          {
             szResult = NumPicture( szPic + lPicStart, lPic, wPicFlags,
-                    (double) pExp->item.asLong.value, &lResultPos,
+                    (double) pExp->item.asLong.value, (ULONG *)&lResultPos,
                      pExp->item.asLong.length, 0 );
             hb_retclen( szResult, lResultPos );
             hb_xfree( szResult );
@@ -546,7 +546,7 @@ HARBOUR HB_TRANSFORM( void )
          case IT_DOUBLE:
          {
             szResult = NumPicture( szPic + lPicStart, lPic, wPicFlags,
-                    (double) pExp->item.asDouble.value, &lResultPos,
+                    (double) pExp->item.asDouble.value, (ULONG *)&lResultPos,
                      pExp->item.asDouble.length, pExp->item.asDouble.decimal );
             hb_retclen( szResult, lResultPos);
             hb_xfree( szResult );