diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ef2727df60..03a9c43975 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,37 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-07 17:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbhpdf/hbhpdf.hbp
+  * contrib/hbhpdf/hbhpdf.hbc
+
+  * contrib/hbexpat/3rd/expat/expat.hbc
+    ! Fixed for 'HB_BUILD_CONTRIB_DYN=yes'
+
+  * external/Makefile
+  - external/libhpdf
+  + contrib/hbhpdf/3rd
+  + contrib/hbhpdf/3rd/libhpdf
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+    * Moved to contrib local dir.
+    + Added support for 'HB_BUILD_CONTRIB_DYN=yes'
+
+  * contrib/hbhpdf/3rd/libhpdf/hpdf.h
+    ! Fixed for dynamic build.
+    ; TODO: Regenerate .dif. For me it restored original copy for some reason :(
+
+  * contrib/hbsqlit3/hbsqlit3.hbc
+  * contrib/sddsqlt3/sddsqlt3.hbc
+    * Using .hbc file for 3rd party lib.
+
+  * contrib/3rd/sqlite3/sqlite3.hbp
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+  * contrib/hbmzip/3rd/minizip/minizip.hbp
+  * contrib/hbexpat/3rd/expat/expat.hbp
+    ! Changed -warn=no to -warn=low, which is equivalent to 'HB_BUILD_WARN := no'
+      in Makefile.
+
 2010-11-07 16:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   - external/sqlite3
     * Wrestle with svn and its bl$dy tree conflicts.
diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp
index c57879d4a9..999bbf0baf 100644
--- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp
+++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp
@@ -16,7 +16,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 -cflag=-DSQLITE_OMIT_DEPRECATED
diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbc b/harbour/contrib/hbexpat/3rd/expat/expat.hbc
index 1763330ae6..86f6254c46 100644
--- a/harbour/contrib/hbexpat/3rd/expat/expat.hbc
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbp b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
index b53e6a6072..b6dad1d096 100644
--- a/harbour/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
@@ -9,7 +9,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 
 xmlparse.c
 xmlrole.c
diff --git a/harbour/external/libhpdf/Makefile b/harbour/contrib/hbhpdf/3rd/libhpdf/Makefile
similarity index 100%
rename from harbour/external/libhpdf/Makefile
rename to harbour/contrib/hbhpdf/3rd/libhpdf/Makefile
diff --git a/harbour/external/libhpdf/README b/harbour/contrib/hbhpdf/3rd/libhpdf/README
similarity index 100%
rename from harbour/external/libhpdf/README
rename to harbour/contrib/hbhpdf/3rd/libhpdf/README
diff --git a/harbour/external/libhpdf/_hbhbpdf.c b/harbour/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
similarity index 100%
rename from harbour/external/libhpdf/_hbhbpdf.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/_hbhbpdf.c
diff --git a/harbour/external/libhpdf/hpdf.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h
similarity index 99%
rename from harbour/external/libhpdf/hpdf.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h
index 1fa2b15ac1..b8b61118c5 100644
--- a/harbour/external/libhpdf/hpdf.h
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h
@@ -472,7 +472,7 @@ HPDF_Page_CreateURILinkAnnot  (HPDF_Page     page,
                                const char   *uri);
 
 
-HPDF_Annotation
+HPDF_EXPORT(HPDF_Annotation)
 HPDF_Page_CreateTextMarkupAnnot (HPDF_Page     page,
 								HPDF_Rect      rect,
 								const char     *text,
@@ -600,7 +600,7 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_Point rb, HPDF_Point rt, HPDF_Point lt); /* l-left, r-right, b-bottom, t-top positions */
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr, 
+HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr,
 					 	HPDF_Annotation	annot,
 					 	HPDF_Annotation	annot3d,
 					 	HPDF_Dict			view);
@@ -622,8 +622,8 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation  annot, const char* style);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_LineAnnot_SetPosition (HPDF_Annotation annot, 
-							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle, 
+HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
+							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
 							HPDF_Point endPoint, HPDF_LineAnnotEndingStyle endStyle);
 
 HPDF_EXPORT(HPDF_STATUS)
