diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 431ea9e8fb..ba328b03cd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,9 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-20 15:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbexpat/hbexpat.ch
+    + added constants for attr array element positions
+  * contrib/hbexpat/tests/test.prg
+  * contrib/hbexpat/tests/tohash.prg
+    + using them
+
+  * contrib/hbmxml/3rd/minixml/mxml.hbp
+  * contrib/hbmzip/hbmzip.hbp
+    * C std-level related tweaks [Tamas Tevesz]
+
 2011-05-19 16:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idedocks.prg
-    ! Fixed: regression where RTE was generated while closing 
+    ! Fixed: regression where RTE was generated while closing
       hbIDE after MDI default has been changed to FALSE.
 
 2011-05-19 16:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -35,20 +46,20 @@
       This facilitates better visual experience in the editor.
 
   * contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
-    + Added: consider a source line as a comment if starts with "*".    
+    + Added: consider a source line as a comment if starts with "*".
 
 2011-05-20 00:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbide/idesaveload.prg
     * turned off MDI mode by default
       reasons:
-      - MDI is a concept is off the map these days
-      - in MDI mode it's not possible (at least I could not find one)
+      - MDI as a concept is off the map these days
+      - in MDI mode it's not possible (at least I could not find a way)
         or not easily to disable the "stats" window
       - in MDI mode it's not possible to disable the editor related
-        toolsbars
+        toolbars
       - in MDI mode the window positions are not kept
       - it's very confusing as default state even if above are fixed
-      if groups thinks that MDI is the future and it makes
+      if group thinks that MDI is the future and it makes
       HBIDE a much better tool, pls shout.
 
 2011-05-20 00:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbexpat/hbexpat.ch b/harbour/contrib/hbexpat/hbexpat.ch
index 2de0418383..17e35f4a9e 100644
--- a/harbour/contrib/hbexpat/hbexpat.ch
+++ b/harbour/contrib/hbexpat/hbexpat.ch
@@ -110,4 +110,7 @@
 #define HB_XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE   1
 #define HB_XML_PARAM_ENTITY_PARSING_ALWAYS              2
 
+#define HB_XML_ATTR_cName                               1
+#define HB_XML_ATTR_cValue                              2
+
 #endif /* HBEXPAT_CH_ */
diff --git a/harbour/contrib/hbexpat/tests/test.prg b/harbour/contrib/hbexpat/tests/test.prg
index 4e32c0dceb..fc8f2ba21e 100644
--- a/harbour/contrib/hbexpat/tests/test.prg
+++ b/harbour/contrib/hbexpat/tests/test.prg
@@ -59,7 +59,7 @@ PROCEDURE start( xData, cElement, aAttr )
 
    IF ! Empty( aAttr )
       FOR EACH aItem IN aAttr
-         OutStd( " " + aItem[ 1 ] + "='" + aItem[ 2 ] + "'" )
+         OutStd( " " + aItem[ HB_XML_ATTR_cName ] + "='" + aItem[ HB_XML_ATTR_cValue ] + "'" )
       NEXT
    ENDIF
 
diff --git a/harbour/contrib/hbexpat/tests/tohash.prg b/harbour/contrib/hbexpat/tests/tohash.prg
index 5fa1b74261..1da6116121 100644
--- a/harbour/contrib/hbexpat/tests/tohash.prg
+++ b/harbour/contrib/hbexpat/tests/tohash.prg
@@ -23,9 +23,6 @@
 #define _N_hAttr            4
 #define _N_MAX_             4
 
-#define _A_cName            1
-#define _A_cValue           2
-
 PROCEDURE Main( cFileName )
    LOCAL p := XML_ParserCreate()
    LOCAL aUserData
@@ -139,7 +136,7 @@ PROCEDURE cb_start( aUserData, cElement, aAttrList )
    ENDIF
 
    FOR EACH aAttr IN aAttrList
-      aNewNode[ _N_hAttr ][ aAttr[ _A_cName ] ] := aAttr[ _A_cValue ]
+      aNewNode[ _N_hAttr ][ aAttr[ HB_XML_ATTR_cName ] ] := aAttr[ HB_XML_ATTR_cValue ]
    NEXT
 
    aUserData[ _D_aNode ] := aNewNode
diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
index 3d4e444ca3..d2b2625e75 100644
--- a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
+++ b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
@@ -13,6 +13,9 @@
 -cpp=no
 -pic
 
+# __inline__ keyword
+{sunos}-c=gnu90
+
 {win}-cflag=-DWIN32 -DWIN
 {win|dos|os2}-cflag=-D_EOL_CRLF
 
diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp
index bd24b914ad..12af1dc316 100644
--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -9,6 +9,9 @@
 
 -w3 -es2
 
+# localtime_r, gmtime_r
+-c=gnu90
+
 # component named libzip also has a header
 # named zip.h, so we look for unzip.h to detect minizip
 -depkeyhead=minizip:unzip.h