diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0656d3b292..583bc6c0c0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,124 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 02:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    + Make it capable to build project dependencies which are not on the
+      central project list. (this feature is used with hbqt)
+    + Added -shl to hbmk2 build calls.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added -shl option to show sub-project level in every output line.
+    + Added experimental -hbcontainer target mode, which is virtual target,
+      it won't create anything. Name not finalized yet.
+    + Normalizing some more paths.
+    ! Fixed not include the same plugin twice.
+    ! Some internal fixes to -hb<target> option handling. Could have caused
+      problems in rare situations.
+    % Minor optimizations.
+
+  * contrib/hbqt/utils/hbqtgen.prg
+    * Changed to generate hbqt.h header references without relative dir, so it
+      can now be freely solved using header dir options at build time.
+
+  - contrib/hbqt/hbmk2_plugin_qt.hbs
+  + contrib/hbqt/hbqt_hbmk2_plugin.hbs
+  * contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/hbqt_common.hbm
+    * Renamed.
+
+  * contrib/hbqt/qtcore/hbqtcore.hbc
+  * contrib/hbqt/qtgui/hbqtgui.hbc
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+    ! Readded previously deleted trick which is required for
+      successful dynlib link.
+
+  * contrib/hbplist
+  * contrib/hbqt/hbqt.hbp
+    + Modified how container project is defined.
+    * Now main container subproject is listed in central project list file.
+
+  * contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/qtgui/hbqtgui.hbp
+    - Moved -gui/-gtnul options inside hbqtgui.
+
+  * contrib/hbqt/hbqt_common.hbm
+    + Added hbqt root dir as header dir.
+
+  * contrib/hbqt/utils/qtcore.qtp
+  * contrib/hbqt/utils/qtgui.qtp
+  * contrib/hbqt/utils/qtnetwork.qtp
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/qtcore/hbqtcore.hbp
+  * contrib/hbqt/qtcore/hbqtcores.hbp
+  - contrib/hbqt/qtcore/*
+  + contrib/hbqt/qtcore/g
+  + contrib/hbqt/qtcore/g/*
+  * contrib/hbqt/qtgui/hbqtgui.hbp
+  * contrib/hbqt/qtgui/hbqtguis.hbp
+  - contrib/hbqt/qtgui/*
+  + contrib/hbqt/qtgui/g
+  + contrib/hbqt/qtgui/g/*
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+  * contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+  - contrib/hbqt/qtnetwork/*
+  + contrib/hbqt/qtnetwork/g
+  + contrib/hbqt/qtnetwork/g/*
+    * Moved generated sources inside 'g' subdir.
+    * Sources regenerated.
+
+  - contrib/hbqt/hbqt_base.cpp
+  - contrib/hbqt/hbqt_destruct.cpp
+  - contrib/hbqt/hbqt_hbevents.cpp
+  - contrib/hbqt/hbqt_hbevents.h
+  - contrib/hbqt/hbqt_hbslots.cpp
+  - contrib/hbqt/hbqt_hbslots.h
+  - contrib/hbqt/hbqt_misc.prg
+  - contrib/hbqt/hbqt_utils.cpp
+  + contrib/hbqt/qtcore/hbqt_base.cpp
+  + contrib/hbqt/qtcore/hbqt_destruct.cpp
+  + contrib/hbqt/qtcore/hbqt_hbevents.cpp
+  + contrib/hbqt/qtcore/hbqt_hbevents.h
+  + contrib/hbqt/qtcore/hbqt_hbslots.cpp
+  + contrib/hbqt/qtcore/hbqt_hbslots.h
+  + contrib/hbqt/qtcore/hbqt_misc.prg
+  + contrib/hbqt/qtcore/hbqt_utils.cpp
+  * contrib/hbqt/qtcore/hbqtcore.hbm
+    * Moved hbqtcore files to their own component subdir.
+
+  - contrib/hbqt/hbqt_errorsys.prg
+  - contrib/hbqt/hbqt_hbqabstractitemmodel.cpp
+  - contrib/hbqt/hbqt_hbqabstractitemmodel.h
+  - contrib/hbqt/hbqt_hbqmainwindow.cpp
+  - contrib/hbqt/hbqt_hbqmainwindow.h
+  - contrib/hbqt/hbqt_hbqplaintextedit.cpp
+  - contrib/hbqt/hbqt_hbqplaintextedit.h
+  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
+  - contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
+  - contrib/hbqt/hbqt_hbqtableview.cpp
+  - contrib/hbqt/hbqt_hbqtableview.h
+  - contrib/hbqt/THbQtUI.prg
+  + contrib/hbqt/qtgui/hbqt_errorsys.prg
+  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h
+  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqmainwindow.h
+  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
+  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h
+  + contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
+  + contrib/hbqt/qtgui/hbqt_hbqtableview.h
+  + contrib/hbqt/qtgui/THbQtUI.prg
+  * contrib/hbqt/qtgui/hbqtgui.hbm
+    * Moved hbqtgui files to their own component subdir.
+
+  - contrib/hbqt/qtdesigner/hbqtdesigner.qtp
+  - contrib/hbqt/qtwebkit/hbqtwebkit.qtp
+  + contrib/hbqt/utils/qtdesigner.qtp
+  + contrib/hbqt/utils/qtwebkit.qtp
+    * Moved .qtp files into utils subdir.
+
 2010-08-01 23:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - contrib/hbqt/generator
     - Deleted. [ Confused SVN ]
@@ -230,7 +348,7 @@
     still one issue.
 
   ; TODO: Further cleanup to file layout. Componentize docs,
-          qth files, move files in central dir to component dirs.
+          qth files, move files in central dir to component dirs. [DONE]
 
   ; TOFIX: hbqtcore references qtgui in QMESSAGEBOX() which is a
            hbqtgui function. This has to be fixed. hbqtcore.dll is
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index d0a4dc48a8..cd0aaac696 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -30,9 +30,7 @@ hbnetio/utils/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp
-hbqt/qtcore/hbqtcore.hbp
-hbqt/qtgui/hbqtgui.hbp
-hbqt/qtnetwork/hbqtnetwork.hbp
+hbqt/hbqt.hbp
 hbsms/hbsms.hbp
 hbsqlit3/hbsqlit3.hbp            # uses: sqlite3 (external)
 hbssl/hbssl.hbp
diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp
index ba96a42a78..7d118b6749 100644
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -7,6 +7,8 @@
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
-qtcore/hbqtcore.hbp
-qtgui/hbqtgui.hbp
-qtnetwork/hbqtnetwork.hbp
+-hbcontainer
+
+hbqtcore.hbc
+hbqtgui.hbc
+hbqtnetwork.hbc
diff --git a/harbour/contrib/hbqt/hbqt_common.hbc b/harbour/contrib/hbqt/hbqt_common.hbc
index 9f6dcf4ce4..f5213adccd 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbc
+++ b/harbour/contrib/hbqt/hbqt_common.hbc
@@ -11,7 +11,7 @@ stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this pl
 
 incpaths=.
 
-plugins=hbmk2_plugin_qt.hbs
+plugins=hbqt_hbmk2_plugin.hbs
 
 {msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
 
@@ -20,6 +20,3 @@ plugins=hbmk2_plugin_qt.hbs
 {allgcc}libs=supc++
 
 {win|os2}hbcppmm=yes
-
-gui=yes
-gt=gtnul
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index c69846e953..c5b3bd4b51 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -17,11 +17,13 @@
 
 -w3 -es2
 
+-i.
 -iqtcore
+-iqtcore/g
 
 -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
 
--plugin=hbmk2_plugin_qt.hbs
+-plugin=hbqt_hbmk2_plugin.hbs
 
 -depkeyhead=qt:QtCore/qglobal.h
 -depcontrol=qt:${HB_WITH_QT}
diff --git a/harbour/contrib/hbqt/hbmk2_plugin_qt.hbs b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs
similarity index 100%
rename from harbour/contrib/hbqt/hbmk2_plugin_qt.hbs
rename to harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs
diff --git a/harbour/contrib/hbqt/qtcore/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/HBEvents.cpp
rename to harbour/contrib/hbqt/qtcore/g/HBEvents.cpp
index c3b2fd8b2d..15a49505e1 100644
--- a/harbour/contrib/hbqt/qtcore/HBEvents.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/HBSlots.cpp
rename to harbour/contrib/hbqt/qtcore/g/HBSlots.cpp
index cde1f94569..9d50f1b3e6 100644
--- a/harbour/contrib/hbqt/qtcore/HBSlots.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
rename to harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
index 59542325da..a0273ad686 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
rename to harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
index d19cf0fd85..91cf0769ce 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
rename to harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
index 41784575fc..45af2f5702 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QBitArray.cpp
rename to harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
index ead9dc86b3..a2c8e68ced 100644
--- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QBuffer.cpp
rename to harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
index 550b6e0015..700d23f64e 100644
--- a/harbour/contrib/hbqt/qtcore/QBuffer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QByteArray.cpp
rename to harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
index f6cce6c9ec..db09014940 100644
--- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QChar.cpp b/harbour/contrib/hbqt/qtcore/g/QChar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QChar.cpp
rename to harbour/contrib/hbqt/qtcore/g/QChar.cpp
index 77707be18a..0b3cbf9649 100644
--- a/harbour/contrib/hbqt/qtcore/QChar.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QChar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
rename to harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
index c40cfcd60c..01b5ac7f0a 100644
--- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QDataStream.cpp
rename to harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
index a0f15ac9a5..9ed4034522 100644
--- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/g/QDate.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QDate.cpp
rename to harbour/contrib/hbqt/qtcore/g/QDate.cpp
index 3547df34fa..7ca69e38c2 100644
--- a/harbour/contrib/hbqt/qtcore/QDate.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDate.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QDateTime.cpp
rename to harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
index ac23ab698d..8040bb4465 100644
--- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/g/QDir.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QDir.cpp
rename to harbour/contrib/hbqt/qtcore/g/QDir.cpp
index 6655e82109..302a5a8212 100644
--- a/harbour/contrib/hbqt/qtcore/QDir.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QDir.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QEvent.cpp
rename to harbour/contrib/hbqt/qtcore/g/QEvent.cpp
index 01f473294c..588b1111df 100644
--- a/harbour/contrib/hbqt/qtcore/QEvent.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QEventLoop.cpp
rename to harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
index e7ad7500a3..fdefd6c6fd 100644
--- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QFile.cpp
rename to harbour/contrib/hbqt/qtcore/g/QFile.cpp
index 6f6e7f957d..fa42783707 100644
--- a/harbour/contrib/hbqt/qtcore/QFile.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QFile.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QFileInfo.cpp
rename to harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
index 6fed6b650d..520fae9ab9 100644
--- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QIODevice.cpp
rename to harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
index bd17f67995..de3a4e5ec4 100644
--- a/harbour/contrib/hbqt/qtcore/QIODevice.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
rename to harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
index 1e8b9bdc8a..4209186840 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QLatin1String.cpp
rename to harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
index ddf7d51a75..3a09879ad2 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/g/QLine.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QLine.cpp
rename to harbour/contrib/hbqt/qtcore/g/QLine.cpp
index cc499b78a1..b668fd05eb 100644
--- a/harbour/contrib/hbqt/qtcore/QLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLine.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QLineF.cpp
rename to harbour/contrib/hbqt/qtcore/g/QLineF.cpp
index e13ce2c944..515bd76383 100644
--- a/harbour/contrib/hbqt/qtcore/QLineF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/g/QList.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QList.cpp
rename to harbour/contrib/hbqt/qtcore/g/QList.cpp
index ec2745c0c6..9507ba9403 100644
--- a/harbour/contrib/hbqt/qtcore/QList.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QList.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QLocale.cpp
rename to harbour/contrib/hbqt/qtcore/g/QLocale.cpp
index a00c0da03d..1615bf4e9e 100644
--- a/harbour/contrib/hbqt/qtcore/QLocale.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QMimeData.cpp
rename to harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
index 107113b775..9f06720346 100644
--- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QModelIndex.cpp
rename to harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
index 77301394b7..7c0a8b973b 100644
--- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QObject.cpp
rename to harbour/contrib/hbqt/qtcore/g/QObject.cpp
index 734143829a..e2eafa9672 100644
--- a/harbour/contrib/hbqt/qtcore/QObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QPoint.cpp
rename to harbour/contrib/hbqt/qtcore/g/QPoint.cpp
index 5ae0b1676a..ccc9b467e0 100644
--- a/harbour/contrib/hbqt/qtcore/QPoint.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QPointF.cpp
rename to harbour/contrib/hbqt/qtcore/g/QPointF.cpp
index 03951fb25e..e439bbbf42 100644
--- a/harbour/contrib/hbqt/qtcore/QPointF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QProcess.cpp
rename to harbour/contrib/hbqt/qtcore/g/QProcess.cpp
index a71f386684..e9911e0c18 100644
--- a/harbour/contrib/hbqt/qtcore/QProcess.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/g/QRect.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QRect.cpp
rename to harbour/contrib/hbqt/qtcore/g/QRect.cpp
index 008b5e284d..e8439cde47 100644
--- a/harbour/contrib/hbqt/qtcore/QRect.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRect.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QRectF.cpp
rename to harbour/contrib/hbqt/qtcore/g/QRectF.cpp
index 075181636a..761ff361d5 100644
--- a/harbour/contrib/hbqt/qtcore/QRectF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QRegExp.cpp
rename to harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
index 635f777f8e..8e2253f15e 100644
--- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/g/QResource.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QResource.cpp
rename to harbour/contrib/hbqt/qtcore/g/QResource.cpp
index 2160fe63ac..71288649a0 100644
--- a/harbour/contrib/hbqt/qtcore/QResource.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QResource.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QSettings.cpp
rename to harbour/contrib/hbqt/qtcore/g/QSettings.cpp
index a2909913ce..f1729d632b 100644
--- a/harbour/contrib/hbqt/qtcore/QSettings.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
rename to harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
index f47dd8dcec..63b197b583 100644
--- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/g/QSize.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QSize.cpp
rename to harbour/contrib/hbqt/qtcore/g/QSize.cpp
index e69de64e54..1d0348d678 100644
--- a/harbour/contrib/hbqt/qtcore/QSize.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSize.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QSizeF.cpp
rename to harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
index 278b8b3b48..8fdc762ff9 100644
--- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QStringList.cpp
rename to harbour/contrib/hbqt/qtcore/g/QStringList.cpp
index 11221e5dcd..4af501e612 100644
--- a/harbour/contrib/hbqt/qtcore/QStringList.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
index ca67007711..5ee55aa2bf 100644
--- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTextCodec.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
index fb5e90168e..7c327d38b5 100644
--- a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
index a5040fcce7..5ce41ba3dc 100644
--- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
index 935f63dc71..7b465e764b 100644
--- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTextStream.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
index 6791ef0ab0..b5d34796b1 100644
--- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QThread.cpp
rename to harbour/contrib/hbqt/qtcore/g/QThread.cpp
index 3f323592d9..d46981be3f 100644
--- a/harbour/contrib/hbqt/qtcore/QThread.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QThread.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/g/QTime.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTime.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTime.cpp
index 5bb969d299..91d512d01d 100644
--- a/harbour/contrib/hbqt/qtcore/QTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTime.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTimer.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTimer.cpp
index 9f7935436e..e361c1c26e 100644
--- a/harbour/contrib/hbqt/qtcore/QTimer.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QTranslator.cpp
rename to harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
index 95b8151a60..222ec271c2 100644
--- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QUrl.cpp
rename to harbour/contrib/hbqt/qtcore/g/QUrl.cpp
index e1a1f52d8f..f83f2f12f5 100644
--- a/harbour/contrib/hbqt/qtcore/QUrl.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/QVariant.cpp
rename to harbour/contrib/hbqt/qtcore/g/QVariant.cpp
index 424ed92fe2..7026329e89 100644
--- a/harbour/contrib/hbqt/qtcore/QVariant.cpp
+++ b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtcore_garbage.h"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/qtcore/THBEvents.prg b/harbour/contrib/hbqt/qtcore/g/THBEvents.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/THBEvents.prg
rename to harbour/contrib/hbqt/qtcore/g/THBEvents.prg
diff --git a/harbour/contrib/hbqt/qtcore/THBSlots.prg b/harbour/contrib/hbqt/qtcore/g/THBSlots.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/THBSlots.prg
rename to harbour/contrib/hbqt/qtcore/g/THBSlots.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg b/harbour/contrib/hbqt/qtcore/g/TQAbstractItemModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg
rename to harbour/contrib/hbqt/qtcore/g/TQAbstractItemModel.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg b/harbour/contrib/hbqt/qtcore/g/TQAbstractListModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg
rename to harbour/contrib/hbqt/qtcore/g/TQAbstractListModel.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg b/harbour/contrib/hbqt/qtcore/g/TQAbstractTableModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg
rename to harbour/contrib/hbqt/qtcore/g/TQAbstractTableModel.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQBitArray.prg b/harbour/contrib/hbqt/qtcore/g/TQBitArray.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQBitArray.prg
rename to harbour/contrib/hbqt/qtcore/g/TQBitArray.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQBuffer.prg b/harbour/contrib/hbqt/qtcore/g/TQBuffer.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQBuffer.prg
rename to harbour/contrib/hbqt/qtcore/g/TQBuffer.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQByteArray.prg b/harbour/contrib/hbqt/qtcore/g/TQByteArray.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQByteArray.prg
rename to harbour/contrib/hbqt/qtcore/g/TQByteArray.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQChar.prg b/harbour/contrib/hbqt/qtcore/g/TQChar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQChar.prg
rename to harbour/contrib/hbqt/qtcore/g/TQChar.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg b/harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQCoreApplication.prg
rename to harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQDataStream.prg b/harbour/contrib/hbqt/qtcore/g/TQDataStream.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQDataStream.prg
rename to harbour/contrib/hbqt/qtcore/g/TQDataStream.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQDate.prg b/harbour/contrib/hbqt/qtcore/g/TQDate.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQDate.prg
rename to harbour/contrib/hbqt/qtcore/g/TQDate.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQDateTime.prg b/harbour/contrib/hbqt/qtcore/g/TQDateTime.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQDateTime.prg
rename to harbour/contrib/hbqt/qtcore/g/TQDateTime.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQDir.prg b/harbour/contrib/hbqt/qtcore/g/TQDir.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQDir.prg
rename to harbour/contrib/hbqt/qtcore/g/TQDir.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQEvent.prg b/harbour/contrib/hbqt/qtcore/g/TQEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQEvent.prg
rename to harbour/contrib/hbqt/qtcore/g/TQEvent.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQEventLoop.prg b/harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQEventLoop.prg
rename to harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQFile.prg b/harbour/contrib/hbqt/qtcore/g/TQFile.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQFile.prg
rename to harbour/contrib/hbqt/qtcore/g/TQFile.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQFileInfo.prg b/harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQFileInfo.prg
rename to harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQIODevice.prg b/harbour/contrib/hbqt/qtcore/g/TQIODevice.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQIODevice.prg
rename to harbour/contrib/hbqt/qtcore/g/TQIODevice.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg b/harbour/contrib/hbqt/qtcore/g/TQLatin1Char.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQLatin1Char.prg
rename to harbour/contrib/hbqt/qtcore/g/TQLatin1Char.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1String.prg b/harbour/contrib/hbqt/qtcore/g/TQLatin1String.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQLatin1String.prg
rename to harbour/contrib/hbqt/qtcore/g/TQLatin1String.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQLine.prg b/harbour/contrib/hbqt/qtcore/g/TQLine.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQLine.prg
rename to harbour/contrib/hbqt/qtcore/g/TQLine.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQLineF.prg b/harbour/contrib/hbqt/qtcore/g/TQLineF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQLineF.prg
rename to harbour/contrib/hbqt/qtcore/g/TQLineF.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQList.prg b/harbour/contrib/hbqt/qtcore/g/TQList.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQList.prg
rename to harbour/contrib/hbqt/qtcore/g/TQList.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQLocale.prg b/harbour/contrib/hbqt/qtcore/g/TQLocale.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQLocale.prg
rename to harbour/contrib/hbqt/qtcore/g/TQLocale.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQMimeData.prg b/harbour/contrib/hbqt/qtcore/g/TQMimeData.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQMimeData.prg
rename to harbour/contrib/hbqt/qtcore/g/TQMimeData.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQModelIndex.prg b/harbour/contrib/hbqt/qtcore/g/TQModelIndex.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQModelIndex.prg
rename to harbour/contrib/hbqt/qtcore/g/TQModelIndex.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQObject.prg b/harbour/contrib/hbqt/qtcore/g/TQObject.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQObject.prg
rename to harbour/contrib/hbqt/qtcore/g/TQObject.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQPoint.prg b/harbour/contrib/hbqt/qtcore/g/TQPoint.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQPoint.prg
rename to harbour/contrib/hbqt/qtcore/g/TQPoint.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQPointF.prg b/harbour/contrib/hbqt/qtcore/g/TQPointF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQPointF.prg
rename to harbour/contrib/hbqt/qtcore/g/TQPointF.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQProcess.prg b/harbour/contrib/hbqt/qtcore/g/TQProcess.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQProcess.prg
rename to harbour/contrib/hbqt/qtcore/g/TQProcess.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQRect.prg b/harbour/contrib/hbqt/qtcore/g/TQRect.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQRect.prg
rename to harbour/contrib/hbqt/qtcore/g/TQRect.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQRectF.prg b/harbour/contrib/hbqt/qtcore/g/TQRectF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQRectF.prg
rename to harbour/contrib/hbqt/qtcore/g/TQRectF.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQRegExp.prg b/harbour/contrib/hbqt/qtcore/g/TQRegExp.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQRegExp.prg
rename to harbour/contrib/hbqt/qtcore/g/TQRegExp.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQResource.prg b/harbour/contrib/hbqt/qtcore/g/TQResource.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQResource.prg
rename to harbour/contrib/hbqt/qtcore/g/TQResource.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQSettings.prg b/harbour/contrib/hbqt/qtcore/g/TQSettings.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQSettings.prg
rename to harbour/contrib/hbqt/qtcore/g/TQSettings.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg b/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQSignalMapper.prg
rename to harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQSize.prg b/harbour/contrib/hbqt/qtcore/g/TQSize.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQSize.prg
rename to harbour/contrib/hbqt/qtcore/g/TQSize.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQSizeF.prg b/harbour/contrib/hbqt/qtcore/g/TQSizeF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQSizeF.prg
rename to harbour/contrib/hbqt/qtcore/g/TQSizeF.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQStringList.prg b/harbour/contrib/hbqt/qtcore/g/TQStringList.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQStringList.prg
rename to harbour/contrib/hbqt/qtcore/g/TQStringList.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg b/harbour/contrib/hbqt/qtcore/g/TQTextBoundaryFinder.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTextBoundaryFinder.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTextCodec.prg b/harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTextCodec.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg b/harbour/contrib/hbqt/qtcore/g/TQTextDecoder.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTextDecoder.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTextDecoder.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg b/harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTextEncoder.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTextStream.prg b/harbour/contrib/hbqt/qtcore/g/TQTextStream.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTextStream.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTextStream.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQThread.prg b/harbour/contrib/hbqt/qtcore/g/TQThread.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQThread.prg
rename to harbour/contrib/hbqt/qtcore/g/TQThread.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTime.prg b/harbour/contrib/hbqt/qtcore/g/TQTime.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTime.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTime.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTimer.prg b/harbour/contrib/hbqt/qtcore/g/TQTimer.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTimer.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTimer.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQTranslator.prg b/harbour/contrib/hbqt/qtcore/g/TQTranslator.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQTranslator.prg
rename to harbour/contrib/hbqt/qtcore/g/TQTranslator.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQUrl.prg b/harbour/contrib/hbqt/qtcore/g/TQUrl.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQUrl.prg
rename to harbour/contrib/hbqt/qtcore/g/TQUrl.prg
diff --git a/harbour/contrib/hbqt/qtcore/TQVariant.prg b/harbour/contrib/hbqt/qtcore/g/TQVariant.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/TQVariant.prg
rename to harbour/contrib/hbqt/qtcore/g/TQVariant.prg
diff --git a/harbour/contrib/hbqt/qtcore/filelist.hbm b/harbour/contrib/hbqt/qtcore/g/filelist.hbm
similarity index 100%
rename from harbour/contrib/hbqt/qtcore/filelist.hbm
rename to harbour/contrib/hbqt/qtcore/g/filelist.hbm
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore_garbage.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore_garbage.h
similarity index 99%
rename from harbour/contrib/hbqt/qtcore/hbqtcore_garbage.h
rename to harbour/contrib/hbqt/qtcore/g/hbqtcore_garbage.h
index cdb3e38c8c..1b16359369 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcore_garbage.h
+++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore_garbage.h
@@ -8,7 +8,7 @@
 /*          or the generator tool itself, and run regenarate.           */
 /* -------------------------------------------------------------------- */
 
