diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e78ac7a85d..6acf1c2d58 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-10-24 03:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * include/hbclass.ch
+   * include/hbsetup.ch
+     - Removed HB_SHORTNAME last occurences. Harbour doesn't 
+       have a 10 char symbol compatibility since some time, and
+       it didn't make too much sense anyway since long.
+       I wonder if HB_CLS_NO_DECORATION (in hbclass.ch) has 
+       any point anymore?
+
 2007-10-24 03:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    - make_gnu.cmd
      - Remove obsolete file. This was the same as make_gnu.bat 
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index baad5f5620..674693f07a 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -126,13 +126,6 @@
    #define HB_CLS_NO_DECLARATIONS
 #endif
 
-/* disable method decoration when Harbour compiled with short (10 chars) symbols */
-#ifdef HB_SHORTNAMES
-   #ifndef HB_CLS_NO_DECORATION
-      #define HB_CLS_NO_DECORATION
-   #endif
-#endif
-
 /*
  * I have to enable this definition by default untill we will not fix
  * preprocessor. [druzus]
diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch
index f51f621a41..b4da2991f5 100644
--- a/harbour/include/hbsetup.ch
+++ b/harbour/include/hbsetup.ch
@@ -72,15 +72,6 @@
 /* #define HB_COMPAT_DBASE */     /* Enable dBase extensions */
 /* #define HB_COMPAT_CLIP */      /* Enable CLIP extensions */
 
-/* NOTE: HB_SHORTNAMES must be defined manually if the symbol name length is
-         set to 10 explicitly and not through the HB_C52_STRICT option
-         [vszakats] */
-
-/* Turn on short names support for the class engine */
-#ifdef HB_C52_STRICT
-   #define HB_SHORTNAMES
-#endif
-
 /* #define HB_FILE_VER_STATIC */  /* Enable inclusion of file version strings */
 
 #endif /* HB_SETUP_CH_ */