diff --git a/include/FramelessHelper/Core/private/chromepalette_p.h b/include/FramelessHelper/Core/private/chromepalette_p.h
index d18577a..2db5188 100644
--- a/include/FramelessHelper/Core/private/chromepalette_p.h
+++ b/include/FramelessHelper/Core/private/chromepalette_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <optional>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
diff --git a/include/FramelessHelper/Core/private/framelessmanager_p.h b/include/FramelessHelper/Core/private/framelessmanager_p.h
index 702e5e5..436cfd5 100644
--- a/include/FramelessHelper/Core/private/framelessmanager_p.h
+++ b/include/FramelessHelper/Core/private/framelessmanager_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <optional>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
diff --git a/include/FramelessHelper/Core/private/registrykey_p.h b/include/FramelessHelper/Core/private/registrykey_p.h
index 348bdb4..5adea9e 100644
--- a/include/FramelessHelper/Core/private/registrykey_p.h
+++ b/include/FramelessHelper/Core/private/registrykey_p.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
 #include <QtCore/qvariant.h>
+#include <optional>
 
 #ifndef REGISTRYKEY_FORCE_QSETTINGS
 #  define REGISTRYKEY_FORCE_QSETTINGS (0)
diff --git a/include/FramelessHelper/Core/private/versionnumber_p.h b/include/FramelessHelper/Core/private/versionnumber_p.h
index bcef97c..e688dc5 100644
--- a/include/FramelessHelper/Core/private/versionnumber_p.h
+++ b/include/FramelessHelper/Core/private/versionnumber_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <array>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
diff --git a/include/FramelessHelper/Core/private/windowborderpainter_p.h b/include/FramelessHelper/Core/private/windowborderpainter_p.h
index 128c0c2..f5f0a4f 100644
--- a/include/FramelessHelper/Core/private/windowborderpainter_p.h
+++ b/include/FramelessHelper/Core/private/windowborderpainter_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Core/framelesshelpercore_global.h>
+#include <optional>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
diff --git a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
index d0c8202..825681e 100644
--- a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
+++ b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Quick/framelesshelperquick_global.h>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 class QQuickItem;
diff --git a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
index 8366a67..a6ef6d9 100644
--- a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
+++ b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 class QEnterEvent;
diff --git a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
index 46e6bc5..8bffd0e 100644
--- a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
+++ b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
@@ -26,6 +26,7 @@
 
 #include <FramelessHelper/Widgets/framelesshelperwidgets_global.h>
 #include <QtGui/qfont.h>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 class QPaintEvent;
diff --git a/src/core/framelessconfig.cpp b/src/core/framelessconfig.cpp
index ecb169e..18070d4 100644
--- a/src/core/framelessconfig.cpp
+++ b/src/core/framelessconfig.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "framelessconfig_p.h"
+#include <array>
 #include <QtCore/qdir.h>
 #include <QtCore/qsettings.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/core/framelesshelper_win.cpp b/src/core/framelesshelper_win.cpp
index d1aca95..71ed341 100644
--- a/src/core/framelesshelper_win.cpp
+++ b/src/core/framelesshelper_win.cpp
@@ -30,6 +30,7 @@
 #include "winverhelper_p.h"
 #include "framelesshelper_windows.h"
 #include "framelesshelpercore_global_p.h"
+#include <optional>
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp
index 9b96a5e..f288143 100644
--- a/src/core/micamaterial.cpp
+++ b/src/core/micamaterial.cpp
@@ -28,6 +28,7 @@
 #include "utils.h"
 #include "framelessconfig_p.h"
 #include "framelesshelpercore_global_p.h"
+#include <optional>
 #include <QtCore/qsysinfo.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qmutex.h>
diff --git a/src/core/registrykey.cpp b/src/core/registrykey.cpp
index 6c0317d..6c901e0 100644
--- a/src/core/registrykey.cpp
+++ b/src/core/registrykey.cpp
@@ -24,6 +24,7 @@
 
 #include "registrykey_p.h"
 #include "framelesshelper_windows.h"
+#include <array>
 #include <QtCore/qloggingcategory.h>
 #if REGISTRYKEY_QWINREGISTRYKEY
 #  include <QtCore/private/qwinregistry_p.h>
diff --git a/src/core/utils.cpp b/src/core/utils.cpp
index d232537..8075965 100644
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -27,6 +27,7 @@
 #ifdef Q_OS_WINDOWS
 #  include "winverhelper_p.h"
 #endif // Q_OS_WINDOWS
+#include <array>
 #include <QtCore/qloggingcategory.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>
diff --git a/src/core/utils_win.cpp b/src/core/utils_win.cpp
index ad35ce4..1037c05 100644
--- a/src/core/utils_win.cpp
+++ b/src/core/utils_win.cpp
@@ -32,6 +32,7 @@
 #include "framelesshelpercore_global_p.h"
 #include "versionnumber_p.h"
 #include "scopeguard_p.h"
+#include <optional>
 #include <QtCore/qhash.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtGui/qwindow.h>
diff --git a/src/core/winverhelper.cpp b/src/core/winverhelper.cpp
index 95e7636..5458306 100644
--- a/src/core/winverhelper.cpp
+++ b/src/core/winverhelper.cpp
@@ -24,6 +24,7 @@
 
 #include "winverhelper_p.h"
 #include "utils.h"
+#include <array>
 
 FRAMELESSHELPER_BEGIN_NAMESPACE