-#include "../hbqt.h"
+#include "hbqt.h"
 
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_HBEvents );
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_HBSlots );
diff --git a/harbour/contrib/hbqt/hbqt_base.cpp b/harbour/contrib/hbqt/qtcore/hbqt_base.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_base.cpp
rename to harbour/contrib/hbqt/qtcore/hbqt_base.cpp
diff --git a/harbour/contrib/hbqt/hbqt_destruct.cpp b/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_destruct.cpp
rename to harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbevents.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbevents.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbevents.cpp
rename to harbour/contrib/hbqt/qtcore/hbqt_hbevents.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbevents.h b/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbevents.h
rename to harbour/contrib/hbqt/qtcore/hbqt_hbevents.h
diff --git a/harbour/contrib/hbqt/hbqt_hbslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbslots.cpp
rename to harbour/contrib/hbqt/qtcore/hbqt_hbslots.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbslots.h
rename to harbour/contrib/hbqt/qtcore/hbqt_hbslots.h
diff --git a/harbour/contrib/hbqt/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_misc.prg
rename to harbour/contrib/hbqt/qtcore/hbqt_misc.prg
diff --git a/harbour/contrib/hbqt/hbqt_utils.cpp b/harbour/contrib/hbqt/qtcore/hbqt_utils.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_utils.cpp
rename to harbour/contrib/hbqt/qtcore/hbqt_utils.cpp
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
index 931e05eab4..a175c9b63c 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
@@ -10,10 +10,10 @@
 libs=../hbqt_common.hbc
 
 # TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed.
