diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d436cabf72..634bc57f26 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,49 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-31 15:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/gtalleg/gtalleg.hbp
+  + contrib/gtalleg/gtallegs.hbp
+  + contrib/hbcurl/hbcurl.hbp
+  + contrib/hbcurl/hbcurls.hbp
+  + contrib/hbssl/hbssl.hbp
+  + contrib/hbssl/hbssls.hbp
+    + Added .hbp files for some thougher libs.
+
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/hbqt.hbp
+  * contrib/hbqt/hbqts.hbp
+  * contrib/hbqt/hbqtcore.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtgui.hbp
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtnetwork.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+  * contrib/hbfbird/hbfbird.hbp
+  * contrib/hbxbp/hbxbp.hbp
+  * contrib/hbcomm/hbcomm.hbp
+  * contrib/hbsms/hbsms.hbp
+    + Added -nohbc.
+    ! Fixed QT hbmk2 files to use different working dir for
+      static and dynamic builds.
+    ! Fixed QT hbmk2 files to create static libs with proper
+      name.
+
+  * contrib/hbcurl/hbcurls/Makefile
+    ! Minor cleanup.
+
+  * utils/hbmk2/hbmk2.prg
+    + Will now also parse '#include <name>' style header dependencies.
+
+  * contrib/hbqt/detect.mk
+    * Synced key header name with .hbp.
+
+  * contrib/hbcomm/hbcomm.hbp
+    + Added missing -w3 -es2.
+
+  * contrib/hbqt/hbqt.h
+    - Deleted mild hack no more necessary.
+
 2010-05-31 13:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   + contrib/hbwin/tests/oletst2.vbs
   + contrib/hbwin/tests/oletst2.js
diff --git a/harbour/contrib/gtalleg/gtalleg.hbp b/harbour/contrib/gtalleg/gtalleg.hbp
new file mode 100644
index 0000000000..c09eb193f6
--- /dev/null
+++ b/harbour/contrib/gtalleg/gtalleg.hbp
@@ -0,0 +1,23 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm}
+
+-reqheader=allegro.h
+
+-inctrypath=${HB_WITH_ALLEGRO}
+-inctrypath=/usr/include
+-inctrypath=/opt/local/include
+
+gtalleg.c
+ssf.c
diff --git a/harbour/contrib/gtalleg/gtallegs.hbp b/harbour/contrib/gtalleg/gtallegs.hbp
new file mode 100644
index 0000000000..0cea961c1c
--- /dev/null
+++ b/harbour/contrib/gtalleg/gtallegs.hbp
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+gtalleg.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DALLEGRO_STATICLINK
diff --git a/harbour/contrib/hbcomm/hbcomm.hbp b/harbour/contrib/hbcomm/hbcomm.hbp
index a5f636fa2c..345c7da44c 100644
--- a/harbour/contrib/hbcomm/hbcomm.hbp
+++ b/harbour/contrib/hbcomm/hbcomm.hbp
@@ -4,7 +4,10 @@
 
 -hblib
 -inc
+-nohbc
 
 -o${hb_name}
 
+-w3 -es2
+
 hbcomm.prg
diff --git a/harbour/contrib/hbcurl/hbcurl.hbp b/harbour/contrib/hbcurl/hbcurl.hbp
new file mode 100644
index 0000000000..4cccaf7054
--- /dev/null
+++ b/harbour/contrib/hbcurl/hbcurl.hbp
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-reqheader=curl/curl.h
+
+-inctrypath=${HB_WITH_CURL}
+-inctrypath=/usr/include
+
+hbcurl.c
diff --git a/harbour/contrib/hbcurl/hbcurls.hbp b/harbour/contrib/hbcurl/hbcurls.hbp
new file mode 100644
index 0000000000..ce400cf461
--- /dev/null
+++ b/harbour/contrib/hbcurl/hbcurls.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!(win|wce)}
+
+hbcurl.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DCURL_STATICLIB
diff --git a/harbour/contrib/hbcurl/hbcurls/Makefile b/harbour/contrib/hbcurl/hbcurls/Makefile
index d062686e27..8e96df59e2 100644
--- a/harbour/contrib/hbcurl/hbcurls/Makefile
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -16,7 +16,7 @@ C_SOURCES := \
 _DET_DSP_NAME := libcurl
 _DET_VAR_INC_ := HB_INC_CURL
 _DET_VAR_HAS_ := HB_HAS_CURL
