diff --git a/ChangeLog.txt b/ChangeLog.txt
index 55737854ab..da0e679ebe 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,67 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-04 03:39 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * bin/check.hb
+    ! fixed shrinking of ChangeLog.txt to not result in broken EOLs
+    ! refinements around interactions of EOL checks and fixes
+    ! include Harbour files "hidden" under /3rd/ dirs
+
+  * bin/commit.hb
+    + set errorlevel, so it can now be used as a git pre-commit hook
+      (as 'exec hbrun bin/commit' in .gits/hooks/pre-commit)
+
+  * contrib/hbexpat/hbexpat.hbc
+    ! fixed expat.hbc detection to actually look for .hbc file not .h
+      (which is never present)
+
+  * utils/hbmk2/hbmk2.prg
+    + added depfinish= .hbc directive. It was missing, yet I
+      was using it in hbexpat.hbc in recent patch, and wondered
+      why it didn't work
+      [ the necessity of the whole previous patch is still suspect
+      though. ]
+    + show warning for any .hbc directives that is unknown.
+      This should avoid above situation nicely.
+      INCOMPATIBILITY: Thus far all lines with unknown directives
+      were ignored, now only empty ones or ones that begin with
+      '#' character (in first column), as documented. Clean your
+      .hbc files accordingly.
+    ! fixed typo in one help text. Pls retranslate, I hope Transifex
+      keeps previous texts, but you can find it in next language
+      update commit, if not.
+
+  * package/harb_win.mft
+    ! deleted BOM (detected by check.hb)
+
+  * contrib/3rd/sqlite3/sqlite3.hbc
+  * contrib/3rd/sqlite3/sqlite3.hbp
+  * contrib/hbbz2/3rd/bz2/bz2.hbc
+  * contrib/hbbz2/3rd/bz2/bz2.hbp
+  * contrib/hbexpat/3rd/expat/_hbconf.h
+  * contrib/hbexpat/3rd/expat/expat.hbc
+  * contrib/hbexpat/3rd/expat/expat.hbp
+  * contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+  * contrib/hblzf/3rd/liblzf/lzf.hbc
+  * contrib/hblzf/3rd/liblzf/lzf.hbp
+  * contrib/hbmlzo/3rd/minilzo/minilzo.hbc
+  * contrib/hbmlzo/3rd/minilzo/minilzo.hbp
+  * contrib/hbmxml/3rd/minixml/config.h
+  * contrib/hbmxml/3rd/minixml/minixml.dif
+  * contrib/hbmxml/3rd/minixml/mxml.hbc
+  * contrib/hbmxml/3rd/minixml/mxml.hbp
+  * contrib/hbmzip/3rd/minizip/minizip.hbc
+  * contrib/hbmzip/3rd/minizip/minizip.hbp
+  * contrib/hbxdiff/3rd/libxdiff/_hbconf.h
+  * contrib/hbxdiff/3rd/libxdiff/xdiff.hbc
+  * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+  * lib/3rd/win/bcc/Makefile
+  * lib/3rd/win/mingw/Makefile
+    ! deleted SVN IDs
+    * rediffed where required
+
 2013-04-04 00:06 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/lang2po.hb
     + more translation comments
diff --git a/bin/check.hb b/bin/check.hb
index e7cada1dfb..6b681434eb 100644
--- a/bin/check.hb
+++ b/bin/check.hb
@@ -162,7 +162,7 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
       ELSE
 
          IF hb_FileMatch( cName, "ChangeLog.txt" ) .AND. Len( cFile ) > 32768 .AND. ! lApplyFixes
-            cFile := Left( cFile, 16384 ) + Right( cFile, 16384 )
+            cFile := RTrimEOL( Left( cFile, 16384 ) ) + LTrim( Right( cFile, 16384 ) )
          ENDIF
 
          lReBuild := .F.
@@ -220,21 +220,28 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
          ENDIF
 
          IF lReBuild
