diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1de13050d0..df6428d2c9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-05 18:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbexpat/hbexpat.hbp
+  * contrib/hbexpat/hbexpat.hbc
+  - contrib/hbexpat/expat
+  + contrib/hbexpat/3rd
+  + contrib/hbexpat/3rd/expat
+    * Moved expat 3rd party code under '3rd' dir.
+
+  * contrib/hbexpat/hbexpat.hbp
+  + contrib/hbexpat/hbexpat.hbx
+  + contrib/hbexpat/hbexpatx.prg
+    + Added .hbx and extern puller harness.
+
 2010-11-05 16:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbexpat/hbexpat.hbp
     ! Minor typo.
diff --git a/harbour/contrib/hbexpat/expat/COPYING b/harbour/contrib/hbexpat/3rd/expat/COPYING
similarity index 100%
rename from harbour/contrib/hbexpat/expat/COPYING
rename to harbour/contrib/hbexpat/3rd/expat/COPYING
diff --git a/harbour/contrib/hbexpat/expat/amigacon.h b/harbour/contrib/hbexpat/3rd/expat/amigacon.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/amigacon.h
rename to harbour/contrib/hbexpat/3rd/expat/amigacon.h
diff --git a/harbour/contrib/hbexpat/expat/ascii.h b/harbour/contrib/hbexpat/3rd/expat/ascii.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/ascii.h
rename to harbour/contrib/hbexpat/3rd/expat/ascii.h
diff --git a/harbour/contrib/hbexpat/expat/asciitab.h b/harbour/contrib/hbexpat/3rd/expat/asciitab.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/asciitab.h
rename to harbour/contrib/hbexpat/3rd/expat/asciitab.h
diff --git a/harbour/contrib/hbexpat/expat/expat.h b/harbour/contrib/hbexpat/3rd/expat/expat.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/expat.h
rename to harbour/contrib/hbexpat/3rd/expat/expat.h
diff --git a/harbour/contrib/hbexpat/expat/expat.hbc b/harbour/contrib/hbexpat/3rd/expat/expat.hbc
similarity index 100%
rename from harbour/contrib/hbexpat/expat/expat.hbc
rename to harbour/contrib/hbexpat/3rd/expat/expat.hbc
diff --git a/harbour/contrib/hbexpat/expat/expat.hbp b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
similarity index 100%
rename from harbour/contrib/hbexpat/expat/expat.hbp
rename to harbour/contrib/hbexpat/3rd/expat/expat.hbp
diff --git a/harbour/contrib/hbexpat/expat/expat_ex.h b/harbour/contrib/hbexpat/3rd/expat/expat_ex.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/expat_ex.h
rename to harbour/contrib/hbexpat/3rd/expat/expat_ex.h
diff --git a/harbour/contrib/hbexpat/expat/iasciita.h b/harbour/contrib/hbexpat/3rd/expat/iasciita.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/iasciita.h
rename to harbour/contrib/hbexpat/3rd/expat/iasciita.h
diff --git a/harbour/contrib/hbexpat/expat/internal.h b/harbour/contrib/hbexpat/3rd/expat/internal.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/internal.h
rename to harbour/contrib/hbexpat/3rd/expat/internal.h
diff --git a/harbour/contrib/hbexpat/expat/latin1ta.h b/harbour/contrib/hbexpat/3rd/expat/latin1ta.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/latin1ta.h
rename to harbour/contrib/hbexpat/3rd/expat/latin1ta.h
diff --git a/harbour/contrib/hbexpat/expat/macconfi.h b/harbour/contrib/hbexpat/3rd/expat/macconfi.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/macconfi.h
rename to harbour/contrib/hbexpat/3rd/expat/macconfi.h
diff --git a/harbour/contrib/hbexpat/expat/nametab.h b/harbour/contrib/hbexpat/3rd/expat/nametab.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/nametab.h
rename to harbour/contrib/hbexpat/3rd/expat/nametab.h
diff --git a/harbour/contrib/hbexpat/expat/utf8tab.h b/harbour/contrib/hbexpat/3rd/expat/utf8tab.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/utf8tab.h
rename to harbour/contrib/hbexpat/3rd/expat/utf8tab.h
diff --git a/harbour/contrib/hbexpat/expat/winconfi.h b/harbour/contrib/hbexpat/3rd/expat/winconfi.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/winconfi.h
rename to harbour/contrib/hbexpat/3rd/expat/winconfi.h
diff --git a/harbour/contrib/hbexpat/expat/xmlparse.c b/harbour/contrib/hbexpat/3rd/expat/xmlparse.c
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmlparse.c
rename to harbour/contrib/hbexpat/3rd/expat/xmlparse.c
diff --git a/harbour/contrib/hbexpat/expat/xmlrole.c b/harbour/contrib/hbexpat/3rd/expat/xmlrole.c
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmlrole.c
rename to harbour/contrib/hbexpat/3rd/expat/xmlrole.c
diff --git a/harbour/contrib/hbexpat/expat/xmlrole.h b/harbour/contrib/hbexpat/3rd/expat/xmlrole.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmlrole.h
rename to harbour/contrib/hbexpat/3rd/expat/xmlrole.h
diff --git a/harbour/contrib/hbexpat/expat/xmltok.c b/harbour/contrib/hbexpat/3rd/expat/xmltok.c
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmltok.c
rename to harbour/contrib/hbexpat/3rd/expat/xmltok.c
diff --git a/harbour/contrib/hbexpat/expat/xmltok.h b/harbour/contrib/hbexpat/3rd/expat/xmltok.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmltok.h
rename to harbour/contrib/hbexpat/3rd/expat/xmltok.h
diff --git a/harbour/contrib/hbexpat/expat/xmltok_i.c b/harbour/contrib/hbexpat/3rd/expat/xmltok_i.c
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmltok_i.c
rename to harbour/contrib/hbexpat/3rd/expat/xmltok_i.c
diff --git a/harbour/contrib/hbexpat/expat/xmltok_i.h b/harbour/contrib/hbexpat/3rd/expat/xmltok_i.h
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmltok_i.h
rename to harbour/contrib/hbexpat/3rd/expat/xmltok_i.h
diff --git a/harbour/contrib/hbexpat/expat/xmltok_n.c b/harbour/contrib/hbexpat/3rd/expat/xmltok_n.c
similarity index 100%
rename from harbour/contrib/hbexpat/expat/xmltok_n.c
rename to harbour/contrib/hbexpat/3rd/expat/xmltok_n.c
diff --git a/harbour/contrib/hbexpat/hbexpat.hbc b/harbour/contrib/hbexpat/hbexpat.hbc
index 1ffde7b779..4329c085df 100644
--- a/harbour/contrib/hbexpat/hbexpat.hbc
+++ b/harbour/contrib/hbexpat/hbexpat.hbc
@@ -5,4 +5,4 @@
 incpaths=.
 
 libs=${hb_name}
