diff --git a/src/common/Args.cpp b/src/common/Args.cpp
index 4b552cc9f..2894c3f7b 100644
--- a/src/common/Args.cpp
+++ b/src/common/Args.cpp
@@ -10,6 +10,7 @@
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDebug>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QUuid>
 
diff --git a/src/common/Common.hpp b/src/common/Common.hpp
index eef9d0467..1dded1d26 100644
--- a/src/common/Common.hpp
+++ b/src/common/Common.hpp
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include <boost/optional.hpp>
 #include <boost/preprocessor.hpp>
+#include <memory>
 #include <string>
 
 #include "common/Aliases.hpp"
diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp
index 05392b2d2..9ac753345 100644
--- a/src/widgets/AttachedWindow.cpp
+++ b/src/widgets/AttachedWindow.cpp
@@ -1,13 +1,15 @@
 #include "AttachedWindow.hpp"
 
 #include "Application.hpp"
+#include "ForwardDecl.hpp"
+#include "common/QLogging.hpp"
 #include "singletons/Settings.hpp"
 #include "util/DebugCount.hpp"
 #include "widgets/splits/Split.hpp"
 
 #include <QTimer>
 #include <QVBoxLayout>
-#include "common/QLogging.hpp"
+#include <memory>
 
 #ifdef USEWINSDK
 #    include "util/WindowsHelper.hpp"
diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp
index 186d310fd..26d3333d9 100644
--- a/src/widgets/AttachedWindow.hpp
+++ b/src/widgets/AttachedWindow.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
+#include "ForwardDecl.hpp"
+
 #include <QTimer>
 #include <QWidget>
+#include <memory>
 
 namespace chatterino {
 
diff --git a/src/widgets/dialogs/BadgePickerDialog.hpp b/src/widgets/dialogs/BadgePickerDialog.hpp
index 171f9f2bc..67de7f48a 100644
--- a/src/widgets/dialogs/BadgePickerDialog.hpp
+++ b/src/widgets/dialogs/BadgePickerDialog.hpp
@@ -5,6 +5,7 @@
 #include <QComboBox>
 #include <QDialog>
 #include <boost/optional.hpp>
+#include <memory>
 
 namespace chatterino {
 
diff --git a/src/widgets/listview/GenericListModel.hpp b/src/widgets/listview/GenericListModel.hpp
index 767ff6915..1765dc86e 100644
--- a/src/widgets/listview/GenericListModel.hpp
+++ b/src/widgets/listview/GenericListModel.hpp
@@ -2,6 +2,7 @@
 
 #include <QAbstractListModel>
 #include <QWidget>
+#include <memory>
 
 namespace chatterino {