diff --git a/QXlsx/header/xlsxcell.h b/QXlsx/header/xlsxcell.h
index aa47ce1e..3343ecf3 100644
--- a/QXlsx/header/xlsxcell.h
+++ b/QXlsx/header/xlsxcell.h
@@ -14,7 +14,6 @@
 #include <QString>
 #include <QTime>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcell_p.h b/QXlsx/header/xlsxcell_p.h
index d7d71c20..061306ed 100644
--- a/QXlsx/header/xlsxcell_p.h
+++ b/QXlsx/header/xlsxcell_p.h
@@ -11,7 +11,6 @@
 
 #include <QList>
 #include <QObject>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcelllocation.h b/QXlsx/header/xlsxcelllocation.h
index 8a5d54ff..473cda6b 100644
--- a/QXlsx/header/xlsxcelllocation.h
+++ b/QXlsx/header/xlsxcelllocation.h
@@ -12,7 +12,6 @@
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcellrange.h b/QXlsx/header/xlsxcellrange.h
index 1e37d40a..cc49aa02 100644
--- a/QXlsx/header/xlsxcellrange.h
+++ b/QXlsx/header/xlsxcellrange.h
@@ -7,7 +7,6 @@
 #include "xlsxglobal.h"
 
 #include <QObject>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcellreference.h b/QXlsx/header/xlsxcellreference.h
index 6638ace3..ffef9859 100644
--- a/QXlsx/header/xlsxcellreference.h
+++ b/QXlsx/header/xlsxcellreference.h
@@ -5,8 +5,6 @@
 
 #include "xlsxglobal.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 const int XLSX_ROW_MAX    = 1048576;
diff --git a/QXlsx/header/xlsxchart.h b/QXlsx/header/xlsxchart.h
index ba68d26c..5b49feb9 100644
--- a/QXlsx/header/xlsxchart.h
+++ b/QXlsx/header/xlsxchart.h
@@ -7,7 +7,6 @@
 
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxchartsheet.h b/QXlsx/header/xlsxchartsheet.h
index 889cac68..982e6eac 100644
--- a/QXlsx/header/xlsxchartsheet.h
+++ b/QXlsx/header/xlsxchartsheet.h
@@ -6,7 +6,6 @@
 #include "xlsxabstractsheet.h"
 
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxchartsheet_p.h b/QXlsx/header/xlsxchartsheet_p.h
index 406807e3..1704f6b3 100644
--- a/QXlsx/header/xlsxchartsheet_p.h
+++ b/QXlsx/header/xlsxchartsheet_p.h
@@ -7,8 +7,6 @@
 #include "xlsxchartsheet.h"
 #include "xlsxglobal.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 class ChartsheetPrivate : public AbstractSheetPrivate
diff --git a/QXlsx/header/xlsxcolor_p.h b/QXlsx/header/xlsxcolor_p.h
index 9528fa94..de459be5 100644
--- a/QXlsx/header/xlsxcolor_p.h
+++ b/QXlsx/header/xlsxcolor_p.h
@@ -9,7 +9,6 @@
 #include <QVariant>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxconditionalformatting.h b/QXlsx/header/xlsxconditionalformatting.h
index 4fbdb5c1..77d1f3ab 100644
--- a/QXlsx/header/xlsxconditionalformatting.h
+++ b/QXlsx/header/xlsxconditionalformatting.h
@@ -13,7 +13,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 class ConditionalFormattingTest;
 
diff --git a/QXlsx/header/xlsxcontenttypes_p.h b/QXlsx/header/xlsxcontenttypes_p.h
index 32c86138..92089460 100644
--- a/QXlsx/header/xlsxcontenttypes_p.h
+++ b/QXlsx/header/xlsxcontenttypes_p.h
@@ -9,7 +9,6 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxdatavalidation.h b/QXlsx/header/xlsxdatavalidation.h
index aea3bea8..feaef1e2 100644
--- a/QXlsx/header/xlsxdatavalidation.h
+++ b/QXlsx/header/xlsxdatavalidation.h
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 class QXmlStreamReader;
 class QXmlStreamWriter;