@@ -1440,17 +1440,16 @@ HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_ICC_LoadIccFromMem (HPDF_Doc   pdf,
                         HPDF_MMgr   mmgr,
                         HPDF_Stream iccdata,
-                        HPDF_Xref   xref, 
+                        HPDF_Xref   xref,
                         int         numcomponent);
 
 HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_LoadIccProfileFromFile  (HPDF_Doc  pdf,
                             const char* icc_file_name,
                                    int  numcomponent);
-                                   
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* _HPDF_H */
-
diff --git a/harbour/external/libhpdf/hpdfanno.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfanno.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.c
diff --git a/harbour/external/libhpdf/hpdfanno.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfanno.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfanno.h
diff --git a/harbour/external/libhpdf/hpdfarra.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfarra.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfarra.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfarra.c
diff --git a/harbour/external/libhpdf/hpdfbina.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbina.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfbina.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbina.c
diff --git a/harbour/external/libhpdf/hpdfbool.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbool.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfbool.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfbool.c
diff --git a/harbour/external/libhpdf/hpdfcata.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfcata.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.c
diff --git a/harbour/external/libhpdf/hpdfcata.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfcata.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcata.h
diff --git a/harbour/external/libhpdf/hpdfcfg.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfcfg.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcfg.h
diff --git a/harbour/external/libhpdf/hpdfconf.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfconf.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfconf.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfconf.h
diff --git a/harbour/external/libhpdf/hpdfcons.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfcons.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfcons.h
diff --git a/harbour/external/libhpdf/hpdfdest.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfdest.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.c
diff --git a/harbour/external/libhpdf/hpdfdest.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfdest.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdest.h
diff --git a/harbour/external/libhpdf/hpdfdict.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdict.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfdict.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdict.c
diff --git a/harbour/external/libhpdf/hpdfdoc.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfdoc.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.c
diff --git a/harbour/external/libhpdf/hpdfdoc.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfdoc.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdoc.h
diff --git a/harbour/external/libhpdf/hpdfdocp.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfdocp.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfdocp.c
diff --git a/harbour/external/libhpdf/hpdfecy.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecy.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfecy.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecy.c
diff --git a/harbour/external/libhpdf/hpdfecyd.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfecyd.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfecyd.c
diff --git a/harbour/external/libhpdf/hpdfencc.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencc.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfencc.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencc.c
diff --git a/harbour/external/libhpdf/hpdfencj.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencj.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfencj.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencj.c
diff --git a/harbour/external/libhpdf/hpdfenck.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenck.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfenck.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenck.c
diff --git a/harbour/external/libhpdf/hpdfencn.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencn.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfencn.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencn.c
diff --git a/harbour/external/libhpdf/hpdfenco.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfenco.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.c
diff --git a/harbour/external/libhpdf/hpdfenco.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfenco.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfenco.h
diff --git a/harbour/external/libhpdf/hpdfencr.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencr.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfencr.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfencr.h
diff --git a/harbour/external/libhpdf/hpdfency.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfency.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfency.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfency.h
diff --git a/harbour/external/libhpdf/hpdferro.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.c
similarity index 100%
rename from harbour/external/libhpdf/hpdferro.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.c
diff --git a/harbour/external/libhpdf/hpdferro.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.h
similarity index 100%
rename from harbour/external/libhpdf/hpdferro.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdferro.h
diff --git a/harbour/external/libhpdf/hpdfextg.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfextg.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.c
diff --git a/harbour/external/libhpdf/hpdfextg.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfextg.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfextg.h
diff --git a/harbour/external/libhpdf/hpdffdf.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdf.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf.c
diff --git a/harbour/external/libhpdf/hpdffdf1.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdf1.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdf1.c
diff --git a/harbour/external/libhpdf/hpdffdfb.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfb.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfb.c
diff --git a/harbour/external/libhpdf/hpdffdfc.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfc.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfc.c
diff --git a/harbour/external/libhpdf/hpdffdfi.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfi.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfi.c
diff --git a/harbour/external/libhpdf/hpdffdfj.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfj.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfj.c
diff --git a/harbour/external/libhpdf/hpdffdfk.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfk.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfk.c
diff --git a/harbour/external/libhpdf/hpdffdfn.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdfn.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdfn.c
diff --git a/harbour/external/libhpdf/hpdffdft.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdft.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffdft.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffdft.c
diff --git a/harbour/external/libhpdf/hpdffon1.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffon1.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffon1.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffon1.c
diff --git a/harbour/external/libhpdf/hpdffonc.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffonc.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffonc.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffonc.c
diff --git a/harbour/external/libhpdf/hpdffond.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffond.h
similarity index 100%
rename from harbour/external/libhpdf/hpdffond.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffond.h
diff --git a/harbour/external/libhpdf/hpdffont.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffont.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.c
diff --git a/harbour/external/libhpdf/hpdffont.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.h
similarity index 100%
rename from harbour/external/libhpdf/hpdffont.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffont.h
diff --git a/harbour/external/libhpdf/hpdffott.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdffott.c
similarity index 100%
rename from harbour/external/libhpdf/hpdffott.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdffott.c
diff --git a/harbour/external/libhpdf/hpdfgsta.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfgsta.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.c
diff --git a/harbour/external/libhpdf/hpdfgsta.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfgsta.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfgsta.h
diff --git a/harbour/external/libhpdf/hpdfimag.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfimag.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.c
diff --git a/harbour/external/libhpdf/hpdfimag.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfimag.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimag.h
diff --git a/harbour/external/libhpdf/hpdfimap.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimap.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfimap.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfimap.c
diff --git a/harbour/external/libhpdf/hpdfinfo.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfinfo.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.c
diff --git a/harbour/external/libhpdf/hpdfinfo.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfinfo.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfinfo.h
diff --git a/harbour/external/libhpdf/hpdflist.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.c
similarity index 100%
rename from harbour/external/libhpdf/hpdflist.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.c
diff --git a/harbour/external/libhpdf/hpdflist.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.h
similarity index 100%
rename from harbour/external/libhpdf/hpdflist.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdflist.h
diff --git a/harbour/external/libhpdf/hpdfmmgr.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfmmgr.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.c
diff --git a/harbour/external/libhpdf/hpdfmmgr.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfmmgr.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfmmgr.h
diff --git a/harbour/external/libhpdf/hpdfname.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfname.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfname.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfname.c
diff --git a/harbour/external/libhpdf/hpdfndic.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfndic.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.c
diff --git a/harbour/external/libhpdf/hpdfndic.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfndic.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfndic.h
diff --git a/harbour/external/libhpdf/hpdfnull.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnull.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfnull.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnull.c
diff --git a/harbour/external/libhpdf/hpdfnumb.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfnumb.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfnumb.c
diff --git a/harbour/external/libhpdf/hpdfobje.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfobje.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.c
diff --git a/harbour/external/libhpdf/hpdfobje.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfobje.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfobje.h
diff --git a/harbour/external/libhpdf/hpdfoutl.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfoutl.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.c
diff --git a/harbour/external/libhpdf/hpdfoutl.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfoutl.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfoutl.h
diff --git a/harbour/external/libhpdf/hpdfpage.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfpage.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.c
diff --git a/harbour/external/libhpdf/hpdfpage.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfpage.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpage.h
diff --git a/harbour/external/libhpdf/hpdfpago.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfpago.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpago.c
diff --git a/harbour/external/libhpdf/hpdfpags.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfpags.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.c
diff --git a/harbour/external/libhpdf/hpdfpags.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfpags.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpags.h
diff --git a/harbour/external/libhpdf/hpdfpdfa.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfpdfa.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.c
diff --git a/harbour/external/libhpdf/hpdfpdfa.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfpdfa.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfpdfa.h
diff --git a/harbour/external/libhpdf/hpdfreal.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfreal.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfreal.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfreal.c
diff --git a/harbour/external/libhpdf/hpdfstre.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfstre.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.c
diff --git a/harbour/external/libhpdf/hpdfstre.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfstre.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstre.h
diff --git a/harbour/external/libhpdf/hpdfstri.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstri.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfstri.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfstri.c
diff --git a/harbour/external/libhpdf/hpdftype.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdftype.h
similarity index 100%
rename from harbour/external/libhpdf/hpdftype.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdftype.h
diff --git a/harbour/external/libhpdf/hpdfu3d.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfu3d.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.c
diff --git a/harbour/external/libhpdf/hpdfu3d.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfu3d.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfu3d.h
diff --git a/harbour/external/libhpdf/hpdfutil.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfutil.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.c
diff --git a/harbour/external/libhpdf/hpdfutil.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfutil.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfutil.h
diff --git a/harbour/external/libhpdf/hpdfvers.h b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h
similarity index 100%
rename from harbour/external/libhpdf/hpdfvers.h
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfvers.h
diff --git a/harbour/external/libhpdf/hpdfxref.c b/harbour/contrib/hbhpdf/3rd/libhpdf/hpdfxref.c
similarity index 100%
rename from harbour/external/libhpdf/hpdfxref.c
rename to harbour/contrib/hbhpdf/3rd/libhpdf/hpdfxref.c
diff --git a/harbour/external/libhpdf/libhpdf.dif b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
similarity index 100%
rename from harbour/external/libhpdf/libhpdf.dif
rename to harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
new file mode 100644
index 0000000000..eee3798c29
--- /dev/null
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+libs=${hb_name}${__HB_DYN__}
+libs=png
diff --git a/harbour/external/libhpdf/libhpdf.hbp b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
similarity index 97%
rename from harbour/external/libhpdf/libhpdf.hbp
rename to harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
index 34f652d1dc..761a5b1fdb 100644
--- a/harbour/external/libhpdf/libhpdf.hbp
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
@@ -9,7 +9,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 -depkeyhead=png:png.h
@@ -17,7 +17,7 @@
 -depcontrol=png:${HB_WITH_PNG}
 -depincpath=png:/usr/include
 -depincpath=png:/opt/local/include
