diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fd3049183b..e402a4f8f8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,86 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-31 12:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt.h
+  * contrib/hbqt/hbqt_hbqtableview.h
+  * contrib/hbqt/hbqt_hbevents.h
+  * contrib/hbqt/hbqt_hbdbfmodel.cpp
+  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
+  * contrib/hbqt/hbqt_hbqmainwindow.h
+  * contrib/hbqt/hbqt_hbqtableview.cpp
+  * contrib/hbqt/hbqt_hbevents.cpp
+  * contrib/hbqt/hbqt_hbqplaintextedit.h
+  * contrib/hbqt/hbqt_hbdbfmodel.h
+  * contrib/hbqt/hbqt_destruct.cpp
+  * contrib/hbqt/hbqt_utils.cpp
+  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
+  * contrib/hbqt/hbqt_hbqplaintextedit.cpp
+  * contrib/hbqt/hbqt_hbslots.cpp
+  * contrib/hbqt/qth/QVariant.qth
+  * contrib/hbqt/qth/QCursor.qth
+  * contrib/hbqt/qth/QClipboard.qth
+  * contrib/hbqt/qth/QApplication.qth
+  * contrib/hbqt/qth/QCoreApplication.qth
+  * contrib/hbqt/qth/QImage.qth
+  * contrib/hbqt/qth/QUrl.qth
+  * contrib/hbqt/qth/QAbstractItemModel.qth
+  * contrib/hbqt/qth/QImageReader.qth
+  * contrib/hbqt/qth/QWebHistoryItem.qth
+  * contrib/hbqt/qth/QFont.qth
+  * contrib/hbqt/qth/QFontDatabase.qth
+    ! Fixed to use '#include <QModule/QName>' format when referring
+      to QT headers. This is the official way and it allows to clean
+      the include header paths.
+    ! Fixed to use '#include <QtCore/qglobal>' instead of
+      '#include <qglobal.h>' for the same reason as above.
+
+  * contrib/hbqt/hbqt.h
+    + Added '#include "QtCore/QObject"' to make hbmk2 component
+      detection happy. This is slight hack as I didn't want to
+      introduce parsing of '<>' style system headers just for the
+      sake of QT. Anyway it's quite humble hack without side effects.
+
+  * contrib/hbqt/detect.mk
+    * Changed to 'QtCore/qglobal.h' as key header name used for
+      detection.
+    ! Fix to header dir autodetection path on darwin platform.
+      (it would have caused potential problem with QT 5.x releases)
+    % Simplified header path list for non-darwin platforms.
+
+  + contrib/hbqt/hbqt_common.hbm
+  + contrib/hbqt/hbqt.hbp
+  + contrib/hbqt/hbqts.hbp
+  + contrib/hbqt/hbqtcore.hbp
+  + contrib/hbqt/hbqtcores.hbp
+  + contrib/hbqt/hbqtgui.hbp
+  + contrib/hbqt/hbqtguis.hbp
+  + contrib/hbqt/hbqtnetwork.hbp
+  + contrib/hbqt/hbqtnetworks.hbp
+    + Added hbmk2 make files for HBQT libs.
+      Features are equivalent to the GNU Make flavour.
+      (only tested on Windows so far)
+
+  + contrib/hbxbp/hbxbp.hbp
+    + Added hbmk2 make file for HBXBP lib.
+
+  * contrib/hbfbird/hbfbird.hbp
+  * contrib/hbsms/hbsms.hbp
+    * Use ${hb_name} instead of ${hb_dirname}.
+    + Added -w3 -es3 options.
+
+  * utils/hbmk2/hbmk2.prg
+    + Set pathseps to '/' in "-reqheader=' and
+      '-reqpkg=' header names.
+
+  - utils/hbmk2/examples/plug_moc.prg
+  + contrib/hbqt/plug_moc.prg
+    * Moved inside hbqt lib.
+
+  * contrib/hbqt/qtgui/*
+  * contrib/hbqt/qtcore/*
+    * Regenerated.
+
 2010-05-31 11:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/xhbhasha.c
     ! fixed HSETAACOMPATIBILITY() to always return .T.
diff --git a/harbour/contrib/hbfbird/hbfbird.hbp b/harbour/contrib/hbfbird/hbfbird.hbp
index 0832d6a1d1..19a190e4c1 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -5,7 +5,9 @@
 -hblib
 -inc
 
--o${hb_dirname}
+-o${hb_name}
+
+-w3 -es2
 
 firebird.c
 tfirebrd.prg
diff --git a/harbour/contrib/hbqt/detect.mk b/harbour/contrib/hbqt/detect.mk
index 1dd93048b6..f94459a468 100644
--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -16,7 +16,7 @@ _DET_VAR_HAS_ := HB_HAS_QT
 _DET_FLT_PLAT := !dos
 _DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
 _DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-_DET_INC_HEAD := /Qt/qglobal.h
+_DET_INC_HEAD := /QtCore/qglobal.h
 include $(TOP)$(ROOT)config/detfun.mk
 
 _QT_DARWIN :=
@@ -25,7 +25,7 @@ ifeq ($(HB_PLATFORM),darwin)
       _DET_DSP_NAME := qt
       _DET_VAR_INC_ := HB_INC_QT
       _DET_VAR_HAS_ := HB_HAS_QT
-      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Versions/4/Headers
+      _DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Headers
       _DET_INC_HEAD := /QtCore
       include $(TOP)$(ROOT)config/detfun.mk
       _QT_DARWIN := yes
@@ -43,13 +43,6 @@ ifneq ($(HB_HAS_QT),)
       endif
    else
       HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d))
-      HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d)/QtCore)
-      ifneq ($(filter qtgui,$(_QT_HEADERS)),)
-         HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d)/QtGui)
-      endif
-      ifneq ($(filter qtnetwork,$(_QT_HEADERS)),)
-         HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d)/QtNetwork)
-      endif
    endif
 
    # Locate 'moc' executable
diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h
index a4eff6bf2e..b6eecf370a 100644
--- a/harbour/contrib/hbqt/hbqt.h
+++ b/harbour/contrib/hbqt/hbqt.h
@@ -66,7 +66,8 @@
 #  include <os2.h>
 #endif
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
+/* For hbmk2: #include "QtCore/QObject" */
 
 #if !( QT_VERSION >= 0x040500 )
    #error QT library version 4.5.0 or upper is required for hbqt.
diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp
new file mode 100644
index 0000000000..9f282e5763
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -0,0 +1,32 @@
+#
+# $Id$
+#
+
+hbqt_common.hbm
+
+-o${hb_name}
+
+hbqt_base.cpp
+hbqt_destruct.cpp
+hbqt_hbdbfmodel.cpp
+hbqt_hbevents.cpp
+hbqt_hbqmainwindow.cpp
+hbqt_hbqplaintextedit.cpp
+hbqt_hbqsyntaxhighlighter.cpp
+hbqt_hbqtableview.cpp
+hbqt_hbslots.cpp
+hbqt_utils.cpp
+hbqt_misc.prg
+hbqt_errorsys.prg
+THbQtUI.prg
+
+-pi=hbqt_hbdbfmodel.h
+-pi=hbqt_hbevents.h
+-pi=hbqt_hbqmainwindow.h
+-pi=hbqt_hbqplaintextedit.h
+-pi=hbqt_hbqsyntaxhighlighter.h
+-pi=hbqt_hbqtableview.h
+-pi=hbqt_hbslots.h
+
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtNetwork.framework/Headers
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
new file mode 100644
index 0000000000..ff578ada1b
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -0,0 +1,23 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+
+-w3 -es2
+
+-stop{dos|mingw64|watcom|bcc|pocc|pocc64|poccarm|msvcia64}
+
+-plugin=plug_moc.prg
+
+{!darwin|HB_WITH_QT}-reqheader=QtCore/QObject
+{!darwin|HB_WITH_QT}-inctrypath=${HB_WITH_QT}
+{!darwin}-inctrypath=/usr/include/qt4
+{!darwin}-inctrypath=/usr/lib/qt4/include
+{!darwin}-inctrypath=/usr/include
+{!darwin}-inctrypath=/Developer/qt/include
+
+{darwin&!HB_WITH_QT}-reqheader=QtCore
+{darwin&!HB_WITH_QT}-inctrypath=/Library/Frameworks/QtCore.framework/Headers
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtCore.framework/Headers
diff --git a/harbour/contrib/hbqt/hbqt_destruct.cpp b/harbour/contrib/hbqt/hbqt_destruct.cpp
index fdea2b60cf..dec8a8fb67 100644
--- a/harbour/contrib/hbqt/hbqt_destruct.cpp
+++ b/harbour/contrib/hbqt/hbqt_destruct.cpp
@@ -58,7 +58,7 @@
 
 #if QT_VERSION >= 0x040500
 