-{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
+{!HB_STATIC_QT&!hbdyn}libs=hbqtcore${__HB_DYN__}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4
 {!HB_STATIC_QT&linux}libs=QtCore QtGui
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui
-{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
+{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtcores${__HB_DYN__}
 {HB_STATIC_QT&linux}libs=hbqtcore
 {HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
index bddef92e79..88b37153cf 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
@@ -2,12 +2,13 @@
 # $Id$
 #
 
-../hbqt_base.cpp
-../hbqt_destruct.cpp
-../hbqt_hbevents.cpp
-../hbqt_hbslots.cpp
-../hbqt_utils.cpp
-../hbqt_misc.prg
+hbqt_base.cpp
+hbqt_destruct.cpp
+hbqt_hbevents.cpp
+hbqt_hbslots.cpp
+hbqt_utils.cpp
 
-../hbqt_hbevents.h
-../hbqt_hbslots.h
+hbqt_misc.prg
+
+hbqt_hbevents.h
+hbqt_hbslots.h
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
index 5388e7b105..59c478ba76 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
@@ -4,7 +4,9 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
 hbqtcore.hbm
 
+-ig
+
 hbqtcores.hbp
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
index db816a6b2e..154bed5826 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
@@ -4,9 +4,11 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
 hbqtcore.hbm
 
+-ig
+
 -stop{!HB_QT_BUILD_STATIC|!allwin}
 
 -cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/THbQtUI.prg b/harbour/contrib/hbqt/qtgui/THbQtUI.prg
similarity index 100%
rename from harbour/contrib/hbqt/THbQtUI.prg
rename to harbour/contrib/hbqt/qtgui/THbQtUI.prg
diff --git a/harbour/contrib/hbqt/qtgui/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQAbstractItemModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
index 3bfc31a023..5846892e7b 100644
--- a/harbour/contrib/hbqt/qtgui/HBQAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp
index f94aa0f50c..cc2e48b0c3 100644
--- a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
index a67b7caf33..3d4f475213 100644
--- a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
index 86e7f3473e..2a8239e385 100644
--- a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQTableView.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
index 281acf9701..928b7b464e 100644
--- a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp
rename to harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
index d0bedaadb4..6c90d0a8ef 100644
--- a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
index c440fc43c4..a2312f0291 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
index ccec2ea0c2..04e16ba395 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
index 9c79867e82..54d0270832 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
index a9b7e18945..0d0339f387 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
index 2fbfca5eef..084a2ba441 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
index 496bfee711..8fc16a93ff 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
index 1e64fb202a..fa26e5e4ba 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
index e6f88b53f5..032c3224de 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
index 5aa0baf3d3..0ffdeaa657 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QAction.cpp
rename to harbour/contrib/hbqt/qtgui/g/QAction.cpp
index dd20a9cb5c..61164a05aa 100644
--- a/harbour/contrib/hbqt/qtgui/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QActionGroup.cpp
rename to harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
index 8d992b172b..56711fa238 100644
--- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QApplication.cpp
rename to harbour/contrib/hbqt/qtgui/g/QApplication.cpp
index c64cdf5cc3..1192a7fca1 100644
--- a/harbour/contrib/hbqt/qtgui/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QBitmap.cpp
rename to harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
index 2c3deca70c..763cd45cf0 100644
--- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
index bbc85fbecc..aeed2a0415 100644
--- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QBrush.cpp
rename to harbour/contrib/hbqt/qtgui/g/QBrush.cpp
index 49e2b5f04f..c7c57e6418 100644
--- a/harbour/contrib/hbqt/qtgui/QBrush.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
rename to harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
index a89a6ff539..7b47cbcbfd 100644
--- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
index 7c68cec34e..ae37873efb 100644
--- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCheckBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
index aa19f56bc3..3f77d7f575 100644
--- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QClipboard.cpp
rename to harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
index 51ad6a209e..e38e4be45f 100644
--- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/g/QColor.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QColor.cpp
rename to harbour/contrib/hbqt/qtgui/g/QColor.cpp
index 2d38d0cfe5..42c77f0d64 100644
--- a/harbour/contrib/hbqt/qtgui/QColor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QColor.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QColorDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
index 9205aa589f..7c11b9d8bc 100644
--- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QComboBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
index e486d2f441..603d28a16c 100644
--- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
index d88c20fbfa..86f113d183 100644
--- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
index a71cf95876..6413c98015 100644
--- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCompleter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
index 91aa078f3c..f80ba567e5 100644
--- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
rename to harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
index 2ea453f453..94088ad504 100644
--- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
index 4adab071c3..3a2ce23269 100644
--- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QCursor.cpp
rename to harbour/contrib/hbqt/qtgui/g/QCursor.cpp
index 37dd49064d..9fd5df368a 100644
--- a/harbour/contrib/hbqt/qtgui/QCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDateEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
index 70d336a71f..3e3c8de24e 100644
--- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
index cb39124c1e..854f248633 100644
--- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
index 3188801f94..bc6a03088b 100644
--- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDial.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDial.cpp
index cf3a074626..48e91aef90 100644
--- a/harbour/contrib/hbqt/qtgui/QDial.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDial.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDialog.cpp
index ad206646ed..afe2f73a7f 100644
--- a/harbour/contrib/hbqt/qtgui/QDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDirModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
index 534d02c2c6..81a275041c 100644
--- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDockWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
index 483cf68e85..eca4445a43 100644
--- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
index 9255b8190f..90ec928e81 100644
--- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
index a319ec8ef0..8cd89a076e 100644
--- a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
index 67c005033a..0a995b7b15 100644
--- a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
index 38db334c86..8a0c12834e 100644
--- a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QDropEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
index 9d27d86d46..c29bacc20b 100644
--- a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
rename to harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
index 62012c92fb..903e354ec2 100644
--- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFileDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
index ffed9c8591..6edac65492 100644
--- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
index e18163bab2..6be04886d1 100644
--- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
index 6d6af045eb..c845ffc86f 100644
--- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
index 55f0ca2224..6adffdf279 100644
--- a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
index c2d1d3e563..f82b9f793f 100644
--- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/g/QFont.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFont.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFont.cpp
index 716d6d904a..8506975949 100644
--- a/harbour/contrib/hbqt/qtgui/QFont.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFont.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
index 64fa61aab1..1390e11e7f 100644
--- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
index db9d115fcc..29f4226572 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
index f7ef0c41e4..700a21174e 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontInfo.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
index 4958257b6d..729f8aeaa6 100644
--- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
index c37c731c51..a3701fcf19 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
index 88ecccb87b..96f158faa2 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFormLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
index 029fdfa1b9..c7dae19af0 100644
--- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QFrame.cpp
rename to harbour/contrib/hbqt/qtgui/g/QFrame.cpp
index 7fb6b638ef..c939bc6997 100644
--- a/harbour/contrib/hbqt/qtgui/QFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QGradient.cpp
rename to harbour/contrib/hbqt/qtgui/g/QGradient.cpp
index 9ab8cb79aa..c24e1ee341 100644
--- a/harbour/contrib/hbqt/qtgui/QGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QGridLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
index 56cd0400bf..30e7a8565e 100644
--- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QGroupBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
index 473967b695..fa329677ee 100644
--- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
index 81aa8bc531..ff2a871851 100644
--- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QHeaderView.cpp
rename to harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
index 2de2671db9..11da32fd92 100644
--- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QHelpEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
index e72751677f..954e5822b6 100644
--- a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QHideEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
index 944aa43fe9..ebc9f069a8 100644
--- a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QIcon.cpp
rename to harbour/contrib/hbqt/qtgui/g/QIcon.cpp
index 767a789159..da14010525 100644
--- a/harbour/contrib/hbqt/qtgui/QIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/g/QImage.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QImage.cpp
rename to harbour/contrib/hbqt/qtgui/g/QImage.cpp
index 29791c3f3b..1e0d5a1c70 100644
--- a/harbour/contrib/hbqt/qtgui/QImage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImage.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QImageReader.cpp
rename to harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
index 485e607c41..d14a1e1e74 100644
--- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QImageWriter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
index d0c273dbb9..ecfa0236ac 100644
--- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QInputContext.cpp b/harbour/contrib/hbqt/qtgui/g/QInputContext.cpp
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/QInputContext.cpp
rename to harbour/contrib/hbqt/qtgui/g/QInputContext.cpp
diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QInputDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
index 5f6cade0cb..3b4404c109 100644
--- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QInputEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
index d70daa00a3..0cb17ad406 100644
--- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
index 903df6bb86..37220b8fd1 100644
--- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QItemDelegate.cpp
rename to harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
index 52719f3efd..2521fcf5f4 100644
--- a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp
rename to harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
index c0edaea3e5..6bfe1c7705 100644
--- a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp
rename to harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
index f8ce9d24d3..5a1aead47c 100644
--- a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QItemSelection.cpp
rename to harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
index a8c1230ec9..0ef429a0b2 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
index 22b8978bc3..4c3a13cc1d 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QKeyEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
index a3aad213e7..e16a566d3a 100644
--- a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QKeySequence.cpp
rename to harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
index 030bf27bcc..4a64c9f70a 100644
--- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
index 9e5590b7b5..f15e60cd24 100644
--- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLabel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLabel.cpp
index 2321830ca0..bcdead7d53 100644
--- a/harbour/contrib/hbqt/qtgui/QLabel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLayout.cpp
index 51ef7715d3..a738329cd0 100644
--- a/harbour/contrib/hbqt/qtgui/QLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLayoutItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
index 7d6c5ba0c5..82d3f621b4 100644
--- a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLineEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
index 9c9634ffe7..068e40b557 100644
--- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
rename to harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
index be24e0d4b8..62396962a9 100644
--- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QListView.cpp
rename to harbour/contrib/hbqt/qtgui/g/QListView.cpp
index 0141a512c3..6697884305 100644
--- a/harbour/contrib/hbqt/qtgui/QListView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QListWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
index eec1cf9010..3ff0abc2f6 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
index ef13e57090..bbc96d1f43 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMainWindow.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
index c9bc091cd7..edbbf396e0 100644
--- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMatrix.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
index df74756fae..0e34d3f332 100644
--- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMdiArea.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
index 801096023a..89f7697109 100644
--- a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
index b5205f18fc..13553115c8 100644
--- a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMenu.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMenu.cpp
index d02cb76163..3921679090 100644
--- a/harbour/contrib/hbqt/qtgui/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMenuBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
index bcbef1b1dd..ac2c6162db 100644
--- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMessageBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
index 9cf0c3f9d0..547ce98c29 100644
--- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
index f9cfc5ba8a..c22f11b9f8 100644
--- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMoveEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
index 08a930d61a..b91ed3d3fa 100644
--- a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QMovie.cpp
rename to harbour/contrib/hbqt/qtgui/g/QMovie.cpp
index 6f53e62aba..946d36096b 100644
--- a/harbour/contrib/hbqt/qtgui/QMovie.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
index 9edfb62556..0dd34a3b52 100644
--- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPaintDevice.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
index b64c0bc124..d8ec7bbd70 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPaintEngine.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
index 7d7c90b043..ead7722656 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
index 8285194ebf..d38c0e79dd 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPainter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPainter.cpp
index b34c208ce7..4397b927e4 100644
--- a/harbour/contrib/hbqt/qtgui/QPainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPainterPath.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
index a0b8db9547..227344bb36 100644
--- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPalette.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPalette.cpp
index 67f18aef3c..827d478543 100644
--- a/harbour/contrib/hbqt/qtgui/QPalette.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/g/QPen.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPen.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPen.cpp
index 74abc4ffd8..88e5823fad 100644
--- a/harbour/contrib/hbqt/qtgui/QPen.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPen.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPicture.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPicture.cpp
index 9dabd9c123..b276cd9e45 100644
--- a/harbour/contrib/hbqt/qtgui/QPicture.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPixmap.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
index a4ed634483..e74be9e7bc 100644
--- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
index c0028786e1..b51b0dce8f 100644
--- a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
index 91b713f609..1210deea0d 100644
--- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPolygon.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
index 7587c2bddf..46610eabbb 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPolygonF.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
index f77b572b1d..fcca333cde 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
index a61907a9a7..bf09cb9af1 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPrintEngine.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
index 172b71127e..b3ff707230 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
index 4e7ff40dec..b186cb9ed4 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPrinter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
index 22dbecf1aa..b199568960 100644
--- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QProgressBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
index ab6e10ae4e..c1934f7e6e 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
rename to harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
index 846fe6765d..7e1ae67052 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QPushButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
index 88004adc67..6bed9b4287 100644
--- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
rename to harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
index eb41d7fd95..05efa636e8 100644
--- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QRadioButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
index 8daeedd567..8c9eaf5bad 100644
--- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QRegion.cpp
rename to harbour/contrib/hbqt/qtgui/g/QRegion.cpp
index 535a7eabd6..9786c1e47d 100644
--- a/harbour/contrib/hbqt/qtgui/QRegion.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QResizeEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
index 31963363b0..fb22903468 100644
--- a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QScrollArea.cpp
rename to harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
index 9cac83877a..4d81599bd6 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QScrollBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
index 3b76b98ef9..d73cfdad9f 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSessionManager.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
index fadd2829cb..4f4bdca0f3 100644
--- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QShowEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
index c5d427101e..fd8e4d61b8 100644
--- a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
index 5d66906619..2aad977c35 100644
--- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
index e2bcd034c8..4fd1b8adc1 100644
--- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSlider.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSlider.cpp
index 87144110fb..1f849f695c 100644
--- a/harbour/contrib/hbqt/qtgui/QSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSound.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSound.cpp
index 7f0b8fbb7c..abc7e184e0 100644
--- a/harbour/contrib/hbqt/qtgui/QSound.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSound.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
index bb4d83628c..ed184d389f 100644
--- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSpinBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
index a78d0d9798..cee5e76403 100644
--- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
index 58fbafbf69..07984597c3 100644
--- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSplitter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
index a04f9530e5..796ea1571d 100644
--- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStackedWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
index 29a0bac6d6..7c7fb481ba 100644
--- a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStandardItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
index dd30e2d4ab..eb71046e4f 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
index 986cef4bff..3a9ddcaeb4 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStatusBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
index 6e7707f03f..fcaa137888 100644
--- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStringListModel.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
index 44b2f47f64..b8e0cb6743 100644
--- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyle.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyle.cpp
index a6a3ef04eb..5eb9a666ab 100644
--- a/harbour/contrib/hbqt/qtgui/QStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
index 16f53b2400..b1bf232f71 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
index c6d5c7b902..8b40608683 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
index d587c4438b..63dc05519c 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
index 73e4af851e..03ff9aba5f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOption.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
index 9c4fdea0da..77faa8e480 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
index 8626080074..60795917d5 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
index beea676edc..96cc907c88 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
index 683c3a7e47..ff47189203 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
index a63505ba0a..cb6b47e510 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
index f0c489a315..77ed743b1d 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
index 6f53a94d73..6d45c99b58 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
index eb2672e345..7aa473ddff 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
index 67ebdfda16..f91357d8f4 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
index cb1694dcab..14812d0440 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
index 1de5ef93d6..ca1f48dd3f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
index a2bb22f3c5..f4558f057c 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
index 291195566b..0d23b2da54 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
index 4be2b1867e..b7e8aa7cbc 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
index 63f5081ba2..92bf9e1592 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
index 34324cc972..b8aae3e65f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
index c1c809f803..c68251a530 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
index 23cd7d6731..49b5b1340f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
index 9d00ef6959..6fd7f9f214 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
index cf325d5689..898765e538 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
index 915514cc31..5e77a4e0d9 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
index 8316a60de3..ab472dff29 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStylePainter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
index d215d61fee..a882f848b8 100644
--- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
rename to harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
index 53b66b917d..cf19cf9c3f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
index 9cf516829f..3f1afde3f9 100644
--- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
rename to harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
index c5f25a360f..a8dfc648a7 100644
--- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTabBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
index 3247866024..ce2432e168 100644
--- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTabWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
index d94f4cfa24..43e79de001 100644
--- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTableView.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTableView.cpp
index 36f73726a7..890a0449af 100644
--- a/harbour/contrib/hbqt/qtgui/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTableWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
index 0c07584cc8..5acd55255f 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
index 3a5611ccea..e6a26bd99b 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
index 93ad26525b..33e09c6b5b 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextBlock.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
index 5e1086ee26..69064ebb6c 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
index a7f7e32f41..90c8b1c944 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
index 3709eef6be..25a25f9471 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
index 4ab388f2ab..92e7ba6eab 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
index 99d4750ba7..fd7c6c71e5 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextCursor.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
index 0ba6d97f5c..476ebc8bf2 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextDocument.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
index 7f17a6a941..57553f2691 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
index d5771d1ae0..b03db06624 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
index e43f4b889d..9fee9ae20e 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
index 8f4eb011e3..164aeb543d 100644
--- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
index 4de49870a7..8fec643df0 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextFragment.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
index 2a57360e31..b1c33f2a08 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextFrame.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
index cbb3ac438c..9a4f84f046 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
index df275ba0e5..11bca09ed9 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
index 3bc3553c6c..357d93208b 100644
--- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
index 3faf44d005..133c78b966 100644
--- a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
index 1548a5573f..788de276bc 100644
--- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
index b8c8b53460..7c23c3f616 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextLength.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
index 0a81668e4a..f57ae7bfbd 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextLine.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
index 7bfb544077..b3378228d5 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextList.cpp b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextList.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextList.cpp
index 9272721dbf..15c86de05a 100644
--- a/harbour/contrib/hbqt/qtgui/QTextList.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
index 3afcbdcbf3..cc4f0dd342 100644
--- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextObject.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
index b63c6132e2..65def3aed8 100644
--- a/harbour/contrib/hbqt/qtgui/QTextObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextOption.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
index 23e3d2a4ba..e5e203c354 100644
--- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
index 971d51c71f..47279d680e 100644
--- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
index b9fecda0d9..57d6ba76d5 100644
--- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QToolBar.cpp
rename to harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
index b0b50bfc28..26b2176f00 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QToolBox.cpp
rename to harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
index 62c8c18dd4..a1cde798dd 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QToolButton.cpp
rename to harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
index db634a76d5..0a7ab9ede3 100644
--- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTransform.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTransform.cpp
index d0d11575e9..57ec513e8e 100644
--- a/harbour/contrib/hbqt/qtgui/QTransform.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTreeView.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
index 5b11315c0c..af8979fcc6 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
index 0580650a85..7232d53597 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
index e396a17975..a65d27445b 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QUiLoader.cpp b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QUiLoader.cpp
rename to harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp
index 4ad27febfc..da944a94ba 100644
--- a/harbour/contrib/hbqt/qtgui/QUiLoader.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
rename to harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
index ac51bc6425..5a13d1e400 100644
--- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QValidator.cpp
rename to harbour/contrib/hbqt/qtgui/g/QValidator.cpp
index 147d7eb8e0..faa7ba6c63 100644
--- a/harbour/contrib/hbqt/qtgui/QValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWheelEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
index 7395d7b834..71a42c42d1 100644
--- a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWidget.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWidget.cpp
index 44bd4e9ec5..e44ada575c 100644
--- a/harbour/contrib/hbqt/qtgui/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
index 7a1fec1570..47ac30eccc 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
index d9b34d72ec..4654798c34 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
index 2d8b88fdbf..386081b829 100644
--- a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
index 52597f07dd..e66ffc0ed2 100644
--- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWizard.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWizard.cpp
index 6c965811c2..4411e6192b 100644
--- a/harbour/contrib/hbqt/qtgui/QWizard.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/QWizardPage.cpp
rename to harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
index 847efe9eab..cd28180f26 100644
--- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
+++ b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtgui_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtgui/THBQAbstractItemModel.prg b/harbour/contrib/hbqt/qtgui/g/THBQAbstractItemModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQAbstractItemModel.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQAbstractItemModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/THBQMainWindow.prg b/harbour/contrib/hbqt/qtgui/g/THBQMainWindow.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQMainWindow.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQMainWindow.prg
diff --git a/harbour/contrib/hbqt/qtgui/THBQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQPlainTextEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/g/THBQSyntaxHighlighter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQSyntaxHighlighter.prg
diff --git a/harbour/contrib/hbqt/qtgui/THBQTableView.prg b/harbour/contrib/hbqt/qtgui/g/THBQTableView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQTableView.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQTableView.prg
diff --git a/harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg b/harbour/contrib/hbqt/qtgui/g/THBQTextBlockUserData.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/THBQTextBlockUserData.prg
rename to harbour/contrib/hbqt/qtgui/g/THBQTextBlockUserData.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractItemDelegate.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractItemDelegate.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractPrintDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractPrintDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractProxyModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractProxyModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractScrollArea.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractScrollArea.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractSlider.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractSlider.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractSpinBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractSpinBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractTextDocumentLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAbstractTextDocumentLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQAction.prg b/harbour/contrib/hbqt/qtgui/g/TQAction.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQAction.prg
rename to harbour/contrib/hbqt/qtgui/g/TQAction.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQActionGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQActionGroup.prg
rename to harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQApplication.prg b/harbour/contrib/hbqt/qtgui/g/TQApplication.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQApplication.prg
rename to harbour/contrib/hbqt/qtgui/g/TQApplication.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQBitmap.prg b/harbour/contrib/hbqt/qtgui/g/TQBitmap.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQBitmap.prg
rename to harbour/contrib/hbqt/qtgui/g/TQBitmap.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQBoxLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQBrush.prg b/harbour/contrib/hbqt/qtgui/g/TQBrush.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQBrush.prg
rename to harbour/contrib/hbqt/qtgui/g/TQBrush.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQButtonGroup.prg
rename to harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQCalendarWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCalendarWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCheckBox.prg b/harbour/contrib/hbqt/qtgui/g/TQCheckBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCheckBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCheckBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQClipboard.prg b/harbour/contrib/hbqt/qtgui/g/TQClipboard.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQClipboard.prg
rename to harbour/contrib/hbqt/qtgui/g/TQClipboard.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQColor.prg b/harbour/contrib/hbqt/qtgui/g/TQColor.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQColor.prg
rename to harbour/contrib/hbqt/qtgui/g/TQColor.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQColorDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQColorDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQComboBox.prg b/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQComboBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQComboBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg b/harbour/contrib/hbqt/qtgui/g/TQCommandLinkButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCommandLinkButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg b/harbour/contrib/hbqt/qtgui/g/TQCommonStyle.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCommonStyle.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCommonStyle.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCompleter.prg b/harbour/contrib/hbqt/qtgui/g/TQCompleter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCompleter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCompleter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQConicalGradient.prg
rename to harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQContextMenuEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQContextMenuEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQCursor.prg b/harbour/contrib/hbqt/qtgui/g/TQCursor.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQCursor.prg
rename to harbour/contrib/hbqt/qtgui/g/TQCursor.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDateEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQDateEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDateEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDateEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQDateTimeEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDateTimeEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDial.prg b/harbour/contrib/hbqt/qtgui/g/TQDial.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDial.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDial.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDirModel.prg b/harbour/contrib/hbqt/qtgui/g/TQDirModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDirModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDirModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDockWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQDockWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDockWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDockWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg b/harbour/contrib/hbqt/qtgui/g/TQDoubleSpinBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDoubleSpinBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQDragEnterEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDragEnterEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQDragLeaveEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDragLeaveEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQDropEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQDropEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQDropEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQDropEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg b/harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQErrorMessage.prg
rename to harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFileDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFileDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg b/harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg b/harbour/contrib/hbqt/qtgui/g/TQFileSystemModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFileSystemModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQFocusEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFocusEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFocusEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg b/harbour/contrib/hbqt/qtgui/g/TQFocusFrame.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFocusFrame.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFocusFrame.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFont.prg b/harbour/contrib/hbqt/qtgui/g/TQFont.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFont.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFont.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg b/harbour/contrib/hbqt/qtgui/g/TQFontComboBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontComboBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontComboBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg b/harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontDatabase.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontInfo.prg b/harbour/contrib/hbqt/qtgui/g/TQFontInfo.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontInfo.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontInfo.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg b/harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontMetrics.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg b/harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFormLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFormLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQFrame.prg b/harbour/contrib/hbqt/qtgui/g/TQFrame.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQFrame.prg
rename to harbour/contrib/hbqt/qtgui/g/TQFrame.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQGradient.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQGradient.prg
rename to harbour/contrib/hbqt/qtgui/g/TQGradient.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQGridLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQGridLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQGroupBox.prg b/harbour/contrib/hbqt/qtgui/g/TQGroupBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQGroupBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQGroupBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQHBoxLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQHBoxLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQHeaderView.prg b/harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQHeaderView.prg
rename to harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQHelpEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQHelpEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQHelpEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQHideEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQHideEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQHideEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQHideEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQIcon.prg b/harbour/contrib/hbqt/qtgui/g/TQIcon.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQIcon.prg
rename to harbour/contrib/hbqt/qtgui/g/TQIcon.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQImage.prg b/harbour/contrib/hbqt/qtgui/g/TQImage.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQImage.prg
rename to harbour/contrib/hbqt/qtgui/g/TQImage.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQImageReader.prg b/harbour/contrib/hbqt/qtgui/g/TQImageReader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQImageReader.prg
rename to harbour/contrib/hbqt/qtgui/g/TQImageReader.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQImageWriter.prg b/harbour/contrib/hbqt/qtgui/g/TQImageWriter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQImageWriter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQImageWriter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQInputContext.prg b/harbour/contrib/hbqt/qtgui/g/TQInputContext.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQInputContext.prg
rename to harbour/contrib/hbqt/qtgui/g/TQInputContext.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQInputDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQInputDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQInputDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQInputDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQInputEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQInputEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQInputEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQInputEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQInputMethodEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQInputMethodEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQItemDelegate.prg b/harbour/contrib/hbqt/qtgui/g/TQItemDelegate.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQItemDelegate.prg
rename to harbour/contrib/hbqt/qtgui/g/TQItemDelegate.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQItemEditorCreatorBase.prg b/harbour/contrib/hbqt/qtgui/g/TQItemEditorCreatorBase.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQItemEditorCreatorBase.prg
rename to harbour/contrib/hbqt/qtgui/g/TQItemEditorCreatorBase.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQItemEditorFactory.prg b/harbour/contrib/hbqt/qtgui/g/TQItemEditorFactory.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQItemEditorFactory.prg
rename to harbour/contrib/hbqt/qtgui/g/TQItemEditorFactory.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelection.prg b/harbour/contrib/hbqt/qtgui/g/TQItemSelection.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQItemSelection.prg
rename to harbour/contrib/hbqt/qtgui/g/TQItemSelection.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg b/harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQKeyEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQKeyEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQKeyEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQKeySequence.prg b/harbour/contrib/hbqt/qtgui/g/TQKeySequence.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQKeySequence.prg
rename to harbour/contrib/hbqt/qtgui/g/TQKeySequence.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg b/harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLCDNumber.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLabel.prg b/harbour/contrib/hbqt/qtgui/g/TQLabel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLabel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLabel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg b/harbour/contrib/hbqt/qtgui/g/TQLayoutItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLayoutItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLayoutItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLineEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQLineEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLineEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLineEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQLinearGradient.prg
rename to harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQListView.prg b/harbour/contrib/hbqt/qtgui/g/TQListView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQListView.prg
rename to harbour/contrib/hbqt/qtgui/g/TQListView.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQListWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQListWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQListWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQListWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQListWidgetItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMainWindow.prg b/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMainWindow.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMatrix.prg b/harbour/contrib/hbqt/qtgui/g/TQMatrix.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMatrix.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMatrix.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMdiArea.prg b/harbour/contrib/hbqt/qtgui/g/TQMdiArea.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMdiArea.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMdiArea.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMdiSubWindow.prg b/harbour/contrib/hbqt/qtgui/g/TQMdiSubWindow.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMdiSubWindow.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMdiSubWindow.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMenu.prg b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMenu.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMenu.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMenuBar.prg b/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMenuBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMessageBox.prg b/harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMessageBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQMouseEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMouseEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMouseEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQMoveEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMoveEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMoveEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQMovie.prg b/harbour/contrib/hbqt/qtgui/g/TQMovie.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQMovie.prg
rename to harbour/contrib/hbqt/qtgui/g/TQMovie.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQPageSetupDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPageSetupDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg b/harbour/contrib/hbqt/qtgui/g/TQPaintDevice.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPaintDevice.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPaintDevice.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPaintEngine.prg b/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPaintEngine.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQPaintEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPaintEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPaintEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPainter.prg b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPainter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPainter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPainterPath.prg b/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPainterPath.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPalette.prg b/harbour/contrib/hbqt/qtgui/g/TQPalette.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPalette.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPalette.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPen.prg b/harbour/contrib/hbqt/qtgui/g/TQPen.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPen.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPen.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPicture.prg b/harbour/contrib/hbqt/qtgui/g/TQPicture.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPicture.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPicture.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPixmap.prg b/harbour/contrib/hbqt/qtgui/g/TQPixmap.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPixmap.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPixmap.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPlainTextDocumentLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQPlainTextDocumentLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPlainTextDocumentLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPlainTextDocumentLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPolygon.prg b/harbour/contrib/hbqt/qtgui/g/TQPolygon.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPolygon.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPolygon.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPolygonF.prg b/harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPolygonF.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPrintDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg b/harbour/contrib/hbqt/qtgui/g/TQPrintEngine.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPrintEngine.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPrintEngine.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQPrintPreviewDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPrintPreviewDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPrinter.prg b/harbour/contrib/hbqt/qtgui/g/TQPrinter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPrinter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPrinter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQProgressBar.prg b/harbour/contrib/hbqt/qtgui/g/TQProgressBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQProgressBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQProgressBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQProgressDialog.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQProgressDialog.prg
rename to harbour/contrib/hbqt/qtgui/g/TQProgressDialog.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQPushButton.prg b/harbour/contrib/hbqt/qtgui/g/TQPushButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQPushButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQPushButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQRadialGradient.prg
rename to harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQRadioButton.prg b/harbour/contrib/hbqt/qtgui/g/TQRadioButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQRadioButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQRadioButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQRegion.prg b/harbour/contrib/hbqt/qtgui/g/TQRegion.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQRegion.prg
rename to harbour/contrib/hbqt/qtgui/g/TQRegion.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQResizeEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQResizeEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQResizeEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQScrollArea.prg b/harbour/contrib/hbqt/qtgui/g/TQScrollArea.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQScrollArea.prg
rename to harbour/contrib/hbqt/qtgui/g/TQScrollArea.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQScrollBar.prg b/harbour/contrib/hbqt/qtgui/g/TQScrollBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQScrollBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQScrollBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSessionManager.prg b/harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSessionManager.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQShowEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQShowEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQShowEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQShowEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg b/harbour/contrib/hbqt/qtgui/g/TQSizeGrip.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSizeGrip.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSizeGrip.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg b/harbour/contrib/hbqt/qtgui/g/TQSizePolicy.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSizePolicy.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSizePolicy.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSlider.prg b/harbour/contrib/hbqt/qtgui/g/TQSlider.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSlider.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSlider.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSound.prg b/harbour/contrib/hbqt/qtgui/g/TQSound.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSound.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSound.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg b/harbour/contrib/hbqt/qtgui/g/TQSpacerItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSpacerItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSpacerItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSpinBox.prg b/harbour/contrib/hbqt/qtgui/g/TQSpinBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSpinBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSpinBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg b/harbour/contrib/hbqt/qtgui/g/TQSplashScreen.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSplashScreen.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSplashScreen.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSplitter.prg b/harbour/contrib/hbqt/qtgui/g/TQSplitter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSplitter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSplitter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStackedWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQStackedWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStackedWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStackedWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItem.prg b/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStandardItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg b/harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStatusBar.prg b/harbour/contrib/hbqt/qtgui/g/TQStatusBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStatusBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStatusBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStringListModel.prg b/harbour/contrib/hbqt/qtgui/g/TQStringListModel.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStringListModel.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStringListModel.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyle.prg b/harbour/contrib/hbqt/qtgui/g/TQStyle.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyle.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyle.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleFactory.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleFactory.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleFactory.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleHintReturn.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleHintReturn.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleHintReturnMask.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleHintReturnMask.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleHintReturnVariant.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleHintReturnVariant.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOption.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOption.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOption.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOption.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionComboBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionComboBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionComplex.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionComplex.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionDockWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionDockWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionFocusRect.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionFocusRect.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionFrame.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionFrame.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionGroupBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionGroupBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionHeader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionHeader.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionMenuItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionMenuItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionProgressBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionProgressBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionSizeGrip.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionSizeGrip.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionSlider.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionSlider.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionSpinBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionSpinBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionTab.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionTab.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionTabBarBase.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionTabBarBase.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionTabWidgetFrame.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionTabWidgetFrame.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionTitleBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionTitleBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionToolButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg b/harbour/contrib/hbqt/qtgui/g/TQStyleOptionViewItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyleOptionViewItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStylePainter.prg b/harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStylePainter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg b/harbour/contrib/hbqt/qtgui/g/TQStyledItemDelegate.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg
rename to harbour/contrib/hbqt/qtgui/g/TQStyledItemDelegate.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/g/TQSyntaxHighlighter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSyntaxHighlighter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg b/harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg
rename to harbour/contrib/hbqt/qtgui/g/TQSystemTrayIcon.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTabBar.prg b/harbour/contrib/hbqt/qtgui/g/TQTabBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTabBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTabBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTabWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTabWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTableView.prg b/harbour/contrib/hbqt/qtgui/g/TQTableView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTableView.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTableView.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTableWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTableWidgetItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg b/harbour/contrib/hbqt/qtgui/g/TQTableWidgetSelectionRange.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTableWidgetSelectionRange.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlock.prg b/harbour/contrib/hbqt/qtgui/g/TQTextBlock.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextBlock.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextBlock.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextBlockFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextBlockFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQTextBlockGroup.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextBlockGroup.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg b/harbour/contrib/hbqt/qtgui/g/TQTextBrowser.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextBrowser.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextBrowser.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextCharFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextCharFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextCursor.prg b/harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextCursor.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocument.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextDocument.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFragment.prg b/harbour/contrib/hbqt/qtgui/g/TQTextFragment.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextFragment.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextFragment.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrame.prg b/harbour/contrib/hbqt/qtgui/g/TQTextFrame.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextFrame.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextFrame.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextImageFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextImageFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg b/harbour/contrib/hbqt/qtgui/g/TQTextInlineObject.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextInlineObject.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextItem.prg b/harbour/contrib/hbqt/qtgui/g/TQTextItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLength.prg b/harbour/contrib/hbqt/qtgui/g/TQTextLength.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextLength.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextLength.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLine.prg b/harbour/contrib/hbqt/qtgui/g/TQTextLine.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextLine.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextLine.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextList.prg b/harbour/contrib/hbqt/qtgui/g/TQTextList.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextList.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextList.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextListFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextListFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextListFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextObject.prg b/harbour/contrib/hbqt/qtgui/g/TQTextObject.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextObject.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextObject.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextOption.prg b/harbour/contrib/hbqt/qtgui/g/TQTextOption.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextOption.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextOption.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextTableFormat.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTextTableFormat.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQTimeEdit.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTimeEdit.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTimeEdit.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQToolBar.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQToolBar.prg
rename to harbour/contrib/hbqt/qtgui/g/TQToolBar.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQToolBox.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQToolBox.prg
rename to harbour/contrib/hbqt/qtgui/g/TQToolBox.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQToolButton.prg b/harbour/contrib/hbqt/qtgui/g/TQToolButton.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQToolButton.prg
rename to harbour/contrib/hbqt/qtgui/g/TQToolButton.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTransform.prg b/harbour/contrib/hbqt/qtgui/g/TQTransform.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTransform.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTransform.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeView.prg b/harbour/contrib/hbqt/qtgui/g/TQTreeView.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTreeView.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTreeView.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTreeWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQTreeWidgetItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQUiLoader.prg b/harbour/contrib/hbqt/qtgui/g/TQUiLoader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQUiLoader.prg
rename to harbour/contrib/hbqt/qtgui/g/TQUiLoader.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQVBoxLayout.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg
rename to harbour/contrib/hbqt/qtgui/g/TQVBoxLayout.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQValidator.prg b/harbour/contrib/hbqt/qtgui/g/TQValidator.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQValidator.prg
rename to harbour/contrib/hbqt/qtgui/g/TQValidator.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQWheelEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWheelEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWheelEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWidget.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWidget.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg b/harbour/contrib/hbqt/qtgui/g/TQWidgetAction.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWidgetAction.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWidgetAction.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg b/harbour/contrib/hbqt/qtgui/g/TQWidgetItem.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWidgetItem.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWidgetItem.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWindowStateChangeEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQWindowStateChangeEvent.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWindowStateChangeEvent.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWindowStateChangeEvent.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg b/harbour/contrib/hbqt/qtgui/g/TQWindowsStyle.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWindowsStyle.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWizard.prg b/harbour/contrib/hbqt/qtgui/g/TQWizard.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWizard.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWizard.prg
diff --git a/harbour/contrib/hbqt/qtgui/TQWizardPage.prg b/harbour/contrib/hbqt/qtgui/g/TQWizardPage.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/TQWizardPage.prg
rename to harbour/contrib/hbqt/qtgui/g/TQWizardPage.prg
diff --git a/harbour/contrib/hbqt/qtgui/filelist.hbm b/harbour/contrib/hbqt/qtgui/g/filelist.hbm
similarity index 100%
rename from harbour/contrib/hbqt/qtgui/filelist.hbm
rename to harbour/contrib/hbqt/qtgui/g/filelist.hbm
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui_garbage.h b/harbour/contrib/hbqt/qtgui/g/hbqtgui_garbage.h
similarity index 99%
rename from harbour/contrib/hbqt/qtgui/hbqtgui_garbage.h
rename to harbour/contrib/hbqt/qtgui/g/hbqtgui_garbage.h
index 796027c2fe..7cc262c724 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtgui_garbage.h
+++ b/harbour/contrib/hbqt/qtgui/g/hbqtgui_garbage.h
@@ -8,7 +8,7 @@
 /*          or the generator tool itself, and run regenarate.           */
 /* -------------------------------------------------------------------- */
 
-#include "../hbqt.h"
+#include "hbqt.h"
 
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_HBQAbstractItemModel );
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_HBQMainWindow );
diff --git a/harbour/contrib/hbqt/hbqt_errorsys.prg b/harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_errorsys.prg
rename to harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg
diff --git a/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h
diff --git a/harbour/contrib/hbqt/hbqt_hbqmainwindow.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqmainwindow.cpp
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbqmainwindow.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqmainwindow.h
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.h
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.h
diff --git a/harbour/contrib/hbqt/hbqt_hbqtableview.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqtableview.cpp
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
diff --git a/harbour/contrib/hbqt/hbqt_hbqtableview.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_hbqtableview.h
rename to harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
index e99b65606d..9e40099840 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
@@ -9,12 +9,15 @@
 
 libs=../qtcore/hbqtcore.hbc
 
-{!HB_STATIC_QT}libs=hbqtgui${__HB_DYN__}
+{!HB_STATIC_QT&!hbdyn}libs=hbqtgui${__HB_DYN__}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtGui4
 {!HB_STATIC_QT&linux}libs=QtGui
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
 {!HB_STATIC_QT}libs=QtUiTools
-{HB_STATIC_QT&allwin}libs=hbqtguis${__HB_DYN__}
+{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtguis${__HB_DYN__}
 {HB_STATIC_QT&linux}libs=hbqtgui
 {HB_STATIC_QT&(allwin|linux)}libs=QtGui
 {HB_STATIC_QT&(allwin|linux)}libs=QtUiTools
+
+gui=yes
+gt=gtnul
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
index d3dab7d995..8c990a9d4e 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
@@ -2,17 +2,17 @@
 # $Id$
 #
 
-../hbqt_hbqabstractitemmodel.cpp
-../hbqt_hbqmainwindow.cpp
-../hbqt_hbqplaintextedit.cpp
-../hbqt_hbqsyntaxhighlighter.cpp
-../hbqt_hbqtableview.cpp
+hbqt_hbqabstractitemmodel.cpp
+hbqt_hbqmainwindow.cpp
+hbqt_hbqplaintextedit.cpp
+hbqt_hbqsyntaxhighlighter.cpp
+hbqt_hbqtableview.cpp
 
-../hbqt_hbqabstractitemmodel.h
-../hbqt_hbqmainwindow.h
-../hbqt_hbqplaintextedit.h
-../hbqt_hbqsyntaxhighlighter.h
-../hbqt_hbqtableview.h
+hbqt_hbqabstractitemmodel.h
+hbqt_hbqmainwindow.h
+hbqt_hbqplaintextedit.h
+hbqt_hbqsyntaxhighlighter.h
+hbqt_hbqtableview.h
 
-../hbqt_errorsys.prg
-../THbQtUI.prg
+hbqt_errorsys.prg
+THbQtUI.prg
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
index feeb49fb6a..0345898d5b 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
@@ -4,9 +4,11 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
 hbqtgui.hbm
 
+-ig
+
 ../qtcore/hbqtcore.hbc
 
 hbqtguis.hbp
diff --git a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
index b20299c79b..3744a60c78 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
@@ -4,9 +4,11 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
 hbqtgui.hbm
 
+-ig
+
 ../qtcore/hbqtcore.hbc
 
 -stop{!HB_QT_BUILD_STATIC|!allwin}
diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QFtp.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
index 45f827761d..e5162bdeae 100644
--- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QHttp.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
index fdb5599110..572c30270e 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
index 7f2fe2b1c5..4fbaaa92fa 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
index a571a3e9ec..317cdd4a9e 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
index d82350c037..f7f307908e 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
similarity index 99%
rename from harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
rename to harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
index 3813c4077a..371ac81d2e 100644
--- a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp
@@ -59,7 +59,7 @@
  */
 /*----------------------------------------------------------------------*/
 
-#include "../hbqt.h"
+#include "hbqt.h"
 #include "hbqtnetwork_garbage.h"
 #include "hbqtcore_garbage.h"
 
diff --git a/harbour/contrib/hbqt/qtnetwork/TQFtp.prg b/harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQFtp.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttp.prg b/harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQHttp.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg b/harbour/contrib/hbqt/qtnetwork/g/TQHttpHeader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQHttpHeader.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg b/harbour/contrib/hbqt/qtnetwork/g/TQHttpRequestHeader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQHttpRequestHeader.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg b/harbour/contrib/hbqt/qtnetwork/g/TQHttpResponseHeader.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQHttpResponseHeader.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg b/harbour/contrib/hbqt/qtnetwork/g/TQNetworkRequest.prg
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg
rename to harbour/contrib/hbqt/qtnetwork/g/TQNetworkRequest.prg
diff --git a/harbour/contrib/hbqt/qtnetwork/filelist.hbm b/harbour/contrib/hbqt/qtnetwork/g/filelist.hbm
similarity index 100%
rename from harbour/contrib/hbqt/qtnetwork/filelist.hbm
rename to harbour/contrib/hbqt/qtnetwork/g/filelist.hbm
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork_garbage.h b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_garbage.h
similarity index 98%
rename from harbour/contrib/hbqt/qtnetwork/hbqtnetwork_garbage.h
rename to harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_garbage.h
index 36134fa24c..f951f1fbbf 100644
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork_garbage.h
+++ b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_garbage.h
@@ -8,7 +8,7 @@
 /*          or the generator tool itself, and run regenarate.           */
 /* -------------------------------------------------------------------- */
 
-#include "../hbqt.h"
+#include "hbqt.h"
 
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QFtp );
 extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QHttp );
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
index dc7d4e1cf7..31e33c471c 100644
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
@@ -9,10 +9,10 @@
 
 libs=../qtcore/hbqtcore.hbc
 
-{!HB_STATIC_QT}libs=hbqtnetwork${__HB_DYN__}
+{!HB_STATIC_QT&!hbdyn}libs=hbqtnetwork${__HB_DYN__}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4
 {!HB_STATIC_QT&linux}libs=QtNetwork
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
-{HB_STATIC_QT&allwin}libs=hbqtnetworks${__HB_DYN__}
+{HB_STATIC_QT&allwin&!hbdyn}libs=hbqtnetworks${__HB_DYN__}
 {HB_STATIC_QT&linux}libs=hbqtnetwork
 {HB_STATIC_QT&(allwin|linux)}libs=QtNetwork
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
index 8751c3b280..fb07a5e8e4 100644
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
@@ -4,7 +4,9 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
+
+-ig
 
 ../qtcore/hbqtcore.hbc
 
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
index 79d72a4232..96152efb6b 100644
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
@@ -4,7 +4,9 @@
 
 ../hbqt_common.hbm
 
-filelist.hbm
+g/filelist.hbm
+
+-ig
 
 ../qtcore/hbqtcore.hbc
 
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt
index 5441ade35a..2d0807cd44 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt
@@ -1,89 +1,88 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebFrame()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebframe.html
-    $ONELINER$
-        Creates a new QWebFrame object.
-    $INHERITS$
-        QObject
-    $SYNTAX$
-        QWebFrame():new( ... )
-        QWebFrame():from( pPtr_OR_oObj_of_type_QWebFrame )
-        QWebFrame():configure( pPtr_OR_oObj_of_type_QWebFrame )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebFrame
-    $METHODS$
-        :addToJavaScriptWindowObject( cName, pObject )      -> NIL
-        :addToJavaScriptWindowObject_1( cName, pObject, nOwn )  -> NIL
-        :contentsSize()                                     -> pQSize
-        :frameName()                                        -> cQString
-        :geometry()                                         -> pQRect
-        :hitTestContent( pPos )                             -> pQWebHitTestResult
-        :icon()                                             -> pQIcon
-        :load( pUrl )                                       -> NIL
-        :page()                                             -> pQWebPage
-        :pos()                                              -> pQPoint
-        :render( pPainter, pClip )                          -> NIL
-        :render_1( pPainter )                               -> NIL
-        :renderTreeDump()                                   -> cQString
-        :scroll( nDx, nDy )                                 -> NIL
-        :scrollBarMaximum( nOrientation )                   -> nInt
-        :scrollBarMinimum( nOrientation )                   -> nInt
-        :scrollBarPolicy( nOrientation )                    -> nQt::ScrollBarPolicy
-        :scrollBarValue( nOrientation )                     -> nInt
-        :scrollPosition()                                   -> pQPoint
-        :securityOrigin()                                   -> pQWebSecurityOrigin
-        :setContent( pData, cMimeType, pBaseUrl )           -> NIL
-        :setHtml( cHtml, pBaseUrl )                         -> NIL
-        :setScrollBarPolicy( nOrientation, nPolicy )        -> NIL
-        :setScrollBarValue( nOrientation, nValue )          -> NIL
-        :setScrollPosition( pPos )                          -> NIL
-        :setTextSizeMultiplier( nFactor )                   -> NIL
-        :setUrl( pUrl )                                     -> NIL
-        :setZoomFactor( nFactor )                           -> NIL
-        :textSizeMultiplier()                               -> nQreal
-        :title()                                            -> cQString
-        :toHtml()                                           -> cQString
-        :toPlainText()                                      -> cQString
-        :url()                                              -> pQUrl
-        :zoomFactor()                                       -> nQreal
-        :evaluateJavaScript( cScriptSource )                -> pQVariant
-        :print( pPrinter )                                  -> NIL
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebFrame.prg
-        C++ Wrappers : contrib/hbqt/QWebFrame.cpp
-        Library      : hb
-    $SEEALSO$
-        QObject
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebFrame()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebframe.html
+ *  $ONELINER$
+ *     Creates a new QWebFrame object.
+ *  $INHERITS$
+ *     QObject
+ *  $SYNTAX$
+ *     QWebFrame():new( ... )
+ *     QWebFrame():from( pPtr_OR_oObj_of_type_QWebFrame )
+ *     QWebFrame():configure( pPtr_OR_oObj_of_type_QWebFrame )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebFrame
+ *  $METHODS$
+ *     :addToJavaScriptWindowObject( cName, pObject )      -> NIL
+ *     :addToJavaScriptWindowObject_1( cName, pObject, nOwn )  -> NIL
+ *     :childFrames()                                      -> pQList<QWebFrame *>
+ *     :contentsSize()                                     -> pQSize
+ *     :frameName()                                        -> cQString
+ *     :geometry()                                         -> pQRect
+ *     :hitTestContent( pPos )                             -> pQWebHitTestResult
+ *     :icon()                                             -> pQIcon
+ *     :load( pUrl )                                       -> NIL
+ *     :page()                                             -> pQWebPage
+ *     :pos()                                              -> pQPoint
+ *     :render( pPainter, pClip )                          -> NIL
+ *     :render_1( pPainter )                               -> NIL
+ *     :renderTreeDump()                                   -> cQString
+ *     :scroll( nDx, nDy )                                 -> NIL
+ *     :scrollBarMaximum( nOrientation )                   -> nInt
+ *     :scrollBarMinimum( nOrientation )                   -> nInt
+ *     :scrollBarPolicy( nOrientation )                    -> nQt::ScrollBarPolicy
+ *     :scrollBarValue( nOrientation )                     -> nInt
+ *     :scrollPosition()                                   -> pQPoint
+ *     :securityOrigin()                                   -> pQWebSecurityOrigin
+ *     :setContent( pData, cMimeType, pBaseUrl )           -> NIL
+ *     :setHtml( cHtml, pBaseUrl )                         -> NIL
+ *     :setScrollBarPolicy( nOrientation, nPolicy )        -> NIL
+ *     :setScrollBarValue( nOrientation, nValue )          -> NIL
+ *     :setScrollPosition( pPos )                          -> NIL
+ *     :setTextSizeMultiplier( nFactor )                   -> NIL
+ *     :setUrl( pUrl )                                     -> NIL
+ *     :setZoomFactor( nFactor )                           -> NIL
+ *     :textSizeMultiplier()                               -> nQreal
+ *     :title()                                            -> cQString
+ *     :toHtml()                                           -> cQString
+ *     :toPlainText()                                      -> cQString
+ *     :url()                                              -> pQUrl
+ *     :zoomFactor()                                       -> nQreal
+ *     :evaluateJavaScript( cScriptSource )                -> pQVariant
+ *     :print( pPrinter )                                  -> NIL
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebFrame.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebFrame.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     QObject
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt
index 3f5214fcc8..d4e69b1e1e 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt
@@ -1,67 +1,68 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebHistory()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebhistory.html
-    $ONELINER$
-        Creates a new QWebHistory object.
-    $INHERITS$
-
-    $SYNTAX$
-        QWebHistory():new( ... )
-        QWebHistory():from( pPtr_OR_oObj_of_type_QWebHistory )
-        QWebHistory():configure( pPtr_OR_oObj_of_type_QWebHistory )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebHistory
-    $METHODS$
-        :back()                                             -> NIL
-        :backItem()                                         -> Item
-        :canGoBack()                                        -> lBool
-        :canGoForward()                                     -> lBool
-        :clear()                                            -> NIL
-        :count()                                            -> nInt
-        :currentItem()                                      -> Item
-        :currentItemIndex()                                 -> nInt
-        :forward()                                          -> NIL
-        :forwardItem()                                      -> Item
-        :goToItem( pItem )                                  -> NIL
-        :itemAt( nI )                                       -> Item
-        :maximumItemCount()                                 -> nInt
-        :setMaximumItemCount( nCount )                      -> NIL
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebHistory.prg
-        C++ Wrappers : contrib/hbqt/QWebHistory.cpp
-        Library      : hb
-    $SEEALSO$
-
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebHistory()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebhistory.html
+ *  $ONELINER$
+ *     Creates a new QWebHistory object.
+ *  $INHERITS$
+ *     
+ *  $SYNTAX$
+ *     QWebHistory():new( ... )
+ *     QWebHistory():from( pPtr_OR_oObj_of_type_QWebHistory )
+ *     QWebHistory():configure( pPtr_OR_oObj_of_type_QWebHistory )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebHistory
+ *  $METHODS$
+ *     :back()                                             -> NIL
+ *     :backItem()                                         -> Item
+ *     :backItems( nMaxItems )                             -> pQList<QWebHistoryItem>
+ *     :canGoBack()                                        -> lBool
+ *     :canGoForward()                                     -> lBool
+ *     :clear()                                            -> NIL
+ *     :count()                                            -> nInt
+ *     :currentItem()                                      -> Item
+ *     :currentItemIndex()                                 -> nInt
+ *     :forward()                                          -> NIL
+ *     :forwardItem()                                      -> Item
+ *     :forwardItems( nMaxItems )                          -> pQList<QWebHistoryItem>
+ *     :goToItem( pItem )                                  -> NIL
+ *     :itemAt( nI )                                       -> Item
+ *     :items()                                            -> pQList<QWebHistoryItem>
+ *     :maximumItemCount()                                 -> nInt
+ *     :setMaximumItemCount( nCount )                      -> NIL
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebHistory.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebHistory.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt
index e09f25244d..d1298c4bdf 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt
@@ -1,56 +1,54 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebHistoryInterface()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebhistoryinterface.html
-    $ONELINER$
-        Creates a new QWebHistoryInterface object.
-    $INHERITS$
-        QObject
-    $SYNTAX$
-        QWebHistoryInterface():new( ... )
-        QWebHistoryInterface():from( pPtr_OR_oObj_of_type_QWebHistoryInterface )
-        QWebHistoryInterface():configure( pPtr_OR_oObj_of_type_QWebHistoryInterface )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebHistoryInterface
-    $METHODS$
-        :addHistoryEntry( cUrl )                            -> NIL
-        :historyContains( cUrl )                            -> lBool
-        :setDefaultInterface( pDefaultInterface )           -> NIL
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebHistoryInterface.prg
-        C++ Wrappers : contrib/hbqt/QWebHistoryInterface.cpp
-        Library      : hb
-    $SEEALSO$
-        QObject
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebHistoryInterface()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebhistoryinterface.html
+ *  $ONELINER$
+ *     Creates a new QWebHistoryInterface object.
+ *  $INHERITS$
+ *     QObject
+ *  $SYNTAX$
+ *     QWebHistoryInterface():new( ... )
+ *     QWebHistoryInterface():from( pPtr_OR_oObj_of_type_QWebHistoryInterface )
+ *     QWebHistoryInterface():configure( pPtr_OR_oObj_of_type_QWebHistoryInterface )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebHistoryInterface
+ *  $METHODS$
+ *     :addHistoryEntry( cUrl )                            -> NIL
+ *     :historyContains( cUrl )                            -> lBool
+ *     :setDefaultInterface( pDefaultInterface )           -> NIL
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebHistoryInterface.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     QObject
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt
index 3a936cd5ad..db5d2bc7b7 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt
@@ -1,61 +1,59 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebHistoryItem()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebhistoryitem.html
-    $ONELINER$
-        Creates a new QWebHistoryItem object.
-    $INHERITS$
-
-    $SYNTAX$
-        QWebHistoryItem():new( ... )
-        QWebHistoryItem():from( pPtr_OR_oObj_of_type_QWebHistoryItem )
-        QWebHistoryItem():configure( pPtr_OR_oObj_of_type_QWebHistoryItem )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebHistoryItem
-    $METHODS$
-        :icon()                                             -> pQIcon
-        :isValid()                                          -> lBool
-        :lastVisited()                                      -> pQDateTime
-        :originalUrl()                                      -> pQUrl
-        :setUserData( pUserData )                           -> NIL
-        :title()                                            -> cQString
-        :url()                                              -> pQUrl
-        :userData()                                         -> pQVariant
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebHistoryItem.prg
-        C++ Wrappers : contrib/hbqt/QWebHistoryItem.cpp
-        Library      : hb
-    $SEEALSO$
-
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebHistoryItem()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebhistoryitem.html
+ *  $ONELINER$
+ *     Creates a new QWebHistoryItem object.
+ *  $INHERITS$
+ *     
+ *  $SYNTAX$
+ *     QWebHistoryItem():new( ... )
+ *     QWebHistoryItem():from( pPtr_OR_oObj_of_type_QWebHistoryItem )
+ *     QWebHistoryItem():configure( pPtr_OR_oObj_of_type_QWebHistoryItem )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebHistoryItem
+ *  $METHODS$
+ *     :icon()                                             -> pQIcon
+ *     :isValid()                                          -> lBool
+ *     :lastVisited()                                      -> pQDateTime
+ *     :originalUrl()                                      -> pQUrl
+ *     :setUserData( pUserData )                           -> NIL
+ *     :title()                                            -> cQString
+ *     :url()                                              -> pQUrl
+ *     :userData()                                         -> pQVariant
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebHistoryItem.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebHistoryItem.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt
index 6d39a4632f..a706a3d211 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt
@@ -1,67 +1,65 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebHitTestResult()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebhittestresult.html
-    $ONELINER$
-        Creates a new QWebHitTestResult object.
-    $INHERITS$
-
-    $SYNTAX$
-        QWebHitTestResult():new( ... )
-        QWebHitTestResult():from( pPtr_OR_oObj_of_type_QWebHitTestResult )
-        QWebHitTestResult():configure( pPtr_OR_oObj_of_type_QWebHitTestResult )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebHitTestResult
-    $METHODS$
-        :alternateText()                                    -> cQString
-        :boundingRect()                                     -> pQRect
-        :frame()                                            -> pQWebFrame
-        :imageUrl()                                         -> pQUrl
-        :isContentEditable()                                -> lBool
-        :isContentSelected()                                -> lBool
-        :isNull()                                           -> lBool
-        :linkTargetFrame()                                  -> pQWebFrame
-        :linkText()                                         -> cQString
-        :linkTitle()                                        -> pQUrl
-        :linkUrl()                                          -> pQUrl
-        :pixmap()                                           -> pQPixmap
-        :pos()                                              -> pQPoint
-        :title()                                            -> cQString
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebHitTestResult.prg
-        C++ Wrappers : contrib/hbqt/QWebHitTestResult.cpp
-        Library      : hb
-    $SEEALSO$
-
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebHitTestResult()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebhittestresult.html
+ *  $ONELINER$
+ *     Creates a new QWebHitTestResult object.
+ *  $INHERITS$
+ *     
+ *  $SYNTAX$
+ *     QWebHitTestResult():new( ... )
+ *     QWebHitTestResult():from( pPtr_OR_oObj_of_type_QWebHitTestResult )
+ *     QWebHitTestResult():configure( pPtr_OR_oObj_of_type_QWebHitTestResult )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebHitTestResult
+ *  $METHODS$
+ *     :alternateText()                                    -> cQString
+ *     :boundingRect()                                     -> pQRect
+ *     :frame()                                            -> pQWebFrame
+ *     :imageUrl()                                         -> pQUrl
+ *     :isContentEditable()                                -> lBool
+ *     :isContentSelected()                                -> lBool
+ *     :isNull()                                           -> lBool
+ *     :linkTargetFrame()                                  -> pQWebFrame
+ *     :linkText()                                         -> cQString
+ *     :linkTitle()                                        -> pQUrl
+ *     :linkUrl()                                          -> pQUrl
+ *     :pixmap()                                           -> pQPixmap
+ *     :pos()                                              -> pQPoint
+ *     :title()                                            -> cQString
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebHitTestResult.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebHitTestResult.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt
index 34afe9040c..3e96bae16e 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt
@@ -1,84 +1,82 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebPage()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebpage.html
-    $ONELINER$
-        Creates a new QWebPage object.
-    $INHERITS$
-        QObject
-    $SYNTAX$
-        QWebPage():new( ... )
-        QWebPage():from( pPtr_OR_oObj_of_type_QWebPage )
-        QWebPage():configure( pPtr_OR_oObj_of_type_QWebPage )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebPage
-    $METHODS$
-        :action( nAction )                                  -> pQAction
-        :bytesReceived()                                    -> nQuint64
-        :createStandardContextMenu()                        -> pQMenu
-        :currentFrame()                                     -> pQWebFrame
-        :findText( cSubString, nOptions )                   -> lBool
-        :focusNextPrevChild( lNext )                        -> lBool
-        :forwardUnsupportedContent()                        -> lBool
-        :history()                                          -> pQWebHistory
-        :inputMethodQuery( nProperty )                      -> pQVariant
-        :isContentEditable()                                -> lBool
-        :isModified()                                       -> lBool
-        :linkDelegationPolicy()                             -> nLinkDelegationPolicy
-        :mainFrame()                                        -> pQWebFrame
-        :palette()                                          -> pQPalette
-        :pluginFactory()                                    -> pQWebPluginFactory
-        :selectedText()                                     -> cQString
-        :setContentEditable( lEditable )                    -> NIL
-        :setForwardUnsupportedContent( lForward )           -> NIL
-        :setLinkDelegationPolicy( nPolicy )                 -> NIL
-        :setPalette( pPalette )                             -> NIL
-        :setPluginFactory( pFactory )                       -> NIL
-        :setView( pView )                                   -> NIL
-        :setViewportSize( pSize )                           -> NIL
-        :settings()                                         -> pQWebSettings
-        :supportsExtension( nExtension )                    -> lBool
-        :swallowContextMenuEvent( pEvent )                  -> lBool
-        :totalBytes()                                       -> nQuint64
-        :triggerAction( nAction, lChecked )                 -> NIL
-        :updatePositionDependentActions( pPos )             -> NIL
-        :view()                                             -> pQWidget
-        :viewportSize()                                     -> pQSize
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebPage.prg
-        C++ Wrappers : contrib/hbqt/QWebPage.cpp
-        Library      : hb
-    $SEEALSO$
-        QObject
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebPage()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebpage.html
+ *  $ONELINER$
+ *     Creates a new QWebPage object.
+ *  $INHERITS$
+ *     QObject
+ *  $SYNTAX$
+ *     QWebPage():new( ... )
+ *     QWebPage():from( pPtr_OR_oObj_of_type_QWebPage )
+ *     QWebPage():configure( pPtr_OR_oObj_of_type_QWebPage )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebPage
+ *  $METHODS$
+ *     :action( nAction )                                  -> pQAction
+ *     :bytesReceived()                                    -> nQuint64
+ *     :createStandardContextMenu()                        -> pQMenu
+ *     :currentFrame()                                     -> pQWebFrame
+ *     :findText( cSubString, nOptions )                   -> lBool
+ *     :focusNextPrevChild( lNext )                        -> lBool
+ *     :forwardUnsupportedContent()                        -> lBool
+ *     :history()                                          -> pQWebHistory
+ *     :inputMethodQuery( nProperty )                      -> pQVariant
+ *     :isContentEditable()                                -> lBool
+ *     :isModified()                                       -> lBool
+ *     :linkDelegationPolicy()                             -> nLinkDelegationPolicy
+ *     :mainFrame()                                        -> pQWebFrame
+ *     :palette()                                          -> pQPalette
+ *     :pluginFactory()                                    -> pQWebPluginFactory
+ *     :selectedText()                                     -> cQString
+ *     :setContentEditable( lEditable )                    -> NIL
+ *     :setForwardUnsupportedContent( lForward )           -> NIL
+ *     :setLinkDelegationPolicy( nPolicy )                 -> NIL
+ *     :setPalette( pPalette )                             -> NIL
+ *     :setPluginFactory( pFactory )                       -> NIL
+ *     :setView( pView )                                   -> NIL
+ *     :setViewportSize( pSize )                           -> NIL
+ *     :settings()                                         -> pQWebSettings
+ *     :supportsExtension( nExtension )                    -> lBool
+ *     :swallowContextMenuEvent( pEvent )                  -> lBool
+ *     :totalBytes()                                       -> nQuint64
+ *     :triggerAction( nAction, lChecked )                 -> NIL
+ *     :updatePositionDependentActions( pPos )             -> NIL
+ *     :view()                                             -> pQWidget
+ *     :viewportSize()                                     -> pQSize
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebPage.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebPage.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     QObject
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt
index 7f393c41de..d1d58eca34 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt
@@ -1,56 +1,55 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebPluginFactory()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebpluginfactory.html
-    $ONELINER$
-        Creates a new QWebPluginFactory object.
-    $INHERITS$
-        QObject
-    $SYNTAX$
-        QWebPluginFactory():new( ... )
-        QWebPluginFactory():from( pPtr_OR_oObj_of_type_QWebPluginFactory )
-        QWebPluginFactory():configure( pPtr_OR_oObj_of_type_QWebPluginFactory )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebPluginFactory
-    $METHODS$
-        :create( cMimeType, pUrl, pArgumentNames, pArgumentValues )  -> pQObject
-        :refreshPlugins()                                   -> NIL
-        :supportsExtension( nExtension )                    -> lBool
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebPluginFactory.prg
-        C++ Wrappers : contrib/hbqt/QWebPluginFactory.cpp
-        Library      : hb
-    $SEEALSO$
-        QObject
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebPluginFactory()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebpluginfactory.html
+ *  $ONELINER$
+ *     Creates a new QWebPluginFactory object.
+ *  $INHERITS$
+ *     QObject
+ *  $SYNTAX$
+ *     QWebPluginFactory():new( ... )
+ *     QWebPluginFactory():from( pPtr_OR_oObj_of_type_QWebPluginFactory )
+ *     QWebPluginFactory():configure( pPtr_OR_oObj_of_type_QWebPluginFactory )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebPluginFactory
+ *  $METHODS$
+ *     :create( cMimeType, pUrl, pArgumentNames, pArgumentValues )  -> pQObject
+ *     :plugins()                                          -> pQList<Plugin>
+ *     :refreshPlugins()                                   -> NIL
+ *     :supportsExtension( nExtension )                    -> lBool
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebPluginFactory.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebPluginFactory.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     QObject
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt
index f4fdbd1878..fb51b36e9f 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt
@@ -1,59 +1,59 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebSecurityOrigin()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebsecurityorigin.html
-    $ONELINER$
-        Creates a new QWebSecurityOrigin object.
-    $INHERITS$
-
-    $SYNTAX$
-        QWebSecurityOrigin():new( ... )
-        QWebSecurityOrigin():from( pPtr_OR_oObj_of_type_QWebSecurityOrigin )
-        QWebSecurityOrigin():configure( pPtr_OR_oObj_of_type_QWebSecurityOrigin )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebSecurityOrigin
-    $METHODS$
-        :databaseQuota()                                    -> nQint64
-        :databaseUsage()                                    -> nQint64
-        :host()                                             -> cQString
-        :port()                                             -> nInt
-        :scheme()                                           -> cQString
-        :setDatabaseQuota( nQuota )                         -> NIL
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebSecurityOrigin.prg
-        C++ Wrappers : contrib/hbqt/QWebSecurityOrigin.cpp
-        Library      : hb
-    $SEEALSO$
-
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebSecurityOrigin()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebsecurityorigin.html
+ *  $ONELINER$
+ *     Creates a new QWebSecurityOrigin object.
+ *  $INHERITS$
+ *     
+ *  $SYNTAX$
+ *     QWebSecurityOrigin():new( ... )
+ *     QWebSecurityOrigin():from( pPtr_OR_oObj_of_type_QWebSecurityOrigin )
+ *     QWebSecurityOrigin():configure( pPtr_OR_oObj_of_type_QWebSecurityOrigin )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebSecurityOrigin
+ *  $METHODS$
+ *     :databaseQuota()                                    -> nQint64
+ *     :databaseUsage()                                    -> nQint64
+ *     :databases()                                        -> pQList<QWebDatabase>
+ *     :host()                                             -> cQString
+ *     :port()                                             -> nInt
+ *     :scheme()                                           -> cQString
+ *     :setDatabaseQuota( nQuota )                         -> NIL
+ *     :allOrigins()                                       -> pQList<QWebSecurityOrigin>
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebSecurityOrigin.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt
index 8753b1cb5f..abac5c0e3b 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt
@@ -1,77 +1,75 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebSettings()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebsettings.html
-    $ONELINER$
-        Creates a new QWebSettings object.
-    $INHERITS$
-
-    $SYNTAX$
-        QWebSettings():new( ... )
-        QWebSettings():from( pPtr_OR_oObj_of_type_QWebSettings )
-        QWebSettings():configure( pPtr_OR_oObj_of_type_QWebSettings )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebSettings
-    $METHODS$
-        :fontFamily( nWhich )                               -> cQString
-        :fontSize( nType )                                  -> nInt
-        :resetAttribute( nAttribute )                       -> NIL
-        :resetFontFamily( nWhich )                          -> NIL
-        :resetFontSize( nType )                             -> NIL
-        :setAttribute( nAttribute, lOn )                    -> NIL
-        :setFontFamily( nWhich, cFamily )                   -> NIL
-        :setFontSize( nType, nSize )                        -> NIL
-        :setUserStyleSheetUrl( pLocation )                  -> NIL
-        :testAttribute( nAttribute )                        -> lBool
-        :userStyleSheetUrl()                                -> pQUrl
-        :clearIconDatabase()                                -> NIL
-        :iconDatabasePath()                                 -> cQString
-        :iconForUrl( pUrl )                                 -> pQIcon
-        :maximumPagesInCache()                              -> nInt
-        :offlineStorageDefaultQuota()                       -> nQint64
-        :offlineStoragePath()                               -> cQString
-        :setIconDatabasePath( cPath )                       -> NIL
-        :setMaximumPagesInCache( nPages )                   -> NIL
-        :setObjectCacheCapacities( nCacheMinDeadCapacity, nCacheMaxDead, nTotalCapacity )  -> NIL
-        :setOfflineStorageDefaultQuota( nMaximumSize )      -> NIL
-        :setOfflineStoragePath( cPath )                     -> NIL
-        :setWebGraphic( nType, pGraphic )                   -> NIL
-        :webGraphic( nType )                                -> pQPixmap
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebSettings.prg
-        C++ Wrappers : contrib/hbqt/QWebSettings.cpp
-        Library      : hb
-    $SEEALSO$
-
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebSettings()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebsettings.html
+ *  $ONELINER$
+ *     Creates a new QWebSettings object.
+ *  $INHERITS$
+ *     
+ *  $SYNTAX$
+ *     QWebSettings():new( ... )
+ *     QWebSettings():from( pPtr_OR_oObj_of_type_QWebSettings )
+ *     QWebSettings():configure( pPtr_OR_oObj_of_type_QWebSettings )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebSettings
+ *  $METHODS$
+ *     :fontFamily( nWhich )                               -> cQString
+ *     :fontSize( nType )                                  -> nInt
+ *     :resetAttribute( nAttribute )                       -> NIL
+ *     :resetFontFamily( nWhich )                          -> NIL
+ *     :resetFontSize( nType )                             -> NIL
+ *     :setAttribute( nAttribute, lOn )                    -> NIL
+ *     :setFontFamily( nWhich, cFamily )                   -> NIL
+ *     :setFontSize( nType, nSize )                        -> NIL
+ *     :setUserStyleSheetUrl( pLocation )                  -> NIL
+ *     :testAttribute( nAttribute )                        -> lBool
+ *     :userStyleSheetUrl()                                -> pQUrl
+ *     :clearIconDatabase()                                -> NIL
+ *     :iconDatabasePath()                                 -> cQString
+ *     :iconForUrl( pUrl )                                 -> pQIcon
+ *     :maximumPagesInCache()                              -> nInt
+ *     :offlineStorageDefaultQuota()                       -> nQint64
+ *     :offlineStoragePath()                               -> cQString
+ *     :setIconDatabasePath( cPath )                       -> NIL
+ *     :setMaximumPagesInCache( nPages )                   -> NIL
+ *     :setObjectCacheCapacities( nCacheMinDeadCapacity, nCacheMaxDead, nTotalCapacity )  -> NIL
+ *     :setOfflineStorageDefaultQuota( nMaximumSize )      -> NIL
+ *     :setOfflineStoragePath( cPath )                     -> NIL
+ *     :setWebGraphic( nType, pGraphic )                   -> NIL
+ *     :webGraphic( nType )                                -> pQPixmap
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebSettings.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebSettings.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt
index 0193a6a34a..a238556146 100644
--- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt
+++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt
@@ -1,79 +1,77 @@
 /*
- *  hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+
- *  Please do not modify this document as it is subject to change in future.
- *  Pritpal Bedi <bedipritpal@hotmail.com>
+ * $Id$
  */
 
 /*  $DOC$
-    $TEMPLATE$
-        Class
-    $NAME$
-        QWebView()
-    $CATEGORY$
-        Harbour Bindings for Qt
-    $SUBCATEGORY$
-        GUI
-    $EXTERNALLINK$
-        http://doc.trolltech.com/4.5/qwebview.html
-    $ONELINER$
-        Creates a new QWebView object.
-    $INHERITS$
-        QWidget
-    $SYNTAX$
-        QWebView():new( ... )
-        QWebView():from( pPtr_OR_oObj_of_type_QWebView )
-        QWebView():configure( pPtr_OR_oObj_of_type_QWebView )
-    $ARGUMENTS$
-
-    $RETURNS$
-        An instance of the object of type QWebView
-    $METHODS$
-        :findText( cSubString, nOptions )                   -> lBool
-        :history()                                          -> pQWebHistory
-        :icon()                                             -> pQIcon
-        :isModified()                                       -> lBool
-        :load( pUrl )                                       -> NIL
-        :load_1( pRequest, nOperation, pBody )              -> NIL
-        :page()                                             -> pQWebPage
-        :pageAction( nAction )                              -> pQAction
-        :selectedText()                                     -> cQString
-        :setContent( pData, cMimeType, pBaseUrl )           -> NIL
-        :setHtml( cHtml, pBaseUrl )                         -> NIL
-        :setPage( pPage )                                   -> NIL
-        :setTextSizeMultiplier( nFactor )                   -> NIL
-        :setUrl( pUrl )                                     -> NIL
-        :setZoomFactor( nFactor )                           -> NIL
-        :settings()                                         -> pQWebSettings
-        :textSizeMultiplier()                               -> nQreal
-        :title()                                            -> cQString
-        :triggerPageAction( nAction, lChecked )             -> NIL
-        :url()                                              -> pQUrl
-        :zoomFactor()                                       -> nQreal
-        :back()                                             -> NIL
-        :forward()                                          -> NIL
-        :print( pPrinter )                                  -> NIL
-        :reload()                                           -> NIL
-        :stop()                                             -> NIL
-
-    $DESCRIPTION$
-
-    $EXAMPLES$
-
-    $TESTS$
-
-    $STATUS$
-        R
-    $COMPLIANCE$
-        Not Clipper Compatible
-    $PLATFORMS$
-        Windows, Linux, MacOS, OS2
-    $VERSION$
-        4.5.3
-    $FILES$
-        Prg Source   : contrib/hbqt/TQWebView.prg
-        C++ Wrappers : contrib/hbqt/QWebView.cpp
-        Library      : hb
-    $SEEALSO$
-        QWidget
-    $END$
+ *  $TEMPLATE$
+ *     Class
+ *  $NAME$
+ *     QWebView()
+ *  $CATEGORY$
+ *     Harbour Bindings for Qt
+ *  $SUBCATEGORY$
+ *     GUI
+ *  $EXTERNALLINK$
+ *     http://doc.trolltech.com/4.5/qwebview.html
+ *  $ONELINER$
+ *     Creates a new QWebView object.
+ *  $INHERITS$
+ *     QWidget
+ *  $SYNTAX$
+ *     QWebView():new( ... )
+ *     QWebView():from( pPtr_OR_oObj_of_type_QWebView )
+ *     QWebView():configure( pPtr_OR_oObj_of_type_QWebView )
+ *  $ARGUMENTS$
+ * 
+ *  $RETURNS$
+ *     An instance of the object of type QWebView
+ *  $METHODS$
+ *     :findText( cSubString, nOptions )                   -> lBool
+ *     :history()                                          -> pQWebHistory
+ *     :icon()                                             -> pQIcon
+ *     :isModified()                                       -> lBool
+ *     :load( pUrl )                                       -> NIL
+ *     :load_1( pRequest, nOperation, pBody )              -> NIL
+ *     :page()                                             -> pQWebPage
+ *     :pageAction( nAction )                              -> pQAction
+ *     :selectedText()                                     -> cQString
+ *     :setContent( pData, cMimeType, pBaseUrl )           -> NIL
+ *     :setHtml( cHtml, pBaseUrl )                         -> NIL
+ *     :setPage( pPage )                                   -> NIL
+ *     :setTextSizeMultiplier( nFactor )                   -> NIL
+ *     :setUrl( pUrl )                                     -> NIL
+ *     :setZoomFactor( nFactor )                           -> NIL
+ *     :settings()                                         -> pQWebSettings
+ *     :textSizeMultiplier()                               -> nQreal
+ *     :title()                                            -> cQString
+ *     :triggerPageAction( nAction, lChecked )             -> NIL
+ *     :url()                                              -> pQUrl
+ *     :zoomFactor()                                       -> nQreal
+ *     :back()                                             -> NIL
+ *     :forward()                                          -> NIL
+ *     :print( pPrinter )                                  -> NIL
+ *     :reload()                                           -> NIL
+ *     :stop()                                             -> NIL
+ * 
+ *  $DESCRIPTION$
+ * 
+ *  $EXAMPLES$
+ * 
+ *  $TESTS$
+ * 
+ *  $STATUS$
+ *     R
+ *  $COMPLIANCE$
+ *     Not Clipper compatible
+ *  $PLATFORMS$
+ *     Windows, Linux, Mac OS X, OS/2
+ *  $VERSION$
+ *     4.5 or upper
+ *  $FILES$
+ *     Harbour source: contrib/hbqt/qtwebkit/TQWebView.prg
+ *     C++ wrappers  : contrib/hbqt/qtwebkit/QWebView.cpp
+ *     Library       : hbqtwebkit
+ *  $SEEALSO$
+ *     QWidget
+ *  $END$
  */
diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg
index 2d10087693..ab1e49dc48 100644
--- a/harbour/contrib/hbqt/utils/hbqtgen.prg
+++ b/harbour/contrib/hbqt/utils/hbqtgen.prg
@@ -1513,7 +1513,7 @@ STATIC FUNCTION BuildHeader( txt_, nMode, cProFile )
    aadd( txt_, "/*----------------------------------------------------------------------*/"    )
    aadd( txt_, ""                                                                              )
    IF nMode == 0
-   aadd( txt_, '#include "../hbqt.h"'                                                          )
+   aadd( txt_, '#include "hbqt.h"'                                                             )
    aadd( txt_, '#include "hb' + FNameGetName( cProFile ) + '_garbage.h"'                       )
    IF !( FNameGetName( cProFile ) == "qtcore" )
       aadd( txt_, '#include "hbqtcore_garbage.h"'                                              )
@@ -1791,7 +1791,7 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut, cProFile )
    aadd( hdr_, "/*          or the generator tool itself, and run regenarate.           */"    )
    aadd( hdr_, "/* -------------------------------------------------------------------- */"    )
    aadd( hdr_, " " )
