diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6005757bcb..e5d9cb797a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,28 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-04-01 21:10 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/common/hbverdsp.c
+    * do not show '(WINANSI)' in the list of version flags.
+
+  * utils/hbmk2/hbmk2.prg
+    + add -inc to xbuild and xmate converted projects, this being 
+      the default mode of operation (AFAI guess) of these tools.
+
+  * contrib/hbct/disk.c
+  * contrib/hbnf/kspeed.c
+  * contrib/hbnf/peek.c
+  * contrib/hbnf/proper.c
+  * contrib/hbnf/ftidle.c
+  * contrib/hbnf/mouse.c
+  * contrib/hbnf/stod.c
+  * contrib/hbnf/getvid.c
+  * contrib/hbnf/getver.c
+  * contrib/hbnf/getenvrn.c
+  * contrib/hbnf/mkdir.c
+  * contrib/hbnf/rmdir.c
+    ! formatting
+
 2012-04-01 17:07 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/win/mingw.mk
     * removed undocumented way (committed in prev rev) to disable 
diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c
index a019c19c98..686467156d 100644
--- a/harbour/contrib/hbct/disk.c
+++ b/harbour/contrib/hbct/disk.c
@@ -71,10 +71,10 @@
 #include "hbwinuni.h"
 
 #if defined( HB_OS_DOS )
-#   include <dos.h>
+#  include <dos.h>
 #endif
 #if defined( HB_OS_WIN )
-   #include <windows.h>
+#  include <windows.h>
 #endif
 
 HB_FUNC( DIRMAKE )
diff --git a/harbour/contrib/hbnf/ftidle.c b/harbour/contrib/hbnf/ftidle.c
index 6ca68c5b4d..dcaef4e7f2 100644
--- a/harbour/contrib/hbnf/ftidle.c
+++ b/harbour/contrib/hbnf/ftidle.c
@@ -21,7 +21,7 @@
 #include "hbdefs.h"
 #include "hbapi.h"
 
-HB_FUNC(FT_Idle)
+HB_FUNC( FT_IDLE )
 {
    hb_idleState();
 }
diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c
index 42a338321b..37f1f0f60a 100644
--- a/harbour/contrib/hbnf/getenvrn.c
+++ b/harbour/contrib/hbnf/getenvrn.c
@@ -30,18 +30,18 @@
 #include "hbapi.h"
 
 #if defined( HB_OS_UNIX )
-#   include <unistd.h>
-#   if defined( HB_OS_DARWIN )
-#      include <crt_externs.h>
-#      define environ (*_NSGetEnviron())
-#   elif !defined( __WATCOMC__ )
+#  include <unistd.h>
+#  if defined( HB_OS_DARWIN )
+#     include <crt_externs.h>
+#     define environ (*_NSGetEnviron())
+#  elif !defined( __WATCOMC__ )
 extern char **environ;
-#   endif
+#  endif
 #elif defined( HB_OS_DOS )
-#   define environ _environ
+#  define environ _environ
 extern char **_environ;
 #elif defined( HB_OS_WIN )
-#   include <windows.h>
+#  include <windows.h>
 #endif
 
 #define NORETURN   0
diff --git a/harbour/contrib/hbnf/getver.c b/harbour/contrib/hbnf/getver.c
index 2dc7d4beeb..25f95d063e 100644
--- a/harbour/contrib/hbnf/getver.c
+++ b/harbour/contrib/hbnf/getver.c
@@ -54,7 +54,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 #if defined( HB_OS_DOS )
-#include "dos.h"
+#  include "dos.h"
 #endif
 #include "string.h"
 #include "stdlib.h"
diff --git a/harbour/contrib/hbnf/getvid.c b/harbour/contrib/hbnf/getvid.c
index fd0926ee3b..f974194cf7 100644
--- a/harbour/contrib/hbnf/getvid.c
+++ b/harbour/contrib/hbnf/getvid.c
@@ -53,7 +53,7 @@
 
 #include "hbapi.h"
 #if defined( HB_OS_DOS )
-#include "dos.h"
+#  include "dos.h"
 #endif
 
 HB_FUNC( _FT_GETVPG )
diff --git a/harbour/contrib/hbnf/kspeed.c b/harbour/contrib/hbnf/kspeed.c
index 66afe1828e..15d2951463 100644
--- a/harbour/contrib/hbnf/kspeed.c
+++ b/harbour/contrib/hbnf/kspeed.c
@@ -81,7 +81,7 @@ _NanFor    ENDS
 
 #include "hbapi.h"
 #if defined( HB_OS_DOS )
-#include "dos.h"
+#  include "dos.h"
 #endif
 
 HB_FUNC( FT_SETRATE )
