diff --git a/src/xlsx/xlsx.pro b/src/xlsx/xlsx.pro
index 14490141..7595937f 100644
--- a/src/xlsx/xlsx.pro
+++ b/src/xlsx/xlsx.pro
@@ -1,11 +1,9 @@
-TARGET = QtXlsx
-
-QMAKE_DOCS = $$PWD/doc/qtxlsx.qdocconf
+include($$PWD/qtxlsx.pri)
 
+load(qt_build_config)
+TARGET = QtXlsx
 load(qt_module)
-
-CONFIG += build_xlsx_lib
-include(qtxlsx.pri)
+QMAKE_DOCS = $$PWD/doc/qtxlsx.qdocconf
 
 #Define this macro if you want to run tests, so more AIPs will get exported.
 #DEFINES += XLSX_TEST
diff --git a/src/xlsx/xlsxabstractooxmlfile.h b/src/xlsx/xlsxabstractooxmlfile.h
index a5a791c2..0258a5e7 100644
--- a/src/xlsx/xlsxabstractooxmlfile.h
+++ b/src/xlsx/xlsxabstractooxmlfile.h
@@ -26,7 +26,7 @@
 #ifndef QXLSX_XLSXABSTRACTOOXMLFILE_H
 #define QXLSX_XLSXABSTRACTOOXMLFILE_H
 
-#include "xlsxglobal.h"
+#include "QtXlsx/xlsxglobal.h"
 
 class QIODevice;
 class QByteArray;
diff --git a/src/xlsx/xlsxabstractsheet.h b/src/xlsx/xlsxabstractsheet.h
index 7aa416dc..757a60aa 100644
--- a/src/xlsx/xlsxabstractsheet.h
+++ b/src/xlsx/xlsxabstractsheet.h
@@ -25,7 +25,8 @@
 #ifndef XLSXABSTRACTSHEET_H
 #define XLSXABSTRACTSHEET_H
 
-#include "xlsxabstractooxmlfile.h"
+#include "QtXlsx/xlsxabstractooxmlfile.h"
+
 #include <QStringList>
 #include <QSharedPointer>
 
diff --git a/src/xlsx/xlsxcell.h b/src/xlsx/xlsxcell.h
index 7aec8ced..2b88b756 100644
--- a/src/xlsx/xlsxcell.h
+++ b/src/xlsx/xlsxcell.h
@@ -25,8 +25,9 @@
 #ifndef QXLSX_XLSXCELL_H
 #define QXLSX_XLSXCELL_H
 
-#include "xlsxglobal.h"
-#include "xlsxformat.h"
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxformat.h"
+
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE_XLSX
diff --git a/src/xlsx/xlsxcellformula.h b/src/xlsx/xlsxcellformula.h
index 0d4679b5..e581823e 100644
--- a/src/xlsx/xlsxcellformula.h
+++ b/src/xlsx/xlsxcellformula.h
@@ -25,7 +25,8 @@
 #ifndef QXLSX_XLSXCELLFORMULA_H
 #define QXLSX_XLSXCELLFORMULA_H
 
-#include "xlsxglobal.h"
+#include "QtXlsx/xlsxglobal.h"
+
 #include <QExplicitlySharedDataPointer>
 
 class QXmlStreamWriter;
diff --git a/src/xlsx/xlsxcellrange.h b/src/xlsx/xlsxcellrange.h
index 5a510b05..1961bd05 100644
--- a/src/xlsx/xlsxcellrange.h
+++ b/src/xlsx/xlsxcellrange.h
@@ -24,8 +24,9 @@
 ****************************************************************************/
 #ifndef QXLSX_XLSXCELLRANGE_H
 #define QXLSX_XLSXCELLRANGE_H
-#include "xlsxglobal.h"
-#include "xlsxcellreference.h"
+
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxcellreference.h"
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/src/xlsx/xlsxcellreference.h b/src/xlsx/xlsxcellreference.h
index 6a917c2f..75b0f5a6 100644
--- a/src/xlsx/xlsxcellreference.h
+++ b/src/xlsx/xlsxcellreference.h
@@ -24,7 +24,8 @@
 ****************************************************************************/
 #ifndef QXLSX_XLSXCELLREFERENCE_H
 #define QXLSX_XLSXCELLREFERENCE_H
-#include "xlsxglobal.h"
+
+#include "QtXlsx/xlsxglobal.h"
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/src/xlsx/xlsxchart.h b/src/xlsx/xlsxchart.h
index fcd8e2d8..509b98cd 100644
--- a/src/xlsx/xlsxchart.h
+++ b/src/xlsx/xlsxchart.h
@@ -26,7 +26,7 @@
 #ifndef QXLSX_CHART_H
 #define QXLSX_CHART_H
 
-#include "xlsxabstractooxmlfile.h"
+#include "QtXlsx/xlsxabstractooxmlfile.h"
 
 #include <QSharedPointer>
 
diff --git a/src/xlsx/xlsxchartsheet.h b/src/xlsx/xlsxchartsheet.h
index 6c5ee981..4ccf836e 100644
--- a/src/xlsx/xlsxchartsheet.h
+++ b/src/xlsx/xlsxchartsheet.h
@@ -25,7 +25,8 @@
 #ifndef XLSXCHARTSHEET_H
 #define XLSXCHARTSHEET_H
 
-#include "xlsxabstractsheet.h"
+#include "QtXlsx/xlsxabstractsheet.h"
+
 #include <QStringList>
 #include <QSharedPointer>
 