--depincpathlocal=png:../../external/png
+-depincpathlocal=png:../../../../external/png
 
 # This is a dependency of png
 -depkeyhead=zlib:zlib.h
@@ -26,11 +26,11 @@
 -depincpath=zlib:/usr/include
 -depincpath=zlib:/usr/local/include
 -depincpath=zlib:/boot/develop/headers/3rdparty
--depincpathlocal=zlib:../../external/zlib
+-depincpathlocal=zlib:../../../../external/zlib
 
 # Suppress deprecated warnings until libharu gets updated for latest libpng
 -cflag=-DPNG_NO_PEDANTIC_WARNINGS
--cflag=-DHPDF_DLL_MAKE{hbdyn}
+-cflag=-DHPDF_DLL_MAKE_CDECL{hbdyn}
 -cflag=-U__COREDLL__{mingwarm}
 
 _hbhbpdf.c
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbc b/harbour/contrib/hbhpdf/hbhpdf.hbc
index 9f5a214632..331a16f154 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbc
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbc
@@ -5,5 +5,4 @@
 incpaths=.
 
 libs=${hb_name}${__HB_DYN__}
-libs=libhpdf
-libs=png
+libs=3rd/libhpdf/libhpdf.hbc
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp
index bbd97a20fb..01ec86554a 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbp
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbp
@@ -21,3 +21,5 @@
 -instfile=inc:harupdf.ch
 
 harupdf.c