-_DET_FLT_PLAT := !dos
+_DET_FLT_PLAT :=
 _DET_FLT_COMP :=
 _DET_INC_DEFP := /usr/include
 _DET_INC_HEAD := /curl/curl.h
diff --git a/harbour/contrib/hbfbird/hbfbird.hbp b/harbour/contrib/hbfbird/hbfbird.hbp
index 19a190e4c1..ee8ee79579 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -4,6 +4,7 @@
 
 -hblib
 -inc
+-nohbc
 
 -o${hb_name}
 
diff --git a/harbour/contrib/hbqt/detect.mk b/harbour/contrib/hbqt/detect.mk
index f94459a468..6801dabba3 100644
--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -16,7 +16,7 @@ _DET_VAR_HAS_ := HB_HAS_QT
 _DET_FLT_PLAT := !dos
 _DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
 _DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-_DET_INC_HEAD := /QtCore/qglobal.h
+_DET_INC_HEAD := /QtCore/QObject
 include $(TOP)$(ROOT)config/detfun.mk
 
 _QT_DARWIN :=
diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h
index b6eecf370a..b72554e373 100644
--- a/harbour/contrib/hbqt/hbqt.h
+++ b/harbour/contrib/hbqt/hbqt.h
@@ -67,7 +67,6 @@
 #endif
 
 #include <QtCore/qglobal.h>
-/* For hbmk2: #include "QtCore/QObject" */
 
 #if !( QT_VERSION >= 0x040500 )
    #error QT library version 4.5.0 or upper is required for hbqt.
diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp
index 9f282e5763..ee312bc45b 100644
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm
 
 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 hbqt_base.cpp
 hbqt_destruct.cpp
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index ff578ada1b..488075044d 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -4,6 +4,7 @@
 
 -hblib
 -inc
+-nohbc
 
 -w3 -es2
 
