diff --git a/CMakeLists.txt b/CMakeLists.txt
index a410d35..5240b27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ endif()
 qt_standard_project_setup()
 
 find_package(OpenSSL REQUIRED)
-find_package(lcms2 REQUIRED)
+find_package(lcms REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(Freetype REQUIRED)
 find_package(OpenJPEG CONFIG REQUIRED)
diff --git a/Pdf4QtDocDiff/mainwindow.cpp b/Pdf4QtDocDiff/mainwindow.cpp
index 9d0293d..ee9d336 100644
--- a/Pdf4QtDocDiff/mainwindow.cpp
+++ b/Pdf4QtDocDiff/mainwindow.cpp
@@ -38,6 +38,7 @@
 #include <QVBoxLayout>
 #include <QActionGroup>
 #include <QScreen>
+#include <QSettings>
 
 namespace pdfdocdiff
 {
diff --git a/Pdf4QtDocPageOrganizer/mainwindow.cpp b/Pdf4QtDocPageOrganizer/mainwindow.cpp
index 6bddb87..98a428e 100644
--- a/Pdf4QtDocPageOrganizer/mainwindow.cpp
+++ b/Pdf4QtDocPageOrganizer/mainwindow.cpp
@@ -39,6 +39,8 @@
 #include <QGuiApplication>
 #include <QDragEnterEvent>
 #include <QDropEvent>
+#include <QSettings>
+#include <QMimeData>
 
 namespace pdfdocpage
 {
diff --git a/Pdf4QtDocPageOrganizer/pageitemmodel.cpp b/Pdf4QtDocPageOrganizer/pageitemmodel.cpp
index edec5cd..c2b892b 100644
--- a/Pdf4QtDocPageOrganizer/pageitemmodel.cpp
+++ b/Pdf4QtDocPageOrganizer/pageitemmodel.cpp
@@ -19,6 +19,7 @@
 
 #include <QFileInfo>
 #include <QImageReader>
+#include <QMimeData>
 
 #include <iterator>
 
diff --git a/Pdf4QtDocPageOrganizer/pageitemmodel.h b/Pdf4QtDocPageOrganizer/pageitemmodel.h
index 07a07ec..8bc0013 100644
--- a/Pdf4QtDocPageOrganizer/pageitemmodel.h
+++ b/Pdf4QtDocPageOrganizer/pageitemmodel.h
@@ -23,6 +23,7 @@
 #include "pdfdocumentmanipulator.h"
 
 #include <QImage>
+#include <QItemSelection>
 #include <QAbstractItemModel>
 
 namespace pdfdocpage
diff --git a/Pdf4QtDocPageOrganizer/selectoutlinetoregroupdialog.h b/Pdf4QtDocPageOrganizer/selectoutlinetoregroupdialog.h
index 9864738..781da77 100644
--- a/Pdf4QtDocPageOrganizer/selectoutlinetoregroupdialog.h
+++ b/Pdf4QtDocPageOrganizer/selectoutlinetoregroupdialog.h
@@ -21,6 +21,7 @@
 #include "pdfdocument.h"
 
 #include <QDialog>
+#include <QModelIndex>
 
 namespace Ui
 {
diff --git a/Pdf4QtLibCore/sources/pdfannotation.cpp b/Pdf4QtLibCore/sources/pdfannotation.cpp
index 2bfeecb..7decac0 100644
--- a/Pdf4QtLibCore/sources/pdfannotation.cpp
+++ b/Pdf4QtLibCore/sources/pdfannotation.cpp
@@ -25,10 +25,11 @@
 #include "pdfform.h"
 #include "pdfpainterutils.h"
 #include "pdfdocumentbuilder.h"
-#include "pdfdbgheap.h"
 
 #include <QIcon>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfcertificatemanager.cpp b/Pdf4QtLibCore/sources/pdfcertificatemanager.cpp
index 18f8743..7024719 100644
--- a/Pdf4QtLibCore/sources/pdfcertificatemanager.cpp
+++ b/Pdf4QtLibCore/sources/pdfcertificatemanager.cpp
@@ -21,6 +21,8 @@
 #include <QFile>
 #include <QStandardPaths>
 
+#include "pdfdbgheap.h"
+
 #if defined(PDF4QT_COMPILER_MINGW) || defined(PDF4QT_COMPILER_GCC)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/Pdf4QtLibCore/sources/pdfcms.cpp b/Pdf4QtLibCore/sources/pdfcms.cpp
index 250ac61..8f2dbed 100644
--- a/Pdf4QtLibCore/sources/pdfcms.cpp
+++ b/Pdf4QtLibCore/sources/pdfcms.cpp
@@ -18,7 +18,6 @@
 #include "pdfcms.h"
 #include "pdfdocument.h"
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QDir>
 #include <QFile>
@@ -26,6 +25,8 @@
 #include <QCoreApplication>
 #include <QReadWriteLock>
 
+#include "pdfdbgheap.h"
+
 #ifdef PDF4QT_COMPILER_CLANG
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wregister"
diff --git a/Pdf4QtLibCore/sources/pdfcolorconvertor.cpp b/Pdf4QtLibCore/sources/pdfcolorconvertor.cpp
index 30ccff0..c15aa7f 100644
--- a/Pdf4QtLibCore/sources/pdfcolorconvertor.cpp
+++ b/Pdf4QtLibCore/sources/pdfcolorconvertor.cpp
@@ -18,6 +18,7 @@
 #include "pdfcolorconvertor.h"
 #include "pdfimageconversion.h"
 #include "pdfutils.h"
+#include "pdfdbgheap.h"
 
 #include <cmath>
 
diff --git a/Pdf4QtLibCore/sources/pdfcolorspaces.cpp b/Pdf4QtLibCore/sources/pdfcolorspaces.cpp
index 2fb76d0..8e8b202 100644
--- a/Pdf4QtLibCore/sources/pdfcolorspaces.cpp
+++ b/Pdf4QtLibCore/sources/pdfcolorspaces.cpp
@@ -23,10 +23,11 @@
 #include "pdfpattern.h"
 #include "pdfcms.h"
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QCryptographicHash>
 
+#include "pdfdbgheap.h"
+
 #include <execution>
 
 namespace pdf
diff --git a/Pdf4QtLibCore/sources/pdfdiff.cpp b/Pdf4QtLibCore/sources/pdfdiff.cpp
index 4d016cb..165fc2d 100644
--- a/Pdf4QtLibCore/sources/pdfdiff.cpp
+++ b/Pdf4QtLibCore/sources/pdfdiff.cpp
@@ -24,10 +24,11 @@
 #include "pdfconstants.h"
 #include "pdfalgorithmlcs.h"
 #include "pdfpainter.h"
-#include "pdfdbgheap.h"
 
 #include <QtConcurrent/QtConcurrent>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfdocumentbuilder.cpp b/Pdf4QtLibCore/sources/pdfdocumentbuilder.cpp
index 295a15d..3f679bf 100644
--- a/Pdf4QtLibCore/sources/pdfdocumentbuilder.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumentbuilder.cpp
@@ -21,7 +21,6 @@
 #include "pdfdocumentreader.h"
 #include "pdfobjectutils.h"
 #include "pdfnametreeloader.h"
-#include "pdfdbgheap.h"
 #include "pdfparser.h"
 #include "pdfstreamfilters.h"
 
@@ -29,6 +28,8 @@
 #include <QPainter>
 #include <QPdfWriter>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfdocumentreader.cpp b/Pdf4QtLibCore/sources/pdfdocumentreader.cpp
index 183fe95..7078c65 100644
--- a/Pdf4QtLibCore/sources/pdfdocumentreader.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumentreader.cpp
@@ -23,11 +23,12 @@
 #include "pdfparser.h"
 #include "pdfstreamfilters.h"
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QFile>
 #include <QCryptographicHash>
 
+#include "pdfdbgheap.h"
+
 #include <regex>
 #include <cctype>
 #include <algorithm>
diff --git a/Pdf4QtLibCore/sources/pdfdocumentsanitizer.cpp b/Pdf4QtLibCore/sources/pdfdocumentsanitizer.cpp
index 4926bbf..670591a 100644
--- a/Pdf4QtLibCore/sources/pdfdocumentsanitizer.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumentsanitizer.cpp
@@ -20,6 +20,7 @@
 #include "pdfexecutionpolicy.h"
 #include "pdfoptimizer.h"
 #include "pdfdocumentbuilder.h"
+#include "pdfdbgheap.h"
 
 namespace pdf
 {
diff --git a/Pdf4QtLibCore/sources/pdfdocumenttextfloweditormodel.cpp b/Pdf4QtLibCore/sources/pdfdocumenttextfloweditormodel.cpp
index a988ec8..3b17bd3 100644
--- a/Pdf4QtLibCore/sources/pdfdocumenttextfloweditormodel.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumenttextfloweditormodel.cpp
@@ -17,11 +17,12 @@
 
 #include "pdfdocumenttextfloweditormodel.h"
 #include "pdfdocumenttextflow.h"
-#include "pdfdbgheap.h"
 
 #include <QColor>
 #include <QBrush>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp b/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp
index b99c278..9ccbd32 100644
--- a/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp
@@ -19,12 +19,13 @@
 #include "pdfconstants.h"
 #include "pdfvisitor.h"
 #include "pdfparser.h"
-#include "pdfdbgheap.h"
 
 #include <QFile>
 #include <QBuffer>
 #include <QSaveFile>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfencoding.cpp b/Pdf4QtLibCore/sources/pdfencoding.cpp
index ecf1363..dd7f919 100644
--- a/Pdf4QtLibCore/sources/pdfencoding.cpp
+++ b/Pdf4QtLibCore/sources/pdfencoding.cpp
@@ -16,11 +16,12 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfencoding.h"
-#include "pdfdbgheap.h"
 
 #include <QTimeZone>
 #include <QStringDecoder>
 
+#include "pdfdbgheap.h"
+
 #include <cctype>
 #include <cstring>
 
diff --git a/Pdf4QtLibCore/sources/pdfexecutionpolicy.cpp b/Pdf4QtLibCore/sources/pdfexecutionpolicy.cpp
index fda05d6..399fdd0 100644
--- a/Pdf4QtLibCore/sources/pdfexecutionpolicy.cpp
+++ b/Pdf4QtLibCore/sources/pdfexecutionpolicy.cpp
@@ -16,11 +16,12 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QThread>
 #include <QCoreApplication>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdffont.cpp b/Pdf4QtLibCore/sources/pdffont.cpp
index 1a10f2b..62ba2fa 100644
--- a/Pdf4QtLibCore/sources/pdffont.cpp
+++ b/Pdf4QtLibCore/sources/pdffont.cpp
@@ -21,7 +21,6 @@
 #include "pdfnametounicode.h"
 #include "pdfexception.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 
 #include <ft2build.h>
 #include <freetype/freetype.h>
@@ -36,6 +35,8 @@
 #include <QPainterPath>
 #include <QDataStream>
 
+#include "pdfdbgheap.h"
+
 #if defined(Q_OS_WIN)
 #include "Windows.h"
 #elif defined(Q_OS_UNIX)
diff --git a/Pdf4QtLibCore/sources/pdffunction.cpp b/Pdf4QtLibCore/sources/pdffunction.cpp
index bd00627..77e3ad1 100644
--- a/Pdf4QtLibCore/sources/pdffunction.cpp
+++ b/Pdf4QtLibCore/sources/pdffunction.cpp
@@ -21,10 +21,11 @@
 #include "pdfdocument.h"
 #include "pdfexception.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 
 #include <QIODevice>
 
+#include "pdfdbgheap.h"
+
 #include <stack>
 #include <iterator>
 #include <type_traits>
diff --git a/Pdf4QtLibCore/sources/pdfglobal.h b/Pdf4QtLibCore/sources/pdfglobal.h
index 475d1ef..6b0b2e8 100644
--- a/Pdf4QtLibCore/sources/pdfglobal.h
+++ b/Pdf4QtLibCore/sources/pdfglobal.h
@@ -18,7 +18,6 @@
 #ifndef PDFGLOBAL_H
 #define PDFGLOBAL_H
 
-#include <QtCore>
 #include <QtSystemDetection>
 #include <QtCompilerDetection>
 #include <QCoreApplication>
diff --git a/Pdf4QtLibCore/sources/pdficontheme.cpp b/Pdf4QtLibCore/sources/pdficontheme.cpp
index 580ac9f..6a8044c 100644
--- a/Pdf4QtLibCore/sources/pdficontheme.cpp
+++ b/Pdf4QtLibCore/sources/pdficontheme.cpp
@@ -16,12 +16,13 @@
 //    along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdficontheme.h"
-#include "pdfdbgheap.h"
 
 #include <QDir>
 #include <QFile>
 #include <QCoreApplication>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfimage.cpp b/Pdf4QtLibCore/sources/pdfimage.cpp
index bc5d05e..e716023 100644
--- a/Pdf4QtLibCore/sources/pdfimage.cpp
+++ b/Pdf4QtLibCore/sources/pdfimage.cpp
@@ -22,11 +22,12 @@
 #include "pdfutils.h"
 #include "pdfjbig2decoder.h"
 #include "pdfccittfaxdecoder.h"
-#include "pdfdbgheap.h"
 
 #include <openjpeg.h>
 #include <jpeglib.h>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfimageconversion.cpp b/Pdf4QtLibCore/sources/pdfimageconversion.cpp
index 14a9bb7..4ccf1d6 100644
--- a/Pdf4QtLibCore/sources/pdfimageconversion.cpp
+++ b/Pdf4QtLibCore/sources/pdfimageconversion.cpp
@@ -1,4 +1,5 @@
 #include "pdfimageconversion.h"
+#include "pdfdbgheap.h"
 
 #include <cmath>
 
diff --git a/Pdf4QtLibCore/sources/pdfmultimedia.cpp b/Pdf4QtLibCore/sources/pdfmultimedia.cpp
index 3a08232..d160d59 100644
--- a/Pdf4QtLibCore/sources/pdfmultimedia.cpp
+++ b/Pdf4QtLibCore/sources/pdfmultimedia.cpp
@@ -18,10 +18,11 @@
 #include "pdfmultimedia.h"
 #include "pdfdocument.h"
 #include "pdfnametreeloader.h"
-#include "pdfdbgheap.h"
 
 #include <QtEndian>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfpagecontentprocessor.cpp b/Pdf4QtLibCore/sources/pdfpagecontentprocessor.cpp
index fd96bac..e2658b8 100644
--- a/Pdf4QtLibCore/sources/pdfpagecontentprocessor.cpp
+++ b/Pdf4QtLibCore/sources/pdfpagecontentprocessor.cpp
@@ -22,10 +22,11 @@
 #include "pdfpattern.h"
 #include "pdfexecutionpolicy.h"
 #include "pdfstreamfilters.h"
-#include "pdfdbgheap.h"
 
 #include <QPainterPathStroker>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfpainter.cpp b/Pdf4QtLibCore/sources/pdfpainter.cpp
index 7cde3a3..5f390f3 100644
--- a/Pdf4QtLibCore/sources/pdfpainter.cpp
+++ b/Pdf4QtLibCore/sources/pdfpainter.cpp
@@ -18,11 +18,12 @@
 #include "pdfpainter.h"
 #include "pdfpattern.h"
 #include "pdfcms.h"
-#include "pdfdbgheap.h"
 
 #include <QPainter>
 #include <QCryptographicHash>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfpainterutils.cpp b/Pdf4QtLibCore/sources/pdfpainterutils.cpp
index 06eab09..6e07c28 100644
--- a/Pdf4QtLibCore/sources/pdfpainterutils.cpp
+++ b/Pdf4QtLibCore/sources/pdfpainterutils.cpp
@@ -16,10 +16,11 @@
 //    along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfpainterutils.h"
-#include "pdfdbgheap.h"
 
 #include <QFontMetrics>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfparser.cpp b/Pdf4QtLibCore/sources/pdfparser.cpp
index 679ffe3..014de9c 100644
--- a/Pdf4QtLibCore/sources/pdfparser.cpp
+++ b/Pdf4QtLibCore/sources/pdfparser.cpp
@@ -19,12 +19,13 @@
 #include "pdfparser.h"
 #include "pdfconstants.h"
 #include "pdfexception.h"
-#include "pdfdbgheap.h"
 
 #include <QFile>
 #include <QThread>
 #include <QMetaEnum>
 
+#include "pdfdbgheap.h"
+
 #include <cctype>
 #include <memory>
 
diff --git a/Pdf4QtLibCore/sources/pdfpattern.cpp b/Pdf4QtLibCore/sources/pdfpattern.cpp
index de5a5cd..fdd8dd2 100644
--- a/Pdf4QtLibCore/sources/pdfpattern.cpp
+++ b/Pdf4QtLibCore/sources/pdfpattern.cpp
@@ -22,11 +22,12 @@
 #include "pdfcolorspaces.h"
 #include "pdfexecutionpolicy.h"
 #include "pdfconstants.h"
-#include "pdfdbgheap.h"
 
 #include <QMutex>
 #include <QPainter>
 
+#include "pdfdbgheap.h"
+
 #include <execution>
 
 namespace pdf
diff --git a/Pdf4QtLibCore/sources/pdfrenderer.cpp b/Pdf4QtLibCore/sources/pdfrenderer.cpp
index 321c096..d3ea6fc 100644
--- a/Pdf4QtLibCore/sources/pdfrenderer.cpp
+++ b/Pdf4QtLibCore/sources/pdfrenderer.cpp
@@ -21,7 +21,6 @@
 #include "pdfexecutionpolicy.h"
 #include "pdfprogress.h"
 #include "pdfannotation.h"
-#include "pdfdbgheap.h"
 
 #include <QDir>
 #include <QElapsedTimer>
@@ -34,6 +33,8 @@
 #include <QOpenGLFunctions>
 #endif
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfsecurityhandler.cpp b/Pdf4QtLibCore/sources/pdfsecurityhandler.cpp
index cb8d71e..2d98baa 100644
--- a/Pdf4QtLibCore/sources/pdfsecurityhandler.cpp
+++ b/Pdf4QtLibCore/sources/pdfsecurityhandler.cpp
@@ -21,11 +21,12 @@
 #include "pdfvisitor.h"
 #include "pdfutils.h"
 #include "pdfdocumentbuilder.h"
-#include "pdfdbgheap.h"
 #include "pdfcertificatemanager.h"
 
 #include <QRandomGenerator>
 
+#include "pdfdbgheap.h"
+
 #if defined(PDF4QT_COMPILER_MINGW) || defined(PDF4QT_COMPILER_GCC)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp b/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp
index 3040ccb..2500ae7 100644
--- a/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp
+++ b/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp
@@ -20,7 +20,6 @@
 #include "pdfencoding.h"
 #include "pdfform.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 #include "pdfsignaturehandler_impl.h"
 
 #if defined(PDF4QT_COMPILER_MINGW) || defined(PDF4QT_COMPILER_GCC)
@@ -48,6 +47,8 @@
 #include <QMutexLocker>
 #include <QStandardPaths>
 
+#include "pdfdbgheap.h"
+
 #include <array>
 #ifdef Q_OS_UNIX
 #include <time.h>
diff --git a/Pdf4QtLibCore/sources/pdfsnapper.cpp b/Pdf4QtLibCore/sources/pdfsnapper.cpp
index ff74f3a..514818c 100644
--- a/Pdf4QtLibCore/sources/pdfsnapper.cpp
+++ b/Pdf4QtLibCore/sources/pdfsnapper.cpp
@@ -17,12 +17,13 @@
 
 #include "pdfsnapper.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 #include "pdfpainter.h"
 #include "pdfwidgetsnapshot.h"
 
 #include <QPainter>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdfstreamfilters.cpp b/Pdf4QtLibCore/sources/pdfstreamfilters.cpp
index 093f5b0..84378bd 100644
--- a/Pdf4QtLibCore/sources/pdfstreamfilters.cpp
+++ b/Pdf4QtLibCore/sources/pdfstreamfilters.cpp
@@ -21,12 +21,13 @@
 #include "pdfparser.h"
 #include "pdfsecurityhandler.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 
 #include <zlib.h>
 
 #include <QtEndian>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibCore/sources/pdftextlayout.cpp b/Pdf4QtLibCore/sources/pdftextlayout.cpp
index 4c118e6..7a196c7 100644
--- a/Pdf4QtLibCore/sources/pdftextlayout.cpp
+++ b/Pdf4QtLibCore/sources/pdftextlayout.cpp
@@ -18,7 +18,6 @@
 #include "pdftextlayout.h"
 #include "pdfutils.h"
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QMutex>
 #include <QPainter>
@@ -26,6 +25,8 @@
 #include <QMutexLocker>
 #include <QRegularExpression>
 
+#include "pdfdbgheap.h"
+
 #include <execution>
 
 namespace pdf
diff --git a/Pdf4QtLibCore/sources/pdftextlayoutgenerator.cpp b/Pdf4QtLibCore/sources/pdftextlayoutgenerator.cpp
index de39399..2335d14 100644
--- a/Pdf4QtLibCore/sources/pdftextlayoutgenerator.cpp
+++ b/Pdf4QtLibCore/sources/pdftextlayoutgenerator.cpp
@@ -16,6 +16,7 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdftextlayoutgenerator.h"
+#include "pdfdbgheap.h"
 
 namespace pdf
 {
diff --git a/Pdf4QtLibCore/sources/pdfutils.cpp b/Pdf4QtLibCore/sources/pdfutils.cpp
index 0a62e94..df7ffed 100644
--- a/Pdf4QtLibCore/sources/pdfutils.cpp
+++ b/Pdf4QtLibCore/sources/pdfutils.cpp
@@ -17,10 +17,11 @@
 
 #include "pdfutils.h"
 #include "pdfexception.h"
-#include "pdfdbgheap.h"
 
 #include <QtGlobal>
 
+#include "pdfdbgheap.h"
+
 #include <jpeglib.h>
 #include <ft2build.h>
 #include <freetype/freetype.h>
diff --git a/Pdf4QtLibCore/sources/pdfwidgetsnapshot.cpp b/Pdf4QtLibCore/sources/pdfwidgetsnapshot.cpp
index c1a0c91..eb1a7b0 100644
--- a/Pdf4QtLibCore/sources/pdfwidgetsnapshot.cpp
+++ b/Pdf4QtLibCore/sources/pdfwidgetsnapshot.cpp
@@ -16,6 +16,7 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfwidgetsnapshot.h"
+#include "pdfdbgheap.h"
 
 namespace pdf
 {
diff --git a/Pdf4QtLibCore/sources/pdfxfaengine.cpp b/Pdf4QtLibCore/sources/pdfxfaengine.cpp
index 4ae73f2..8857c27 100644
--- a/Pdf4QtLibCore/sources/pdfxfaengine.cpp
+++ b/Pdf4QtLibCore/sources/pdfxfaengine.cpp
@@ -19,7 +19,6 @@
 #include "pdfform.h"
 #include "pdfpainterutils.h"
 #include "pdffont.h"
-#include "pdfdbgheap.h"
 
 #include <QBuffer>
 #include <QDomElement>
@@ -32,6 +31,8 @@
 #include <QFontDatabase>
 #include <QAbstractTextDocumentLayout>
 
+#include "pdfdbgheap.h"
+
 #include <stack>
 #include <optional>
 
diff --git a/Pdf4QtLibCore/sources/pdfxreftable.cpp b/Pdf4QtLibCore/sources/pdfxreftable.cpp
index c35a96f..8724697 100644
--- a/Pdf4QtLibCore/sources/pdfxreftable.cpp
+++ b/Pdf4QtLibCore/sources/pdfxreftable.cpp
@@ -20,10 +20,11 @@
 #include "pdfexception.h"
 #include "pdfparser.h"
 #include "pdfstreamfilters.h"
-#include "pdfdbgheap.h"
 
 #include <QIODevice>
 
+#include "pdfdbgheap.h"
+
 #include <stack>
 
 namespace pdf
diff --git a/Pdf4QtLibWidgets/sources/pdfadvancedtools.cpp b/Pdf4QtLibWidgets/sources/pdfadvancedtools.cpp
index 252d42b..b6cdbdb 100644
--- a/Pdf4QtLibWidgets/sources/pdfadvancedtools.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfadvancedtools.cpp
@@ -22,12 +22,13 @@
 #include "pdfcompiler.h"
 #include "pdfwidgetformmanager.h"
 #include "pdfwidgetannotation.h"
-#include "pdfdbgheap.h"
 
 #include <QActionGroup>
 #include <QInputDialog>
 #include <QKeyEvent>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibWidgets/sources/pdfcertificatemanagerdialog.cpp b/Pdf4QtLibWidgets/sources/pdfcertificatemanagerdialog.cpp
index cb1df03..215313b 100644
--- a/Pdf4QtLibWidgets/sources/pdfcertificatemanagerdialog.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfcertificatemanagerdialog.cpp
@@ -27,6 +27,7 @@
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QStandardPaths>
 
 namespace pdf
 {
diff --git a/Pdf4QtLibWidgets/sources/pdfcompiler.cpp b/Pdf4QtLibWidgets/sources/pdfcompiler.cpp
index b9aa727..92edb63 100644
--- a/Pdf4QtLibWidgets/sources/pdfcompiler.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfcompiler.cpp
@@ -21,10 +21,12 @@
 #include "pdfexecutionpolicy.h"
 #include "pdftextlayoutgenerator.h"
 #include "pdfdrawspacecontroller.h"
-#include "pdfdbgheap.h"
 
+#include <QCache>
 #include <QtConcurrent/QtConcurrent>
 
+#include "pdfdbgheap.h"
+
 #include <execution>
 
 namespace pdf
@@ -114,14 +116,18 @@ void PDFAsynchronousPageCompilerWorkerThread::run()
 
 PDFAsynchronousPageCompiler::PDFAsynchronousPageCompiler(PDFDrawWidgetProxy* proxy) :
     BaseClass(proxy),
-    m_proxy(proxy)
+    m_proxy(proxy),
+    m_cache(new QCache<PDFInteger, PDFPrecompiledPage>())
 {
-    m_cache.setMaxCost(128 * 1024 * 1024);
+    m_cache->setMaxCost(128 * 1024 * 1024);
 }
 
 PDFAsynchronousPageCompiler::~PDFAsynchronousPageCompiler()
 {
     stop(true);
+
+    delete m_cache;
+    m_cache = nullptr;
 }
 
 bool PDFAsynchronousPageCompiler::isOperationCancelled() const
@@ -183,7 +189,7 @@ void PDFAsynchronousPageCompiler::stop(bool clearCache)
 
             if (clearCache)
             {
-                m_cache.clear();
+                m_cache->clear();
             }
 
             m_state = State::Inactive;
@@ -207,7 +213,7 @@ void PDFAsynchronousPageCompiler::reset()
 
 void PDFAsynchronousPageCompiler::setCacheLimit(int limit)
 {
-    m_cache.setMaxCost(limit);
+    m_cache->setMaxCost(limit);
 }
 
 const PDFPrecompiledPage* PDFAsynchronousPageCompiler::getCompiledPage(PDFInteger pageIndex, bool compile)
@@ -218,7 +224,7 @@ const PDFPrecompiledPage* PDFAsynchronousPageCompiler::getCompiledPage(PDFIntege
         return nullptr;
     }
 
-    PDFPrecompiledPage* page = m_cache.object(pageIndex);
+    PDFPrecompiledPage* page = m_cache->object(pageIndex);
 
     if (!page && compile)
     {
@@ -250,7 +256,7 @@ void PDFAsynchronousPageCompiler::smartClearCache(const int milisecondsLimit, co
 
     Q_ASSERT(std::is_sorted(activePages.cbegin(), activePages.cend()));
 
-    QList<PDFInteger> pageIndices = m_cache.keys();
+    QList<PDFInteger> pageIndices = m_cache->keys();
     for (const PDFInteger pageIndex : pageIndices)
     {
         if (std::binary_search(activePages.cbegin(), activePages.cend(), pageIndex))
@@ -259,10 +265,10 @@ void PDFAsynchronousPageCompiler::smartClearCache(const int milisecondsLimit, co
             continue;
         }
 
-        const PDFPrecompiledPage* page = m_cache.object(pageIndex);
+        const PDFPrecompiledPage* page = m_cache->object(pageIndex);
         if (page && page->hasExpired(milisecondsLimit))
         {
-            m_cache.remove(pageIndex);
+            m_cache->remove(pageIndex);
         }
     }
 }
@@ -287,7 +293,7 @@ void PDFAsynchronousPageCompiler::onPageCompiled()
                     PDFPrecompiledPage* page = new PDFPrecompiledPage(std::move(task.precompiledPage));
                     page->markAccessed();
                     qint64 memoryConsumptionEstimate = page->getMemoryConsumptionEstimate();
-                    if (m_cache.insert(it->first, page, memoryConsumptionEstimate))
+                    if (m_cache->insert(it->first, page, memoryConsumptionEstimate))
                     {
                         compiledPages.push_back(it->first);
                     }
@@ -295,7 +301,7 @@ void PDFAsynchronousPageCompiler::onPageCompiled()
                     {
                         // We can't insert page to the cache, because cache size is too small. We will
                         // emit error string to inform the user, that cache is too small.
-                        QString message = PDFTranslationContext::tr("Precompiled page size is too high (%1 kB). Cache size is %2 kB. Increase the cache size!").arg(memoryConsumptionEstimate / 1024).arg(m_cache.maxCost() / 1024);
+                        QString message = PDFTranslationContext::tr("Precompiled page size is too high (%1 kB). Cache size is %2 kB. Increase the cache size!").arg(memoryConsumptionEstimate / 1024).arg(m_cache->maxCost() / 1024);
                         errors[it->first] = PDFRenderError(RenderErrorType::Error, message);
                     }
                 }
diff --git a/Pdf4QtLibWidgets/sources/pdfcompiler.h b/Pdf4QtLibWidgets/sources/pdfcompiler.h
index b10ae54..5613176 100644
--- a/Pdf4QtLibWidgets/sources/pdfcompiler.h
+++ b/Pdf4QtLibWidgets/sources/pdfcompiler.h
@@ -24,11 +24,13 @@
 #include "pdfpainter.h"
 #include "pdftextlayout.h"
 
-#include <QCache>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QWaitCondition>
 
+template <class Key, class T>
+class QCache;
+
 namespace pdf
 {
 class PDFDrawWidgetProxy;
@@ -143,7 +145,7 @@ private:
     PDFAsynchronousPageCompilerWorkerThread* m_thread = nullptr;
 
     PDFDrawWidgetProxy* m_proxy;
-    QCache<PDFInteger, PDFPrecompiledPage> m_cache;
+    QCache<PDFInteger, PDFPrecompiledPage>* m_cache;
 
     /// This task is protected by mutex. Every access to this
     /// variable must be done with locked mutex.
diff --git a/Pdf4QtLibWidgets/sources/pdfdrawspacecontroller.cpp b/Pdf4QtLibWidgets/sources/pdfdrawspacecontroller.cpp
index 7638767..239795e 100644
--- a/Pdf4QtLibWidgets/sources/pdfdrawspacecontroller.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfdrawspacecontroller.cpp
@@ -24,7 +24,6 @@
 #include "pdfannotation.h"
 #include "pdfdrawwidget.h"
 #include "pdfwidgetannotation.h"
-#include "pdfdbgheap.h"
 
 #include <QTimer>
 #include <QPainter>
@@ -32,6 +31,8 @@
 #include <QScreen>
 #include <QGuiApplication>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibWidgets/sources/pdfdrawwidget.cpp b/Pdf4QtLibWidgets/sources/pdfdrawwidget.cpp
index 27c0233..d0b245e 100644
--- a/Pdf4QtLibWidgets/sources/pdfdrawwidget.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfdrawwidget.cpp
@@ -22,7 +22,6 @@
 #include "pdfannotation.h"
 #include "pdfwidgetannotation.h"
 #include "pdfwidgetformmanager.h"
-#include "pdfdbgheap.h"
 
 #include <QPainter>
 #include <QGridLayout>
@@ -31,6 +30,8 @@
 #include <QPixmapCache>
 #include <QColorSpace>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibWidgets/sources/pdfitemmodels.cpp b/Pdf4QtLibWidgets/sources/pdfitemmodels.cpp
index ffe408b..d98b551 100644
--- a/Pdf4QtLibWidgets/sources/pdfitemmodels.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfitemmodels.cpp
@@ -18,7 +18,6 @@
 #include "pdfitemmodels.h"
 #include "pdfdocument.h"
 #include "pdfdrawspacecontroller.h"
-#include "pdfdbgheap.h"
 #include "pdfdrawwidget.h"
 
 #include <QFont>
@@ -26,6 +25,9 @@
 #include <QApplication>
 #include <QMimeDatabase>
 #include <QFileIconProvider>
+#include <QMimeData>
+
+#include "pdfdbgheap.h"
 
 namespace pdf
 {
diff --git a/Pdf4QtLibWidgets/sources/pdfobjecteditorwidget.cpp b/Pdf4QtLibWidgets/sources/pdfobjecteditorwidget.cpp
index ab37666..bfd2e8b 100644
--- a/Pdf4QtLibWidgets/sources/pdfobjecteditorwidget.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfobjecteditorwidget.cpp
@@ -20,7 +20,6 @@
 #include "pdfdocumentbuilder.h"
 #include "pdfencoding.h"
 #include "pdfwidgetutils.h"
-#include "pdfdbgheap.h"
 
 #include <QTabWidget>
 #include <QVBoxLayout>
@@ -37,6 +36,8 @@
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibWidgets/sources/pdfpagecontenteditortools.cpp b/Pdf4QtLibWidgets/sources/pdfpagecontenteditortools.cpp
index 59bdd59..79539c2 100644
--- a/Pdf4QtLibWidgets/sources/pdfpagecontenteditortools.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfpagecontenteditortools.cpp
@@ -27,6 +27,7 @@
 #include <QFileDialog>
 #include <QImageReader>
 #include <QGuiApplication>
+#include <QStandardPaths>
 
 namespace pdf
 {
diff --git a/Pdf4QtLibWidgets/sources/pdfpagecontentelements.cpp b/Pdf4QtLibWidgets/sources/pdfpagecontentelements.cpp
index c32cf1e..e81440d 100644
--- a/Pdf4QtLibWidgets/sources/pdfpagecontentelements.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfpagecontentelements.cpp
@@ -22,6 +22,7 @@
 #include "pdfwidgetutils.h"
 #include "pdfutils.h"
 
+#include <QBuffer>
 #include <QPainter>
 #include <QKeyEvent>
 #include <QMouseEvent>
diff --git a/Pdf4QtLibWidgets/sources/pdfpagecontentelements.h b/Pdf4QtLibWidgets/sources/pdfpagecontentelements.h
index 36583ce..a394349 100644
--- a/Pdf4QtLibWidgets/sources/pdfpagecontentelements.h
+++ b/Pdf4QtLibWidgets/sources/pdfpagecontentelements.h
@@ -26,6 +26,7 @@
 #include <QBrush>
 #include <QCursor>
 #include <QPainterPath>
+#include <QElapsedTimer>
 
 #include <set>
 
diff --git a/Pdf4QtLibWidgets/sources/pdfrenderingerrorswidget.cpp b/Pdf4QtLibWidgets/sources/pdfrenderingerrorswidget.cpp
index 23bb153..53c4a10 100644
--- a/Pdf4QtLibWidgets/sources/pdfrenderingerrorswidget.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfrenderingerrorswidget.cpp
@@ -17,10 +17,10 @@
 
 #include "pdfrenderingerrorswidget.h"
 #include "pdfdrawwidget.h"
-#include "pdfdbgheap.h"
 #include "ui_pdfrenderingerrorswidget.h"
 
 #include "pdfwidgetutils.h"
+#include "pdfdbgheap.h"
 
 namespace pdf
 {
diff --git a/Pdf4QtLibWidgets/sources/pdfselectpagesdialog.cpp b/Pdf4QtLibWidgets/sources/pdfselectpagesdialog.cpp
index be5f8aa..ea7b3a9 100644
--- a/Pdf4QtLibWidgets/sources/pdfselectpagesdialog.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfselectpagesdialog.cpp
@@ -16,10 +16,10 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfselectpagesdialog.h"
-#include "pdfdbgheap.h"
 #include "ui_pdfselectpagesdialog.h"
 
 #include "pdfwidgetutils.h"
+#include "pdfdbgheap.h"
 
 #include <QMessageBox>
 
diff --git a/Pdf4QtLibWidgets/sources/pdfwidgettool.cpp b/Pdf4QtLibWidgets/sources/pdfwidgettool.cpp
index a57e68e..d05356f 100644
--- a/Pdf4QtLibWidgets/sources/pdfwidgettool.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfwidgettool.cpp
@@ -20,7 +20,6 @@
 #include "pdfcompiler.h"
 #include "pdfwidgetutils.h"
 #include "pdfpainterutils.h"
-#include "pdfdbgheap.h"
 
 #include <QLabel>
 #include <QAction>
@@ -36,6 +35,8 @@
 #include <QStylePainter>
 #include <QStyleOptionTitleBar>
 
+#include "pdfdbgheap.h"
+
 namespace pdf
 {
 
diff --git a/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp b/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp
index 0d636b7..5dad54b 100644
--- a/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp
+++ b/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp
@@ -17,7 +17,6 @@
 
 #include "pdfwidgetutils.h"
 #include "pdfcolorconvertor.h"
-#include "pdfdbgheap.h"
 
 #include <QDialog>
 #include <QLayout>
@@ -26,6 +25,8 @@
 #include <QGroupBox>
 #include <QApplication>
 
+#include "pdfdbgheap.h"
+
 #ifdef Q_OS_MAC
 int qt_default_dpi_x() { return 72; }
 int qt_default_dpi_y() { return 72; }
diff --git a/Pdf4QtViewer/pdfaboutdialog.cpp b/Pdf4QtViewer/pdfaboutdialog.cpp
index 89bcdba..87898b7 100644
--- a/Pdf4QtViewer/pdfaboutdialog.cpp
+++ b/Pdf4QtViewer/pdfaboutdialog.cpp
@@ -16,11 +16,11 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfaboutdialog.h"
-#include "pdfdbgheap.h"
 #include "ui_pdfaboutdialog.h"
 
 #include "pdfutils.h"
 #include "pdfwidgetutils.h"
+#include "pdfdbgheap.h"
 
 namespace pdfviewer
 {
diff --git a/Pdf4QtViewer/pdfadvancedfindwidget.cpp b/Pdf4QtViewer/pdfadvancedfindwidget.cpp
index c34d5f7..671aa11 100644
--- a/Pdf4QtViewer/pdfadvancedfindwidget.cpp
+++ b/Pdf4QtViewer/pdfadvancedfindwidget.cpp
@@ -16,7 +16,6 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfadvancedfindwidget.h"
-#include "pdfdbgheap.h"
 #include "ui_pdfadvancedfindwidget.h"
 
 #include "pdfcompiler.h"
@@ -25,6 +24,8 @@
 
 #include <QMessageBox>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfbookmarkmanager.cpp b/Pdf4QtViewer/pdfbookmarkmanager.cpp
index c3d97d4..92844ce 100644
--- a/Pdf4QtViewer/pdfbookmarkmanager.cpp
+++ b/Pdf4QtViewer/pdfbookmarkmanager.cpp
@@ -18,6 +18,7 @@
 #include "pdfbookmarkmanager.h"
 #include "pdfaction.h"
 
+#include <QFile>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonDocument>
diff --git a/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.cpp b/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.cpp
index caa5904..17c1842 100644
--- a/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.cpp
+++ b/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.cpp
@@ -21,7 +21,6 @@
 #include "pdfwidgetutils.h"
 #include "pdfdocumentwriter.h"
 #include "pdfimage.h"
-#include "pdfdbgheap.h"
 #include "pdfexception.h"
 #include "pdfwidgetutils.h"
 #include "pdfimageconversion.h"
@@ -39,6 +38,8 @@
 #include <QMouseEvent>
 #include <QToolTip>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.h b/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.h
index 73e468a..7a8b23a 100644
--- a/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.h
+++ b/Pdf4QtViewer/pdfcreatebitonaldocumentdialog.h
@@ -27,6 +27,7 @@
 
 #include <QDialog>
 #include <QFuture>
+#include <QFutureWatcher>
 
 namespace Ui
 {
diff --git a/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp b/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp
index bd98fba..e3b7bcb 100644
--- a/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp
+++ b/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp
@@ -24,12 +24,13 @@
 #include "pdfutils.h"
 #include "pdfexception.h"
 #include "pdfexecutionpolicy.h"
-#include "pdfdbgheap.h"
 
 #include <QLocale>
 #include <QPageSize>
 #include <QtConcurrent/QtConcurrent>
 
+#include "pdfdbgheap.h"
+
 #include <stack>
 #include <execution>
 
diff --git a/Pdf4QtViewer/pdfdocumentpropertiesdialog.h b/Pdf4QtViewer/pdfdocumentpropertiesdialog.h
index 8600e93..30e7bba 100644
--- a/Pdf4QtViewer/pdfdocumentpropertiesdialog.h
+++ b/Pdf4QtViewer/pdfdocumentpropertiesdialog.h
@@ -23,6 +23,7 @@
 #include <QDialog>
 #include <QFuture>
 #include <QFutureWatcher>
+#include <QDateTime>
 
 class QTreeWidgetItem;
 
diff --git a/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp b/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp
index b5c32c7..d020719 100644
--- a/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp
+++ b/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp
@@ -23,10 +23,11 @@
 #include "pdfwidgetutils.h"
 #include "pdfsecurityhandler.h"
 #include "pdfcertificatemanager.h"
-#include "pdfdbgheap.h"
 
 #include <QMessageBox>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfencryptionstrengthhintwidget.cpp b/Pdf4QtViewer/pdfencryptionstrengthhintwidget.cpp
index 97176da..2950d2a 100644
--- a/Pdf4QtViewer/pdfencryptionstrengthhintwidget.cpp
+++ b/Pdf4QtViewer/pdfencryptionstrengthhintwidget.cpp
@@ -18,11 +18,12 @@
 #include "pdfencryptionstrengthhintwidget.h"
 #include "pdfwidgetutils.h"
 #include "pdfutils.h"
-#include "pdfdbgheap.h"
 
 #include <QPainter>
 #include <QFontMetrics>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp b/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp
index 2a8f625..0bfb839 100644
--- a/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp
+++ b/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp
@@ -20,13 +20,14 @@
 
 #include "pdfwidgetutils.h"
 #include "pdfdocumentwriter.h"
-#include "pdfdbgheap.h"
 
 #include <QCheckBox>
 #include <QPushButton>
 #include <QElapsedTimer>
 #include <QtConcurrent/QtConcurrent>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfprogramcontroller.cpp b/Pdf4QtViewer/pdfprogramcontroller.cpp
index 63a881b..fdd8059 100644
--- a/Pdf4QtViewer/pdfprogramcontroller.cpp
+++ b/Pdf4QtViewer/pdfprogramcontroller.cpp
@@ -25,7 +25,6 @@
 #include "pdfwidgetutils.h"
 #include "pdfconstants.h"
 #include "pdfdocumentbuilder.h"
-#include "pdfdbgheap.h"
 #include "pdfcertificatemanagerdialog.h"
 #include "pdfwidgetutils.h"
 
@@ -58,6 +57,8 @@
 #include <QToolBar>
 #include <QXmlStreamWriter>
 
+#include "pdfdbgheap.h"
+
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
diff --git a/Pdf4QtViewer/pdfrendertoimagesdialog.cpp b/Pdf4QtViewer/pdfrendertoimagesdialog.cpp
index db31229..191acb5 100644
--- a/Pdf4QtViewer/pdfrendertoimagesdialog.cpp
+++ b/Pdf4QtViewer/pdfrendertoimagesdialog.cpp
@@ -22,7 +22,6 @@
 #include "pdfwidgetutils.h"
 #include "pdfoptionalcontent.h"
 #include "pdfdrawspacecontroller.h"
-#include "pdfdbgheap.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
@@ -30,6 +29,8 @@
 #include <QtConcurrent/QtConcurrent>
 #include <QImageWriter>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfsanitizedocumentdialog.cpp b/Pdf4QtViewer/pdfsanitizedocumentdialog.cpp
index 0fa4c6d..6470871 100644
--- a/Pdf4QtViewer/pdfsanitizedocumentdialog.cpp
+++ b/Pdf4QtViewer/pdfsanitizedocumentdialog.cpp
@@ -20,13 +20,14 @@
 
 #include "pdfwidgetutils.h"
 #include "pdfdocumentwriter.h"
-#include "pdfdbgheap.h"
 
 #include <QCheckBox>
 #include <QPushButton>
 #include <QElapsedTimer>
 #include <QtConcurrent/QtConcurrent>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfsendmail.cpp b/Pdf4QtViewer/pdfsendmail.cpp
index a19df2b..3248df5 100644
--- a/Pdf4QtViewer/pdfsendmail.cpp
+++ b/Pdf4QtViewer/pdfsendmail.cpp
@@ -16,12 +16,13 @@
 //    along with PDF4QT.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "pdfsendmail.h"
-#include "pdfdbgheap.h"
 
 #include <QDir>
 #include <QWidget>
 #include <QFileInfo>
 
+#include "pdfdbgheap.h"
+
 #ifdef Q_OS_WIN
 #include <Windows.h>
 #include <MAPI.h>
diff --git a/Pdf4QtViewer/pdfsidebarwidget.cpp b/Pdf4QtViewer/pdfsidebarwidget.cpp
index 45eb3aa..a869410 100644
--- a/Pdf4QtViewer/pdfsidebarwidget.cpp
+++ b/Pdf4QtViewer/pdfsidebarwidget.cpp
@@ -22,7 +22,6 @@
 
 #include "pdfwidgetutils.h"
 #include "pdftexttospeech.h"
-#include "pdfdbgheap.h"
 #include "pdfdrawwidget.h"
 #include "pdfwidgettool.h"
 
@@ -47,6 +46,8 @@
 #include <QDialog>
 #include <QPushButton>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdftexttospeech.cpp b/Pdf4QtViewer/pdftexttospeech.cpp
index 4de40be..788f563 100644
--- a/Pdf4QtViewer/pdftexttospeech.cpp
+++ b/Pdf4QtViewer/pdftexttospeech.cpp
@@ -20,7 +20,6 @@
 #include "pdfdrawspacecontroller.h"
 #include "pdfcompiler.h"
 #include "pdfdrawwidget.h"
-#include "pdfdbgheap.h"
 
 #include <QLabel>
 #include <QAction>
@@ -30,6 +29,8 @@
 #include <QTextBrowser>
 #include <QTextToSpeech>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfviewermainwindow.cpp b/Pdf4QtViewer/pdfviewermainwindow.cpp
index 156c65e..e4fbcc1 100644
--- a/Pdf4QtViewer/pdfviewermainwindow.cpp
+++ b/Pdf4QtViewer/pdfviewermainwindow.cpp
@@ -24,7 +24,6 @@
 #include "pdfviewersettingsdialog.h"
 #include "pdfdocumentpropertiesdialog.h"
 #include "pdfrendertoimagesdialog.h"
-#include "pdfdbgheap.h"
 
 #include "pdfdocumentreader.h"
 #include "pdfvisitor.h"
@@ -67,6 +66,8 @@
 #include <QToolButton>
 #include <QActionGroup>
 
+#include "pdfdbgheap.h"
+
 #ifdef Q_OS_WIN
 #include "Windows.h"
 #endif
diff --git a/Pdf4QtViewer/pdfviewermainwindowlite.cpp b/Pdf4QtViewer/pdfviewermainwindowlite.cpp
index 5528af5..0eb6576 100644
--- a/Pdf4QtViewer/pdfviewermainwindowlite.cpp
+++ b/Pdf4QtViewer/pdfviewermainwindowlite.cpp
@@ -24,7 +24,6 @@
 #include "pdfviewersettingsdialog.h"
 #include "pdfdocumentpropertiesdialog.h"
 #include "pdfrendertoimagesdialog.h"
-#include "pdfdbgheap.h"
 
 #include "pdfdocumentreader.h"
 #include "pdfvisitor.h"
@@ -68,6 +67,8 @@
 #include <QToolButton>
 #include <QActionGroup>
 
+#include "pdfdbgheap.h"
+
 #ifdef Q_OS_WIN
 #include "Windows.h"
 #endif
diff --git a/Pdf4QtViewer/pdfviewersettings.cpp b/Pdf4QtViewer/pdfviewersettings.cpp
index 02ce814..0753014 100644
--- a/Pdf4QtViewer/pdfviewersettings.cpp
+++ b/Pdf4QtViewer/pdfviewersettings.cpp
@@ -17,9 +17,12 @@
 
 #include "pdfviewersettings.h"
 #include "pdfconstants.h"
-#include "pdfdbgheap.h"
 
+#include <QSettings>
 #include <QPixmapCache>
+#include <QStandardPaths>
+
+#include "pdfdbgheap.h"
 
 namespace pdfviewer
 {
diff --git a/Pdf4QtViewer/pdfviewersettings.h b/Pdf4QtViewer/pdfviewersettings.h
index 90e2769..281e103 100644
--- a/Pdf4QtViewer/pdfviewersettings.h
+++ b/Pdf4QtViewer/pdfviewersettings.h
@@ -26,6 +26,8 @@
 
 #include <QObject>
 
+class QSettings;
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewer/pdfviewersettingsdialog.cpp b/Pdf4QtViewer/pdfviewersettingsdialog.cpp
index 24fd6d0..e454019 100644
--- a/Pdf4QtViewer/pdfviewersettingsdialog.cpp
+++ b/Pdf4QtViewer/pdfviewersettingsdialog.cpp
@@ -23,7 +23,6 @@
 #include "pdfwidgetutils.h"
 #include "pdfrecentfilemanager.h"
 #include "pdfcolorconvertor.h"
-#include "pdfdbgheap.h"
 
 #include <QAction>
 #include <QLineEdit>
@@ -34,6 +33,8 @@
 #include <QDomDocument>
 #include <QStyledItemDelegate>
 
+#include "pdfdbgheap.h"
+
 namespace pdfviewer
 {
 
diff --git a/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.h b/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.h
index 9544757..ef62cff 100644
--- a/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.h
+++ b/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.h
@@ -23,6 +23,8 @@
 #include "pdftransparencyrenderer.h"
 
 #include <QDialog>
+#include <QFuture>
+#include <QFutureWatcher>
 #include <QAbstractItemModel>
 
 namespace Ui
diff --git a/Pdf4QtViewerPlugins/RedactPlugin/redactplugin.cpp b/Pdf4QtViewerPlugins/RedactPlugin/redactplugin.cpp
index 7740ab0..f328aea 100644
--- a/Pdf4QtViewerPlugins/RedactPlugin/redactplugin.cpp
+++ b/Pdf4QtViewerPlugins/RedactPlugin/redactplugin.cpp
@@ -27,6 +27,7 @@
 #include "pdfcompiler.h"
 
 #include <QAction>
+#include <QFileInfo>
 #include <QMessageBox>
 
 namespace pdfplugin
diff --git a/Pdf4QtViewerPlugins/SignaturePlugin/signatureplugin.cpp b/Pdf4QtViewerPlugins/SignaturePlugin/signatureplugin.cpp
index 1fb7462..8bd8246 100644
--- a/Pdf4QtViewerPlugins/SignaturePlugin/signatureplugin.cpp
+++ b/Pdf4QtViewerPlugins/SignaturePlugin/signatureplugin.cpp
@@ -25,6 +25,7 @@
 #include "signdialog.h"
 #include "pdfdocumentwriter.h"
 
+#include <QBuffer>
 #include <QAction>
 #include <QToolButton>
 #include <QMainWindow>
diff --git a/Pdf4QtViewerProfi/main.cpp b/Pdf4QtViewerProfi/main.cpp
index 30967a1..69d1250 100644
--- a/Pdf4QtViewerProfi/main.cpp
+++ b/Pdf4QtViewerProfi/main.cpp
@@ -17,11 +17,12 @@
 
 #include "pdfviewermainwindow.h"
 #include "pdfconstants.h"
-#include "pdfdbgheap.h"
 
 #include <QApplication>
 #include <QCommandLineParser>
 
+#include "pdfdbgheap.h"
+
 int main(int argc, char *argv[])
 {
 #if defined(PDF4QT_USE_DBG_HEAP)
diff --git a/PdfTool/pdftoolabstractapplication.cpp b/PdfTool/pdftoolabstractapplication.cpp
index f366125..7733a45 100644
--- a/PdfTool/pdftoolabstractapplication.cpp
+++ b/PdfTool/pdftoolabstractapplication.cpp
@@ -19,6 +19,7 @@
 #include "pdfdocumentreader.h"
 #include "pdfutils.h"
 
+#include <QFileInfo>
 #include <QCommandLineParser>
 
 namespace pdftool
diff --git a/PdfTool/pdftoolattachments.cpp b/PdfTool/pdftoolattachments.cpp
index 53a1e3c..54771fc 100644
--- a/PdfTool/pdftoolattachments.cpp
+++ b/PdfTool/pdftoolattachments.cpp
@@ -18,6 +18,9 @@
 #include "pdftoolattachments.h"
 #include "pdfexception.h"
 
+#include <QFile>
+#include <QMimeDatabase>
+
 namespace pdftool
 {
 
diff --git a/PdfTool/pdftoolcertstore.cpp b/PdfTool/pdftoolcertstore.cpp
index fbe4bca..b001b79 100644
--- a/PdfTool/pdftoolcertstore.cpp
+++ b/PdfTool/pdftoolcertstore.cpp
@@ -1,4 +1,4 @@
-//    Copyright (C) 2020-2021 Jakub Melka
+//    Copyright (C) 2020-2023 Jakub Melka
 //
 //    This file is part of PDF4QT.
 //
@@ -18,6 +18,8 @@
 #include "pdftoolcertstore.h"
 #include "pdfsignaturehandler.h"
 
+#include <QFile>
+
 namespace pdftool
 {
 
diff --git a/PdfTool/pdftoolseparate.cpp b/PdfTool/pdftoolseparate.cpp
index c06596d..ecc82f0 100644
--- a/PdfTool/pdftoolseparate.cpp
+++ b/PdfTool/pdftoolseparate.cpp
@@ -21,6 +21,8 @@
 #include "pdfoptimizer.h"
 #include "pdfdocumentwriter.h"
 
+#include <QFileInfo>
+
 namespace pdftool
 {
 
diff --git a/PdfTool/pdftoolunite.cpp b/PdfTool/pdftoolunite.cpp
index 1a5c2de..fb85e77 100644
--- a/PdfTool/pdftoolunite.cpp
+++ b/PdfTool/pdftoolunite.cpp
@@ -21,6 +21,8 @@
 #include "pdfoptimizer.h"
 #include "pdfdocumentwriter.h"
 
+#include <QFileInfo>
+
 namespace pdftool
 {