diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f5eb5a8a0a..299c26541a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-20 14:02 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * include/clipdefs.h
+  * include/extend.api
+  * include/hbapi.h
+  * include/hbdefs.h
+    * deprecated HB_LEGACY_TYPES_ON build-time option. Use native
+      Harbour types instead. (deprecated using HB_LEGACY_LEVEL4)
+    + added HB_PARAMNO Harbour type to denote parameter number.
+    ; TOFIX: Use HB_PARAMNO instead of HB_BYTE, HB_USHORT, int, HB_ULONG
+
+  * src/rtl/version.c
+    * deprecated HB_BUILDDATE(). use HB_VERSION( HB_VERSION_BUILD_DATE_STR ) instead
+    * deprecated HB_PCODEVER(). use HB_VERSION( HB_VERSION_PCODE_VER_STR ) instead
+    ; both deprecated using HB_LEGACY_LEVEL4
+
 2012-07-20 02:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
     ! Fixed: clicking on selected area was not removing the selection.
diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h
index 174614258a..1827bcf311 100644
--- a/harbour/include/clipdefs.h
+++ b/harbour/include/clipdefs.h
@@ -62,20 +62,20 @@
 
 /* New types */
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 typedef unsigned char BYTE;
 #endif
 typedef BYTE *  BYTEP;
 typedef BYTEP   BYTEPP;
 typedef BYTEP   PBYTE;
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 typedef short SHORT;
 #endif
 typedef SHORT * SHORTP;
 typedef SHORTP  PSHORT;
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 typedef unsigned short USHORT;
 #endif
 typedef USHORT * USHORTP;
@@ -85,13 +85,13 @@ typedef unsigned int WORD;
 typedef WORD *  WORDP;
 typedef WORDP   PWORD;
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 typedef long LONG;
 #endif
 typedef LONG *  LONGP;
 typedef LONGP   PLONG;
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 typedef unsigned long ULONG;
 #endif
 typedef ULONG * ULONGP;
@@ -101,7 +101,7 @@ typedef unsigned long DWORD;
 typedef DWORD * DWORDP;
 typedef DWORDP  PDWORD;
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 #undef BOOL
 typedef USHORT BOOL;
 #endif
@@ -129,7 +129,7 @@ typedef FUNCP * FUNCPP;
 #define HIDE    static
 #define CLIPPER HARBOUR
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
 #  undef FALSE
 #  define FALSE      0
 #  undef TRUE
diff --git a/harbour/include/extend.api b/harbour/include/extend.api
index c86076f896..f6415fce6f 100644
--- a/harbour/include/extend.api
+++ b/harbour/include/extend.api
@@ -85,7 +85,7 @@ typedef PHB_ITEM  ITEM;
 #define PCOUNT          hb_pcount()
 #define ALENGTH( n )    hb_parinfa( n, 0 )
 
-#if ! defined( HB_LEGACY_TYPES_ON )
+#if ! defined( HB_LEGACY_LEVEL4 ) || ! defined( HB_LEGACY_TYPES_ON )
    #define ISCHAR( n )           HB_ISCHAR( n )
    #define ISNUM( n )            HB_ISNUM( n )
    #define ISLOG( n )            HB_ISLOG( n )
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index 93f6ef207b..a9b5c41b35 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -245,7 +245,7 @@ HB_EXTERN_BEGIN
 #define HB_ISDATETIME( n )    ( hb_param( n, HB_IT_DATETIME ) != NULL )
 
 /* Compatibility #defines, deprecated */
-#if defined( HB_LEGACY_TYPES_ON )
+#if defined( HB_LEGACY_LEVEL4 ) && defined( HB_LEGACY_TYPES_ON )
    #define ISNIL( n )            HB_ISNIL( n )
    #define ISCHAR( n )           HB_ISCHAR( n )
    #define ISNUM( n )            HB_ISNUM( n )
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 98495a1383..b3939d1915 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -229,9 +229,9 @@ typedef unsigned int        HB_UINT;
 #endif
 
 /* Harbour abstract types */
-/* ...add them here... */
 #define HB_AREANO           HB_USHORT
 #define HB_FIELDNO          HB_USHORT
+#define HB_PARAMNO          HB_USHORT
 
 /* Convenience */
 typedef HB_UCHAR            HB_BYTE;
@@ -345,7 +345,7 @@ typedef HB_UCHAR            HB_U8;
 
 /* Legacy Windows/Clipper-style types */
 
-#if defined( HB_LEGACY_TYPES_ON )
+#if defined( HB_LEGACY_LEVEL4 ) && defined( HB_LEGACY_TYPES_ON )
 
    #if ! defined( HB_DONT_DEFINE_BOOL )
       #undef BOOL                         /* boolean */
diff --git a/harbour/src/rtl/version.c b/harbour/src/rtl/version.c
index b56a6e9320..b0e6488817 100644
--- a/harbour/src/rtl/version.c
+++ b/harbour/src/rtl/version.c
@@ -224,6 +224,8 @@ HB_FUNC( HB_COMPILER )
    hb_retc_buffer( hb_verCompiler() );
 }
 
+#if defined( HB_LEGACY_LEVEL4 )
+
 HB_FUNC( HB_PCODEVER )
 {
    hb_retc_buffer( hb_verPCode() );
@@ -233,3 +235,5 @@ HB_FUNC( HB_BUILDDATE )
 {
    hb_retc_buffer( hb_verBuildDate() );
 }
+
+#endif