diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c1a48b3cb4..0716e1f73c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-22 11:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/bsd/gcc.mk
+    + added c i s to ar parameters
+
+  * harbour/src/vm/estack.c
+    * formatting
+
+  * harbour/include/hbtypes.h
+    % replaced #ifdef ... / #undef ... with simple #undef
+
 2009-12-22 10:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * package/winuni/RELNOTES
     * Finalizing.
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index b33d0d4129..8820fa73d8 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -39,7 +39,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 LDFLAGS += $(LIBPATHS)
 
 AR := $(HB_CCPREFIX)ar
-AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false )
+AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 DY := $(CC)
 DFLAGS += -shared $(LIBPATHS)
diff --git a/harbour/include/hbtypes.h b/harbour/include/hbtypes.h
index e4e1ef90b1..a2c1b9f5e0 100644
--- a/harbour/include/hbtypes.h
+++ b/harbour/include/hbtypes.h
@@ -53,9 +53,7 @@
 #ifndef HB_TYPES_H_
 #define HB_TYPES_H_
 
-#ifdef HB_API_MACROS
-   #undef HB_API_MACROS
-#endif
+#undef HB_API_MACROS
 
 #include "hbvm.h"
 #include "hbapiitm.h"
diff --git a/harbour/src/vm/estack.c b/harbour/src/vm/estack.c
index 667a221915..37828dfc53 100644
--- a/harbour/src/vm/estack.c
+++ b/harbour/src/vm/estack.c
@@ -102,7 +102,7 @@
                                       hb_stack_ptr = NULL; } while ( 0 )
 #     define hb_stack_ready()    (hb_stack_ptr != NULL)
 
-#else
+#  else
 
       /* compiler has no native TLS support, we have to implement it ourselves */
 #     if defined( HB_STACK_MACROS )
@@ -123,7 +123,7 @@
                                  while ( 0 )
 #     define hb_stack_ready()    ( s_fInited && hb_tls_get( hb_stack_key ) )
 
-#endif /* HB_USE_TLS */
+#  endif /* HB_USE_TLS */
 
 #  if !defined( HB_STACK_PRELOAD )
 #     undef hb_stack