diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f2807de144..91441c5dbe 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-08-28 20:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * source/rtl/gtchrmap.c
+   * source/rtl/hbgtcore.c
+   * source/vm/hvm.c
+     + Added three TOFIXes regarding namespace violations.
+       s_pszLinkedMain        -> hb_vm_pszLinkedMain
+       s_defaultGT            -> hb_gt_szNameDefault
+       s_szDefaultCharMapFile -> hb_gt_szCharMapFileDefault
+       TOFIX: These should be fixed in 1.1 (or maybe even in 
+              1.0.1 if this isn't such a big problem for 3rd 
+              parties).
+
 2008-08-28 18:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/gtwvg/wvgutils.c
      ! Fixed to use documented Harbour API hb_winmainArgGet() 
diff --git a/harbour/source/rtl/gtchrmap.c b/harbour/source/rtl/gtchrmap.c
index d20b008704..6675f6aca9 100644
--- a/harbour/source/rtl/gtchrmap.c
+++ b/harbour/source/rtl/gtchrmap.c
@@ -62,6 +62,10 @@
 #define MAX_CHAR_VAL    0xff
 #define HB_CHRMAP(a,c)  ( ( (a) << 16 ) | (c) )
 
+/* TOFIX: s_szDefaultCharMapFile is violating namespace, so it should be 
+          renamed to hb_gt_szCharMapFileDefault, or wrapped into an 
+          official API ASAP. [vszakats] */
+
 char * s_szDefaultCharMapFile = "/etc/harbour/hb-charmap.def";
 
 static void chrmap_init( int *piTransTbl )
diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c
index ba8cf2e921..c9746ac2dc 100644
--- a/harbour/source/rtl/hbgtcore.c
+++ b/harbour/source/rtl/hbgtcore.c
@@ -75,7 +75,7 @@ static HB_FHANDLE s_hStdOut = ( HB_FHANDLE ) 1;
 static HB_FHANDLE s_hStdErr = ( HB_FHANDLE ) 2;
 
 /* base GT strucure */
-static PHB_GT_BASE   s_curGT = NULL;
+static PHB_GT_BASE s_curGT = NULL;
 
 PHB_GT hb_gt_Base( void )
 {
@@ -3017,6 +3017,9 @@ static HB_GT_FUNCS s_gtCoreFunc =
 
 static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ];
 
+/* TOFIX: s_defaultGT is violating namespace, so it should be 
+          renamed to hb_gt_szNameDefault ASAP. [vszakats] */
+
 #if defined(HB_GT_DEFAULT)
    HB_EXPORT const char * s_defaultGT = HB_GT_DRVNAME( HB_GT_DEFAULT );
 #elif defined(HB_GT_LIB)
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 79352b5902..607a3ca99a 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -228,7 +228,10 @@ static BOOL hb_bTracePrgCalls = FALSE; /* prg tracing is off */
 #  define HB_TRACE_PRG( _TRMSG_ ) if( hb_bTracePrgCalls ) HB_TRACE( HB_TR_ALWAYS, _TRMSG_ )
 #endif
 
-HB_EXPORT const char * s_pszLinkedMain = NULL; /* name of starup function set by linker */
+/* TOFIX: s_pszLinkedMain is violating namespace, so it should be 
+          renamed to hb_vm_pszLinkedMain ASAP. [vszakats] */
+
+HB_EXPORT const char * s_pszLinkedMain = NULL; /* name of startup function set by linker */
 
 /* virtual machine state */