diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a0b7cbd2ee..9e9e61c4ec 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-29 20:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * make_b32.mak
+     - HB_NO_BCC_MAX_OPENFILES_HACK - no longer used.
+
+   * include/hbsetup.h
+     - HB_ASORT_OPT_ITEMCOPY - no longer used.
+     - HB_FAST_STOD - no longer used.
+
 2008-05-29 20:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * source/rtl/dateshb.c
    * source/rtl/datesx.c
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 7c2d673f28..52ef5f9b1c 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -175,22 +175,14 @@
 /* ***********************************************************************
  * You can set here the maximum symbol name length handled by Harbour
  * compiler and runtime. You can override this setting in the make process.
+ * Setting this too low, may result in clashing symbols in Harbour 
+ * itself. For strict CA-Cl*pper compatibility a value of 10 would have 
+ * to be used, but Harbour won't properly compile using this setting.
  *
  * By default this value is 63
  */
 #ifndef HB_SYMBOL_NAME_LEN
-/* NOTE: For complete CA-Cl*pper compatibility you can set the maximum
-         symbol name to 10. Sometimes this can be useful for compiling legacy
-         code. [vszakats] */
-/*
-   #ifdef HB_C52_STRICT
-      #define HB_SYMBOL_NAME_LEN   10
-   #else
-*/
-      #define HB_SYMBOL_NAME_LEN   63
-/*
-   #endif
-*/
+   #define HB_SYMBOL_NAME_LEN   63
 #endif
 
 /* ***********************************************************************
@@ -224,38 +216,6 @@
  */
 /* #define HB_FIX_ACOPY_BUG */
 
-/* ***********************************************************************
- * This controls an optimisation in ASORT() function
- *
- * If this is defined the item copying is optimized, in a way that
- * instead of calling the official hb_itemCopy(), the item structures
- * will be directly copied with memcpy(), this means that the related
- * data areas (string space for example) will never be moved. This can be
- * safely done here, because it's guaranteed by the nature of sorting
- * that the set of items doesn't change (there're no deleted or new
- * items, just swapping) in this functions.
- * Using this option makes sorting *much* faster, but if you have a
- * problem, or the low level stuff changes, turn it off. [vszakats]
- */
-/*
- * It's not longer used - current code which uses hb_itemSwap() should
- * give similar performance (probably a little bit worser due to some small
- * function call overhead) but it's ready for automatic GC activation and
- * I'd like to keep it.
- * If the current performance is not enough then I can change sorting
- * algorithm used inside ASORT and with cost of some additional memory 
- * improve the speed but it's not my priority now. [druzus]
- */
-/* #define HB_ASORT_OPT_ITEMCOPY */
-
-/* ***********************************************************************
- * You can select here faster but less secure behaviour of STOD() function
- * There is no data validation if this is enabled.
- *
- * By default we are using secure method.
- */
-/* #define HB_FAST_STOD */
-
 /* ***********************************************************************
  * You can select here if you want a strong type support in the compiler
  * For example:
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index 793f6fbcd4..e05cb1f3e1 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -119,7 +119,7 @@ CFLAGS      = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -I$(OBJ_DIR)
 !endif
 #-----------
 !if "$(BCCDLL_WITH_DYNRT)" == "-tWR"
-    BCCDLL_WITH_DYNRT=$(BCCDLL_WITH_DYNRT) -DHB_NO_BCC_MAX_OPENFILES_HACK
+    BCCDLL_WITH_DYNRT=$(BCCDLL_WITH_DYNRT)
     RTLIBSUFFIX = i
 !endif
 #-----------