+
+3rd/libhpdf/libhpdf.hbc
diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
index d24b602f09..88204d1e4d 100644
--- a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
+++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
@@ -7,7 +7,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 ioapi.c
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
index 540f95f6b8..79c8ac4fbe 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbc
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
@@ -5,4 +5,4 @@
 incpaths=.
 
 libs=${hb_name}${__HB_DYN__}
-libs=sqlite3
+libs=../3rd/sqlite3/sqlite3.hbc
diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbc b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
index 41f30bc1d7..18403c41db 100644
--- a/harbour/contrib/sddsqlt3/sddsqlt3.hbc
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
@@ -3,6 +3,6 @@
 #
 
 libs=${hb_name}${__HB_DYN__}
-libs=sqlite3
+libs=../3rd/sqlite3/sqlite3.hbc
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/external/Makefile b/harbour/external/Makefile
index b415e9cefc..52f8b9dc49 100644
--- a/harbour/external/Makefile
+++ b/harbour/external/Makefile
@@ -6,7 +6,6 @@ ROOT := ../
 
 DIRS := \
    bzip2 \
-   libhpdf \
    hbpmcom \
    png \
    jpeg \
diff --git a/harbour/external/libhpdf/libhpdf.hbc b/harbour/external/libhpdf/libhpdf.hbc
deleted file mode 100644
index 1763330ae6..0000000000
--- a/harbour/external/libhpdf/libhpdf.hbc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-libs=${hb_name}