-            cFile := RemoveEndingWhitespace( cFile, cEOL, lRemoveEndingWhitespace )
+            cFile := RemoveEndingWhitespace( cFile, iif( Empty( cEOL ), hb_eol(), cEOL ), lRemoveEndingWhitespace )
          ENDIF
 
-         IF !( Right( cFile, Len( cEOL ) ) == cEOL )
+         IF !( Right( cFile, Len( Chr( 10 ) ) ) == Chr( 10 ) )
             AAdd( aErr, "content: has no EOL at EOF" )
             IF lApplyFixes
-               cFile += cEOL
+               cFile += iif( Empty( cEOL ), hb_eol(), cEOL )
             ENDIF
          ENDIF
 
-         IF Right( cFile, Len( cEOL ) * 2 ) == Replicate( cEOL, 2 )
+         IF Right( cFile, Len( Chr( 10 ) ) * 2 ) == Replicate( Chr( 10 ), 2 )
             AAdd( aErr, "content: has multiple EOL at EOF" )
             IF lApplyFixes
-               DO WHILE Right( cFile, Len( cEOL ) * 2 ) == Replicate( cEOL, 2 )
-                  cFile := hb_StrShrink( cFile, Len( cEOL ) )
+               DO WHILE Right( cFile, Len( Chr( 10 ) ) * 2 ) == Replicate( Chr( 10 ), 2 )
+                  cFile := hb_StrShrink( cFile, Len( Chr( 10 ) ) )
+               ENDDO
+            ENDIF
+         ELSEIF Right( cFile, Len( Chr( 13 ) + Chr( 10 ) ) * 2 ) == Replicate( Chr( 13 ) + Chr( 10 ), 2 )
+            AAdd( aErr, "content: has multiple EOL at EOF" )
+            IF lApplyFixes
+               DO WHILE Right( cFile, Len( Chr( 13 ) + Chr( 10 ) ) * 2 ) == Replicate( Chr( 13 ) + Chr( 10 ), 2 )
+                  cFile := hb_StrShrink( cFile, Len( Chr( 13 ) + Chr( 10 ) ) )
                ENDDO
             ENDIF
          ENDIF
@@ -257,6 +264,14 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
 STATIC FUNCTION IsBinary( cFile )
    RETURN Chr( 0 ) $ cFile .OR. !( Chr( 10 ) $ cFile )
 
+STATIC FUNCTION RTrimEOL( cFile )
+
+   DO WHILE Right( cFile, 1 ) $ Chr( 13 ) + Chr( 10 )
+      cFile := hb_StrShrink( cFile, 1 )
+   ENDDO
+
+   RETURN cFile
+
 /*
  * UTF-8 encoding detection, based on filestr.cpp from Far Manager.
  * Harbour adaptation Copyright 2013 Viktor Szakats (harbour syenar.net)
@@ -426,7 +441,13 @@ STATIC FUNCTION LoadGitignore()
    LOCAL cLine
 
    IF s_aIgnore == NIL
-      s_aIgnore := { "*/3rd/*" }
+
+      s_aIgnore := { ;
+         "*/3rd/*", ;
+         "!*/3rd/*/*.hbc", ;
+         "!*/3rd/*/*.hbp", ;
+         "!*/3rd/*/Makefile" }
+
       FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( ".gitignore" ), Chr( 13 ) ), Chr( 10 ) )
          IF ! Empty( cLine ) .AND. !( Left( cLine, 1 ) == "#" )
             /* TODO: clean this */
diff --git a/bin/commit.hb b/bin/commit.hb
index 23f06e754c..72ebb72742 100644
--- a/bin/commit.hb
+++ b/bin/commit.hb
@@ -48,6 +48,7 @@ PROCEDURE Main()
 
    IF Empty( aChanges )
       OutStd( hb_ProgName() + ": " + "no changes" + hb_eol() )
+      ErrorLevel( 0 )
       RETURN
    ENDIF
 
@@ -83,6 +84,7 @@ PROCEDURE Main()
    IF ! hb_FileExists( cLogName := "ChangeLog.txt" )
       IF ! hb_FileExists( cLogName := "ChangeLog" )
          OutStd( hb_ProgName() + ": " + "can't find ChangeLog file" + hb_eol() )
