diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0a49baea70..4d771259aa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-17 12:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * contrib/xhb/cstructc.c
+   * contrib/make_b32.bat
+     ! Some fixes for recent changes.
+
 2007-11-17 10:20 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
    * harbour/contrib/adordd/make_b32.bat
    * harbour/contrib/adordd/make_vc.bat
diff --git a/harbour/contrib/make_b32.bat b/harbour/contrib/make_b32.bat
index 6c53f8ac8a..e49469196f 100644
--- a/harbour/contrib/make_b32.bat
+++ b/harbour/contrib/make_b32.bat
@@ -12,7 +12,7 @@ goto EXIT
 
 :ERROR
 echo ----------------------------------------
-echo RUN : make_vc.bat DIRNAME  !!!
+echo RUN : make_b32.bat DIRNAME  !!!
 echo ----------------------------------------
 
 :EXIT
diff --git a/harbour/contrib/xhb/cstructc.c b/harbour/contrib/xhb/cstructc.c
index 63beeb20ad..063cd9b977 100644
--- a/harbour/contrib/xhb/cstructc.c
+++ b/harbour/contrib/xhb/cstructc.c
@@ -87,6 +87,9 @@ static PHB_ITEM hb_itemPutCRaw( PHB_ITEM pItem, const char * szText, ULONG ulLen
    return pItem;
 }
 
+#ifdef hb_itemPutCRawStatic
+   #undef hb_itemPutCRawStatic
+#endif
 static PHB_ITEM hb_itemPutCRawStatic( PHB_ITEM pItem, const char * szText, ULONG ulLen )
 {
    HB_TRACE_STEALTH(HB_TR_DEBUG, ("hb_itemPutCRawStatic(%p, %s, %lu)", pItem, szText, ulLen));
@@ -107,13 +110,17 @@ static PHB_ITEM hb_itemPutCRawStatic( PHB_ITEM pItem, const char * szText, ULONG
    return pItem;
 }
 
-#undef hb_retclenAdoptRaw
+#ifdef hb_retclenAdoptRaw
+   #undef hb_retclenAdoptRaw
+#endif
 HB_EXPORT void hb_retclenAdoptRaw( const char * szText, ULONG ulLen )
 {
    hb_itemPutCRaw( hb_stackReturnItem(), szText, ulLen );
 }
 
-#undef hb_retclenStatic
+#ifdef hb_retclenStatic
+   #undef hb_retclenStatic
+#endif
 HB_EXPORT void hb_retclenStatic( const char * szText, ULONG ulLen )
 {
    hb_itemPutCRawStatic( hb_stackReturnItem(), szText, ulLen );