-   aadd( hdr_, '#include "../hbqt.h"' )
+   aadd( hdr_, '#include "hbqt.h"' )
    aadd( hdr_, " " )
 
    txt_ := {}
diff --git a/harbour/contrib/hbqt/utils/qtcore.qtp b/harbour/contrib/hbqt/utils/qtcore.qtp
index f04bb5c674..0e0ae67d86 100644
--- a/harbour/contrib/hbqt/utils/qtcore.qtp
+++ b/harbour/contrib/hbqt/utils/qtcore.qtp
@@ -3,7 +3,7 @@
 ;
 
 -I=../qtcore/qth
--O=../qtcore
+-O=../qtcore/g
 -D=../qtcore/doc
 
 HBEvents.qth
diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.qtp b/harbour/contrib/hbqt/utils/qtdesigner.qtp
similarity index 69%
rename from harbour/contrib/hbqt/qtdesigner/hbqtdesigner.qtp
rename to harbour/contrib/hbqt/utils/qtdesigner.qtp
index b148e971ae..0f4d84ad70 100644
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.qtp
+++ b/harbour/contrib/hbqt/utils/qtdesigner.qtp
@@ -2,17 +2,9 @@
 ; $Id$
 ;
 
-;
-; Harbour Source Wrapper Generator's Project File for QT v4.5
-;
-; Pritpal Bedi <bedipritpal@hotmail.com>
-;
-
--I=qth
-
--O=
-
--D=doc
+-I=../qdesigner/qth
+-O=../qdesigner/g
+-D=../qdesigner/doc
 
 QDesignerActionEditorInterface.qth
 QDesignerFormEditorInterface.qth
