diff --git a/src/xlsx/xlsxdocument.cpp b/src/xlsx/xlsxdocument.cpp
index ebbea44..91a3741 100644
--- a/src/xlsx/xlsxdocument.cpp
+++ b/src/xlsx/xlsxdocument.cpp
@@ -32,8 +32,7 @@
 #include <QFile>
 #include <QPointF>
 
-namespace QXlsx {
-
+QT_BEGIN_NAMESPACE_XLSX
 
 DocumentPrivate::DocumentPrivate(Document *p) :
     q_ptr(p), defaultPackageName(QStringLiteral("Book1.xlsx"))
@@ -56,8 +55,9 @@ bool DocumentPrivate::loadPackage(QIODevice *device)
 
 
 /*!
-  \class QXlsx::Document
+  \class Document
   \inmodule QtXlsx
+  \brief The Document class provides a API that is used to handle the contents of .xlsx files.
 
 */
 
@@ -243,4 +243,4 @@ Document::~Document()
     delete d_ptr;
 }
 
-} // namespace QXlsx
+QT_END_NAMESPACE_XLSX
diff --git a/src/xlsx/xlsxdocument.h b/src/xlsx/xlsxdocument.h
index df75208..07e90fb 100644
--- a/src/xlsx/xlsxdocument.h
+++ b/src/xlsx/xlsxdocument.h
@@ -31,7 +31,7 @@
 class QIODevice;
 class QImage;
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 class Workbook;
 class Worksheet;
@@ -80,6 +80,6 @@ private:
     DocumentPrivate * const d_ptr;
 };
 
-} // namespace QXlsx
+QT_END_NAMESPACE_XLSX
 
 #endif // QXLSX_XLSXDOCUMENT_H
diff --git a/src/xlsx/xlsxformat.cpp b/src/xlsx/xlsxformat.cpp
index 33c838d..e19483e 100755
--- a/src/xlsx/xlsxformat.cpp
+++ b/src/xlsx/xlsxformat.cpp
@@ -27,7 +27,7 @@
 #include <QDataStream>
 #include <QDebug>
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 FormatPrivate::FormatPrivate(Format *p) :
     q_ptr(p)
@@ -44,12 +44,25 @@ FormatPrivate::FormatPrivate(Format *p) :
     color_indexed = 0;
 }
 
+/*!
+ * \class Format
+ * \inmodule QtXlsx
+ * \brief Providing the methods and properties that are available for formatting cells in Excel.
+ */
+
+
+/*!
+ * \internal
+ */
 Format::Format() :
     d_ptr(new FormatPrivate(this))
 {
 
 }
 
+/*!
+ * \internal
+ */
 Format::~Format()
 {
     delete d_ptr;
@@ -807,4 +820,4 @@ int Format::colorIndexed() const
     return d->color_indexed;
 }
 
-} // namespace QXlsx
+QT_END_NAMESPACE_XLSX
diff --git a/src/xlsx/xlsxformat.h b/src/xlsx/xlsxformat.h
index 1d3ec32..948701f 100755
--- a/src/xlsx/xlsxformat.h
+++ b/src/xlsx/xlsxformat.h
@@ -31,7 +31,7 @@
 #include <QByteArray>
 #include <QList>
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 class Styles;
 class Worksheet;
@@ -247,6 +247,6 @@ private:
     FormatPrivate * const d_ptr;
 };
 
-} // namespace QXlsx
+QT_END_NAMESPACE_XLSX
 
 #endif // QXLSX_FORMAT_H
diff --git a/src/xlsx/xlsxglobal.h b/src/xlsx/xlsxglobal.h
index 9ee55a8..5057545 100644
--- a/src/xlsx/xlsxglobal.h
+++ b/src/xlsx/xlsxglobal.h
@@ -26,7 +26,9 @@
 #define XLSXGLOBAL_H
 #include <QtGlobal>
 
-namespace QXlsx {
+#define QT_BEGIN_NAMESPACE_XLSX namespace QXlsx {
+#define QT_END_NAMESPACE_XLSX }
+#define QTXLSX_USE_NAMESPACE using namespace QXlsx;
 
 #if !defined(QT_STATIC) && !defined(XLSX_NO_LIB)
 #  if defined(QT_BUILD_XLSX_LIB)
@@ -44,6 +46,4 @@ namespace QXlsx {
 #  define XLSX_AUTOTEST_EXPORT
 #endif
 
-}
-
 #endif // XLSXGLOBAL_H
diff --git a/src/xlsx/xlsxworkbook.cpp b/src/xlsx/xlsxworkbook.cpp
index 5d5a887..ed1f525 100755
--- a/src/xlsx/xlsxworkbook.cpp
+++ b/src/xlsx/xlsxworkbook.cpp
@@ -36,7 +36,7 @@
 #include <QFile>
 #include <QBuffer>
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 WorkbookPrivate::WorkbookPrivate(Workbook *q) :
     q_ptr(q)
@@ -331,4 +331,4 @@ void Workbook::addWorksheet(const QString &name, QSharedPointer<Worksheet> sheet
     d->worksheets.append(sheet);
 }
 
-} //namespace
+QT_END_NAMESPACE_XLSX
diff --git a/src/xlsx/xlsxworkbook.h b/src/xlsx/xlsxworkbook.h
index 365a888..8eb2de3 100755
--- a/src/xlsx/xlsxworkbook.h
+++ b/src/xlsx/xlsxworkbook.h
@@ -32,7 +32,7 @@
 
 class QIODevice;
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 class Worksheet;
 class Format;
@@ -87,6 +87,6 @@ private:
     WorkbookPrivate * const d_ptr;
 };
 
-} //QXlsx
+QT_END_NAMESPACE_XLSX
 
 #endif // XLSXWORKBOOK_H
diff --git a/src/xlsx/xlsxworksheet.cpp b/src/xlsx/xlsxworksheet.cpp
index 33b9e6a..9e92a9b 100755
--- a/src/xlsx/xlsxworksheet.cpp
+++ b/src/xlsx/xlsxworksheet.cpp
@@ -44,7 +44,7 @@
 
 #include <stdint.h>
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 
 WorksheetPrivate::WorksheetPrivate(Worksheet *p) :
     q_ptr(p)
@@ -1136,4 +1136,4 @@ QSharedPointer<Worksheet> Worksheet::loadFromXmlData(const QByteArray &data)
     return loadFromXmlFile(&buffer);
 }
 
-} //namespace
+QT_END_NAMESPACE_XLSX
diff --git a/src/xlsx/xlsxworksheet.h b/src/xlsx/xlsxworksheet.h
index db6be3c..66c367c 100755
--- a/src/xlsx/xlsxworksheet.h
+++ b/src/xlsx/xlsxworksheet.h
@@ -36,7 +36,7 @@ class QDateTime;
 class QUrl;
 class QImage;
 
-namespace QXlsx {
+QT_BEGIN_NAMESPACE_XLSX
 class Package;
 class Workbook;
 class XmlStreamWriter;
@@ -101,6 +101,5 @@ private:
     WorksheetPrivate * const d_ptr;
 };
 
-} //QXlsx
-
+QT_END_NAMESPACE_XLSX
 #endif // XLSXWORKSHEET_H