diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4966d70713..fc16d44025 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-07 16:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/gtwvt/gtwvt.c
+  * contrib/gtwvg/gtwvg.c
+  * contrib/hbmisc/hb_f.c
+  * contrib/hbwin/win_dll.c
+    * SHORT type cleanup. Converted to HB_WCHAR, nothing, USHORT, WORD
+      depending on context.
+
 2010-02-07 16:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/cdpapi.c
     ! Fixed type when manually correcting 'unsigned char' to UCHAR
diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c
index 1d3f1e9141..6199c6ab97 100644
--- a/harbour/contrib/gtwvg/gtwvg.c
+++ b/harbour/contrib/gtwvg/gtwvg.c
@@ -1571,7 +1571,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam,
                      if( pWVT->inCDP )
                      {
 #if defined( UNICODE )
-                        c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( USHORT ) c );
+                        c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( HB_WCHAR ) c );
 #else
                         if( c > 0 && c <= 255 && pWVT->keyTransTbl[ c ] )
                            c = pWVT->keyTransTbl[ c ];
@@ -3969,9 +3969,9 @@ static void hb_gt_wvt_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize )
       {
          RECT rect;
 
-         rect.top = rect.bottom = ( SHORT ) iRow;
-         rect.left = ( SHORT ) iCol;
-         rect.right = ( SHORT ) ( iCol + iSize - 1 );
+         rect.top = rect.bottom = iRow;
+         rect.left = iCol;
+         rect.right = iCol + iSize - 1;
 
          rect = hb_gt_wvt_GetXYFromColRowRect( pWVT, rect );
 
diff --git a/harbour/contrib/hbmisc/hb_f.c b/harbour/contrib/hbmisc/hb_f.c
index f896b95341..e9f9c95788 100644
--- a/harbour/contrib/hbmisc/hb_f.c
+++ b/harbour/contrib/hbmisc/hb_f.c
@@ -81,7 +81,7 @@ HB_FUNC( HB_FUSE )
      else
          open_flags = 0;
 
-      handles[area]  = hb_fsOpen( hb_parc( 1 ), ( SHORT ) open_flags );
+      handles[area]  = hb_fsOpen( hb_parc( 1 ), ( USHORT ) open_flags );
       offset[area]   = 0;
       recno[area]    = 1;
       b              = ( char * ) hb_xgrab( b_size );
diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c
index ed7c1912ba..95d13af6a4 100644
--- a/harbour/contrib/hbwin/win_dll.c
+++ b/harbour/contrib/hbwin/win_dll.c
@@ -150,7 +150,7 @@ typedef struct
    union
    {
       BYTE     bArg;             /* 1-byte argument */
-      SHORT    usArg;            /* 2-byte argument */
+      WORD     usArg;            /* 2-byte argument */
       DWORD    dwArg;            /* 4-byte argument */
       double   dArg;             /* double argument */
    } numargs;
diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c
index 5e3dd4410a..15bb256258 100644
--- a/harbour/src/rtl/gtwvt/gtwvt.c
+++ b/harbour/src/rtl/gtwvt/gtwvt.c
@@ -1374,7 +1374,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam,
                      if( pWVT->inCDP )
                      {
 #if defined( UNICODE )
-                        c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( USHORT ) c );
+                        c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( HB_WCHAR ) c );
 #else
                         if( c > 0 && c <= 255 && pWVT->keyTransTbl[ c ] )
                            c = pWVT->keyTransTbl[ c ];