diff --git a/harbour/contrib/hbqt/utils/qtgui.qtp b/harbour/contrib/hbqt/utils/qtgui.qtp
index 597538dad7..d5e79da9d7 100644
--- a/harbour/contrib/hbqt/utils/qtgui.qtp
+++ b/harbour/contrib/hbqt/utils/qtgui.qtp
@@ -3,7 +3,7 @@
 ;
 
 -I=../qtgui/qth
--O=../qtgui
+-O=../qtgui/g
 -D=../qtgui/doc
 
 HBQAbstractItemModel.qth
diff --git a/harbour/contrib/hbqt/utils/qtnetwork.qtp b/harbour/contrib/hbqt/utils/qtnetwork.qtp
index f47be6f6ff..796f33d3a7 100644
--- a/harbour/contrib/hbqt/utils/qtnetwork.qtp
+++ b/harbour/contrib/hbqt/utils/qtnetwork.qtp
@@ -3,7 +3,7 @@
 ;
 
 -I=../qtnetwork/qth
--O=../qtnetwork
+-O=../qtnetwork/g
 -D=../qtnetwork/doc
 
 QFtp.qth
diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.qtp b/harbour/contrib/hbqt/utils/qtwebkit.qtp
similarity index 60%
rename from harbour/contrib/hbqt/qtwebkit/hbqtwebkit.qtp
rename to harbour/contrib/hbqt/utils/qtwebkit.qtp
index b114d1ff62..8d10dcafe9 100644
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.qtp
+++ b/harbour/contrib/hbqt/utils/qtwebkit.qtp
@@ -2,17 +2,9 @@
 ; $Id$
 ;
 