+         ErrorLevel( 2 )
          RETURN
       ENDIF
    ENDIF
@@ -107,8 +109,10 @@ PROCEDURE Main()
       hb_MemoWrit( cLogName, cLog )
 
       OutStd( hb_ProgName() + ": " + hb_StrFormat( "Edit %1$s and commit", cLogName ) + hb_eol() )
+      ErrorLevel( 0 )
    ELSE
       OutStd( hb_ProgName() + ": " + "Please correct errors listed above and re-run" + hb_eol() )
+      ErrorLevel( 1 )
    ENDIF
 
    RETURN
diff --git a/contrib/3rd/sqlite3/sqlite3.hbc b/contrib/3rd/sqlite3/sqlite3.hbc
index 8eaa686a0e..7e56a5bcee 100644
--- a/contrib/3rd/sqlite3/sqlite3.hbc
+++ b/contrib/3rd/sqlite3/sqlite3.hbc
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
 
diff --git a/contrib/3rd/sqlite3/sqlite3.hbp b/contrib/3rd/sqlite3/sqlite3.hbp
index 6584171a06..d22fe2c128 100644
--- a/contrib/3rd/sqlite3/sqlite3.hbp
+++ b/contrib/3rd/sqlite3/sqlite3.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbbz2/3rd/bz2/bz2.hbc b/contrib/hbbz2/3rd/bz2/bz2.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbbz2/3rd/bz2/bz2.hbc
+++ b/contrib/hbbz2/3rd/bz2/bz2.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbbz2/3rd/bz2/bz2.hbp b/contrib/hbbz2/3rd/bz2/bz2.hbp
index ccb0b56249..70fc184497 100644
--- a/contrib/hbbz2/3rd/bz2/bz2.hbp
+++ b/contrib/hbbz2/3rd/bz2/bz2.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbexpat/3rd/expat/_hbconf.h b/contrib/hbexpat/3rd/expat/_hbconf.h
index 8fbae27cb3..3350098803 100644
--- a/contrib/hbexpat/3rd/expat/_hbconf.h
+++ b/contrib/hbexpat/3rd/expat/_hbconf.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #ifndef _HBCONF_H
 #define _HBCONF_H
diff --git a/contrib/hbexpat/3rd/expat/expat.hbc b/contrib/hbexpat/3rd/expat/expat.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbexpat/3rd/expat/expat.hbc
+++ b/contrib/hbexpat/3rd/expat/expat.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbexpat/3rd/expat/expat.hbp b/contrib/hbexpat/3rd/expat/expat.hbp
index e3311afe2a..39633faf79 100644
--- a/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/contrib/hbexpat/3rd/expat/expat.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbexpat/hbexpat.hbc b/contrib/hbexpat/hbexpat.hbc
index b80c8e4800..b6b439f143 100644
--- a/contrib/hbexpat/hbexpat.hbc
+++ b/contrib/hbexpat/hbexpat.hbc
@@ -7,10 +7,10 @@ headers=${hb_name}.ch
 
 libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
-depkeyhead=inst_expat:expat.h
-depcontrol=inst_expat:local{HB_BUILD_3RDEXT='no'}
-depincpathlocal=inst_expat:3rd/expat
-depfinish=inst_expat
+depkeyhead=expat_hbc:expat.hbc
+depcontrol=expat_hbc:local{HB_BUILD_3RDEXT='no'}
+depincpathlocal=expat_hbc:3rd/expat
+depfinish=expat_hbc
 
-libs=3rd/expat/expat.hbc{HBMK_HAS_INST_EXPAT_LOCAL}
-libs=expat{!HBMK_HAS_INST_EXPAT_LOCAL}
+libs=3rd/expat/expat.hbc{HBMK_HAS_EXPAT_HBC_LOCAL}
+libs=expat{!HBMK_HAS_INST_EXPAT_HBC_LOCAL}
diff --git a/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c b/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
index 84b9f2f2db..ae6190065c 100644
--- a/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
+++ b/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "hbapi.h"
 