-#include <QTextCodec>
+#include <QtCore/QTextCodec>
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp b/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp
index 29eab39c00..67b98aacfa 100644
--- a/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp
@@ -60,8 +60,8 @@
 
 #include "hbqt_hbdbfmodel.h"
 
-#include <QIcon>
-#include <QWidget>
+#include <QtGui/QIcon>
+#include <QtGui/QWidget>
 
 #define HBQT_BRW_CELLVALUE                        1001
 
diff --git a/harbour/contrib/hbqt/hbqt_hbdbfmodel.h b/harbour/contrib/hbqt/hbqt_hbdbfmodel.h
index ca11cddf76..1b27673d1f 100644
--- a/harbour/contrib/hbqt/hbqt_hbdbfmodel.h
+++ b/harbour/contrib/hbqt/hbqt_hbdbfmodel.h
@@ -57,8 +57,8 @@
 
 /*----------------------------------------------------------------------*/
 
-#include <QAbstractItemModel>
-#include <QPointer>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QPointer>
 
 class HBDbfModel : public QAbstractItemModel
 {
diff --git a/harbour/contrib/hbqt/hbqt_hbevents.cpp b/harbour/contrib/hbqt/hbqt_hbevents.cpp
index f823fcfe5d..2fed911bb4 100644
--- a/harbour/contrib/hbqt/hbqt_hbevents.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbevents.cpp
@@ -63,8 +63,8 @@
 
 #include "hbqt_hbevents.h"
 
-#include <QPointer>
-#include <QVariant>
+#include <QtCore/QPointer>
+#include <QtCore/QVariant>
 
 HBEvents::HBEvents( QObject * parent ) : QObject( parent )
 {
diff --git a/harbour/contrib/hbqt/hbqt_hbevents.h b/harbour/contrib/hbqt/hbqt_hbevents.h
index 65a41122ab..120e9ee2ec 100644
--- a/harbour/contrib/hbqt/hbqt_hbevents.h
+++ b/harbour/contrib/hbqt/hbqt_hbevents.h
@@ -59,9 +59,9 @@
 
 /*----------------------------------------------------------------------*/
 
-#include <QObject>
-#include <QEvent>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QEvent>
+#include <QtCore/QList>
 
 class HBEvents: public QObject
 {
diff --git a/harbour/contrib/hbqt/hbqt_hbqmainwindow.h b/harbour/contrib/hbqt/hbqt_hbqmainwindow.h
index 287ed6a6bc..f4f3064db9 100644
--- a/harbour/contrib/hbqt/hbqt_hbqmainwindow.h
+++ b/harbour/contrib/hbqt/hbqt_hbqmainwindow.h
@@ -57,9 +57,9 @@
 
 /*----------------------------------------------------------------------*/
 
-#include <QPointer>
-#include <QMainWindow>
-#include <QMouseEvent>
+#include <QtCore/QPointer>
+#include <QtGui/QMainWindow>
+#include <QtGui/QMouseEvent>
 
 class HBQMainWindow : public QMainWindow
 {
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
index 07d22bd8f7..fe7c8f833f 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
@@ -74,7 +74,7 @@
 #if QT_VERSION >= 0x040500
 
 #include "hbqt_hbqplaintextedit.h"
-#include <QApplication>
+#include <QtGui/QApplication>
 
 #define selectionState_off                        0
 #define selectionState_on                         1
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
index a18764291c..70418a61e6 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
@@ -55,18 +55,18 @@
 
 #include "hbapiitm.h"
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 #include <QtGui/QPlainTextEdit>
-#include <QtCore>
-#include <QKeyEvent>
-#include <QTextBlock>
-#include <QPainter>
-#include <QMessageBox>
-#include <QCompleter>
-#include <QAbstractItemView>
-#include <QScrollBar>
-#include <QToolTip>
+#include <QtCore/QtCore>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QTextBlock>
+#include <QtGui/QPainter>
+#include <QtGui/QMessageBox>
+#include <QtGui/QCompleter>
+#include <QtGui/QAbstractItemView>
+#include <QtGui/QScrollBar>
+#include <QtGui/QToolTip>
 
 #include "hbqt_hbqsyntaxhighlighter.h"
 
@@ -271,4 +271,3 @@ private:
 };
 
 #endif
-
diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
index 18bc495f64..b4a1a7b912 100644
--- a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
@@ -58,8 +58,8 @@
 #include "hbqt_hbqsyntaxhighlighter.h"
 
 #include <QtCore/QPointer>
-#include <QHash>
-#include <QTextCharFormat>
+#include <QtCore/QHash>
+#include <QtGui/QTextCharFormat>
 
 HBQTextBlockUserData::HBQTextBlockUserData() : QTextBlockUserData()
 {
diff --git a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
index 5b947e1e31..494344d174 100644
--- a/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
+++ b/harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
@@ -55,8 +55,8 @@
 
 /*----------------------------------------------------------------------*/
 
-#include <QSyntaxHighlighter>
-#include <QTextBlockUserData>
+#include <QtGui/QSyntaxHighlighter>
+#include <QtGui/QTextBlockUserData>
 
 class QTextDocument;
 
diff --git a/harbour/contrib/hbqt/hbqt_hbqtableview.cpp b/harbour/contrib/hbqt/hbqt_hbqtableview.cpp
index a679f265ea..eb3144a4b1 100644
--- a/harbour/contrib/hbqt/hbqt_hbqtableview.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqtableview.cpp
@@ -57,7 +57,7 @@
 
 #if QT_VERSION >= 0x040500
 
-#include <QPointer>
+#include <QtCore/QPointer>
 #include "hbqt_hbqtableview.h"
 
 HBQTableView::HBQTableView( QWidget * parent ) : QTableView( parent )
diff --git a/harbour/contrib/hbqt/hbqt_hbqtableview.h b/harbour/contrib/hbqt/hbqt_hbqtableview.h
index 5e2642b5d3..a9d9820030 100644
--- a/harbour/contrib/hbqt/hbqt_hbqtableview.h
+++ b/harbour/contrib/hbqt/hbqt_hbqtableview.h
@@ -55,7 +55,7 @@
 #ifndef HBQT_HBQTABLEVIEW_H
 #define HBQT_HBQTABLEVIEW_H
 
-#include <QTableView>
+#include <QtGui/QTableView>
 
 /*----------------------------------------------------------------------*/
 class HBQTableView : public QTableView
diff --git a/harbour/contrib/hbqt/hbqt_hbslots.cpp b/harbour/contrib/hbqt/hbqt_hbslots.cpp
index 8eec8d4a34..1fe99cd099 100644
--- a/harbour/contrib/hbqt/hbqt_hbslots.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbslots.cpp
@@ -63,7 +63,7 @@
 
 #include "hbqt_hbslots.h"
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbqt/hbqt_utils.cpp b/harbour/contrib/hbqt/hbqt_utils.cpp
index 5eecae055f..9653987ff8 100644
--- a/harbour/contrib/hbqt/hbqt_utils.cpp
+++ b/harbour/contrib/hbqt/hbqt_utils.cpp
@@ -60,7 +60,7 @@
 #if QT_VERSION >= 0x040500
 /*----------------------------------------------------------------------*/
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbqt/hbqtcore.hbp b/harbour/contrib/hbqt/hbqtcore.hbp
new file mode 100644
index 0000000000..a4af33a587
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+hbqt_common.hbm
+
+-o${hb_name}
+
+qtcore/*.cpp
+qtcore/*.prg
+
+-pi=qtcore/*.h
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/hbqtcores.hbp
new file mode 100644
index 0000000000..cc7d8a8242
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+
+@hbqtcore.hbp
+
+-cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqtgui.hbp b/harbour/contrib/hbqt/hbqtgui.hbp
new file mode 100644
index 0000000000..1ccb741d44
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+hbqt_common.hbm
+
+-o${hb_name}
+
+qtgui/*.cpp
+qtgui/*.prg
+
+-pi=qtgui/*.h
+
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/hbqtguis.hbp
new file mode 100644
index 0000000000..ea62b7450c
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+
+@hbqtgui.hbp
+
+-cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqtnetwork.hbp b/harbour/contrib/hbqt/hbqtnetwork.hbp
new file mode 100644
index 0000000000..af8d4d3352
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+hbqt_common.hbm
+
+-o${hb_name}
+
+qtnetwork/*.cpp
+qtnetwork/*.prg
+
+-pi=qtnetwork/*.h
+
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtNetwork.framework/Headers
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/hbqtnetworks.hbp
new file mode 100644
index 0000000000..e0055cf5d6
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+
+@hbqtnetwork.hbp
+
+-cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqts.hbp b/harbour/contrib/hbqt/hbqts.hbp
new file mode 100644
index 0000000000..32f3796ea7
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+
+@hbqt.hbp
+
+-cflag=-DQT_NODLL
diff --git a/harbour/utils/hbmk2/examples/plug_moc.prg b/harbour/contrib/hbqt/plug_moc.prg
similarity index 100%
rename from harbour/utils/hbmk2/examples/plug_moc.prg
rename to harbour/contrib/hbqt/plug_moc.prg
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
index 37d6d25ab6..00ca23ccf6 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
@@ -82,8 +82,8 @@
 
 #include <QtCore/QPointer>
 
-#include <QSize>
-#include <QStringList>
+#include <QtCore/QSize>
+#include <QtCore/QStringList>
 #include <QtCore/QAbstractItemModel>
 
 
diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
index fbb6a4fc7b..10ad341537 100644
--- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
+++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
@@ -71,7 +71,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QCoreApplication>
 
 
diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp
index 8edd7d9ac7..0899d88c09 100644
--- a/harbour/contrib/hbqt/qtcore/QUrl.cpp
+++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp
@@ -90,7 +90,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QUrl>
 
 
diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp
index ab19c5c4f9..fa7bce9df6 100644
--- a/harbour/contrib/hbqt/qtcore/QVariant.cpp
+++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp
@@ -87,9 +87,9 @@
 
 #include <QtCore/QPointer>
 
-#include <QLine>
-#include <QRect>
-#include <QStringList>
+#include <QtCore/QLine>
+#include <QtCore/QRect>
+#include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtCore/QBitArray>
 #include <QtCore/QTime>
diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp
index 7acb37f644..dd6693b9fb 100644
--- a/harbour/contrib/hbqt/qtgui/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp
@@ -82,10 +82,10 @@
 #include "hbdate.h"
 #include "hbapierr.h"
 
-#include <qfont.h>
-#include <qfontmetrics.h>
-#include <qimage.h>
-#include <qpalette.h>
+#include <QtGui/QFont>
+#include <QtGui/QFontmetrics>
+#include <QtGui/QImage>
+#include <QtGui/QPalette>
 #include <QtGui/QApplication>
 #include <QtCore/QLocale>
 #include <QtCore/QTextCodec>
diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
index b767cbbfac..5175abc699 100644
--- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp
+++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
@@ -71,7 +71,7 @@
 
 #include <QtCore/QPointer>
 
-#include <qpalette.h>
+#include <QtGui/QPalette>
 #include <QtGui/QClipboard>
 #include <QtGui/QApplication>
 #include <QtCore/QMimeData>
diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp
index 2f49ef3b64..64c0456f76 100644
--- a/harbour/contrib/hbqt/qtgui/QCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp
@@ -67,7 +67,7 @@
 
 #include <QtCore/QPointer>
 
-#include <qpixmap.h>
+#include <QtGui/QPixmap>
 #include <QtGui/QCursor>
 #include <QtGui/QBitmap>
 
diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp
index 5372c1ddf7..13b67b42c8 100644
--- a/harbour/contrib/hbqt/qtgui/QFont.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFont.cpp
@@ -77,7 +77,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QFont>
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
index 30ddea73bf..c3361655c3 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
@@ -84,7 +84,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QFontDatabase>
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp
index bd94862315..e0d2603dbe 100644
--- a/harbour/contrib/hbqt/qtgui/QImage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImage.cpp
@@ -87,7 +87,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QImage>
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
index 326a7e10c2..92287559c8 100644
--- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
@@ -80,7 +80,7 @@
 
 #include <QtCore/QPointer>
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QtGui/QImageReader>
 
 
diff --git a/harbour/contrib/hbqt/qth/QAbstractItemModel.qth b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth
index b2b7f6c730..c247c3f931 100644
--- a/harbour/contrib/hbqt/qth/QAbstractItemModel.qth
+++ b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth
@@ -64,8 +64,8 @@ New      =
 </SUBCLASS>
 
 <CODE>
-#include <QSize>
-#include <QStringList>
+#include <QtCore/QSize>
+#include <QtCore/QStringList>
 #include <QtCore/QAbstractItemModel>
 
 
diff --git a/harbour/contrib/hbqt/qth/QApplication.qth b/harbour/contrib/hbqt/qth/QApplication.qth
index 2c377944ec..0ff02ca258 100644
--- a/harbour/contrib/hbqt/qth/QApplication.qth
+++ b/harbour/contrib/hbqt/qth/QApplication.qth
@@ -70,10 +70,10 @@ New      =
 #include "hbdate.h"
 #include "hbapierr.h"
 
-#include <qfont.h>
-#include <qfontmetrics.h>
-#include <qimage.h>
-#include <qpalette.h>
+#include <QtGui/QFont>
+#include <QtGui/QFontmetrics>
+#include <QtGui/QImage>
+#include <QtGui/QPalette>
 #include <QtGui/QApplication>
 #include <QtCore/QLocale>
 #include <QtCore/QTextCodec>
diff --git a/harbour/contrib/hbqt/qth/QClipboard.qth b/harbour/contrib/hbqt/qth/QClipboard.qth
index cd2cebdd54..840d7efa34 100644
--- a/harbour/contrib/hbqt/qth/QClipboard.qth
+++ b/harbour/contrib/hbqt/qth/QClipboard.qth
@@ -62,7 +62,7 @@ Destructor = no
 </CLASS>
 
 <CODE>
-#include <qpalette.h>
+#include <QtGui/QPalette>
 #include <QtGui/QClipboard>
 #include <QtGui/QApplication>
 #include <QtCore/QMimeData>
diff --git a/harbour/contrib/hbqt/qth/QCoreApplication.qth b/harbour/contrib/hbqt/qth/QCoreApplication.qth
index 34f943d775..b4f79dfcaf 100644
--- a/harbour/contrib/hbqt/qth/QCoreApplication.qth
+++ b/harbour/contrib/hbqt/qth/QCoreApplication.qth
@@ -62,7 +62,7 @@ New      =
 
 
 <CODE>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QCoreApplication>
 
 
diff --git a/harbour/contrib/hbqt/qth/QCursor.qth b/harbour/contrib/hbqt/qth/QCursor.qth
index 933a1d093c..e288a8d4d3 100644
--- a/harbour/contrib/hbqt/qth/QCursor.qth
+++ b/harbour/contrib/hbqt/qth/QCursor.qth
@@ -70,7 +70,7 @@ oCursor := QCursor():new( pQBitmap, pQBitmapAsMask, [ nHotX = -1 ], [ nHotY = -1
 </DOC>
 
 <CODE>
-#include <qpixmap.h>
+#include <QtGui/QPixmap>
 #include <QtGui/QCursor>
 #include <QtGui/QBitmap>
 
diff --git a/harbour/contrib/hbqt/qth/QFont.qth b/harbour/contrib/hbqt/qth/QFont.qth
index 3209481c48..e58622063f 100644
--- a/harbour/contrib/hbqt/qth/QFont.qth
+++ b/harbour/contrib/hbqt/qth/QFont.qth
@@ -70,7 +70,7 @@ oFont := QFont():new( pFont, pPaintDevice )
 </DOC>
 
 <CODE>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QFont>
 
 /*
diff --git a/harbour/contrib/hbqt/qth/QFontDatabase.qth b/harbour/contrib/hbqt/qth/QFontDatabase.qth
index c0a7974067..42d12056e7 100644
--- a/harbour/contrib/hbqt/qth/QFontDatabase.qth
+++ b/harbour/contrib/hbqt/qth/QFontDatabase.qth
@@ -62,7 +62,7 @@ New      =
 </CLASS>
 
 <CODE>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QFontDatabase>
 
 
diff --git a/harbour/contrib/hbqt/qth/QImage.qth b/harbour/contrib/hbqt/qth/QImage.qth
index f59e45a463..65b2ed287d 100644
--- a/harbour/contrib/hbqt/qth/QImage.qth
+++ b/harbour/contrib/hbqt/qth/QImage.qth
@@ -75,7 +75,7 @@ oImage := QImage():new( pQImage )
 </DOC>
 
 <CODE>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtGui/QImage>
 
 
diff --git a/harbour/contrib/hbqt/qth/QImageReader.qth b/harbour/contrib/hbqt/qth/QImageReader.qth
index 11953d2183..f4ac646438 100644
--- a/harbour/contrib/hbqt/qth/QImageReader.qth
+++ b/harbour/contrib/hbqt/qth/QImageReader.qth
@@ -62,7 +62,7 @@ New      =
 </CLASS>
 
 <CODE>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QtGui/QImageReader>
 
 
diff --git a/harbour/contrib/hbqt/qth/QUrl.qth b/harbour/contrib/hbqt/qth/QUrl.qth
index 83f013aa52..ea85dd5ba6 100644
--- a/harbour/contrib/hbqt/qth/QUrl.qth
+++ b/harbour/contrib/hbqt/qth/QUrl.qth
@@ -61,7 +61,7 @@ New      = pParent
 </CLASS>
 
 <CODE>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QUrl>
 
 
diff --git a/harbour/contrib/hbqt/qth/QVariant.qth b/harbour/contrib/hbqt/qth/QVariant.qth
index 0bc7e69826..83c055f059 100644
--- a/harbour/contrib/hbqt/qth/QVariant.qth
+++ b/harbour/contrib/hbqt/qth/QVariant.qth
@@ -61,9 +61,9 @@ New      =
 </CLASS>
 
 <CODE>
-#include <QLine>
-#include <QRect>
-#include <QStringList>
+#include <QtCore/QLine>
+#include <QtCore/QRect>
+#include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtCore/QBitArray>
 #include <QtCore/QTime>
diff --git a/harbour/contrib/hbqt/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qth/QWebHistoryItem.qth
index 32eee9b3a7..5fc11d3017 100644
--- a/harbour/contrib/hbqt/qth/QWebHistoryItem.qth
+++ b/harbour/contrib/hbqt/qth/QWebHistoryItem.qth
@@ -62,7 +62,7 @@ New      =
 </CLASS>
 
 <CODE>
-#include <qvariant.h>
+#include <QtCore/QVariant>
 
 #include <QtWebKit/QWebHistoryItem>
 
diff --git a/harbour/contrib/hbsms/hbsms.hbp b/harbour/contrib/hbsms/hbsms.hbp
index 2dcced7161..09b67f3610 100644
--- a/harbour/contrib/hbsms/hbsms.hbp
+++ b/harbour/contrib/hbsms/hbsms.hbp
@@ -5,6 +5,8 @@
 -hblib
 -inc
 
--o${hb_dirname}
+-o${hb_name}
+
+-w3 -es2
 
 hbsms.prg
diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp
new file mode 100644
index 0000000000..f94d6ad94c
--- /dev/null
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -0,0 +1,48 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+
+-o${hb_name}
+
+-w3 -es2
+
+../hbqt/hbqt.hbc
+
+hbpprocess.prg
+xbp3state.prg
+xbpappevent.prg
+xbpbitmap.prg
+xbpbrowse.prg
+xbpcheckbox.prg
+xbpclipboard.prg
+xbpcombobox.prg
+xbpdataref.prg
+xbpdialog.prg
+xbpfiledialog.prg
+xbpfontdialog.prg
+xbpgeneric.prg
+xbpgra.prg
+xbphtmlviewer.prg
+xbplistbox.prg
+xbpmenubar.prg
+xbpmle.prg
+xbpparthandler.prg
+xbppresspace.prg
+xbpprintdialog.prg
+xbpprinter.prg
+xbppushbutton.prg
+xbpradiobutton.prg
+xbprtf.prg
+xbpscrollbar.prg
+xbpsle.prg
+xbpspinbutton.prg
+xbpstatic.prg
+xbpstatusbar.prg
+xbpstyle.prg
+xbptabpage.prg
+xbptoolbar.prg
+xbptreeview.prg
+xbpwindow.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 46b430c33b..2b6323831a 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1975,7 +1975,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
 
          cParam := MacroProc( hbmk, tmp := SubStr( cParam, Len( "-reqheader=" ) + 1 ), aParam[ _PAR_cFileName ] )
          IF ! Empty( cParam )
-            hbmk[ _HBMK_hKEYHEADER ][ cParam ] := NIL
+            hbmk[ _HBMK_hKEYHEADER ][ StrTran( cParam, "\", "/" ) ] := NIL
          ENDIF
 
       CASE Left( cParamL, Len( "-stop" ) ) == "-stop"
@@ -5848,6 +5848,8 @@ STATIC FUNCTION pkg_try_detection( hbmk, cName )
                   cNameFlavour := hb_StrShrink( cNameFlavour, 1 )
                ENDIF
 
+               cNameFlavour := StrTran( cNameFlavour, "\", "/" )
+
                IF cNameFlavour $ hbmk[ _HBMK_hKEYHEADER ]
                   hbmk[ _HBMK_hKEYHEADER ][ cNameFlavour ] := cIncludeDir
                ENDIF
@@ -5919,6 +5921,7 @@ STATIC FUNCTION FindHeader( hbmk, cFileName, cParentDir, aINCTRYPATH )
             /* Add these dir to include paths */
             IF AScan( hbmk[ _HBMK_aINCPATH ], { |tmp| tmp == cDir } ) == 0
                AAdd( hbmk[ _HBMK_aINCPATH ], DirDelPathSep( PathSepToSelf( cDir ) ) )
+               cFileName := StrTran( cFileName, "\", "/" )
                IF cFileName $ hbmk[ _HBMK_hKEYHEADER ]
                   hbmk[ _HBMK_hKEYHEADER ][ cFileName ] := cDir
                ENDIF