-;
-; Harbour Source Wrapper Generator's Project File for QT v4.5
-;
-; Pritpal Bedi <bedipritpal@hotmail.com>
-;
-
--I=qth
-
--O=
-
--D=doc
+-I=../qtwebkit/qth
+-O=../qtwebkit/g
+-D=../qtwebkit/doc
 
 QWebFrame.qth
 QWebHistory.qth
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 0352092849..9ad80f3f17 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -378,11 +378,23 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
 
    aSortedList := TopoSort( aPairList )
 
+   /* Add referenced project not present on our list and featuring an .hbp file */
+   FOR EACH cProject IN aSortedList
+      IF !( cProject $ hProjectList )
+         IF hb_FileExists( s_cBase + s_cHome + cProject )
+            AddProject( hProjectList, cProject )
+            call_hbmk2_hbinfo( s_cBase + s_cHome + cProject, hProjectList[ cProject ] )
+         ENDIF
+      ENDIF
+   NEXT
+
    /* Load project information for dependencies too
       (we need "cType" to decide about dynamic build) */
    IF GetEnv( "HB_BUILD_CONTRIB_DYN" ) == "yes"
       FOR EACH cProject IN aSortedList
-         IF !( cProject $ hProjectReqList )
+         IF !( cProject $ hProjectReqList ) .AND. ;
+            cProject $ hProjectList .AND. ;
+            !( "lChecked" $ hProjectList[ cProject ] )
             call_hbmk2_hbinfo( s_cBase + s_cHome + cProject, hProjectList[ cProject ] )
          ENDIF
       NEXT