diff --git a/harbour/contrib/hbqt/hbqtcore.hbp b/harbour/contrib/hbqt/hbqtcore.hbp
index a4af33a587..196d60e52a 100644
--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm
 
 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 qtcore/*.cpp
 qtcore/*.prg
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/hbqtcores.hbp
index cc7d8a8242..e3ddf0e99d 100644
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #
 
-@hbqtcore.hbp
+hbqtcore.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 -cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqtgui.hbp b/harbour/contrib/hbqt/hbqtgui.hbp
index 1ccb741d44..d0af9f5be8 100644
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm
 
 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 qtgui/*.cpp
 qtgui/*.prg
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/hbqtguis.hbp
index ea62b7450c..7f9a63527b 100644
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #
 
-@hbqtgui.hbp
+hbqtgui.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 -cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqtnetwork.hbp b/harbour/contrib/hbqt/hbqtnetwork.hbp
index af8d4d3352..e1031b59e5 100644
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm
 
 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 qtnetwork/*.cpp
 qtnetwork/*.prg
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/hbqtnetworks.hbp
index e0055cf5d6..a2b83d762f 100644
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #
 
-@hbqtnetwork.hbp
+hbqtnetwork.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 -cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqts.hbp b/harbour/contrib/hbqt/hbqts.hbp
index 32f3796ea7..e63d09cd45 100644
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #
 
-@hbqt.hbp
+hbqt.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
 -cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbsms/hbsms.hbp b/harbour/contrib/hbsms/hbsms.hbp
index 09b67f3610..a64624d64f 100644
--- a/harbour/contrib/hbsms/hbsms.hbp
+++ b/harbour/contrib/hbsms/hbsms.hbp
@@ -4,6 +4,7 @@
 
 -hblib
 -inc
+-nohbc
 
 -o${hb_name}
 
diff --git a/harbour/contrib/hbssl/hbssl.hbp b/harbour/contrib/hbssl/hbssl.hbp
new file mode 100644
index 0000000000..e9a87370f6
--- /dev/null
+++ b/harbour/contrib/hbssl/hbssl.hbp
@@ -0,0 +1,50 @@
+#
+# $Id$
+#
+
+-stop{wce}
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-reqheader=openssl/ssl.h
+
+-inctrypath=${HB_WITH_OPENSSL}
+-inctrypath=/usr/include
+-inctrypath=/usr/local/include
+-inctrypath=/usr/local/ssl/include
+-inctrypath=/boot/common/include
+
+{darwin}-cflag=-DOPENSSL_NO_SHA256
+{darwin}-cflag=-DOPENSSL_NO_SHA512
+{darwin}-cflag=-DOPENSSL_NO_CAMELLIA
+{darwin}-cflag=-DOPENSSL_NO_SEED
+{darwin}-cflag=-DOPENSSL_NO_DGRAM
+{darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
+
+{win|wce}-cflag=-DOPENSSL_OPT_WINDLL
+
+# Patent will expire in 2010/2011
+-cflag=-DOPENSSL_NO_IDEA
+
+hbssl.c
+bio.c
+err.c
+evp.c
+evpciph.c
+evpenc.c
+evpmd.c
+evppkey.c
+pem.c
+rand.c
+ssl.c
+sslciph.c
+sslctx.c
+sslsess.c
+x509.c
diff --git a/harbour/contrib/hbssl/hbssls.hbp b/harbour/contrib/hbssl/hbssls.hbp
new file mode 100644
index 0000000000..5f442982d5
--- /dev/null
+++ b/harbour/contrib/hbssl/hbssls.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!(win|wce)}
+
+hbssl.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+{win|wce}-cflag=-UOPENSSL_OPT_WINDLL
diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp
index f94d6ad94c..10e16c81d0 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbp
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -4,6 +4,7 @@
 
 -hblib
 -inc
+-nohbc
 
 -o${hb_name}
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2b6323831a..934f8c35e9 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5472,8 +5472,9 @@ STATIC FUNCTION SetupForGT( cGT_New, /* @ */ cGT, /* @ */ lGUI )
    root file. It won't attempt to parse all possible #include syntaxes
    and source code formats, won't try to interpret comments, line
    continuation, different keyword and filename cases, etc, etc. In
-   order to work, it will need #include "filename" format in source.
-   If this isn't enough for your needs, feel free to update the code.
+   order to work, it will need #include "filename" and #include
+   <filename> format in source. If this isn't enough for your needs,
+   feel free to update the code.
    [vszakats] */
 
 #define _HEADSTATE_hFiles       1
@@ -5676,11 +5677,15 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
       cHeader := NIL
       nPos := 1
       DO WHILE .T.
-
-         IF ( tmp := hb_At( '#include "', cFile, nPos ) ) > 0
-            nPos := tmp + Len( '#include "' )
-            IF ( tmp := hb_At( '"', cFile, nPos ) ) > 0
-               cHeader := SubStr( cFile, nPos, tmp - nPos )
+         IF ( tmp := hb_At( '#include ', cFile, nPos ) ) > 0
+            nPos := tmp + Len( '#include ' )
+            tmp := SubStr( cFile, nPos, 1 )
+            ++nPos
+            IF tmp $ '"<'
+               IF ( tmp := hb_At( iif( tmp == "<", ">", '"' ), cFile, nPos ) ) > 0
+                  cHeader := SubStr( cFile, nPos, tmp - nPos )
+                  nPos := tmp
+               ENDIF
             ENDIF
          ELSE
             EXIT