diff --git a/QXlsx/header/xlsxdatavalidation_p.h b/QXlsx/header/xlsxdatavalidation_p.h
index ebb407c4..38b8355c 100644
--- a/QXlsx/header/xlsxdatavalidation_p.h
+++ b/QXlsx/header/xlsxdatavalidation_p.h
@@ -6,7 +6,6 @@
 #include "xlsxdatavalidation.h"
 
 #include <QSharedData>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxdatetype.h b/QXlsx/header/xlsxdatetype.h
index cf09f4c6..ee6c9f68 100644
--- a/QXlsx/header/xlsxdatetype.h
+++ b/QXlsx/header/xlsxdatetype.h
@@ -11,7 +11,6 @@
 #include <QString>
 #include <QStringList>
 #include <QTime>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxdocument.h b/QXlsx/header/xlsxdocument.h
index 688612ec..99004e64 100644
--- a/QXlsx/header/xlsxdocument.h
+++ b/QXlsx/header/xlsxdocument.h
@@ -11,7 +11,6 @@
 #include <QImage>
 #include <QObject>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxdocument_p.h b/QXlsx/header/xlsxdocument_p.h
index 5638dfed..9f6a647b 100644
--- a/QXlsx/header/xlsxdocument_p.h
+++ b/QXlsx/header/xlsxdocument_p.h
@@ -9,7 +9,6 @@
 #include "xlsxworkbook.h"
 
 #include <QMap>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxdrawing_p.h b/QXlsx/header/xlsxdrawing_p.h
index 75b6b1d7..31490242 100644
--- a/QXlsx/header/xlsxdrawing_p.h
+++ b/QXlsx/header/xlsxdrawing_p.h
@@ -8,7 +8,6 @@
 
 #include <QList>
 #include <QString>
-#include <QtGlobal>
 
 class QIODevice;
 class QXmlStreamWriter;
diff --git a/QXlsx/header/xlsxformat_p.h b/QXlsx/header/xlsxformat_p.h
index 87d2aa6b..c54dfa08 100644
--- a/QXlsx/header/xlsxformat_p.h
+++ b/QXlsx/header/xlsxformat_p.h
@@ -7,7 +7,6 @@
 #include <QMap>
 #include <QSet>
 #include <QSharedData>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxglobal.h b/QXlsx/header/xlsxglobal.h
index ef92e022..91756173 100644
--- a/QXlsx/header/xlsxglobal.h
+++ b/QXlsx/header/xlsxglobal.h
@@ -13,7 +13,6 @@
 #include <QString>
 #include <QStringList>
 #include <QVariant>
-#include <QtGlobal>
 
 #if defined(QXlsx_SHAREDLIB)
 #    if defined(QXlsx_EXPORTS)
diff --git a/QXlsx/header/xlsxtheme_p.h b/QXlsx/header/xlsxtheme_p.h
index 94d16e8f..5916e4ca 100644
--- a/QXlsx/header/xlsxtheme_p.h
+++ b/QXlsx/header/xlsxtheme_p.h
@@ -7,7 +7,6 @@
 
 #include <QIODevice>
 #include <QString>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxutility_p.h b/QXlsx/header/xlsxutility_p.h
index a1aebd7d..ca5176fd 100644
--- a/QXlsx/header/xlsxutility_p.h
+++ b/QXlsx/header/xlsxutility_p.h
@@ -14,7 +14,6 @@
 #include <QStringList>
 #include <QTime>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxworkbook.h b/QXlsx/header/xlsxworkbook.h
index 2e3e796a..22e8e8bc 100644
--- a/QXlsx/header/xlsxworkbook.h
+++ b/QXlsx/header/xlsxworkbook.h
@@ -13,7 +13,6 @@
 #include <QImage>
 #include <QList>
 #include <QSharedPointer>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxworkbook_p.h b/QXlsx/header/xlsxworkbook_p.h
index 86847018..32abcbf9 100644
--- a/QXlsx/header/xlsxworkbook_p.h
+++ b/QXlsx/header/xlsxworkbook_p.h
@@ -11,7 +11,6 @@
 
 #include <QSharedPointer>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxworksheet.h b/QXlsx/header/xlsxworksheet.h