diff --git a/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
index e63ea76988..b55ec0b5c5 100644
--- a/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
+++ b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
 libs=png
diff --git a/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
index 826ea7f6b8..81d9c19401 100644
--- a/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+++ b/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hblzf/3rd/liblzf/lzf.hbc b/contrib/hblzf/3rd/liblzf/lzf.hbc
index beb076e732..23fcb200ae 100644
--- a/contrib/hblzf/3rd/liblzf/lzf.hbc
+++ b/contrib/hblzf/3rd/liblzf/lzf.hbc
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
 
diff --git a/contrib/hblzf/3rd/liblzf/lzf.hbp b/contrib/hblzf/3rd/liblzf/lzf.hbp
index dc149da687..1e144c45f0 100644
--- a/contrib/hblzf/3rd/liblzf/lzf.hbp
+++ b/contrib/hblzf/3rd/liblzf/lzf.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbmlzo/3rd/minilzo/minilzo.hbc b/contrib/hbmlzo/3rd/minilzo/minilzo.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbmlzo/3rd/minilzo/minilzo.hbc
+++ b/contrib/hbmlzo/3rd/minilzo/minilzo.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbmlzo/3rd/minilzo/minilzo.hbp b/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
index bf1bac3b09..e11935b64b 100644
--- a/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
+++ b/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -hblib
 -inc
diff --git a/contrib/hbmxml/3rd/minixml/config.h b/contrib/hbmxml/3rd/minixml/config.h
index b069b6bd17..2afcfbef4f 100644
--- a/contrib/hbmxml/3rd/minixml/config.h
+++ b/contrib/hbmxml/3rd/minixml/config.h
@@ -1,8 +1,6 @@
 /*
- * $Id$
- */
-
-/*
+ * "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $"
+ *
  * Configuration file for Mini-XML, a small XML-like file parsing library.
  *
  * Copyright 2003-2010 by Michael R Sweet.
diff --git a/contrib/hbmxml/3rd/minixml/minixml.dif b/contrib/hbmxml/3rd/minixml/minixml.dif
index 0b18a0c469..a2f4ccf8f9 100644
--- a/contrib/hbmxml/3rd/minixml/minixml.dif
+++ b/contrib/hbmxml/3rd/minixml/minixml.dif
@@ -1,18 +1,7 @@
-diff -urN minixml.orig/config.h minixml/config.h
---- minixml.orig/config.h	2012-11-06 03:46:33.084020512 +0100
-+++ minixml/config.h	2012-11-06 03:46:33.084020512 +0100
-@@ -1,6 +1,8 @@
- /*
-- * "$Id: config.h.in 408 2010-09-19 05:26:46Z mike $"
-- *
-+ * $Id: config.h 18162 2012-09-27 21:08:47Z vszakats $
-+ */
-+
-+/*
-  * Configuration file for Mini-XML, a small XML-like file parsing library.
-  *
-  * Copyright 2003-2010 by Michael R Sweet.
-@@ -18,62 +20,89 @@
+diff -urN minixml.orig\config.h minixml\config.h
+--- minixml.orig\config.h	Thu Apr 04 03:37:59 2013
++++ minixml\config.h	Thu Apr 04 03:37:59 2013
+@@ -18,62 +18,89 @@
   * Include necessary headers...
   */
  
@@ -114,7 +103,7 @@ diff -urN minixml.orig/config.h minixml/config.h
  #    define strdup _mxml_strdup
  #  endif /* !HAVE_STRDUP */
  
-@@ -82,14 +111,20 @@
+@@ -82,14 +109,20 @@
  
  #  ifndef HAVE_SNPRINTF
  extern int	_mxml_snprintf(char *, size_t, const char *, ...);
@@ -138,9 +127,31 @@ diff -urN minixml.orig/config.h minixml/config.h
 +#  ifdef __cplusplus
 +}
 +#  endif /* __cplusplus */