-libs=expat/expat.hbc
+libs=3rd/expat/expat.hbc
diff --git a/harbour/contrib/hbexpat/hbexpat.hbp b/harbour/contrib/hbexpat/hbexpat.hbp
index 4b5762993b..c3f0dace68 100644
--- a/harbour/contrib/hbexpat/hbexpat.hbp
+++ b/harbour/contrib/hbexpat/hbexpat.hbp
@@ -13,13 +13,14 @@
 -depcontrol=expat:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=expat:${HB_WITH_EXPAT}
 -depincpath=expat:/usr/include
--depincpathlocal=expat:expat
-#-depincpathlocal=expat:../../external/expat
+-depincpathlocal=expat:3rd/expat
 
 -instfile=inc:hbexpat.ch
+-instfile=inc:hbexpatx.ch
 
 hbexpat.c
 hbexpatc.c
 hbexpatp.prg
+hbexpatx.prg
 
-expat/expat.hbc
+3rd/expat/expat.hbc
diff --git a/harbour/contrib/hbexpat/hbexpat.hbx b/harbour/contrib/hbexpat/hbexpat.hbx
new file mode 100644
index 0000000000..548bffe1e1
--- /dev/null
+++ b/harbour/contrib/hbexpat/hbexpat.hbx
@@ -0,0 +1,86 @@
+/*
+ * $Id$
+ */
+
+/* -------------------------------------------------------------------- */
+/* NOTE: You can add manual override which functions to include or      */
+/*       exclude from automatically generated EXTERNAL/DYNAMIC list.    */
+/*          Syntax: // HB_FUNC_INCLUDE <func>                           */
+/*                  // HB_FUNC_EXCLUDE <func>                           */
+/* -------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------- */
+/* WARNING: Automatically generated code below. DO NOT EDIT!            */
+/*          Regenerate with HB_REBUILD_EXTERN=yes while using GCC       */
+/*          compiler family. [vszakats]                                 */
+/* -------------------------------------------------------------------- */
+
+#ifndef __HBEXTERN_CH__HBEXPAT__
+#define __HBEXTERN_CH__HBEXPAT__
+
+#ifdef __HBEXTERN__HBEXPAT__ANNOUNCE
+   ANNOUNCE __HBEXTERN__HBEXPAT__
+#endif
+
+#ifdef __HBEXTERN__HBEXPAT__REQUEST
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC HB_XML_EXPATVERSIONINFO
+DYNAMIC HB_XML_GET_UNICODE_TABLE
+DYNAMIC XML_DEFAULTCURRENT
+DYNAMIC XML_ERRORSTRING
+DYNAMIC XML_EXPATVERSION
+DYNAMIC XML_EXPATVERSIONINFO
+DYNAMIC XML_GETBASE
+DYNAMIC XML_GETCURRENTBYTECOUNT
+DYNAMIC XML_GETCURRENTBYTEINDEX
+DYNAMIC XML_GETCURRENTCOLUMNNUMBER
+DYNAMIC XML_GETCURRENTLINENUMBER
+DYNAMIC XML_GETERRORCODE
+DYNAMIC XML_GETIDATTRIBUTEINDEX
+DYNAMIC XML_GETPARSINGSTATUS
+DYNAMIC XML_GETSPECIFIEDATTRIBUTECOUNT
+DYNAMIC XML_GETUSERDATA
+DYNAMIC XML_PARSE
+DYNAMIC XML_PARSERCREATE
+DYNAMIC XML_PARSERESET
+DYNAMIC XML_PARSERFREE
+DYNAMIC XML_RESUMEPARSER
+DYNAMIC XML_SETATTLISTDECLHANDLER
+DYNAMIC XML_SETBASE
+DYNAMIC XML_SETCDATASECTIONHANDLER
+DYNAMIC XML_SETCHARACTERDATAHANDLER
+DYNAMIC XML_SETCOMMENTHANDLER
+DYNAMIC XML_SETDEFAULTHANDLER
+DYNAMIC XML_SETDEFAULTHANDLEREXPAND
+DYNAMIC XML_SETELEMENTHANDLER
+DYNAMIC XML_SETENCODING
+DYNAMIC XML_SETENDCDATASECTIONHANDLER
+DYNAMIC XML_SETENDDOCTYPEDECLHANDLER
+DYNAMIC XML_SETENDELEMENTHANDLER
+DYNAMIC XML_SETENDNAMESPACEDECLHANDLER
+DYNAMIC XML_SETENTITYDECLHANDLER
+DYNAMIC XML_SETNAMESPACEDECLHANDLER
+DYNAMIC XML_SETNOTATIONDECLHANDLER
+DYNAMIC XML_SETNOTSTANDALONEHANDLER
+DYNAMIC XML_SETPARAMENTITYPARSING
+DYNAMIC XML_SETPROCESSINGINSTRUCTIONHANDLER
+DYNAMIC XML_SETRETURNNSTRIPLET
+DYNAMIC XML_SETSKIPPEDENTITYHANDLER
+DYNAMIC XML_SETSTARTCDATASECTIONHANDLER
+DYNAMIC XML_SETSTARTDOCTYPEDECLHANDLER
+DYNAMIC XML_SETSTARTELEMENTHANDLER
+DYNAMIC XML_SETSTARTNAMESPACEDECLHANDLER
+DYNAMIC XML_SETUNKNOWNENCODINGHANDLER
+DYNAMIC XML_SETUSERDATA
+DYNAMIC XML_SETXMLDECLHANDLER
+DYNAMIC XML_STOPPARSER
+DYNAMIC XML_USEFOREIGNDTD
+DYNAMIC __HB_XML_CDPU16MAP
+
+#ifdef __HBEXTERN__HBEXPAT__REQUEST
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif
diff --git a/harbour/contrib/hbexpat/hbexpatx.prg b/harbour/contrib/hbexpat/hbexpatx.prg
new file mode 100644
index 0000000000..da43383d44
--- /dev/null
+++ b/harbour/contrib/hbexpat/hbexpatx.prg
@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * extern puller
+ *
+ * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+ * www - http://harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#define __HBEXTERN__HBEXPAT__ANNOUNCE
+#define __HBEXTERN__HBEXPAT__REQUEST
+#include "hbexpat.hbx"