diff --git a/harbour/contrib/hbnf/mkdir.c b/harbour/contrib/hbnf/mkdir.c
index 77ea375519..6dc321dca2 100644
--- a/harbour/contrib/hbnf/mkdir.c
+++ b/harbour/contrib/hbnf/mkdir.c
@@ -52,7 +52,7 @@ End
 #include "hbapi.h"
 #include "hbapifs.h"
 
-HB_FUNC(FT_MKDIR)
+HB_FUNC( FT_MKDIR )
 {
-   hb_retl( HB_ISCHAR( 1 ) && hb_fsMkDir( hb_parc(1) ) );
+   hb_retl( HB_ISCHAR( 1 ) && hb_fsMkDir( hb_parc( 1 ) ) );
 }
diff --git a/harbour/contrib/hbnf/mouse.c b/harbour/contrib/hbnf/mouse.c
index 7c696cd211..a53cc34fb7 100644
--- a/harbour/contrib/hbnf/mouse.c
+++ b/harbour/contrib/hbnf/mouse.c
@@ -53,7 +53,7 @@
 
 #include "hbapi.h"
 #if defined( HB_OS_DOS )
-#include "dos.h"
+#  include "dos.h"
 #endif
 #include "hbapiitm.h"
 #include "hbapigt.h"
diff --git a/harbour/contrib/hbnf/peek.c b/harbour/contrib/hbnf/peek.c
index 4ceddd98fe..fd70e132cb 100644
--- a/harbour/contrib/hbnf/peek.c
+++ b/harbour/contrib/hbnf/peek.c
@@ -35,7 +35,7 @@
 #define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
 #define FP_OFF( fp ) ( *( ( unsigned int * ) &( fp ) ) )
 