-diff -urN minixml.orig/mxml_fil.c minixml/mxml_fil.c
---- minixml.orig/mxml_fil.c	2012-11-06 03:46:33.092020512 +0100
-+++ minixml/mxml_fil.c	2012-11-06 03:46:33.092020512 +0100
+diff -urN minixml.orig\mxml.h minixml\mxml.h
+--- minixml.orig\mxml.h	Thu Apr 04 03:37:59 2013
++++ minixml\mxml.h	Thu Apr 04 03:37:59 2013
+@@ -29,8 +29,16 @@
+ #  include <stdlib.h>
+ #  include <string.h>
+ #  include <ctype.h>
+-#  include <errno.h>
+-
++#  if defined( UNDER_CE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ ) || \
++      defined( _WINCE )
++#     include <io.h>
++#     if !defined( UNDER_CE )
++#        define UNDER_CE
++#     endif
++#     define strerror(e)      ""
++#  else
++#     include <errno.h>
++#  endif
+ 
+ /*
+  * Constants...
+diff -urN minixml.orig\mxml_fil.c minixml\mxml_fil.c
+--- minixml.orig\mxml_fil.c	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_fil.c	Thu Apr 04 03:37:59 2013
 @@ -329,8 +329,14 @@
      return (-1);
  
@@ -237,31 +248,9 @@ diff -urN minixml.orig/mxml_fil.c minixml/mxml_fil.c
  	    if ((*putc_cb)('\n', p) < 0)
  	      return (-1);
  
-diff -urN minixml.orig/mxml.h minixml/mxml.h
---- minixml.orig/mxml.h	2012-11-06 03:46:33.100020512 +0100
-+++ minixml/mxml.h	2012-11-06 03:46:33.100020512 +0100
-@@ -29,8 +29,16 @@
- #  include <stdlib.h>
- #  include <string.h>
- #  include <ctype.h>
--#  include <errno.h>
--
-+#  if defined( UNDER_CE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ ) || \
-+      defined( _WINCE )
-+#     include <io.h>
-+#     if !defined( UNDER_CE )
-+#        define UNDER_CE
-+#     endif
-+#     define strerror(e)      ""
-+#  else
-+#     include <errno.h>
-+#  endif
- 
- /*
-  * Constants...
-diff -urN minixml.orig/mxml_nod.c minixml/mxml_nod.c
---- minixml.orig/mxml_nod.c	2012-11-06 03:46:33.096020512 +0100
-+++ minixml/mxml_nod.c	2012-11-06 03:46:33.096020512 +0100
+diff -urN minixml.orig\mxml_nod.c minixml\mxml_nod.c
+--- minixml.orig\mxml_nod.c	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_nod.c	Thu Apr 04 03:37:59 2013
 @@ -221,7 +221,11 @@
    */
  
@@ -275,9 +264,9 @@ diff -urN minixml.orig/mxml_nod.c minixml/mxml_nod.c
  
   /*
    * Now delete any node data...
-diff -urN minixml.orig/mxml_pri.c minixml/mxml_pri.c
---- minixml.orig/mxml_pri.c	2012-11-06 03:46:33.096020512 +0100
-+++ minixml/mxml_pri.c	2012-11-06 03:46:33.096020512 +0100
+diff -urN minixml.orig\mxml_pri.c minixml\mxml_pri.c
+--- minixml.orig\mxml_pri.c	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_pri.c	Thu Apr 04 03:37:59 2013
 @@ -1,5 +1,5 @@
  /*
 - * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $"
@@ -292,9 +281,9 @@ diff -urN minixml.orig/mxml_pri.c minixml/mxml_pri.c
 - * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $".
 + * End of "$Id: mxml_pri.c 422 2010-11-07 22:55:11Z mike $".
   */