index 7c9232a8..13774eef 100644
--- a/QXlsx/header/xlsxworksheet.h
+++ b/QXlsx/header/xlsxworksheet.h
@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QVariant>
-#include <QtGlobal>
 
 class WorksheetTest;
 
diff --git a/QXlsx/header/xlsxworksheet_p.h b/QXlsx/header/xlsxworksheet_p.h
index 8013a90e..7e32df90 100644
--- a/QXlsx/header/xlsxworksheet_p.h
+++ b/QXlsx/header/xlsxworksheet_p.h
@@ -227,23 +227,23 @@ class WorksheetPrivate : public AbstractSheetPrivate
 public:
     CellTable cellTable;
 
-    QMap<int, QMap<int, QString>> comments;
-    QMap<int, QMap<int, QSharedPointer<XlsxHyperlinkData>>> urlTable;
+    QHash<int, QHash<int, QString>> comments;
+    QHash<int, QHash<int, QSharedPointer<XlsxHyperlinkData>>> urlTable;
     QList<CellRange> merges;
-    QMap<int, QSharedPointer<XlsxRowInfo>> rowsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfoHelper;
+    QHash<int, QSharedPointer<XlsxRowInfo>> rowsInfo;
+    QHash<int, QSharedPointer<XlsxColumnInfo>> colsInfo;
+    QHash<int, QSharedPointer<XlsxColumnInfo>> colsInfoHelper;
 
     QList<DataValidation> dataValidationsList;
     QList<ConditionalFormatting> conditionalFormattingList;
 
-    QMap<int, CellFormula> sharedFormulaMap; // shared formula map
+    QHash<int, CellFormula> sharedFormulaMap; // shared formula map
 
     CellRange dimension;
 
-    mutable QMap<int, QString> row_spans;
-    QMap<int, double> row_sizes;
-    QMap<int, double> col_sizes;
+    mutable QHash<int, QString> row_spans;
+    QHash<int, double> row_sizes;
+    QHash<int, double> col_sizes;
 
     // pagesetup and print settings add by liufeijin 20181028, liufeijin
     QString PpaperSize;
diff --git a/QXlsx/header/xlsxzipwriter_p.h b/QXlsx/header/xlsxzipwriter_p.h
index 799e77c6..42b5acab 100644
--- a/QXlsx/header/xlsxzipwriter_p.h
+++ b/QXlsx/header/xlsxzipwriter_p.h
@@ -7,7 +7,6 @@
 
 #include <QIODevice>
 #include <QString>
-#include <QtGlobal>
 
 class QZipWriter;
 
diff --git a/QXlsx/source/xlsxabstractooxmlfile.cpp b/QXlsx/source/xlsxabstractooxmlfile.cpp
index 47025926..b0701fd3 100644
--- a/QXlsx/source/xlsxabstractooxmlfile.cpp
+++ b/QXlsx/source/xlsxabstractooxmlfile.cpp
@@ -6,7 +6,6 @@
 
 #include <QBuffer>
 #include <QByteArray>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxabstractsheet.cpp b/QXlsx/source/xlsxabstractsheet.cpp
index bf243bfc..ce45d542 100644
--- a/QXlsx/source/xlsxabstractsheet.cpp
+++ b/QXlsx/source/xlsxabstractsheet.cpp
@@ -5,8 +5,6 @@
 #include "xlsxabstractsheet_p.h"
 #include "xlsxworkbook.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 AbstractSheetPrivate::AbstractSheetPrivate(AbstractSheet *p, AbstractSheet::CreateFlag flag)