diff --git a/src/xlsx/xlsxconditionalformatting.h b/src/xlsx/xlsxconditionalformatting.h
index 45378f73..e43051c4 100644
--- a/src/xlsx/xlsxconditionalformatting.h
+++ b/src/xlsx/xlsxconditionalformatting.h
@@ -25,9 +25,10 @@
 #ifndef QXLSX_XLSXCONDITIONALFORMATTING_H
 #define QXLSX_XLSXCONDITIONALFORMATTING_H
 
-#include "xlsxglobal.h"
-#include "xlsxcellrange.h"
-#include "xlsxcellreference.h"
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxcellrange.h"
+#include "QtXlsx/xlsxcellreference.h"
+
 #include <QSharedDataPointer>
 #include <QString>
 #include <QList>
diff --git a/src/xlsx/xlsxdatavalidation.h b/src/xlsx/xlsxdatavalidation.h
index 3a190792..f7cd125f 100644
--- a/src/xlsx/xlsxdatavalidation.h
+++ b/src/xlsx/xlsxdatavalidation.h
@@ -25,7 +25,8 @@
 #ifndef QXLSX_XLSXDATAVALIDATION_H
 #define QXLSX_XLSXDATAVALIDATION_H
 
-#include "xlsxglobal.h"
+#include "QtXlsx/xlsxglobal.h"
+
 #include <QSharedDataPointer>
 #include <QString>
 #include <QList>
diff --git a/src/xlsx/xlsxdocument.h b/src/xlsx/xlsxdocument.h
index 7f1113dd..9bc73fb1 100644
--- a/src/xlsx/xlsxdocument.h
+++ b/src/xlsx/xlsxdocument.h
@@ -26,11 +26,13 @@
 #ifndef QXLSX_XLSXDOCUMENT_H
 #define QXLSX_XLSXDOCUMENT_H
 
-#include "xlsxglobal.h"
-#include "xlsxformat.h"
-#include "xlsxworksheet.h"
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxformat.h"
+#include "QtXlsx/xlsxworksheet.h"
+
 #include <QObject>
 #include <QVariant>
+
 class QIODevice;
 class QImage;
 
diff --git a/src/xlsx/xlsxdrawinganchor_p.h b/src/xlsx/xlsxdrawinganchor_p.h
index 2f38a911..24393ef5 100644
--- a/src/xlsx/xlsxdrawinganchor_p.h
+++ b/src/xlsx/xlsxdrawinganchor_p.h
@@ -23,6 +23,17 @@
 **
 ****************************************************************************/
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt Xlsx API.  It exists for the convenience
+// of the Qt Xlsx.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #ifndef QXLSX_XLSXDRAWINGANCHOR_P_H
 #define QXLSX_XLSXDRAWINGANCHOR_P_H
 
diff --git a/src/xlsx/xlsxformat.h b/src/xlsx/xlsxformat.h
index 0923d0ea..1ba1c9fc 100755
--- a/src/xlsx/xlsxformat.h
+++ b/src/xlsx/xlsxformat.h
@@ -25,7 +25,8 @@
 #ifndef QXLSX_FORMAT_H
 #define QXLSX_FORMAT_H
 
-#include "xlsxglobal.h"
+#include "QtXlsx/xlsxglobal.h"
+
 #include <QFont>
 #include <QColor>
 #include <QByteArray>
diff --git a/src/xlsx/xlsxrichstring.h b/src/xlsx/xlsxrichstring.h
index 01d1972c..368a5f45 100644
--- a/src/xlsx/xlsxrichstring.h
+++ b/src/xlsx/xlsxrichstring.h
@@ -25,8 +25,9 @@
 #ifndef XLSXRICHSTRING_H
 #define XLSXRICHSTRING_H
 
-#include "xlsxglobal.h"
-#include "xlsxformat.h"
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxformat.h"
+
 #include <QVariant>
 #include <QStringList>
 #include <QSharedDataPointer>
diff --git a/src/xlsx/xlsxworkbook.h b/src/xlsx/xlsxworkbook.h
index 464f0463..8738920b 100755
--- a/src/xlsx/xlsxworkbook.h
+++ b/src/xlsx/xlsxworkbook.h
@@ -25,9 +25,10 @@
 #ifndef XLSXWORKBOOK_H
 #define XLSXWORKBOOK_H
 
-#include "xlsxglobal.h"
-#include "xlsxabstractooxmlfile.h"
-#include "xlsxabstractsheet.h"
+#include "QtXlsx/xlsxglobal.h"
+#include "QtXlsx/xlsxabstractooxmlfile.h"
+#include "QtXlsx/xlsxabstractsheet.h"
+
 #include <QList>
 #include <QImage>
 #include <QSharedPointer>
diff --git a/src/xlsx/xlsxworksheet.h b/src/xlsx/xlsxworksheet.h
index 68833702..a21e5afd 100755
--- a/src/xlsx/xlsxworksheet.h
+++ b/src/xlsx/xlsxworksheet.h
@@ -25,15 +25,17 @@
 #ifndef XLSXWORKSHEET_H
 #define XLSXWORKSHEET_H
 
-#include "xlsxabstractsheet.h"
-#include "xlsxcell.h"
-#include "xlsxcellrange.h"
-#include "xlsxcellreference.h"
+#include "QtXlsx/xlsxabstractsheet.h"
+#include "QtXlsx/xlsxcell.h"
+#include "QtXlsx/xlsxcellrange.h"
+#include "QtXlsx/xlsxcellreference.h"
+
 #include <QStringList>
 #include <QMap>
 #include <QVariant>
 #include <QPointF>
 #include <QSharedPointer>
+
 class QIODevice;
 class QDateTime;
 class QUrl;