-diff -urN minixml.orig/mxml_pri.h minixml/mxml_pri.h
---- minixml.orig/mxml_pri.h	2012-11-06 03:46:33.096020512 +0100
-+++ minixml/mxml_pri.h	2012-11-06 03:46:33.096020512 +0100
+diff -urN minixml.orig\mxml_pri.h minixml\mxml_pri.h
+--- minixml.orig\mxml_pri.h	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_pri.h	Thu Apr 04 03:37:59 2013
 @@ -1,5 +1,5 @@
  /*
 - * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $"
@@ -309,9 +298,9 @@ diff -urN minixml.orig/mxml_pri.h minixml/mxml_pri.h
 - * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $".
 + * End of "$Id: mxml_pri.h 408 2010-09-19 05:26:46Z mike $".
   */
-diff -urN minixml.orig/mxml_set.c minixml/mxml_set.c
---- minixml.orig/mxml_set.c	2012-11-06 03:46:33.100020512 +0100
-+++ minixml/mxml_set.c	2012-11-06 03:46:33.100020512 +0100
+diff -urN minixml.orig\mxml_set.c minixml\mxml_set.c
+--- minixml.orig\mxml_set.c	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_set.c	Thu Apr 04 03:37:59 2013
 @@ -1,5 +1,5 @@
  /*
 - * "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $"
@@ -468,9 +457,9 @@ diff -urN minixml.orig/mxml_set.c minixml/mxml_set.c
 - * End of "$Id: mxml-set.c 441 2011-12-09 23:49:00Z mike $".
 + * End of "$Id: mxml-set.c 426 2011-01-01 23:42:17Z mike $".
   */
-diff -urN minixml.orig/mxml_str.c minixml/mxml_str.c
---- minixml.orig/mxml_str.c	2012-11-06 03:46:33.100020512 +0100
-+++ minixml/mxml_str.c	2012-11-06 03:46:33.100020512 +0100
+diff -urN minixml.orig\mxml_str.c minixml\mxml_str.c
+--- minixml.orig\mxml_str.c	Thu Apr 04 03:37:59 2013
++++ minixml\mxml_str.c	Thu Apr 04 03:37:59 2013
 @@ -28,6 +28,9 @@
  
  #include "config.h"
diff --git a/contrib/hbmxml/3rd/minixml/mxml.hbc b/contrib/hbmxml/3rd/minixml/mxml.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbmxml/3rd/minixml/mxml.hbc
+++ b/contrib/hbmxml/3rd/minixml/mxml.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbmxml/3rd/minixml/mxml.hbp b/contrib/hbmxml/3rd/minixml/mxml.hbp
index 38acac0174..4151bb1f6e 100644
--- a/contrib/hbmxml/3rd/minixml/mxml.hbp
+++ b/contrib/hbmxml/3rd/minixml/mxml.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbmzip/3rd/minizip/minizip.hbc b/contrib/hbmzip/3rd/minizip/minizip.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbmzip/3rd/minizip/minizip.hbc
+++ b/contrib/hbmzip/3rd/minizip/minizip.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbmzip/3rd/minizip/minizip.hbp b/contrib/hbmzip/3rd/minizip/minizip.hbp
index 166d295a48..c78af55f1e 100644
--- a/contrib/hbmzip/3rd/minizip/minizip.hbp
+++ b/contrib/hbmzip/3rd/minizip/minizip.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/contrib/hbxdiff/3rd/libxdiff/_hbconf.h b/contrib/hbxdiff/3rd/libxdiff/_hbconf.h
index 3c46fe3c82..317f135f81 100644
--- a/contrib/hbxdiff/3rd/libxdiff/_hbconf.h
+++ b/contrib/hbxdiff/3rd/libxdiff/_hbconf.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #if ! defined( HB_CONFIG_H )
 #define HB_CONFIG_H
diff --git a/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc
index 1763330ae6..1b9404bcb1 100644
--- a/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc
+++ b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbc
@@ -1,5 +1,2 @@
-#
-# $Id$
-#
 
 libs=${hb_name}
diff --git a/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
index 363ae5bc35..365e915dea 100644
--- a/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+++ b/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 -stop{hbdyn}
 
diff --git a/lib/3rd/win/bcc/Makefile b/lib/3rd/win/bcc/Makefile
index 2df7717a8c..0d79037547 100644
--- a/lib/3rd/win/bcc/Makefile
+++ b/lib/3rd/win/bcc/Makefile
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 ROOT := ../../../../
 
