diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 9391b59e6c..b78e5c7862 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-28 00:57 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/gtwvw/gtwvwd.c
+  * extras/gtwvw/hbgtwvw.h
+    * do not use <tchar.h>
+
 2012-11-27 21:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/src/vm/cmdarg.c
     * eliminated unnecessary initialization
diff --git a/harbour/extras/gtwvw/gtwvwd.c b/harbour/extras/gtwvw/gtwvwd.c
index 61d6f8f68a..45148d8560 100644
--- a/harbour/extras/gtwvw/gtwvwd.c
+++ b/harbour/extras/gtwvw/gtwvwd.c
@@ -3648,7 +3648,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
             //long             lSBColorForeground, lSBColorBackground;
 
             size_t stLen;
-            const _TCHAR * pEnd;
+            const TCHAR * pEnd;
 
             pWindowData->bSBPaint = FALSE;
 
@@ -3666,7 +3666,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
                //lSBColorBackground = strtol( s_cSBColorBackground, NULL, 10 );
                SetBkColor( lpDIS->hDC, pWindowData->cSBColorBackground );  //lSBColorBackground );
 
-            for( pEnd = ptStr; *pEnd != _TEXT( '\0' ); pEnd++ )
+            for( pEnd = ptStr; *pEnd != TEXT( '\0' ); pEnd++ )
                continue;
 
             stLen = pEnd - ptStr;
diff --git a/harbour/extras/gtwvw/hbgtwvw.h b/harbour/extras/gtwvw/hbgtwvw.h
index 77090a06fc..832e4448f3 100644
--- a/harbour/extras/gtwvw/hbgtwvw.h
+++ b/harbour/extras/gtwvw/hbgtwvw.h
@@ -102,7 +102,6 @@
 #include "hbole.h"
 
 #include <windows.h>
-#include <tchar.h>
 #include <stdlib.h>
 #include <commctrl.h>