diff --git a/QXlsx/source/xlsxcell.cpp b/QXlsx/source/xlsxcell.cpp
index 7dba4e48..348400d7 100644
--- a/QXlsx/source/xlsxcell.cpp
+++ b/QXlsx/source/xlsxcell.cpp
@@ -15,7 +15,6 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QTime>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxcellformula.cpp b/QXlsx/source/xlsxcellformula.cpp
index c614e6b5..a5a076bd 100644
--- a/QXlsx/source/xlsxcellformula.cpp
+++ b/QXlsx/source/xlsxcellformula.cpp
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxcelllocation.cpp b/QXlsx/source/xlsxcelllocation.cpp
index 543c7347..f48e94f0 100644
--- a/QXlsx/source/xlsxcelllocation.cpp
+++ b/QXlsx/source/xlsxcelllocation.cpp
@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxcellrange.cpp b/QXlsx/source/xlsxcellrange.cpp
index eabadd6a..adcb919b 100644
--- a/QXlsx/source/xlsxcellrange.cpp
+++ b/QXlsx/source/xlsxcellrange.cpp
@@ -7,7 +7,6 @@
 #include <QPoint>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxchart.cpp b/QXlsx/source/xlsxchart.cpp
index 4af59123..7bb3391c 100644
--- a/QXlsx/source/xlsxchart.cpp
+++ b/QXlsx/source/xlsxchart.cpp
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxchartsheet.cpp b/QXlsx/source/xlsxchartsheet.cpp
index c344f077..733d5aae 100644
--- a/QXlsx/source/xlsxchartsheet.cpp
+++ b/QXlsx/source/xlsxchartsheet.cpp
@@ -12,7 +12,6 @@
 #include <QDir>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxconditionalformatting.cpp b/QXlsx/source/xlsxconditionalformatting.cpp
index 932fce85..c30d8d41 100644
--- a/QXlsx/source/xlsxconditionalformatting.cpp
+++ b/QXlsx/source/xlsxconditionalformatting.cpp
@@ -10,7 +10,6 @@
 #include <QDebug>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxdatavalidation.cpp b/QXlsx/source/xlsxdatavalidation.cpp
index a7d41270..bf8fa512 100644
--- a/QXlsx/source/xlsxdatavalidation.cpp
+++ b/QXlsx/source/xlsxdatavalidation.cpp
@@ -8,7 +8,6 @@
 
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxdatetype.cpp b/QXlsx/source/xlsxdatetype.cpp
index f757c65c..187b7686 100644
--- a/QXlsx/source/xlsxdatetype.cpp
+++ b/QXlsx/source/xlsxdatetype.cpp
@@ -5,8 +5,6 @@
 #include "xlsxglobal.h"
 #include "xlsxutility_p.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 DateType::DateType()
diff --git a/QXlsx/source/xlsxdocpropscore.cpp b/QXlsx/source/xlsxdocpropscore.cpp
index 450b8124..517c811e 100644
--- a/QXlsx/source/xlsxdocpropscore.cpp
+++ b/QXlsx/source/xlsxdocpropscore.cpp
@@ -9,7 +9,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxdocument.cpp b/QXlsx/source/xlsxdocument.cpp
index cb7111d2..f0cef3f9 100644
--- a/QXlsx/source/xlsxdocument.cpp
+++ b/QXlsx/source/xlsxdocument.cpp
@@ -27,7 +27,6 @@
 #include <QPointF>
 #include <QSharedPointer>
 #include <QTemporaryFile>