-HB_FUNC(FT_PEEK)
+HB_FUNC( FT_PEEK )
 {
    auto unsigned int ProtMode = cpmiIsProtected();
    auto unsigned char * bytePtr;
diff --git a/harbour/contrib/hbnf/proper.c b/harbour/contrib/hbnf/proper.c
index 3210b6b736..48c2c7a0a2 100644
--- a/harbour/contrib/hbnf/proper.c
+++ b/harbour/contrib/hbnf/proper.c
@@ -36,69 +36,69 @@
 
 static char _ftToLower( char c )
 {
-  return c >= 'A' && c <= 'Z' ? c - 'A' + 'a' : c;
+   return c >= 'A' && c <= 'Z' ? c - 'A' + 'a' : c;
 }
 
 static char _ftToUpper( char c )
 {
-  return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
+   return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
 }
 
 static HB_BOOL _ftIsUpper( char c )
 {
-  return c >= 'A' && c <= 'Z';
+   return c >= 'A' && c <= 'Z';
 }
 
 static HB_BOOL _ftIsLower( char c )
 {
-  return c >= 'a' && c <= 'z';
+   return c >= 'a' && c <= 'z';
 }
 
 static HB_BOOL _ftIsAlpha( char c )
 {
-  return _ftIsUpper(c) || _ftIsLower(c);
+   return _ftIsUpper( c ) || _ftIsLower( c );
 }
 
 HB_FUNC( FT_PROPER )
 {
-  HB_ISIZ iLen = hb_parclen(1);
-  const char *cStr;
-  char *cDst = NULL;
-  HB_ISIZ i; /*, iPos = 0; */
-  HB_BOOL fCap = HB_TRUE;
+   HB_ISIZ iLen = hb_parclen(1);
+   const char *cStr;
+   char *cDst = NULL;
+   HB_ISIZ i; /*, iPos = 0; */
+   HB_BOOL fCap = HB_TRUE;
 
-  hb_storc( NULL, 1 );
-  cStr = hb_parc(1);
+   hb_storc( NULL, 1 );
+   cStr = hb_parc(1);
 
-  for( i = 0; i < iLen; i++ ) {
-     if( _ftIsAlpha( cStr[i] ) )  {
-        if( !cDst ) {
-            cDst = (char *) hb_xgrab(iLen + 1);
-            memcpy(cDst, cStr, iLen + 1);
-        }
-        if( fCap )
-           cDst[i] = _ftToUpper( cDst[i] );
-        else
-           cDst[i] = _ftToLower( cDst[i] );
-        }
-     fCap = ( cStr[i] == ' ' || cStr[i] == '-' || cStr[i] == 0x27 );
-  }
+   for( i = 0; i < iLen; i++ ) {
+      if( _ftIsAlpha( cStr[i] ) )  {
+         if( !cDst ) {
+             cDst = (char *) hb_xgrab(iLen + 1);
+             memcpy(cDst, cStr, iLen + 1);
+         }
+         if( fCap )
+            cDst[i] = _ftToUpper( cDst[i] );
+         else
+            cDst[i] = _ftToLower( cDst[i] );
+         }
+      fCap = ( cStr[i] == ' ' || cStr[i] == '-' || cStr[i] == 0x27 );
+   }
 
-  /* Find "Mc" */
-  if( cDst ) {
-     for( i = 0; i < iLen - 2; i++ )
-        if( cStr[i] == 'M' && cStr[i+1] == 'c' ) {
-           cDst[i+2] = _ftToUpper( cDst[i+2] );
-        }
-  }
-  /* // If "Mc" was found, Cap next letter if Alpha
-  if( iPos > 1 )
-     if( iPos < iLen )
-        if( ! _ftIsUpper( cStr[iPos] ) )
-           cStr[iPos] = _ftToUpper( cStr[iPos] );
-  */
-  if( cDst )
-     hb_retclen_buffer( cDst, iLen );
-  else
-     hb_retclen( cStr, iLen );
+   /* Find "Mc" */
+   if( cDst ) {
+      for( i = 0; i < iLen - 2; i++ )
+         if( cStr[i] == 'M' && cStr[i+1] == 'c' ) {
+            cDst[i+2] = _ftToUpper( cDst[i+2] );
+         }
+   }
+   /* // If "Mc" was found, Cap next letter if Alpha
+   if( iPos > 1 )
+      if( iPos < iLen )
+         if( ! _ftIsUpper( cStr[iPos] ) )
+            cStr[iPos] = _ftToUpper( cStr[iPos] );
+   */
+   if( cDst )
+      hb_retclen_buffer( cDst, iLen );
+   else
+      hb_retclen( cStr, iLen );
 }
diff --git a/harbour/contrib/hbnf/rmdir.c b/harbour/contrib/hbnf/rmdir.c
index 28bceda492..19ef6bdf74 100644
--- a/harbour/contrib/hbnf/rmdir.c
+++ b/harbour/contrib/hbnf/rmdir.c
@@ -51,7 +51,7 @@ End
 #include "hbapi.h"
 #include "hbapifs.h"
 
-HB_FUNC(FT_RMDIR)
+HB_FUNC( FT_RMDIR )
 {
-   hb_retl( HB_ISCHAR( 1 ) && hb_fsRmDir( hb_parc(1) ) );
+   hb_retl( HB_ISCHAR( 1 ) && hb_fsRmDir( hb_parc( 1 ) ) );
 }
diff --git a/harbour/contrib/hbnf/stod.c b/harbour/contrib/hbnf/stod.c
index b51bb5eb04..36d4fd8493 100644
--- a/harbour/contrib/hbnf/stod.c
+++ b/harbour/contrib/hbnf/stod.c
@@ -27,7 +27,7 @@
 
 #include "hbapi.h"
 
-HB_FUNC(FT_STOD)
+HB_FUNC( FT_STOD )
 {
    hb_retds( hb_parclen( 1 ) >= 8 ? hb_parc( 1 ) : NULL );
 }
diff --git a/harbour/src/common/hbverdsp.c b/harbour/src/common/hbverdsp.c
index 113afc10e2..5e2747baf4 100644
--- a/harbour/src/common/hbverdsp.c
+++ b/harbour/src/common/hbverdsp.c
@@ -157,9 +157,6 @@ void hb_verBuildInfo( void )
 #endif
 #if defined( HB_CLP_STRICT )
    hb_conOutErr( "(Clipper 5.x strict) ", 0 );
-#endif
-#if defined( HB_OS_WIN ) && ! defined( UNICODE )
-   hb_conOutErr( "(WINANSI) ", 0 );
 #endif
    hb_conOutErr( hb_conNewLine(), 0 );
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 4eb40b20da..d6a15eb596 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -11965,6 +11965,7 @@ STATIC PROCEDURE convert_xbp_to_hbp( hbmk, cSrcName, cDstName )
    AAdd( aDst, "# Automatically converted by hbmk2 from xbuild project:" )
    AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
    AAdd( aDst, "" )
+   AAdd( aDst, "-inc" )
 
    IF ".lib" $ cSrcName
       AAdd( aDst, "-hblib" )
@@ -12095,6 +12096,7 @@ STATIC PROCEDURE convert_xhp_to_hbp( hbmk, cSrcName, cDstName )
    AAdd( aDst, "# Automatically converted by hbmk2 from xMate project:" )
    AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
    AAdd( aDst, "" )
+   AAdd( aDst, "-inc" )
 
    cSrc := StrTran( cSrc, Chr( 13 ) + Chr( 10 ), Chr( 10 ) )
    cSrc := StrTran( cSrc, Chr( 9 ), " " )