@@ -406,20 +418,22 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
    /* Build the dependencies and primary targets in sorted order */
 
    FOR EACH cProject IN aSortedList DESCEND
+      IF cProject $ hProjectList
 
-      cProjectPath := s_cBase + s_cHome + cProject
-      lPrimary := cProject $ hProjectReqList
+         cProjectPath := s_cBase + s_cHome + cProject
+         lPrimary := cProject $ hProjectReqList
 
-      call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), .F. )
+         call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), .F. )
 
-      /* Build dynamic lib */
-      IF GetEnv( "HB_BUILD_CONTRIB_DYN" ) == "yes" .AND. hProjectList[ cProject ][ "cType" ] == "hblib"
-         call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), .T. )
-      ENDIF
+         /* Build dynamic lib */
+         IF GetEnv( "HB_BUILD_CONTRIB_DYN" ) == "yes" .AND. hProjectList[ cProject ][ "cType" ] == "hblib"
+            call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), .T. )
+         ENDIF
 
-      /* Compile documentation */
-      IF lPrimary .AND. lInstall
-         mk_hbd( PathSepToSelf( cProjectPath ) )
+         /* Compile documentation */
+         IF lPrimary .AND. lInstall
+            mk_hbd( PathSepToSelf( cProjectPath ) )
+         ENDIF
       ENDIF
    NEXT
 
@@ -447,6 +461,8 @@ STATIC FUNCTION call_hbmk2_hbinfo( cProjectPath, hProject )
 
    clear_hbmk2_envvars()
 