-#include <QtGlobal>
 
 /*
         From Wikipedia: The Open Packaging Conventions (OPC) is a
diff --git a/QXlsx/source/xlsxdrawing.cpp b/QXlsx/source/xlsxdrawing.cpp
index fc37502a..56199e34 100644
--- a/QXlsx/source/xlsxdrawing.cpp
+++ b/QXlsx/source/xlsxdrawing.cpp
@@ -7,7 +7,6 @@
 #include <QBuffer>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxdrawinganchor.cpp b/QXlsx/source/xlsxdrawinganchor.cpp
index 9922f30b..14e71792 100644
--- a/QXlsx/source/xlsxdrawinganchor.cpp
+++ b/QXlsx/source/xlsxdrawinganchor.cpp
@@ -12,7 +12,6 @@
 #include <QDir>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxformat.cpp b/QXlsx/source/xlsxformat.cpp
index 3aef8383..7aaf8f86 100644
--- a/QXlsx/source/xlsxformat.cpp
+++ b/QXlsx/source/xlsxformat.cpp
@@ -8,7 +8,6 @@
 
 #include <QDataStream>
 #include <QDebug>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxmediafile.cpp b/QXlsx/source/xlsxmediafile.cpp
index f930f8f3..01350933 100644
--- a/QXlsx/source/xlsxmediafile.cpp
+++ b/QXlsx/source/xlsxmediafile.cpp
@@ -3,7 +3,6 @@
 #include "xlsxmediafile_p.h"
 
 #include <QCryptographicHash>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxnumformatparser.cpp b/QXlsx/source/xlsxnumformatparser.cpp
index eaf28e2a..48b2d49f 100644
--- a/QXlsx/source/xlsxnumformatparser.cpp
+++ b/QXlsx/source/xlsxnumformatparser.cpp
@@ -3,7 +3,6 @@
 #include "xlsxnumformatparser_p.h"
 
 #include <QString>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxrelationships.cpp b/QXlsx/source/xlsxrelationships.cpp
index b1e9c1e5..85fa5ee8 100644
--- a/QXlsx/source/xlsxrelationships.cpp
+++ b/QXlsx/source/xlsxrelationships.cpp
@@ -7,7 +7,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxrichstring.cpp b/QXlsx/source/xlsxrichstring.cpp
index af126a49..d019aaeb 100644
--- a/QXlsx/source/xlsxrichstring.cpp
+++ b/QXlsx/source/xlsxrichstring.cpp
@@ -8,7 +8,6 @@
 #include <QDebug>
 #include <QTextDocument>
 #include <QTextFragment>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxsharedstrings.cpp b/QXlsx/source/xlsxsharedstrings.cpp
index d2b20aa6..476ede28 100644
--- a/QXlsx/source/xlsxsharedstrings.cpp
+++ b/QXlsx/source/xlsxsharedstrings.cpp
@@ -12,7 +12,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxsimpleooxmlfile.cpp b/QXlsx/source/xlsxsimpleooxmlfile.cpp
index dda49003..181e0bc6 100644
--- a/QXlsx/source/xlsxsimpleooxmlfile.cpp
+++ b/QXlsx/source/xlsxsimpleooxmlfile.cpp
@@ -3,7 +3,6 @@
 #include "xlsxsimpleooxmlfile_p.h"
 
 #include <QIODevice>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxstyles.cpp b/QXlsx/source/xlsxstyles.cpp
index 50d00d27..2695e8b9 100644
--- a/QXlsx/source/xlsxstyles.cpp
+++ b/QXlsx/source/xlsxstyles.cpp
@@ -13,7 +13,6 @@
 #include <QMap>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxworkbook.cpp b/QXlsx/source/xlsxworkbook.cpp
index 8a907ed1..650dc298 100644
--- a/QXlsx/source/xlsxworkbook.cpp
+++ b/QXlsx/source/xlsxworkbook.cpp
@@ -20,7 +20,6 @@
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include <QtDebug>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxworksheet.cpp b/QXlsx/source/xlsxworksheet.cpp
index 483334f7..804a4015 100644
--- a/QXlsx/source/xlsxworksheet.cpp
+++ b/QXlsx/source/xlsxworksheet.cpp
@@ -39,7 +39,6 @@
 #include <QVariant>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -1341,9 +1340,8 @@ void Worksheet::saveToXmlFile(QIODevice *device) const
 
     if (!d->colsInfo.isEmpty()) {
         writer.writeStartElement(QStringLiteral("cols"));
-        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(d->colsInfo);
-        while (it.hasNext()) {
-            it.next();
+
+        for (auto it = d->colsInfo.begin(); it != d->colsInfo.end(); ++it) {
             QSharedPointer<XlsxColumnInfo> col_info = it.value();
             writer.writeStartElement(QStringLiteral("col"));
             writer.writeAttribute(QStringLiteral("min"), QString::number(col_info->firstColumn));
@@ -1558,17 +1556,20 @@ void WorksheetPrivate::saveXmlCellData(QXmlStreamWriter &writer,
     writer.writeStartElement(QStringLiteral("c"));
     writer.writeAttribute(QStringLiteral("r"), cell_pos);
 
-    QMap<int, QSharedPointer<XlsxRowInfo>>::ConstIterator rIt;
-    QMap<int, QSharedPointer<XlsxColumnInfo>>::ConstIterator cIt;
-
     // Style used by the cell, row or col
-    if (!cell->format().isEmpty())
+    if (!cell->format().isEmpty()) {
         writer.writeAttribute(QStringLiteral("s"), QString::number(cell->format().xfIndex()));
-    else if ((rIt = rowsInfo.constFind(row)) != rowsInfo.constEnd() && !(*rIt)->format.isEmpty())
-        writer.writeAttribute(QStringLiteral("s"), QString::number((*rIt)->format.xfIndex()));
-    else if ((cIt = colsInfoHelper.constFind(col)) != colsInfoHelper.constEnd() &&
-             !(*cIt)->format.isEmpty())
-        writer.writeAttribute(QStringLiteral("s"), QString::number((*cIt)->format.xfIndex()));
+    } else {
+        auto rIt = rowsInfo.constFind(row);
+        if (rIt != rowsInfo.constEnd() && !(*rIt)->format.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("s"), QString::number((*rIt)->format.xfIndex()));
+        } else {
+            auto cIt = colsInfoHelper.constFind(col);
+            if (cIt != colsInfoHelper.constEnd() && !(*cIt)->format.isEmpty()) {
+                writer.writeAttribute(QStringLiteral("s"), QString::number((*cIt)->format.xfIndex()));
+            }
+        }
+    }
 
     if (cell->cellType() == Cell::SharedStringType) // 's'
     {
@@ -1719,15 +1720,10 @@ void WorksheetPrivate::saveXmlHyperlinks(QXmlStreamWriter &writer) const
         return;
 
     writer.writeStartElement(QStringLiteral("hyperlinks"));
-    QMapIterator<int, QMap<int, QSharedPointer<XlsxHyperlinkData>>> it(urlTable);
-
-    while (it.hasNext()) {
-        it.next();
+    for (auto it = urlTable.begin(); it != urlTable.end(); ++it) {
         int row = it.key();
-        QMapIterator<int, QSharedPointer<XlsxHyperlinkData>> it2(it.value());
 
-        while (it2.hasNext()) {
-            it2.next();
+        for (auto it2 = it.value().begin(); it2 != it.value().end(); ++it2) {
             int col                                = it2.key();
             QSharedPointer<XlsxHyperlinkData> data = it2.value();
             QString ref                            = CellReference(row, col).toString();
@@ -1787,9 +1783,7 @@ void WorksheetPrivate::splitColsInfo(int colFirst, int colLast)
     // we are trying to set "B:D", there should be "A", "B:D", "E:H".
     // This will be more complex if we try to set "C:F" after "B:D".
     {
-        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(colsInfo);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = colsInfo.begin(); it != colsInfo.end(); ++it) {
             QSharedPointer<XlsxColumnInfo> info = it.value();
             if (colFirst > info->firstColumn && colFirst <= info->lastColumn) {
                 // split the range,
@@ -1805,9 +1799,7 @@ void WorksheetPrivate::splitColsInfo(int colFirst, int colLast)
         }
     }
     {
-        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(colsInfo);
-        while (it.hasNext()) {
-            it.next();
+        for (auto it = colsInfo.begin(); it != colsInfo.end(); ++it) {
             QSharedPointer<XlsxColumnInfo> info = it.value();
             if (colLast >= info->firstColumn && colLast < info->lastColumn) {
                 QSharedPointer<XlsxColumnInfo> info2(new XlsxColumnInfo(*info));
diff --git a/QXlsx/source/xlsxzipwriter.cpp b/QXlsx/source/xlsxzipwriter.cpp
index 0ee17e37..3c2fb19e 100644
--- a/QXlsx/source/xlsxzipwriter.cpp
+++ b/QXlsx/source/xlsxzipwriter.cpp
@@ -5,7 +5,6 @@
 #include <private/qzipwriter_p.h>
 
 #include <QDebug>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX