diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b0fa682207..8ca74b2044 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-20 12:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/hbverdsp.c
+  * include/hbsetup.ch
+  * contrib/xhb/xhbver.prg
+    - Deleted HB_COMPAT_VO, HB_COMPAT_DBASE, HB_COMPAT_CLIP as build-time
+      options. They were not used, and in the future these should be
+      implemented as addon libraries.
+
+  * INSTALL
+    * Minor terminogology adjustment.
+
+  * examples/hbdoc2/tmplates.prg
+  * examples/hbdoc2/hbdoc2.prg
+    - Deleted special handling of FlagShip functions.
+
 2010-02-20 11:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbextern.ch
   * src/rtl/browdb.prg
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 084f1b9add..cdf84cf7d6 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -699,8 +699,8 @@ HARBOUR
          HB_TR_OUTPUT=<filename> (to override default stderr output)
          HB_TR_WINOUT=yes (to enable additional OutputDebugString() output on Windows systems only)
 
-   Memory statistics
-   -----------------
+   Memory statistics/tracking
+   --------------------------
       Build Harbour with:
          HB_USER_CFLAGS=-DHB_FM_STATISTICS
 
diff --git a/harbour/contrib/xhb/xhbver.prg b/harbour/contrib/xhb/xhbver.prg
index 26b117dcd3..1301b4f18e 100644
--- a/harbour/contrib/xhb/xhbver.prg
+++ b/harbour/contrib/xhb/xhbver.prg
@@ -90,11 +90,7 @@ FUNCTION hb_buildinfo( n )
    v[ _HB_COMPAT_C53             ] := .F.
 #endif
    v[ _HB_COMPAT_XPP             ] := .T. /* Converted to library in Harbour. */
-#ifdef HB_COMPAT_VO
-   v[ _HB_COMPAT_VO              ] := .T.
-#else
-   v[ _HB_COMPAT_VO              ] := .F.
-#endif
+   v[ _HB_COMPAT_VO              ] := .T. /* Converted to library in Harbour. */
 #ifdef HB_COMPAT_FLAGSHIP
    v[ _HB_COMPAT_FLAGSHIP        ] := .T.
 #else
@@ -105,11 +101,7 @@ FUNCTION hb_buildinfo( n )
 #else
    v[ _HB_COMPAT_FOXPRO          ] := .F.
 #endif
-#ifdef HB_COMPAT_DBASE
-   v[ _HB_COMPAT_DBASE           ] := .T.
-#else
-   v[ _HB_COMPAT_DBASE           ] := .F.
-#endif
+   v[ _HB_COMPAT_DBASE           ] := .T. /* Converted to library in Harbour. */
    v[ _HB_HARBOUR_OBJ_GENERATION ] := .F. /* Always off in Harbour */
    v[ _HB_HARBOUR_STRICT_ANSI_C  ] := .F. /* Fake value, unlikely it's turned on */
    v[ _HB_CPLUSPLUS              ] := hb_Version( HB_VERSION_COMPILER_CPP )
diff --git a/harbour/examples/hbdoc2/hbdoc2.prg b/harbour/examples/hbdoc2/hbdoc2.prg
index 40d0c7fc17..34210cf91d 100644
--- a/harbour/examples/hbdoc2/hbdoc2.prg
+++ b/harbour/examples/hbdoc2/hbdoc2.prg
@@ -909,7 +909,6 @@ FUNCTION Decode( cType, hsBlock, cKey )
       CASE cCode == "C52U" ;     RETURN "This is an undocumented CA-Cl*pper v5.2 function and is only visible if source was compiled with the HB_CLP_UNDOC flag"
       CASE cCode == "C52S" ;     RETURN "? verbage: This is an CA-Cl*pper v5.2 compliant and is only visible if source was compiled with the HB_CLP_STRICT flag"
       CASE cCode == "C53" ;      RETURN "This is CA-Cl*pper v5.3 compliant and is only visible if source was compiled with the HB_COMPAT_C53 flag"
-      CASE cCode == "FS" ;       RETURN "This a Flagship compatibility function and is only visible if source was compiled with the HB_COMPAT_FLAGSHIP flag"
       CASE cCode == "H" ;        RETURN "This is Harbour specific"
       CASE cCode == "NA" ;       RETURN "Not applicable"
       OTHERWISE ;                RETURN "Unknown 'COMPLIANCE' code: '" + cCode + "'"
diff --git a/harbour/examples/hbdoc2/tmplates.prg b/harbour/examples/hbdoc2/tmplates.prg
index 3d44c63fef..3c74a1bec2 100644
--- a/harbour/examples/hbdoc2/tmplates.prg
+++ b/harbour/examples/hbdoc2/tmplates.prg
@@ -323,7 +323,6 @@ INIT PROCEDURE Templates()
       { "C52S",     "? verbage: This is an CA-Cl*pper v5.2 compliant and is only visible if source was compiled with the HB_C52_STRICT flag" }, ;
       { "C52U",     "This is an undocumented CA-Cl*pper v5.2 function and is only visible if source was compiled with the HB_C52_UNDOC flag" }, ;
       { "C53",      "This is CA-Cl*pper v5.3 compliant and is only visible if source was compiled with the HB_COMPAT_C53 flag" }, ;
-      { "FS",       "This a Flagship compatibility function and is only visible if source was compiled with the HB_COMPAT_FLAGSHIP flag" }, ;
       { "H",        "This is Harbour specific" }, ;
       { "NA",       "Not applicable" } ;
    }
diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch
index d6a4b2c48a..8e805d610d 100644
--- a/harbour/include/hbsetup.ch
+++ b/harbour/include/hbsetup.ch
@@ -63,10 +63,7 @@
 #define HB_CLP_UNDOC              /* Enable Cl*pper 5.2e/5.3x undocumented features */
 #define HB_COMPAT_C53             /* Enable Cl*pper 5.3x extensions */
 #define HB_COMPAT_FLAGSHIP        /* Enable Flagship extensions */
-/* #define HB_COMPAT_VO */        /* Enable VO extensions */
 /* #define HB_COMPAT_FOXPRO */    /* Enable FoxPro extensions */
-/* #define HB_COMPAT_DBASE */     /* Enable dBase extensions */
-/* #define HB_COMPAT_CLIP */      /* Enable CLIP extensions */
 
 /* ***********************************************************************
  * Leave this #define if you want to allow usage of legacy Harbour 2.0.0/Clipper
diff --git a/harbour/src/common/hbverdsp.c b/harbour/src/common/hbverdsp.c
index 13c488f115..805f56e37a 100644
--- a/harbour/src/common/hbverdsp.c
+++ b/harbour/src/common/hbverdsp.c
@@ -166,17 +166,8 @@ void hb_verBuildInfo( void )
 #if defined( HB_COMPAT_FLAGSHIP )
    hb_conOutErr( "(Flagship) ", 0 );
 #endif
-#if defined( HB_COMPAT_VO )
-   hb_conOutErr( "(VO) ", 0 );
-#endif
 #if defined( HB_COMPAT_FOXPRO )
    hb_conOutErr( "(FoxPro) ", 0 );
-#endif
-#if defined( HB_COMPAT_DBASE )
-   hb_conOutErr( "(dBase) ", 0 );
-#endif
-#if defined( HB_COMPAT_CLIP )
-   hb_conOutErr( "(CLIP) ", 0 );
 #endif
    hb_conOutErr( hb_conNewLine(), 0 );