+   hProject[ "lChecked" ] := NIL
+
    IF hb_processRun( s_cBinDir + "hbmk2 --hbinfo " + StrTran( cProjectPath, "\", "/" ),, @cStdOut  ) == 0
 
       hProject[ "cType" ] := hbmk2_hbinfo_getitem( cStdOut, "targettype" )
@@ -515,7 +531,7 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn )
    ENDIF
 
    nErrorLevel := mk_hb_processRun( s_cBinDir + "hbmk2" +;
-                                    " -quiet -width=0" +;
+                                    " -quiet -width=0 -shl" +;
                                     " @" + StrTran( s_cHome + "hbpre", "\", "/" ) +;
                                     cOptionsPre +;
                                     " " + StrTran( cProjectPath, "\", "/" ) +;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 68f7db728b..4f20000519 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -369,55 +369,56 @@ REQUEST hbmk_KEYW
 #define _HBMK_aLNG              86
 #define _HBMK_cPO               87
 
-#define _HBMK_aPLUGIN           88
-#define _HBMK_hPLUGINHRB        89
-#define _HBMK_hPLUGINVars       90
-#define _HBMK_aPLUGINPars       91
-#define _HBMK_hPLUGINExt        92
+#define _HBMK_hPLUGINHRB        88
+#define _HBMK_hPLUGINVars       89
+#define _HBMK_aPLUGINPars       90
+#define _HBMK_hPLUGINExt        91
 
-#define _HBMK_lDEBUGTIME        93
-#define _HBMK_lDEBUGINC         94
-#define _HBMK_lDEBUGSTUB        95
-#define _HBMK_lDEBUGI18N        96
-#define _HBMK_lDEBUGDEPD        97
-#define _HBMK_lDEBUGPARS        98
+#define _HBMK_lDEBUGTIME        92
+#define _HBMK_lDEBUGINC         93
+#define _HBMK_lDEBUGSTUB        94
+#define _HBMK_lDEBUGI18N        95
+#define _HBMK_lDEBUGDEPD        96
+#define _HBMK_lDEBUGPARS        97
 
-#define _HBMK_cCCPATH           99
-#define _HBMK_cCCPREFIX         100
-#define _HBMK_cCCPOSTFIX        101
-#define _HBMK_cCCEXT            102
+#define _HBMK_cCCPATH           98
+#define _HBMK_cCCPREFIX         99
+#define _HBMK_cCCPOSTFIX        100
+#define _HBMK_cCCEXT            101
 
-#define _HBMK_cWorkDir          103
-#define _HBMK_cWorkDirDynSub    104
-#define _HBMK_nCmd_Esc          105
-#define _HBMK_nScr_Esc          106
-#define _HBMK_nCmd_FNF          107
-#define _HBMK_nScr_FNF          108
-#define _HBMK_nErrorLevel       109
+#define _HBMK_cWorkDir          102
+#define _HBMK_cWorkDirDynSub    103
+#define _HBMK_nCmd_Esc          104
+#define _HBMK_nScr_Esc          105
+#define _HBMK_nCmd_FNF          106
+#define _HBMK_nScr_FNF          107
+#define _HBMK_nErrorLevel       108
 
-#define _HBMK_cPROGDIR          110
-#define _HBMK_cPROGNAME         111
+#define _HBMK_cPROGDIR          109
+#define _HBMK_cPROGNAME         110
 
-#define _HBMK_hAUTOHBC          112 /* trigger header => .hbc associations */
-#define _HBMK_hAUTOHBCFOUND     113 /* trigger headers found */
+#define _HBMK_hAUTOHBC          111 /* trigger header => .hbc associations */
+#define _HBMK_hAUTOHBCFOUND     112 /* trigger headers found */
 
-#define _HBMK_aDEPTHBC          114 /* .hbc references found */
-#define _HBMK_hDEPTSDIR         115 /* Header dirs found for dependencies */
+#define _HBMK_aDEPTHBC          113 /* .hbc references found */
+#define _HBMK_hDEPTSDIR         114 /* Header dirs found for dependencies */
 
-#define _HBMK_lStopAfterInit    116
-#define _HBMK_lStopAfterHarbour 117
+#define _HBMK_lStopAfterInit    115
+#define _HBMK_lStopAfterHarbour 116
 
-#define _HBMK_nCOMPVer          118
-#define _HBMK_lDEPIMPLIB        119 /* Generate import libs configured in dependecy specification */
-#define _HBMK_lInstForce        120 /* Force to install target even if was up to date */
-#define _HBMK_lAutoHBM          121 /* Toggles processing of hbmk.hbm file in current directory */
+#define _HBMK_nCOMPVer          117
+#define _HBMK_lDEPIMPLIB        118 /* Generate import libs configured in dependecy specification */
+#define _HBMK_lInstForce        119 /* Force to install target even if was up to date */
+#define _HBMK_lAutoHBM          120 /* Toggles processing of hbmk.hbm file in current directory */
+#define _HBMK_lContainer        121 /* Target type: container */
+#define _HBMK_lShowLevel        122 /* Show project nesting level in all output lines */
 
-#define _HBMK_aArgs             122
-#define _HBMK_nArgTarget        123
-#define _HBMK_lPause            124
-#define _HBMK_nLevel            125
+#define _HBMK_aArgs             123
+#define _HBMK_nArgTarget        124
+#define _HBMK_lPause            125
+#define _HBMK_nLevel            126
 
-#define _HBMK_MAX_              125
+#define _HBMK_MAX_              126
 
 #define _HBMK_DEP_CTRL_MARKER   ".control." /* must be an invalid path */
 
@@ -892,7 +893,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    hbmk[ _HBMK_lBLDFLGC ] := .F.
    hbmk[ _HBMK_lBLDFLGL ] := .F.
 
-   hbmk[ _HBMK_aPLUGIN ] := {}
    hbmk[ _HBMK_hPLUGINHRB ] := { => }
    hbmk[ _HBMK_hPLUGINVars ] := { => }
    hbmk[ _HBMK_aPLUGINPars ] := {}
@@ -915,6 +915,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
    hbmk[ _HBMK_lInstForce ] := .F.
    hbmk[ _HBMK_lAutoHBM ] := .T.
+   hbmk[ _HBMK_lContainer ] := .F.
+   hbmk[ _HBMK_lShowLevel ] := .F.
 
    hbmk[ _HBMK_aArgs ] := aArgs
    hbmk[ _HBMK_nArgTarget ] := nArgTarget
@@ -980,6 +982,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       CASE Left( cParamL, 7 )  == "-build="    ; hbmk[ _HBMK_cBUILD ] := SubStr( cParam, 8 )
       CASE Left( cParamL, 6 )  == "-build"     ; hbmk[ _HBMK_lStopAfterHarbour ] := .T.
       CASE Left( cParamL, 6 )  == "-lang="     ; hbmk[ _HBMK_cUILNG ] := SubStr( cParam, 7 ) ; SetUILang( hbmk )
+      CASE Left( cParamL, 4 )  == "-shl"       ; hbmk[ _HBMK_lShowLevel ] := .T.
       CASE Left( cParamL, 7 )  == "-width="
 
          tmp := Val( SubStr( cParam, 8 ) )
@@ -1873,6 +1876,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
            Left( cParamL, 5 )  == "-cpu=" .OR. ;
            Left( cParamL, 7 )  == "-build=" .OR. ;
            Left( cParamL, 6 )  == "-lang=" .OR. ;
+           Left( cParamL, 4 )  == "-shl" .OR. ;
            Left( cParamL, 7 )  == "-width=" .OR. ;
            Left( cParamL, 5 )  == "-env:" .OR. ;
            cParamL             == "-autohbm" .OR. ;
@@ -1898,10 +1902,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       CASE cParamL == "-quiet-"          ; hbmk[ _HBMK_lQuiet ] := .F.
       CASE cParamL == "-info"            ; hbmk[ _HBMK_lInfo ] := .T.
       CASE cParamL == "-pause"           ; lPause := .T.
-      CASE cParamL == "-hbexe"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .F. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .F. )
-      CASE cParamL == "-hblib"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .T. ; Set_lCreateDyn( hbmk, .F. )
-      CASE cParamL == "-hbdyn"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .T. ) ; hbmk[ _HBMK_lDynVM ] := .F. ; l_lNOHBLIB := .T.
-      CASE cParamL == "-hbdynvm"         ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .T. ) ; hbmk[ _HBMK_lDynVM ] := .T. ; l_lNOHBLIB := .F.
+      CASE cParamL == "-hbexe"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .F. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .F. ) ; hbmk[ _HBMK_lCreateImpLib ] := .F.
+      CASE cParamL == "-hblib"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .T. ; Set_lCreateDyn( hbmk, .F. ) ; hbmk[ _HBMK_lCreateImpLib ] := .F.
+      CASE cParamL == "-hbdyn"           ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .T. ) ; hbmk[ _HBMK_lCreateImpLib ] := .F. ; hbmk[ _HBMK_lDynVM ] := .F. ; l_lNOHBLIB := .T.
+      CASE cParamL == "-hbdynvm"         ; hbmk[ _HBMK_lStopAfterHarbour ] := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .T. ) ; hbmk[ _HBMK_lCreateImpLib ] := .F. ; hbmk[ _HBMK_lDynVM ] := .T. ; l_lNOHBLIB := .F.
+      CASE cParamL == "-hbcontainer"     ; hbmk[ _HBMK_lContainer ] := .T. ; hbmk[ _HBMK_lStopAfterInit ] := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; Set_lCreateDyn( hbmk, .F. ) ; hbmk[ _HBMK_lCreateImpLib ] := .F.
       CASE cParamL == "-hbimplib"        ; hbmk[ _HBMK_lCreateImpLib ] := .T. ; lAcceptIFlag := .T.
       CASE cParamL == "-gui" .OR. ;
            cParamL == "-mwindows"        ; hbmk[ _HBMK_lGUI ]       := .T. /* Compatibility */
@@ -2363,7 +2368,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
          cParam := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, SubStr( cParam, Len( "-plugin=" ) + 1 ), aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
          IF ( tmp := FindInPathPlugIn( cParam ) ) != NIL
-            AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
             PlugIn_Load( hbmk, tmp )
          ELSE
             IF hbmk[ _HBMK_lInfo ]
@@ -2538,6 +2542,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             NEXT
          ENDIF
 
+         cParam := PathNormalize( cParam )
+
          IF hbmk[ _HBMK_lInfo ]
             hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing: %1$s" ), cParam ) )
          ENDIF
@@ -2548,7 +2554,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
          cParam := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
          IF ( tmp := FindInPathPlugIn( cParam ) ) != NIL
-            AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
             PlugIn_Load( hbmk, tmp )
          ELSE
             IF hbmk[ _HBMK_lInfo ]
@@ -2704,7 +2709,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    ENDIF
 
    /* Start doing the make process. */
-   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. ! hbmk[ _HBMK_lCreateImpLib ] .AND. ( Len( hbmk[ _HBMK_aPLUGINPars ] ) + Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0
+   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. ! hbmk[ _HBMK_lCreateImpLib ] .AND. ( Len( hbmk[ _HBMK_aPLUGINPars ] ) + Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0 .AND. ! hbmk[ _HBMK_lContainer ]
       hbmk_OutErr( hbmk, I_( "Warning: No source files were specified." ) )
       RETURN 0
    ENDIF
@@ -7253,50 +7258,55 @@ STATIC PROCEDURE PlugIn_Load( hbmk, cFileName )
    LOCAL cExt
    LOCAL lOK
    LOCAL cType
-   LOCAL hrb := NIL
+   LOCAL hrb
 
-   hb_FNameSplit( cFileName, NIL, NIL, @cExt )
+   cFileName := PathNormalize( cFileName )
 
-   cFile := hb_MemoRead( cFileName )
+   IF !( cFileName $ hbmk[ _HBMK_hPLUGINHRB ] )
 
-   IF ! Empty( cFile )
-      lOK := .F.
-      /* Optimization: Don't try to load it as .hrb if the extension is .prg or .hbs (Harbour script) */
-      IF !( Lower( cExt ) == ".prg" ) .AND. ;
-         !( Lower( cExt ) == ".hbs" )
-         BEGIN SEQUENCE WITH {| oError | Break( oError ) }
-            hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
-            cType := I_( "(compiled)" )
-            lOK := .T.
-         END SEQUENCE
-      ENDIF
-      IF ! lOK .AND. !( Lower( cExt ) == ".hrb" ) /* Optimization: Don't try to load it as .prg if the extension is .hrb */
-         cType := I_( "(source)" )
-         cFile := hb_compileFromBuf( cFile, "-n2", "-w3", "-es2", "-q0", "-D" + _HBMK_SCRIPT )
-         IF ! Empty( cFile )
-            hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
+      hrb := NIL
+
+      hb_FNameSplit( cFileName, NIL, NIL, @cExt )
+
+      cFile := hb_MemoRead( cFileName )
+
+      IF ! Empty( cFile )
+         lOK := .F.
+         /* Optimization: Don't try to load it as .hrb if the extension is .prg or .hbs (Harbour script) */
+         IF !( Lower( cExt ) == ".prg" ) .AND. ;
+            !( Lower( cExt ) == ".hbs" )
+            BEGIN SEQUENCE WITH {| oError | Break( oError ) }
+               hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
+               cType := I_( "(compiled)" )
+               lOK := .T.
+            END SEQUENCE
+         ENDIF
+         IF ! lOK .AND. !( Lower( cExt ) == ".hrb" ) /* Optimization: Don't try to load it as .prg if the extension is .hrb */
+            cType := I_( "(source)" )
+            cFile := hb_compileFromBuf( cFile, "-n2", "-w3", "-es2", "-q0", "-D" + _HBMK_SCRIPT )
+            IF ! Empty( cFile )
+               hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
+            ENDIF
          ENDIF
       ENDIF
-   ENDIF
 
-   IF ! Empty( hrb )
-      hbmk[ _HBMK_hPLUGINHRB ][ cFileName ] := hrb
-
-      IF ! PlugIn_call_low( hbmk, cFileName, hrb, PlugIn_make_ctx( hbmk, "init" ) )
-         /* Don't call plugin any further if initialization returned error */
-         hb_HDel( hbmk[ _HBMK_hPLUGINHRB ], cFileName )
-         IF hbmk[ _HBMK_lInfo ]
-            hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Initializing plugin: %1$s" ), cFileName ) )
+      IF ! Empty( hrb )
+         IF ! PlugIn_call_low( hbmk, cFileName, hrb, PlugIn_make_ctx( hbmk, "init" ) )
+            /* Don't call plugin any further if initialization returned error */
+            IF hbmk[ _HBMK_lInfo ]
+               hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Initializing plugin: %1$s" ), cFileName ) )
+            ENDIF
+         ELSE
+            hbmk[ _HBMK_hPLUGINHRB ][ cFileName ] := hrb
+            IF hbmk[ _HBMK_lTRACE ]
+               hbmk_OutStd( hbmk, hb_StrFormat( I_( "Loaded plugin: %1$s %2$s" ), cFileName, cType ) )
+            ENDIF
          ENDIF
       ELSE
-         IF hbmk[ _HBMK_lTRACE ]
-            hbmk_OutStd( hbmk, hb_StrFormat( I_( "Loaded plugin: %1$s %2$s" ), cFileName, cType ) )
+         IF hbmk[ _HBMK_lInfo ]
+            hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Loading plugin: %1$s" ), cFileName ) )
          ENDIF
       ENDIF
-   ELSE
-      IF hbmk[ _HBMK_lInfo ]
-         hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Loading plugin: %1$s" ), cFileName ) )
-      ENDIF
    ENDIF
 
    RETURN
@@ -8468,6 +8478,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                      NEXT
                   ENDIF
 
+                  cItem := PathNormalize( cItem )
+
                   IF hbmk[ _HBMK_lInfo ]
                      hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing: %1$s" ), cItem ) )
                   ENDIF
@@ -8510,6 +8522,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                   NEXT
                ENDIF
 
+               cItem := PathNormalize( cItem )
+
                IF hbmk[ _HBMK_lInfo ]
                   hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing: %1$s" ), cItem ) )
                ENDIF
@@ -8755,7 +8769,6 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
 
          cLine := PathNormalize( PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, cLine, cFileName ) ), FNameDirGet( cFileName ) ) )
          IF ( tmp := FindInPathPlugIn( cLine ) ) != NIL
-            AAdd( hbmk[ _HBMK_aPLUGIN ], tmp )
             PlugIn_Load( hbmk, tmp )
          ELSE
             IF hbmk[ _HBMK_lInfo ]
@@ -10333,7 +10346,8 @@ STATIC FUNCTION hbmk_TARGETNAME( hbmk )
 
 STATIC FUNCTION hbmk_TARGETTYPE( hbmk )
 
-   IF hbmk[ _HBMK_lCreateLib ]                                           ; RETURN "hblib"
+   IF hbmk[ _HBMK_lContainer ]                                           ; RETURN "hbcontainer"
+   ELSEIF hbmk[ _HBMK_lCreateLib ]                                       ; RETURN "hblib"
    ELSEIF hbmk[ _HBMK_lCreateDyn ] .AND. ! hbmk[ _HBMK_lDynVM ]          ; RETURN "hbdyn"
    ELSEIF hbmk[ _HBMK_lCreateDyn ] .AND. hbmk[ _HBMK_lDynVM ]            ; RETURN "hbdynvm"
    ELSEIF hbmk[ _HBMK_lCreateImpLib ]                                    ; RETURN "hbimplib"
@@ -11121,6 +11135,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-build=<name>"      , I_( "use a specific build name" ) },;
       { "-lang=<lang>"       , I_( "override default language. Similar to HB_LANG envvar." ) },;
       { "-width=<n>"         , I_( "set output width to <n> characters (0=unlimited)." ) },;
+      { "-shl"               , I_( "show sub-project level in output lines" ) },;
       { "--version"          , I_( "display version header only" ) } }
 
    LOCAL aText_Notes := {;
@@ -11202,18 +11217,23 @@ STATIC PROCEDURE OutNote( hbmk, cText )
 STATIC PROCEDURE hbmk_OutStd( hbmk, cText )
    LOCAL nLine
    LOCAL nLines
+   LOCAL nWidth
+   LOCAL cPrefix
    LOCAL tmp
 
+   IF hbmk[ _HBMK_lShowLevel ]
+      nWidth := 10
+      cPrefix := hb_StrFormat( "hbmk2 #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
+   ELSE
+      nWidth := 7
+      cPrefix := "hbmk2:"
+   ENDIF
+
    cText := StrTran( cText, "\n", hb_eol() )
-   nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - 7 )
+   nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - nWidth )
    FOR nLine := 1 TO nLines
-      IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - 7, nLine ) ) )
-         IF nLine == 1
-            OutStd( PadR( "hbmk2:", 7 ) )
-         ELSE
-            OutStd( Space( 7 ) )
-         ENDIF
-         OutStd( tmp + _OUT_EOL )
+      IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - nWidth, nLine ) ) )
+         OutStd( iif( nLine == 1, PadR( cPrefix, nWidth ), Space( nWidth ) ) + tmp + _OUT_EOL )
       ENDIF
    NEXT
 
@@ -11222,18 +11242,23 @@ STATIC PROCEDURE hbmk_OutStd( hbmk, cText )
 STATIC PROCEDURE hbmk_OutErr( hbmk, cText )
    LOCAL nLine
    LOCAL nLines
+   LOCAL nWidth
+   LOCAL cPrefix
    LOCAL tmp
 
+   IF hbmk[ _HBMK_lShowLevel ]
+      nWidth := 10
+      cPrefix := hb_StrFormat( "hbmk2 #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
+   ELSE
+      nWidth := 7
+      cPrefix := "hbmk2:"
+   ENDIF
+
    cText := StrTran( cText, "\n", hb_eol() )
-   nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - 7 )
+   nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - nWidth )
    FOR nLine := 1 TO nLines
-      IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - 7, nLine ) ) )
-         IF nLine == 1
-            OutErr( PadR( "hbmk2:", 7 ) )
-         ELSE
-            OutErr( Space( 7 ) )
-         ENDIF
-         OutErr( tmp + _OUT_EOL )
+      IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - nWidth, nLine ) ) )
+         OutErr( iif( nLine == 1, PadR( cPrefix, nWidth ), Space( nWidth ) ) + tmp + _OUT_EOL )
       ENDIF
    NEXT