diff --git a/lib/3rd/win/mingw/Makefile b/lib/3rd/win/mingw/Makefile
index d1b0964884..0b974485b8 100644
--- a/lib/3rd/win/mingw/Makefile
+++ b/lib/3rd/win/mingw/Makefile
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 
 ROOT := ../../../../
 
diff --git a/package/harb_win.mft b/package/harb_win.mft
index fdaf885b60..7a03b33cfd 100644
--- a/package/harb_win.mft
+++ b/package/harb_win.mft
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Copyright © 1999-2013 (see application banner) -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 8c53568429..f18e45f638 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -11154,6 +11154,17 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
             hbmk[ _HBMK_hDEP ][ cName ][ _HBMKDEP_cIMPLIBDST ] := hb_FNameNameExt( hb_DirSepToOS( cLine ) )
          ENDIF
 
+      CASE Lower( Left( cLine, Len( "depfinish="    ) ) ) == "depfinish="    ; cLine := SubStr( cLine, Len( "depfinish="    ) + 1 )
+
+         cLine := MacroProc( hbmk, cLine, cFileName )
+         IF ! Empty( cLine )
+            IF cLine $ hbmk[ _HBMK_hDEP ]
+               dep_try_detection( hbmk, hbmk[ _HBMK_hDEP ][ cLine ] )
+            ELSE
+               _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Unknown dependency name: %1$s" ), ParamToString( _PAR_NEW_HBC() ) ) )
+            ENDIF
+         ENDIF
+
       /* .hbc identification strings. Similar to pkgconfig ones. */
       CASE Lower( Left( cLine, Len( "name="         ) ) ) == "name="         ; cLine := SubStr( cLine, Len( "name="         ) + 1 )
 
@@ -11189,6 +11200,10 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
 
          /* Silently ignore */
 
+      CASE ! Empty( cLine ) .AND. !( Left( cLine, 1 ) == "#" )
+
+         _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Unknown directive: %1$s" ), ParamToString( _PAR_NEW_HBC() ) ) )
+
       ENDCASE
    NEXT
 
@@ -16004,7 +16019,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong )
                                    "include that into project files. Uses same format as .hbp files." ) }, ;
       { "*.hbc"              , I_( "collection of options that accompany components (aka 'libs', aka packages). " + ;
                                    "Use different syntax than command-line and .hbp/.hbm files. Lines beginning " + ;
-                                   "with '#' character are ignored, each directive must be placed in separate lines." ) }, ;
+                                   "with '#' character are ignored, each directive must be placed in separate line." ) }, ;
       { "*.ch"               , I_( "if passed directly as a source file, it will be used as additional standard header" ) }, ;
       { _HBMK_AUTOHBC_NAME   , hb_StrFormat( I_( "standard .hbc file that gets automatically processed, if present. Possible location(s) (in order of precedence) [*]: %1$s" ), ArrayToList( AutoConfPathList( hbmk, .F., hbmk[ _HBMK_lMarkdown ] ), ", " ) ) }, ;
       { _HBMK_AUTOHBM_NAME   , I_( "optional .hbm file residing in current working directory, which gets automatically processed before other options" ) }, ;
@@ -16168,6 +16183,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong )
       { "depincpathlocal="  , hb_StrFormat( I_( "same as %1$s option" ), "-depincpathlocal=" ) }, ;
       { "depimplibs="       , hb_StrFormat( I_( "same as %1$s option" ), "-depimplibs="      ) }, ;
       { "depimplibd="       , hb_StrFormat( I_( "same as %1$s option" ), "-depimplibd="      ) }, ;
+      { "depfinish="        , hb_StrFormat( I_( "same as %1$s option" ), "-depfinish="       ) }, ;
       { "name="             , I_( "package name" ) }, ;
       { "description="      , I_( "package description" ) }, ;
       { "version=<x.y.z>"   , I_( "package version number, where x,y,z >= 0 <= 255. Defaults to 0.0.1, if not specified." ) }, ;