diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9a8eb528eb..df99ffad69 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-01 17:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
+  * contrib/hbmxml/tests/reminder.prg
+    ! Fixed to use with miniXML r433
+  * contrib/hbxdiff/3rd/libxdiff/config.h
+    ! Fixed libxdiff build with bcc 5.5
+
 2011-03-01 15:25 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
   * contrib/hbmxml/3rd/minixml/config.h
   * contrib/hbmxml/3rd/minixml/COPYING
diff --git a/harbour/contrib/hbmxml/tests/reminder.prg b/harbour/contrib/hbmxml/tests/reminder.prg
index 774bd74197..6d814a663f 100644
--- a/harbour/contrib/hbmxml/tests/reminder.prg
+++ b/harbour/contrib/hbmxml/tests/reminder.prg
@@ -55,7 +55,7 @@ STATIC FUNCTION asXML( xml )
    ENDIF
 
    subnode := mxmlGetFirstChild( node )
-   DO WHILE ! Empty( subnode := mxmlGetNext( subnode ) )
+   DO WHILE ! Empty( subnode := mxmlGetNextSibling( subnode ) )
       IF mxmlGetType( subnode ) == MXML_ELEMENT 
          IF mxmlGetElement( subnode ) == "body"
             c := mxmlGetOpaque( subnode )
diff --git a/harbour/contrib/hbxdiff/3rd/libxdiff/config.h b/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
index e25da5ab3d..3eade7b51c 100644
--- a/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
+++ b/harbour/contrib/hbxdiff/3rd/libxdiff/config.h
@@ -2,6 +2,11 @@
  * $Id$
  */
 
+#if ( defined( __BORLANDC__ ) && ( __BORLANDC__ >= 1360 ) && ( __BORLANDC__ < 1400 ) ) /* for BCC 5.5 */
+#define XRABPLY_TYPE64 __int64
+#define XV64(v) ((xply_word) v ## ui64)
+#endif
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
@@ -101,6 +106,15 @@
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
+
+#if defined( __GNUC__ )
+#  define inline __inline__
+#elif defined( _MSC_VER )
+#  define inline _inline
+#else
+#  define inline
+#endif
+
 #ifndef __cplusplus
 /* #undef inline */
 #endif