diff --git a/cockatrice/src/client/lag_monitor.cpp b/cockatrice/src/client/lag_monitor.cpp
index 383d64644..6b72087ec 100644
--- a/cockatrice/src/client/lag_monitor.cpp
+++ b/cockatrice/src/client/lag_monitor.cpp
@@ -1,7 +1,10 @@
 #include "lag_monitor.h"
 
+#include <QApplication>
 #include <QCoreApplication>
+#include <QDateTime>
 #include <QEvent>
+#include <QMessageLogger>
 #include <QTimer>
 
 LagMonitor::LagMonitor(QObject *parent) : QObject(parent)
diff --git a/cockatrice/src/client/lag_monitor.h b/cockatrice/src/client/lag_monitor.h
index 9fdf6b283..0bb98c25e 100644
--- a/cockatrice/src/client/lag_monitor.h
+++ b/cockatrice/src/client/lag_monitor.h
@@ -6,15 +6,15 @@
 #ifndef LAG_MONITOR_H
 #define LAG_MONITOR_H
 
-#include <QDateTime>
 #include <QElapsedTimer>
 #include <QList>
 #include <QLoggingCategory>
 #include <QObject>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
 
-class QEvent;
 class QTimer;
 
 /**
diff --git a/cockatrice/src/client/latency_graph_widget.cpp b/cockatrice/src/client/latency_graph_widget.cpp
index 46d6ccdd3..72df3ce6c 100644
--- a/cockatrice/src/client/latency_graph_widget.cpp
+++ b/cockatrice/src/client/latency_graph_widget.cpp
@@ -5,7 +5,11 @@
 
 #include "latency_graph_widget.h"
 
+#include <QColor>
 #include <QPainter>
+#include <QRectF>
+#include <QtGlobal>
+#include <qnumeric.h>
 
 LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/client/latency_graph_widget.h b/cockatrice/src/client/latency_graph_widget.h
index 4f6f38f8b..31a7022b2 100644
--- a/cockatrice/src/client/latency_graph_widget.h
+++ b/cockatrice/src/client/latency_graph_widget.h
@@ -8,6 +8,8 @@
 
 #include <QList>
 #include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 /**
  * @brief Bar graph of recent network round-trip samples.
diff --git a/cockatrice/src/client/latency_status_widget.cpp b/cockatrice/src/client/latency_status_widget.cpp
index 779c726eb..940074581 100644
--- a/cockatrice/src/client/latency_status_widget.cpp
+++ b/cockatrice/src/client/latency_status_widget.cpp
@@ -6,11 +6,15 @@
 #include "latency_status_widget.h"
 
 #include "latency_graph_widget.h"
+#include "latency_tracker.h"
 
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QObject>
+#include <QPoint>
 #include <QVBoxLayout>
+#include <qnamespace.h>
 
 LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/client/latency_status_widget.h b/cockatrice/src/client/latency_status_widget.h
index d9e1d130c..24d6fda4d 100644
--- a/cockatrice/src/client/latency_status_widget.h
+++ b/cockatrice/src/client/latency_status_widget.h
@@ -7,8 +7,10 @@
 #define LATENCY_STATUS_WIDGET_H
 
 #include <QList>
+#include <QString>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
+#include <qtmetamacros.h>
 
 class QLabel;
 class LatencyGraphWidget;
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
index c1598bd25..7480da27e 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
@@ -8,14 +8,25 @@
 #include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
 #include "../interface/widgets/dialogs/dlg_register.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
+#include "libcockatrice/protocol/pb/event_connection_closed.pb.h"
+#include "libcockatrice/protocol/pb/event_server_shutdown.pb.h"
 
+#include <QChar>
 #include <QDateTime>
+#include <QDebug>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
+#include <QPixmap>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QThread>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/settings/servers_settings.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
     : QObject(parent), dialogParent(dialogParent)
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
index bae99a3e0..d4a832c75 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
@@ -2,17 +2,22 @@
 #define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
 
 #include "abstract_client.h"
+#include "latency_tracker.h"
 
 #include <QMessageBox>
 #include <QObject>
 #include <QString>
-#include <QThread>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class RemoteClient;
 class ServerInfo_User;
 class DlgConnect;
+class Event_ConnectionClosed;
+class Event_ServerShutdown;
+class QThread;
+class QWidget;
+template <typename T> class QList;
 
 /**
  * Owns the RemoteClient and its worker thread.
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
index 42292b2aa..d5cfdbbc9 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@@ -1,11 +1,22 @@
 #include "deck_stats_interface.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+
+#include <QByteArray>
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QString>
+#include <QUrl>
 #include <QUrlQuery>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
index 09bf998de..e7791075c 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -7,7 +7,8 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QObject>
+#include <qtmetamacros.h>
 
 class QByteArray;
 class QNetworkAccessManager;
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
index 627b7fe34..30044c2b6 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@@ -1,11 +1,28 @@
 #include "tapped_out_interface.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+
+#include <QByteArray>
+#include <QDebug>
 #include <QDesktopServices>
+#include <QList>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
 #include <QUrlQuery>
+#include <QVariant>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
index 32f9369d5..615991b07 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -9,6 +9,7 @@
 
 #include <QLoggingCategory>
 #include <QObject>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
index 010b63684..7127b0a29 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
@@ -1,6 +1,7 @@
 #include "deck_link_to_api_transformer.h"
 
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
 namespace DeckLinkToApiTransformer
 {
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
index dae633717..ae5e92d6c 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
@@ -1,21 +1,35 @@
 #include "spoiler_background_updater.h"
 
-#include "../../../../interface/window_main.h"
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
 
+#include <QChar>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
+#include <QDir>
 #include <QFile>
+#include <QFileInfo>
+#include <QIODevice>
+#include <QList>
 #include <QLocale>
+#include <QMessageLogger>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QSharedPointer>
+#include <QSystemTrayIcon>
+#include <QTimeZone>
 #include <QUrl>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
+#include <QtGlobal>
+#include <functional>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <tuple>
+#include <utility>
 #include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
index 03d4897a2..a6c4ed00f 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
@@ -10,7 +10,11 @@
 #include <QByteArray>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QProcess>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QProcess;
+class QUrl;
 
 inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
 
diff --git a/cockatrice/src/client/network/update/client/client_update_checker.h b/cockatrice/src/client/network/update/client/client_update_checker.h
index 1a89de533..16cbd0369 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.h
+++ b/cockatrice/src/client/network/update/client/client_update_checker.h
@@ -6,9 +6,12 @@
 
 #ifndef CLIENT_UPDATE_CHECKER_H
 #define CLIENT_UPDATE_CHECKER_H
-#include <QObject>
+#include "release_channel.h"
 
-class Release;
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 /**
  * We use a singleton instance of UpdateChannel, which can cause interference and feedback loops when multiple objects
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp
index f401dfd00..45c503623 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -2,15 +2,27 @@
 
 #include "version_string.h"
 
+#include <QByteArray>
+#include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QMessageBox>
+#include <QJsonParseError>
+#include <QJsonValue>
+#include <QMap>
+#include <QMessageLogger>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QSysInfo>
+#include <QRegularExpressionMatch>
+#include <QUrl>
+#include <QVariant>
+#include <QVariantMap>
 #include <QtGlobal>
 #include <optional>
+#include <qnamespace.h>
+#include <qprocessordetection.h>
 
 #if defined(Q_OS_MACOS)
 #include <sys/sysctl.h>
diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h
index e038cb2f4..183a766ab 100644
--- a/cockatrice/src/client/network/update/client/release_channel.h
+++ b/cockatrice/src/client/network/update/client/release_channel.h
@@ -11,8 +11,9 @@
 #include <QLoggingCategory>
 #include <QObject>
 #include <QString>
-#include <QVariantMap>
+#include <QVariantList>
 #include <optional>
+#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp
index a71bcf8f8..c86972d60 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/network/update/client/update_downloader.cpp
@@ -1,6 +1,14 @@
 #include "update_downloader.h"
 
+#include <QByteArray>
+#include <QChar>
+#include <QDir>
+#include <QFile>
+#include <QIODevice>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
 #include <QUrl>
+#include <QVariant>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)
 {
diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h
index 9a0caccbc..8aeefb22a 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/network/update/client/update_downloader.h
@@ -7,8 +7,14 @@
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
+#include <QNetworkReply>
 #include <QObject>
-#include <QtNetwork>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QNetworkAccessManager;
 
 class UpdateDownloader : public QObject
 {
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 0f8693f2d..15a41e7e1 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -2,15 +2,20 @@
 
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
+#include "libcockatrice/interfaces/interface_card_database_path_provider.h"
 #include "shortcuts_settings.h"
-#include "version_string.h"
 
+#include <QApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QGlobalStatic>
+#include <QMessageLogger>
 #include <QSettings>
+#include <QSharedPointer>
 #include <QStandardPaths>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/card_database_settings.h>
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index 7a90d82f1..5f699247d 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -7,11 +7,13 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
+#include <QList>
 #include <QLoggingCategory>
+#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
index d4030c174..4bdd581b5 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/client/settings/card_counter_settings.cpp
@@ -1,8 +1,15 @@
 #include "card_counter_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QChar>
 #include <QColor>
 #include <QSettings>
+#include <QVariant>
 #include <QtMath>
+#include <iterator>
+
+class QObject;
 
 CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent)
     : SettingsManager(settingsPath + "card_counters.ini", "cards", "counters", parent)
diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h
index 2ac658177..e5ca0a9bb 100644
--- a/cockatrice/src/client/settings/card_counter_settings.h
+++ b/cockatrice/src/client/settings/card_counter_settings.h
@@ -7,10 +7,12 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
+#include <QString>
 #include <libcockatrice/settings/settings_manager.h>
+#include <qtmetamacros.h>
 
-class QSettings;
 class QColor;
+class QObject;
 
 class CardCounterSettings : public SettingsManager
 {
diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp
index b909d47ac..4a5bafb01 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/client/settings/shortcut_treeview.cpp
@@ -3,7 +3,24 @@
 #include "cache_settings.h"
 #include "shortcuts_settings.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QFont>
+#include <QHash>
 #include <QHeaderView>
+#include <QList>
+#include <QModelIndex>
+#include <QRegularExpression>
+#include <QSharedPointer>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QStringList>
+#include <QVariant>
+#include <algorithm>
+#include <qnamespace.h>
+
+class QObject;
+class QWidget;
 
 ShortcutFilterProxyModel::ShortcutFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {
diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h
index afaf7e7ed..53f3fa0ef 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.h
+++ b/cockatrice/src/client/settings/shortcut_treeview.h
@@ -8,8 +8,13 @@
 #define SHORTCUT_TREEVIEW_H
 
 #include <QSortFilterProxyModel>
-#include <QStandardItemModel>
+#include <QString>
 #include <QTreeView>
+#include <qtmetamacros.h>
+
+class QObject;
+class QStandardItemModel;
+class QWidget;
 
 /**
  * Custom implementation of QSortFilterProxyModel that appends the source and parent strings together when filtering
diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp
index 2ff65ab6f..ffb4afcac 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.cpp
+++ b/cockatrice/src/client/settings/shortcuts_settings.cpp
@@ -2,9 +2,13 @@
 
 #include <QDebug>
 #include <QFile>
+#include <QMap>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QSettings>
+#include <QSharedPointer>
 #include <QStringList>
-#include <utility>
+#include <QVariant>
 
 ShortcutKey::ShortcutKey(const QString &_name, QList<QKeySequence> _sequence, ShortcutGroup::Groups _group)
     : QList<QKeySequence>(_sequence), name(_name), group(_group)
diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h
index f4ebc204e..24790a407 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@@ -8,9 +8,18 @@
 #define SHORTCUTSSETTINGS_H
 
 #include <QApplication>
+#include <QByteArray>
+#include <QChar>
+#include <QHash>
 #include <QKeySequence>
+#include <QList>
 #include <QLoggingCategory>
-#include <QSettings>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings");
 
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index 96cafa3d3..4ac142cf4 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -4,8 +4,15 @@
 
 #include <QApplication>
 #include <QAudioOutput>
+#include <QDebug>
 #include <QDir>
+#include <QFile>
+#include <QList>
 #include <QMediaPlayer>
+#include <QMessageLogger>
+#include <QStringList>
+#include <QUrl>
+#include <QtGlobal>
 #include <libcockatrice/settings/sound_settings.h>
 
 #define DEFAULT_THEME_NAME "Default"
diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h
index 0c201523a..8167c71b5 100644
--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -7,17 +7,17 @@
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
-#include <QAudioOutput>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QMediaPlayer>
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
+
+class QAudioOutput;
+class QMediaPlayer;
 
 inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
 
-class QBuffer;
-
 typedef QMap<QString, QString> QStringMap;
 
 class SoundEngine : public QObject
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index a2b7519a8..616311750 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,9 +1,27 @@
 #include "deck_filter_string.h"
 
+#include "../interface/deck_loader/loaded_deck.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+
+#include <QByteArray>
+#include <QDebug>
 #include <QFileInfo>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <algorithm>
+#include <any>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
+#include <mutex>
+#include <qnamespace.h>
+#include <stddef.h>
+#include <string>
+#include <vector>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 5b1419004..76b891b59 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -7,13 +7,14 @@
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
-#include "../interface/deck_loader/loaded_deck.h"
-
 #include <QLoggingCategory>
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
 
+struct CardSearchLanguage;
+struct LoadedDeck;
+
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
 /**
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index f109fbcd3..6cc893224 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -5,8 +5,15 @@
 
 #include <QComboBox>
 #include <QGridLayout>
+#include <QIcon>
 #include <QPushButton>
+#include <QSizePolicy>
+#include <QString>
+#include <QStringLiteral>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/filters/filter_card.h>
+#include <stddef.h>
 
 FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h
index 98fe3fd02..2aa38c992 100644
--- a/cockatrice/src/filters/filter_builder.h
+++ b/cockatrice/src/filters/filter_builder.h
@@ -8,8 +8,8 @@
 #define FILTERBUILDER_H
 
 #include <QWidget>
+#include <qtmetamacros.h>
 
-class QCheckBox;
 class QComboBox;
 class LineEditUnfocusable;
 class CardFilter;
diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp
index 33b54530e..b3bf307f1 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -1,8 +1,15 @@
 #include "filter_tree_model.h"
 
+#include <QFlags>
 #include <QFont>
+#include <QString>
+#include <QVariant>
+#include <functional>
 #include <libcockatrice/filters/filter_card.h>
 #include <libcockatrice/filters/filter_tree.h>
+#include <stddef.h>
+
+class QObject;
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {
diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h
index 7452f7a61..826fcc941 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -8,11 +8,15 @@
 #define FILTERTREEMODEL_H
 
 #include <QAbstractItemModel>
+#include <QList>
+#include <QModelIndex>
 #include <libcockatrice/filters/filter_card.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class FilterTree;
-class CardFilter;
 class FilterTreeNode;
+class QObject;
 
 class FilterTreeModel : public QAbstractItemModel
 {
diff --git a/cockatrice/src/filters/syntax_help.cpp b/cockatrice/src/filters/syntax_help.cpp
index fa5338a41..baf5764d0 100644
--- a/cockatrice/src/filters/syntax_help.cpp
+++ b/cockatrice/src/filters/syntax_help.cpp
@@ -1,8 +1,21 @@
 #include "syntax_help.h"
 
+#include <QDebug>
 #include <QFile>
+#include <QFlags>
+#include <QIODevice>
+#include <QLineEdit>
+#include <QMessageLogger>
+#include <QObject>
 #include <QRegularExpression>
+#include <QSharedPointer>
+#include <QSize>
+#include <QString>
+#include <QTextBrowser>
+#include <QTextDocument>
 #include <QTextStream>
+#include <QUrl>
+#include <qnamespace.h>
 
 /**
  * Creates the card search syntax help window
diff --git a/cockatrice/src/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h
index d06fe03e5..52c878691 100644
--- a/cockatrice/src/filters/syntax_help.h
+++ b/cockatrice/src/filters/syntax_help.h
@@ -8,9 +8,10 @@
 #ifndef SEARCH_SYNTAX_HELP_H
 #define SEARCH_SYNTAX_HELP_H
 
-#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QTextBrowser>
+
+class QLineEdit;
+class QTextBrowser;
 
 inline Q_LOGGING_CATEGORY(SyntaxHelpLog, "syntax_help");
 
diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp
index 6aa2ab28f..efc575eff 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/cockatrice/src/game/abstract_game.cpp
@@ -1,7 +1,18 @@
 #include "abstract_game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "game_event_handler.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "libcockatrice/protocol/pb/game_replay.pb.h"
+#include "player/player_info.h"
 #include "player/player_logic.h"
+#include "player/player_manager.h"
+#include "zones/card_zone_logic.h"
+
+#include <QList>
+#include <QMap>
+
+class AbstractClient;
 
 AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {
diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index fcf764492..326af8ac9 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -7,15 +7,18 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
-#include "game_event_handler.h"
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "player/player_manager.h"
-
 #include <QObject>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class CardItem;
+class AbstractClient;
+class GameEventHandler;
+class GameMetaInfo;
+class GameReplay;
+class GameState;
+class PlayerManager;
+
 class AbstractGame : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
index 286764b3b..c05134a75 100644
--- a/cockatrice/src/game/arrow_registry.cpp
+++ b/cockatrice/src/game/arrow_registry.cpp
@@ -1,6 +1,9 @@
 #include "arrow_registry.h"
 
 #include "../game_graphics/board/arrow_item.h"
+#include "board/arrow_data.h"
+
+#include <QSharedPointer>
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {
diff --git a/cockatrice/src/game/arrow_registry.h b/cockatrice/src/game/arrow_registry.h
index ef98229a2..ca3b04090 100644
--- a/cockatrice/src/game/arrow_registry.h
+++ b/cockatrice/src/game/arrow_registry.h
@@ -1,13 +1,13 @@
 #ifndef COCKATRICE_ARROW_REGISTRY_H
 #define COCKATRICE_ARROW_REGISTRY_H
 
-#include "board/arrow_data.h"
-
+#include <QList>
 #include <QMap>
 #include <QSet>
-#include <QSharedPointer>
 
 class ArrowItem;
+struct ArrowData;
+template <class T> class QSharedPointer;
 
 struct ArrowKey
 {
diff --git a/cockatrice/src/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp
index 9e89deed0..d5accd16e 100644
--- a/cockatrice/src/game/board/arrow_data.cpp
+++ b/cockatrice/src/game/board/arrow_data.cpp
@@ -1,5 +1,8 @@
 #include "arrow_data.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_arrow.pb.h"
+#include "libcockatrice/utility/color.h"
+
 ArrowData ArrowData::fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator)
 {
     ArrowData data;
diff --git a/cockatrice/src/game/board/arrow_data.h b/cockatrice/src/game/board/arrow_data.h
index 2752f97e3..00217512f 100644
--- a/cockatrice/src/game/board/arrow_data.h
+++ b/cockatrice/src/game/board/arrow_data.h
@@ -3,8 +3,8 @@
 
 #include <QColor>
 #include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
-#include <libcockatrice/utility/color.h>
+
+class ServerInfo_Arrow;
 
 struct ArrowData
 {
diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index 0080b5ae6..94bae67cd 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,9 +1,14 @@
 #include "card_list.h"
 
 #include "../../game_graphics/board/card_item.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
+#include <QChar>
 #include <QDebug>
+#include <QMessageLogger>
+#include <QSharedPointer>
 #include <algorithm>
+#include <compare>
 #include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
diff --git a/cockatrice/src/game/board/card_list.h b/cockatrice/src/game/board/card_list.h
index 85a6848b7..b5427df0d 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/cockatrice/src/game/board/card_list.h
@@ -9,6 +9,8 @@
 
 #include <QList>
 #include <QLoggingCategory>
+#include <QString>
+#include <functional>
 
 inline Q_LOGGING_CATEGORY(CardListLog, "card_list");
 
diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp
index 4319400d7..3f879a849 100644
--- a/cockatrice/src/game/board/card_state.cpp
+++ b/cockatrice/src/game/board/card_state.cpp
@@ -1,5 +1,7 @@
 #include "card_state.h"
 
+#include <QSharedPointer>
+
 void CardState::resetState(bool keepAnnotations)
 {
     attacking = false;
diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h
index 0498b1aa2..ca7aaf927 100644
--- a/cockatrice/src/game/board/card_state.h
+++ b/cockatrice/src/game/board/card_state.h
@@ -3,9 +3,12 @@
 
 #include <QMap>
 #include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class CardZoneLogic;
 class CardItem;
+
 class CardState : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp
index 0970e4272..5d8c73d5b 100644
--- a/cockatrice/src/game/board/counter_state.cpp
+++ b/cockatrice/src/game/board/counter_state.cpp
@@ -1,5 +1,7 @@
 #include "counter_state.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
+
 #include <libcockatrice/utility/color.h>
 
 CounterState::CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent)
diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h
index 4c7b34473..8badc6217 100644
--- a/cockatrice/src/game/board/counter_state.h
+++ b/cockatrice/src/game/board/counter_state.h
@@ -4,7 +4,9 @@
 #include <QColor>
 #include <QObject>
 #include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
+#include <qtmetamacros.h>
+
+class ServerInfo_Counter;
 
 class CounterState : public QObject
 {
diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp
index 4c8b109c2..7343d052a 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -1,9 +1,17 @@
 #include "game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
 
+#include <QList>
+#include <QMap>
+#include <QString>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
+class AbstractClient;
+class QObject;
+
 Game::Game(QObject *_parent,
            bool isLocalGame,
            QList<AbstractClient *> &_clients,
diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h
index 4f912664c..6a309cfb2 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -9,7 +9,14 @@
 
 #include "abstract_game.h"
 
-#include <QObject>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class Event_GameJoined;
+class QObject;
+class QString;
+template <class Key, class T> class QMap;
+template <typename T> class QList;
 
 class Game : public AbstractGame
 {
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index f146cdbb4..b86f661bb 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,9 +1,30 @@
 #include "game_event_handler.h"
 
-#include "../game_graphics/log/message_log_widget.h"
-#include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/game_commands.pb.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_player.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "player/player_event_handler.h"
+#include "player/player_info.h"
+#include "player/player_logic.h"
+#include "player/player_manager.h"
 
+#include <QList>
+#include <QMap>
+#include <QMapIterator>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
@@ -13,7 +34,6 @@
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
@@ -28,6 +48,8 @@
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_event_container.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <string>
+#include <utility>
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {
diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h
index 99277abb7..30021d295 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/cockatrice/src/game/game_event_handler.h
@@ -19,23 +19,29 @@
 
 #include <QLoggingCategory>
 #include <QObject>
+#include <QPair>
+#include <QString>
+#include <QVector>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
+#include <qtmetamacros.h>
+
+// IWYU pragma: keep
+// GameEventContext, ServerInfo_Player and ServerInfo_User are passed by value
+// to signals and slots, so the moc-generated code needs the complete types.
+#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class AbstractGame;
-class CommandContainer;
-class GameCommand;
 class GameEventContainer;
 class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
 class Response;
-
 class Event_GameStateChanged;
 class Event_PlayerPropertiesChanged;
 class Event_Join;
-class Event_Leave;
 class Event_GameHostChanged;
 class Event_GameClosed;
 class Event_SetActivePlayer;
@@ -44,6 +50,15 @@ class Event_GameSay;
 class Event_Kicked;
 class Event_ReverseTurn;
 class Event_Ping;
+class ServerInfo_PlayerProperties;
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler");
 
diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h
index cdba1605f..ef8f0c08e 100644
--- a/cockatrice/src/game/game_meta_info.h
+++ b/cockatrice/src/game/game_meta_info.h
@@ -9,13 +9,16 @@
 
 #include <QMap>
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <qtmetamacros.h>
 
 // Translation layer class to expose protobuf safely and hook it up to Qt Signals.
 // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.
 // If the network object changes, only this class needs to be adjusted.
 
 class AbstractGame;
+
 class GameMetaInfo : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/game_state.cpp b/cockatrice/src/game/game_state.cpp
index dc9ba02a3..e3bbbec00 100644
--- a/cockatrice/src/game/game_state.cpp
+++ b/cockatrice/src/game/game_state.cpp
@@ -2,6 +2,11 @@
 
 #include "abstract_game.h"
 
+#include <QChar>
+#include <QTimer>
+
+class AbstractClient;
+
 GameState::GameState(AbstractGame *parent,
                      int _secondsElapsed,
                      int _hostId,
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 94bbb853c..55784fb91 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -7,12 +7,14 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include <QTimer>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractGame;
-class ServerInfo_PlayerProperties;
-class ServerInfo_User;
+class AbstractClient;
+class QTimer;
 
 class GameState : public QObject
 {
diff --git a/cockatrice/src/game/phase.cpp b/cockatrice/src/game/phase.cpp
index 7fb1700a5..f56228279 100644
--- a/cockatrice/src/game/phase.cpp
+++ b/cockatrice/src/game/phase.cpp
@@ -1,5 +1,10 @@
 #include "phase.h"
 
+#include <QByteArray>
+#include <QList>
+#include <QSharedPointer>
+#include <QtGlobal>
+
 Phase::Phase(const QString &_name, const QString &_color, const QString &_soundFileName)
     : name(_name), color(_color), soundFileName(_soundFileName)
 {
diff --git a/cockatrice/src/game/phase.h b/cockatrice/src/game/phase.h
index a888ad43b..b4eaa6e46 100644
--- a/cockatrice/src/game/phase.h
+++ b/cockatrice/src/game/phase.h
@@ -7,8 +7,9 @@
 #ifndef PHASE_H
 #define PHASE_H
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QString>
+#include <QVector>
 
 class Phase
 {
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 67c3295d6..35682ede8 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,14 +1,54 @@
 #include "player_actions.h"
 
+#include "../../client/settings/cache_settings.h"
+#include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
-#include "../../game_graphics/dialogs/dlg_roll_dice.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
-#include "../../game_graphics/zones/hand_zone.h"
 #include "../../game_graphics/zones/table_zone.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/utility/get_text_with_max.h"
+#include "../../interface/deck_loader/loaded_deck.h"
+#include "../abstract_game.h"
+#include "../board/counter_state.h"
+#include "../game_event_handler.h"
+#include "../zones/card_zone_logic.h"
+#include "../zones/hand_zone_logic.h"
+#include "../zones/pile_zone_logic.h"
+#include "../zones/table_zone_logic.h"
 #include "../zones/view_zone_logic.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/relation/card_relation_type.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/filters/filter_string.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
+#include "libcockatrice/protocol/pb/game_commands.pb.h"
+#include "libcockatrice/settings/cards_display_settings.h"
+#include "player_info.h"
+#include "player_logic.h"
 
+#include <QAction>
+#include <QChar>
+#include <QColor>
+#include <QFlags>
+#include <QInputDialog>
+#include <QKeyEvent>
+#include <QList>
+#include <QMap>
+#include <QMapIterator>
+#include <QMetaType>
+#include <QPoint>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QVariant>
+#include <QVariantList>
+#include <QtGlobal>
+#include <algorithm>
+#include <functional>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
@@ -26,13 +66,16 @@
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/expression.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <memory>
+#include <qnamespace.h>
+#include <qnumeric.h>
+#include <string>
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index fa4d54110..8fff81635 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -8,17 +8,25 @@
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
 
-#include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/board/card_item.h" // IWYU pragma: keep - moc instantiates the metatype for QList<CardItem *>, which Qt 6.4 needs complete
 #include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
-#include "event_processing_options.h"
-#include "player_logic.h"
+#include "../board/card_list.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QMenu>
 #include <QObject>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/filters/filter_string.h>
+#include <qtmetamacros.h>
+
+class CardItem;
+class CardRelation;
+class QAction;
+class QTimer;
+template <typename T> class QList;
 
 namespace google
 {
@@ -29,9 +37,9 @@ class Message;
 } // namespace google
 
 class Command_MoveCard;
-class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
+
 class PlayerActions : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index 277b8b1d4..18f6573df 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,15 +1,32 @@
 #include "player_event_handler.h"
 
-#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../abstract_game.h"
 #include "../board/arrow_data.h"
 #include "../board/card_list.h"
+#include "../board/counter_state.h"
+#include "../zones/card_zone_logic.h"
+#include "../zones/hand_zone_logic.h"
+#include "../zones/pile_zone_logic.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "player_actions.h"
+#include "player_info.h"
 #include "player_logic.h"
+#include "player_manager.h"
 
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <QDebug>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
 #include <libcockatrice/protocol/pb/event_attach_card.pb.h>
@@ -32,8 +49,9 @@
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
-#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <qlogging.h>
+#include <string>
 
 PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player)
 {
diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h
index 300cacd08..88254119b 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -22,14 +22,14 @@
 #include "event_processing_options.h"
 
 #include <QObject>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <QString>
 #include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <libcockatrice/protocol/pb/game_event_context.pb.h>
+#include <qtmetamacros.h>
+#include <sys/types.h>
 
 class CardItem;
 class CardZoneLogic;
 class PlayerLogic;
-
 class Event_AttachCard;
 class Event_ChangeZoneProperties;
 class Event_CreateArrow;
@@ -50,6 +50,9 @@ class Event_SetCardCounter;
 class Event_SetCounter;
 class Event_Shuffle;
 class Event_GameLogNotice;
+class GameEventContext;
+enum CardAttribute : int;
+template <typename T> class QList;
 
 /**
  * @class PlayerEventHandler
diff --git a/cockatrice/src/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp
index c4debde0f..aef0d82aa 100644
--- a/cockatrice/src/game/player/player_info.cpp
+++ b/cockatrice/src/game/player/player_info.cpp
@@ -1,5 +1,7 @@
 #include "player_info.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 PlayerInfo::PlayerInfo(const ServerInfo_User &info, int _id, bool _local, bool _judge)
     : id(_id), local(_local), judge(_judge)
 {
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index 4ec39edbd..58e877f8e 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -7,10 +7,10 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "../../game_graphics/player/player_target.h"
-
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qtmetamacros.h>
 
 class PlayerInfo : public QObject
 {
diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp
index 143df5c57..b545b7088 100644
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/cockatrice/src/game/player/player_logic.cpp
@@ -1,33 +1,37 @@
 #include "player_logic.h"
 
-#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/board/counter_general.h"
-#include "../../game_graphics/game_scene.h"
-#include "../../game_graphics/player/player_target.h"
-#include "../../game_graphics/zones/hand_zone.h"
-#include "../../game_graphics/zones/pile_zone.h"
-#include "../../game_graphics/zones/stack_zone.h"
-#include "../../game_graphics/zones/table_zone.h"
-#include "../../interface/theme_manager.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/card_list.h"
+#include "../abstract_game.h"
+#include "../board/arrow_data.h"
+#include "../board/counter_state.h"
+#include "../game_meta_info.h"
+#include "../zones/hand_zone_logic.h"
+#include "../zones/pile_zone_logic.h"
+#include "../zones/stack_zone_logic.h"
+#include "../zones/table_zone_logic.h"
+#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/utility/zone_names.h"
 #include "player_actions.h"
+#include "player_event_handler.h"
+#include "player_info.h"
+#include "player_manager.h"
 
 #include <QDebug>
-#include <QMenu>
-#include <QMetaType>
-#include <QPainter>
-#include <QtConcurrent>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
+#include <QMapIterator>
+#include <QMessageLogger>
+#include <QMutableMapIterator>
+#include <QSet>
+#include <QSharedPointer>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
+#include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/color.h>
+#include <qalgorithms.h>
+#include <string>
 
 PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
index 6923b3afe..59da7cc32 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@@ -7,57 +7,48 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../../game_graphics/player/player_area.h"
-#include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../board/arrow_data.h"
-#include "../interface/deck_loader/loaded_deck.h"
+#include "../zones/card_zone_logic.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
 #include "../zones/stack_zone_logic.h"
 #include "../zones/table_zone_logic.h"
-#include "player_event_handler.h"
-#include "player_info.h"
-#include "player_manager.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 
+#include <QColor>
 #include <QInputDialog>
+#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QTimer>
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/game_event.pb.h>
+#include <QObject>
+#include <QString>
 #include <libcockatrice/utility/zone_names.h>
+#include <qtmetamacros.h>
+
+// IWYU pragma: keep
+// ServerInfo_Card appears inside QList<...> in signal and slot
+// signatures, which the moc-generated code needs to be complete.
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+
+class CardItem;
+class CounterState;
+class QWidget;
+class ServerInfo_PlayerProperties;
+struct ArrowData;
+struct LoadedDeck;
+template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
-
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-} // namespace google
 class AbstractCardItem;
 class AbstractGame;
-class ArrowItem;
-class ArrowTarget;
-class CardDatabase;
-class CardZone;
-class CommandContainer;
-class GameCommand;
-class GameEvent;
 class PlayerInfo;
 class PlayerEventHandler;
 class PlayerActions;
-class PlayerMenu;
-class QAction;
-class QMenu;
-class ServerInfo_Arrow;
 class ServerInfo_Card;
 class ServerInfo_Counter;
 class ServerInfo_Player;
 class ServerInfo_User;
-class TabGame;
 
 const int MAX_TOKENS_PER_DIALOG = 99;
 
diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp
index 8486efbeb..4730805ad 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@@ -1,8 +1,14 @@
 #include "player_manager.h"
 
 #include "../abstract_game.h"
+#include "../game_state.h"
+#include "player_info.h"
 #include "player_logic.h"
 
+#include <QList>
+#include <QMapIterator>
+#include <QSharedPointer>
+
 PlayerManager::PlayerManager(AbstractGame *_game,
                              int _localPlayerId,
                              bool _localPlayerIsJudge,
diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h
index 504e65396..7a9f7645b 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@@ -7,12 +7,17 @@
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
 
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 #include <QMap>
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
+#include <qtmetamacros.h>
 
 class AbstractGame;
 class PlayerLogic;
+
 class PlayerManager : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index dcf3e9b9b..4ab4a6321 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -1,6 +1,13 @@
 #include "replay.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
+
+#include <QList>
+
+class GameReplay;
+class QObject;
 
 Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
 {
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
index 1c269b273..cc995dbac 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -10,6 +10,11 @@
 
 #include "abstract_game.h"
 
+#include <qtmetamacros.h>
+
+class GameReplay;
+class QObject;
+
 class Replay : public AbstractGame
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp
index 7e0585f4e..d997ab9ad 100644
--- a/cockatrice/src/game/zones/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/card_zone_logic.cpp
@@ -1,16 +1,25 @@
 #include "card_zone_logic.h"
 
+#include "../../client/translation.h"
 #include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/zones/card_zone.h"
 #include "../../game_graphics/zones/view_zone.h"
+#include "../board/card_list.h"
 #include "../player/player_actions.h"
+#include "../player/player_info.h"
 #include "../player/player_logic.h"
+#include "libcockatrice/card/database/card_database.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
 #include <QDebug>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <string>
 
 /**
  * @param _player the player that the zone belongs to
diff --git a/cockatrice/src/game/zones/card_zone_logic.h b/cockatrice/src/game/zones/card_zone_logic.h
index ae97719a9..2e232b258 100644
--- a/cockatrice/src/game/zones/card_zone_logic.h
+++ b/cockatrice/src/game/zones/card_zone_logic.h
@@ -10,17 +10,18 @@
 #include "../../client/translation.h"
 #include "../board/card_list.h"
 
+#include <QList>
 #include <QLoggingCategory>
 #include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class CardItem;
 
 inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
 
 class PlayerLogic;
 class ZoneViewZone;
-class QMenu;
-class QAction;
-class QPainter;
-class CardDragItem;
 
 class CardZoneLogic : public QObject
 {
diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp
index 3bdd15902..cea17d031 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/hand_zone_logic.cpp
@@ -3,6 +3,9 @@
 #include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
+class PlayerLogic;
+class QObject;
+
 HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,
diff --git a/cockatrice/src/game/zones/hand_zone_logic.h b/cockatrice/src/game/zones/hand_zone_logic.h
index 400506248..c7d63bc0d 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.h
+++ b/cockatrice/src/game/zones/hand_zone_logic.h
@@ -8,6 +8,12 @@
 #define COCKATRICE_HAND_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class HandZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp
index 0f374fb84..40af25cc5 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.cpp
+++ b/cockatrice/src/game/zones/pile_zone_logic.cpp
@@ -1,6 +1,10 @@
 #include "pile_zone_logic.h"
 
 #include "../../game_graphics/board/card_item.h"
+#include "../board/card_list.h"
+
+class PlayerLogic;
+class QObject;
 
 PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,
diff --git a/cockatrice/src/game/zones/pile_zone_logic.h b/cockatrice/src/game/zones/pile_zone_logic.h
index 522d99b89..ed6841b75 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.h
+++ b/cockatrice/src/game/zones/pile_zone_logic.h
@@ -8,6 +8,12 @@
 #define COCKATRICE_PILE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class PileZoneLogic : public CardZoneLogic
 {
 
diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp
index 341d4b0e4..454274971 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/stack_zone_logic.cpp
@@ -3,6 +3,9 @@
 #include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
+class PlayerLogic;
+class QObject;
+
 StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
                                const QString &_name,
                                bool _hasCardAttr,
diff --git a/cockatrice/src/game/zones/stack_zone_logic.h b/cockatrice/src/game/zones/stack_zone_logic.h
index cce4bd0fa..657d44ecf 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.h
+++ b/cockatrice/src/game/zones/stack_zone_logic.h
@@ -8,6 +8,12 @@
 #define COCKATRICE_STACK_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class StackZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp
index a4f033819..07e4a759b 100644
--- a/cockatrice/src/game/zones/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/table_zone_logic.cpp
@@ -1,6 +1,13 @@
 #include "table_zone_logic.h"
 
 #include "../../game_graphics/board/card_item.h"
+#include "../board/card_list.h"
+#include "libcockatrice/card/card_info.h"
+
+#include <QPoint>
+
+class PlayerLogic;
+class QObject;
 
 TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
                                const QString &_name,
diff --git a/cockatrice/src/game/zones/table_zone_logic.h b/cockatrice/src/game/zones/table_zone_logic.h
index 6d8d64a20..8078bfd05 100644
--- a/cockatrice/src/game/zones/table_zone_logic.h
+++ b/cockatrice/src/game/zones/table_zone_logic.h
@@ -8,6 +8,12 @@
 #define COCKATRICE_TABLE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class TableZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp
index de00581d1..eb3b7715f 100644
--- a/cockatrice/src/game/zones/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/view_zone_logic.cpp
@@ -2,8 +2,14 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game_graphics/board/card_item.h"
+#include "../board/card_list.h"
 
+#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
+
+class PlayerLogic;
+class QObject;
+
 /**
  * @param _player the player that the cards are revealed to.
  * @param _origZone the zone the cards were revealed from.
diff --git a/cockatrice/src/game/zones/view_zone_logic.h b/cockatrice/src/game/zones/view_zone_logic.h
index e3080d044..6fae301e4 100644
--- a/cockatrice/src/game/zones/view_zone_logic.h
+++ b/cockatrice/src/game/zones/view_zone_logic.h
@@ -8,6 +8,11 @@
 #define COCKATRICE_VIEW_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class ZoneViewZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
index 2f43591ac..2e18fca2d 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
@@ -2,12 +2,20 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../z_values.h"
+#include "abstract_card_item.h"
 
+#include <QBrush>
+#include <QColor>
 #include <QCursor>
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <QPainterPath>
+#include <QTransform>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+
+class QPointF;
 
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
index 1cbeb4fe7..18afdcbb8 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
@@ -7,11 +7,17 @@
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
-#include "abstract_card_item.h"
+#include "../card_dimensions.h"
+#include "graphics_item_type.h"
 
-class QGraphicsScene;
-class CardZone;
-class CardInfo;
+#include <QGraphicsItem>
+#include <QList>
+#include <QObject>
+#include <QPointF>
+#include <QRectF>
+#include <qtmetamacros.h>
+
+class AbstractCardItem;
 
 class AbstractCardDragItem : public QObject, public QGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
index 3969b7d03..a79c5873e 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
@@ -3,19 +3,42 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../card_dimensions.h"
 #include "../game_scene.h"
 #include "../z_values.h"
+#include "abstract_graphics_item.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/card_ref.h"
 
+#include <QBrush>
+#include <QChar>
 #include <QCursor>
+#include <QFlags>
+#include <QFont>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QHash>
+#include <QLineF>
+#include <QList>
 #include <QPainter>
+#include <QPainterPath>
+#include <QPen>
+#include <QPixmap>
+#include <QPointF>
+#include <QRectF>
+#include <QTransform>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/debug_settings.h>
+#include <qnamespace.h>
+
+class QSizeF;
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h
index 8cbe95282..385f9c32f 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@@ -8,14 +8,22 @@
 #define ABSTRACTCARDITEM_H
 
 #include "../animated_item.h"
-#include "../card_dimensions.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
+#include <QColor>
+#include <QGraphicsItem>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
 
 class PlayerLogic;
+class CardInfo;
+class QPainter;
+class QPoint;
 
 class AbstractCardItem : public ArrowTarget, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
index 4ba04804f..8500b9c51 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -2,21 +2,33 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
+#include "../../game/board/counter_state.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
 #include "../../game_graphics/board/translate_counter_name.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QAction>
 #include <QApplication>
+#include <QEvent>
+#include <QFlags>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QKeyEvent>
-#include <QMenu>
+#include <QKeySequence>
+#include <QList>
+#include <QSharedPointer>
 #include <QString>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/utility/expression.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 AbstractCounter::AbstractCounter(CounterState *state,
                                  PlayerLogic *_player,
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game_graphics/board/abstract_counter.h
index 67b5b4074..7ba686a93 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.h
+++ b/cockatrice/src/game_graphics/board/abstract_counter.h
@@ -7,18 +7,21 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../game/board/counter_state.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 #include "../player/menu/abstract_player_component.h"
 
+#include <QColor>
 #include <QGraphicsItem>
 #include <QInputDialog>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class PlayerLogic;
 class QAction;
-class QKeyEvent;
 class QMenu;
-class QString;
+class CounterState;
+class QWidget;
 
 class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
index 8da8ab708..50e80d359 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
@@ -1,6 +1,14 @@
 #include "abstract_graphics_item.h"
 
+#include <QBrush>
+#include <QFont>
+#include <QFontMetrics>
 #include <QPainter>
+#include <QRectF>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 void AbstractGraphicsItem::paintNumberEllipse(int number,
                                               int fontSize,
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.h b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
index 287c2c0b3..ebc2a3761 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
@@ -7,7 +7,12 @@
 #ifndef ABSTRACTGRAPHICSITEM_H
 #define ABSTRACTGRAPHICSITEM_H
 
-#include <QGraphicsItem>
+#include <QColor>
+#include <QGraphicsObject>
+#include <qtmetamacros.h>
+
+class QGraphicsItem;
+class QPainter;
 
 /**
  * Parent class of all objects that appear in a game.
diff --git a/cockatrice/src/game_graphics/board/arrow_item.cpp b/cockatrice/src/game_graphics/board/arrow_item.cpp
index 664d44ecc..c5a9b9c5e 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@@ -2,28 +2,42 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/board/arrow_data.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../game_scene.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
-#include "../zones/card_zone.h"
 #include "card_item.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/color.pb.h"
 
-#include <QDebug>
+#include <QBrush>
 #include <QElapsedTimer>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QLineF>
+#include <QLinearGradient>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <math.h>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
index 76a2d5d6c..2395165fc 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -6,15 +6,23 @@
 #include "arrow_target.h"
 #include "graphics_item_type.h"
 
+#include <QColor>
 #include <QElapsedTimer>
 #include <QGraphicsItem>
+#include <QList>
+#include <QMetaObject>
+#include <QObject>
 #include <QPainterPath>
+#include <QPointF>
 #include <QPointer>
+#include <QRectF>
 #include <QSharedPointer>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class CardItem;
-class QGraphicsSceneMouseEvent;
 class PlayerLogic;
+template <class T> class QSharedPointer;
 
 class ArrowItem : public QObject, public QGraphicsItem, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp
index 79b21d921..024479ee6 100644
--- a/cockatrice/src/game_graphics/board/arrow_target.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_target.cpp
@@ -1,7 +1,8 @@
 #include "arrow_target.h"
 
-#include "../../game/player/player_logic.h"
-#include "arrow_item.h"
+#include <QVariant>
+
+class QGraphicsItem;
 
 ArrowTarget::ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent) : AbstractGraphicsItem(parent), owner(_owner)
 {
diff --git a/cockatrice/src/game_graphics/board/arrow_target.h b/cockatrice/src/game_graphics/board/arrow_target.h
index bf89c5456..5c55e0e5d 100644
--- a/cockatrice/src/game_graphics/board/arrow_target.h
+++ b/cockatrice/src/game_graphics/board/arrow_target.h
@@ -9,10 +9,10 @@
 
 #include "abstract_graphics_item.h"
 
-#include <QList>
+#include <qtmetamacros.h>
 
 class PlayerLogic;
-class ArrowItem;
+class QGraphicsItem;
 
 class ArrowTarget : public AbstractGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp
index 49467c5c9..265ea759c 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp
@@ -6,9 +6,20 @@
 #include "../zones/view_zone.h"
 #include "card_item.h"
 
+#include <QBrush>
+#include <QColor>
 #include <QCursor>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QList>
+#include <QObject>
 #include <QPainter>
+#include <QPoint>
+#include <QSharedPointer>
+#include <qnamespace.h>
+
+class CardZoneLogic;
 
 CardDragItem::CardDragItem(CardItem *_item,
                            int _id,
diff --git a/cockatrice/src/game_graphics/board/card_drag_item.h b/cockatrice/src/game_graphics/board/card_drag_item.h
index 74d25ad04..d5e9a9e83 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/card_drag_item.h
@@ -9,7 +9,11 @@
 
 #include "abstract_card_drag_item.h"
 
+#include <QPointF>
+#include <qtmetamacros.h>
+
 class CardItem;
+class CardZone;
 
 class CardDragItem : public AbstractCardDragItem
 {
diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp
index c2dc455cc..a04d86c15 100644
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@@ -1,26 +1,52 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../client/settings/card_counter_settings.h"
+#include "../../game/abstract_game.h"
+#include "../../game/board/card_state.h"
+#include "../../game/game_state.h"
 #include "../../game/phase.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/player/player_manager.h"
+#include "../../game/zones/card_zone_logic.h"
+#include "../../game/zones/table_zone_logic.h"
 #include "../../game/zones/view_zone_logic.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../card_dimensions.h"
 #include "../game_scene.h"
-#include "../zones/table_zone.h"
-#include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
 
 #include <../../client/settings/card_counter_settings.h>
 #include <QApplication>
+#include <QBrush>
+#include <QChar>
+#include <QColor>
+#include <QCursor>
+#include <QFlags>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
-#include <QMenu>
+#include <QMap>
+#include <QMapIterator>
+#include <QObject>
 #include <QPainter>
+#include <QPen>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSizeF>
+#include <QTransform>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+struct CardRef;
 
 CardItem::CardItem(PlayerLogic *_owner,
                    QGraphicsItem *parent,
diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h
index 2ba43d03d..df79ef378 100644
--- a/cockatrice/src/game_graphics/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@@ -8,18 +8,24 @@
 #define CARDITEM_H
 
 #include "../../game/board/card_state.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "abstract_card_item.h"
+#include "graphics_item_type.h"
 
-#include <libcockatrice/network/server/remote/game/server_card.h>
+#include <QList>
+#include <QPoint>
+#include <QPointF>
+#include <QString>
+#include <QVariantList>
+#include <qtmetamacros.h>
 
-class CardDatabase;
 class CardDragItem;
-class CardZone;
 class ServerInfo_Card;
 class PlayerLogic;
-class QAction;
 class QColor;
+class CardZoneLogic;
+class QGraphicsItem;
+struct CardRef;
+template <class Key, class T> class QMap;
 
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
diff --git a/cockatrice/src/game_graphics/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp
index 379c6f837..4a8bbd6a4 100644
--- a/cockatrice/src/game_graphics/board/counter_general.cpp
+++ b/cockatrice/src/game_graphics/board/counter_general.cpp
@@ -3,7 +3,20 @@
 #include "../../interface/pixel_map_generator.h"
 #include "abstract_graphics_item.h"
 
+#include <QFont>
 #include <QPainter>
+#include <QPixmap>
+#include <QPoint>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class CounterState;
+class PlayerLogic;
+class QGraphicsItem;
 
 GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent)
     : AbstractCounter(state, player, true, useNameForShortcut, parent)
diff --git a/cockatrice/src/game_graphics/board/counter_general.h b/cockatrice/src/game_graphics/board/counter_general.h
index 0a2e882ce..2e49f11d7 100644
--- a/cockatrice/src/game_graphics/board/counter_general.h
+++ b/cockatrice/src/game_graphics/board/counter_general.h
@@ -9,6 +9,12 @@
 
 #include "abstract_counter.h"
 
+#include <qtmetamacros.h>
+
+class CounterState;
+class PlayerLogic;
+class QGraphicsItem;
+
 class GeneralCounter : public AbstractCounter
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.cpp b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
index 4f1c97657..3a2a5c7c8 100644
--- a/cockatrice/src/game_graphics/board/translate_counter_name.cpp
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
@@ -1,5 +1,8 @@
 #include "translate_counter_name.h"
 
+#include <QtGlobal>
+#include <utility>
+
 const QMap<QString, QString> TranslateCounterName::translated = {
     {"life", QT_TRANSLATE_NOOP("TranslateCounterName", "Life")},
     {"w", QT_TRANSLATE_NOOP("TranslateCounterName", "White")},
diff --git a/cockatrice/src/game_graphics/board/translate_counter_name.h b/cockatrice/src/game_graphics/board/translate_counter_name.h
index ba3a94fa5..e7e42e5fc 100644
--- a/cockatrice/src/game_graphics/board/translate_counter_name.h
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.h
@@ -7,8 +7,10 @@
 #ifndef TRANSLATECOUNTERNAME_H
 #define TRANSLATECOUNTERNAME_H
 
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QMap>
 #include <QString>
-#include <QtCore>
 
 class TranslateCounterName
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp
index 1acd02a75..c86bc9925 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp
@@ -2,15 +2,47 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/theme_manager.h"
+#include "../board/abstract_card_drag_item.h"
+#include "../card_dimensions.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
 
 #include <QApplication>
+#include <QBrush>
+#include <QColor>
+#include <QCursor>
+#include <QFlags>
+#include <QFont>
+#include <QFontMetrics>
+#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
+#include <QMapIterator>
 #include <QMouseEvent>
+#include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
+#include <QtGlobal>
 #include <QtMath>
 #include <algorithm>
+#include <compare>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
+
+class QObject;
+class QRectF;
+class QWidget;
+struct CardRef;
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.h b/cockatrice/src/game_graphics/deckview/deck_view.h
index f996fd4da..3b5b4b6f4 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view.h
@@ -8,17 +8,30 @@
 #define DECKVIEW_H
 
 #include "../board/abstract_card_drag_item.h"
+#include "../board/abstract_card_item.h"
+#include "../board/graphics_item_type.h"
 
+#include <QGraphicsItem>
+#include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QList>
 #include <QMap>
+#include <QMultiMap>
+#include <QPair>
+#include <QPointF>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
+#include <qtmetamacros.h>
 
 class DeckList;
-class InnerDecklistNode;
-class CardInfo;
 class DeckViewCardContainer;
 class DeckViewCardDragItem;
-class MoveCardToZone;
+class QObject;
+class QWidget;
+struct CardRef;
 
 class DeckViewCard : public AbstractCardItem
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
index bc07ac183..c97767ec7 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
@@ -2,18 +2,36 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
+#include "../../game/abstract_game.h"
+#include "../../game/game_event_handler.h"
+#include "../../game/game_state.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../interface/deck_loader/deck_file_format.h"
 #include "../../interface/deck_loader/deck_loader.h"
+#include "../../interface/deck_loader/loaded_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
+#include "../board/abstract_card_item.h"
 #include "deck_view.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 
+#include <QHBoxLayout>
+#include <QList>
 #include <QMessageBox>
-#include <libcockatrice/card/database/card_database.h>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
@@ -26,6 +44,9 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <optional>
+#include <qnamespace.h>
+#include <string>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
 {
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.h b/cockatrice/src/game_graphics/deckview/deck_view_container.h
index b5317c39a..80b82b6e5 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.h
@@ -7,14 +7,17 @@
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../interface/deck_loader/deck_loader.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/utility/playmat_params.h"
 
 #include <QPushButton>
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
 
 class QVBoxLayout;
 class AbstractCardItem;
 class VisualDeckStorageWidget;
-class DeckPreviewWidget;
 class Response;
 class TabGame;
 class DeckView;
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
index 2ffb214f7..90cbed9a1 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
@@ -1,7 +1,15 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/abstract_card_item.h"
 #include "deck_view.h"
+#include "deck_view_container.h"
+
+#include <QSharedPointer>
+#include <QTabBar>
+#include <QWidget>
+
+class DeckList;
+class TabGame;
 
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
     : QTabWidget(nullptr), playerId(_playerId), parentGame(parent)
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
index 7cfa8c9aa..7d73b78a2 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
@@ -6,9 +6,15 @@
 
 #ifndef TABBED_DECK_VIEW_CONTAINER_H
 #define TABBED_DECK_VIEW_CONTAINER_H
-#include "deck_view_container.h"
-
+#include <QMap>
+#include <QString>
 #include <QTabWidget>
+#include <qtmetamacros.h>
+
+class DeckList;
+class DeckView;
+class DeckViewContainer;
+class TabGame;
 
 class TabbedDeckViewContainer : public QTabWidget
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
index 6d8ad0534..5ce050380 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
@@ -2,23 +2,30 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
-#include "../../main.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QCheckBox>
 #include <QCloseEvent>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QLabel>
 #include <QLineEdit>
+#include <QModelIndex>
 #include <QRadioButton>
+#include <QSet>
+#include <QTimer>
 #include <QTreeView>
+#include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/database/token/token_display_model.h>
 #include <libcockatrice/settings/card_override_settings.h>
@@ -26,6 +33,10 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QModelIndex;
+class QWidget;
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
index 281e161fc..a03a1046b 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
@@ -8,19 +8,22 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class QLabel;
 class QLineEdit;
 class QComboBox;
 class QCheckBox;
-class QPushButton;
 class QRadioButton;
-class QCloseEvent;
 class QTreeView;
-class DeckList;
 class CardDatabaseModel;
 class TokenDisplayModel;
 class CardInfoPictureWidget;
+class QModelIndex;
+class QWidget;
 
 struct TokenInfo
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
index 41c907163..b7cd73d79 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
@@ -1,17 +1,24 @@
 #include "dlg_move_top_cards_until.h"
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QCheckBox>
+#include <QComboBox>
 #include <QCompleter>
 #include <QDialogButtonBox>
+#include <QGridLayout>
 #include <QLabel>
-#include <QLineEdit>
 #include <QMessageBox>
 #include <QSpinBox>
 #include <QString>
 #include <QVBoxLayout>
-#include <QWidget>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
index ac9d41a94..b9080bcc1 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
@@ -7,14 +7,19 @@
 #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H
 #define DLG_MOVE_TOP_CARDS_UNTIL_H
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QSpinBox>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class FilterString;
+class QCheckBox;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QSpinBox;
+class QWidget;
 
 struct MoveTopCardsUntilOptions
 {
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
index 4f5d5b861..b17881211 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
@@ -1,12 +1,15 @@
 #include "dlg_roll_dice.h"
 
 #include <QDialogButtonBox>
+#include <QGridLayout>
 #include <QLabel>
 #include <QSpinBox>
+#include <QString>
 #include <QVBoxLayout>
-#include <QWidget>
 #include <libcockatrice/utility/dice_limits.h>
 
+class QWidget;
+
 DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent)
 {
     numberOfSidesLabel = new QLabel(tr("Number of sides:"));
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
index 15f7dc1ba..4c146a054 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
@@ -8,9 +8,13 @@
 #define DLG_ROLL_DICE_H
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QSpinBox>
+#include <qtmetamacros.h>
+#include <sys/types.h>
+
+class QDialogButtonBox;
+class QLabel;
+class QSpinBox;
+class QWidget;
 
 class DlgRollDice : public QDialog
 {
diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp
index e4466f95d..cc3f9f1d3 100644
--- a/cockatrice/src/game_graphics/game_scene.cpp
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@@ -2,25 +2,50 @@
 
 #include "../client/settings/cache_settings.h"
 #include "../game/abstract_game.h"
+#include "../game/arrow_registry.h"
+#include "../game/board/arrow_data.h"
 #include "../game/player/player_actions.h"
+#include "../game/player/player_event_handler.h"
+#include "../game/player/player_info.h"
 #include "../game/player/player_logic.h"
-#include "../game_graphics/player/player_graphics_item.h"
+#include "../game/zones/card_zone_logic.h"
+#include "../game/zones/view_zone_logic.h"
+#include "animated_item.h"
+#include "board/abstract_card_item.h"
+#include "board/arrow_item.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/menu/player_menu.h"
 #include "player/player_graphics_item.h"
+#include "player/player_target.h"
+#include "zones/card_zone.h"
 #include "zones/select_zone.h"
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 
 #include <QBasicTimer>
 #include <QDebug>
+#include <QEvent>
+#include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
+#include <QListIterator>
+#include <QMenu>
+#include <QMessageLogger>
+#include <QMutableHashIterator>
+#include <QObject>
+#include <QPoint>
+#include <QRectF>
+#include <QSet>
+#include <QSharedPointer>
 #include <QtMath>
+#include <algorithm>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <numeric>
+#include <qnamespace.h>
+
+class ArrowTarget;
 
 /**
  * @brief Constructs the GameScene.
diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
index cf81eec9d..c7cae1e76 100644
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -2,16 +2,33 @@
 #define GAMESCENE_H
 
 #include "../game/arrow_registry.h"
-#include "../game/board/arrow_data.h"
-#include "../game/zones/card_zone_logic.h"
-#include "animated_item.h"
-#include "board/arrow_item.h"
 
 #include <QGraphicsScene>
 #include <QHash>
 #include <QList>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QMetaObject>
+#include <QPointF>
 #include <QPointer>
+#include <QSize>
+#include <QSizeF>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+// IWYU pragma: keep
+// ServerInfo_Card appears inside QList<...> in signal and slot
+// signatures, which the moc-generated code needs to be complete.
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+
+class CardZoneLogic;
+class IAnimatedItem;
+class QGraphicsItem;
+class QPoint;
+struct ArrowData;
+template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene");
 inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal");
diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp
index ed6355157..1c92d74ae 100644
--- a/cockatrice/src/game_graphics/game_view.cpp
+++ b/cockatrice/src/game_graphics/game_view.cpp
@@ -5,13 +5,24 @@
 #include "game_scene.h"
 
 #include <QAction>
+#include <QBrush>
+#include <QColor>
+#include <QEvent>
+#include <QGraphicsScene>
 #include <QGridLayout>
 #include <QLabel>
-#include <QLayout>
+#include <QMargins>
+#include <QPainter>
+#include <QPoint>
 #include <QResizeEvent>
 #include <QRubberBand>
+#include <QString>
+#include <QStringLiteral>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
+#include <qnamespace.h>
 
 // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
 // This subclass disables that behavior so dragCountLabel can appear above it.
diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game_graphics/game_view.h
index a23655513..e57267734 100644
--- a/cockatrice/src/game_graphics/game_view.h
+++ b/cockatrice/src/game_graphics/game_view.h
@@ -10,11 +10,19 @@
 #include "tally/tally.h"
 
 #include <QGraphicsView>
+#include <QList>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
+#include <qtmetamacros.h>
 
 class GameScene;
 class QGridLayout;
 class QLabel;
 class QRubberBand;
+class QAction;
+class QWidget;
 
 class GameView : public QGraphicsView
 {
diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp
index 8dcbcfdaa..9320c1295 100644
--- a/cockatrice/src/game_graphics/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@@ -1,11 +1,22 @@
 #include "hand_counter.h"
 
+#include "../game/board/card_list.h"
+#include "../game/zones/card_zone_logic.h"
 #include "../interface/pixel_map_generator.h"
-#include "zones/card_zone.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <QPixmap>
 #include <QPixmapCache>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QString>
+#include <QStringLiteral>
+#include <QTransform>
+#include <qnamespace.h>
+
+class QGraphicsItem;
 
 HandCounter::HandCounter(QGraphicsItem *parent) : AbstractGraphicsItem(parent), number(0)
 {
diff --git a/cockatrice/src/game_graphics/hand_counter.h b/cockatrice/src/game_graphics/hand_counter.h
index 9aa65d514..c1f5d09d8 100644
--- a/cockatrice/src/game_graphics/hand_counter.h
+++ b/cockatrice/src/game_graphics/hand_counter.h
@@ -10,10 +10,10 @@
 #include "board/abstract_graphics_item.h"
 #include "board/graphics_item_type.h"
 
-#include <QString>
+#include <qtmetamacros.h>
 
-class QPainter;
-class QPixmap;
+class QGraphicsItem;
+class QPoint;
 
 class HandCounter : public AbstractGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
index b998a3650..4a9750fca 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -3,20 +3,39 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
+#include "../../client/translation.h"
+#include "../../game/abstract_game.h"
+#include "../../game/board/card_list.h"
 #include "../../game/game_state.h"
 #include "../../game/phase.h"
+#include "../../game/player/player_event_handler.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/player/player_manager.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/card_localization.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
+#include <QColor>
+#include <QDebug>
+#include <QList>
+#include <QSharedPointer>
+#include <QStringList>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <optional>
+#include <stdlib.h>
 #include <utility>
 
+class QWidget;
+class ServerInfo_User;
+class TabSupervisor;
+
 static QString sanitizeHtml(QString dirty)
 {
     return dirty.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;");
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
index 375c6df4d..6800ba8ed 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -7,14 +7,23 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
-#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 
+#include <QPair>
+#include <QString>
+#include <qtmetamacros.h>
+#include <sys/types.h>
+
 class AbstractGame;
 class CardItem;
 class GameEventContext;
 class PlayerLogic;
 class PlayerEventHandler;
+class CardZoneLogic;
+class QWidget;
+class ServerInfo_User;
+class TabSupervisor;
+template <typename T> class QList;
 
 class MessageLogWidget : public ChatView
 {
diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp
index 3361f9d55..d0a3f74fd 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.cpp
+++ b/cockatrice/src/game_graphics/phases_toolbar.cpp
@@ -1,17 +1,26 @@
 #include "phases_toolbar.h"
 
 #include "../interface/pixel_map_generator.h"
+#include "board/abstract_graphics_item.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
 
 #include <QAction>
-#include <QDebug>
+#include <QColor>
 #include <QPainter>
-#include <QPen>
+#include <QPixmap>
+#include <QRect>
+#include <QRectF>
 #include <QTimer>
+#include <QTransform>
+#include <QtGlobal>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable)
     : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable),
diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h
index 39884ef75..376775284 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.h
+++ b/cockatrice/src/game_graphics/phases_toolbar.h
@@ -8,11 +8,14 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "board/abstract_graphics_item.h"
-
-#include <QFrame>
-#include <QGraphicsObject>
+#include <QGraphicsItem>
 #include <QList>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QAction;
+class QTimer;
 
 namespace google
 {
@@ -21,8 +24,6 @@ namespace protobuf
 class Message;
 }
 } // namespace google
-class PlayerLogic;
-class GameCommand;
 
 class PhaseButton : public QObject, public QGraphicsItem
 {
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
index 75ca1b28b..137ec2ed1 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -1,21 +1,43 @@
 #include "card_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
+#include "../../../game/abstract_game.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_manager.h"
+#include "../../../game/zones/card_zone_logic.h"
 #include "../../board/card_item.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../../game/zones/view_zone_logic.h"
+#include "../../game_scene.h"
 #include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "move_menu.h"
 #include "pt_menu.h"
 
+#include <QAction>
+#include <QColor>
+#include <QIcon>
+#include <QMap>
+#include <QObject>
 #include <QPainter>
+#include <QPixmap>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <qnamespace.h>
+#include <utility>
 
 /**
  * @brief Creates a circular icon filled with the specified color.
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
index d67ef3876..337d77b3e 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.h
@@ -7,12 +7,18 @@
 #ifndef COCKATRICE_CARD_MENU_H
 #define COCKATRICE_CARD_MENU_H
 
+#include <QList>
 #include <QMenu>
-#include <libcockatrice/utility/card_ref.h>
+#include <QPair>
+#include <QString>
+#include <qtmetamacros.h>
 
 class CardItem;
 class PlayerGraphicsItem;
 class PlayerLogic;
+class QAction;
+struct CardRef;
+
 class CardMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
index 743746cc8..e16ebc112 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -1,8 +1,14 @@
 #include "custom_zone_menu.h"
 
+#include "../../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+#include <QList>
+#include <QVariant>
+
 CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     menuAction()->setVisible(false);
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
index 46dd58db6..07f5510ca 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
@@ -10,8 +10,11 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
+#include <QString>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+
 class CustomZoneMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
index 6d9364579..580d2642e 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
@@ -1,15 +1,28 @@
 #include "grave_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_manager.h"
+#include "../../../game/zones/pile_zone_logic.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <QKeySequence>
+#include <QList>
+#include <QMap>
 #include <QMenu>
+#include <QObject>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
+class QWidget;
+
 GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.h b/cockatrice/src/game_graphics/player/menu/grave_menu.h
index 116261e9b..fa285409f 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.h
@@ -10,10 +10,13 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+class QAction;
+class QMenu;
+class QWidget;
+
 class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
index ba0702f07..141542cb4 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
@@ -2,16 +2,28 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game_graphics/zones/hand_zone.h"
+#include "../../../game/board/card_list.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_manager.h"
+#include "../../../game/zones/hand_zone_logic.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <QKeySequence>
+#include <QList>
+#include <QMap>
 #include <QMenu>
+#include <QObject>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
+class QWidget;
+
 HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     auto *actions = player->getLogic()->getPlayerActions();
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.h b/cockatrice/src/game_graphics/player/menu/hand_menu.h
index d5204612b..de7726064 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.h
@@ -10,11 +10,12 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-class PlayerActions;
+class QAction;
+class QMenu;
+class QWidget;
 
 class HandMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
index 4c15e09ec..aa389006e 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
@@ -2,15 +2,29 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
+#include "../../../game/board/card_list.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_manager.h"
+#include "../../../game/zones/pile_zone_logic.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/abstract_game.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QInputDialog>
+#include <QKeySequence>
+#include <QList>
+#include <QMap>
 #include <QMenu>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+
+class QWidget;
 
 LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.h b/cockatrice/src/game_graphics/player/menu/library_menu.h
index bc0e6fb8e..72e90d0ba 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.h
@@ -11,11 +11,11 @@
 #include "abstract_player_component.h"
 
 #include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
-class PlayerLogic;
-class PlayerActions;
+class QMenu;
+class QWidget;
 
 class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
index 632e0ddda..2991100ec 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
@@ -1,11 +1,15 @@
 #include "move_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
+#include "../../game_scene.h"
 #include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+
 MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {
     aMoveToTopLibrary = new QAction(this);
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.h b/cockatrice/src/game_graphics/player/menu/move_menu.h
index 150bdbd3c..f1f239abd 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.h
@@ -7,8 +7,11 @@
 #ifndef COCKATRICE_MOVE_MENU_H
 #define COCKATRICE_MOVE_MENU_H
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+class QAction;
+
 class MoveMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 7c90211df..44b184cfe 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -1,16 +1,31 @@
 #include "player_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../../game/abstract_game.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_logic.h"
+#include "../../../game/player/player_manager.h"
 #include "../../../game_graphics/zones/hand_zone.h"
 #include "../../../game_graphics/zones/pile_zone.h"
 #include "../../../game_graphics/zones/table_zone.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../board/card_item.h"
 #include "../player_graphics_item.h"
+#include "abstract_player_component.h"
 #include "card_menu.h"
+#include "custom_zone_menu.h"
+#include "grave_menu.h"
 #include "hand_menu.h"
+#include "library_menu.h"
+#include "rfg_menu.h"
+#include "say_menu.h"
+#include "sideboard_menu.h"
+#include "tally_menu.h"
+#include "utility_menu.h"
 
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
+#include <QMenu>
+#include <QString>
 
 PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
index a6e89fab0..97dd2fc56 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -8,24 +8,28 @@
 #define COCKATRICE_PLAYER_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "custom_zone_menu.h"
-#include "grave_menu.h"
-#include "hand_menu.h"
-#include "library_menu.h"
-#include "rfg_menu.h"
-#include "say_menu.h"
-#include "sideboard_menu.h"
-#include "tally_menu.h"
-#include "utility_menu.h"
 
 #include <QList>
-#include <QMenu>
 #include <QObject>
-#include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
+#include <utility>
 
 class CardItem;
 class CardMenu;
 class PlayerGraphicsItem;
+class AbstractPlayerComponent;
+class CustomZoneMenu;
+class GraveyardMenu;
+class HandMenu;
+class LibraryMenu;
+class QMenu;
+class RfgMenu;
+class SayMenu;
+class SideboardMenu;
+class TallyMenu;
+class UtilityMenu;
+struct CardRef;
+
 class PlayerMenu : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
index 152461c18..b4f852b43 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
@@ -1,10 +1,14 @@
 #include "pt_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
+#include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+
 PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 {
     PlayerActions *playerActions = player->getLogic()->getPlayerActions();
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.h b/cockatrice/src/game_graphics/player/menu/pt_menu.h
index 72f828801..aaf17cead 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.h
@@ -7,8 +7,11 @@
 #ifndef COCKATRICE_PT_MENU_H
 #define COCKATRICE_PT_MENU_H
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+class QAction;
+
 class PtMenu : public QMenu
 {
 
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
index 45abadbf7..98514280f 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
@@ -1,11 +1,21 @@
 #include "rfg_menu.h"
 
+#include "../../../game/player/player_info.h"
+#include "../../../game/zones/pile_zone_logic.h"
+#include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+#include <QList>
+#include <QMenu>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/utility/zone_names.h>
 
+class QWidget;
+
 RfgMenu::RfgMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.h b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
index f5dd888e4..8e1460316 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
@@ -10,10 +10,13 @@
 #include "../../../interface/widgets/menus/tearoff_menu.h"
 #include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+class QAction;
+class QMenu;
+class QWidget;
+
 class RfgMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
index e7b0b3826..d467c6469 100644
--- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
@@ -5,7 +5,12 @@
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+#include <QKeySequence>
+#include <QList>
+#include <QString>
 #include <libcockatrice/settings/message_settings.h>
+
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.h b/cockatrice/src/game_graphics/player/menu/say_menu.h
index 3ff160d05..72169d18f 100644
--- a/cockatrice/src/game_graphics/player/menu/say_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.h
@@ -10,8 +10,10 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+
 class SayMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
index 6753f743e..1eef3604f 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
@@ -1,10 +1,15 @@
 #include "sideboard_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../../game/player/player_info.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
+#include <QAction>
+#include <QKeySequence>
+
 SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
     aViewSideboard = new QAction(this);
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
index b3b547291..3e6501c90 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
@@ -10,8 +10,11 @@
 #include "abstract_player_component.h"
 
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+class QAction;
+
 class SideboardMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
index 08cb6cac9..7ae5b36ce 100644
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
@@ -1,7 +1,10 @@
 #include "tally_menu.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../tally/tally.h"
+#include "libcockatrice/settings/interface_settings.h"
 
+#include <QAction>
 #include <QActionGroup>
 
 TallyMenu::TallyMenu()
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.h b/cockatrice/src/game_graphics/player/menu/tally_menu.h
index 11802fd20..75bd41ac0 100644
--- a/cockatrice/src/game_graphics/player/menu/tally_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.h
@@ -2,10 +2,13 @@
 #define COCKATRICE_TALLY_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../tally/tally.h"
 #include "abstract_player_component.h"
 
-#include <QMenu>
+#include <qtmetamacros.h>
+
+class QAction;
+class QActionGroup;
+enum class TallyType;
 
 class TallyMenu : public TearOffMenu, public AbstractPlayerComponent
 {
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index a7ea38d9a..7c18b3f4c 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -1,12 +1,17 @@
 #include "utility_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../interface/deck_loader/deck_loader.h"
+#include "../../../game/player/player_info.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
+#include "../../game_scene.h"
 #include "../player_graphics_item.h"
-#include "player_menu.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QKeySequence>
+#include <QSet>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.h b/cockatrice/src/game_graphics/player/menu/utility_menu.h
index bdc2a81a5..009e4aca3 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.h
@@ -9,10 +9,16 @@
 
 #include "abstract_player_component.h"
 
+#include <QAction>
+#include <QList>
 #include <QMenu>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
 class PlayerGraphicsItem;
+
 class UtilityMenu : public QMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/player/player_area.cpp b/cockatrice/src/game_graphics/player/player_area.cpp
index 86b8c2d1b..2af642eb5 100644
--- a/cockatrice/src/game_graphics/player/player_area.cpp
+++ b/cockatrice/src/game_graphics/player/player_area.cpp
@@ -2,6 +2,7 @@
 
 #include "../../interface/theme_manager.h"
 
+#include <QBrush>
 #include <QPainter>
 
 PlayerArea::PlayerArea(QGraphicsItem *parentItem) : QObject(), QGraphicsItem(parentItem)
diff --git a/cockatrice/src/game_graphics/player/player_area.h b/cockatrice/src/game_graphics/player/player_area.h
index d73547f81..7370a78be 100644
--- a/cockatrice/src/game_graphics/player/player_area.h
+++ b/cockatrice/src/game_graphics/player/player_area.h
@@ -8,7 +8,14 @@
 #define COCKATRICE_PLAYER_AREA_H
 
 #include "../board/graphics_item_type.h"
-#include "QGraphicsItem"
+
+#include <QGraphicsItem>
+#include <QObject>
+#include <QRectF>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QGraphicsItem;
 
 /**
  * The entire graphical area belonging to a single player.
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
index 95c225812..74f5de601 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.cpp
+++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp
@@ -1,12 +1,21 @@
 #include "player_dialogs.h"
 
+#include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
+#include "../../game/player/player_actions.h"
+#include "../../game/player/player_logic.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
+#include "../board/abstract_counter.h"
 #include "../board/card_item.h"
+#include "../dialogs/dlg_create_token.h"
+#include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
+#include "../game_scene.h"
 #include "../player/player_graphics_item.h"
 
+#include <QChar>
 #include <QInputDialog>
+#include <QLineEdit>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/utility/string_limits.h>
 
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
index f87704f2d..86d7282a2 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.h
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -1,12 +1,26 @@
 #ifndef COCKATRICE_PLAYER_DIALOGS_H
 #define COCKATRICE_PLAYER_DIALOGS_H
-#include "../../game/player/player_actions.h"
 #include "player_graphics_item.h"
 
-#include <QGraphicsView>
-#include <QObject>
+// IWYU pragma: keep
+// MoveTopCardsUntilOptions is passed by value to a slot, so the moc-generated
+// code needs the complete type.
+#include "../dialogs/dlg_move_top_cards_until.h"
+
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardItem;
+class CardRelation;
+class PlayerActions;
+class QWidget;
+struct MoveTopCardsUntilOptions;
 
-class PlayerGraphicsItem;
 class PlayerDialogs : public QObject
 {
 
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
index 122ab83be..419816087 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@@ -1,26 +1,53 @@
 #include "player_graphics_item.h"
 
+#include "../../client/settings/cache_settings.h"
+#include "../../game/board/counter_state.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
+#include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
+#include "../../game/zones/hand_zone_logic.h"
+#include "../../game/zones/pile_zone_logic.h"
+#include "../../game/zones/stack_zone_logic.h"
+#include "../../game/zones/table_zone_logic.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../interface/widgets/cards/art_crop_attribution.h"
 #include "../../interface/widgets/cards/card_art_utils.h"
 #include "../../interface/widgets/playmat/playmat_utils.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/abstract_card_item.h"
+#include "../board/abstract_counter.h"
 #include "../board/counter_general.h"
+#include "../card_dimensions.h"
 #include "../hand_counter.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "menu/player_menu.h"
+#include "player_area.h"
 #include "player_dialogs.h"
+#include "player_target.h"
 
-#include <QGraphicsView>
+#include <QList>
+#include <QMapIterator>
+#include <QMenu>
+#include <QPainter>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QSharedPointer>
+#include <QTransform>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 PlayerGraphicsItem::PlayerGraphicsItem(PlayerLogic *_player) : player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.h b/cockatrice/src/game_graphics/player/player_graphics_item.h
index e5ae59a61..e1ca0a036 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.h
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.h
@@ -6,12 +6,20 @@
 
 #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H
-#include "../../game/player/player_logic.h"
-#include "../board/abstract_counter.h"
+#include "../board/graphics_item_type.h"
 #include "../game_scene.h"
+#include "libcockatrice/utility/playmat_params.h"
 
 #include <QGraphicsObject>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QMap>
+#include <QMetaObject>
+#include <QPixmap>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class HandZone;
 class PileZone;
@@ -20,7 +28,12 @@ class PlayerMenu;
 class PlayerTarget;
 class StackZone;
 class TableZone;
-class ZoneViewZone;
+class AbstractCounter;
+class CardZone;
+class CounterState;
+class PlayerArea;
+class PlayerLogic;
+struct CardRef;
 
 class PlayerGraphicsItem : public QGraphicsObject
 {
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
index a7ec2e4a9..7b358010f 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@@ -2,16 +2,30 @@
 
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/server/user/user_context_menu.h"
-#include "../../interface/widgets/server/user/user_list_manager.h"
-#include "../../interface/widgets/server/user/user_list_widget.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "user_level.h"
 
-#include <QHeaderView>
+#include <QBrush>
+#include <QColor>
+#include <QEvent>
+#include <QFlag>
+#include <QList>
+#include <QMapIterator>
+#include <QModelIndex>
 #include <QMouseEvent>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
+#include <QPalette>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringLiteral>
+#include <QVariant>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <qnamespace.h>
+
+class QModelIndex;
+class QObject;
+class QPoint;
+class QWidget;
 
 PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
 {
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.h b/cockatrice/src/game_graphics/player/player_list_widget.h
index f2f0be5fd..b070fe312 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.h
+++ b/cockatrice/src/game_graphics/player/player_list_widget.h
@@ -7,18 +7,23 @@
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
-#include "../../game/player/player_logic.h"
-
 #include <QIcon>
 #include <QMap>
+#include <QString>
 #include <QStyledItemDelegate>
 #include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <qtmetamacros.h>
 
 class ServerInfo_PlayerProperties;
 class TabSupervisor;
 class AbstractClient;
 class AbstractGame;
 class UserContextMenu;
+class QModelIndex;
+class QObject;
+class QPoint;
+class QWidget;
 
 class PlayerListItemDelegate : public QStyledItemDelegate
 {
diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp
index d6c28370d..24734cd42 100644
--- a/cockatrice/src/game_graphics/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@@ -1,16 +1,43 @@
 #include "player_target.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../board/abstract_counter.h"
+#include "../board/abstract_graphics_item.h"
+#include "../board/arrow_target.h"
 #include "../game_scene.h"
+#include "libcockatrice/settings/interface_settings.h"
+#include "user_level.h"
 
-#include <QApplication>
-#include <QDebug>
+#include <QBrush>
+#include <QColor>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QObject>
 #include <QPainter>
+#include <QPainterPath>
+#include <QPen>
 #include <QPixmapCache>
+#include <QPointF>
+#include <QRadialGradient>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
+#include <string>
+#include <sys/types.h>
+
+class CounterState;
+class QGraphicsItem;
 
 PlayerCounter::PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent)
     : AbstractCounter(state, player, false, false, parent)
diff --git a/cockatrice/src/game_graphics/player/player_target.h b/cockatrice/src/game_graphics/player/player_target.h
index 1d06c6274..7780104d2 100644
--- a/cockatrice/src/game_graphics/player/player_target.h
+++ b/cockatrice/src/game_graphics/player/player_target.h
@@ -14,8 +14,12 @@
 
 #include <QElapsedTimer>
 #include <QPixmap>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class PlayerLogic;
+class CounterState;
+class QGraphicsItem;
 
 class PlayerCounter : public AbstractCounter, public IAnimatedItem
 {
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp
index 7e05c3fb1..28e280c02 100644
--- a/cockatrice/src/game_graphics/tally/stats_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp
@@ -4,6 +4,11 @@
 
 #include <QCoreApplication>
 #include <QList>
+#include <QSharedPointer>
+#include <QString>
+#include <QVariant>
+#include <QVariantList>
+#include <QtGlobal>
 #include <algorithm>
 
 static int sumPowers(const QList<CardItem *> &cards)
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.h b/cockatrice/src/game_graphics/tally/stats_tally.h
index e499587eb..cb0bdf81b 100644
--- a/cockatrice/src/game_graphics/tally/stats_tally.h
+++ b/cockatrice/src/game_graphics/tally/stats_tally.h
@@ -2,6 +2,10 @@
 #define COCKATRICE_STATS_TALLY_H
 #include "tally.h"
 
+#include <QList>
+
+class CardItem;
+
 /**
  * @brief Extracts and tallies stats from selected cards.
  */
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.cpp b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
index 2241eb3b2..ccd727405 100644
--- a/cockatrice/src/game_graphics/tally/subtype_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
@@ -1,9 +1,18 @@
 #include "subtype_tally.h"
 
 #include "../board/card_item.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
 #include <QMap>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <algorithm>
+#include <compare>
+#include <iterator>
+#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.h b/cockatrice/src/game_graphics/tally/subtype_tally.h
index 9926528e0..019a797d4 100644
--- a/cockatrice/src/game_graphics/tally/subtype_tally.h
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.h
@@ -4,7 +4,6 @@
 #include "tally.h"
 
 #include <QList>
-#include <QString>
 
 class CardItem;
 
diff --git a/cockatrice/src/game_graphics/tally/tally.h b/cockatrice/src/game_graphics/tally/tally.h
index 84c54918f..5699758e7 100644
--- a/cockatrice/src/game_graphics/tally/tally.h
+++ b/cockatrice/src/game_graphics/tally/tally.h
@@ -1,5 +1,6 @@
 #ifndef COCKATRICE_TALLY_H
 #define COCKATRICE_TALLY_H
+#include <QList>
 #include <QString>
 
 class CardItem;
diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp
index 3457b681e..b2ba8618e 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/card_zone.cpp
@@ -1,10 +1,18 @@
 #include "card_zone.h"
 
+#include "../../game/board/card_list.h"
+#include "../../game/zones/card_zone_logic.h"
+#include "../board/abstract_graphics_item.h"
 #include "../board/card_item.h"
-#include "view_zone.h"
 
+#include <QAction>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
+#include <qnamespace.h>
+
+class QGraphicsItem;
+class QPoint;
+class QPointF;
 
 CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), menu(nullptr), doubleClickAction(0), logic(_logic)
diff --git a/cockatrice/src/game_graphics/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h
index 4cef6ca80..def3eee14 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.h
+++ b/cockatrice/src/game_graphics/zones/card_zone.h
@@ -7,12 +7,21 @@
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../../game/zones/card_zone_logic.h"
 #include "../board/abstract_graphics_item.h"
 #include "../board/graphics_item_type.h"
 
 #include <QLoggingCategory>
-#include <QString>
+#include <QPointF>
+#include <qtmetamacros.h>
+
+class CardDragItem;
+class CardItem;
+class CardZoneLogic;
+class QAction;
+class QGraphicsItem;
+class QMenu;
+class QPoint;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone");
 
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp
index 1a8f7a910..3e527c081 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@@ -2,14 +2,27 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
+#include "../../game/zones/hand_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
+#include "../card_dimensions.h"
 
+#include <QBrush>
+#include <QList>
 #include <QPainter>
+#include <QPoint>
+#include <QPointF>
+#include <QRectF>
+#include <QString>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <string>
+
+class QGraphicsItem;
 
 HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h
index c3f3f252b..5c91d684d 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.h
+++ b/cockatrice/src/game_graphics/zones/hand_zone.h
@@ -7,9 +7,16 @@
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "../../game/zones/hand_zone_logic.h"
+#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class HandZoneLogic;
+class QGraphicsItem;
+template <typename T> class QList;
+
 class HandZone : public SelectZone
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp
index abdf262f4..77a87a4af 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp
@@ -1,18 +1,33 @@
 #include "pile_zone.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/pile_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "view_zone.h"
+#include "../card_dimensions.h"
 
 #include <QApplication>
+#include <QCursor>
+#include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
+#include <QList>
 #include <QPainter>
+#include <QPainterPath>
+#include <QPoint>
+#include <QPointF>
+#include <QRectF>
+#include <QString>
+#include <QTransform>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+#include <string>
 
 PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h
index 099bc6f60..b2d8d0cd2 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.h
+++ b/cockatrice/src/game_graphics/zones/pile_zone.h
@@ -7,9 +7,13 @@
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
-#include "../../game/zones/pile_zone_logic.h"
 #include "card_zone.h"
 
+#include <qtmetamacros.h>
+
+class PileZoneLogic;
+class QGraphicsItem;
+
 /**
  * A CardZone where the cards are in a single pile instead of being laid out.
  * Usually only top card is accessible by clicking.
diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
index 470c70fcf..d69ec32f5 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@@ -1,13 +1,25 @@
 #include "select_zone.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/board/card_list.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 
+#include <QBrush>
+#include <QGraphicsItem>
 #include <QGraphicsRectItem>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QPen>
+#include <QPoint>
+#include <QRectF>
+#include <QTransform>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 static qreal stackingOffset(qreal cardHeight)
 {
diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h
index b5d3ca37a..8a56949e3 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.h
+++ b/cockatrice/src/game_graphics/zones/select_zone.h
@@ -9,10 +9,16 @@
 
 #include "card_zone.h"
 
+#include <QPointF>
 #include <QSet>
+#include <QtGlobal>
 #include <optional>
+#include <qtmetamacros.h>
 
 class QGraphicsRectItem;
+class CardItem;
+class CardZoneLogic;
+class QGraphicsItem;
 
 /**
  * A CardZone where the cards are laid out, with each card directly interactable by clicking.
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp
index ff62097c7..de1ff8ba9 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@@ -1,15 +1,27 @@
 #include "stack_zone.h"
 
+#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/stack_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QGraphicsItem>
+#include <QList>
 #include <QPainter>
+#include <QPoint>
+#include <QRectF>
+#include <QString>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <qnumeric.h>
+#include <string>
 
 StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.h b/cockatrice/src/game_graphics/zones/stack_zone.h
index 96b3f96a6..5dea481b6 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.h
+++ b/cockatrice/src/game_graphics/zones/stack_zone.h
@@ -7,9 +7,14 @@
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
-#include "../../game/zones/stack_zone_logic.h"
 #include "select_zone.h"
 
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QGraphicsItem;
+class StackZoneLogic;
+
 class StackZone : public SelectZone
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp
index 88e9abe6c..b704b79e0 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@@ -1,23 +1,50 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/table_zone_logic.h"
 #include "../../interface/theme_manager.h"
-#include "../board/arrow_item.h"
+#include "../board/abstract_card_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 #include "../z_values.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QGradient>
+#include <QGraphicsItem>
 #include <QGraphicsScene>
+#include <QLinearGradient>
+#include <QList>
+#include <QListIterator>
 #include <QPainter>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+#include <algorithm>
+#include <iterator>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <string>
+
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
 
 const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
 const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80);
diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h
index 92915a2ed..ccd1d8e81 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@@ -7,12 +7,26 @@
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "../../game/zones/table_zone_logic.h"
 #include "../animated_item.h"
-#include "../board/abstract_card_item.h"
+#include "../card_dimensions.h"
 #include "select_zone.h"
 
 #include <QElapsedTimer>
+#include <QMap>
+#include <QPixmap>
+#include <QPoint>
+#include <QPointF>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class CardDragItem;
+class CardItem;
+class CardZoneLogic;
+class QColor;
+class QGraphicsItem;
+class QPainter;
+class TableZoneLogic;
+template <typename T> class QList;
 
 /**
  * @brief TableZone is the grid based rect where CardItems may be placed.
diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp
index 5bd5d262f..a2aa124dc 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@@ -2,16 +2,29 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../game/player/player_actions.h"
+#include "../../game/player/player_info.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
 #include "../../game/zones/view_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
+#include "../card_dimensions.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/filters/filter_string.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 
 #include <QBrush>
+#include <QColor>
 #include <QDebug>
-#include <QGraphicsSceneWheelEvent>
+#include <QMessageLogger>
+#include <QObject>
 #include <QPainter>
+#include <QSharedPointer>
+#include <QtGlobal>
 #include <QtMath>
+#include <functional>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
@@ -19,6 +32,9 @@
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <string>
+
+class QGraphicsItem;
 
 /**
  * @param parent the parent QGraphicsWidget containing the reveal zone
diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h
index 9dfa00ce2..4032da760 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.h
+++ b/cockatrice/src/game_graphics/zones/view_zone.h
@@ -7,17 +7,29 @@
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "../../game/zones/view_zone_logic.h"
+#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
+#include <QList>
 #include <QLoggingCategory>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
 #include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+// IWYU pragma: keep
+// ServerInfo_Card appears inside QList<...> in signal and slot
+// signatures, which the moc-generated code needs to be complete.
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+
+class QGraphicsItem;
+class ZoneViewZoneLogic;
 
 inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
 
-class ZoneViewWidget;
 class Response;
 class ServerInfo_Card;
 class QGraphicsSceneWheelEvent;
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index fa6733413..b4f73d348 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -1,28 +1,53 @@
 #include "view_zone_widget.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../client/translation.h"
 #include "../../filters/syntax_help.h"
+#include "../../game/board/card_list.h"
 #include "../../game/player/player_actions.h"
 #include "../../game/player/player_logic.h"
+#include "../../game/zones/card_zone_logic.h"
+#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../board/card_item.h"
-#include "../game_scene.h"
+#include "../card_dimensions.h"
 #include "../z_values.h"
+#include "libcockatrice/utility/macros.h"
 #include "view_zone.h"
 
+#include <QAction>
 #include <QCheckBox>
+#include <QCloseEvent>
+#include <QDebug>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
+#include <QGraphicsItem>
+#include <QGraphicsLayout>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
-#include <QLabel>
-#include <QPainter>
+#include <QIcon>
+#include <QObject>
+#include <QRect>
 #include <QScrollBar>
+#include <QSizeF>
+#include <QSizePolicy>
+#include <QString>
+#include <QStringLiteral>
 #include <QStyle>
 #include <QStyleOption>
+#include <QStyleOptionTitleBar>
+#include <QTimer>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.h b/cockatrice/src/game_graphics/zones/view_zone_widget.h
index de5ad28d5..9fe022b27 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.h
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.h
@@ -6,30 +6,34 @@
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
-#include "../../game/zones/card_zone_logic.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsWidget>
 #include <QLineEdit>
+#include <QList>
+#include <QPoint>
+#include <QPointF>
 #include <QPointer>
+#include <QRectF>
+#include <QtGlobal>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+// IWYU pragma: keep
+// ServerInfo_Card appears inside QList<...> in signal and slot
+// signatures, which the moc-generated code needs to be complete.
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
-class QLabel;
-class QPushButton;
-class CardZone;
 class ZoneViewZone;
 class PlayerLogic;
-class CardDatabase;
 class QScrollBar;
-class GameScene;
 class ServerInfo_Card;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
-class QStyleOption;
 class QGraphicsView;
 class QWidget;
+class CardZoneLogic;
 
 class ScrollableGraphicsProxyWidget : public QGraphicsProxyWidget
 {
diff --git a/cockatrice/src/interface/card_localization.h b/cockatrice/src/interface/card_localization.h
index 1a1e7be5d..39cbd7700 100644
--- a/cockatrice/src/interface/card_localization.h
+++ b/cockatrice/src/interface/card_localization.h
@@ -6,6 +6,7 @@
 #include <QString>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
 namespace CardLocalization
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
index 8e34942e1..4f77c7096 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -4,27 +4,45 @@
 #include "../pixel_map_generator.h"
 #include "card_picture_loader_cache_method.h"
 #include "card_picture_loader_local_schemes.h"
+#include "card_picture_loader_status_bar.h"
+#include "card_picture_loader_worker.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
 #include <QApplication>
-#include <QBuffer>
+#include <QChar>
+#include <QColor>
+#include <QDateTime>
 #include <QDebug>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
+#include <QImage>
+#include <QLatin1Char>
+#include <QList>
 #include <QMainWindow>
+#include <QMessageLogger>
 #include <QMetaObject>
-#include <QMovie>
-#include <QNetworkRequest>
-#include <QPainter>
+#include <QMetaType>
+#include <QPixmap>
 #include <QPixmapCache>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QSize>
 #include <QStatusBar>
+#include <QString>
+#include <QStringLiteral>
 #include <QThread>
-#include <algorithm>
+#include <QWidget>
+#include <QtGlobal>
+#include <compare>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <utility>
+#include <qnamespace.h>
 
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
index 6224befbf..c6d91570b 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@@ -1,12 +1,20 @@
 #ifndef CARD_PICTURE_LOADER_H
 #define CARD_PICTURE_LOADER_H
 
-#include "card_picture_loader_status_bar.h"
-#include "card_picture_loader_worker.h"
-
-#include <QDateTime>
 #include <QHash>
 #include <QLoggingCategory>
+#include <QObject>
+#include <qtmetamacros.h>
+
+class CardPictureLoaderStatusBar;
+class CardPictureLoaderWorker;
+class ExactCard;
+class QDateTime;
+class QImage;
+class QPixmap;
+class QSize;
+class QString;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader");
 inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail");
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
index 12165e8f3..1437e23f4 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
@@ -2,11 +2,21 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "card_picture_loader_local_schemes.h"
-#include "card_picture_to_load.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QDebug>
+#include <QDir>
 #include <QDirIterator>
-#include <QMovie>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QFileInfo>
+#include <QImageReader>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTimer>
 #include <libcockatrice/settings/paths_settings.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
index 44163d1db..009897acc 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
@@ -1,8 +1,15 @@
 #ifndef PICTURE_LOADER_LOCAL_H
 #define PICTURE_LOADER_LOCAL_H
 
-#include <QTimer>
-#include <libcockatrice/card/printing/exact_card.h>
+#include <QImage>
+#include <QLoggingCategory>
+#include <QMultiHash>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QTimer;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
index d1895af06..98364e3cb 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
@@ -1,5 +1,11 @@
 #include "card_picture_loader_request_status_display_widget.h"
 
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QHBoxLayout>
+#include <QUrl>
+
 CardPictureLoaderRequestStatusDisplayWidget::CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent,
                                                                                          const QUrl &_url,
                                                                                          const ExactCard &card,
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
index c9a272b68..58051cc1e 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
@@ -1,11 +1,16 @@
 #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QDateTime>
 #include <QLabel>
-#include <QUrl>
+#include <QSharedPointer>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QHBoxLayout;
+class QUrl;
 
 /**
  * @class CardPictureLoaderRequestStatusDisplayWidget
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
index 9e7e645bd..3b26c8033 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
@@ -1,7 +1,19 @@
 #include "card_picture_loader_status_bar.h"
 
+#include "../widgets/quick_settings/settings_button_widget.h"
+#include "../widgets/quick_settings/settings_popup_widget.h"
 #include "card_picture_loader_request_status_display_widget.h"
 
+#include <QDateTime>
+#include <QHBoxLayout>
+#include <QList>
+#include <QProgressBar>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QUrl>
+
+class ExactCard;
+
 CardPictureLoaderStatusBar::CardPictureLoaderStatusBar(QWidget *parent) : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
index 7f1f509db..2ba386c42 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
@@ -1,12 +1,16 @@
 #ifndef PICTURE_LOADER_STATUS_BAR_H
 #define PICTURE_LOADER_STATUS_BAR_H
 
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
-#include "card_picture_loader_worker_work.h"
-
-#include <QHBoxLayout>
-#include <QProgressBar>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QHBoxLayout;
+class QProgressBar;
+class QTimer;
+class QUrl;
+class SettingsButtonWidget;
 
 /**
  * @class CardPictureLoaderStatusBar
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
index 0fd6a42d5..150b4c544 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
@@ -4,15 +4,34 @@
 #include "card_picture_loader_cache_method.h"
 #include "card_picture_loader_local.h"
 #include "card_picture_loader_worker_work.h"
+#include "card_picture_to_load.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/server_rate_limiter.h"
 
-#include <QDirIterator>
-#include <QMovie>
+#include <QAbstractNetworkCache>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
+#include <QImage>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QNetworkAccessManager>
+#include <QNetworkCacheMetaData>
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QSettings>
+#include <QSharedPointer>
 #include <QThread>
+#include <QVariant>
+#include <QtGlobal>
+#include <compare>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qnamespace.h>
 #include <utility>
 #include <version_string.h>
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
index 8b136f309..4b42c6e59 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
@@ -1,21 +1,25 @@
 #ifndef PICTURE_LOADER_WORKER_H
 #define PICTURE_LOADER_WORKER_H
 
-#include "card_picture_loader_local.h"
-#include "card_picture_loader_worker_work.h"
-#include "card_picture_to_load.h"
-
-#include <QDateTime>
 #include <QHash>
 #include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 #include <QObject>
+#include <QPair>
 #include <QQueue>
+#include <QSet>
+#include <QString>
 #include <QTimer>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/card/database/card_database.h>
+#include <QUrl>
+#include <qtmetamacros.h>
+
+class CardPictureLoaderLocal;
+class ExactCard;
+class QDateTime;
+class QImage;
+class QNetworkAccessManager;
+class QNetworkDiskCache;
+class QNetworkReply;
+class QThread;
 
 #define REDIRECT_HEADER_NAME "redirects"
 #define REDIRECT_ORIGINAL_URL "original"
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
index 19c6be469..92524384a 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
@@ -2,19 +2,35 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "card_picture_loader_worker.h"
+#include "card_picture_to_load.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/server_rate_limiter.h"
 
 #include <QBuffer>
-#include <QDirIterator>
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QDateTime>
+#include <QDebug>
+#include <QImageReader>
+#include <QList>
 #include <QLoggingCategory>
+#include <QMessageLogger>
 #include <QMovie>
 #include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QRandomGenerator>
-#include <QThread>
-#include <QThreadPool>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QTimer>
+#include <QUrl>
+#include <QVariant>
 
 ServerRateLimiter CardPictureLoaderWorkerWork::s_rateLimiter;
+#include <QtGlobal>
 #include <libcockatrice/settings/download_settings.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 
 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
index 84a7dafdb..c3dbcc6e8 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
@@ -1,19 +1,18 @@
 #ifndef PICTURE_LOADER_WORKER_WORK_H
 #define PICTURE_LOADER_WORKER_WORK_H
 
-#include "card_picture_loader_worker.h"
 #include "card_picture_to_load.h"
 
-#include <QDateTime>
+#include <QImage>
 #include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
 #include <QObject>
-#include <QRandomGenerator>
 #include <QString>
-#include <QThread>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/utility/server_rate_limiter.h>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QNetworkReply;
+class QUrl;
+class ServerRateLimiter;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerWorkLog, "card_picture_loader.worker");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
index 4f933207e..e35c417c8 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
@@ -1,12 +1,22 @@
 #include "card_picture_to_load.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
-#include <QCoreApplication>
 #include <QDate>
+#include <QDebug>
+#include <QMap>
+#include <QMessageLogger>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
+#include <QSharedPointer>
 #include <QUrl>
+#include <QtGlobal>
 #include <algorithm>
+#include <functional>
 #include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/cards_display_settings.h>
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
index 9e0e7449c..fe56dc4c6 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
@@ -1,6 +1,12 @@
 #ifndef PICTURE_TO_LOAD_H
 #define PICTURE_TO_LOAD_H
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QList>
+#include <QLoggingCategory>
+#include <QSharedPointer>
+#include <QString>
 #include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.cpp b/cockatrice/src/interface/deck_loader/card_node_function.cpp
index 9441fe428..0934b34da 100644
--- a/cockatrice/src/interface/deck_loader/card_node_function.cpp
+++ b/cockatrice/src/interface/deck_loader/card_node_function.cpp
@@ -1,5 +1,12 @@
 #include "card_node_function.h"
 
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.cpp b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
index 3c88cde4e..ba5a44e4c 100644
--- a/cockatrice/src/interface/deck_loader/deck_file_format.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
@@ -1,5 +1,7 @@
 #include "deck_file_format.h"
 
+#include <qnamespace.h>
+
 DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
 {
     if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
index f29b4eed2..d413a6c04 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp
@@ -1,26 +1,51 @@
 #include "deck_loader.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+
 #include <QApplication>
 #include <QClipboard>
+#include <QDateTime>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
+#include <QFileDevice>
 #include <QFileInfo>
-#include <QFutureWatcher>
+#include <QFont>
+#include <QFuture>
+#include <QIODevice>
+#include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QMultiMap>
 #include <QPrinter>
 #include <QRegularExpression>
 #include <QSaveFile>
+#include <QSet>
+#include <QSharedPointer>
 #include <QStringList>
+#include <QTextBlockFormat>
+#include <QTextCharFormat>
 #include <QTextCursor>
 #include <QTextDocument>
+#include <QTextLength>
 #include <QTextStream>
 #include <QTextTable>
+#include <QTextTableCell>
+#include <QTextTableFormat>
+#include <QVector>
 #include <QtConcurrentRun>
-#include <libcockatrice/card/database/card_database.h>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <qnamespace.h>
+
+class QTextLength;
 
 const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
 
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
index be0df311d..16402b14b 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ b/cockatrice/src/interface/deck_loader/deck_loader.h
@@ -7,13 +7,23 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
+#include "deck_file_format.h"
 #include "loaded_deck.h"
 
 #include <QLoggingCategory>
-#include <QPrinter>
-#include <QTextCursor>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <optional>
+#include <qtmetamacros.h>
+
+class DeckList;
+class DecklistCardNode;
+class InnerDecklistNode;
+class QPrinter;
+class QTextCursor;
+class QTextStream;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
 
diff --git a/cockatrice/src/interface/intents/intent.h b/cockatrice/src/interface/intents/intent.h
index 5d9fdd3d6..ad8d4b5af 100644
--- a/cockatrice/src/interface/intents/intent.h
+++ b/cockatrice/src/interface/intents/intent.h
@@ -2,6 +2,8 @@
 #define COCKATRICE_INTENT_H
 
 #include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class Intent : public QObject
 {
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.cpp b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
index 1cccc5a23..42ddc97cc 100644
--- a/cockatrice/src/interface/intents/intent_connect_to_server.cpp
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
@@ -1,8 +1,14 @@
 #include "intent_connect_to_server.h"
 
+#include "contexts/context_connect_to_server.h"
 #include "intent_disconnect_from_server.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "remote_client.h"
 
 #include <QTimer>
+#include <QtGlobal>
+
+template <typename T> class QList;
 
 IntentConnectToServer::IntentConnectToServer(RemoteClient *_remoteClient, ContextConnectToServer *_context)
     : Intent(), remoteClient(_remoteClient), context(_context)
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.h b/cockatrice/src/interface/intents/intent_connect_to_server.h
index eab4d1a21..50d7f088b 100644
--- a/cockatrice/src/interface/intents/intent_connect_to_server.h
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.h
@@ -1,9 +1,14 @@
 #ifndef COCKATRICE_INTENT_CONNECT_TO_SERVER_H
 #define COCKATRICE_INTENT_CONNECT_TO_SERVER_H
 
-#include "contexts/context_connect_to_server.h"
+#include "abstract_client.h"
 #include "intent.h"
-#include "remote_client.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class RemoteClient;
+struct ContextConnectToServer;
 
 class IntentConnectToServer : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
index cb39d7bab..e865c4a2b 100644
--- a/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
@@ -1,5 +1,7 @@
 #include "intent_disconnect_from_server.h"
 
+#include "remote_client.h"
+
 IntentDisconnectFromServer::IntentDisconnectFromServer(RemoteClient *_remoteClient)
     : Intent(), remoteClient(_remoteClient)
 {
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.h b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
index 6e1dfd0c1..5425e973b 100644
--- a/cockatrice/src/interface/intents/intent_disconnect_from_server.h
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
@@ -1,8 +1,12 @@
 #ifndef COCKATRICE_INTENT_DISCONNECT_FROM_SERVER_H
 #define COCKATRICE_INTENT_DISCONNECT_FROM_SERVER_H
 
+#include "abstract_client.h"
 #include "intent.h"
-#include "remote_client.h"
+
+#include <qtmetamacros.h>
+
+class RemoteClient;
 
 class IntentDisconnectFromServer : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.cpp b/cockatrice/src/interface/intents/intent_join_server_game.cpp
index b22b200ed..52e02b276 100644
--- a/cockatrice/src/interface/intents/intent_join_server_game.cpp
+++ b/cockatrice/src/interface/intents/intent_join_server_game.cpp
@@ -3,9 +3,17 @@
 #include "../widgets/server/game_selector.h"
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
+#include "abstract_client.h"
+#include "contexts/context_connect_to_server.h"
+#include "contexts/context_join_room.h"
 #include "intent_join_server_room.h"
+#include "remote_client.h"
 
+#include <QMap>
+#include <QSharedPointer>
+#include <QString>
 #include <QTimer>
+#include <qnamespace.h>
 
 IntentJoinServerGame::IntentJoinServerGame(TabSupervisor *_tabSupervisor,
                                            RemoteClient *_remoteClient,
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.h b/cockatrice/src/interface/intents/intent_join_server_game.h
index 5e196df38..5abb31fc5 100644
--- a/cockatrice/src/interface/intents/intent_join_server_game.h
+++ b/cockatrice/src/interface/intents/intent_join_server_game.h
@@ -3,13 +3,14 @@
 
 #include "contexts/context_join_game.h"
 #include "intent.h"
-#include "remote_client.h"
 
 #include <QScopedPointer>
 #include <memory>
+#include <qtmetamacros.h>
 
 class TabRoom;
 class TabSupervisor;
+class RemoteClient;
 
 class IntentJoinServerGame : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.cpp b/cockatrice/src/interface/intents/intent_join_server_room.cpp
index d25bc8d17..24349cadf 100644
--- a/cockatrice/src/interface/intents/intent_join_server_room.cpp
+++ b/cockatrice/src/interface/intents/intent_join_server_room.cpp
@@ -3,8 +3,15 @@
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_server.h"
 #include "../widgets/tabs/tab_supervisor.h"
+#include "abstract_client.h"
+#include "contexts/context_connect_to_server.h"
+#include "contexts/context_join_room.h"
 #include "intent_connect_to_server.h"
+#include "remote_client.h"
 
+#include <QMap>
+#include <QSharedPointer>
+#include <QString>
 #include <QTimer>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.h b/cockatrice/src/interface/intents/intent_join_server_room.h
index 4a5599896..b4febae7b 100644
--- a/cockatrice/src/interface/intents/intent_join_server_room.h
+++ b/cockatrice/src/interface/intents/intent_join_server_room.h
@@ -1,11 +1,13 @@
 #ifndef COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
 #define COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
 
-#include "contexts/context_join_room.h"
 #include "intent.h"
-#include "remote_client.h"
+
+#include <qtmetamacros.h>
 
 class TabSupervisor;
+class RemoteClient;
+struct ContextJoinRoom;
 
 class IntentJoinServerRoom : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp
index 7beb63e1d..0d8390015 100644
--- a/cockatrice/src/interface/intents/intent_login.cpp
+++ b/cockatrice/src/interface/intents/intent_login.cpp
@@ -2,9 +2,13 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../widgets/dialogs/dlg_login_prompt.h"
+#include "contexts/context_connect_to_server.h"
 #include "libcockatrice/settings/servers_settings.h"
 
 #include <QDialog>
+#include <QString>
+#include <QVariant>
+#include <qnamespace.h>
 
 IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context,
                                                      bool _promptForMissingCredentials)
diff --git a/cockatrice/src/interface/intents/intent_login.h b/cockatrice/src/interface/intents/intent_login.h
index 8ffd91a0a..a805f1d75 100644
--- a/cockatrice/src/interface/intents/intent_login.h
+++ b/cockatrice/src/interface/intents/intent_login.h
@@ -1,9 +1,12 @@
 #ifndef COCKATRICE_INTENT_LOGIN_H
 #define COCKATRICE_INTENT_LOGIN_H
 
-#include "contexts/context_connect_to_server.h"
 #include "intent.h"
 
+#include <qtmetamacros.h>
+
+struct ContextConnectToServer;
+
 class IntentGetLoginCredentials : public Intent
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.cpp b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
index 2457bec72..5b673d106 100644
--- a/cockatrice/src/interface/intents/intent_open_local_deck.cpp
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
@@ -2,10 +2,14 @@
 
 #include "../deck_loader/deck_file_format.h"
 #include "../deck_loader/deck_loader.h"
+#include "../deck_loader/loaded_deck.h"
 #include "../widgets/tabs/tab_supervisor.h"
 #include "intent_wait_for_database_load.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <optional>
 
 IntentOpenLocalDeck::IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file)
     : Intent(), tabSupervisor(_tabSupervisor), file(_file)
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.h b/cockatrice/src/interface/intents/intent_open_local_deck.h
index 97f875e39..0338e9384 100644
--- a/cockatrice/src/interface/intents/intent_open_local_deck.h
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.h
@@ -4,6 +4,7 @@
 #include "intent.h"
 
 #include <QString>
+#include <qtmetamacros.h>
 
 class TabSupervisor;
 
diff --git a/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp b/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
index d50f509a0..63aef004b 100644
--- a/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
@@ -2,13 +2,22 @@
 
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
+#include "contexts/context_connect_to_server.h"
 #include "intent_connect_to_server.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
+#include "remote_client.h"
 
+#include <QMap>
+#include <QSharedPointer>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/response_join_room.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
+class CommandContainer;
+class QVariant;
+
 IntentOpenServerRoomByName::IntentOpenServerRoomByName(TabSupervisor *_tabSupervisor,
                                                        RemoteClient *_remoteClient,
                                                        std::unique_ptr<ContextJoinRoom> _context,
diff --git a/cockatrice/src/interface/intents/intent_open_server_room_by_name.h b/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
index 2f9e716af..e163796fc 100644
--- a/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
@@ -1,19 +1,21 @@
 #ifndef COCKATRICE_INTENT_OPEN_SERVER_ROOM_BY_NAME_H
 #define COCKATRICE_INTENT_OPEN_SERVER_ROOM_BY_NAME_H
 
+#include "abstract_client.h"
 #include "contexts/context_join_room.h"
 #include "intent.h"
-#include "remote_client.h"
 
 #include <QScopedPointer>
 #include <QString>
 #include <QTimer>
 #include <memory>
+#include <qtmetamacros.h>
 
-class TabRoom;
 class TabSupervisor;
 class Event_ListRooms;
 class ServerInfo_Room;
+class RemoteClient;
+class Response;
 
 /**
  * @brief Connects to the configured server and opens a room identified by its name.
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
index 016de63e6..8abad3d88 100644
--- a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
@@ -3,11 +3,17 @@
 #include "../deck_loader/deck_loader.h"
 #include "../widgets/dialogs/dlg_shared_decks_preview.h"
 #include "../widgets/tabs/tab_supervisor.h"
+#include "abstract_client.h"
+#include "contexts/context_connect_to_server.h"
 #include "intent_connect_to_server.h"
+#include "remote_client.h"
 
+#include <QDebug>
 #include <QMessageBox>
+#include <QSharedPointer>
 #include <QTimer>
-#include <libcockatrice/card/database/card_database_querier.h>
+#include <QWidget>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/protocol/pb/command_deck_share_download.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_share_list.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -15,6 +21,11 @@
 #include <libcockatrice/protocol/pb/response_deck_share_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <optional>
+#include <qnamespace.h>
+#include <string>
+
+class CommandContainer;
 
 IntentOpenSharedDeck::IntentOpenSharedDeck(TabSupervisor *_tabSupervisor,
                                            RemoteClient *_remoteClient,
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h
index 87812bdea..afce2370f 100644
--- a/cockatrice/src/interface/intents/intent_open_shared_deck.h
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.h
@@ -1,20 +1,24 @@
 #ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 #define COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 
+#include "../deck_loader/loaded_deck.h"
 #include "contexts/context_open_deck.h"
 #include "intent.h"
-#include "remote_client.h"
 
 #include <QList>
 #include <QMap>
 #include <QScopedPointer>
+#include <QString>
 #include <memory>
+#include <qtmetamacros.h>
 
 class TabSupervisor;
-struct LoadedDeck;
 class CardDatabaseQuerier;
 class DlgSharedDecksPreview;
 class QTimer;
+class CommandContainer;
+class RemoteClient;
+class Response;
 
 class IntentOpenSharedDeck : public Intent
 {
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
index c36378818..7a7da90a4 100644
--- a/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
@@ -1,5 +1,8 @@
 #include "intent_wait_for_database_load.h"
 
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+
 #include <libcockatrice/card/database/card_database_manager.h>
 
 bool IntentWaitForDatabaseLoad::checkPrecondition() const
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.h b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
index 72f4a1ffc..715918f04 100644
--- a/cockatrice/src/interface/intents/intent_wait_for_database_load.h
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
@@ -3,6 +3,8 @@
 
 #include "intent.h"
 
+#include <qtmetamacros.h>
+
 class IntentWaitForDatabaseLoad : public Intent
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp
index 707863354..966fd1213 100644
--- a/cockatrice/src/interface/intents/url_parser.cpp
+++ b/cockatrice/src/interface/intents/url_parser.cpp
@@ -4,22 +4,34 @@
 #include "../widgets/tabs/tab_room.h"
 #include "../widgets/tabs/tab_supervisor.h"
 #include "../window_main.h"
+#include "contexts/context_connect_to_server.h"
 #include "contexts/context_join_game.h"
+#include "contexts/context_join_room.h"
 #include "contexts/context_open_deck.h"
 #include "intent.h"
 #include "intent_join_server_game.h"
 #include "intent_login.h"
 #include "intent_open_shared_deck.h"
+#include "remote_client.h"
 
 #include <QDebug>
 #include <QLoggingCategory>
+#include <QMap>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStringLiteral>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/settings/servers_settings.h>
 #include <memory>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(UrlParserLog, "url_parser");
 
diff --git a/cockatrice/src/interface/intents/url_parser.h b/cockatrice/src/interface/intents/url_parser.h
index ea29fed53..9b8594275 100644
--- a/cockatrice/src/interface/intents/url_parser.h
+++ b/cockatrice/src/interface/intents/url_parser.h
@@ -2,8 +2,11 @@
 #define COCKATRICE_URL_PARSER_H
 
 #include <QList>
+#include <QMetaObject>
 #include <QObject>
+#include <QString>
 #include <QUrlQuery>
+#include <qtmetamacros.h>
 
 class Intent;
 class MainWindow;
diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp
index a78997cc2..4c3074139 100644
--- a/cockatrice/src/interface/key_signals.cpp
+++ b/cockatrice/src/interface/key_signals.cpp
@@ -1,6 +1,9 @@
 #include "key_signals.h"
 
+#include <QEvent>
+#include <QFlags>
 #include <QKeyEvent>
+#include <qnamespace.h>
 
 bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event)
 {
diff --git a/cockatrice/src/interface/key_signals.h b/cockatrice/src/interface/key_signals.h
index 30dcee0ba..dbe147ad8 100644
--- a/cockatrice/src/interface/key_signals.h
+++ b/cockatrice/src/interface/key_signals.h
@@ -8,8 +8,8 @@
 #ifndef KEYSIGNALS_H
 #define KEYSIGNALS_H
 
-#include <QEvent>
 #include <QObject>
+#include <qtmetamacros.h>
 
 class KeySignals : public QObject
 {
diff --git a/cockatrice/src/interface/layouts/flow_layout.cpp b/cockatrice/src/interface/layouts/flow_layout.cpp
index 0d03b7789..ba5e492e3 100644
--- a/cockatrice/src/interface/layouts/flow_layout.cpp
+++ b/cockatrice/src/interface/layouts/flow_layout.cpp
@@ -15,13 +15,18 @@
 
 #include "flow_layout.h"
 
-#include "../widgets/general/layout_containers/flow_widget.h"
-
 #include <QDebug>
 #include <QLayoutItem>
-#include <QScrollArea>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
+#include <QSizePolicy>
 #include <QStyle>
+#include <QWidget>
 #include <QWidgetItem>
+#include <QtGlobal>
 
 FlowLayout::FlowLayout(QWidget *parent,
                        const Qt::Orientation flowDirection,
diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h
index 9adcd8bb5..a6e015e3e 100644
--- a/cockatrice/src/interface/layouts/flow_layout.h
+++ b/cockatrice/src/interface/layouts/flow_layout.h
@@ -12,8 +12,14 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
+#include <QSize>
 #include <QStyle>
-#include <QWidget>
+#include <QVector>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class QLayoutItem;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout", QtInfoMsg);
 
diff --git a/cockatrice/src/interface/layouts/overlap_layout.cpp b/cockatrice/src/interface/layouts/overlap_layout.cpp
index a4c13518a..2b4da9138 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.cpp
+++ b/cockatrice/src/interface/layouts/overlap_layout.cpp
@@ -1,7 +1,15 @@
 #include "overlap_layout.h"
 
 #include <QDebug>
+#include <QLayoutItem>
+#include <QMargins>
+#include <QMessageLogger>
+#include <QRect>
+#include <QWidget>
+#include <QWidgetItem>
+#include <QtGlobal>
 #include <QtMath>
+#include <limits.h>
 
 /**
  * @class OverlapLayout
diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h
index c1b6a8e51..32c74c18a 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.h
+++ b/cockatrice/src/interface/layouts/overlap_layout.h
@@ -10,7 +10,11 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QWidget>
+#include <QSize>
+#include <qnamespace.h>
+
+class QLayoutItem;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(OverlapLayoutLog, "overlap_layout");
 
diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/interface/logger.cpp
index 3e00a0b24..87fdcbd8c 100644
--- a/cockatrice/src/interface/logger.cpp
+++ b/cockatrice/src/interface/logger.cpp
@@ -5,9 +5,16 @@
 #include <QApplication>
 #include <QDateTime>
 #include <QDebug>
+#include <QFlags>
+#include <QIODevice>
 #include <QLocale>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QMutexLocker>
 #include <QSysInfo>
 #include <iostream>
+#include <qconfig.h>
+#include <qnamespace.h>
 
 #define LOGGER_MAX_ENTRIES 128
 #define LOGGER_FILENAME "qdebug.txt"
diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/interface/logger.h
index fc6dd70be..2287da804 100644
--- a/cockatrice/src/interface/logger.h
+++ b/cockatrice/src/interface/logger.h
@@ -8,10 +8,15 @@
 #define LOGGER_H
 
 #include <QFile>
+#include <QList>
 #include <QMutex>
+#include <QObject>
 #include <QString>
 #include <QTextStream>
-#include <QVector>
+#include <qlogging.h>
+#include <qprocessordetection.h>
+#include <qtmetamacros.h>
+#include <string>
 
 #if defined(Q_PROCESSOR_X86_32)
 #define BUILD_ARCHITECTURE "32-bit"
diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp
index e1a490d20..a7db23d31 100644
--- a/cockatrice/src/interface/palette_editor/color_button.cpp
+++ b/cockatrice/src/interface/palette_editor/color_button.cpp
@@ -1,7 +1,19 @@
 #include "color_button.h"
 
+#include <QBrush>
 #include <QColorDialog>
+#include <QFont>
+#include <QIcon>
 #include <QPainter>
+#include <QPalette>
+#include <QPen>
+#include <QPixmap>
+#include <QRectF>
+#include <QSize>
+#include <QString>
+#include <qnamespace.h>
+
+class QWidget;
 
 ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
 {
diff --git a/cockatrice/src/interface/palette_editor/color_button.h b/cockatrice/src/interface/palette_editor/color_button.h
index 4b139ef68..f9991ec6b 100644
--- a/cockatrice/src/interface/palette_editor/color_button.h
+++ b/cockatrice/src/interface/palette_editor/color_button.h
@@ -3,6 +3,9 @@
 
 #include <QColor>
 #include <QToolButton>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 class ColorButton : public QToolButton
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
index d5a168708..20e16614a 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
@@ -1,5 +1,6 @@
 #include "palette_editor_dialog.h"
 
+#include "../theme_config.h"
 #include "../theme_manager.h"
 #include "palette_generator.h"
 #include "palette_grid_widget.h"
@@ -9,12 +10,22 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QDir>
+#include <QEvent>
 #include <QFile>
 #include <QFrame>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
+#include <QPalette>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <initializer_list>
+#include <qnamespace.h>
 
 PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QString &_themeName, QWidget *parent)
     : QDialog(parent), themeDirPath(_themeDirPath), themeName(_themeName)
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
index 953902c06..e29a70cb0 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
@@ -3,18 +3,21 @@
 
 #include "../theme_config.h"
 
+#include <QColor>
 #include <QDialog>
-#include <QFrame>
 #include <QMap>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QTimer;
-
 class QLabel;
 class QComboBox;
 class QDialogButtonBox;
 class QPushButton;
 class PaletteGridWidget;
 class QuickSetupPanel;
+class QFrame;
+class QWidget;
 
 class PaletteEditorDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_generator.cpp b/cockatrice/src/interface/palette_editor/palette_generator.cpp
index 822e57250..c98dcbe03 100644
--- a/cockatrice/src/interface/palette_editor/palette_generator.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_generator.cpp
@@ -1,6 +1,13 @@
 #include "palette_generator.h"
 
+#include "../theme_config.h"
+
 #include <QColor>
+#include <QMap>
+#include <QPalette>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 // ════════════════════════════════════════════════════════════════════════════
 //  PaletteGenerator::fromAccent
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
index 97d28b731..de069bc80 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
@@ -1,14 +1,25 @@
 #include "palette_grid_widget.h"
 
+#include "../theme_config.h"
 #include "../theme_manager.h"
+#include "color_button.h"
 
 #include <QApplication>
+#include <QColor>
+#include <QEvent>
+#include <QFont>
+#include <QFrame>
 #include <QGridLayout>
 #include <QLabel>
 #include <QMetaEnum>
 #include <QScrollArea>
+#include <QString>
+#include <QStringList>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <utility>
 
 static QList<QPalette::ColorRole> allRoles()
 {
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
index 77cbf1c62..f1ff41ec2 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
@@ -2,15 +2,19 @@
 #define COCKATRICE_PALETTE_GRID_WIDGET_H
 
 #include "../theme_config.h"
-#include "color_button.h"
 
+#include <QList>
 #include <QMap>
 #include <QPalette>
-#include <QVBoxLayout>
+#include <QVector>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QLabel;
 class QScrollArea;
+class ColorButton;
+class QVBoxLayout;
+
 // Scrollable grid of ColorButtons — one per (ColorGroup × ColorRole) cell.
 // Owns the load/read round-trip for PaletteConfig but has no file I/O itself.
 class PaletteGridWidget : public QWidget
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
index 85098bde5..04f98dcc3 100644
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
@@ -1,9 +1,15 @@
 #include "quick_setup_panel.h"
 
+#include "color_button.h"
+
 #include <QApplication>
+#include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPalette>
 #include <QSlider>
+#include <QString>
+#include <qnamespace.h>
 
 QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.h b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
index c83e27cf2..ea402086f 100644
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.h
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
@@ -1,13 +1,14 @@
 #ifndef COCKATRICE_QUICK_SETUP_PANEL_H
 #define COCKATRICE_QUICK_SETUP_PANEL_H
 
-#include "color_button.h"
-
+#include <QColor>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QHBoxLayout;
 class QLabel;
 class QSlider;
+class ColorButton;
 
 /**
  * @class QuickSetupPanel
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index b70dc576f..2f5c4b6dd 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -1,15 +1,37 @@
 #include "pixel_map_generator.h"
 
+#include "libcockatrice/network/server/remote/user_level.h"
 #include "theme_manager.h"
 
 #include <QApplication>
+#include <QBrush>
+#include <QByteArray>
+#include <QChar>
+#include <QColor>
+#include <QDebug>
 #include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
+#include <QDomNodeList>
 #include <QFile>
+#include <QIODevice>
+#include <QImage>
 #include <QImageReader>
+#include <QLatin1Char>
+#include <QLatin1String>
+#include <QMessageLogger>
 #include <QPainter>
 #include <QPalette>
+#include <QPointF>
+#include <QRadialGradient>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringLiteral>
 #include <QSvgRenderer>
+#include <QtGlobal>
+#include <initializer_list>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qnamespace.h>
 
 #define DEFAULT_COLOR_UNREGISTERED "#32c8ec";
 #define DEFAULT_COLOR_REGISTERED "#5ed900";
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index b6e822fd9..7c01bb332 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -7,14 +7,20 @@
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 #include <QHash>
 #include <QIcon>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QPixmap>
+#include <QString>
+#include <QStringView>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <optional>
 
+class QSize;
+
 inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");
 
 class PhasePixmapGenerator
diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
index 8293a82cf..652e322c8 100644
--- a/cockatrice/src/interface/theme_config.cpp
+++ b/cockatrice/src/interface/theme_config.cpp
@@ -1,9 +1,17 @@
 #include "theme_config.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QDir>
 #include <QFile>
+#include <QFlags>
+#include <QIODevice>
+#include <QList>
 #include <QMetaEnum>
+#include <QPair>
 #include <QTextStream>
+#include <qnamespace.h>
+#include <utility>
 
 bool ThemeConfig::isEmpty() const
 {
diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h
index 567aeccda..8b91613f5 100644
--- a/cockatrice/src/interface/theme_config.h
+++ b/cockatrice/src/interface/theme_config.h
@@ -3,9 +3,10 @@
 
 #include <QColor>
 #include <QMap>
-#include <QObject>
 #include <QPalette>
+#include <QSharedPointer>
 #include <QString>
+#include <qtmetamacros.h>
 
 // Application-specific color roles, layered on top of the fixed QPalette role
 // set. Stored in the same palette-<scheme>.toml under an [AppColors] section
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index 08374c8fd..cbf869639 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -2,25 +2,40 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "pixel_map_generator.h"
+#include "theme_config.h"
 
 #include <QApplication>
+#include <QChar>
 #include <QColor>
 #include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QLibraryInfo>
+#include <QFlags>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QLatin1Char>
+#include <QList>
 #include <QMap>
+#include <QMessageLogger>
 #include <QMetaEnum>
 #include <QPalette>
+#include <QPixmap>
 #include <QPixmapCache>
-#include <QStandardPaths>
+#include <QSharedPointer>
 #include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QStyle>
 #include <QStyleFactory>
 #include <QStyleHints>
+#include <QTextStream>
 #include <QWidget>
 #include <Qt>
+#include <QtGlobal>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qlogging.h>
+#include <qnumeric.h>
 
 #define SYSTEM_THEME_NAME "System"
 #define LEGACY_SYSTEM_THEME_NAME "Default"
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index 4c9d070dc..c1ab65685 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -10,21 +10,21 @@
 #include "theme_config.h"
 
 #include <QBrush>
-#include <QDir>
+#include <QColor>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
-#include <QPixmap>
+#include <QPalette>
 #include <QString>
+#include <QStringView>
 #include <array>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager");
 
 typedef QMap<QString, QString> QStringMap;
 typedef QMap<int, QBrush> QBrushMap;
 
-class QApplication;
-
 class ThemeManager : public QObject
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
index 2199faf30..ef7fb0e0e 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -1,15 +1,24 @@
 #include "color_identity_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
+#include <QChar>
 #include <QHBoxLayout>
-#include <QLabel>
+#include <QLayoutItem>
+#include <QList>
+#include <QObject>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
+#include <QSharedPointer>
 #include <QSize>
+#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
+#include <qnamespace.h>
 
 ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
     : QWidget(parent), colorIdentity(_colorIdentity)
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
index 315ac07d6..3caf1a964 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
@@ -7,9 +7,13 @@
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ColorIdentityWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
index 62b01511e..13c185a79 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
@@ -1,6 +1,11 @@
 #include "deck_color_identity.h"
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QChar>
+#include <QList>
 #include <QSet>
+#include <QStringList>
 #include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
index fcbb69c2e..7da97f88c 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
@@ -1,12 +1,16 @@
 #include "mana_cost_widget.h"
 
+#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>
-#include <QLabel>
+#include <QList>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
 #include <QSize>
-#include <qregularexpression.h>
+#include <QtGlobal>
 
 ManaCostWidget::ManaCostWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
index 8bd2e9bc0..a181f1148 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
@@ -7,9 +7,13 @@
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ManaCostWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
index 18011909f..80dc11852 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
@@ -3,8 +3,16 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../pixel_map_generator.h"
 
+#include <QGraphicsOpacityEffect>
+#include <QPixmap>
 #include <QResizeEvent>
+#include <QSharedPointer>
+#include <QSize>
+#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <utility>
+
+class QWidget;
 
 ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
     : QLabel(parent), symbol(std::move(_symbol)), isActive(_isActive), mayBeToggled(_mayBeToggled)
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
index 705873dff..8dad15785 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
@@ -7,8 +7,13 @@
 #ifndef MANA_SYMBOL_WIDGET_H
 #define MANA_SYMBOL_WIDGET_H
 
-#include <QGraphicsOpacityEffect>
+#include <QChar>
 #include <QLabel>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QGraphicsOpacityEffect;
+class QWidget;
 
 class ManaSymbolWidget : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
index 8ab18ddd9..c4b347047 100644
--- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
@@ -1,8 +1,17 @@
 #include "art_crop_attribution.h"
 
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QColor>
+#include <QFont>
 #include <QFontMetrics>
 #include <QObject>
 #include <QPainter>
+#include <QPointF>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
 
 QString buildArtAttribution(const ExactCard &card)
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.h b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
index 0b3fb3d56..b4acbef26 100644
--- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
@@ -1,7 +1,8 @@
 #ifndef COCKATRICE_ART_CROP_ATTRIBUTION_H
 #define COCKATRICE_ART_CROP_ATTRIBUTION_H
 
-#include <QStringView>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 class ExactCard;
 class QPainter;
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
index b26b73593..ebf79282e 100644
--- a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
@@ -1,7 +1,10 @@
 #include "card_art_utils.h"
 
+#include "libcockatrice/card/card_info.h"
+
 #include <QTransform>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qnamespace.h>
 
 namespace CardArtUtils
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
index 8df3700c3..b15ac5d23 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
@@ -1,13 +1,33 @@
 #include "card_group_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "../../general/display/banner_widget.h"
+#include "../card_info_picture_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
+#include "../card_size_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QResizeEvent>
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+#include <QDebug>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QModelIndex>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSlider>
+#include <QStringLiteral>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+#include <utility>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
index e5f7c7ee2..f4a555766 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
@@ -7,15 +7,24 @@
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include "../../general/display/banner_widget.h"
-#include "../card_info_picture_with_text_overlay_widget.h"
-#include "../card_size_widget.h"
-
-#include <QItemSelectionModel>
-#include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QVector>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
 
 class CardGroupDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
index a192d13d8..3256e0ca8 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
@@ -1,10 +1,20 @@
 #include "flat_card_group_display_widget.h"
 
-#include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include "../../general/display/banner_widget.h"
+#include "../../general/layout_containers/flow_widget.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QMap>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
 #include <utility>
 
+class CardSizeWidget;
+class QItemSelectionModel;
+
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
                                                        DeckListModel *_deckListModel,
                                                        QItemSelectionModel *_selectionModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
index 0772c1ab4..d13dcddb5 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
@@ -10,6 +10,16 @@
 #include "../../general/layout_containers/flow_widget.h"
 #include "card_group_display_widget.h"
 
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QItemSelectionModel;
+class QWidget;
+
 class FlatCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
index dca8ee2a5..6e923cdbe 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -1,8 +1,20 @@
 #include "overlapped_card_group_display_widget.h"
 
+#include "../../general/display/banner_widget.h"
+#include "../../general/layout_containers/overlap_widget.h"
+#include "../card_size_widget.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QMap>
 #include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QSlider>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class QItemSelectionModel;
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
index 5b4b80d6b..76be3069f 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
@@ -10,6 +10,16 @@
 #include "../../general/layout_containers/overlap_widget.h"
 #include "card_group_display_widget.h"
 
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QItemSelectionModel;
+class QWidget;
+
 class OverlappedCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
index 577dafe0a..7ec2ee38e 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,14 +1,25 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
+#include "../../../game_graphics/card_dimensions.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/card_ref.h"
 
-#include <QApplication>
+#include <QGuiApplication>
+#include <QObject>
+#include <QRect>
 #include <QScreen>
+#include <QSize>
+#include <QString>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 
+class QWidget;
+
 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
     : QFrame(parent, flags), aspectRatio(CardDimensions::HEIGHT_F / CardDimensions::WIDTH_F)
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
index f8f33f3d4..65965a63e 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -7,15 +7,17 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
-#include <QComboBox>
 #include <QFrame>
-#include <QStringList>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class AbstractCardItem;
+class QWidget;
+struct CardRef;
 
 class CardInfoDisplayWidget : public QFrame
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
index fcccf445a..0f66eb209 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,16 +1,27 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.h"
-#include "card_info_display_widget.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
+#include <QList>
+#include <QObject>
+#include <QPushButton>
 #include <QSplitter>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+struct CardRef;
 
 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
index e766fac7a..1f8143785 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -7,16 +7,19 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include <QPushButton>
+#include <QString>
 #include <QTabWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
 
 class AbstractCardItem;
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class QVBoxLayout;
 class QSplitter;
+class QPushButton;
+class QWidget;
+struct CardRef;
 
 class CardInfoFrameWidget : public QTabWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
index e5b0c4872..5ec4c8a25 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
@@ -1,6 +1,12 @@
 #include "card_info_picture_art_crop_widget.h"
 
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "libcockatrice/card/printing/exact_card.h"
+
+#include <QRect>
+#include <QSize>
+
+class QWidget;
 
 CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     : CardInfoPictureWidget(parent, false, false)
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
index ce22a1a44..540b0c2fa 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h
@@ -9,6 +9,11 @@
 
 #include "card_info_picture_widget.h"
 
+#include <QPixmap>
+#include <qtmetamacros.h>
+
+class QWidget;
+
 class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
index 40bef3df3..ba10d4a0f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@@ -2,10 +2,17 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
 #include <QPainterPath>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 #include <QStylePainter>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 /**
  * @brief Constructs a CardPictureEnlargedWidget.
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
index a158ac6cf..f5ead2a18 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
@@ -8,8 +8,12 @@
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H
 
+#include <QPixmap>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class QSize;
 
 class CardInfoPictureEnlargedWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 2dd21e78a..3c1e1b77f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,21 +1,47 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../window_main.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 #include "card_art_utils.h"
+#include "card_info_picture_enlarged_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QAbstractAnimation>
+#include <QAction>
+#include <QApplication>
+#include <QByteArray>
+#include <QCursor>
+#include <QDebug>
+#include <QEasingCurve>
+#include <QGuiApplication>
+#include <QList>
 #include <QMenu>
 #include <QMouseEvent>
+#include <QObject>
+#include <QPainterPath>
+#include <QPropertyAnimation>
+#include <QRect>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QSize>
+#include <QString>
 #include <QStylePainter>
+#include <QTimer>
 #include <QWidget>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <utility>
+#include <qlogging.h>
+#include <qnamespace.h>
 
 static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
 // static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 4fe84ed0b..8d2d63736 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -7,15 +7,20 @@
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
-#include "card_info_picture_enlarged_widget.h"
-
-#include <QPropertyAnimation>
+#include <QLoggingCategory>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QPoint>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class CardInfoPictureEnlargedWidget;
+class QPropertyAnimation;
+class QTimer;
 
 inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");
 
-class AbstractCardItem;
 class QMenu;
 
 class CardInfoPictureWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
index 000a88b2f..04fe9ab69 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
@@ -1,8 +1,24 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
+#include <QBrush>
+#include <QChar>
+#include <QFont>
 #include <QFontMetrics>
+#include <QList>
+#include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
+#include <QPen>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringList>
 #include <QStylePainter>
+#include <algorithm>
+
+class QWidget;
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
index ba978498d..6c547dc13 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
@@ -11,8 +11,14 @@
 #include "card_info_picture_widget.h"
 
 #include <QColor>
-#include <QSize>
+#include <QString>
 #include <QTextOption>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QPainter;
+class QRect;
+class QWidget;
 
 class CardInfoPictureWithTextOverlayWidget : public CardInfoPictureWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
index e98c3c02a..fa6cde311 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,15 +1,26 @@
 #include "card_info_text_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../client/settings/cache_settings.h"
 #include "../../card_localization.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/settings/cards_display_settings.h"
 
 #include <QGridLayout>
 #include <QLabel>
+#include <QList>
 #include <QScrollArea>
 #include <QScrollBar>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
 #include <QTextEdit>
+#include <QWidget>
 #include <libcockatrice/card/game_specific_terms.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 
 CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent)
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
index 683be5ab5..8223093fe 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
@@ -10,10 +10,13 @@
 #include "libcockatrice/card/printing/exact_card.h"
 
 #include <QFrame>
-#include <libcockatrice/card/card_info.h>
+#include <QString>
+#include <qtmetamacros.h>
+
 class QLabel;
 class QScrollArea;
 class QTextEdit;
+class QWidget;
 
 class CardInfoTextWidget : public QFrame
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
index 9cdfd4bce..ab1840591 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@@ -1,10 +1,19 @@
 #include "card_size_widget.h"
 
-#include "../printing_selector/printing_selector.h"
-#include "../visual_deck_storage/visual_deck_storage_widget.h"
+#include "../general/layout_containers/flow_widget.h"
 
+#include <QEvent>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QPoint>
 #include <QScrollArea>
+#include <QSizePolicy>
+#include <QSlider>
 #include <QWheelEvent>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 /**
  * @class CardSizeWidget
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 46883e792..7de97a5e9 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -9,15 +9,15 @@
 #ifndef CARD_SIZE_WIDGET_H
 #define CARD_SIZE_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSlider>
 #include <QTimer>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QWheelEvent;
+class FlowWidget;
+class QHBoxLayout;
+class QLabel;
+class QSlider;
 
 class CardSizeWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
index a4b4eaf54..911e35285 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@@ -1,14 +1,38 @@
 #include "deck_card_zone_display_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../general/display/banner_widget.h"
+#include "../visual_deck_editor/visual_deck_editor_widget.h"
+#include "card_group_display_widgets/card_group_display_widget.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_manager.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 #include "libcockatrice/settings/cards_display_settings.h"
 
-#include <QResizeEvent>
-#include <algorithm>
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QLayout>
+#include <QLayoutItem>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class CardSizeWidget;
+class QMouseEvent;
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
index f25108834..b7dc3ed3e 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
@@ -7,16 +7,27 @@
 #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
 #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
 
-#include "../general/display/banner_widget.h"
-#include "../general/layout_containers/overlap_widget.h"
 #include "../visual_deck_editor/visual_deck_editor_widget.h"
-#include "card_group_display_widgets/card_group_display_widget.h"
-#include "card_info_picture_with_text_overlay_widget.h"
-#include "card_size_widget.h"
 
-#include <QVBoxLayout>
+#include <QHash>
+#include <QList>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardGroupDisplayWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class OverlapWidget;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
+class QVBoxLayout;
 
 class DeckCardZoneDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
index 147143e7f..186c55755 100644
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@@ -1,15 +1,15 @@
 #include "deck_preview_card_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "card_info_picture_widget.h"
 
 #include <QApplication>
-#include <QFileInfo>
-#include <QFontMetrics>
 #include <QMouseEvent>
-#include <QPainterPath>
-#include <QStylePainter>
+#include <QTimer>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
+class QWidget;
+
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
  * @param parent The parent widget.
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
index 7571bc256..9643c7364 100644
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
@@ -11,9 +11,12 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
 #include <QColor>
-#include <QSize>
-#include <QTextOption>
-#include <QTimer>
+#include <QMouseEvent>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QTimer;
+class QWidget;
 
 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
index 483fc71b0..730043d95 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
@@ -1,9 +1,16 @@
 #include "abstract_analytics_panel_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "../general/display/banner_widget.h"
 #include "deck_list_statistics_analyzer.h"
 
+#include <QDialog>
+#include <QHBoxLayout>
 #include <QPushButton>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : QWidget(parent), analyzer(analyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
index 23374a9e1..c1afb78d0 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
@@ -3,12 +3,16 @@
 
 #include "../general/display/banner_widget.h"
 
-#include <QDialog>
 #include <QJsonObject>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class DeckListStatisticsAnalyzer;
+class QDialog;
+class QHBoxLayout;
+class QPushButton;
+class QVBoxLayout;
 
 class AbstractAnalyticsPanelWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
index c83e6d982..f1ed5767c 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
@@ -3,8 +3,11 @@
 #include "analytics_panel_widget_factory.h"
 
 #include <QDialogButtonBox>
+#include <QList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 AddAnalyticsPanelDialog::AddAnalyticsPanelDialog(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Add Analytics Panel"));
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
index aa44734c2..f70c1d8f5 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
@@ -2,12 +2,15 @@
 #ifndef COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 #define COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 
-#include "analytics_panel_widget_factory.h"
-
 #include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QVBoxLayout;
+class QWidget;
 
 class AddAnalyticsPanelDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
index e807e9d47..79dda527d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
@@ -2,6 +2,8 @@
 
 #include "abstract_analytics_panel_widget.h"
 
+#include <QSharedPointer>
+
 AnalyticsPanelWidgetFactory &AnalyticsPanelWidgetFactory::instance()
 {
     static AnalyticsPanelWidgetFactory f;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
index 6c5856d70..598498980 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
@@ -1,9 +1,9 @@
 #ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 #define COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 
+#include <QList>
 #include <QMap>
 #include <QString>
-#include <QStringList>
 #include <QWidget>
 #include <functional>
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
index 70d6df94f..99a6daf5d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
@@ -3,6 +3,8 @@
 
 #include "analytics_panel_widget_factory.h"
 
+#include <QString>
+
 class AnalyticsPanelWidgetRegistrar
 {
 public:
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
index 51129a4b4..1c61116e3 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
@@ -1,5 +1,8 @@
 #include "draw_probability_config.h"
 
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject DrawProbabilityConfig::toJson() const
 {
     QJsonObject o;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
index 71f88c0fc..28fd4c841 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
@@ -5,6 +5,10 @@
 #include <QFormLayout>
 #include <QLabel>
 #include <QSpinBox>
+#include <QString>
+#include <QVariant>
+
+class QWidget;
 
 DrawProbabilityConfigDialog::DrawProbabilityConfigDialog(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
index 44b1f0eec..3553db75d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
@@ -3,11 +3,13 @@
 #include "draw_probability_config.h"
 
 #include <QDialog>
-#include <QFormLayout>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QSpinBox;
 class QLabel;
+class QFormLayout;
+class QWidget;
 
 class DrawProbabilityConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
index 0107294c7..90d9f58ef 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
@@ -1,21 +1,40 @@
 #include "draw_probability_widget.h"
 
+#include "../../../general/display/banner_widget.h"
+#include "../../../general/layout_containers/flow_widget.h"
+#include "../../abstract_analytics_panel_widget.h"
+#include "../../deck_list_statistics_analyzer.h"
+#include "deck_list_model.h"
 #include "draw_probability_config_dialog.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 
+#include <QAbstractItemView>
+#include <QChar>
 #include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QHBoxLayout>
 #include <QHeaderView>
+#include <QJsonObject>
 #include <QLabel>
+#include <QList>
 #include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <QTableWidget>
 #include <QTableWidgetItem>
-#include <QWidget>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : AbstractAnalyticsPanelWidget(parent, analyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
index 9f7b971b1..7c7bdb50a 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
@@ -1,16 +1,19 @@
 #ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 #define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 
-#include "../../../../layouts/flow_layout.h"
-#include "../../../general/layout_containers/flow_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "draw_probability_config.h"
 
-#include <QComboBox>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QTableWidget>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class FlowWidget;
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QSpinBox;
+class QTableWidget;
+class QWidget;
 
 class DrawProbabilityWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
index 2f9f60752..41ebdec1e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
@@ -1,5 +1,9 @@
 #include "mana_base_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaBaseConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
index d01f88b8b..5fd45af62 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
@@ -2,8 +2,9 @@
 #ifndef COCKATRICE_MANA_BASE_CONFIG_H
 #define COCKATRICE_MANA_BASE_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaBaseConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
index 83e35d57d..32b54c485 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
@@ -1,6 +1,19 @@
 #include "mana_base_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QHash>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QPushButton>
+#include <QStringList>
+#include <QVBoxLayout>
+
+class QWidget;
 
 ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                            ManaBaseConfig initial,
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
index a816f154f..b0ae77076 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
@@ -2,18 +2,20 @@
 #ifndef COCKATRICE_MANA_BASE_ADD_DIALOG_H
 #define COCKATRICE_MANA_BASE_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
 
 class ManaBaseConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
index 0093c360b..fc7914b94 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
@@ -3,12 +3,27 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config_dialog.h"
 
+#include <QColor>
 #include <QDialog>
-#include <QListWidget>
+#include <QHBoxLayout>
+#include <QHash>
+#include <QLayoutItem>
+#include <QMap>
+#include <QObject>
+#include <QPair>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <algorithm>
 #include <libcockatrice/utility/color.h>
+#include <qnamespace.h>
+#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
index 85b2a13b3..7ec5ecefe 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
@@ -7,16 +7,17 @@
 #ifndef MANA_BASE_WIDGET_H
 #define MANA_BASE_WIDGET_H
 
-#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
-#include <QHBoxLayout>
-#include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <utility>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QHBoxLayout;
+class QWidget;
 
 class ManaBaseWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
index a0ccedc74..7e15058a4 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
@@ -1,9 +1,21 @@
 #include "mana_curve_category_widget.h"
 
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
 #include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
+
+#include <QHBoxLayout>
+#include <QHash>
+#include <QLabel>
+#include <QList>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QString>
+#include <QVBoxLayout>
+#include <QVector>
+#include <algorithm>
 
 constexpr int MIN_ROW_HEIGHT = 100; // Minimum readable height per row
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
index c6aa6f1f0..1794d5cab 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
@@ -1,12 +1,14 @@
 #ifndef COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 #define COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QString;
+class QVBoxLayout;
+struct ManaCurveConfig;
+template <typename Key, typename T> class QHash;
 
 class ManaCurveCategoryWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
index 0dfef1b66..190642ad9 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
@@ -1,5 +1,9 @@
 #include "mana_curve_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaCurveConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
index 55222dd98..28224db03 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
@@ -2,8 +2,9 @@
 #ifndef COCKATRICE_MANA_CURVE_CONFIG_H
 #define COCKATRICE_MANA_CURVE_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaCurveConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
index 9e9ae98a6..c5498ff3e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
@@ -1,12 +1,22 @@
 #include "mana_curve_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QHash>
 #include <QLabel>
+#include <QList>
 #include <QListWidget>
+#include <QListWidgetItem>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 ManaCurveConfigDialog::ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
     : QDialog(parent), analyzer(analyzer)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
index 17e6776e5..47ce1b8c2 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
@@ -1,16 +1,18 @@
 #ifndef COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 #define COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_curve_config.h"
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
+#include <qtmetamacros.h>
 
 class QListWidget;
 class QCheckBox;
 class QComboBox;
+class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
 
 class ManaCurveConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
index c04767015..f1d9ea8c7 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
@@ -2,10 +2,18 @@
 
 #include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
 
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QVector>
+#include <algorithm>
+#include <compare>
 
 ManaCurveTotalWidget::ManaCurveTotalWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
index 203f75345..0eaecec96 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
@@ -1,11 +1,15 @@
 #ifndef COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
 #define COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class BarChartWidget;
+class QHBoxLayout;
+class QLabel;
+struct ManaCurveConfig;
+template <class Key, class T> class QMap;
 
 class ManaCurveTotalWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
index b182bf954..6d93bde54 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
@@ -1,19 +1,23 @@
 #include "mana_curve_widget.h"
 
-#include "../../../general/display/charts/bars/bar_chart_background_widget.h"
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "../../../general/display/charts/bars/segmented_bar_widget.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
-#include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
+#include "mana_curve_category_widget.h"
 #include "mana_curve_config_dialog.h"
+#include "mana_curve_total_widget.h"
 
-#include <QInputDialog>
-#include <QJsonArray>
-#include <QLabel>
-#include <QPushButton>
-#include <QSettings>
+#include <QDialog>
+#include <QHash>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <QtGlobal>
+
+class QWidget;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
index d3e56d44c..14c445717 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
@@ -8,14 +8,17 @@
 #define MANA_CURVE_WIDGET_H
 
 #include "../../abstract_analytics_panel_widget.h"
-#include "mana_curve_category_widget.h"
 #include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
 
-#include <QVBoxLayout>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
 
-class SegmentedBarWidget;
 class DeckListStatisticsAnalyzer;
+class ManaCurveCategoryWidget;
+class ManaCurveTotalWidget;
+class QWidget;
 
 class ManaCurveWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
index ee57cb1e2..7a6f0b51a 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
@@ -1,5 +1,9 @@
 #include "mana_devotion_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaDevotionConfig::toJson() const
 {
     QJsonObject jsonObject;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
index 08be146e5..480b2151c 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
@@ -1,8 +1,9 @@
 #ifndef COCKATRICE_MANA_DEVOTION_CONFIG_H
 #define COCKATRICE_MANA_DEVOTION_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaDevotionConfig
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
index b01c33ba5..0d70fc24d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
@@ -1,5 +1,19 @@
 #include "mana_devotion_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QHash>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QStringList>
+#include <QVBoxLayout>
+
+class QWidget;
+
 ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                                    ManaDevotionConfig initial,
                                                    QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
index fd804e2af..9c37ec5ad 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
@@ -2,16 +2,20 @@
 #ifndef COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 #define COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
 
 class ManaDevotionConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
index 709577ff2..7e1f0c211 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
@@ -3,12 +3,26 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config_dialog.h"
 
+#include <QChar>
+#include <QColor>
+#include <QDialog>
+#include <QHBoxLayout>
 #include <QHash>
-#include <QInputDialog>
+#include <QLayoutItem>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <algorithm>
+#include <qnamespace.h>
+#include <utility>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
index af0215305..2b0182c1e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
@@ -6,11 +6,17 @@
 
 #ifndef MANA_DEVOTION_WIDGET_H
 #define MANA_DEVOTION_WIDGET_H
-#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
 #include "mana_devotion_config.h"
 
-#include <QHBoxLayout>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QHBoxLayout;
+class QWidget;
 
 class ManaDevotionWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
index 01af9329c..ab321661e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
@@ -1,5 +1,9 @@
 #include "mana_distribution_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaDistributionConfig::toJson() const
 {
     QJsonObject o;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
index d1aa0f48e..012b0f4a7 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
@@ -1,8 +1,8 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 #define COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
 #include <QStringList>
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
index 325c70028..24b71bae0 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
@@ -1,12 +1,19 @@
 #include "mana_distribution_config_dialog.h"
 
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QList>
 #include <QListWidget>
+#include <QListWidgetItem>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
 
 ManaDistributionConfigDialog::ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
index 57c88e29d..3d21b6bee 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
@@ -4,14 +4,15 @@
 #include "mana_distribution_config.h"
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QStringList>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QListWidget;
 class QCheckBox;
 class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
 
 class ManaDistributionConfigDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
index 8a5e14858..4faa105e6 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
@@ -2,7 +2,10 @@
 
 #include "../../../cards/additional_info/mana_symbol_widget.h"
 
+#include <QLabel>
+#include <QProgressBar>
 #include <QVBoxLayout>
+#include <qnamespace.h>
 
 ManaDistributionSingleDisplayWidget::ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
index e33d0cec1..2fd3efb2d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QProgressBar;
 
 class ManaDistributionSingleDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
index 8eaea1426..5543c64df 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
@@ -1,12 +1,21 @@
 #include "mana_distribution_widget.h"
 
+#include "../../../general/display/charts/bars/color_bar.h"
+#include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config_dialog.h"
+#include "mana_distribution_single_display_widget.h"
 
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
+#include <QDialog>
+#include <QHBoxLayout>
+#include <QHash>
+#include <QList>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QWidget>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
index 2d834f3af..6230e0201 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
@@ -1,17 +1,21 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config.h"
-#include "mana_distribution_single_display_widget.h"
 
-#include <QHBoxLayout>
+#include <QJsonObject>
 #include <QMap>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ColorBar;
+class ColorPie;
+class DeckListStatisticsAnalyzer;
+class ManaDistributionSingleDisplayWidget;
+class QHBoxLayout;
+class QVBoxLayout;
+class QWidget;
 
 class ManaDistributionWidget : public AbstractAnalyticsPanelWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
index 76552ea2f..9f6257930 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
@@ -1,5 +1,6 @@
 #include "deck_analytics_widget.h"
 
+#include "../general/layout_containers/flow_widget.h"
 #include "abstract_analytics_panel_widget.h"
 #include "add_analytics_panel_dialog.h"
 #include "analytics_panel_widget_factory.h"
@@ -9,13 +10,19 @@
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
 
+#include <QCheckBox>
+#include <QDialog>
 #include <QEvent>
+#include <QFrame>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonValueRef>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSettings>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <qnamespace.h>
 
 DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *_statsAnalyzer)
     : QWidget(parent), statsAnalyzer(_statsAnalyzer)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
index 3c73deca2..f1e071ff6 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -7,19 +7,22 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
-#include "abstract_analytics_panel_widget.h"
-#include "deck_list_statistics_analyzer.h"
-#include "resizable_panel.h"
-
-#include <QCheckBox>
 #include <QJsonObject>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
 #include <QVector>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class LayoutInspector;
+class AbstractAnalyticsPanelWidget;
+class DeckListStatisticsAnalyzer;
+class FlowWidget;
+class QCheckBox;
+class QPushButton;
+class QScrollArea;
+class QVBoxLayout;
+class ResizablePanel;
 
 class DeckAnalyticsWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
index add13ff21..c2f70759e 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
@@ -1,11 +1,19 @@
 #include "deck_list_statistics_analyzer.h"
 
 #include "deck_list_model.h"
-#include "deck_list_statistics_analyzer.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QChar>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <initializer_list>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <utility>
 
 DeckListStatisticsAnalyzer::DeckListStatisticsAnalyzer(QObject *parent,
                                                        DeckListModel *_model,
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
index 52ae751bf..c3643d65f 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 #define COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 
-#include "deck_list_model.h"
-
 #include <QHash>
+#include <QList>
 #include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 #include <unordered_map>
 
 class DeckListModel;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index 250fe1ad3..f46679406 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -1,11 +1,34 @@
 #include "resizable_panel.h"
 
+#include "abstract_analytics_panel_widget.h"
 #include "libcockatrice/utility/qt_utils.h"
 
+#include <QApplication>
+#include <QByteArray>
 #include <QColor>
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
 #include <QHBoxLayout>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPalette>
 #include <QPixmap>
+#include <QPointF>
+#include <QPushButton>
+#include <QRect>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QSize>
+#include <QSizePolicy>
+#include <QTimer>
+#include <QVBoxLayout>
 #include <QtGlobal>
+#include <qnamespace.h>
 
 ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWidget *analyticsPanel, QWidget *parent)
     : QWidget(parent), panel(analyticsPanel), typeId(_typeId)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
index d958ec64d..809703847 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
@@ -1,19 +1,15 @@
 #ifndef COCKATRICE_RESIZABLE_PANEL_H
 #define COCKATRICE_RESIZABLE_PANEL_H
 
-#include "abstract_analytics_panel_widget.h"
-
-#include <QApplication>
-#include <QDrag>
-#include <QFrame>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QPoint>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class AbstractAnalyticsPanelWidget;
+class QFrame;
+class QPushButton;
+class QTimer;
 
 class ResizablePanel : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
index 00388a3cd..e8f6398f7 100644
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
@@ -1,17 +1,35 @@
 #include "card_database_view.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../key_signals.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QAbstractItemModel>
+#include <QAction>
 #include <QApplication>
+#include <QByteArray>
 #include <QClipboard>
+#include <QFlags>
 #include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QList>
 #include <QMenu>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPoint>
+#include <QSharedPointer>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/layouts_settings.h>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
 
 static bool canBeCommander(const CardInfo &cardInfo)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
index 668444199..c095c544d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
@@ -3,12 +3,19 @@
 
 #include "../../key_signals.h"
 
+#include <QPair>
+#include <QString>
+#include <QStringList>
 #include <QTreeView>
 #include <functional>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
-class CardDatabaseModel;
 class CardDatabaseDisplayModel;
+class QModelIndex;
+class QPoint;
+class QWidget;
+template <typename T> class QList;
 
 /**
  * @brief The card database table.
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
index 6269f0323..57ae6eadd 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
@@ -2,10 +2,23 @@
 
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "card_database_view.h"
+#include "deck_editor_database_display_widget.h"
+#include "deck_list_model.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <libcockatrice/deck_list/deck_list_node_tree.h>
+#include <QFlags>
+#include <QList>
+#include <QPair>
+#include <QString>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <functional>
+#include <qnamespace.h>
+#include <utility>
 
 DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
index 6af2e4432..b73843bc7 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
@@ -1,12 +1,10 @@
 #ifndef COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
-class CardDatabase;
 class DeckEditorDatabaseDisplayWidget;
 class FilterTree;
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
index a78a9c9c5..1b920ea1d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
@@ -1,8 +1,14 @@
 #include "deck_editor_card_info_dock_widget.h"
 
 #include "../cards/card_info_frame_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 
+#include <QFlags>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <qnamespace.h>
+
+class ExactCard;
 
 DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
index 086ca2ca4..2f204306d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
@@ -8,12 +8,13 @@
 #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../cards/card_info_frame_widget.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
+class CardInfoFrameWidget;
+class ExactCard;
+
 class DeckEditorCardInfoDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
index a83e25f5f..7ed398535 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -2,19 +2,30 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
+#include "../utility/custom_line_edit.h"
+#include "card_database_display_model.h"
+#include "card_database_model.h"
 #include "card_database_view.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QClipboard>
-#include <QHeaderView>
+#include <QAction>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QStringLiteral>
 #include <QToolButton>
-#include <QTreeView>
+#include <QVBoxLayout>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+class FilterTree;
 
 DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
index 5de4d211d..e9edec125 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
@@ -8,16 +8,21 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../utility/custom_line_edit.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QHBoxLayout>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
+#include <qtmetamacros.h>
 
 class CardDatabaseView;
-class AbstractTabDeckEditor;
+class CardDatabaseDisplayModel;
+class CardDatabaseModel;
+class ExactCard;
+class FilterTree;
+class QAction;
+class QHBoxLayout;
+class QVBoxLayout;
+class SearchLineEdit;
 
 class DeckEditorDatabaseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 4b141e255..37dd57459 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -2,28 +2,75 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
 #include "../playmat/playmat_settings_dialog.h"
-#include "../settings_page/user_interface_settings_page.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 #include "../tabs/api/commander_spellbook/commander_bracket_widget.h"
+#include "../utility/custom_line_edit.h"
+#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "deck_list_history_manager_widget.h"
+#include "deck_list_model.h"
 #include "deck_list_style_proxy.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QAction>
+#include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
+#include <QDialog>
 #include <QDockWidget>
+#include <QFlags>
+#include <QGridLayout>
 #include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QMenu>
 #include <QMessageBox>
+#include <QModelIndex>
+#include <QPair>
+#include <QPoint>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
 #include <QSplitter>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTextEdit>
+#include <QTimer>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
+#include <algorithm>
+#include <compare>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_node_tree.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
-#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <utility>
 
 static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 1e5f4e677..97ab8823e 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -8,27 +8,36 @@
 #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
 #define DECK_EDITOR_DECK_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
-#include "../utility/custom_line_edit.h"
-#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "deck_list_history_manager_widget.h"
-#include "deck_list_style_proxy.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDockWidget>
-#include <QLabel>
-#include <QMenu>
-#include <QPushButton>
-#include <QTextEdit>
+#include <QModelIndexList>
+#include <QString>
 #include <QTreeView>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <qtmetamacros.h>
 
 class CommanderBracketWidget;
 class DeckListModel;
 class AbstractTabDeckEditor;
+class DeckListHistoryManagerWidget;
+class DeckListStyleProxy;
+class DeckPreviewDeckTagsDisplayWidget;
+class DeckStateManager;
+class LineEditUnfocusable;
+class QAction;
+class QCheckBox;
+class QComboBox;
+class QItemSelectionModel;
+class QLabel;
+class QMenu;
+class QModelIndex;
+class QPoint;
+class QPushButton;
+class QTextEdit;
+class QTimer;
+class SettingsButtonWidget;
+
 class DeckEditorDeckDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index c6b6e4416..0a47333fa 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -4,11 +4,31 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
+#include "../tabs/abstract_tab_deck_editor.h"
+#include "libcockatrice/filters/filter_card.h"
 
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QDebug>
+#include <QFlags>
 #include <QGridLayout>
+#include <QItemSelectionModel>
+#include <QList>
 #include <QMenu>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPersistentModelIndex>
+#include <QPoint>
+#include <QString>
+#include <QStringLiteral>
 #include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <qnamespace.h>
 
 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
index b61fc72b5..7bb9c0045 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -8,13 +8,18 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
 
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class FilterTreeModel;
 class AbstractTabDeckEditor;
+class QAction;
+class QPoint;
+class QTreeView;
+class QWidget;
+
 class DeckEditorFilterDockWidget : public QDockWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
index 06d8d1de7..d45e951ba 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
@@ -2,10 +2,15 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../printing_selector/printing_selector.h"
+#include "deck_editor_deck_dock_widget.h"
 #include "printing_disabled_info_widget.h"
 
+#include <QFlags>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
index 1037b55fb..e20ae932d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
@@ -7,13 +7,13 @@
 #ifndef DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 #define DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../printing_selector/printing_selector.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class PrintingDisabledInfoWidget;
-class TabDeckEditor;
+class AbstractTabDeckEditor;
+class PrintingSelector;
+class QWidget;
 
 class DeckEditorPrintingSelectorDockWidget : public QDockWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
index c93f12b34..209dc7273 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
@@ -1,7 +1,28 @@
 #include "deck_list_history_manager_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "deck_state_manager.h"
+#include "libcockatrice/deck_list/deck_list_history_manager.h"
+#include "libcockatrice/deck_list/deck_list_memento.h"
+
+#include <QAction>
+#include <QBrush>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QKeySequence>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QSharedPointer>
+#include <QStack>
+#include <QString>
+#include <QStringLiteral>
+#include <QToolButton>
+#include <QVariant>
+#include <qnamespace.h>
+
+class DeckListStyleProxy;
 
 DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_deckStateManager,
                                                            DeckListStyleProxy *_styleProxy,
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
index ab53912e2..5ed44b0fd 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
@@ -1,18 +1,20 @@
 #ifndef COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 
+#include <qtmetamacros.h>
+
+class DeckListStyleProxy;
+class QAction;
+class QHBoxLayout;
+class QLabel;
+class QListWidget;
+class QListWidgetItem;
+class QToolButton;
+class SettingsButtonWidget;
 #ifndef COCKATRICE_DECK_UNDO_WIDGET_H
 #define COCKATRICE_DECK_UNDO_WIDGET_H
 
-#include "../quick_settings/settings_button_widget.h"
-#include "deck_list_style_proxy.h"
-
-#include <QAction>
-#include <QHBoxLayout>
-#include <QListWidget>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckStateManager;
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
index e41529b22..1e1aefe58 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
@@ -3,7 +3,10 @@
 #include <QBrush>
 #include <QColor>
 #include <QFont>
+#include <QModelIndex>
+#include <QVariant>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
 
 QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
index 52b7eea10..e4d1de4f4 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
@@ -2,6 +2,7 @@
 #define COCKATRICE_DECK_LIST_STYLE_PROXY_H
 
 #include <QIdentityProxyModel>
+#include <qtmetamacros.h>
 
 class DeckListStyleProxy : public QIdentityProxyModel
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
index cfe989e9f..d4715c8d5 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
@@ -1,11 +1,28 @@
 #include "deck_state_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/loaded_deck.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/deck_list_memento.h"
+#include "libcockatrice/deck_list/deck_list_node_tree.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 
+#include <QList>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_history_manager.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+
+class QModelIndex;
 
 DeckStateManager::DeckStateManager(QObject *parent)
     : QObject(parent), deckList(QSharedPointer<DeckList>(new DeckList)),
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
index 2c8b34a39..98876947b 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
@@ -2,13 +2,22 @@
 #define COCKATRICE_DECK_STATE_MANAGER_H
 
 #include "../../deck_loader/loaded_deck.h"
-#include "deck_list_model.h"
 
+#include <QModelIndex>
+#include <QObject>
 #include <QSharedPointer>
+#include <QString>
+#include <QStringList>
 #include <functional>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <qtmetamacros.h>
 
 class DeckListHistoryManager;
+class DeckListModel;
+class DecklistNodeTree;
+class ExactCard;
+struct CardRef;
+struct PlaymatInfo;
 
 /**
  * @brief This class centralizes the management of the state of the deck in the deck editor tab.
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
index 9a0be2570..cb9667603 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
@@ -2,10 +2,14 @@
 
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QEvent>
+#include <QIcon>
 #include <QLabel>
 #include <QLineEdit>
+#include <QList>
 #include <QPushButton>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/utility/string_limits.h>
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
index 6f55617a8..f4c9c0f9d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
@@ -8,9 +8,9 @@
 #define DECK_ZONE_DIALOG_H
 
 #include <QDialog>
-#include <QEvent>
 #include <QString>
 #include <functional>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QDialogButtonBox;
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
index 23670b1b3..b2c4dd303 100644
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
@@ -3,10 +3,13 @@
 #include "../dialogs/override_printing_warning.h"
 
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QLabel>
 #include <QPushButton>
+#include <QSize>
 #include <QStyle>
-#include <qguiapplication.h>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 PrintingDisabledInfoWidget::PrintingDisabledInfoWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
index 0851ccfad..c14c758ff 100644
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
 #define COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QPushButton;
 class QLabel;
diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
index 4343f0aab..0ebdc0647 100644
--- a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
+++ b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
@@ -3,9 +3,11 @@
 #include <QClipboard>
 #include <QGuiApplication>
 #include <QLocale>
+#include <QStringLiteral>
 #include <QTimeZone>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
index ede9fb41b..f97cc6788 100644
--- a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
+++ b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
@@ -7,7 +7,9 @@
 #ifndef SHARE_BAR_WIDGET_H
 #define SHARE_BAR_WIDGET_H
 
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QLabel;
 class QLineEdit;
diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
index 21ec80e08..3bb829089 100644
--- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
@@ -2,14 +2,20 @@
 
 #include "../cards/additional_info/color_identity_widget.h"
 #include "../cards/deck_preview_card_picture_widget.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/card_ref.h"
 
 #include <QCheckBox>
+#include <QColor>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
+#include <QRect>
+#include <QStringLiteral>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_querier.h>
+#include <qnamespace.h>
 
 SharedDeckPreviewWidget::SharedDeckPreviewWidget(QWidget *parent,
                                                  const CardDatabaseQuerier *querier,
diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
index bd4c4ee5f..bff7de743 100644
--- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
@@ -7,15 +7,15 @@
 #ifndef SHARED_DECK_PREVIEW_WIDGET_H
 #define SHARED_DECK_PREVIEW_WIDGET_H
 
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class ColorIdentityWidget;
 class DeckPreviewCardPictureWidget;
 class QCheckBox;
 class QFrame;
-class QKeyEvent;
 class QLabel;
-class QResizeEvent;
 class CardDatabaseQuerier;
 
 /**
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 700012d45..7a7e31a58 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -2,19 +2,34 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
+#include "../server/handle_public_servers.h"
+#include "../server/user/user_info_connection.h"
+#include "libcockatrice/utility/macros.h"
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QKeyEvent>
+#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
index 083dad0ad..10cb5366a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
@@ -7,12 +7,13 @@
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
-#include "../interface/widgets/server/handle_public_servers.h"
-#include "../interface/widgets/server/user/user_info_connection.h"
-
 #include <QDialog>
 #include <QLineEdit>
+#include <QMap>
+#include <QString>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+#include <utility>
 
 class QCheckBox;
 class QComboBox;
@@ -23,6 +24,9 @@ class QLabel;
 class QPushButton;
 class QRadioButton;
 class QVBoxLayout;
+class HandlePublicServers;
+class QWidget;
+class UserConnection_Information;
 
 class DlgConnect : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
index a4a31d78d..f2dd8c1e4 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
@@ -1,7 +1,7 @@
 #include "dlg_convert_deck_to_cod_format.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/deck_file_format.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -10,6 +10,7 @@
 #include <QFileInfo>
 #include <QLabel>
 #include <QMessageBox>
+#include <QObject>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
index 526582135..de2fb9a63 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
@@ -8,14 +8,17 @@
 #ifndef DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 #define DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 
-#include <QCheckBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QString>
+#include <QtGlobal>
 #include <functional>
+#include <qtmetamacros.h>
 
 class QWidget;
+class QCheckBox;
+class QDialogButtonBox;
+class QLabel;
+class QVBoxLayout;
 
 class DialogConvertDeckToCodFormat : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
index 59f3e033d..104b695e6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -2,23 +2,35 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/tabs/tab_room.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/utility/macros.h"
 
-#include <QApplication>
 #include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMapIterator>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSet>
+#include <QSharedPointer>
+#include <QSize>
 #include <QSpinBox>
+#include <QVBoxLayout>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/game_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
+
+class QWidget;
 
 void DlgCreateGame::sharedCtor()
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
index 61925286d..71b09997c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
@@ -9,7 +9,9 @@
 
 #include <QDialog>
 #include <QMap>
+#include <QString>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
 
 class QCheckBox;
 class QDialogButtonBox;
@@ -22,6 +24,7 @@ class QSpinBox;
 class Response;
 class ServerInfo_Game;
 class TabRoom;
+class QWidget;
 
 class DlgCreateGame : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
index e9c73b025..9eb064beb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@@ -2,9 +2,20 @@
 
 #include "../../../client/settings/cache_settings.h"
 
+#include <QAbstractItemView>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QList>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
index e584d0731..081701485 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
@@ -9,9 +9,15 @@
 #define DLG_DEFAULT_TAGS_EDITOR_H
 
 #include <QDialog>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QLineEdit;
+class QListWidget;
+class QListWidgetItem;
+class QPushButton;
+class QVBoxLayout;
+class QWidget;
 
 class DlgDefaultTagsEditor : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
index 120e20f3e..520ece007 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
@@ -3,12 +3,22 @@
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
+#include <QGridLayout>
+#include <QIODevice>
 #include <QImageReader>
 #include <QLabel>
+#include <QMessageLogger>
+#include <QPixmap>
 #include <QPushButton>
+#include <QSize>
+#include <QString>
 #include <QVBoxLayout>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
index 9ac774b24..4df45711c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
@@ -7,16 +7,18 @@
 #ifndef DLG_EDITAVATAR_H
 #define DLG_EDITAVATAR_H
 
-#include <QComboBox>
+#include <QByteArray>
 #include <QDialog>
-#include <QLineEdit>
+#include <QImage>
 #include <QLoggingCategory>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar");
 
 class QLabel;
 class QPushButton;
-class QCheckBox;
 
 class DlgEditAvatar : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
index 4310c03fc..59f80c79c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@@ -4,12 +4,17 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
+class QVBoxLayout;
+class QWidget;
+
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 {
     oldPasswordLabel = new QLabel(tr("Old password:"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
index 85c72233d..e80ede3f3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
@@ -9,10 +9,11 @@
 
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 class DlgEditPassword : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index a56aa8e35..cbf61a394 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -2,25 +2,41 @@
 
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
+#include "card_database_display_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
 #include <QAction>
+#include <QChar>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
+#include <QHash>
 #include <QHeaderView>
-#include <QInputDialog>
+#include <QItemSelectionModel>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QStringLiteral>
 #include <QToolBar>
 #include <QTreeView>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/database/token/token_edit_model.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
index 202212e98..cde89d22b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
@@ -8,7 +8,11 @@
 #define DLG_EDIT_TOKENS_H
 
 #include <QDialog>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
 class QModelIndex;
 class CardDatabaseModel;
@@ -17,6 +21,7 @@ class QLabel;
 class QComboBox;
 class QLineEdit;
 class QTreeView;
+class QWidget;
 
 class DlgEditTokens : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
index 85b95f335..ffe8391a0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@@ -4,10 +4,18 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QPixmap>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
+#include <QVBoxLayout>
 #include <libcockatrice/utility/string_limits.h>
 
+class QVBoxLayout;
+class QWidget;
+
 DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)
 {
     emailLabel = new QLabel(tr("Email:"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
index 35a8bfb46..0385c2bbe 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
@@ -10,10 +10,11 @@
 #include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 class DlgEditUser : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
index 7e174a228..cd3c3893e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
@@ -1,15 +1,25 @@
 #include "dlg_filter_games.h"
 
+#include "../server/games_model.h"
+
 #include <QCheckBox>
 #include <QComboBox>
-#include <QCryptographicHash>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QPushButton>
+#include <QList>
+#include <QMapIterator>
+#include <QSharedPointer>
+#include <QSize>
 #include <QSpinBox>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
 
 DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
                                const GamesProxyModel *_gamesProxyModel,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
index 1cf822b89..d7c11d0f1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
@@ -7,20 +7,23 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../interface/widgets/server/games_model.h"
+#include "../server/game_filter_configs.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
 #include <QMap>
 #include <QSet>
+#include <QString>
+#include <QStringList>
 #include <QTime>
+#include <qtmetamacros.h>
 
 class QCheckBox;
 class QComboBox;
 class QGroupBox;
 class QLineEdit;
 class QSpinBox;
+class GamesProxyModel;
+class QWidget;
 
 class DlgFilterGames : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
index c21955373..3ee74faab 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
@@ -4,12 +4,16 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
+#include <QSize>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
+class QWidget;
+
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
index d32e2fc3e..f5678af17 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDCHALLENGE_H
 #define DLG_FORGOTPASSWORDCHALLENGE_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 class DlgForgotPasswordChallenge : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
index 4ee0c9c88..0cb1773b6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
@@ -4,12 +4,16 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
+#include <QSize>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
+class QWidget;
+
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
index 2cf352e0d..ff255c748 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDREQUEST_H
 #define DLG_FORGOTPASSWORDREQUEST_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 class DlgForgotPasswordRequest : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
index 2800d5c0c..6c1b95b43 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@@ -4,12 +4,18 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
+class QVBoxLayout;
+class QWidget;
+
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
 {
     QString lastfphost;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
index 8a443b906..995d67359 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
@@ -7,13 +7,13 @@
 #ifndef DLG_FORGOTPASSWORDRESET_H
 #define DLG_FORGOTPASSWORDRESET_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 class DlgForgotPasswordReset : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
index b5451bb2c..cf503856f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
@@ -6,13 +6,18 @@
 
 #include <QGuiApplication>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QRect>
 #include <QScreen>
+#include <QSize>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QVBoxLayout>
+#include <QtGlobal>
+#include <functional>
+
+class QWidget;
 
 DlgInviteToGame::DlgInviteToGame(TabSupervisor *_tabSupervisor,
                                  const QString &_inviteUrl,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
index bbb589bdb..cfcc48733 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
@@ -8,12 +8,16 @@
 #define DLG_INVITE_TO_GAME_H
 
 #include <QDialog>
+#include <QList>
+#include <QString>
 #include <QStringList>
+#include <qtmetamacros.h>
 
 class QLineEdit;
 class QPushButton;
 class TabSupervisor;
 class UserListWidget;
+class QWidget;
 
 class DlgInviteToGame : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
index 626ebed50..cbf24db87 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@@ -3,8 +3,13 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
 
+#include <QDir>
+#include <QString>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/recents_settings.h>
+
+class QWidget;
+
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
     QString startingDir = SettingsCache::instance().recents().getLatestDeckDirPath();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
index 27d658902..5ba07c01d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
@@ -9,6 +9,9 @@
 #define DLG_LOAD_DECK_H
 
 #include <QFileDialog>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 /**
  * The file dialog for "Load Deck" operations.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
index a3242c797..2c0fd3f6f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
@@ -9,12 +9,19 @@
 #include <QCheckBox>
 #include <QClipboard>
 #include <QDialogButtonBox>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QKeyEvent>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
+#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
index dce9d712c..f3cbb7b62 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
@@ -8,13 +8,16 @@
 #ifndef DLG_LOAD_DECK_FROM_CLIPBOARD_H
 #define DLG_LOAD_DECK_FROM_CLIPBOARD_H
 
-#include "../../deck_loader/loaded_deck.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QCheckBox>
 #include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QPlainTextEdit;
 class QPushButton;
+class QCheckBox;
+class QWidget;
 
 /**
  * Base class for dialog windows for actions that involve loading decks from text input.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
index ba00873d9..88b7e2bb3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
@@ -1,16 +1,37 @@
 #include "dlg_load_deck_from_website.h"
 
+#include "../../deck_loader/card_node_function.h"
+#include "parsers/deck_link_to_api_transformer.h"
+#include "parsers/interface_json_deck_parser.h"
+
 #include <QApplication>
+#include <QByteArray>
 #include <QClipboard>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QEventLoop>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QString>
+#include <QTextStream>
+#include <QUrl>
+#include <QVBoxLayout>
+#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
+#include <qnamespace.h>
 #include <version_string.h>
 
+class QWidget;
+
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)
 {
     nam = new QNetworkAccessManager(this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
index 2890148b9..3f6e759f2 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
@@ -8,15 +8,21 @@
 #ifndef DLG_LOAD_DECK_FROM_WEBSITE_H
 #define DLG_LOAD_DECK_FROM_WEBSITE_H
 
-#include "../client/network/parsers/deck_link_to_api_transformer.h"
 #include "../client/network/parsers/interface_json_deck_parser.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QDialog>
-#include <QLabel>
-#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QNetworkAccessManager>
-#include <QVBoxLayout>
+#include <QSharedPointer>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QLineEdit;
+class QNetworkAccessManager;
+class QVBoxLayout;
+class QWidget;
+enum class DeckProvider;
+template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(DlgLoadDeckFromWebsiteLog, "dlg_load_deck_from_website");
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
index ffe08bec9..a56009fe4 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
@@ -3,9 +3,13 @@
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
+#include <QItemSelectionModel>
 #include <QPushButton>
+#include <QSize>
 #include <QVBoxLayout>
 
+class QWidget;
+
 DlgLoadRemoteDeck::DlgLoadRemoteDeck(AbstractClient *_client, QWidget *parent) : QDialog(parent), client(_client)
 {
     dirView = new RemoteDeckList_TreeWidget(client);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
index 9c81e9ae3..cfec16d90 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
@@ -9,12 +9,13 @@
 #define DLG_STARTGAME_H
 
 #include <QDialog>
+#include <qtmetamacros.h>
 
 class RemoteDeckList_TreeWidget;
 class QModelIndex;
 class AbstractClient;
-class QPushButton;
 class QDialogButtonBox;
+class QWidget;
 
 class DlgLoadRemoteDeck : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
index eca0ec658..858deb751 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
@@ -7,10 +7,13 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QSize>
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/game_settings.h>
 
+class QWidget;
+
 DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 {
     numberPlayersLabel = new QLabel(tr("Players:"), this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
index 4307581a4..0725a08db 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
@@ -11,6 +11,9 @@
 #define DLG_LOCAL_GAME_OPTIONS_H
 
 #include <QDialog>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 struct LocalGameOptions
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
index 86647ef26..0a18a759f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
@@ -7,6 +7,8 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
+class QWidget;
+
 DlgLoginPrompt::DlgLoginPrompt(const QString &serverText, QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Sign in"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
index e47924058..47bf3bcf4 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
@@ -8,9 +8,12 @@
 #define DLG_LOGIN_PROMPT_H
 
 #include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QCheckBox;
 class QLineEdit;
+class QWidget;
 
 /**
  * @brief Small sign-in dialog used when a cockatrice:// link needs credentials
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index 556c270be..b3da6d19c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -4,21 +4,42 @@
 #include "../../pixel_map_generator.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
+#include "libcockatrice/card/database/card_database.h"
 
+#include <QAbstractButton>
+#include <QAbstractItemView>
+#include <QAbstractTableModel>
 #include <QAction>
+#include <QByteArray>
 #include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QIcon>
 #include <QItemSelection>
+#include <QItemSelectionModel>
 #include <QLabel>
+#include <QList>
+#include <QModelIndex>
+#include <QModelIndexList>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSortFilterProxyModel>
+#include <QStringLiteral>
 #include <QToolBar>
 #include <QTreeView>
+#include <QWidget>
 #include <QtConcurrentRun>
+#include <QtGlobal>
 #include <algorithm>
+#include <compare>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
index 2ed5eca0f..d08412c51 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
@@ -7,12 +7,11 @@
 #ifndef DLG_MANAGE_SETS_H
 #define DLG_MANAGE_SETS_H
 
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QLabel>
 #include <QMainWindow>
+#include <QString>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
-class CardDatabase;
 class LineEditUnfocusable;
 class QGroupBox;
 class QItemSelection;
@@ -20,7 +19,14 @@ class QPushButton;
 class QTreeView;
 class SetsDisplayModel;
 class SetsModel;
-class SetsProxyModel;
+class QAction;
+class QDialogButtonBox;
+class QGridLayout;
+class QHBoxLayout;
+class QLabel;
+class QToolBar;
+class QWidget;
+template <class T> class QSet;
 
 class WndSets : public QMainWindow
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
index 1af83bfb5..52c9eaef0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
@@ -2,7 +2,11 @@
 
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
 
+#include <QAbstractItemView>
+#include <QFont>
 #include <QFontDatabase>
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -10,16 +14,22 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QSplitter>
+#include <QSharedPointer>
 #include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QTextEdit>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
 #include <libcockatrice/protocol/pb/command_report_details.pb.h>
 #include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
 #include <libcockatrice/protocol/pb/response_report_details.pb.h>
 #include <libcockatrice/protocol/pb/response_report_my_list.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+#include <string>
+
+class QWidget;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
index 09b1963dd..dc9f90d2d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
@@ -3,8 +3,9 @@
 
 #include <QDialog>
 #include <QList>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class QTableWidget;
@@ -12,6 +13,8 @@ class QTextEdit;
 class QLineEdit;
 class QPushButton;
 class QLabel;
+class QWidget;
+class Response;
 
 class DlgMyReports : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 6d022861c..9e32e87d1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -10,14 +10,23 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
+#include <QPixmap>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/string_limits.h>
 
+class QWidget;
+
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {
     // ── Server picker ──────────────────────────────────────────────────
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
index ce14eb427..10ea98543 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
@@ -5,12 +5,16 @@
 #include <QDialog>
 #include <QLineEdit>
 #include <QMap>
+#include <QString>
+#include <qtmetamacros.h>
+#include <utility>
 
 class HandlePublicServers;
 class QLabel;
 class QPushButton;
 class QRadioButton;
 class UserConnection_Information;
+class QWidget;
 
 class DlgRegister : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
index 7b855af96..b1ae479fe 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
@@ -1,21 +1,31 @@
 #include "dlg_report_user.h"
 
 #include "abstract_client.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QFont>
 #include <QFontDatabase>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLatin1String>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QSharedPointer>
 #include <QTextEdit>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/protocol/pb/command_report.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/report_categories.h>
+#include <qnamespace.h>
+#include <string>
+
+class QWidget;
 
 DlgReportUser::DlgReportUser(AbstractClient *_client,
                              const QString &_reportedUser,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
index f8d5938ce..c7fce055d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
@@ -2,7 +2,8 @@
 #define COCKATRICE_DLG_REPORT_USER_H
 
 #include <QDialog>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class QComboBox;
@@ -10,6 +11,8 @@ class QDialogButtonBox;
 class QLineEdit;
 class QTextEdit;
 class QLabel;
+class QWidget;
+class Response;
 
 class DlgReportUser : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
index 8eed083e1..55c6569f7 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@@ -1,26 +1,59 @@
 #include "dlg_select_set_for_cards.h"
 
 #include "../../deck_loader/card_node_function.h"
-#include "../../deck_loader/deck_loader.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QBrush>
+#include <QByteArray>
 #include <QCheckBox>
+#include <QColor>
 #include <QDialogButtonBox>
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QHBoxLayout>
+#include <QImage>
 #include <QLabel>
-#include <QMessageBox>
+#include <QLayoutItem>
 #include <QMimeData>
+#include <QModelIndex>
+#include <QMouseEvent>
+#include <QObject>
 #include <QPainter>
+#include <QPair>
+#include <QPixmap>
+#include <QPoint>
+#include <QPointF>
 #include <QPushButton>
+#include <QRect>
+#include <QScrollArea>
 #include <QScrollBar>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QSplitter>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QVector>
 #include <algorithm>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <qdrag.h>
-#include <qevent.h>
+#include <qalgorithms.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
+#include <utility>
 
 DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManger)
     : QDialog(parent), deckStateManager(deckStateManger)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
index 4528552d0..89cc43662 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
@@ -7,19 +7,23 @@
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
-#include "../interface/widgets/general/layout_containers/flow_widget.h"
-
-#include <QCheckBox>
 #include <QDialog>
-#include <QLabel>
-#include <QListWidget>
+#include <QList>
 #include <QMap>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
 
 class DeckStateManager;
 class SetEntryWidget; // Forward declaration
+class FlowWidget;
+class QCheckBox;
+class QLabel;
+class QListWidget;
+class QPushButton;
+class QScrollArea;
+class QVBoxLayout;
 
 class DlgSelectSetForCards : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index 581920dbc..d41c948eb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -8,6 +8,7 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../main.h"
+#include "../settings_page/abstract_settings_page.h"
 #include "../settings_page/appearance_settings_page.h"
 #include "../settings_page/deck_editor_settings_page.h"
 #include "../settings_page/general_settings_page.h"
@@ -18,33 +19,59 @@
 #include "../settings_page/sound_settings_page.h"
 #include "../settings_page/storage_settings_page.h"
 #include "../settings_page/user_interface_settings_page.h"
+#include "libcockatrice/card/database/card_database.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 #include "libcockatrice/card/database/card_database_manager.h"
 
+#include <QAbstractAnimation>
 #include <QAbstractItemView>
+#include <QApplication>
+#include <QBrush>
+#include <QByteArray>
 #include <QCloseEvent>
+#include <QColor>
+#include <QDebug>
 #include <QDir>
+#include <QEasingCurve>
+#include <QEvent>
+#include <QFlags>
 #include <QFrame>
 #include <QGraphicsOpacityEffect>
 #include <QGuiApplication>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QKeyEvent>
+#include <QKeySequence>
 #include <QLineEdit>
 #include <QListView>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QModelIndex>
+#include <QObject>
+#include <QPalette>
+#include <QPixmap>
 #include <QPropertyAnimation>
 #include <QPushButton>
+#include <QRect>
 #include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QSequentialAnimationGroup>
 #include <QShortcut>
+#include <QSize>
+#include <QSizePolicy>
 #include <QStackedLayout>
 #include <QStackedWidget>
+#include <QStringLiteral>
 #include <QToolButton>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qnamespace.h>
+
+class QModelIndex;
 
 /**
  * @brief Wraps a widget in a scroll area for long settings pages
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
index 845c0b4d6..1f15e76d5 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
@@ -7,9 +7,15 @@
 #define DLG_SETTINGS_H
 
 #include <QDialog>
+#include <QList>
 #include <QLoggingCategory>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class QPushButton;
+class QModelIndex;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");
 
@@ -17,7 +23,6 @@ class QStackedWidget;
 class QToolButton;
 class QListView;
 class QLineEdit;
-
 class AbstractSettingsPage;
 class SettingsSearchModel;
 class SettingsSearchDelegate;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
index 897d32062..eec80a7e8 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
@@ -9,16 +9,21 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QString>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
+#include <string>
+
+class QWidget;
+template <class T> class QSharedPointer;
 
 DlgShareDeck::DlgShareDeck(AbstractClient *_client, const QSharedPointer<DeckList> &_deck, QWidget *_parent)
     : QDialog(_parent), client(_client), deck(_deck), shareTimeoutTimer(new QTimer(this))
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
index 162fa3677..108a8c38b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
@@ -9,6 +9,7 @@
 
 #include <QDialog>
 #include <QSharedPointer>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class CommandContainer;
@@ -17,6 +18,8 @@ class QDialogButtonBox;
 class QLineEdit;
 class QTimer;
 class Response;
+class QWidget;
+template <class T> class QSharedPointer;
 
 /**
  * @brief Slim dialog to create a temporary share for the deck open in the editor.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
index cd7ecdcdd..8ad91dcaf 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
@@ -3,14 +3,19 @@
 #include "../deck_share/shared_deck_preview_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 
-#include <QCloseEvent>
+#include <QAbstractButton>
 #include <QDateTime>
 #include <QDialogButtonBox>
+#include <QFont>
 #include <QLabel>
 #include <QPushButton>
+#include <QStringList>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_querier.h>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
                                              const CardDatabaseQuerier *querier,
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
index 31820e3a0..fab7ba6bf 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
@@ -3,14 +3,17 @@
 
 #include <QDialog>
 #include <QList>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class FlowWidget;
-class QCloseEvent;
 class QLabel;
 class QPushButton;
 class ServerInfo_DeckShareItem;
 class SharedDeckPreviewWidget;
 class CardDatabaseQuerier;
+class QWidget;
 
 /**
  * @brief Non-modal preview of the decks contained in a shared-deck link.
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
index 4322beb8c..3d50480cc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
@@ -2,9 +2,17 @@
 
 #include "../../../client/settings/cache_settings.h"
 
+#include <QButtonGroup>
 #include <QDate>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QRadioButton>
+#include <QString>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/updates_settings.h>
 
+class QWidget;
+
 DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Card Update Check"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
index d26610983..0d0fb6670 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
@@ -7,12 +7,15 @@
 #ifndef DLG_STARTUP_CARD_CHECK_H
 #define DLG_STARTUP_CARD_CHECK_H
 
-#include <QButtonGroup>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QButtonGroup;
+class QDialogButtonBox;
+class QLabel;
+class QRadioButton;
+class QVBoxLayout;
+class QWidget;
 
 class DlgStartupCardCheck : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
index 3d3619bf0..511ff1c7d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@@ -7,9 +7,19 @@
 #include <QDate>
 #include <QDebug>
 #include <QDialogButtonBox>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QMessageLogger>
+#include <QPixmap>
 #include <QPushButton>
+#include <QSizePolicy>
+#include <QString>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <algorithm>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qnamespace.h>
 
 #define MIN_TIP_IMAGE_HEIGHT 200
 #define MIN_TIP_IMAGE_WIDTH 200
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
index e493481d0..689814115 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
@@ -7,12 +7,15 @@
 #ifndef DLG_TIPOFDAY_H
 #define DLG_TIPOFDAY_H
 
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QHBoxLayout;
+class QPixmap;
+class QVBoxLayout;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day");
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
index bac270580..76bb13248 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -4,18 +4,33 @@
 #include "../client/network/update/client/client_update_checker.h"
 #include "../client/network/update/client/release_channel.h"
 #include "../interface/window_main.h"
+#include "update/client/update_downloader.h"
 
+#include <QApplication>
+#include <QByteArray>
 #include <QCoreApplication>
+#include <QDate>
+#include <QDebug>
 #include <QDesktopServices>
+#include <QDialogButtonBox>
 #include <QDir>
 #include <QFileInfo>
 #include <QLabel>
+#include <QList>
+#include <QLocale>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QObject>
+#include <QProcess>
 #include <QProgressBar>
 #include <QPushButton>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSslSocket>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QtNetwork>
+#include <QWidget>
+#include <qnamespace.h>
 #include <version_string.h>
 
 // Executable that, when it sits next to the downloaded update installer, is installed instead of
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
index 2cef46e70..026a54a8c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
@@ -7,17 +7,24 @@
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "../client/network/update/client/update_downloader.h"
+#include "../../../client/network/update/client/release_channel.h"
 
-#include <QDialogButtonBox>
+#include <QDialog>
 #include <QLoggingCategory>
-#include <QProgressDialog>
-#include <QtNetwork>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QLabel;
+class QProgressBar;
+class QPushButton;
+class QWidget;
+class UpdateDownloader;
 
 inline Q_LOGGING_CATEGORY(DlgUpdateLog, "dlg_update");
 
-class Release;
-
 class DlgUpdate : public QDialog
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index 957e039c0..d55e800a1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -4,13 +4,18 @@
 #include "../../logger.h"
 
 #include <QApplication>
+#include <QCheckBox>
 #include <QClipboard>
+#include <QHBoxLayout>
+#include <QList>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/servers_settings.h>
 
+class QWidget;
+
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {
     logArea = new QPlainTextEdit;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
index 5c7315b50..d63ff5ffc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
@@ -7,11 +7,14 @@
 #ifndef DLG_VIEWLOG_H
 #define DLG_VIEWLOG_H
 
-#include <QCheckBox>
 #include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QPlainTextEdit;
-class QCloseEvent;
+class QCheckBox;
+class QPushButton;
+class QWidget;
 
 class DlgViewLog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
index 33d102f5e..57f7ff7f5 100644
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
@@ -3,7 +3,13 @@
 #include "../../card_picture_loader/card_picture_loader.h"
 #include "../../client/settings/cache_settings.h"
 
+#include <QMessageBox>
+#include <QObject>
+#include <QString>
 #include <libcockatrice/settings/cards_display_settings.h>
+
+class QWidget;
+
 bool OverridePrintingWarning::execMessageBox(QWidget *parent, bool enable)
 {
     QString message;
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
index f2c926fc3..6c5891373 100644
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_OVERRIDE_PRINTING_WARN_H
 #define COCKATRICE_OVERRIDE_PRINTING_WARN_H
-#include <QMessageBox>
+
+class QWidget;
 
 namespace OverridePrintingWarning
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
index 66170792a..3463fe6df 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
@@ -2,11 +2,20 @@
 
 #include <QDate>
 #include <QFile>
-#include <QMessageBox>
+#include <QIODevice>
+#include <QList>
+#include <QSharedPointer>
+#include <QStringView>
 #include <QTextStream>
+#include <QVariant>
 #include <QXmlStreamReader>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <stdio.h>
 #include <utility>
 
+class QObject;
+
 #define TIPDDBMODEL_COLUMNS 3
 
 TipOfTheDay::TipOfTheDay(QString _title, QString _content, QString _imagePath, QDate _date)
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
index 9cda07e2b..4e6e23567 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
@@ -9,6 +9,12 @@
 
 #include <QAbstractListModel>
 #include <QDate>
+#include <QModelIndex>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+template <typename T> class QList;
 
 class TipOfTheDay
 {
diff --git a/cockatrice/src/interface/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h
index 423111bb6..775d55895 100644
--- a/cockatrice/src/interface/widgets/general/background_sources.h
+++ b/cockatrice/src/interface/widgets/general/background_sources.h
@@ -9,7 +9,10 @@
 
 #include <QList>
 #include <QObject>
+#include <QSharedPointer>
 #include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class BackgroundSources
 {
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp b/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
index aad259900..fd9ad67a8 100644
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
@@ -1,9 +1,9 @@
 #include "background_plate_widget.h"
 
-#include <QBrush>
 #include <QColor>
 #include <QPainter>
-#include <QPen>
+#include <QRect>
+#include <qnamespace.h>
 
 BackgroundPlateWidget::BackgroundPlateWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
index 1fc1bc3ba..6634069c4 100644
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
@@ -2,6 +2,7 @@
 #define COCKATRICE_BACKGROUND_PLATE_WIDGET_H
 
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class BackgroundPlateWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
index 31f384cac..baf46bbba 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
@@ -2,10 +2,15 @@
 
 #include "../../../pixel_map_generator.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QHBoxLayout>
 #include <QLinearGradient>
-#include <QMouseEvent>
 #include <QPainter>
-#include <QVBoxLayout>
+#include <QPixmap>
+#include <QPointF>
+#include <QRect>
+#include <QtGlobal>
 
 BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation orientation, int transparency_)
     : QWidget(parent), gradientOrientation(orientation), transparency(qBound(0, transparency_, 100))
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h
index 77a05abb6..06556089b 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -10,8 +10,10 @@
 #define BANNER_WIDGET_H
 
 #include <QLabel>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class BannerWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
index f7ca669f3..3ea2df6bd 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
@@ -1,5 +1,17 @@
 #include "bar_chart_background_widget.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <QString>
+#include <QtGlobal>
+#include <qnamespace.h>
+
 BarChartBackgroundWidget::BarChartBackgroundWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
index 06a17c7c6..1fc8a3bde 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
@@ -1,8 +1,8 @@
 #ifndef COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
 #define COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
 
-#include <QPainter>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class BarChartBackgroundWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
index 04315d0ce..484ac861d 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -1,9 +1,20 @@
 #include "bar_chart_widget.h"
 
+#include <QBrush>
+#include <QFlags>
+#include <QFont>
+#include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPen>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QSize>
 #include <QToolTip>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 BarChartWidget::BarChartWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
index e80a3f8e8..a596c094a 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
@@ -2,9 +2,12 @@
 #define COCKATRICE_BAR_CHART_WIDGET_H
 
 #include <QColor>
+#include <QList>
 #include <QString>
+#include <QStringList>
 #include <QVector>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 struct BarSegment
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
index 2194b6b03..82d15d5be 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
@@ -2,6 +2,10 @@
 
 #include <QFontMetrics>
 #include <QPainter>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <utility>
 
 BarWidget::BarWidget(QString label, int value, int total, QColor barColor, QWidget *parent)
     : QWidget(parent), label(std::move(label)), value(value), total(total), barColor(barColor)
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
index 05814f15b..18da1f939 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
@@ -8,7 +8,11 @@
 #ifndef BAR_WIDGET_H
 #define BAR_WIDGET_H
 
+#include <QColor>
+#include <QString>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class BarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
index 1087c621e..28118cc9c 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
@@ -2,10 +2,21 @@
 
 #include "libcockatrice/utility/color.h"
 
+#include <QBrush>
 #include <QLinearGradient>
+#include <QMap>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
 #include <QToolTip>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <utility>
 
 ColorBar::ColorBar(const QMap<QString, int> &_colors, QWidget *parent)
     : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
index 1d435cec1..3acb7f97f 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
@@ -2,9 +2,13 @@
 #define COCKATRICE_COLOR_BAR_H
 
 #include <QColor>
-#include <QMap>
+#include <QList>
+#include <QPair>
 #include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+template <class Key, class T> class QMap;
 
 /**
  * @class ColorBar
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
index 3726dd061..33195a518 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
@@ -1,5 +1,13 @@
 #include "percent_bar_widget.h"
 
+#include <QBrush>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
+
 PercentBarWidget::PercentBarWidget(QWidget *parent, double initialValue) : QWidget(parent), valueToDisplay(initialValue)
 {
     setMinimumSize(50, 10);
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
index 9cd6039c8..f12cb8ae7 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
@@ -8,8 +8,9 @@
 #ifndef PERCENT_BAR_WIDGET_H
 #define PERCENT_BAR_WIDGET_H
 
-#include <QPainter>
 #include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class PercentBarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
index 03c69373a..5a3130964 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -1,9 +1,19 @@
 #include "segmented_bar_widget.h"
 
+#include <QBrush>
+#include <QFont>
+#include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
 #include <QToolTip>
+#include <qnamespace.h>
+#include <utility>
 
 SegmentedBarWidget::SegmentedBarWidget(QString label, QVector<Segment> segments, int total, QWidget *parent)
     : QWidget(parent), label(std::move(label)), segments(std::move(segments)), total(total)
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
index 4df54e42e..c8c7dc2b9 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
@@ -2,8 +2,12 @@
 #define COCKATRICE_SEGMENTED_BAR_WIDGET_H
 
 #include <QColor>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QVector>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class SegmentedBarWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
index bd4641981..82542a663 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -2,10 +2,22 @@
 
 #include "libcockatrice/utility/color.h"
 
+#include <QBrush>
+#include <QFontMetrics>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QPointF>
+#include <QRadialGradient>
+#include <QRectF>
+#include <QSize>
 #include <QToolTip>
+#include <QtGlobal>
 #include <QtMath>
+#include <cmath>
+#include <qnamespace.h>
+#include <utility>
 
 ColorPie::ColorPie(const QMap<QString, int> &_colors, QWidget *parent)
     : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
index 60d8e18f2..0fe023f63 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
@@ -1,6 +1,12 @@
 #ifndef COCKATRICE_COLOR_PIE_H
 #define COCKATRICE_COLOR_PIE_H
 
+#include <QColor>
+#include <QList>
+#include <QPair>
+#include <qtmetamacros.h>
+
+class QPoint;
 #ifndef COLOR_PIE_H
 #define COLOR_PIE_H
 
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
index f485e0040..0609eb16a 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
@@ -1,7 +1,16 @@
 #include "dynamic_font_size_label.h"
-#define FONT_PRECISION (0.5)
 
-#include <QElapsedTimer>
+#include <QFont>
+#include <QFontMetricsF>
+#include <QObject>
+#include <QRect>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QWidget>
+#include <QtGlobal>
+
+#define FONT_PRECISION (0.5)
 
 DynamicFontSizeLabel::DynamicFontSizeLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
index c9b159b02..cd029902a 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
@@ -9,6 +9,12 @@
 
 #include <QColor>
 #include <QLabel>
+#include <QString>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+#include <stddef.h>
+
+class QWidget;
 
 class DynamicFontSizeLabel : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
index 653b2cd5c..25e8ca48f 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
@@ -2,7 +2,14 @@
 
 #include "dynamic_font_size_label.h"
 
+#include <QBrush>
+#include <QFont>
+#include <QLinearGradient>
 #include <QPainter>
+#include <QPen>
+#include <QSize>
+#include <QWidget>
+#include <qnamespace.h>
 
 DynamicFontSizePushButton::DynamicFontSizePushButton(QWidget *parent) : QPushButton(parent)
 {
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
index 540abfe6b..dfbb03d20 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
@@ -7,9 +7,12 @@
 #ifndef DYNAMICFONTSIZEPUSHBUTTON_H
 #define DYNAMICFONTSIZEPUSHBUTTON_H
 
-#include <QObject>
+#include <QColor>
 #include <QPushButton>
-#include <QWidget>
+#include <QString>
+#include <stddef.h>
+
+class QWidget;
 
 class DynamicFontSizePushButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.cpp b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
index ee26c78d9..40ee91bcc 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
@@ -1,5 +1,12 @@
 #include "labeled_input.h"
 
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QSpinBox>
+#include <qobjectdefs.h>
+
 LabeledInput::LabeledInput(QWidget *parent, const QString &labelText) : QWidget(parent)
 {
     label = new QLabel(labelText, this);
diff --git a/cockatrice/src/interface/widgets/general/display/labeled_input.h b/cockatrice/src/interface/widgets/general/display/labeled_input.h
index 838dfb280..a07d50dbb 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.h
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h
@@ -7,11 +7,15 @@
 #ifndef LABELED_INPUT_H
 #define LABELED_INPUT_H
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QHBoxLayout;
+class QLabel;
+class QSpinBox;
 
 class LabeledInput final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
index 7db18c57d..e1218a6fb 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
@@ -1,7 +1,13 @@
 #include "shadow_background_label.h"
 
-#include <QPaintEvent>
+#include <QColor>
+#include <QMargins>
 #include <QPainter>
+#include <QRect>
+#include <QSizePolicy>
+#include <qnamespace.h>
+
+class QWidget;
 
 /**
  * @class ShadowBackgroundLabel
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
index 69232691e..e64b9ca5b 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
@@ -8,6 +8,10 @@
 #define STYLEDLABEL_H
 
 #include <QLabel>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 class ShadowBackgroundLabel : public QLabel
 {
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
index c7bdd1e5e..7f23827bc 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
@@ -1,9 +1,19 @@
 #include "home_styled_button.h"
 
+#include <QBrush>
+#include <QFontMetrics>
 #include <QPainter>
 #include <QPainterPath>
-#include <qgraphicseffect.h>
-#include <qstyleoption.h>
+#include <QPen>
+#include <QPointF>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QWidget;
 
 HomeStyledButton::HomeStyledButton(const QString &text, QPair<QColor, QColor> _gradientColors, QWidget *parent)
     : QPushButton(text, parent), gradientColors(_gradientColors)
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index f8d97e9aa..55ac5550f 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -6,7 +6,13 @@
 
 #ifndef HOME_STYLED_BUTTON_H
 #define HOME_STYLED_BUTTON_H
+#include <QColor>
+#include <QPair>
 #include <QPushButton>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 class HomeStyledButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index 648d315f9..c77fd76fd 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -2,25 +2,68 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../deck_loader/deck_file_format.h"
+#include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
+#include "../../theme_config.h"
 #include "../../theme_manager.h"
 #include "../../window_main.h"
 #include "../cards/art_crop_attribution.h"
+#include "../cards/card_info_picture_art_crop_widget.h"
+#include "abstract_client.h"
 #include "background_sources.h"
 #include "home_styled_button.h"
 #include "home_tab_button_color.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/utility/card_ref.h"
 
+#include <QBrush>
+#include <QDebug>
+#include <QFlags>
+#include <QFont>
+#include <QFontMetrics>
+#include <QGridLayout>
 #include <QGroupBox>
+#include <QImage>
 #include <QLabel>
 #include <QLinearGradient>
+#include <QList>
+#include <QMap>
+#include <QObject>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPoint>
+#include <QPointF>
 #include <QPushButton>
+#include <QRandomGenerator>
+#include <QRect>
+#include <QRectF>
+#include <QRgb>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QString>
+#include <QStringLiteral>
+#include <QTimer>
 #include <QVBoxLayout>
+#include <QVector>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <optional>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <utility>
 
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home")))
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index 1cadc4a67..fb9566cad 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -7,16 +7,23 @@
 
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../cards/card_info_picture_art_crop_widget.h"
-#include "home_styled_button.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QGridLayout>
+#include <QColor>
+#include <QPair>
+#include <QPixmap>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <qtmetamacros.h>
 
 class QGridLayout;
 class QLabel;
+class CardInfoPictureArtCropWidget;
+class ExactCard;
+class HomeStyledButton;
+class QGroupBox;
+class QTimer;
+class TabSupervisor;
 
 class HomeWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
index 01c9ac34e..6a6025ec2 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
@@ -6,10 +6,17 @@
 
 #include "flow_widget.h"
 
+#include "../../../layouts/flow_layout.h"
+
+#include <QEvent>
 #include <QHBoxLayout>
 #include <QKeyEvent>
+#include <QLayoutItem>
+#include <QList>
+#include <QMessageLogger>
 #include <QResizeEvent>
 #include <QScrollArea>
+#include <QSize>
 #include <QSizePolicy>
 #include <QWidget>
 
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
index 4d52db3f1..dbf33d07f 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
@@ -8,13 +8,17 @@
 #ifndef FLOW_WIDGET_H
 #define FLOW_WIDGET_H
 
-#include "../../../layouts/flow_layout.h"
-
-#include <QHBoxLayout>
-#include <QKeyEvent>
 #include <QLoggingCategory>
-#include <QScrollArea>
 #include <QWidget>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class FlowLayout;
+class QHBoxLayout;
+class QKeyEvent;
+class QLayoutItem;
+class QScrollArea;
 
 inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget", QtInfoMsg);
 inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size", QtInfoMsg);
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
index 97068978d..8cfe190e2 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
@@ -1,7 +1,11 @@
 #include "overlap_control_widget.h"
 
+#include "../display/labeled_input.h"
 #include "overlap_widget.h"
 
+#include <QHBoxLayout>
+#include <QSlider>
+
 OverlapControlWidget::OverlapControlWidget(int overlapPercentage,
                                            int maxColumns,
                                            int maxRows,
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
index 104a97da9..c5639110f 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
@@ -6,12 +6,14 @@
 
 #ifndef OVERLAP_CONTROL_WIDGET_H
 #define OVERLAP_CONTROL_WIDGET_H
-#include "../display/labeled_input.h"
-#include "overlap_widget.h"
-
-#include <QHBoxLayout>
-#include <QSlider>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class LabeledInput;
+class OverlapWidget;
+class QHBoxLayout;
+class QSlider;
 
 class OverlapControlWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
index 1c4ee30ab..03240211c 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
@@ -1,9 +1,9 @@
 #include "overlap_widget.h"
 
-#include "../../../layouts/flow_layout.h"
+#include "../../../layouts/overlap_layout.h"
 
+#include <QLayoutItem>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 /**
  * @class OverlapWidget
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
index 62c620201..c103c5f80 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
@@ -7,9 +7,12 @@
 #ifndef OVERLAP_WIDGET_H
 #define OVERLAP_WIDGET_H
 
-#include "../../../layouts/overlap_layout.h"
-
+#include <QString>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class OverlapLayout;
 
 class OverlapWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
index 6e27b4e42..b0503ec22 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@@ -2,9 +2,14 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../deck_editor/deck_editor_filter_dock_widget.h"
 #include "../tabs/abstract_tab_deck_editor.h"
 
+#include <QAction>
+#include <QList>
+#include <QString>
 #include <libcockatrice/settings/recents_settings.h>
+
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
     aNewDeck = new QAction(QString(), this);
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
index 08ce7bba1..904fbb6f4 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
@@ -8,8 +8,11 @@
 #define DECK_EDITOR_MENU_H
 
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
+class QAction;
+
 class DeckEditorMenu : public QMenu
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
index 4af02fe4f..6441a7864 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
@@ -10,7 +10,6 @@
 #include "shader_banner_widget.h"
 #include "step_indicator_widget.h"
 
-#include <QCloseEvent>
 #include <QEvent>
 #include <QFont>
 #include <QHBoxLayout>
@@ -18,6 +17,10 @@
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QVBoxLayout>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
 
 FirstRunWizard::FirstRunWizard(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
index 21d7b6e06..bd0e79679 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
@@ -3,6 +3,9 @@
 
 #include <QDialog>
 #include <QList>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class BannerHost;
 class FirstRunWizardPage;
@@ -11,6 +14,7 @@ class CardDatabaseSetupPage;
 class QLabel;
 class QPushButton;
 class QStackedWidget;
+class QWidget;
 
 /** @brief Polished first-run onboarding flow: card database setup, theme
  *         selection, server account setup, and a handful of key preferences.
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
index bdcd123bd..e7b818810 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
@@ -1,7 +1,9 @@
 #ifndef FIRST_RUN_WIZARD_PAGE_H
 #define FIRST_RUN_WIZARD_PAGE_H
 
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 /** @brief Base class for a single step of FirstRunWizard.
  *
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
index 2107ea8bf..16a1d2254 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
@@ -1,8 +1,14 @@
 #include "account_setup_page.h"
 
+#include "../first_run_wizard_page.h"
+
 #include <QLabel>
 #include <QPushButton>
+#include <QString>
 #include <QVBoxLayout>
+#include <qnamespace.h>
+
+class QWidget;
 
 AccountSetupPage::AccountSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
index 0d9b76699..344b4e41a 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
@@ -3,8 +3,11 @@
 
 #include "../first_run_wizard_page.h"
 
+#include <qtmetamacros.h>
+
 class QLabel;
 class QPushButton;
+class QWidget;
 
 /** @brief First-run account step. Does NOT embed DlgRegister's fields: they exist
  *         to be handed to ConnectionController's network registration flow, which
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
index 50e8ff63d..feff78088 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
@@ -1,23 +1,31 @@
 #include "card_database_setup_page.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../first_run_wizard_page.h"
+#include "libcockatrice/card/database/card_database.h"
 
 #include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QLatin1String>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QSettings>
+#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <climits>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/updates_settings.h>
+#include <qnamespace.h>
 
 CardDatabaseSetupPage::CardDatabaseSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
index 870e759ea..77631dc77 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
@@ -4,6 +4,9 @@
 #include "../first_run_wizard_page.h"
 
 #include <QSize>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QLabel;
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
index 4205fa532..1adf35282 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
@@ -1,7 +1,13 @@
 #include "finish_page.h"
 
+#include "../first_run_wizard_page.h"
+
 #include <QLabel>
+#include <QString>
 #include <QVBoxLayout>
+#include <qnamespace.h>
+
+class QWidget;
 
 FinishPage::FinishPage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
index 40ebc6ed0..b78e40ec5 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
@@ -3,7 +3,10 @@
 
 #include "../first_run_wizard_page.h"
 
+#include <qtmetamacros.h>
+
 class QLabel;
+class QWidget;
 
 class FinishPage : public FirstRunWizardPage
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
index fceb34deb..da08e3a12 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
@@ -2,6 +2,7 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/sound_engine.h"
+#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/interface_settings.h"
 #include "libcockatrice/settings/sound_settings.h"
 #include "libcockatrice/settings/tabs_settings.h"
@@ -9,10 +10,16 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
+#include <QFrame>
 #include <QGroupBox>
 #include <QLabel>
+#include <QList>
 #include <QScrollArea>
+#include <QString>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
index eed1b3aed..18d6c0e8f 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
@@ -3,10 +3,13 @@
 
 #include "../first_run_wizard_page.h"
 
+#include <qtmetamacros.h>
+
 class QCheckBox;
 class QComboBox;
 class QGroupBox;
 class QLabel;
+class QWidget;
 
 /** @brief A curated subset of settings for the user to adjust.
  **/
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
index 797fe4425..66554d85c 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
@@ -1,10 +1,12 @@
 #include "theme_setup_page.h"
 
+#include "../../../theme_config.h"
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/palette_editor/palette_generator.h"
 #include "../../interface/palette_editor/quick_setup_panel.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/general/background_sources.h"
+#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/appearance_settings.h"
 
 #include <QComboBox>
@@ -12,12 +14,21 @@
 #include <QFile>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QLabel>
+#include <QIODevice>
+#include <QList>
+#include <QMap>
 #include <QMessageBox>
+#include <QObject>
 #include <QPalette>
+#include <QSharedPointer>
+#include <QStringLiteral>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
+#include <initializer_list>
 #include <libcockatrice/settings/paths_settings.h>
-#include <libcockatrice/settings/personal_settings.h>
+
+class QWidget;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
index 16a3c9a5d..b0d717043 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
@@ -3,9 +3,14 @@
 
 #include "../first_run_wizard_page.h"
 
+#include <QColor>
+#include <QString>
+#include <qtmetamacros.h>
+
 class QComboBox;
 class QGroupBox;
 class QuickSetupPanel;
+class QWidget;
 
 /** @brief First-run theme step. Reuses the same building blocks as Appearance
  *         settings and the Palette Editor (ThemeManager, PaletteConfig,
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
index 16e0719d2..71d2fa409 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
@@ -3,15 +3,23 @@
 #include "../../../../main.h"
 #include "../../client/settings/cache_settings.h"
 #include "../../settings_page/general_settings_page.h"
+#include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/personal_settings.h"
 
 #include <QApplication>
+#include <QChar>
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
 #include <QLocale>
-#include <QTranslator>
+#include <QString>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QWidget;
 
 WelcomePage::WelcomePage(QWidget *parent) : FirstRunWizardPage(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
index 93b24d83d..289034ab1 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
@@ -3,8 +3,11 @@
 
 #include "../first_run_wizard_page.h"
 
+#include <qtmetamacros.h>
+
 class QComboBox;
 class QLabel;
+class QWidget;
 
 class WelcomePage : public FirstRunWizardPage
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
index 0b9f65783..c17399957 100644
--- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
@@ -1,16 +1,27 @@
 #include "shader_banner_widget.h"
 
+#include "../../theme_config.h"
 #include "../../theme_manager.h"
 #include "banner_shader_config.h"
 #include "brand_colors.h"
 
 #include <QApplication>
+#include <QBrush>
+#include <QDebug>
+#include <QLinearGradient>
 #include <QPainter>
+#include <QPalette>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQuickWidget>
-#include <QResizeEvent>
+#include <QRgb>
 #include <QStackedLayout>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qmath.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
index ac47b1141..6fa0c703f 100644
--- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
@@ -5,6 +5,8 @@
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class BannerShaderConfig;
 class QQuickWidget;
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
index d25e8544b..004bdcc11 100644
--- a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
@@ -1,7 +1,13 @@
 #include "step_indicator_widget.h"
 
+#include <QBrush>
+#include <QColor>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
+#include <QRectF>
+#include <QSize>
+#include <QtGlobal>
 
 StepIndicatorWidget::StepIndicatorWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
index 1b85be04f..d2b5dfcb5 100644
--- a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
@@ -2,6 +2,7 @@
 #define STEP_INDICATOR_WIDGET_H
 
 #include <QWidget>
+#include <qtmetamacros.h>
 
 /** @brief Row of dots showing progress through a fixed-length sequence of steps,
  *         in the style of a mobile/OS setup flow. Purely presentational. */
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
index e970f8413..f77aefb33 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
@@ -1,6 +1,9 @@
 #include "playmat_collection_dialog.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 #include "playmat_settings_dialog.h"
 
 #include <QComboBox>
@@ -8,10 +11,15 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListWidget>
+#include <QListWidgetItem>
 #include <QPushButton>
+#include <QString>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/settings/interface_settings.h>
 
+class QWidget;
+
 PlaymatCollectionDialog::PlaymatCollectionDialog(QWidget *parent) : QDialog(parent)
 {
     setMinimumWidth(420);
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
index 167893f8e..a04cfdf54 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
@@ -2,13 +2,15 @@
 #define COCKATRICE_PLAYMAT_COLLECTION_DIALOG_H
 
 #include <QDialog>
+#include <QList>
 #include <libcockatrice/utility/playmat_params.h>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QLabel;
 class QListWidget;
-class QListWidgetItem;
 class QPushButton;
+class QWidget;
 
 /**
  * @brief Dialog for editing the user-level playmat collection.
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
index 130daadf4..881866292 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
@@ -3,13 +3,22 @@
 #include "../cards/art_crop_attribution.h"
 #include "playmat_utils.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
 #include <QKeyEvent>
 #include <QLinearGradient>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPainterPath>
+#include <QPalette>
+#include <QPen>
+#include <QPointF>
+#include <QRect>
+#include <QSizePolicy>
 #include <QWheelEvent>
+#include <QtGlobal>
 #include <cmath>
+#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
index 88b9ec41d..5e54e96eb 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
@@ -1,10 +1,15 @@
 #ifndef COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
 #define COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
 
-#include <QFocusEvent>
+#include "libcockatrice/utility/playmat_params.h"
+
 #include <QPixmap>
+#include <QPoint>
+#include <QRectF>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 /**
  * @brief Interactive crop surface showing how a playmat card art will appear
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
index 9459c5ea9..5a4457d34 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
@@ -6,6 +6,11 @@
 #include "../utility/completer_utils.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 #include "playmat_preview_widget.h"
 
 #include <QCheckBox>
@@ -15,14 +20,18 @@
 #include <QDoubleSpinBox>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QPainter>
-#include <QPainterPath>
+#include <QList>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QSignalBlocker>
+#include <QSize>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
 
 PlaymatSettingsDialog::PlaymatSettingsDialog(const CardRef &initialCard,
                                              const PlaymatParams &initialParams,
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
index 9ef306a5f..07833af25 100644
--- a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
@@ -1,9 +1,14 @@
 #ifndef COCKATRICE_PLAYMAT_SETTINGS_DIALOG_H
 #define COCKATRICE_PLAYMAT_SETTINGS_DIALOG_H
 
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
+
 #include <QDialog>
+#include <QMetaObject>
 #include <QPixmap>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QCheckBox;
 class QComboBox;
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
index 579106540..bad88ddbb 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
@@ -1,8 +1,21 @@
 #include "all_zones_card_amount_widget.h"
 
 #include "../general/display/shadow_background_label.h"
+#include "card_amount_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QFont>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QSlider>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <algorithm>
+#include <qnamespace.h>
+
+class DeckStateManager;
 
 /**
  * @brief Constructor for the AllZonesCardAmountWidget class.
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
index 325dd1c1b..cefabe293 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
@@ -7,11 +7,15 @@
 
 #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
 #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
-#include "../../deck_loader/deck_loader.h"
-#include "card_amount_widget.h"
-
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class CardAmountWidget;
+class DeckStateManager;
+class ExactCard;
+class QLabel;
+class QSlider;
+class QVBoxLayout;
 
 class AllZonesCardAmountWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
index ff47e7b9c..4b5040741 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -1,9 +1,30 @@
 #include "card_amount_widget.h"
 
 #include "../deck_editor/deck_state_manager.h"
+#include "../general/display/dynamic_font_size_push_button.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QFont>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QModelIndex>
 #include <QPainter>
-#include <QTimer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSlider>
+#include <QVariant>
+#include <algorithm>
+#include <functional>
+#include <qnamespace.h>
+
+class QModelIndex;
 
 /**
  * @brief Constructs a widget for displaying and controlling the card count in a specific zone.
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
index 2780e3ad2..6f5889fc7 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -8,15 +8,17 @@
 #ifndef CARD_AMOUNT_WIDGET_H
 #define CARD_AMOUNT_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../general/display/dynamic_font_size_push_button.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QTreeView>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class DeckStateManager;
+class DynamicFontSizePushButton;
+class QHBoxLayout;
+class QLabel;
+class QSlider;
 
 class CardAmountWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
index f16b4885c..27ae61b94 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -1,19 +1,38 @@
 #include "printing_selector.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
+#include "../cards/card_size_widget.h"
 #include "../deck_editor/deck_state_manager.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "printing_selector_card_display_widget.h"
 #include "printing_selector_card_search_widget.h"
 #include "printing_selector_card_selection_widget.h"
 #include "printing_selector_card_sorting_widget.h"
 #include "printing_selector_placeholder_widget.h"
 
-#include <QBoxLayout>
+#include <QCheckBox>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QList>
+#include <QMap>
+#include <QScrollArea>
 #include <QScrollBar>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
+#include <QTimer>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/macros.h>
+#include <qnamespace.h>
 
 /**
  * @brief Constructs a PrintingSelector widget to display and manage card printings.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
index 14d73f836..b9cb27ecd 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@@ -7,18 +7,20 @@
 #ifndef PRINTING_SELECTOR_H
 #define PRINTING_SELECTOR_H
 
-#include "../cards/card_size_widget.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "printing_selector_placeholder_widget.h"
-
-#include <QCheckBox>
-#include <QLabel>
-#include <QTreeView>
-#include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class FlowWidget;
+class PrintingSelectorPlaceholderWidget;
+class QCheckBox;
+class QHBoxLayout;
+class QString;
+class QTimer;
+class QVBoxLayout;
+class SettingsButtonWidget;
+template <class Key, class T> class QMap;
 
 #define BATCH_SIZE 10
 
@@ -33,8 +35,8 @@ class DeckStateManager;
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
 class PrintingSelectorCardSortingWidget;
-class PrintingSelectorViewOptionsWidget;
 class AbstractTabDeckEditor;
+
 class PrintingSelector : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
index edeba86d1..1c3cb635d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
@@ -1,11 +1,22 @@
 #include "printing_selector_card_display_widget.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "printing_selector.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <QGraphicsEffect>
+#include <QMap>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
 #include <QVBoxLayout>
-#include <utility>
+#include <qnamespace.h>
+
+class AbstractTabDeckEditor;
+class DeckStateManager;
+class QSlider;
 
 /**
  * @brief Constructs a PrintingSelectorCardDisplayWidget to display card information.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
index 4de561f4f..f0a378fd3 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
@@ -7,12 +7,25 @@
 #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "printing_selector_card_overlay_widget.h"
-#include "set_name_and_collectors_number_display_widget.h"
+#include "libcockatrice/card/printing/exact_card.h"
+
+// IWYU pragma: keep
+// ZoneCounts appears inside a QMap in a slot signature, so the moc-generated
+// code needs the complete type.
+#include "printing_selector.h"
 
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class AbstractTabDeckEditor;
+class DeckStateManager;
+class PrintingSelectorCardOverlayWidget;
+class QSlider;
+class QString;
+class QVBoxLayout;
+class SetNameAndCollectorsNumberDisplayWidget;
+struct ZoneCounts;
+template <class Key, class T> class QMap;
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index e8816847e..bec9100a6 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -3,23 +3,46 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../card_picture_loader/card_picture_loader.h"
 #include "../cards/card_info_picture_widget.h"
-#include "printing_selector_card_display_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
+#include "all_zones_card_amount_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QAction>
 #include <QApplication>
+#include <QDebug>
 #include <QFileDialog>
+#include <QGuiApplication>
+#include <QImage>
 #include <QImageReader>
 #include <QLabel>
+#include <QList>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
+#include <QPixmap>
 #include <QPixmapCache>
+#include <QPoint>
+#include <QRect>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizeF>
+#include <QSlider>
+#include <QString>
+#include <QStringLiteral>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/card_override_settings.h>
-#include <utility>
+#include <qnamespace.h>
+
+class DeckStateManager;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
index fbcfa9230..20d8f7b4b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
@@ -7,14 +7,20 @@
 #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "all_zones_card_amount_widget.h"
-#include "set_name_and_collectors_number_display_widget.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <QWidget>
+#include <qtmetamacros.h>
 
 class QAction;
 class QMenu;
+class AbstractTabDeckEditor;
+class AllZonesCardAmountWidget;
+class CardInfoPictureWidget;
+class DeckStateManager;
+class QLabel;
+class QPoint;
+class QSlider;
 
 class PrintingSelectorCardOverlayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
index 3c42f06dc..718e24ea0 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
@@ -1,5 +1,11 @@
 #include "printing_selector_card_search_widget.h"
 
+#include "printing_selector.h"
+
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QTimer>
+
 /**
  * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.
  *
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
index 3efabe13c..d54cf5fbc 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
@@ -7,11 +7,14 @@
 #ifndef PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 
-#include "printing_selector.h"
-
-#include <QLineEdit>
-#include <QTimer>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class PrintingSelector;
+class QHBoxLayout;
+class QLineEdit;
+class QTimer;
 
 class PrintingSelectorCardSearchWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
index 2eb2ef245..da66591b3 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
@@ -1,7 +1,12 @@
 #include "printing_selector_card_selection_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "printing_selector.h"
+
+#include <QHBoxLayout>
+#include <QPushButton>
+
+class DeckStateManager;
 
 /**
  * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck.
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
index 0aa56c9d8..c619c5327 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.h
@@ -7,11 +7,13 @@
 #ifndef PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 
-#include "printing_selector.h"
-
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckStateManager;
+class PrintingSelector;
+class QHBoxLayout;
+class QPushButton;
 
 class PrintingSelectorCardSelectionWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
index f4a05cfc7..f47ba0746 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -1,11 +1,26 @@
 #include "printing_selector_card_sorting_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "printing_selector.h"
 
+#include <QComboBox>
+#include <QDate>
+#include <QHBoxLayout>
+#include <QModelIndex>
+#include <QPair>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QVariant>
+#include <algorithm>
 #include <libcockatrice/card/set/card_set_comparator.h>
 #include <libcockatrice/settings/card_database_settings.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+#include <utility>
 
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
index bb5b60cdc..1cd99457b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
@@ -7,11 +7,20 @@
 #ifndef PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 
-#include "printing_selector.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
-#include <QComboBox>
-#include <QPushButton>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckListModel;
+class PrintingSelector;
+class QComboBox;
+class QHBoxLayout;
+class QPushButton;
 
 class PrintingSelectorCardSortingWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
index aee34bccd..7f9ad66c8 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
@@ -1,5 +1,10 @@
 #include "printing_selector_placeholder_widget.h"
 
+#include <QLabel>
+#include <QSizePolicy>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *parent) : QWidget(parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
index abf030c69..6702d325a 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
@@ -1,9 +1,11 @@
 #ifndef COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
 #define COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
 
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
 
 class PrintingSelectorPlaceholderWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
index e12775a04..9bc92ad90 100644
--- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
@@ -1,6 +1,11 @@
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <QSlider>
+#include <QFontMetrics>
+#include <QLabel>
+#include <QRect>
+#include <QSizePolicy>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 /**
  * @class SetNameAndCollectorsNumberDisplayWidget
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
index 140f190df..54e580b67 100644
--- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
@@ -8,10 +8,12 @@
 #ifndef SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 #define SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
 
 class SetNameAndCollectorsNumberDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
index 881c3e3ac..981ed843c 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -1,11 +1,21 @@
 #include "settings_button_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "settings_popup_widget.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
 #include <QMouseEvent>
+#include <QPixmap>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
 #include <QScreen>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QToolButton>
+#include <qnamespace.h>
 
 SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
     : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr))
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
index 1dc52ac72..015300bf8 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -8,10 +8,14 @@
 #ifndef SETTINGS_BUTTON_WIDGET_H
 #define SETTINGS_BUTTON_WIDGET_H
 
-#include "settings_popup_widget.h"
-
-#include <QToolButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QPixmap;
+class QToolButton;
+class SettingsPopupWidget;
 
 class SettingsButtonWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
index 8389caea9..7ace155a7 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
@@ -1,10 +1,14 @@
 #include "settings_popup_widget.h"
 
 #include <QApplication>
-#include <QFocusEvent>
+#include <QFrame>
 #include <QPainter>
+#include <QRect>
 #include <QScreen>
 #include <QScrollArea>
+#include <QSize>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::Popup | Qt::FramelessWindowHint)
 {
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
index 01e86abfe..61b2cb013 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
@@ -8,10 +8,11 @@
 #ifndef SETTINGS_POPUP_WIDGET_H
 #define SETTINGS_POPUP_WIDGET_H
 
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QScrollArea;
+class QVBoxLayout;
 
 class SettingsPopupWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
index c51b96b6c..f3f1da2c4 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
@@ -1,10 +1,16 @@
 #include "replay_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../game/player/event_processing_options.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/game_replay.pb.h"
 
 #include <QTimer>
+#include <algorithm>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <qnumeric.h>
 
 static constexpr int TIMER_INTERVAL_MS = 200;
 static constexpr int EMPTY_SECTION_MARGIN_MS = 500;
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index 81e66824d..3b33deada 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -3,11 +3,14 @@
 
 #include "../../../game/player/event_processing_options.h"
 
+#include <QList>
 #include <QObject>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class GameReplay;
 class QTimer;
+class GameEventContainer;
 
 /**
  * @brief This class handles all logic to do with playing back replays
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
index 5d58705d2..5b3829af2 100644
--- a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
@@ -1,10 +1,14 @@
 #include "replay_quick_settings_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "libcockatrice/utility/macros.h"
 
+#include <QDebug>
 #include <QGridLayout>
 #include <QLabel>
 #include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
index a337ea0a6..d0be7d58d 100644
--- a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
@@ -5,7 +5,12 @@
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>
+#include <QLabel>
+#include <QtGlobal>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 class ReplayQuickSettingsWidget : public SettingsButtonWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
index fe4ac330b..48a43dba8 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -1,9 +1,15 @@
 #include "replay_timeline_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-
+#include <QBrush>
+#include <QColor>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPointF>
+#include <QSize>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 static constexpr int BIN_LENGTH = 5000;
 static constexpr int MIN_RESOLUTION_MS = 1000;
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
index 47d19a741..2c277228f 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
@@ -7,13 +7,9 @@
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
-#include "../../../game/player/event_processing_options.h"
-
-#include <QMouseEvent>
+#include <QList>
 #include <QWidget>
-
-class QPaintEvent;
-class QTimer;
+#include <qtmetamacros.h>
 
 class ReplayTimelineWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
index c92771f8c..07b4e72ce 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
@@ -3,12 +3,21 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../pixel_map_generator.h"
-#include "../interface/widgets/tabs/tab_game.h"
+#include "libcockatrice/settings/interface_settings.h"
 #include "replay_manager.h"
 #include "replay_quick_settings_widget.h"
+#include "replay_timeline_widget.h"
 
+#include <QAction>
 #include <QHBoxLayout>
+#include <QIcon>
+#include <QSize>
+#include <QString>
+#include <QStringLiteral>
 #include <QToolButton>
+#include <QtGlobal>
+
+class GameReplay;
 
 ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay)
     : QWidget(parent), replayPlayButton(nullptr), replayFastForwardButton(nullptr), aReplaySkipForward(nullptr),
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h
index 6d2b7a043..74aace570 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.h
@@ -8,15 +8,18 @@
 #ifndef REPLAY_WIDGET_H
 #define REPLAY_WIDGET_H
 
-#include "replay_timeline_widget.h"
+#include "../../../game/player/event_processing_options.h"
 
-#include <QToolButton>
 #include <QWidget>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <qtmetamacros.h>
 
 class ReplayManager;
 class ReplayQuickSettingsWidget;
-class TabGame;
+class GameEventContainer;
+class GameReplay;
+class QAction;
+class QToolButton;
+class ReplayTimelineWidget;
 
 /**
  * @brief The top-level widget that is put in the replay dock widget.
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index 91a7cb965..037a4a1e5 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -4,22 +4,47 @@
 #include "../../client/sound_engine.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/tabs/tab_account.h"
+#include "../../tabs/tab_supervisor.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
 #include "../user/user_list_proxy.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/protocol/pb/event_room_say.pb.h"
+#include "room_message_type.h"
 
 #include <QApplication>
+#include <QBrush>
+#include <QChar>
 #include <QDateTime>
 #include <QDesktopServices>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QFontInfo>
 #include <QMouseEvent>
+#include <QPalette>
+#include <QPixmap>
+#include <QPointF>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include <QScrollBar>
+#include <QSharedPointer>
+#include <QTextBlockFormat>
+#include <QTextDocument>
 #include <QTimer>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
+
+class QPoint;
 
 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
 
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
index 06e3a0ed8..3fa7224e5 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -8,22 +8,34 @@
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "../../interface/widgets/tabs/tab_supervisor.h"
-#include "../user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
-#include <QAction>
 #include <QColor>
+#include <QDateTime>
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <QTextBlock>
 #include <QTextBrowser>
+#include <QTextCharFormat>
 #include <QTextCursor>
 #include <QTextFragment>
+#include <QVector>
 #include <libcockatrice/network/server/remote/room_message_type.h>
 #include <libcockatrice/network/server/remote/user_level.h>
+#include <qtmetamacros.h>
 
 class AbstractGame;
-class QTextTable;
-class QMouseEvent;
 class UserContextMenu;
 class UserListProxy;
+class QAction;
+class QPoint;
+class QUrl;
+class QWidget;
+class TabSupervisor;
+struct CardRef;
+template <typename Enum> class QFlags;
 
 class UserMessagePosition
 {
diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.h b/cockatrice/src/interface/widgets/server/game_filter_configs.h
index 5cb048669..1b7322c55 100644
--- a/cockatrice/src/interface/widgets/server/game_filter_configs.h
+++ b/cockatrice/src/interface/widgets/server/game_filter_configs.h
@@ -1,6 +1,11 @@
 #ifndef COCKATRICE_GAME_FILTER_CONFIGS_H
 #define COCKATRICE_GAME_FILTER_CONFIGS_H
 
+#include <QList>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
 #include <QTime>
 
 /**
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 659325987..27464e14e 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -1,32 +1,54 @@
 #include "game_selector.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
 #include "../interface/widgets/dialogs/dlg_filter_games.h"
-#include "../interface/widgets/tabs/tab_account.h"
-#include "../interface/widgets/tabs/tab_game.h"
 #include "../interface/widgets/tabs/tab_room.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 #include "game_link.h"
+#include "game_selector_quick_filter_toolbar.h"
 #include "games_model.h"
+#include "libcockatrice/protocol/pb/event_add_to_list.pb.h"
+#include "libcockatrice/protocol/pb/event_remove_from_list.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "user/user_list_manager.h"
 
+#include <QAction>
 #include <QClipboard>
 #include <QDebug>
 #include <QGuiApplication>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QLineEdit>
+#include <QMap>
+#include <QMenu>
 #include <QMessageBox>
+#include <QModelIndex>
 #include <QPushButton>
+#include <QSize>
+#include <QString>
+#include <QStringLiteral>
 #include <QTreeView>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
+
+class QModelIndex;
+class QPoint;
+class QWidget;
+template <typename T> class QList;
 
 GameSelector::GameSelector(AbstractClient *_client,
                            TabSupervisor *_tabSupervisor,
diff --git a/cockatrice/src/interface/widgets/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h
index 9af39cf50..01e093b06 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.h
+++ b/cockatrice/src/interface/widgets/server/game_selector.h
@@ -1,25 +1,34 @@
 #ifndef GAMESELECTOR_H
 #define GAMESELECTOR_H
 
-#include "game_selector_quick_filter_toolbar.h"
 #include "game_type_map.h"
 
 #include <QGroupBox>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
+#include <qtmetamacros.h>
+// IWYU pragma: keep
+// ServerInfo_User appears by value and inside QList in slot signatures, so the
+// moc-generated code needs the complete type.
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class QTreeView;
 class GamesModel;
 class GamesProxyModel;
 class QPushButton;
-class QCheckBox;
-class QLabel;
 class AbstractClient;
 class TabSupervisor;
 class TabRoom;
 class ServerInfo_Game;
 class Response;
+class Event_AddToList;
+class Event_RemoveFromList;
+class GameSelectorQuickFilterToolBar;
+class QModelIndex;
+class QPoint;
+class QString;
+class QWidget;
+class ServerInfo_User;
+template <class Key, class T> class QMap;
+template <typename T> class QList;
 
 /**
  * @class GameSelector
diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
index d668b1c33..0fc3d879c 100644
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
@@ -1,12 +1,22 @@
 #include "game_selector_quick_filter_toolbar.h"
 
+#include "game_filter_configs.h"
 #include "games_model.h"
-#include "user/user_list_manager.h"
 
 #include <QCheckBox>
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLineEdit>
+#include <QMapIterator>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSignalBlocker>
+#include <QString>
+#include <QVariant>
+#include <QtGlobal>
+
+class TabSupervisor;
+template <class Key, class T> class QMap;
 
 GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
                                                                TabSupervisor *_tabSupervisor,
diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
index 9b7b6e61f..99ed179b5 100644
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
@@ -1,12 +1,19 @@
 #ifndef COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 #define COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 
-#include "../tabs/tab_supervisor.h"
-#include "games_model.h"
-
-#include <QHBoxLayout>
-#include <QLineEdit>
 #include <QWidget>
+#include <functional>
+#include <qtmetamacros.h>
+
+class GamesProxyModel;
+class QCheckBox;
+class QComboBox;
+class QHBoxLayout;
+class QLineEdit;
+class QString;
+class TabSupervisor;
+struct GameFilterConfigs;
+template <class Key, class T> class QMap;
 
 class GameSelectorQuickFilterToolBar : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp
index 127badbb2..289dbee44 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@@ -2,13 +2,26 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/tabs/tab_account.h"
-#include "user/user_list_manager.h"
-#include "user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "user/user_list_proxy.h"
+#include "user_level.h"
 
+#include <QAbstractItemModel>
+#include <QDate>
 #include <QDateTime>
+#include <QFlag>
 #include <QIcon>
+#include <QMapIterator>
+#include <QObject>
+#include <QSet>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTime>
 #include <QTimeZone>
+#include <QVariant>
+#include <QtGlobal>
+#include <compare>
+#include <initializer_list>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/settings/game_filters_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h
index b5f86c291..9bf54b83a 100644
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@@ -4,13 +4,18 @@
 #include "game_filter_configs.h"
 #include "game_type_map.h"
 
+#include <QAbstractTableModel>
 #include <QList>
-#include <QSet>
+#include <QMap>
+#include <QModelIndex>
 #include <QSortFilterProxyModel>
-#include <QTime>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class UserListProxy;
+class QObject;
 
 /**
  * @class GamesModel
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
index f5d682c36..08b7837dd 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@@ -2,10 +2,19 @@
 
 #include "../../../client/settings/cache_settings.h"
 
+#include <QByteArray>
+#include <QDebug>
 #include <QJsonDocument>
+#include <QJsonParseError>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QSharedPointer>
 #include <QUrl>
+#include <QVariant>
+#include <QVariantMap>
 #include <libcockatrice/settings/servers_settings.h>
+#include <qlogging.h>
 
 #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json"
 
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.h b/cockatrice/src/interface/widgets/server/handle_public_servers.h
index fa924b183..bacc7d3bf 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.h
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.h
@@ -9,8 +9,17 @@
 
 #include "user/user_info_connection.h"
 
+#include <QList>
+#include <QMap>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+#include <utility>
+
 class QNetworkReply;
 class QNetworkAccessManager;
+class QVariant;
 
 /**
  * This class is used to update the servers.ini file and ensure
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
index df9dfbf53..74e403ea8 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
@@ -1,14 +1,23 @@
 #include "remote_decklist_tree_widget.h"
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+
+#include <QAbstractItemView>
 #include <QFileIconProvider>
 #include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QSharedPointer>
 #include <QSortFilterProxyModel>
+#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
+class QObject;
+class QWidget;
+
 RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
                                                        RemoteDeckList_TreeModel::DirectoryNode *_parent)
     : RemoteDeckList_TreeModel::Node(_name, _parent)
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
index 2cf09aff7..d553ffe9e 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
+++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
@@ -8,13 +8,23 @@
 #ifndef REMOTEDECKLIST_TREEWIDGET_H
 #define REMOTEDECKLIST_TREEWIDGET_H
 
+#include <QAbstractItemModel>
 #include <QDateTime>
+#include <QIcon>
+#include <QList>
+#include <QModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QTreeView>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class Response;
 class AbstractClient;
 class QSortFilterProxyModel;
 class ServerInfo_DeckStorage_TreeItem;
+class QObject;
+class QWidget;
 
 class RemoteDeckList_TreeModel : public QAbstractItemModel
 {
@@ -22,6 +32,7 @@ class RemoteDeckList_TreeModel : public QAbstractItemModel
 public:
     class DirectoryNode;
     class FileNode;
+
     class Node
     {
     protected:
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
index d62bf81aa..c131c3cbf 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,16 +1,27 @@
 #include "remote_replay_list_tree_widget.h"
 
 #include "../../../pixel_map_generator.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
 
+#include <QAbstractItemView>
+#include <QDateTime>
 #include <QFileIconProvider>
 #include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 
+class QObject;
+class QWidget;
+
 const int RemoteReplayList_TreeModel::numberOfColumns = 6;
 
 RemoteReplayList_TreeModel::MatchNode::MatchNode(const ServerInfo_ReplayMatch &_matchInfo)
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
index 10e698aee..e99702e60 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
+++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
@@ -9,21 +9,30 @@
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_H
 
-#include <QDateTime>
+#include <QAbstractItemModel>
+#include <QIcon>
+#include <QList>
+#include <QModelIndex>
+#include <QSet>
+#include <QString>
 #include <QTreeView>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay_match.pb.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class Response;
 class AbstractClient;
 class QSortFilterProxyModel;
+class QObject;
+class QWidget;
 
 class RemoteReplayList_TreeModel : public QAbstractItemModel
 {
     Q_OBJECT
 private:
-    class MatchNode;
     class ReplayNode;
+
     class Node
     {
     protected:
diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
index c115caa47..cb5f84eef 100644
--- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
@@ -1,8 +1,15 @@
 #include "user_avatar_provider.h"
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
+
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <string>
+#include <sys/types.h>
 
 UserAvatarProvider::UserAvatarProvider(AbstractClient *client, QObject *parent) : QObject(parent), client(client)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
index 44491e544..c1e75bc1c 100644
--- a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
@@ -5,6 +5,8 @@
 #include <QObject>
 #include <QPixmap>
 #include <QSet>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
index 2ba745715..d84bd5804 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
@@ -2,9 +2,22 @@
 
 #include "../../../card_picture_loader/card_picture_loader.h"
 #include "../../cards/card_art_utils.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
+#include <QChar>
+#include <QMetaObject>
 #include <QPointer>
+#include <QRect>
+#include <QSize>
+#include <QStringList>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <memory>
 
 static QString makeKey(const QString &user, const QString &card, const QString &providerId)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
index e8283a891..ce9225b00 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
@@ -1,12 +1,16 @@
 #ifndef COCKATRICE_USER_CARD_ART_PROVIDER_H
 #define COCKATRICE_USER_CARD_ART_PROVIDER_H
 
+#include <QList>
 #include <QMap>
 #include <QObject>
 #include <QPixmap>
 #include <QQueue>
 #include <QSet>
-#include <libcockatrice/card/printing/exact_card.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ExactCard;
 
 class UserCardArtProvider : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
index d49e3d540..f8b57cfc2 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
@@ -3,30 +3,50 @@
 #include "../../../card_picture_loader/card_picture_loader.h"
 #include "../../cards/art_crop_attribution.h"
 #include "../../utility/completer_utils.h"
-#include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 #include "user_card_art_provider.h"
 #include "user_list_painter.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QComboBox>
 #include <QCompleter>
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
+#include <QFlags>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
+#include <QLinearGradient>
+#include <QList>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
+#include <QPen>
 #include <QPushButton>
-#include <QRegularExpression>
+#include <QRect>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <QWheelEvent>
+#include <QtGlobal>
 #include <cmath>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
index 24e14dce5..bfba8b007 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
@@ -3,24 +3,26 @@
 
 #include "user_list_painter.h"
 
-#include <QComboBox>
 #include <QDialog>
+#include <QMetaObject>
 #include <QPixmap>
+#include <QPoint>
+#include <QString>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class QCompleter;
-class QFocusEvent;
 class QGroupBox;
-class QKeyEvent;
-class QMouseEvent;
 class QLineEdit;
 class QDoubleSpinBox;
 class QLabel;
 class QPushButton;
-class QWheelEvent;
 class CardDatabaseModel;
 class CardDatabaseDisplayModel;
 class CardSearchModel;
 class CardCompleterProxyModel;
+class QComboBox;
 
 /**
  * @brief Interactive preview of the user list banner art.
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
index f95ad88e4..c8fe97cda 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -1,20 +1,42 @@
 #include "user_context_menu.h"
 
+#include "../../../../game/abstract_game.h"
+#include "../../../../game/game_event_handler.h"
+#include "../../../../game/game_meta_info.h"
 #include "../../dialogs/dlg_report_user.h"
-#include "../../interface/widgets/tabs/tab_account.h"
-#include "../../interface/widgets/tabs/tab_game.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 #include "../chat_view/chat_view.h"
+#include "../game_link.h"
 #include "../game_selector.h"
+#include "../game_type_map.h"
+#include "libcockatrice/protocol/pb/admin_commands.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_ban.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
 #include "user_info_box.h"
+#include "user_level.h"
 #include "user_list_dialog.h"
 #include "user_list_manager.h"
 #include "user_list_proxy.h"
 
 #include <QAction>
+#include <QClipboard>
+#include <QCursor>
+#include <QDialog>
+#include <QFlags>
+#include <QGuiApplication>
+#include <QHeaderView>
+#include <QMap>
 #include <QMenu>
-#include <QtGui>
-#include <QtWidgets>
+#include <QMessageBox>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
@@ -27,6 +49,10 @@
 #include <libcockatrice/protocol/pb/response_warn_list.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+#include <string>
+
+class QVariant;
 
 UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game)
     : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.h b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
index 0922eae94..2536819a4 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
@@ -11,19 +11,22 @@
 
 #include <QList>
 #include <QObject>
+#include <QString>
 #include <functional>
 #include <libcockatrice/network/server/remote/user_level.h>
+#include <qtmetamacros.h>
+#include <utility>
+
 class AbstractGame;
 class UserListProxy;
 class AbstractClient;
 class ChatView;
 class CommandContainer;
 class QAction;
-class QMenu;
 class QPoint;
 class Response;
-class ServerInfo_User;
 class TabSupervisor;
+class QWidget;
 
 class UserContextMenu : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
index 3d89cecf5..ff3d9a224 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
@@ -5,20 +5,36 @@
 #include "../../interface/widgets/dialogs/dlg_edit_password.h"
 #include "../../interface/widgets/dialogs/dlg_edit_user.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/utility/days_years_between.h"
 #include "user_card_settings_dialog.h"
+#include "user_level.h"
+#include "user_list_painter.h"
 
+#include <QByteArray>
+#include <QDate>
 #include <QDateTime>
+#include <QDialog>
+#include <QFlag>
+#include <QFont>
 #include <QGridLayout>
 #include <QHBoxLayout>
-#include <QInputDialog>
 #include <QLabel>
+#include <QLineEdit>
+#include <QLocale>
 #include <QMessageBox>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/passwordhasher.h>
+#include <string>
+#include <sys/types.h>
 
 UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), client(_client), editable(_editable)
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.h b/cockatrice/src/interface/widgets/server/user/user_info_box.h
index 955cb9d3d..6bc571a37 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h
@@ -7,13 +7,15 @@
 #ifndef USERINFOBOX_H
 #define USERINFOBOX_H
 
-#include <QDateTime>
 #include <QLabel>
+#include <QPixmap>
 #include <QPushButton>
+#include <QString>
 #include <QWidget>
 #include <libcockatrice/network/server/remote/user_level.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/days_years_between.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class Response;
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
index f934960f8..d23ac63ba 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@@ -2,7 +2,10 @@
 
 #include "../../../../client/settings/cache_settings.h"
 
-#include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QVariant>
 #include <libcockatrice/settings/servers_settings.h>
 #include <utility>
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.h b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
index 6278815a9..b44d97d42 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
@@ -7,12 +7,11 @@
 #ifndef USERCONNECTION_INFORMATION_H
 #define USERCONNECTION_INFORMATION_H
 
-#include <QApplication>
-#include <QDir>
-#include <QFile>
 #include <QLoggingCategory>
-#include <QSettings>
-#include <QStandardPaths>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(UserInfoConnectionLog, "user_info_connection");
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
index 967de2f2c..c3e880084 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
@@ -4,26 +4,61 @@
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "user_level.h"
 #include "user_list_painter.h"
 
 #include <QApplication>
+#include <QBrush>
+#include <QChar>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QFontMetrics>
 #include <QGridLayout>
 #include <QHBoxLayout>
+#include <QImage>
 #include <QLabel>
+#include <QLayout>
+#include <QLinearGradient>
+#include <QList>
+#include <QListView>
+#include <QMap>
+#include <QMenu>
+#include <QModelIndex>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPropertyAnimation>
+#include <QPen>
+#include <QPoint>
 #include <QPushButton>
-#include <QScreen>
-#include <QScrollBar>
+#include <QRect>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
 #include <QStandardItem>
+#include <QStandardItemModel>
+#include <QStringLiteral>
+#include <QStyle>
+#include <QStyleOptionViewItem>
 #include <QStyledItemDelegate>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnumeric.h>
+#include <string>
+
+class QAction;
 
 /// Qt stylesheets accept #aarrggbb, which is QColor::name(QColor::HexArgb).
 static QString colorStr(const QColor &color)
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
index ed7320fba..f2a91d025 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
@@ -1,24 +1,29 @@
 #ifndef COCKATRICE_USER_INFO_POPUP_H
 #define COCKATRICE_USER_INFO_POPUP_H
 
-#include "../../interface/widgets/server/game_type_map.h"
 #include "user_list_painter.h"
 
+#include <QColor>
 #include <QFrame>
-#include <QListView>
-#include <QMap>
+#include <QPalette>
 #include <QPixmap>
-#include <QStandardItemModel>
+#include <QString>
+#include <QWidget>
 #include <functional>
-#include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+#include <utility>
 
 class AbstractClient;
 class QLabel;
 class QPushButton;
 class TabSupervisor;
+class QListView;
+class QPoint;
+class QStandardItemModel;
+class Response;
+template <class Key, class T> class QMap;
 
 // ── Roles ─────────────────────────────────────────────────────────────────────
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
index fc5b520ad..605c89734 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
@@ -1,17 +1,26 @@
 #include "user_list_dialog.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGridLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QSharedPointer>
 #include <QSpinBox>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
index fa7d5de92..e10fca5bb 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
@@ -2,7 +2,8 @@
 #define COCKATRICE_USER_LIST_DIALOG_H
 
 #include <QDialog>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QLabel;
@@ -11,6 +12,8 @@ class QRadioButton;
 class QSpinBox;
 class QLineEdit;
 class QCheckBox;
+class QWidget;
+class ServerInfo_User;
 
 class BanDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
index 216420006..385a969fd 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
@@ -1,8 +1,11 @@
 #include "user_list_manager.h"
 
-#include "../../client/sound_engine.h"
-#include "user_info_box.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
+#include <QList>
+#include <QSharedPointer>
+#include <algorithm>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
index 6238f0799..b2ff69286 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
@@ -10,18 +10,22 @@
 #include "user_list_proxy.h"
 
 #include <QMap>
-#include <QWidget>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+// IWYU pragma: keep
+// ServerInfo_User appears by value and inside QList in slot signatures, so the
+// moc-generated code needs the complete type.
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class Event_AddToList;
-class Event_ListRooms;
 class Event_RemoveFromList;
 class Event_UserJoined;
 class Event_UserLeft;
 class Response;
 class ServerInfo_User;
-class TabSupervisor;
+template <typename T> class QList;
 
 class UserListManager : public QObject, public UserListProxy
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
index 34a3d6ae1..08eaaaff7 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
@@ -1,14 +1,35 @@
 #include "user_list_painter.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
 #include <QAbstractScrollArea>
 #include <QApplication>
+#include <QBrush>
+#include <QChar>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QFontMetrics>
+#include <QImage>
+#include <QLinearGradient>
+#include <QMap>
+#include <QModelIndex>
+#include <QObject>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPen>
+#include <QPixmap>
+#include <QPoint>
 #include <QScrollBar>
+#include <QSharedPointer>
 #include <QStyle>
 #include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
 static constexpr int RowHeight = 72;
 static constexpr int AvatarSize = 36;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.h b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
index 352a01f6b..e7293a097 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_painter.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
@@ -5,16 +5,19 @@
 
 #include <QColor>
 #include <QList>
-#include <QMap>
 #include <QPalette>
-#include <QPixmap>
 #include <QRect>
+#include <QRectF>
 #include <QSize>
+#include <QString>
+#include <QtGlobal>
 
 class QPainter;
 class QModelIndex;
 class QStyleOptionViewItem;
 class ServerInfo_User;
+class QPixmap;
+template <class Key, class T> class QMap;
 
 struct CardArtParams
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
index 937058024..78d45d120 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
@@ -1,12 +1,13 @@
 #include "user_list_panel_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "user_list_manager.h"
 #include "user_list_widget.h"
 
 #include <QLineEdit>
+#include <QList>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QVBoxLayout>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/settings/interface_settings.h>
 
 namespace
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
index 7ae14dfcf..088365bbc 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
@@ -8,7 +8,9 @@
 
 #include "user_list_widget.h"
 
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class QLineEdit;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
index 3b8fc08b7..b3fd1d1a9 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -4,18 +4,64 @@
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "user_avatar_provider.h"
+#include "user_card_art_provider.h"
 #include "user_context_menu.h"
+#include "user_info_popup.h"
+#include "user_level.h"
+#include "user_list_manager.h"
 #include "user_list_painter.h"
+#include "user_list_proxy.h"
 
+#include <QAbstractAnimation>
+#include <QAbstractItemModel>
+#include <QApplication>
+#include <QByteArray>
+#include <QColor>
+#include <QContextMenuEvent>
+#include <QCursor>
 #include <QEvent>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QFontMetrics>
+#include <QFrame>
+#include <QGuiApplication>
 #include <QHeaderView>
+#include <QIcon>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QKeyEvent>
+#include <QLayout>
 #include <QMenu>
+#include <QModelIndex>
 #include <QMouseEvent>
+#include <QObject>
 #include <QPainter>
+#include <QPalette>
+#include <QPoint>
+#include <QPointF>
+#include <QPropertyAnimation>
+#include <QRect>
+#include <QScreen>
 #include <QScrollBar>
+#include <QSharedPointer>
+#include <QSignalBlocker>
+#include <QSize>
+#include <QStringLiteral>
+#include <QStyle>
+#include <QStyleOptionViewItem>
 #include <QTimer>
+#include <QTreeWidget>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
+#include <qnamespace.h>
+
+class QPixmap;
+struct GameInviteOption;
 
 namespace UserListRoles
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
index 9802387b2..8093222ea 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
@@ -7,33 +7,34 @@
 #ifndef USERLIST_H
 #define USERLIST_H
 
-#include "../../cards/card_info_picture_art_crop_widget.h"
-#include "../../interface/widgets/server/game_link.h"
-#include "user_avatar_provider.h"
-#include "user_card_art_provider.h"
-#include "user_info_popup.h"
-#include "user_list_manager.h"
-#include "user_list_painter.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
-#include <QComboBox>
 #include <QGroupBox>
+#include <QList>
+#include <QMap>
 #include <QSet>
+#include <QString>
 #include <QStyledItemDelegate>
-#include <QTextEdit>
 #include <QTreeWidgetItem>
 #include <functional>
-#include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
+#include <qtmetamacros.h>
+#include <utility>
 
-class QTreeWidget;
-class ServerInfo_User;
 class AbstractClient;
 class TabSupervisor;
-class Response;
-class CommandContainer;
 class UserContextMenu;
 class UserListWidget;
-class QShowEvent;
+class QModelIndex;
+class QPixmap;
+class QPoint;
+class QTimer;
+class QWidget;
+class UserAvatarProvider;
+class UserCardArtProvider;
+class UserInfoPopup;
+class UserListManager;
+struct CardArtParams;
+struct GameInviteOption;
 
 class UserListItemDelegate : public QStyledItemDelegate
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
index 9a70e94c5..9c43d1f7b 100644
--- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
@@ -2,14 +2,22 @@
 
 #include "settings_search_model.h"
 
+#include <QChar>
 #include <QCheckBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLatin1Char>
 #include <QLayout>
+#include <QLayoutItem>
 #include <QLineEdit>
+#include <QObject>
 #include <QPair>
 #include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <QTextDocument>
+#include <utility>
 
 /**
  * @brief Recursively collects all widgets within a layout
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
index 3140f94f3..722a91e62 100644
--- a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
@@ -3,6 +3,7 @@
 
 #include <QList>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs"
 #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
index 415eef6b9..159db767d 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
@@ -1,29 +1,44 @@
 #include "appearance_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/card_counter_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../palette_editor/palette_editor_dialog.h"
+#include "../../theme_config.h"
 #include "../dialogs/override_printing_warning.h"
 #include "../general/home_tab_button_color.h"
 #include "../interface/theme_manager.h"
 #include "../interface/widgets/general/background_sources.h"
 #include "../playmat/playmat_collection_dialog.h"
-#include "../playmat/playmat_settings_dialog.h"
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/utility/macros.h"
 
+#include <QAbstractButton>
 #include <QApplication>
+#include <QColor>
 #include <QColorDialog>
+#include <QDebug>
 #include <QDesktopServices>
+#include <QDir>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QGroupBox>
 #include <QMessageBox>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QStyleFactory>
 #include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qnamespace.h>
 
 AppearanceSettingsPage::AppearanceSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
index bec4cd72f..096ba0915 100644
--- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
@@ -5,11 +5,14 @@
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QGroupBox>
 #include <QLabel>
+#include <QList>
 #include <QPushButton>
 #include <QSpinBox>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QGroupBox;
 
 class AppearanceSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
index bdbb38c95..2020b2031 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
@@ -4,19 +4,39 @@
 #include "../../pixel_map_generator.h"
 #include "update/card_spoiler/spoiler_background_updater.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QAction>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QGridLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
+#include <QHash>
 #include <QInputDialog>
 #include <QLineEdit>
+#include <QList>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QMessageBox>
 #include <QSet>
+#include <QSizePolicy>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QToolBar>
 #include <QUrl>
+#include <QVBoxLayout>
+#include <QVariant>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/macros.h>
+#include <qlogging.h>
+#include <qnamespace.h>
 
 DeckEditorSettingsPage::DeckEditorSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
index 23e33fa20..47f840191 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
@@ -4,10 +4,17 @@
 #include "abstract_settings_page.h"
 
 #include <QCheckBox>
-#include <QGroupBox>
 #include <QLabel>
-#include <QListWidget>
 #include <QPushButton>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QAction;
+class QGroupBox;
+class QLineEdit;
+class QListWidget;
+class QListWidgetItem;
+class QModelIndex;
 
 class DeckEditorSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
index 57099fb4a..a4597014a 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
@@ -6,13 +6,26 @@
 #include "../server/user/user_info_connection.h"
 #include "update/client/release_channel.h"
 
+#include <QByteArray>
 #include <QCoreApplication>
+#include <QDate>
+#include <QDebug>
 #include <QFile>
 #include <QFileDialog>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QLineEdit>
+#include <QList>
+#include <QMap>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QTranslator>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QVariantList>
+#include <QtGlobal>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
@@ -22,6 +35,9 @@
 #include <libcockatrice/settings/updates_settings.h>
 #include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/translation_loader.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <utility>
 
 enum startupCardUpdateCheckBehaviorIndex
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
index 07e0ba3a9..fca300670 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
@@ -5,11 +5,16 @@
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QGroupBox>
 #include <QLabel>
 #include <QLoggingCategory>
-#include <QPushButton>
 #include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+class QLineEdit;
+class QPushButton;
 
 inline Q_LOGGING_CATEGORY(GeneralSettingsPageLog, "general_settings_page");
 
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
index 68e3f2ac7..9494155af 100644
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
@@ -3,14 +3,27 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
+#include "libcockatrice/utility/macros.h"
 
+#include <QAction>
+#include <QColor>
+#include <QDebug>
 #include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QSizePolicy>
+#include <QStringLiteral>
 #include <QToolBar>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/settings/message_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
 
 MessagesSettingsPage::MessagesSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
index 4d491136f..e85e6cca7 100644
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
@@ -4,10 +4,15 @@
 #include "abstract_settings_page.h"
 
 #include <QCheckBox>
-#include <QGroupBox>
 #include <QLabel>
-#include <QListWidget>
+#include <QString>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QAction;
+class QGroupBox;
+class QLineEdit;
+class QListWidget;
 
 class MessagesSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
index 2fdff3bce..bf35b7557 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
@@ -7,7 +7,24 @@
 
 #include "settings_search_model.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
+#include <QFont>
+#include <QModelIndex>
 #include <QPainter>
+#include <QPalette>
+#include <QPen>
+#include <QRect>
+#include <QSize>
+#include <QStringLiteral>
+#include <QStyle>
+#include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QObject;
 
 SettingsSearchDelegate::SettingsSearchDelegate(QObject *parent) : QStyledItemDelegate(parent)
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
index aa296049a..2e48a3de9 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
@@ -6,8 +6,14 @@
 #ifndef COCKATRICE_SETTINGS_SEARCH_DELEGATE_H
 #define COCKATRICE_SETTINGS_SEARCH_DELEGATE_H
 
+#include <QList>
 #include <QPixmap>
+#include <QString>
+#include <QStringList>
 #include <QStyledItemDelegate>
+#include <qtmetamacros.h>
+
+class QObject;
 
 /**
  * @brief Custom paint delegate for settings search result items
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
index 71f859d4b..015a7d45d 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
@@ -6,7 +6,14 @@
 #include "settings_search_model.h"
 
 #include <QPair>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <QVariant>
+#include <QWidget>
 #include <algorithm>
+#include <utility>
+
+class QObject;
 
 SettingsSearchModel::SettingsSearchModel(QObject *parent) : QAbstractListModel(parent)
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.h b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
index 0b590f180..902a29312 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
@@ -7,9 +7,17 @@
 #define COCKATRICE_SETTINGS_SEARCH_MODEL_H
 
 #include <QAbstractListModel>
+#include <QByteArray>
 #include <QList>
+#include <QMetaType>
+#include <QModelIndex>
 #include <QRegularExpression>
-#include <QWidget>
+#include <QString>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QObject;
+class QWidget;
 
 /**
  * @brief Represents a single searchable setting entry
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
index 1277d0e49..ea7ed745c 100644
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
@@ -8,8 +8,17 @@
 #include "../interface/widgets/utility/sequence_edit.h"
 
 #include <QAbstractItemView>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QVBoxLayout>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qnamespace.h>
 
 ShortcutSettingsPage::ShortcutSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
index 05391df77..6ae7fbfa7 100644
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
@@ -3,14 +3,18 @@
 
 #include "abstract_settings_page.h"
 
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
+#include <QString>
+#include <qtmetamacros.h>
 
 class SequenceEdit;
 class ShortcutTreeView;
 class SearchLineEdit;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
+class QPushButton;
+class QVBoxLayout;
 
 class ShortcutSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
index 2bd776671..05725bb42 100644
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
@@ -3,10 +3,21 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../client/sound_engine.h"
 
+#include <QDebug>
 #include <QGridLayout>
+#include <QGroupBox>
+#include <QList>
+#include <QSharedPointer>
+#include <QSlider>
+#include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/sound_settings.h>
 #include <libcockatrice/utility/macros.h>
+#include <qnamespace.h>
 
 SoundSettingsPage::SoundSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
index f90bcbc5a..acaa4f7c4 100644
--- a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
@@ -5,10 +5,13 @@
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
-#include <QSpinBox>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+class QSlider;
+class QSpinBox;
 
 class SoundSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
index 4aad91115..a71296820 100644
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
@@ -5,12 +5,21 @@
 #include "../../card_picture_loader/card_picture_loader_local_schemes.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 
+#include <QComboBox>
 #include <QDir>
 #include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QList>
 #include <QMessageBox>
+#include <QString>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qnamespace.h>
 
 StorageSettingsPage::StorageSettingsPage()
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
index 5c8a00981..1c9a35323 100644
--- a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
@@ -3,11 +3,13 @@
 
 #include "abstract_settings_page.h"
 
-#include <QComboBox>
-#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QGroupBox;
 
 class StorageSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
index 03b9455fa..0a5f57e1f 100644
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
@@ -3,13 +3,22 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h"
+#include "libcockatrice/utility/macros.h"
 
+#include <QDebug>
 #include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 enum visualDeckStoragePromptForConversionIndex
 {
diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
index 277c5461e..297d80c35 100644
--- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
@@ -5,13 +5,14 @@
 
 #include <QCheckBox>
 #include <QComboBox>
-#include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QToolButton>
-#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QGroupBox;
 
 class UserInterfaceSettingsPage : public AbstractSettingsPage
 {
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index 6423c581b..4044f03db 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -11,35 +11,49 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../deck_loader/deck_file_format.h"
+#include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
+#include "../cards/card_info_frame_widget.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
 #include "../client/network/interfaces/tapped_out_interface.h"
+#include "../deck_editor/deck_editor_card_database_dock_widget.h"
+#include "../deck_editor/deck_editor_card_info_dock_widget.h"
+#include "../deck_editor/deck_editor_deck_dock_widget.h"
+#include "../deck_editor/deck_editor_filter_dock_widget.h"
+#include "../deck_editor/deck_editor_printing_selector_dock_widget.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
-#include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_load_deck.h"
 #include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../interface/widgets/dialogs/dlg_share_deck.h"
+#include "../menus/deck_editor_menu.h"
+#include "../printing_selector/printing_selector.h"
 #include "../utility/visibility_change_listener.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QAction>
-#include <QApplication>
 #include <QCloseEvent>
 #include <QDesktopServices>
+#include <QDockWidget>
 #include <QFileDialog>
-#include <QHeaderView>
-#include <QLineEdit>
+#include <QFlags>
+#include <QList>
+#include <QMainWindow>
+#include <QMenu>
 #include <QMessageBox>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
-#include <QProcessEnvironment>
 #include <QPushButton>
-#include <QRegularExpression>
-#include <QSplitter>
-#include <QTreeView>
+#include <QSharedPointer>
 #include <QUrl>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
@@ -50,6 +64,8 @@
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/recents_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <optional>
+#include <string>
 
 /**
  * @brief Constructs the AbstractTabDeckEditor.
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
index dae8f5b0a..1782e7afd 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
@@ -9,48 +9,31 @@
 #define TAB_GENERIC_DECK_EDITOR_H
 
 #include "../../deck_loader/deck_loader.h"
-#include "../interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
-#include "../interface/widgets/menus/deck_editor_menu.h"
-#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 #include "tab.h"
 
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
+#include <QMap>
+#include <QSize>
+#include <QString>
+#include <qtmetamacros.h>
 
 class DeckStateManager;
 class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-
-class CardInfoFrameWidget;
-class DeckLoader;
 class DeckEditorMenu;
 class DeckEditorCardInfoDockWidget;
 class DeckEditorCardDatabaseDockWidget;
 class DeckEditorDeckDockWidget;
 class DeckEditorFilterDockWidget;
 class DeckEditorPrintingSelectorDockWidget;
-class DeckPreviewDeckTagsDisplayWidget;
 class Response;
 class FilterTree;
-class FilterTreeModel;
-class FilterBuilder;
-
-class QTreeView;
-class QTextEdit;
-class QLabel;
-class QComboBox;
-class QGroupBox;
 class QMessageBox;
-class QHBoxLayout;
-class QVBoxLayout;
-class QPushButton;
 class QDockWidget;
 class QMenu;
 class QAction;
+class ExactCard;
+class TabSupervisor;
+struct LoadedDeck;
 
 /**
  * @class AbstractTabDeckEditor
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
index 40882db04..8d023cd61 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
@@ -2,6 +2,9 @@
 
 #include <QDebug>
 #include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 void ArchidektDeckListingApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
index 723c65ce2..c42bc1315 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
@@ -4,8 +4,9 @@
 #include "deck_listings/archidekt_api_response_deck_listing_container.h"
 
 #include <QJsonObject>
-#include <QString>
+#include <QList>
 #include <QUrl>
+#include <QVector>
 
 class ArchidektDeckListingApiResponse
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
index 46c229156..d118301bb 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
@@ -1,5 +1,9 @@
 #include "archidekt_api_response_card.h"
 
+#include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
+
 void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
index 559580da2..8e9e0b12a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
@@ -3,11 +3,10 @@
 
 #include "archidekt_api_response_edition.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
-#include <QVector>
+#include <QStringList>
 
 class ArchidektApiResponseCard
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
index f51d0f3e7..14b13a4ed 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
@@ -1,5 +1,11 @@
 #include "archidekt_api_response_card_entry.h"
 
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
+
 void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
index 118cf5b13..eb7c4190c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
@@ -3,11 +3,10 @@
 
 #include "archidekt_api_response_card.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
-#include <QVector>
+#include <QStringList>
 
 struct Category
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
index 122617a22..73836b9c8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
@@ -1,5 +1,9 @@
 #include "archidekt_api_response_edition.h"
 
+#include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
+
 void ArchidektApiResponseEdition::fromJson(const QJsonObject &json)
 {
     editionCode = json.value("editioncode").toString();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
index b898cd816..63d29652f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
@@ -1,11 +1,8 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
-#include <QVector>
 
 class ArchidektApiResponseEdition
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
index a27d8d961..362ac0f63 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
@@ -1,6 +1,13 @@
 #include "archidekt_api_response_deck.h"
 
 #include "../card/archidekt_api_response_card_entry.h"
+#include "../deck_listings/archidekt_api_response_deck_owner.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 void ArchidektApiResponseDeck::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
index b539d9dd1..6af0a01c5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
@@ -1,15 +1,14 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
 
-#include "../card/archidekt_api_response_card.h"
 #include "../card/archidekt_api_response_card_entry.h"
 #include "../deck_listings/archidekt_api_response_deck_owner.h"
 #include "archidekt_api_response_deck_category.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
+#include <QStringList>
 #include <QVector>
 
 class ArchidektApiResponseDeck
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
index 990293bc6..0df8b9f68 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
@@ -1,5 +1,9 @@
 #include "archidekt_api_response_deck_category.h"
 
+#include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
+
 void ArchidektApiResponseDeckCategory::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
index 5e218b6a4..b31743643 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
@@ -1,15 +1,8 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
 
-#include "../card/archidekt_api_response_card.h"
-#include "../card/archidekt_api_response_card_entry.h"
-#include "../deck_listings/archidekt_api_response_deck_owner.h"
-
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
-#include <QVector>
 
 class ArchidektApiResponseDeckCategory
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
index 416621b41..0f5290f02 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
@@ -3,8 +3,10 @@
 #include "archidekt_api_response_deck_owner.h"
 
 #include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
index 8924bb3f5..904d6b624 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
@@ -3,11 +3,11 @@
 
 #include "archidekt_api_response_deck_owner.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QMap>
 #include <QString>
-#include <QVector>
+#include <QStringList>
 
 class ArchidektApiResponseDeckListingContainer
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
index 3d6eac03d..67b80d67a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
@@ -1,5 +1,9 @@
 #include "archidekt_api_response_deck_owner.h"
 
+#include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
+
 void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
index df3f48fd2..f63d6af0e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
@@ -1,11 +1,11 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
-#include <QVector>
+#include <QStringList>
+#include <QUrl>
 
 class ArchidektApiResponseDeckOwner
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
index 657ef3dbe..555ec7ec5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
@@ -2,16 +2,39 @@
 
 #include "../../../../../../client/settings/cache_settings.h"
 #include "../../../../../deck_loader/card_node_function.h"
-#include "../../../../../deck_loader/deck_loader.h"
-#include "../../../../cards/card_size_widget.h"
+#include "../../../../../deck_loader/loaded_deck.h"
 #include "../../../../cards/deck_card_zone_display_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
+#include "../../../../visual_deck_editor/visual_deck_editor_widget.h"
 #include "../api_response/archidekt_formats.h"
+#include "../api_response/card/archidekt_api_response_card.h"
+#include "../api_response/card/archidekt_api_response_card_entry.h"
+#include "../api_response/card/archidekt_api_response_edition.h"
 #include "../api_response/deck/archidekt_api_response_deck.h"
+#include "deck_list_model.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QAbstractListModel>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <QModelIndex>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QSharedPointer>
 #include <QSortFilterProxyModel>
+#include <QTextStream>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class CardSizeWidget;
 
 ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent,
                                                                              ArchidektApiResponseDeck _response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
index aaf272718..cdacc70b3 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
@@ -1,18 +1,22 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
 
-#include "../../../../../deck_loader/deck_loader.h"
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
 #include "../api_response/deck/archidekt_api_response_deck.h"
-#include "deck_list_model.h"
 
-#include <QPushButton>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QHash>
+#include <QPersistentModelIndex>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QHBoxLayout;
+class QPushButton;
+class QScrollArea;
+class QVBoxLayout;
+class VisualDeckDisplayOptionsWidget;
+struct LoadedDeck;
 
 /**
  * @class ArchidektApiResponseDeckDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
index c35c2d0b8..b5e28fcf5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
@@ -1,17 +1,30 @@
 #include "archidekt_api_response_deck_entry_display_widget.h"
 
 #include "../../../../../card_picture_loader/card_picture_loader.h"
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../../../../general/display/background_plate_widget.h"
 #include "../../../../general/display/charts/bars/color_bar.h"
+#include "../../../../general/display/shadow_background_label.h"
+#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
+#include "../api_response/deck_listings/archidekt_api_response_deck_owner.h"
 #include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QHBoxLayout>
+#include <QByteArray>
+#include <QDateTime>
+#include <QFontMetrics>
 #include <QLabel>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QPixmap>
+#include <QRect>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QVBoxLayout>
+#include <QVariant>
 #include <QWidget>
+#include <QtGlobal>
+#include <qnamespace.h>
 #include <version_string.h>
 
 #define ARCHIDEKT_DEFAULT_IMAGE "https://storage.googleapis.com/topdekt-user/images/archidekt_deck_card_shadow.jpg"
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
index 575a81b5f..e8ed8561d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
@@ -1,17 +1,20 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
 
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
-#include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QLabel>
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QVBoxLayout>
+#include <QPixmap>
+#include <QString>
+#include <QUrl>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class BackgroundPlateWidget;
+class ArchidektDeckPreviewImageDisplayWidget;
+class QLabel;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QVBoxLayout;
 
 /**
  * @class ArchidektApiResponseDeckEntryDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
index 21e8e3f9a..9c4ea59ab 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
@@ -1,8 +1,18 @@
 #include "archidekt_api_response_deck_listings_display_widget.h"
 
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../../../../cards/card_size_widget.h"
+#include "../../../../general/layout_containers/flow_widget.h"
+#include "../api_response/archidekt_deck_listing_api_response.h"
+#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
 #include "archidekt_api_response_deck_entry_display_widget.h"
 
+#include <QHBoxLayout>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QSlider>
+#include <qnamespace.h>
+
 ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsDisplayWidget(
     QWidget *parent,
     ArchidektDeckListingApiResponse response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
index f9a887aa4..a9a7da7a1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
@@ -1,15 +1,15 @@
 #ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
 
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../api_response/archidekt_deck_listing_api_response.h"
-
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class ArchidektDeckListingApiResponse;
+class CardSizeWidget;
+class FlowWidget;
+class QHBoxLayout;
+class QNetworkAccessManager;
 
 /**
  * @class ArchidektApiResponseDeckListingsDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
index ced08491e..97383534f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
@@ -1,7 +1,11 @@
 #include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QFontMetrics>
-#include <QPainter>
+#include "../../../../general/display/shadow_background_label.h"
+
+#include <QFont>
+#include <QLabel>
+#include <QString>
+#include <qnamespace.h>
 
 ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
index 053823c45..991f27b6a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
@@ -1,10 +1,11 @@
 #ifndef COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 
-#include "../../../../general/display/shadow_background_label.h"
-
-#include <QLabel>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class ShadowBackgroundLabel;
 
 /**
  * @class ArchidektDeckPreviewImageDisplayWidget
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
index 888197f53..02badf1aa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
@@ -3,31 +3,54 @@
 #include "../../../../../client/settings/cache_settings.h"
 #include "../../../../pixel_map_generator.h"
 #include "../../../cards/additional_info/mana_symbol_widget.h"
+#include "../../../cards/card_size_widget.h"
+#include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
+#include "../../tab.h"
 #include "../../tab_supervisor.h"
 #include "api_response/archidekt_deck_listing_api_response.h"
+#include "api_response/deck/archidekt_api_response_deck.h"
+#include "card_database_display_model.h"
+#include "card_database_model.h"
 #include "display/archidekt_api_response_deck_display_widget.h"
 #include "display/archidekt_api_response_deck_listings_display_widget.h"
 
+#include <QByteArray>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDebug>
-#include <QFormLayout>
+#include <QEvent>
 #include <QGridLayout>
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonValueRef>
+#include <QLabel>
+#include <QLayoutItem>
+#include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QPoint>
 #include <QPushButton>
-#include <QResizeEvent>
 #include <QScrollArea>
-#include <QScrollBar>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QSpinBox>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QTimer>
+#include <QUrl>
 #include <QUrlQuery>
+#include <QVBoxLayout>
+#include <QWheelEvent>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card/card_search_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
 #include <version_string.h>
 
 TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
index e837e672b..015b8590b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
@@ -1,26 +1,35 @@
 #ifndef COCKATRICE_TAB_ARCHIDEKT_H
 #define COCKATRICE_TAB_ARCHIDEKT_H
 
-#include "../../interface/widgets/cards/card_size_widget.h"
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
-#include "display/archidekt_api_response_deck_listings_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QNetworkAccessManager>
-#include <QPushButton>
-#include <QScrollArea>
+#include <QChar>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
 #include <QSet>
-#include <QSpinBox>
 #include <QString>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
+#include <QVector>
+#include <qtmetamacros.h>
+
+class ArchidektApiResponseDeckListingsDisplayWidget;
+class CardSizeWidget;
+class QCheckBox;
+class QComboBox;
+class QHBoxLayout;
+class QLabel;
+class QLineEdit;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QPushButton;
+class QScrollArea;
+class QSpinBox;
+class QTimer;
+class QVBoxLayout;
+class QWidget;
+class SettingsButtonWidget;
+class TabSupervisor;
 
 /** Base API link for Archidekt deck search */
 inline QString archidektApiLink = "https://archidekt.com/api/decks/v3/?name=";
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
index 3c95a4553..aa892d0d4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
@@ -1,5 +1,7 @@
 #include "card_in_deck_request.h"
 
+#include <QJsonValue>
+
 CardInDeckRequest CardInDeckRequest::fromJson(const QJsonObject &json)
 {
     CardInDeckRequest request;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
index b7eb96211..6bcaca42f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_CARD_IN_DECK_REQUEST_H
 #define COCKATRICE_CARD_IN_DECK_REQUEST_H
 #include <QJsonObject>
+#include <QString>
 
 struct CardInDeckRequest
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
index 14558d234..0ae5dd360 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
@@ -1,5 +1,7 @@
 #include "commander_spellbook_card_result.h"
 
+#include <QJsonValue>
+
 CommanderSpellbookCardResult CommanderSpellbookCardResult::fromJson(const QJsonObject &json)
 {
     CommanderSpellbookCardResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
index 166469353..ac259f3aa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
@@ -1,6 +1,14 @@
 #include "commander_spellbook_deck_request.h"
 
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/utility/card_ref.h"
+
 #include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueConstRef>
+#include <QSet>
+#include <QString>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 CommanderSpellbookDeckRequest CommanderSpellbookDeckRequest::fromJson(const QJsonObject &json)
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
index 46d8e053b..002f7666f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
@@ -1,11 +1,12 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
 #include "card_in_deck_request.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QJsonObject>
 #include <QList>
 
+class DeckList;
+
 struct CommanderSpellbookDeckRequest
 {
     static CommanderSpellbookDeckRequest fromJson(const QJsonObject &json);
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
index c3640ce79..35ba954a1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
@@ -1,5 +1,9 @@
 #include "commander_spellbook_estimate_bracket_result.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 EstimateBracketResult EstimateBracketResult::fromJson(const QJsonObject &json)
 {
     EstimateBracketResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
index bb589a901..c9c152d35 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
@@ -6,6 +6,7 @@
 
 #include <QJsonObject>
 #include <QList>
+#include <QString>
 
 struct EstimateBracketResult
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
index bbc23e15e..53630a69e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
@@ -1,5 +1,7 @@
 #include "commander_spellbook_variant_result.h"
 
+#include <QJsonValue>
+
 CommanderSpellbookVariantResult CommanderSpellbookVariantResult::fromJson(const QJsonObject &json)
 {
     CommanderSpellbookVariantResult result;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
index d908f1299..49f45f92c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
@@ -3,6 +3,7 @@
 
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QString>
 
 struct CommanderSpellbookVariantResult
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
index b85129a3f..8e0448faa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
@@ -4,6 +4,8 @@
 
 #include <libcockatrice/settings/commander_bracket_settings.h>
 
+class DeckList;
+
 CommanderBracketService &CommanderBracketService::instance()
 {
     static CommanderBracketService service;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
index e0c2a9d55..22962cc95 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
@@ -1,10 +1,15 @@
 #ifndef COCKATRICE_COMMANDER_BRACKET_SERVICE_H
 #define COCKATRICE_COMMANDER_BRACKET_SERVICE_H
 
+#include "api_response/commander_spellbook_estimate_bracket_result.h"
 #include "commander_spellbook_api_accessor.h"
-#include "libcockatrice/deck_list/deck_list.h"
 
 #include <QObject>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class DeckList;
 
 struct CommanderBracketEstimate
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
index 2cbbedfa4..06a76dd19 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
@@ -3,7 +3,9 @@
 #include "../../../../../client/settings/cache_settings.h"
 #include "../../../../pixel_map_generator.h"
 #include "commander_bracket_service.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QAbstractButton>
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -11,11 +13,17 @@
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QObject>
 #include <QPushButton>
+#include <QStringLiteral>
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <libcockatrice/settings/deck_editor_settings.h>
+#include <qnamespace.h>
+
+template <class T> class QSharedPointer;
 
 CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
index a45610fcf..f5b2b7958 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
@@ -4,12 +4,17 @@
 #include "commander_spellbook_bracket_explainer.h"
 
 #include <QSharedPointer>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class QLabel;
 class QToolButton;
 struct CommanderBracketEstimate;
+class DeckList;
+class QObject;
+template <class T> class QSharedPointer;
 
 class CommanderBracketWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
index 590692d98..bd8d9379d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
@@ -1,13 +1,21 @@
 #include "commander_spellbook_api_accessor.h"
 
 #include "api_response/commander_spellbook_deck_request.h"
+#include "api_response/commander_spellbook_estimate_bracket_result.h"
 
+#include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
+#include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QStringLiteral>
 #include <QUrl>
+#include <QVariant>
 #include <version_string.h>
 
+class DeckList;
+
 static const QUrl ESTIMATE_BRACKET_URL(QStringLiteral("https://backend.commanderspellbook.com/estimate-bracket"));
 
 CommanderSpellbookApiAccessor &CommanderSpellbookApiAccessor::instance()
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
index 682a48524..98e7e3710 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
@@ -1,12 +1,15 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 
-#include "api_response/commander_spellbook_estimate_bracket_result.h"
-
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QObject>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class DeckList;
+class QNetworkReply;
+struct EstimateBracketResult;
 
 class CommanderSpellbookApiAccessor final : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
index fc308ed60..06250f1ea 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
@@ -1,5 +1,9 @@
 #include "commander_spellbook_bracket_explainer.h"
 
+#include "api_response/commander_spellbook_card_result.h"
+#include "api_response/commander_spellbook_estimate_bracket_result.h"
+#include "api_response/commander_spellbook_variant_result.h"
+
 static QString cardList(const QList<CommanderSpellbookCardResult> &cards, int max = 5)
 {
     QStringList names;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
index 9ed499742..3ab317df9 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
@@ -1,6 +1,12 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
-#include "api_response/commander_spellbook_estimate_bracket_result.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+struct EstimateBracketResult;
 
 namespace CommanderBracketNames
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
index 90b490efe..22200ffa2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
@@ -2,9 +2,16 @@
 
 #include "../../../../../client/settings/cache_settings.h"
 
+#include <QByteArray>
 #include <QJsonDocument>
-#include <QJsonObject>
+#include <QJsonParseError>
+#include <QMap>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QString>
+#include <QStringLiteral>
 #include <QUrl>
+#include <QVariant>
 #include <libcockatrice/settings/commander_bracket_settings.h>
 
 static const QUrl COMMANDER_BRACKET_JSON_URL(QStringLiteral("https://cockatrice.github.io/commander-brackets.json"));
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
index b8348b13c..39bddba05 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
@@ -1,9 +1,12 @@
 #ifndef COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
 #define COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
 
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QObject>
+#include <QVariantMap>
+#include <qtmetamacros.h>
+
+class QNetworkAccessManager;
 
 class HandleCommanderBrackets : public QObject
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
index 145a3fca0..411fdd5ed 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
@@ -3,6 +3,9 @@
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueConstRef>
+#include <qlogging.h>
 
 void EdhrecApiResponseArchidektLink::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
index d265c164d..0786550fe 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
@@ -1,7 +1,9 @@
 #ifndef ARCHIDEKTENTRY_H
 #define ARCHIDEKTENTRY_H
 
+#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
index 1297fc157..b6ecac0af 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@@ -1,7 +1,13 @@
 #include "edhrec_average_deck_api_response.h"
 
+#include "../archidekt_links/edhrec_api_response_archidekt_links.h"
+#include "../cards/edhrec_api_response_card_container.h"
+#include "../commander/edhrec_commander_api_response_average_deck_statistics.h"
+
 #include <QDebug>
 #include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void EdhrecAverageDeckApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
index 1cb070c30..324dce52a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@@ -1,10 +1,14 @@
 #include "edhrec_deck_api_response.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueConstRef>
+#include <QString>
+#include <QTextStream>
+#include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
+#include <qlogging.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
index 7bc97c431..a47fcc10b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
@@ -7,7 +7,9 @@
 #ifndef EDHREC_DECK_API_RESPONSE_H
 #define EDHREC_DECK_API_RESPONSE_H
 
-#include "../../../../../../deck_loader/deck_loader.h"
+#include "libcockatrice/deck_list/deck_list.h"
+
+#include <QJsonArray>
 
 class EdhrecDeckApiResponse
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
index 1231d147a..26502f1de 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
@@ -1,6 +1,8 @@
 #include "edhrec_api_response_card_prices.h"
 
 #include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void CardPrices::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
index 3fef8be34..8660cac50 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
@@ -3,6 +3,9 @@
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 void EdhrecApiResponseCardContainer::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
index d76dda490..70d39474d 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
@@ -11,6 +11,7 @@
 #include "edhrec_commander_api_response_commander_details.h"
 
 #include <QJsonObject>
+#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
index a4a746c61..ebf09d2a9 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
@@ -1,6 +1,8 @@
 #include "edhrec_api_response_card_details.h"
 
 #include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
 
 EdhrecApiResponseCardDetails::EdhrecApiResponseCardDetails()
     : synergy(0.0), inclusion(0), numDecks(0), potentialDecks(0)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
index 72d6fe2cc..0cf585ee9 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
@@ -1,6 +1,10 @@
 #include "edhrec_api_response_card_list.h"
 
 #include <QDebug>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 EdhrecApiResponseCardList::EdhrecApiResponseCardList()
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
index 2df29de0c..d6e0d7f75 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
@@ -9,7 +9,7 @@
 
 #include "edhrec_api_response_card_details.h"
 
-#include <QJsonArray>
+#include <QJsonObject>
 #include <QList>
 #include <QString>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
index 7b220603e..7383677c8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
@@ -1,6 +1,11 @@
 #include "edhrec_commander_api_response_commander_details.h"
 
+#include "../card_prices/edhrec_api_response_card_prices.h"
+
 #include <QDebug>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <qlogging.h>
 
 void EdhrecCommanderApiResponseCommanderDetails::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
index 293e9a150..a0858e9d2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
@@ -10,6 +10,8 @@
 #include "../card_prices/edhrec_api_response_card_prices.h"
 
 #include <QJsonArray>
+#include <QJsonObject>
+#include <QList>
 #include <QString>
 #include <QVector>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
index da2a9c052..1e0304e8a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
@@ -1,7 +1,12 @@
 #include "edhrec_commander_api_response.h"
 
+#include "../archidekt_links/edhrec_api_response_archidekt_links.h"
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
 #include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void EdhrecCommanderApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
index 74cce5322..996ec3c0c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
@@ -1,5 +1,7 @@
 #include "edhrec_commander_api_response_average_deck_statistics.h"
 
+#include <QJsonValue>
+
 void EdhrecCommanderApiResponseAverageDeckStatistics::fromJson(const QJsonObject &json)
 {
     creature = json.value("creature").toInt(0);
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
index 26122ce89..4df2f3523 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
@@ -1,7 +1,10 @@
 #include "edhrec_top_cards_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void EdhrecTopCardsApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
index 695498e2b..cdf0d4a71 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
@@ -9,6 +9,7 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopCardsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
index 83b10c9e5..c1bf71cb2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
@@ -1,7 +1,10 @@
 #include "edhrec_top_commanders_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void EdhrecTopCommandersApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
index 10aa51ff4..4579632c6 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
@@ -9,6 +9,7 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopCommandersApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
index 56eb4fa4f..cf6ea5df8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
@@ -1,7 +1,10 @@
 #include "edhrec_top_tags_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 void EdhrecTopTagsApiResponse::fromJson(const QJsonObject &json)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
index 0337d94f8..e6e25d97b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
@@ -9,6 +9,7 @@
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QJsonObject>
 #include <QString>
 
 class EdhrecTopTagsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
index 75902daad..0ba74fd60 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
@@ -1,5 +1,13 @@
 #include "edhrec_api_response_card_prices_display_widget.h"
 
+#include "../../api_response/card_prices/edhrec_api_response_card_prices.h"
+
+#include <QGridLayout>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QLabel>
+#include <QString>
+
 EdhrecApiResponseCardPricesDisplayWidget::EdhrecApiResponseCardPricesDisplayWidget(QWidget *parent,
                                                                                    const CardPrices &_cardPrices)
     : QWidget(parent), cardPrices(_cardPrices)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
index 8943ae9f3..75fe033dc 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
@@ -9,9 +9,11 @@
 
 #include "../../api_response/card_prices/edhrec_api_response_card_prices.h"
 
-#include <QGridLayout>
-#include <QLabel>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QGridLayout;
+class QLabel;
 
 class EdhrecApiResponseCardPricesDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index 00c1741df..0728b3154 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -1,10 +1,21 @@
 #include "edhrec_api_response_card_details_display_widget.h"
 
+#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../cards/card_size_widget.h"
 #include "../../../../../general/display/background_plate_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_details.h"
 #include "../../tab_edhrec_main.h"
+#include "edhrec_api_response_card_inclusion_display_widget.h"
+#include "edhrec_api_response_card_synergy_display_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QLabel>
 #include <QMouseEvent>
+#include <QObject>
+#include <QSlider>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <qnamespace.h>
 
 EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
index b09cc4e04..d738f4685 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
@@ -7,15 +7,18 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 
-#include "../../../../../cards/card_info_picture_widget.h"
-#include "../../../../../general/display/background_plate_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
-#include "edhrec_api_response_card_inclusion_display_widget.h"
-#include "edhrec_api_response_card_synergy_display_widget.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class BackgroundPlateWidget;
+class CardInfoPictureWidget;
+class EdhrecApiResponseCardInclusionDisplayWidget;
+class EdhrecApiResponseCardSynergyDisplayWidget;
+class QLabel;
+class QVBoxLayout;
 
 class EdhrecApiResponseCardDetailsDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
index 8292b00ea..6786b006e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
@@ -1,5 +1,13 @@
 #include "edhrec_api_response_card_inclusion_display_widget.h"
 
+#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_details.h"
+
+#include <QLabel>
+#include <QString>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 EdhrecApiResponseCardInclusionDisplayWidget::EdhrecApiResponseCardInclusionDisplayWidget(
     QWidget *parent,
     const EdhrecApiResponseCardDetails &_toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
index 516d820eb..61a1bd645 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
@@ -7,12 +7,14 @@
 #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class PercentBarWidget;
+class QLabel;
+class QVBoxLayout;
 
 class EdhrecApiResponseCardInclusionDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
index 841ef315b..5295b92d5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
@@ -1,9 +1,19 @@
 #include "edhrec_api_response_card_list_display_widget.h"
 
 #include "../../../../../general/display/banner_widget.h"
+#include "../../../../../general/layout_containers/flow_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_details.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "edhrec_api_response_card_details_display_widget.h"
 
-#include <QLabel>
+#include <QDebug>
+#include <QForeach>
+#include <QList>
+#include <QResizeEvent>
+#include <QSize>
+#include <QVBoxLayout>
+#include <qlogging.h>
+#include <qnamespace.h>
 
 EdhrecApiResponseCardListDisplayWidget::EdhrecApiResponseCardListDisplayWidget(QWidget *parent,
                                                                                EdhrecApiResponseCardList toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
index 555da6ecf..20bdad8ea 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
@@ -8,12 +8,14 @@
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
 
 #include "../../../../../general/display/banner_widget.h"
-#include "../../../../../general/layout_containers/flow_widget.h"
-#include "../../api_response/cards/edhrec_api_response_card_list.h"
 
-#include <QResizeEvent>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecApiResponseCardList;
+class FlowWidget;
+class QVBoxLayout;
 
 class EdhrecApiResponseCardListDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
index 9d5571a8f..5f4b02327 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
@@ -1,5 +1,13 @@
 #include "edhrec_api_response_card_synergy_display_widget.h"
 
+#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_details.h"
+
+#include <QLabel>
+#include <QString>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 EdhrecApiResponseCardSynergyDisplayWidget::EdhrecApiResponseCardSynergyDisplayWidget(
     QWidget *parent,
     const EdhrecApiResponseCardDetails &_toDisplay)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
index 5800b5497..71cca6ca4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
@@ -7,12 +7,14 @@
 #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class PercentBarWidget;
+class QLabel;
+class QVBoxLayout;
 
 class EdhrecApiResponseCardSynergyDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
index 40a803e77..3da050edd 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
@@ -1,11 +1,20 @@
 #include "edhrec_api_response_commander_details_display_widget.h"
 
 #include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../cards/card_size_widget.h"
+#include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
 #include "../../tab_edhrec_main.h"
 #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
+#include "edhrec_commander_api_response_navigation_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QObject>
+#include <QSlider>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <qnamespace.h>
 
 EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
index 4201ce3b3..197263512 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
@@ -7,16 +7,19 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 
-#include "../../../../../cards/card_info_picture_widget.h"
 #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
-#include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
-#include "edhrec_commander_api_response_navigation_widget.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class EdhrecCommanderApiResponseNavigationWidget;
+class CardInfoPictureWidget;
+class EdhrecApiResponseCardPricesDisplayWidget;
+class QHBoxLayout;
+class QLabel;
+class QVBoxLayout;
+
 class EdhrecCommanderResponseCommanderDetailsDisplayWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
index c3ab23e41..b26a7e574 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
@@ -1,6 +1,12 @@
 #include "edhrec_commander_api_response_bracket_navigation_widget.h"
 
+#include <QChar>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
 #include <QSet>
+#include <QSharedPointer>
+#include <qnamespace.h>
 
 EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBracketNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
index 713ef2791..a741b6696 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
@@ -1,11 +1,16 @@
 #ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
 #define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
 
-#include <QGridLayout>
-#include <QLabel>
+#include <QList>
 #include <QMap>
-#include <QPushButton>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QGridLayout;
+class QLabel;
+class QPushButton;
 
 class EdhrecCommanderApiResponseBracketNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
index 1845c020d..48704d010 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
@@ -1,6 +1,12 @@
 #include "edhrec_commander_api_response_budget_navigation_widget.h"
 
+#include <QChar>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
 #include <QSet>
+#include <QSharedPointer>
+#include <qnamespace.h>
 
 EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudgetNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
index 666edba16..8013d1d6b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
@@ -1,11 +1,16 @@
 #ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
 #define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
 
-#include <QGridLayout>
-#include <QLabel>
+#include <QList>
 #include <QMap>
-#include <QPushButton>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QGridLayout;
+class QLabel;
+class QPushButton;
 
 class EdhrecCommanderApiResponseBudgetNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
index 230858d6c..111d91b91 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
@@ -1,15 +1,30 @@
 #include "edhrec_commander_api_response_display_widget.h"
 
-#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../api_response/cards/edhrec_api_response_card_container.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/commander/edhrec_commander_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 #include "edhrec_api_response_commander_details_display_widget.h"
 
+#include <QAbstractItemView>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QLayoutItem>
+#include <QList>
 #include <QListView>
+#include <QModelIndex>
+#include <QObject>
 #include <QResizeEvent>
 #include <QScrollArea>
+#include <QSize>
 #include <QSplitter>
+#include <QStringList>
 #include <QStringListModel>
+#include <QVBoxLayout>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class QModelIndex;
 
 EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget(QWidget *parent,
                                                                                  EdhrecCommanderApiResponse response,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
index 80da8a7f8..5ada40df3 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
@@ -7,11 +7,14 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/commander/edhrec_commander_api_response.h"
-
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecCommanderApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 class EdhrecCommanderApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
index c42d2ed90..fd02c4261 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
@@ -1,6 +1,12 @@
 #include "edhrec_commander_api_response_navigation_widget.h"
 
 #include "../../tab_edhrec_main.h"
+#include "edhrec_commander_api_response_bracket_navigation_widget.h"
+#include "edhrec_commander_api_response_budget_navigation_widget.h"
+
+#include <QGridLayout>
+#include <QObject>
+#include <QPushButton>
 
 EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigationWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
index 9b46b54ba..737558625 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
@@ -7,14 +7,16 @@
 #ifndef EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 
-#include "edhrec_api_response_commander_details_display_widget.h"
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
-#include "edhrec_commander_api_response_budget_navigation_widget.h"
+#include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
 
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecCommanderApiResponseBracketNavigationWidget;
+class EdhrecCommanderApiResponseBudgetNavigationWidget;
+class QGridLayout;
+class QPushButton;
 
 class EdhrecCommanderApiResponseNavigationWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
index ae07c9dc8..6f32db102 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
@@ -1,8 +1,17 @@
 #include "edhrec_top_cards_api_response_display_widget.h"
 
+#include "../../api_response/cards/edhrec_api_response_card_container.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
+#include <QHBoxLayout>
+#include <QList>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 EdhrecTopCardsApiResponseDisplayWidget::EdhrecTopCardsApiResponseDisplayWidget(QWidget *parent,
                                                                                EdhrecTopCardsApiResponse response)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
index 30998391c..8b5ddfad0 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
@@ -7,12 +7,13 @@
 #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
-
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopCardsApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 class EdhrecTopCardsApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
index 13f54a979..4ab333fd4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
@@ -1,8 +1,20 @@
 #include "edhrec_top_commanders_api_response_display_widget.h"
 
+#include "../../api_response/cards/edhrec_api_response_card_container.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QList>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QSize>
+#include <QVBoxLayout>
+#include <qlogging.h>
+#include <qnamespace.h>
+
 EdhrecTopCommandersApiResponseDisplayWidget::EdhrecTopCommandersApiResponseDisplayWidget(
     QWidget *parent,
     EdhrecTopCommandersApiResponse response)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
index 2b9563ea5..8471a8dda 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
@@ -7,12 +7,13 @@
 #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
-
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopCommandersApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 class EdhrecTopCommandersApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
index 91a1ce3fa..9c7ce8d06 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
@@ -1,8 +1,17 @@
 #include "edhrec_top_tags_api_response_display_widget.h"
 
+#include "../../api_response/cards/edhrec_api_response_card_container.h"
+#include "../../api_response/cards/edhrec_api_response_card_list.h"
 #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 
+#include <QHBoxLayout>
+#include <QList>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 EdhrecTopTagsApiResponseDisplayWidget::EdhrecTopTagsApiResponseDisplayWidget(QWidget *parent,
                                                                              EdhrecTopTagsApiResponse response)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
index 4a4fc8991..2c13d069f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
@@ -7,11 +7,13 @@
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
-
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopTagsApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 class EdhrecTopTagsApiResponseDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
index 10389f4eb..3aa395126 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
@@ -1,16 +1,26 @@
 #include "tab_edhrec.h"
 
+#include "../../tab.h"
 #include "api_response/commander/edhrec_commander_api_response.h"
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonValueRef>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QResizeEvent>
+#include <QSharedPointer>
+#include <QUrl>
+#include <qlogging.h>
+
+class TabSupervisor;
 
 TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
index 5ce36c9cf..4e3c9c8ba 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
@@ -8,10 +8,16 @@
 #define TAB_EDHREC_H
 
 #include "../../tab.h"
-#include "display/commander/edhrec_commander_api_response_display_widget.h"
 
-#include <QNetworkAccessManager>
+#include <QJsonValue>
+#include <QString>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class EdhrecCommanderApiResponseDisplayWidget;
+class QNetworkAccessManager;
+class QNetworkReply;
+class TabSupervisor;
 
 class TabEdhRec : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
index bd52dd3b5..ca575dc02 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@@ -1,6 +1,9 @@
 #include "tab_edhrec_main.h"
 
 #include "../../../../../client/settings/cache_settings.h"
+#include "../../../../deck_loader/loaded_deck.h"
+#include "../../../cards/card_size_widget.h"
+#include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
 #include "../../tab_supervisor.h"
 #include "api_response/average_deck/edhrec_average_deck_api_response.h"
@@ -18,13 +21,17 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <version_string.h>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
index a7ed83efd..5d0245ed4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
@@ -7,16 +7,25 @@
 #ifndef TAB_EDHREC_MAIN_H
 #define TAB_EDHREC_MAIN_H
 
-#include "../../interface/widgets/cards/card_size_widget.h"
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
-#include "display/commander/edhrec_commander_api_response_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QNetworkAccessManager>
-#include <QPushButton>
-#include <libcockatrice/card/database/card_database.h>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QString>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class EdhrecCommanderApiResponseDisplayWidget;
+class QHBoxLayout;
+class QLineEdit;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QPushButton;
+class QVBoxLayout;
+class QWidget;
+class SettingsButtonWidget;
+class TabSupervisor;
 
 class TabEdhRecMain : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab.cpp b/cockatrice/src/interface/widgets/tabs/tab.cpp
index 3dcb3b523..5ef4d18b8 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab.cpp
@@ -1,12 +1,17 @@
 #include "tab.h"
 
 #include "../interface/widgets/cards/card_info_display_widget.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QApplication>
-#include <QCloseEvent>
-#include <QDebug>
+#include <QFlags>
+#include <QPoint>
+#include <QRect>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 Tab::Tab(TabSupervisor *_tabSupervisor)
     : QMainWindow(_tabSupervisor), tabSupervisor(_tabSupervisor), contentsChanged(false), infoPopup(0)
diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h
index bddf325e2..e114f9bd9 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.h
+++ b/cockatrice/src/interface/widgets/tabs/tab.h
@@ -7,12 +7,16 @@
 #ifndef TAB_H
 #define TAB_H
 
+#include <QList>
 #include <QMainWindow>
+#include <QString>
 #include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
 
 class QMenu;
 class TabSupervisor;
 class CardInfoDisplayWidget;
+class QPoint;
 
 class Tab : public QMainWindow
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
index dbcf50966..e55dc55d0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
@@ -6,10 +6,17 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/server/user/user_list_widget.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "tab_supervisor.h"
 
+#include <QHBoxLayout>
+#include <QList>
+#include <QMap>
 #include <QPushButton>
+#include <QSharedPointer>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
@@ -19,6 +26,7 @@
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
 
 TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
     : Tab(_tabSupervisor), client(_client)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h
index 68054c7a1..ab2c4b38d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.h
@@ -9,11 +9,16 @@
 
 #include "tab.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+#include <string>
+// IWYU pragma: keep
+// ServerInfo_User appears by value and inside QList in slot signatures, so the
+// moc-generated code needs the complete type.
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class Event_AddToList;
-class Event_ListRooms;
 class Event_RemoveFromList;
 class Event_UserJoined;
 class Event_UserLeft;
@@ -23,6 +28,8 @@ class Response;
 class ServerInfo_User;
 class UserInfoBox;
 class UserListWidget;
+class TabSupervisor;
+template <typename T> class QList;
 
 class TabAccount : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
index 16f17e03e..cfbd00538 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
@@ -1,19 +1,31 @@
 #include "tab_admin.h"
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
+#include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/admin_commands.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <limits.h>
+#include <string>
+
+class CommandContainer;
+class QVariant;
+class TabSupervisor;
 
 ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.h b/cockatrice/src/interface/widgets/tabs/tab_admin.h
index 0da098ba5..8eb139a8e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.h
@@ -10,15 +10,17 @@
 #include "tab.h"
 
 #include <QDialog>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
-
 class QGroupBox;
 class QPushButton;
 class QSpinBox;
 class QLineEdit;
+class QWidget;
+class Response;
+class TabSupervisor;
 
 class ShutdownDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
index 999bc3db0..1fc2854ce 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
@@ -1,16 +1,39 @@
 #include "tab_card_art_rules.h"
 
 #include "../utility/completer_utils.h"
+#include "card_database_display_model.h"
+#include "card_database_model.h"
+#include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_manager.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
 
+#include <QAbstractItemView>
+#include <QComboBox>
 #include <QCompleter>
 #include <QFormLayout>
 #include <QHBoxLayout>
+#include <QLineEdit>
+#include <QList>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QTableView>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <string>
+
+class QObject;
+class TabSupervisor;
 
 CardArtRulesModel::CardArtRulesModel(AbstractClient *client, QObject *parent)
     : QAbstractTableModel(parent), client(client)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
index b9ea2ca83..f34300179 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
@@ -1,16 +1,28 @@
 #ifndef COCKATRICE_DLG_CARD_ART_RULES_H
 #define COCKATRICE_DLG_CARD_ART_RULES_H
 
-#include "card/card_search_model.h"
-#include "tab_supervisor.h"
+#include "tab.h"
 
 #include <QAbstractTableModel>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTableView>
+#include <QModelIndex>
+#include <QString>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+#include <vector>
 
 class AbstractClient;
+class CardCompleterProxyModel;
+class CardDatabaseDisplayModel;
+class CardDatabaseModel;
+class CardSearchModel;
+class QComboBox;
+class QCompleter;
+class QLineEdit;
+class QObject;
+class QPushButton;
+class QTableView;
+class Response;
+class TabSupervisor;
 
 class CardArtRulesModel : public QAbstractTableModel
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index 8439aef70..7ca179cea 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -2,28 +2,28 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../deck_editor/deck_editor_card_database_dock_widget.h"
+#include "../deck_editor/deck_editor_card_info_dock_widget.h"
+#include "../deck_editor/deck_editor_deck_dock_widget.h"
+#include "../deck_editor/deck_editor_printing_selector_dock_widget.h"
 #include "../deck_editor/deck_state_manager.h"
-#include "../filters/filter_builder.h"
-#include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
 #include "../interface/widgets/menus/deck_editor_menu.h"
-#include "tab_supervisor.h"
 
 #include <QAction>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QDir>
+#include <QByteArray>
 #include <QDockWidget>
-#include <QHeaderView>
-#include <QMenuBar>
-#include <QProcessEnvironment>
-#include <QTimer>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pending_command.h>
+#include <QEvent>
+#include <QList>
+#include <QMap>
+#include <QMenu>
+#include <QSize>
+#include <QString>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
+#include <qnamespace.h>
+
+class TabSupervisor;
 
 /**
  * @brief Constructs a new TabDeckEditor object.
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
index 14be59cd7..afe62e962 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
@@ -1,17 +1,11 @@
 #ifndef WINDOW_DECKEDITOR_H
 #define WINDOW_DECKEDITOR_H
 
-#include "../../key_signals.h"
-#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
 #include "abstract_tab_deck_editor.h"
 
-#include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
-class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-class DeckListModel;
-
-class QLabel;
+class TabSupervisor;
 
 /**
  * @class TabDeckEditor
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 41ebb17a2..44d04bd24 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -1,32 +1,55 @@
 #include "tab_deck_storage.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../deck_share/deck_share_utils.h"
 #include "../deck_share/share_bar_widget.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
+#include "abstract_client.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QAction>
 #include <QApplication>
-#include <QDateTime>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
+#include <QFile>
+#include <QFileInfo>
 #include <QFileSystemModel>
+#include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QInputDialog>
+#include <QItemSelection>
+#include <QItemSelectionModel>
 #include <QLineEdit>
 #include <QMessageBox>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPixmap>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QStyle>
 #include <QTimer>
 #include <QToolBar>
 #include <QTreeView>
 #include <QUrl>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
@@ -38,12 +61,17 @@
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <optional>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
+
+class TabSupervisor;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
index f8d585880..35a4649c7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
@@ -11,22 +11,26 @@
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
+#include <QList>
+#include <QString>
 #include <QStringList>
+#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <qtmetamacros.h>
 
 struct LoadedDeck;
 class ServerInfo_User;
-class AbstractClient;
 class QTreeView;
 class QFileSystemModel;
 class QToolBar;
-class QTreeWidget;
-class QTreeWidgetItem;
 class QGroupBox;
 class QTimer;
 class CommandContainer;
 class Response;
 class ShareBarWidget;
+class QAction;
+class QModelIndex;
+class TabSupervisor;
 
 class TabDeckStorage : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
index 39652ef7d..d641a1ea5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
@@ -6,21 +6,35 @@
 
 #include "tab_developer.h"
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QDateTime>
+#include <QFont>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QLabel>
+#include <QList>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QSpinBox>
 #include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <algorithm>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
 #include <libcockatrice/protocol/pb/response_get_server_stats.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+
+class TabSupervisor;
 
 static constexpr int DEFAULT_AUTO_REFRESH_INTERVAL_SECS = 30;
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.h b/cockatrice/src/interface/widgets/tabs/tab_developer.h
index 727a56bcb..1a4e5904f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_developer.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.h
@@ -9,6 +9,10 @@
 
 #include "tab.h"
 
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
 class AbstractClient;
 class QCheckBox;
 class QLabel;
@@ -17,6 +21,7 @@ class QSpinBox;
 class QTableWidget;
 class QTimer;
 class Response;
+class TabSupervisor;
 
 class TabDeveloper : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 23976340b..9a6862b2c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -2,11 +2,16 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../../game/abstract_game.h"
+#include "../../../game/game_event_handler.h"
+#include "../../../game/game_meta_info.h"
+#include "../../../game/game_state.h"
+#include "../../../game/player/player_info.h"
+#include "../../../game/player/player_manager.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
 #include "../game/game.h"
 #include "../game/player/player_logic.h"
 #include "../game/replay.h"
-#include "../game_graphics/board/arrow_item.h"
-#include "../game_graphics/board/card_item.h"
 #include "../game_graphics/deckview/deck_view_container.h"
 #include "../game_graphics/deckview/tabbed_deck_view_container.h"
 #include "../game_graphics/game_scene.h"
@@ -25,37 +30,48 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/completer_utils.h"
 #include "../interface/widgets/utility/line_edit_completer.h"
-#include "../interface/window_main.h"
 #include "../main.h"
+#include "../menus/tearoff_menu.h"
+#include "../replay/replay_widget.h"
 #include "../utility/visibility_change_listener.h"
 #include "card/card_completer_proxy_model.h"
 #include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "tab_supervisor.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
+#include <QCloseEvent>
 #include <QCompleter>
 #include <QDebug>
 #include <QDockWidget>
+#include <QFlags>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QMapIterator>
 #include <QMenu>
 #include <QMessageBox>
+#include <QPoint>
 #include <QPushButton>
 #include <QRegularExpression>
+#include <QSharedPointer>
 #include <QStackedWidget>
 #include <QStringListModel>
+#include <QSystemTrayIcon>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/settings/chat_settings.h>
@@ -63,6 +79,18 @@
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
+#include <utility>
+
+class Event_GameJoined;
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
 
 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index 29a2f40a3..7bc52202f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -9,47 +9,55 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
-#include "../game/abstract_game.h"
-#include "../game/player/player_logic.h"
-#include "../game_graphics/log/message_log_widget.h"
-#include "../interface/widgets/menus/tearoff_menu.h"
-#include "../interface/widgets/replay/replay_widget.h"
 #include "tab.h"
 
-#include <QCompleter>
+#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QStringListModel>
+#include <QPair>
+#include <QSize>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include <qtmetamacros.h>
+// IWYU pragma: keep
+// ServerInfo_User appears by value and inside QList in slot signatures, so the
+// moc-generated code needs the complete type.
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class CardMenu;
-class ServerInfo_PlayerProperties;
 class TabbedDeckViewContainer;
+class AbstractGame;
+class Event_GameJoined;
+class GameEventContext;
+class MessageLogWidget;
+class PlayerLogic;
+class QAction;
+class QCompleter;
+class QStringListModel;
+class QWidget;
+class ServerInfo_Player;
+class ServerInfo_User;
+class TabSupervisor;
+class TearOffMenu;
+struct CardRef;
+struct LoadedDeck;
+
 inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");
 
 class UserListProxy;
-class DeckViewContainer;
 class AbstractClient;
-class CardDatabase;
 class GameView;
 class GameScene;
 class ReplayWidget;
 class CardInfoFrameWidget;
-class QTimer;
-class QSplitter;
 class QLabel;
 class QPushButton;
-class QToolButton;
 class QMenu;
-class ZoneViewLayout;
-class ZoneViewWidget;
 class PhasesToolbar;
 class PlayerListWidget;
-class ReplayTimelineWidget;
-class CardZone;
 class AbstractCardItem;
-class CardItem;
 class QVBoxLayout;
-class QHBoxLayout;
 class GameReplay;
 class LineEditCompleter;
 class QDockWidget;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
index 7a79b1785..1358645d0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
@@ -1,5 +1,9 @@
 #include "tab_home.h"
 
+#include "../general/home_widget.h"
+
+class TabSupervisor;
+
 TabHome::TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
 {
     homeWidget = new HomeWidget(this, tabSupervisor);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h
index 3aae19c2b..bc86348cb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.h
@@ -7,12 +7,14 @@
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
-#include "../interface/widgets/general/home_widget.h"
 #include "tab.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
+class HomeWidget;
+class TabSupervisor;
 
 class TabHome : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
index f73d06b57..9f17afea2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
@@ -1,23 +1,35 @@
 #include "tab_logs.h"
 
 #include "../interface/widgets/utility/custom_line_edit.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
 
 #include <QCheckBox>
 #include <QDockWidget>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QSpinBox>
 #include <QTabWidget>
 #include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
+
+class TabSupervisor;
 
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands)
     : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
index 8e914ea64..fc8ef1ea0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h
@@ -9,7 +9,8 @@
 
 #include "tab.h"
 
-#include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class LineEditUnfocusable;
@@ -24,9 +25,8 @@ class QWidget;
 class QGridLayout;
 class QVBoxLayout;
 class QTableWidget;
-class CommandContainer;
 class Response;
-class AbstractClient;
+class TabSupervisor;
 
 class TabLog : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
index 418843178..65186e396 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
@@ -6,12 +6,18 @@
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "../main.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "tab_supervisor.h"
 
+#include <QAction>
 #include <QApplication>
-#include <QDebug>
+#include <QCloseEvent>
 #include <QMenu>
+#include <QMessageLogger>
+#include <QSharedPointer>
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
@@ -19,6 +25,7 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <string>
 
 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
                        AbstractClient *_client,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h
index 0e6d66d4c..bea58ecb3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.h
@@ -10,6 +10,13 @@
 #include "tab.h"
 
 #include <QLoggingCategory>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
+
+class QAction;
+class QMenu;
+class TabSupervisor;
 
 inline Q_LOGGING_CATEGORY(TabMessageLog, "tab_message");
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
index b9c37f1af..09a640540 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
@@ -1,8 +1,13 @@
 #include "tab_moderation.h"
 
 #include "abstract_client.h"
-#include "tab_supervisor.h"
+#include "libcockatrice/protocol/pb/admin_commands.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user_alt.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user_session.pb.h"
 
+#include <QAbstractItemView>
 #include <QDateTime>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -10,12 +15,17 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QSharedPointer>
 #include <QSplitter>
+#include <QStringList>
 #include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QTextEdit>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_moderator_last_logins.pb.h>
@@ -26,6 +36,10 @@
 #include <libcockatrice/protocol/pb/response_user_sessions.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+#include <string>
+
+class TabSupervisor;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.h b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
index 0a534992b..e352e90bb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
@@ -3,7 +3,9 @@
 
 #include "tab.h"
 
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class QGroupBox;
@@ -12,6 +14,8 @@ class QLineEdit;
 class QPushButton;
 class QTableWidget;
 class QTextEdit;
+class Response;
+class TabSupervisor;
 
 /**
  * Staff investigation tool. Lets moderators look up a user's account data,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
index d13f9d1e3..6bf3f6be7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
@@ -2,6 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h"
@@ -12,14 +13,21 @@
 #include "../visual_deck_storage/visual_deck_storage_tag_filter_widget.h"
 #include "tab_supervisor.h"
 
-#include <QDateTime>
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QDebug>
+#include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
 #include <QPixmap>
+#include <QSet>
 #include <QStringList>
 #include <QToolButton>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <functional>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_download_public.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -27,6 +35,7 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <optional>
+#include <qnamespace.h>
 
 TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &_userName)
     : Tab(_tabSupervisor), client(_client), userName(_userName)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
index 492fdeafa..847479e78 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
@@ -8,11 +8,13 @@
 
 #include "tab.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
 class AbstractClient;
 class CommandContainer;
 class DeckPreviewColorIdentityFilterWidget;
 class FlowWidget;
-class PublicDeckPreviewWidget;
 class QLabel;
 class QToolButton;
 class RemotePublicDecksModel;
@@ -20,6 +22,7 @@ class Response;
 class VisualDeckStorageQuickSettingsWidget;
 class VisualDeckStorageSearchWidget;
 class VisualDeckStorageTagFilterWidget;
+class TabSupervisor;
 
 /**
  * @brief A visual grid of the public decks published by another user.
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
index e26bea2a3..52bc4cd8f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@@ -3,22 +3,51 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
-#include "tab_game.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QAction>
 #include <QApplication>
+#include <QByteArray>
 #include <QClipboard>
+#include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
+#include <QFile>
+#include <QFileInfo>
 #include <QFileSystemModel>
+#include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QIODevice>
 #include <QInputDialog>
+#include <QItemSelectionModel>
+#include <QLineEdit>
+#include <QList>
+#include <QLoggingCategory>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QStyle>
 #include <QToolBar>
 #include <QTreeView>
 #include <QUrl>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_download.pb.h>
@@ -32,6 +61,11 @@
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
+
+class TabSupervisor;
 
 inline Q_LOGGING_CATEGORY(TabReplaysLog, "replays_tab");
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h
index aa4ec039c..e29e29bd7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.h
@@ -10,19 +10,26 @@
 
 #include "tab.h"
 
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+// IWYU pragma: keep
+// GameReplay is a protobuf message passed through the openReplay signal,
+// so the moc-generated code needs the complete type.
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <qtmetamacros.h>
 
 class ServerInfo_User;
 class Response;
-class AbstractClient;
 class QTreeView;
 class QFileSystemModel;
-class QToolBar;
 class QGroupBox;
 class RemoteReplayList_TreeWidget;
-class GameReplay;
 class Event_ReplayAdded;
 class CommandContainer;
+class QAction;
+class QModelIndex;
+class TabSupervisor;
 
 class TabReplays : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.cpp b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
index 0b9108f9b..5f158e9b1 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
@@ -2,11 +2,16 @@
 
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
 #include "tab_supervisor.h"
 
+#include <QAbstractItemView>
+#include <QChar>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDateTime>
+#include <QDebug>
+#include <QFont>
 #include <QFontDatabase>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -15,16 +20,19 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QPushButton>
+#include <QSharedPointer>
 #include <QSignalBlocker>
 #include <QSplitter>
 #include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QTextCursor>
 #include <QTextEdit>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QVariant>
 #include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
 #include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
 #include <libcockatrice/protocol/pb/command_report_assign.pb.h>
@@ -41,6 +49,8 @@
 #include <libcockatrice/protocol/pb/response_report_user_info.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+#include <string>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.h b/cockatrice/src/interface/widgets/tabs/tab_report.h
index b62a99ce2..645f949de 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.h
@@ -4,8 +4,9 @@
 #include "tab.h"
 
 #include <QList>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class QCheckBox;
@@ -19,6 +20,8 @@ class QTableWidget;
 class QTextEdit;
 class QTimer;
 class GameReplay;
+class Response;
+class TabSupervisor;
 
 class TabReport : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index 866324367..67106ba34 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -11,27 +11,39 @@
 #include "../interface/widgets/server/user/user_list_panel_widget.h"
 #include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
+#include "../server/game_type_map.h"
+#include "../server/user/user_list_proxy.h"
 #include "../utility/completer_utils.h"
+#include "../utility/line_edit_completer.h"
 #include "card/card_completer_proxy_model.h"
 #include "card/card_search_model.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
-#include "tab_account.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "tab_supervisor.h"
+#include "user_level.h"
 
+#include <QAction>
 #include <QApplication>
+#include <QCloseEvent>
 #include <QCompleter>
+#include <QDateTime>
+#include <QFlag>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMenu>
-#include <QMessageBox>
-#include <QPushButton>
 #include <QRegularExpression>
 #include <QSplitter>
 #include <QStringListModel>
+#include <QStringLiteral>
 #include <QSystemTrayIcon>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include <QtCore/qdatetime.h>
+#include <QWidget>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
@@ -46,6 +58,8 @@
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
 
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
                  AbstractClient *_client,
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h
index 7d01d5cf6..031056145 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.h
@@ -8,16 +8,21 @@
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "../interface/widgets/utility/line_edit_completer.h"
 #include "tab.h"
 
-#include <QFocusEvent>
-#include <QGroupBox>
+#include <QList>
 #include <QMap>
-#include <QStringListModel>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class UserListProxy;
-class UserListManager;
+class QAction;
+class QGroupBox;
+class QMenu;
+class QStringListModel;
+class TabSupervisor;
+
 namespace google
 {
 namespace protobuf
@@ -30,12 +35,9 @@ class UserListWidget;
 class UserListPanelWidget;
 class QLabel;
 class ChatView;
-class QPushButton;
-class QTextTable;
 class QCompleter;
 class RoomEvent;
 class ServerInfo_Room;
-class ServerInfo_Game;
 class Event_ListGames;
 class Event_JoinRoom;
 class Event_LeaveRoom;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
index fca32094c..0f3e76c76 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
@@ -1,14 +1,20 @@
 #include "tab_server.h"
 
-#include "../interface/widgets/server/user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
 #include "tab_supervisor.h"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QInputDialog>
+#include <QMap>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QTextEdit>
+#include <QSharedPointer>
+#include <QTextBrowser>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
@@ -16,6 +22,9 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <qnamespace.h>
+
+class TabRoom;
 
 RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h
index 121ff814d..eb2f572fe 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.h
@@ -12,20 +12,21 @@
 #include <QGroupBox>
 #include <QHash>
 #include <QSet>
-#include <QTextBrowser>
-#include <QTreeWidget>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
 
 class AbstractClient;
-class QTextEdit;
-class QLabel;
-class UserListWidget;
 class QPushButton;
-
 class Event_ListRooms;
 class Event_ServerMessage;
 class Response;
 class ServerInfo_Room;
 class CommandContainer;
+class QTextBrowser;
+class QTreeWidget;
+class QWidget;
+class TabSupervisor;
 
 class RoomSelector : public QGroupBox
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index 0dc246eaa..70014ec47 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -2,14 +2,27 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../../game/abstract_game.h"
+#include "../../../game/game_event_handler.h"
+#include "../../../game/game_meta_info.h"
+#include "../../deck_loader/loaded_deck.h"
+#include "../../intents/contexts/context_connect_to_server.h"
+#include "../../intents/contexts/context_join_game.h"
+#include "../../intents/contexts/context_join_room.h"
+#include "../../intents/intent.h"
 #include "../../intents/intent_join_server_game.h"
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/server/game_link.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
+#include "abstract_tab_deck_editor.h"
 #include "api/archidekt/tab_archidekt.h"
+#include "api/edhrec/tab_edhrec.h"
 #include "api/edhrec/tab_edhrec_main.h"
+#include "latency_tracker.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
+#include "tab.h"
 #include "tab_account.h"
 #include "tab_admin.h"
 #include "tab_card_art_rules.h"
@@ -27,14 +40,31 @@
 #include "tab_room.h"
 #include "tab_server.h"
 #include "tab_visual_database_display.h"
+#include "user_level.h"
 #include "visual_deck_editor/tab_deck_editor_visual.h"
-#include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "visual_deck_storage/tab_deck_storage_visual.h"
 
+#include <QAction>
 #include <QApplication>
+#include <QCloseEvent>
+#include <QCommonStyle>
+#include <QDebug>
+#include <QFlag>
+#include <QIcon>
+#include <QListIterator>
+#include <QMapIterator>
+#include <QMenu>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QObject>
 #include <QPainter>
+#include <QRect>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <QStyle>
+#include <QStyleOption>
 #include <QSystemTrayIcon>
+#include <QTabBar>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -45,11 +75,16 @@
 #include <libcockatrice/protocol/pb/room_event.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/chat_settings.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/tabs_settings.h>
+#include <memory>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
+
+class QWidget;
 
 QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index 1a4f7f749..9c7dc48d1 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -8,29 +8,36 @@
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/server/game_link.h"
-#include "../interface/widgets/server/user/user_list_proxy.h"
-#include "abstract_tab_deck_editor.h"
-#include "api/archidekt/tab_archidekt.h"
-#include "api/edhrec/tab_edhrec.h"
-#include "api/edhrec/tab_edhrec_main.h"
-#include "tab_visual_database_display.h"
-#include "visual_deck_editor/tab_deck_editor_visual.h"
-#include "visual_deck_storage/tab_deck_storage_visual.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QAbstractButton>
+#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QMenu>
 #include <QProxyStyle>
+#include <QSize>
+#include <QString>
 #include <QTabWidget>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
+#include <qtmetamacros.h>
 
 class TabCardArtRules;
+class AbstractTabDeckEditor;
+class QAction;
+class QWidget;
+class TabArchidekt;
+class TabDeckEditorVisual;
+class TabDeckStorageVisual;
+class TabEdhRec;
+class TabEdhRecMain;
+class TabVisualDatabaseDisplay;
+struct LoadedDeck;
+
 inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
 
 class UserListManager;
-class QMenu;
 class AbstractClient;
 class Tab;
 class TabServer;
@@ -56,7 +63,6 @@ class Event_NotifyUser;
 class ServerInfo_Room;
 class ServerInfo_User;
 class GameReplay;
-class DeckList;
 
 class MacOSTabFixStyle : public QProxyStyle
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
index 3112e7ada..f4b007072 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
@@ -1,6 +1,7 @@
 #include "tab_visual_database_display.h"
 
-#include "tab_deck_editor.h"
+#include "../visual_database_display/visual_database_display_widget.h"
+#include "card_database_model.h"
 #include "tab_supervisor.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
index 3a4bcd6ea..31633f10c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
@@ -8,8 +8,14 @@
 #define TAB_VISUAL_DATABASE_DISPLAY_H
 
 #include "../interface/widgets/visual_database_display/visual_database_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 #include "tab.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class TabSupervisor;
+
 class TabVisualDatabaseDisplay : public Tab
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index 0f43893d3..be7255dc3 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -2,37 +2,53 @@
 
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../client/settings/shortcuts_settings.h"
-#include "../../cards/card_info_display_widget.h"
+#include "../../../deck_loader/loaded_deck.h"
+#include "../../deck_editor/deck_editor_card_database_dock_widget.h"
+#include "../../deck_editor/deck_editor_card_info_dock_widget.h"
+#include "../../deck_editor/deck_editor_deck_dock_widget.h"
+#include "../../deck_editor/deck_editor_filter_dock_widget.h"
+#include "../../deck_editor/deck_editor_printing_selector_dock_widget.h"
 #include "../../deck_editor/deck_state_manager.h"
 #include "../../deck_editor/deck_zone_dialog.h"
-#include "../../filters/filter_builder.h"
-#include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/cards/card_info_frame_widget.h"
 #include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
 #include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../tab_deck_editor.h"
+#include "../../menus/deck_editor_menu.h"
+#include "../../visual_database_display/visual_database_display_widget.h"
+#include "../../visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
 #include "../tab_supervisor.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "tab_deck_editor_visual_tab_widget.h"
 
 #include <QAction>
-#include <QCloseEvent>
-#include <QCompleter>
-#include <QDir>
+#include <QApplication>
+#include <QByteArray>
+#include <QDebug>
 #include <QDockWidget>
-#include <QHeaderView>
+#include <QEvent>
+#include <QFlags>
+#include <QItemSelection>
+#include <QItemSelectionModel>
 #include <QLineEdit>
+#include <QList>
+#include <QLoggingCategory>
+#include <QMainWindow>
+#include <QMap>
 #include <QMenu>
-#include <QProcessEnvironment>
-#include <QSplitter>
-#include <QTextStream>
+#include <QMessageLogger>
+#include <QModelIndex>
+#include <QMouseEvent>
+#include <QSize>
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <functional>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 
 /**
  * @brief Constructs the TabDeckEditorVisual instance.
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
index fb09578c4..f5eb9981a 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
@@ -1,8 +1,19 @@
 #ifndef WINDOW_DECKEDITORVISUAL_H
 #define WINDOW_DECKEDITORVISUAL_H
 
-#include "../tab.h"
-#include "tab_deck_editor_visual_tab_widget.h"
+#include "../abstract_tab_deck_editor.h"
+
+#include <QMouseEvent>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QDockWidget;
+class QHBoxLayout;
+class QVBoxLayout;
+class QWidget;
+class TabDeckEditorVisualTabWidget;
+class TabSupervisor;
 
 /**
  * @class TabDeckEditorVisual
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
index 5ccfcc28f..8e01ff983 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
@@ -1,7 +1,24 @@
 #include "tab_deck_editor_visual_tab_widget.h"
 
+#include "../../deck_analytics/deck_analytics_widget.h"
+#include "../../deck_analytics/deck_list_statistics_analyzer.h"
+#include "../../deck_editor/deck_editor_deck_dock_widget.h"
 #include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
+#include "../../visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
+#include "../../visual_deck_editor/visual_deck_editor_widget.h"
 #include "../abstract_tab_deck_editor.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+
+#include <QApplication>
+#include <QFlags>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <qnamespace.h>
+
+class CardDatabaseModel;
+class DeckListModel;
+class QMouseEvent;
 
 /**
  * @brief Constructs the TabDeckEditorVisualTabWidget.
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
index 4f04b51f6..fff978f42 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
@@ -1,16 +1,25 @@
 #ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
 #define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
 
-#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
-#include "../../interface/widgets/printing_selector/printing_selector.h"
-#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
-#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
-#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../abstract_tab_deck_editor.h"
+#include "libcockatrice/card/card_info.h"
 
+#include <QMouseEvent>
+#include <QString>
 #include <QTabWidget>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <qtmetamacros.h>
+
+class AbstractTabDeckEditor;
+class CardDatabaseModel;
+class DeckAnalyticsWidget;
+class DeckListModel;
+class DeckListStatisticsAnalyzer;
+class ExactCard;
+class PrintingSelector;
+class QVBoxLayout;
+class QWidget;
+class VisualDatabaseDisplayWidget;
+class VisualDeckEditorSampleHandWidget;
+class VisualDeckEditorWidget;
 
 /**
  * @class TabDeckEditorVisualTabWidget
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index 03df76b03..cb6dfab9c 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -1,23 +1,30 @@
 #include "tab_deck_storage_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
+#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/deck_color_identity.h"
 #include "../../deck_share/deck_share_utils.h"
+#include "../../deck_share/share_bar_widget.h"
 #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
+#include "../tab.h"
 #include "../tab_supervisor.h"
 
 #include <QMessageBox>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
+#include <optional>
+#include <string>
 
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)), client(_client),
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
index 7cd4e7d17..13a078fce 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
@@ -10,22 +10,18 @@
 #include "../../deck_share/share_bar_widget.h"
 #include "../tab.h"
 
+#include <QList>
+#include <QString>
 #include <QStringList>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <qtmetamacros.h>
 
 struct LoadedDeck;
-class AbstractClient;
 class CommandContainer;
-class DeckPreviewWidget;
-class QFileSystemModel;
-class QGroupBox;
 class QTimer;
-class QToolBar;
-class QTreeView;
-class QTreeWidget;
-class QTreeWidgetItem;
 class Response;
 class VisualDeckStorageWidget;
+class TabSupervisor;
 
 class TabDeckStorageVisual final : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
index 29bf2263e..8042fb9fc 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
@@ -2,18 +2,42 @@
 
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/mana_cost_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QBrush>
+#include <QChar>
+#include <QFlags>
+#include <QFont>
 #include <QFontMetrics>
 #include <QLinearGradient>
+#include <QList>
+#include <QModelIndex>
 #include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
+#include <QPen>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
+#include <QRectF>
 #include <QRegularExpression>
 #include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
+#include <QStyle>
 #include <QStyleOptionViewItem>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/printing/printing_info.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <qnamespace.h>
+
+class QObject;
+template <class T> class QSharedPointer;
 
 // ---------------------------------------------------------------------------
 // Internal colour helpers
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.h b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
index 78667f56b..ad81d86e4 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
@@ -9,10 +9,16 @@
 
 #include <QCache>
 #include <QColor>
-#include <QPixmap>
+#include <QString>
 #include <QStyledItemDelegate>
+#include <qtmetamacros.h>
 
 class CardInfo;
+class QObject;
+class QPainter;
+class QPoint;
+class QRect;
+template <class T> class QSharedPointer;
 
 /**
  * @brief Paints styled card completer popup rows.
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
index 6794ccbb4..0f1585f3c 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
@@ -2,20 +2,37 @@
 
 #include "../cards/card_info_picture_enlarged_widget.h"
 #include "card_completer_delegate.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 #include "reversed_completer_model.h"
 
+#include <QAbstractAnimation>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
+#include <QByteArray>
 #include <QCompleter>
 #include <QEvent>
+#include <QItemSelectionModel>
 #include <QKeyEvent>
+#include <QList>
 #include <QMouseEvent>
+#include <QPoint>
 #include <QPropertyAnimation>
+#include <QRect>
 #include <QScreen>
+#include <QSharedPointer>
 #include <QSize>
+#include <QString>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+template <class T> class QSharedPointer;
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.h b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
index 616e3fe61..9245c9095 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.h
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
@@ -9,6 +9,7 @@
 
 #include <QModelIndex>
 #include <QObject>
+#include <qtmetamacros.h>
 
 class CardInfoPictureEnlargedWidget;
 class QCompleter;
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
index cf98bfede..7df105d15 100644
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
@@ -1,5 +1,9 @@
 #include "compact_push_button.h"
 
+#include <QFontMetrics>
+#include <QSizePolicy>
+#include <QWidget>
+
 CompactPushButton::CompactPushButton(QWidget *parent) : QPushButton(parent)
 {
     setCheckable(true);
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.h b/cockatrice/src/interface/widgets/utility/compact_push_button.h
index b0017beee..fa8c8080a 100644
--- a/cockatrice/src/interface/widgets/utility/compact_push_button.h
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.h
@@ -1,7 +1,12 @@
 #ifndef COCKATRICE_COMPACT_PUSH_BUTTON_H
 #define COCKATRICE_COMPACT_PUSH_BUTTON_H
 
+#include <QIcon>
 #include <QPushButton>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 class CompactPushButton : public QPushButton
 {
diff --git a/cockatrice/src/interface/widgets/utility/completer_utils.cpp b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
index 23ddb30b0..53db58b70 100644
--- a/cockatrice/src/interface/widgets/utility/completer_utils.cpp
+++ b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
@@ -7,12 +7,13 @@
 #include <QLineEdit>
 #include <QObject>
 #include <QRegularExpression>
+#include <QString>
 #include <QStringListModel>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
-#include <libcockatrice/models/database/card_database_display_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 namespace
 {
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
index 05f56c275..d524041c3 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@@ -3,11 +3,17 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 
+#include <QCoreApplication>
+#include <QEvent>
+#include <QFlags>
 #include <QKeyEvent>
+#include <QKeySequence>
 #include <QLineEdit>
-#include <QObject>
+#include <QList>
+#include <QString>
 #include <QTreeView>
-#include <QWidget>
+#include <QVector>
+#include <qnamespace.h>
 
 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.h b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
index 8c389b797..4d256d3dc 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
@@ -8,6 +8,7 @@
 #define CUSTOMLINEEDIT_H
 
 #include <QLineEdit>
+#include <qtmetamacros.h>
 
 class QTreeView;
 class QKeyEvent;
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
index 134352eb3..1a1bc924d 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
@@ -2,6 +2,8 @@
 
 #include <QInputDialog>
 
+class QWidget;
+
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
                        const QString &label,
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.h b/cockatrice/src/interface/widgets/utility/get_text_with_max.h
index 424bb0c6a..f1c89c703 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.h
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.h
@@ -8,8 +8,11 @@
 #define GETTEXTWITHMAX_H
 
 #include <QLineEdit>
-#include <QWidget>
+#include <QString>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
index 3a678029d..38e3e4350 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
@@ -1,8 +1,16 @@
 #include "line_edit_completer.h"
 
 #include <QAbstractItemView>
+#include <QChar>
+#include <QCompleter>
 #include <QFocusEvent>
 #include <QKeyEvent>
+#include <QModelIndex>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QWidget;
 
 LineEditCompleter::LineEditCompleter(QWidget *parent) : LineEditUnfocusable(parent)
 {
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
index 369b7b553..c141682bf 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
@@ -10,12 +10,12 @@
 
 #include "custom_line_edit.h"
 
-#include <QCompleter>
-#include <QFocusEvent>
-#include <QKeyEvent>
 #include <QList>
 #include <QString>
-#include <QVector>
+#include <qtmetamacros.h>
+
+class QCompleter;
+class QWidget;
 
 enum class CompleterTrigger
 {
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.cpp b/cockatrice/src/interface/widgets/utility/report_utils.cpp
index aa4558e5c..a581c9837 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.cpp
+++ b/cockatrice/src/interface/widgets/utility/report_utils.cpp
@@ -1,12 +1,20 @@
 #include "report_utils.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
+
 #include <QApplication>
 #include <QBrush>
+#include <QChar>
+#include <QColor>
 #include <QDateTime>
 #include <QPalette>
+#include <QSharedPointer>
 #include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QTextCursor>
 #include <QTextEdit>
+#include <qnamespace.h>
+#include <string>
 
 namespace report_utils
 {
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.h b/cockatrice/src/interface/widgets/utility/report_utils.h
index c6cc96c18..679989486 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.h
+++ b/cockatrice/src/interface/widgets/utility/report_utils.h
@@ -2,10 +2,11 @@
 #define REPORT_UTILS_H
 
 #include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
+#include <QtGlobal>
 
 class QTableWidget;
 class QTextEdit;
+class ServerInfo_Report;
 
 namespace report_utils
 {
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
index 1bc9ba14b..3702798fd 100644
--- a/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
@@ -1,7 +1,10 @@
 #include "reversed_completer_model.h"
 
 #include <QAbstractItemModel>
+#include <QDebug>
+#include <QList>
 #include <QModelIndex>
+#include <QPersistentModelIndex>
 #include <QVariant>
 
 void ReversedCompleterModel::setSourceModel(QAbstractItemModel *sourceModel)
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.h b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
index 64233a1b0..cf4b44974 100644
--- a/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
@@ -8,8 +8,8 @@
 #define REVERSED_COMPLETER_MODEL_H
 
 #include <QAbstractProxyModel>
-
-class QAbstractItemModel;
+#include <QModelIndex>
+#include <qnamespace.h>
 
 /**
  * @brief A completer model that can present its rows bottom-to-top.
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
index 06561a41d..e92287c9a 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
@@ -4,8 +4,16 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../pixel_map_generator.h"
 
+#include <QChar>
+#include <QEvent>
+#include <QFlags>
 #include <QHBoxLayout>
 #include <QKeyEvent>
+#include <QLineEdit>
+#include <QList>
+#include <QPoint>
+#include <QPushButton>
+#include <QStringLiteral>
 #include <QToolTip>
 
 SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h
index 28e18d42f..0cdd48ceb 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.h
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.h
@@ -7,10 +7,15 @@
 #ifndef SEQUENCEEDIT_H
 #define SEQUENCEEDIT_H
 
-#include <QEvent>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QKeySequence>
+#include <QString>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QKeyEvent;
+class QLineEdit;
+class QPushButton;
 
 class SequenceEdit : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
index 10928caf6..f154918d6 100644
--- a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
+++ b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
@@ -2,6 +2,9 @@
 #define COCKATRICE_VISIBILITY_LISTENER_H
 
 #include <QObject>
+#include <qtmetamacros.h>
+
+class QWidget;
 
 /**
  * @brief This filter listens to the visibility changes of a target widget, emitting signals whenever the visibility of
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
index 57c6da762..cf815ace0 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
@@ -1,8 +1,19 @@
 #include "visual_database_display_color_filter_widget.h"
 
 #include "../cards/additional_info/mana_symbol_widget.h"
+#include "filter_tree_model.h"
+#include "libcockatrice/filters/filter_card.h"
 
+#include <QAbstractItemModel>
+#include <QComboBox>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QPersistentModelIndex>
+#include <QSharedPointer>
+#include <QString>
 #include <QTimer>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/filters/filter_tree.h>
 
 /**
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
index 497d25fce..38812b02a 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
@@ -7,11 +7,16 @@
 #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-
-#include <QComboBox>
-#include <QHBoxLayout>
+#include <QByteArray>
+#include <QChar>
+#include <QList>
+#include <QMetaType>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class QComboBox;
+class QHBoxLayout;
 
 class VisualDatabaseDisplayColorFilterCircleWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
index 76a611d52..fd005b315 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
@@ -1,13 +1,28 @@
 #include "visual_database_display_filter_save_load_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "filter_tree_model.h"
+#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_filter_display_widget.h"
 
-#include <QHBoxLayout>
+#include <QByteArray>
+#include <QChar>
+#include <QDir>
+#include <QFile>
+#include <QIODevice>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QVBoxLayout>
 #include <libcockatrice/filters/filter_tree.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qnamespace.h>
 
 VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
index 459633e42..ea8a0ed6b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.h
@@ -7,17 +7,19 @@
 #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QFile>
-#include <QFileDialog>
-#include <QJsonObject>
-#include <QLineEdit>
+#include <QList>
 #include <QMap>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QPair>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLineEdit;
+class QPushButton;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayFilterSaveLoadWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
index a59a068dd..3e9d9e525 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -2,9 +2,36 @@
 
 #include "../../pixel_map_generator.h"
 #include "../deck_editor/card_database_view.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "card_database_display_model.h"
+#include "visual_database_display_filter_save_load_widget.h"
+#include "visual_database_display_format_legality_filter_widget.h"
+#include "visual_database_display_main_type_filter_widget.h"
+#include "visual_database_display_name_filter_widget.h"
+#include "visual_database_display_set_filter_widget.h"
+#include "visual_database_display_sub_type_filter_widget.h"
 #include "visual_database_display_widget.h"
 
+#include <QAbstractItemView>
+#include <QComboBox>
 #include <QGroupBox>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QLayout>
+#include <QList>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QSize>
+#include <QSizePolicy>
+#include <QString>
+#include <QStringLiteral>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class DeckListModel;
 
 VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *_parent,
                                                                                    DeckListModel *deckListModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
index 8a3555455..f97310c1b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
@@ -1,14 +1,22 @@
 #ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
 #define COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
 
-#include "visual_database_display_filter_save_load_widget.h"
-#include "visual_database_display_format_legality_filter_widget.h"
-#include "visual_database_display_main_type_filter_widget.h"
-#include "visual_database_display_name_filter_widget.h"
-#include "visual_database_display_set_filter_widget.h"
-#include "visual_database_display_sub_type_filter_widget.h"
+#include "../general/layout_containers/flow_widget.h"
+
+#include <qtmetamacros.h>
 
 class VisualDatabaseDisplayWidget;
+class DeckListModel;
+class QComboBox;
+class QGroupBox;
+class QLabel;
+class SettingsButtonWidget;
+class VisualDatabaseDisplayFilterSaveLoadWidget;
+class VisualDatabaseDisplayFormatLegalityFilterWidget;
+class VisualDatabaseDisplayMainTypeFilterWidget;
+class VisualDatabaseDisplayNameFilterWidget;
+class VisualDatabaseDisplaySetFilterWidget;
+class VisualDatabaseDisplaySubTypeFilterWidget;
 
 class VisualDatabaseDisplayFilterToolbarWidget : public FlowWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
index 633f07af7..a5725ff3f 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
@@ -1,14 +1,29 @@
 #include "visual_database_display_format_legality_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QPersistentModelIndex>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
+#include <limits>
+#include <qnamespace.h>
 
 VisualDatabaseDisplayFormatLegalityFilterWidget::VisualDatabaseDisplayFormatLegalityFilterWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
index 1b1a1382e..e94593e67 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
@@ -1,16 +1,17 @@
 #ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
 #define COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLabel>
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayFormatLegalityFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
index c44489c1b..eff0fe10b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
@@ -1,14 +1,27 @@
 #include "visual_database_display_main_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QPersistentModelIndex>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
+#include <qnamespace.h>
 
 VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
index 6dec58319..b5a6f332c 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
@@ -7,15 +7,17 @@
 #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLabel>
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayMainTypeFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
index 3fa1a782a..d3e497b21 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
@@ -1,11 +1,26 @@
 #include "visual_database_display_name_filter_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../deck_editor/deck_state_manager.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "deck_list_model.h"
+#include "filter_tree_model.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/filters/filter_card.h"
+#include "libcockatrice/filters/filter_tree.h"
 #include "visual_database_display_filter_button.h"
 
-#include <QHBoxLayout>
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QLineEdit>
+#include <QList>
+#include <QPersistentModelIndex>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <algorithm>
+#include <qnamespace.h>
 
 VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
                                                                              FilterTreeModel *_filterModel,
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
index 0c10408ae..1629cb93b 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
@@ -7,14 +7,17 @@
 #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLineEdit>
 #include <QMap>
-#include <QPushButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckListModel;
+class FilterTreeModel;
+class FlowWidget;
+class QLineEdit;
+class QPushButton;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayNameFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
index 358c3ed88..3d76fb78a 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@@ -2,15 +2,35 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/card/set/card_set_list.h"
+#include "libcockatrice/filters/filter_card.h"
+#include "libcockatrice/utility/macros.h"
 #include "visual_database_display_filter_button.h"
 
+#include <QAbstractItemModel>
+#include <QCheckBox>
+#include <QDateTime>
+#include <QDebug>
+#include <QHBoxLayout>
 #include <QLineEdit>
+#include <QList>
+#include <QPersistentModelIndex>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSpinBox>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <algorithm>
+#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
index bcc5e93c2..468e97e0d 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
@@ -7,16 +7,19 @@
 #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QCheckBox>
-#include <QLineEdit>
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QCheckBox;
+class QHBoxLayout;
+class QLineEdit;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayRecentSetFilterSettingsWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
index 6d4bcb58e..705bb8efa 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
@@ -1,15 +1,28 @@
 #include "visual_database_display_sub_type_filter_widget.h"
 
 #include "../../../filters/filter_tree_model.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/filters/filter_card.h"
 #include "visual_database_display_filter_button.h"
 
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QList>
+#include <QPersistentModelIndex>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
 #include <QSpinBox>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_tree.h>
+#include <qnamespace.h>
 
 VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent,
                                                                                    FilterTreeModel *_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
index d713c7f99..7929063fd 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
@@ -7,14 +7,18 @@
 #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLabel>
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplaySubTypeFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index 6e0fee53f..599ac97b4 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
@@ -3,21 +3,52 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../../filters/syntax_help.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
+#include "../cards/card_info_picture_widget.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../cards/card_size_widget.h"
 #include "../deck_editor/card_database_view.h"
+#include "../general/layout_containers/flow_widget.h"
 #include "../utility/custom_line_edit.h"
+#include "card_database_display_model.h"
+#include "card_database_model.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/filters/filter_card.h"
+#include "libcockatrice/filters/filter_tree.h"
 #include "visual_database_display_color_filter_widget.h"
-#include "visual_database_display_filter_save_load_widget.h"
-#include "visual_database_display_main_type_filter_widget.h"
-#include "visual_database_display_name_filter_widget.h"
-#include "visual_database_display_set_filter_widget.h"
-#include "visual_database_display_sub_type_filter_widget.h"
+#include "visual_database_display_filter_toolbar_widget.h"
 
-#include <QHeaderView>
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QDebug>
+#include <QIcon>
+#include <QLabel>
+#include <QLineEdit>
+#include <QList>
+#include <QMessageLogger>
+#include <QModelIndex>
+#include <QPair>
+#include <QPersistentModelIndex>
+#include <QPushButton>
+#include <QScrollArea>
 #include <QScrollBar>
-#include <QShowEvent>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QSlider>
+#include <QStringLiteral>
 #include <QStyledItemDelegate>
+#include <QTimer>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -25,6 +56,8 @@
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <utility>
 
+class QMouseEvent;
+
 VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
                                                          CardDatabaseModel *database_model,
                                                          DeckListModel *deckListModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
index d161ce362..9771e55c1 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
@@ -7,25 +7,38 @@
 #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
-#include "../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../cards/card_size_widget.h"
-#include "../general/layout_containers/flow_widget.h"
-#include "../general/layout_containers/overlap_control_widget.h"
-#include "../utility/custom_line_edit.h"
-#include "visual_database_display_color_filter_widget.h"
-#include "visual_database_display_filter_toolbar_widget.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QLoggingCategory>
-#include <QVBoxLayout>
-#include <QWheelEvent>
+#include <QMouseEvent>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <functional>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qscrollarea.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class CardDatabaseDisplayModel;
+class CardDatabaseModel;
+class CardDatabaseView;
+class CardSizeWidget;
+class DeckList;
+class DeckListModel;
+class ExactCard;
+class FilterTreeModel;
+class FlowWidget;
+class OverlapControlWidget;
+class QLabel;
+class QModelIndex;
+class QPushButton;
+class QScrollArea;
+class QTimer;
+class QToolButton;
+class QVBoxLayout;
+class SearchLineEdit;
+class VisualDatabaseDisplayColorFilterWidget;
+class VisualDatabaseDisplayFilterToolbarWidget;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");
 
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
index bb5b333d9..0f6ac51ec 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
@@ -2,13 +2,18 @@
 
 #include "../../../client/settings/cache_settings.h"
 
+#include <QChar>
 #include <QDir>
 #include <QFile>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMessageBox>
+#include <QMouseEvent>
 #include <QPushButton>
+#include <QSize>
+#include <QSizePolicy>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qnamespace.h>
 
 FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel)
     : QWidget(parent), filterFilename(filename), filterModel(_filterModel)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
index 5fe29fa2d..6d051bcf7 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
@@ -7,12 +7,12 @@
 #ifndef VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_FILTER_DISPLAY_WIDGET_H
 
-#include <QMouseEvent>
-#include <QPushButton>
 #include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class FilterTreeModel;
+class QPushButton;
 
 class FilterDisplayWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
index 28abe480e..25ba41aa9 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
@@ -1,9 +1,27 @@
 #include "visual_deck_display_options_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "../deck_editor/deck_editor_deck_dock_widget.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
+#include "../utility/compact_push_button.h"
+#include "deck_list_model.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QComboBox>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QtGlobal>
 #include <libcockatrice/utility/qt_utils.h>
+#include <qnamespace.h>
 
 VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
index bc11884df..96600c587 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
@@ -3,12 +3,18 @@
 
 #include "visual_deck_editor_widget.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QPushButton>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class CompactPushButton;
+class QComboBox;
+class QHBoxLayout;
+class QLabel;
+class QListWidget;
+class SettingsButtonWidget;
 
 /**
  * @class VisualDeckDisplayOptionsWidget
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
index da4fe09e5..76c3d0908 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
@@ -1,5 +1,9 @@
 #include "visual_deck_editor_placeholder_widget.h"
 
+#include <QLabel>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
 VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *parent) : QWidget(parent)
 {
     mainLayout = new QVBoxLayout(this);
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
index de2362a81..84a3142d8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
@@ -1,9 +1,11 @@
 #ifndef COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
 #define COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
 
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
 
 class VisualDeckEditorPlaceholderWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
index cee268228..1554dceb8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
@@ -1,16 +1,37 @@
 #include "visual_deck_editor_sample_hand_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.h"
 #include "../cards/card_info_picture_widget.h"
+#include "../cards/card_size_widget.h"
 #include "../deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h"
-#include "../deck_analytics/deck_list_statistics_analyzer.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "deck_list_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QSlider>
+#include <QSpinBox>
 #include <QSplitter>
+#include <QString>
+#include <QVBoxLayout>
+#include <QtGlobal>
+#include <algorithm>
+#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 #include <random>
 
+class DeckListStatisticsAnalyzer;
+
 VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
                                                                    DeckListStatisticsAnalyzer *_statsAnalyzer)
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
index c6c07dd55..16f343b75 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h
@@ -7,16 +7,22 @@
 #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 
-#include "../cards/card_size_widget.h"
-#include "../deck_analytics/deck_list_statistics_analyzer.h"
-#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QPushButton>
-#include <QSpinBox>
+#include <QList>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
 
 class DrawProbabilityWidget;
+class CardSizeWidget;
+class DeckListModel;
+class DeckListStatisticsAnalyzer;
+class FlowWidget;
+class QHBoxLayout;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
+
 class VisualDeckEditorSampleHandWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
index 60e354d6e..74b940586 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
@@ -1,33 +1,48 @@
 #include "visual_deck_editor_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../main.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../../layouts/overlap_layout.h"
 #include "../../pixel_map_generator.h"
-#include "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../cards/card_size_widget.h"
 #include "../cards/deck_card_zone_display_widget.h"
 #include "../general/layout_containers/flow_widget.h"
-#include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
-#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "../utility/compact_push_button.h"
 #include "../utility/completer_utils.h"
+#include "card/card_completer_proxy_model.h"
+#include "card_database_display_model.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 #include "visual_deck_display_options_widget.h"
+#include "visual_deck_editor_placeholder_widget.h"
 
-#include <QCheckBox>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QCompleter>
+#include <QDebug>
 #include <QHBoxLayout>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QLayout>
 #include <QLineEdit>
+#include <QList>
+#include <QModelIndex>
 #include <QPushButton>
-#include <QResizeEvent>
+#include <QRegularExpression>
+#include <QScrollArea>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSortFilterProxyModel>
+#include <QStringLiteral>
 #include <QTimer>
-#include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/card/database/card_database.h>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <qscrollarea.h>
+#include <qnamespace.h>
 
 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
index cc045fca2..0b8ff19fb 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
@@ -7,26 +7,35 @@
 #ifndef VISUAL_DECK_EDITOR_H
 #define VISUAL_DECK_EDITOR_H
 
-#include "../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../cards/card_size_widget.h"
-#include "../general/layout_containers/overlap_control_widget.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "../utility/compact_push_button.h"
-#include "visual_deck_editor_placeholder_widget.h"
-
-#include <QCheckBox>
-#include <QListWidget>
-#include <QPushButton>
+#include <QHash>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qscrollarea.h>
+#include <qtmetamacros.h>
 
 class VisualDeckDisplayOptionsWidget;
 class DeckCardZoneDisplayWidget;
+class CardCompleterProxyModel;
+class CardDatabaseDisplayModel;
+class CardDatabaseModel;
+class CardSizeWidget;
+class CompactPushButton;
+class DeckList;
+class DeckListModel;
+class ExactCard;
+class FlowWidget;
+class QCompleter;
+class QHBoxLayout;
+class QItemSelection;
+class QItemSelectionModel;
+class QLineEdit;
+class QModelIndex;
+class QScrollArea;
+class QVBoxLayout;
+class VisualDeckEditorPlaceholderWidget;
+
 enum class DisplayType
 {
     Flat,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
index d1a780c38..1ac4c856c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -1,8 +1,13 @@
 #include "deck_preview_color_identity_filter_widget.h"
 
 #include "../../cards/additional_info/mana_symbol_widget.h"
+#include "../visual_deck_storage_sort_filter_proxy_model.h"
 
+#include <QHBoxLayout>
+#include <QPushButton>
 #include <QSet>
+#include <QSharedPointer>
+#include <QString>
 
 DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent)
     : QWidget(parent), layout(new QHBoxLayout(this))
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
index d54984bcf..e0c90034c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
@@ -8,11 +8,14 @@
 
 #include "../visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QHBoxLayout>
+#include <QChar>
 #include <QMap>
-#include <QPushButton>
 #include <QSet>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QPushButton;
 
 class DeckPreviewColorIdentityFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
index 41d87ccb1..dc619e9fa 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@@ -1,15 +1,23 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
+#include "../../../deck_loader/loaded_deck.h"
 #include "../../general/layout_containers/flow_widget.h"
 #include "deck_preview_tag_addition_widget.h"
 #include "deck_preview_tag_dialog.h"
 #include "deck_preview_tag_display_widget.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QDialog>
+#include <QDir>
 #include <QDirIterator>
 #include <QHBoxLayout>
+#include <QSizePolicy>
 #include <libcockatrice/settings/paths_settings.h>
+#include <optional>
+#include <qnamespace.h>
 
 DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags)
     : QWidget(_parent), currentTags(_tags)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
index 64bd5aa1a..a12f6ec3c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h
@@ -6,9 +6,12 @@
 #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 
+#include <QList>
+#include <QString>
 #include <QStringList>
 #include <QWidget>
 #include <functional>
+#include <qtmetamacros.h>
 
 class FlowWidget;
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
index fdf4b2a28..82ed6191c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@@ -1,12 +1,19 @@
 #include "deck_preview_tag_addition_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
+#include <QFont>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <algorithm>
+#include <qnamespace.h>
 #include <utility>
 
 DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
index 7a3a735a2..30ce46249 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
@@ -7,7 +7,9 @@
 #ifndef DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 #define DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 
-#include "deck_preview_deck_tags_display_widget.h"
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
 
 class DeckPreviewTagAdditionWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
index f27d11d36..2a6a42e9d 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
@@ -8,10 +8,17 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QMessageBox>
+#include <QObject>
 #include <QPushButton>
+#include <QSharedPointer>
 #include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
                                            const QStringList &_activeTags,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
index 4d9040af4..80d5560a0 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
@@ -9,10 +9,18 @@
 #define DECK_PREVIEW_TAG_DIALOG_H
 
 #include <QDialog>
-#include <QLabel>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QVBoxLayout;
+class QWidget;
 
 class DeckPreviewTagDialog : public QDialog
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
index a7fef5031..e62570241 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
@@ -1,9 +1,19 @@
 #include "deck_preview_tag_display_widget.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QFlags>
+#include <QFont>
 #include <QFontMetrics>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <algorithm>
+#include <qnamespace.h>
 
 DeckPreviewTagDisplayWidget::DeckPreviewTagDisplayWidget(QWidget *parent, const QString &_tagName)
     : QWidget(parent), tagName(_tagName), state(TagState::NotSelected)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
index df2a6b404..d3f5e7326 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
@@ -7,10 +7,12 @@
 #ifndef DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 
-#include <QLabel>
-#include <QPushButton>
 #include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QPushButton;
 
 enum class TagState
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
index d9ea9fc30..7796f893b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
@@ -1,5 +1,8 @@
 #include "deck_preview_tag_item_widget.h"
 
+#include <QCheckBox>
+#include <QHBoxLayout>
+
 DeckPreviewTagItemWidget::DeckPreviewTagItemWidget(const QString &tagName, bool isChecked, QWidget *parent)
     : QWidget(parent), checkBox_(new QCheckBox(this))
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
index a3301799a..a09eb7501 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
@@ -7,9 +7,11 @@
 #ifndef DECK_PREVIEW_TAG_ITEM_WIDGET_H
 #define DECK_PREVIEW_TAG_ITEM_WIDGET_H
 
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QCheckBox;
 
 class DeckPreviewTagItemWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
index 53fe32314..220c55788 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -3,26 +3,51 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
 #include "../../../deck_loader/deck_loader.h"
+#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
+#include "../visual_deck_storage_model.h"
 #include "../visual_deck_storage_quick_settings_widget.h"
 #include "../visual_deck_storage_tag_filter_widget.h"
 #include "../visual_deck_storage_widget.h"
 #include "deck_preview_deck_tags_display_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/utility/card_ref.h"
 
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QCursor>
+#include <QDebug>
 #include <QFileInfo>
 #include <QFrame>
 #include <QInputDialog>
 #include <QLabel>
+#include <QLineEdit>
 #include <QMenu>
 #include <QMessageBox>
+#include <QModelIndex>
 #include <QMouseEvent>
+#include <QPair>
+#include <QRect>
 #include <QSet>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QStandardItem>
 #include <QStandardItemModel>
+#include <QStringLiteral>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
+#include <compare>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
+#include <utility>
 
 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
                                      VisualDeckStorageWidget *_visualDeckStorageWidget,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
index f4909eda8..cdeed87c7 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
@@ -6,17 +6,18 @@
 #ifndef DECK_PREVIEW_WIDGET_H
 #define DECK_PREVIEW_WIDGET_H
 
-#include "../../cards/deck_preview_card_picture_widget.h"
-#include "../visual_deck_storage_model.h"
-
 #include <QAbstractItemView>
+#include <QAbstractScrollArea>
 #include <QApplication>
 #include <QComboBox>
 #include <QEvent>
-#include <QVBoxLayout>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
 
-class QEnterEvent;
 class QFrame;
 class QLabel;
 class QMenu;
@@ -26,6 +27,8 @@ class DeckPreviewCardPictureWidget;
 class DeckPreviewDeckTagsDisplayWidget;
 class VisualDeckStorageModel;
 class VisualDeckStorageWidget;
+class QVBoxLayout;
+struct LoadedDeck;
 
 class DeckPreviewWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
index b49d6f9f4..361747423 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
@@ -4,15 +4,19 @@
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "../../general/layout_containers/flow_widget.h"
+#include "../remote_public_decks_model.h"
 #include "deck_preview_tag_display_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/card_ref.h"
 
+#include <QDateTime>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QMouseEvent>
-#include <QResizeEvent>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 PublicDeckPreviewWidget::PublicDeckPreviewWidget(QWidget *parent, const RemotePublicDecksModel::DeckEntry &entry)
     : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
index a0e5dd43a..103120c7f 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
@@ -9,16 +9,15 @@
 #include "../remote_public_decks_model.h"
 
 #include <QList>
+#include <QMouseEvent>
 #include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class ColorIdentityWidget;
 class DeckPreviewCardPictureWidget;
 class FlowWidget;
-class QKeyEvent;
 class QLabel;
-class QMouseEvent;
-class QResizeEvent;
 
 /**
  * @brief A preview tile for a public deck published by another user.
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
index a1cabd729..9b8daf87c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
@@ -3,7 +3,10 @@
 #include "../../../client/settings/cache_settings.h"
 
 #include <QTimer>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_list_other_user.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -11,6 +14,9 @@
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/network_settings.h>
+#include <string>
+
+class QObject;
 
 RemotePublicDecksModel::RemotePublicDecksModel(AbstractClient *_client, QObject *parent)
     : QAbstractListModel(parent), client(_client)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
index eeb606442..cb1f786e4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
@@ -9,10 +9,15 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include <QAbstractListModel>
+#include <QChar>
 #include <QDateTime>
 #include <QList>
+#include <QModelIndex>
 #include <QSet>
+#include <QString>
 #include <QStringList>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class CommandContainer;
@@ -20,6 +25,7 @@ class QTimer;
 class Response;
 class ServerInfo_DeckStorage_Folder;
 class ServerInfo_DeckStorage_TreeItem;
+class QObject;
 
 /**
  * @brief Flat, read-only list of the public decks published by another user.
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
index 53f21d1a1..44b7a1a06 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@@ -2,6 +2,7 @@
 
 #include "../cards/card_info_picture_widget.h"
 #include "../cards/card_size_widget.h"
+#include "../cards/deck_preview_card_picture_widget.h"
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "deck_preview/deck_preview_widget.h"
@@ -10,10 +11,20 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 #include "visual_deck_storage_widget.h"
 
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QDebug>
 #include <QElapsedTimer>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QModelIndex>
+#include <QPersistentModelIndex>
 #include <QSet>
+#include <QSharedPointer>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <qnamespace.h>
 
 VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
     QWidget *parent,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
index 5a81457b0..998619c0b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
@@ -17,9 +17,12 @@
 #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 
 #include <QHash>
+#include <QList>
 #include <QSet>
 #include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class BannerWidget;
 class DeckPreviewWidget;
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
index daca55fc8..e84631e52 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
@@ -1,19 +1,32 @@
 #include "visual_deck_storage_model.h"
 
+#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QChar>
 #include <QDir>
 #include <QDirIterator>
 #include <QElapsedTimer>
 #include <QFile>
 #include <QFileInfo>
 #include <QFutureWatcher>
+#include <QMetaObject>
+#include <QMetaType>
 #include <QSet>
+#include <QSharedPointer>
+#include <QVariant>
 #include <QtConcurrentRun>
+#include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <optional>
 #include <utility>
 
+class QObject;
+
 namespace
 {
 /**
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
index 330205356..57eaebacf 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
@@ -14,14 +14,20 @@
 #define VISUAL_DECK_STORAGE_MODEL_H
 
 #include "../../deck_loader/loaded_deck.h"
+#include "libcockatrice/utility/card_ref.h"
 
 #include <QAbstractListModel>
 #include <QDateTime>
 #include <QHash>
 #include <QList>
+#include <QModelIndex>
+#include <QString>
 #include <QStringList>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <optional>
+#include <QVector>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 namespace VisualDeckStorageRoles
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
index c19ac0fec..9bb6e0fae 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
@@ -2,14 +2,23 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../cards/card_size_widget.h"
-#include "visual_deck_storage_widget.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "libcockatrice/utility/macros.h"
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSlider>
 #include <QSpinBox>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent)
     : SettingsButtonWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
index a85e9e654..7bce34d8c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
@@ -11,11 +11,14 @@
 
 #include "../quick_settings/settings_button_widget.h"
 
+#include <qtmetamacros.h>
+
 class CardSizeWidget;
 class QLabel;
 class QSpinBox;
 class QCheckBox;
 class QComboBox;
+class QWidget;
 
 class VisualDeckStorageQuickSettingsWidget : public SettingsButtonWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
index 406527893..2c03666c1 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
@@ -4,6 +4,10 @@
 #include "../../pixel_map_generator.h"
 
 #include <QAction>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QStringLiteral>
 #include <QTimer>
 
 /**
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
index 7769ea911..87a8dc9f8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
@@ -6,11 +6,13 @@
 #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 
-#include <QHBoxLayout>
-#include <QLineEdit>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QTimer;
+class QHBoxLayout;
+class QLineEdit;
 
 class VisualDeckStorageSearchWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
index 0ad6ebcb2..abe3327af 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
@@ -1,10 +1,20 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/loaded_deck.h"
 #include "../../filters/deck_filter_string.h"
+#include "visual_deck_storage_model.h"
 
+#include <QAbstractItemModel>
+#include <QDateTime>
 #include <QFileInfo>
+#include <QModelIndex>
+#include <QObject>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QVariant>
 #include <algorithm>
+#include <compare>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
index a6c40a2d7..51732adc8 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
@@ -15,11 +15,15 @@
 #ifndef VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
 #define VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
 
-#include "visual_deck_storage_model.h"
-
+#include <QChar>
+#include <QList>
 #include <QSet>
 #include <QSortFilterProxyModel>
 #include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+class VisualDeckStorageModel;
 
 class VisualDeckStorageSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
index 6289a4941..f798a72a9 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
@@ -3,6 +3,9 @@
 #include "../../../client/settings/cache_settings.h"
 #include "visual_deck_storage_widget.h"
 
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent) : QWidget(parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
index 633924d84..df3f39eb5 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
@@ -8,11 +8,13 @@
 
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class VisualDeckStorageWidget;
+class QComboBox;
+class QHBoxLayout;
+
 class VisualDeckStorageSortWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
index 6f954b01b..d6b7aedbb 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
@@ -4,6 +4,13 @@
 #include "deck_preview/deck_preview_tag_display_widget.h"
 
 #include <QHBoxLayout>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
+#include <algorithm>
+#include <compare>
+#include <qnamespace.h>
 
 VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
index 5e3cb398c..13a27c10a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
@@ -6,13 +6,16 @@
 #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 
-#include <QSet>
+#include <QList>
 #include <QStringList>
 #include <QWidget>
 #include <functional>
+#include <qtmetamacros.h>
 
 class DeckPreviewTagDisplayWidget;
 class FlowWidget;
+class QString;
+template <class T> class QSet;
 
 class VisualDeckStorageTagFilterWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index c7218f195..51e9c70e7 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -2,22 +2,38 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
-#include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
 #include "visual_deck_storage_folder_display_widget.h"
+#include "visual_deck_storage_model.h"
 #include "visual_deck_storage_quick_settings_widget.h"
 #include "visual_deck_storage_search_widget.h"
+#include "visual_deck_storage_sort_filter_proxy_model.h"
 #include "visual_deck_storage_sort_widget.h"
 #include "visual_deck_storage_tag_filter_widget.h"
 
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QDebug>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QList>
+#include <QModelIndex>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QStringLiteral>
 #include <QTimer>
+#include <QToolButton>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <qnamespace.h>
 
 VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
index dfb715bea..b512dd87c 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -6,18 +6,13 @@
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
-#include "visual_deck_storage_model.h"
-#include "visual_deck_storage_sort_filter_proxy_model.h"
-
-#include <QHBoxLayout>
-#include <QScrollArea>
-#include <QToolButton>
-#include <QVBoxLayout>
+#include <QSet>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QResizeEvent;
-class QShowEvent;
 class QTimer;
 class DeckPreviewColorIdentityFilterWidget;
 class VisualDeckStorageFolderDisplayWidget;
@@ -25,6 +20,13 @@ class VisualDeckStorageQuickSettingsWidget;
 class VisualDeckStorageSearchWidget;
 class VisualDeckStorageSortWidget;
 class VisualDeckStorageTagFilterWidget;
+class QHBoxLayout;
+class QScrollArea;
+class QToolButton;
+class QVBoxLayout;
+class VisualDeckStorageModel;
+class VisualDeckStorageSortFilterProxyModel;
+struct LoadedDeck;
 
 class VisualDeckStorageWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 77cc85130..889e81bfe 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -21,7 +21,6 @@
 
 #include "../client/latency_status_widget.h"
 #include "../client/network/update/client/client_update_checker.h"
-#include "../client/network/update/client/release_channel.h"
 #include "../client/settings/cache_settings.h"
 #include "../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/dialogs/dlg_edit_tokens.h"
@@ -34,50 +33,63 @@
 #include "../interface/widgets/dialogs/dlg_view_log.h"
 #include "../interface/widgets/onboarding/first_run_wizard.h"
 #include "../interface/widgets/settings_page/general_settings_page.h"
-#include "../interface/widgets/tabs/tab_game.h"
 #include "../interface/widgets/tabs/tab_server.h"
 #include "../interface/widgets/tabs/tab_supervisor.h"
 #include "../main.h"
+#include "abstract_client.h"
 #include "intents/contexts/context_connect_to_server.h"
 #include "intents/contexts/context_join_room.h"
+#include "intents/intent.h"
 #include "intents/intent_connect_to_server.h"
 #include "intents/intent_login.h"
 #include "intents/intent_open_server_room_by_name.h"
 #include "intents/url_parser.h"
+#include "latency_tracker.h"
 #include "logger.h"
 #include "pixel_map_generator.h"
 #include "version_string.h"
 #include "widgets/dialogs/dlg_connect.h"
 #include "widgets/server/handle_public_servers.h"
+#include "widgets/settings_page/abstract_settings_page.h"
 #include "widgets/tabs/api/commander_spellbook/handle_commander_brackets.h"
-#include "widgets/utility/get_text_with_max.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QCloseEvent>
 #include <QDateTime>
+#include <QDebug>
 #include <QDesktopServices>
+#include <QDialog>
+#include <QEvent>
 #include <QFile>
 #include <QFileDialog>
-#include <QLabel>
+#include <QFileInfo>
+#include <QFlags>
+#include <QIODevice>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QObject>
+#include <QPixmap>
 #include <QPixmapCache>
+#include <QPushButton>
+#include <QSharedPointer>
 #include <QStatusBar>
+#include <QStringLiteral>
 #include <QSystemTrayIcon>
-#include <QThread>
 #include <QTimer>
-#include <QWindow>
-#include <QtConcurrent>
-#include <QtNetwork>
+#include <QWidget>
+#include <QtConcurrentRun>
+#include <QtGlobal>
+#include <functional>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/local/local_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/network/server/local/local_server.h>
-#include <libcockatrice/network/server/local/local_server_interface.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
@@ -91,6 +103,13 @@
 #include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/settings/tabs_settings.h>
 #include <libcockatrice/settings/updates_settings.h>
+#include <memory>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <tuple>
+#include <utility>
+
+class LocalServerInterface;
 
 #define GITHUB_PAGES_URL "https://cockatrice.github.io"
 #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors"
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index 1c4dde300..5223332a0 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -26,16 +26,26 @@
 #define WINDOW_H
 
 #include "../client/lag_monitor.h"
+#include "../client/network/update/client/release_channel.h"
 #include "connection_controller/remote_connection_controller.h"
-#include "widgets/dialogs/dlg_local_game_options.h"
 
+#include <QByteArray>
+#include <QDir>
 #include <QList>
+#include <QLoggingCategory>
 #include <QMainWindow>
-#include <QMessageBox>
-#include <QSystemTrayIcon>
-#include <QtNetwork>
+#include <QMenu>
+#include <QProcess>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <qtmetamacros.h>
+
+class QAction;
+class QWidget;
+struct LocalGameOptions;
 
 inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
 inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup");
@@ -43,18 +53,11 @@ inline Q_LOGGING_CATEGORY(WindowMainStartupVersionLog, "window_main.startup.vers
 inline Q_LOGGING_CATEGORY(WindowMainStartupShortcutsLog, "window_main.startup.shortcuts");
 inline Q_LOGGING_CATEGORY(WindowMainStartupAutoconnectLog, "window_main.startup.autoconnect");
 
-class Release;
-class DlgConnect;
 class DlgViewLog;
 class GameReplay;
-class HandlePublicServers;
-class LocalClient;
 class LocalServer;
-class QLabel;
 class LatencyStatusWidget;
-class QThread;
 class RemoteClient;
-class ServerInfo_User;
 class TabSupervisor;
 class WndSets;
 class DlgTipOfTheDay;
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index af519f436..b9cc8dabc 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -25,36 +25,55 @@
 #include "client/sound_engine.h"
 #include "client/url_scheme_event_filter.h"
 #include "database/interface/settings_card_preference_provider.h"
+#include "interface/intents/intent.h"
 #include "interface/intents/intent_open_local_deck.h"
 #include "interface/logger.h"
 #include "interface/pixel_map_generator.h"
 #include "interface/theme_manager.h"
-#include "interface/widgets/dialogs/dlg_settings.h"
-#include "interface/widgets/tabs/tab_supervisor.h"
 #include "interface/window_main.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/rng/rng_abstract.h"
 #include "single_instance_manager.h"
 #include "version_string.h"
 
 #include <QApplication>
+#include <QByteArray>
+#include <QByteArrayView>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
+#include <QCoreApplication>
 #include <QCryptographicHash>
-#include <QDateTime>
 #include <QDebug>
+#include <QFileInfo>
+#include <QGuiApplication>
+#include <QIcon>
+#include <QList>
 #include <QLocale>
 #include <QMessageBox>
-#include <QSystemTrayIcon>
+#include <QMessageLogger>
+#include <QNetworkInterface>
+#include <QObject>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTranslator>
 #include <QUrl>
+#include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/rng/rng_sfmt.h>
-#include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/card_database_settings.h>
-#include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/settings/network_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/cryptoutil.h>
 #include <libcockatrice/utility/translation_loader.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qsystemdetection.h>
 
 QTranslator *translator, *qtTranslator;
 RNG_Abstract *rng;
@@ -91,6 +110,7 @@ static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, cons
 #include <ShlObj.h>
 #include <ctime>
 #include <filesystem>
+
 #pragma comment(lib, "DbgHelp.lib") // Link the DbgHelp library
 // clang-format on
 
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index eee262d2c..3d772915b 100644
--- a/cockatrice/src/main.h
+++ b/cockatrice/src/main.h
@@ -15,7 +15,6 @@ class CardDatabase;
 class QString;
 class QSystemTrayIcon;
 class QTranslator;
-class SoundEngine;
 
 extern CardDatabase *db;
 
diff --git a/cockatrice/src/single_instance_manager.cpp b/cockatrice/src/single_instance_manager.cpp
index 8d363ff34..89fc6b578 100644
--- a/cockatrice/src/single_instance_manager.cpp
+++ b/cockatrice/src/single_instance_manager.cpp
@@ -1,7 +1,16 @@
 #include "single_instance_manager.h"
 
+#include <QByteArray>
+#include <QDataStream>
 #include <QDir>
+#include <QIODevice>
+#include <QList>
+#include <QLocalServer>
+#include <QLocalSocket>
 #include <QPointer>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <QtGlobal>
 
 namespace
 {
diff --git a/cockatrice/src/single_instance_manager.h b/cockatrice/src/single_instance_manager.h
index d3884a60f..727994208 100644
--- a/cockatrice/src/single_instance_manager.h
+++ b/cockatrice/src/single_instance_manager.h
@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_SINGLE_INSTANCE_MANAGER_H
 #define COCKATRICE_SINGLE_INSTANCE_MANAGER_H
 
-#include <QDataStream>
-#include <QDebug>
-#include <QLocalServer>
-#include <QLocalSocket>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QLocalServer;
 
 class SingleInstanceManager : public QObject
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index 56c737793..bd33f18e7 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -1,21 +1,17 @@
 #include "card_info.h"
 
 #include "game_specific_terms.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
 #include "printing/printing_info.h"
 #include "relation/card_relation.h"
 #include "set/card_set.h"
 
-#include <QDir>
+#include <QHashIterator>
 #include <QRegularExpression>
 #include <QSharedPointer>
 #include <QString>
-#include <algorithm>
 #include <utility>
 
-class CardRelation;
-class CardSet;
-class CardInfo;
-
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 const QHash<QString, QString> &CardInfo::getPropertiesHash() const
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
index 17894cec5..356da0546 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -5,15 +5,19 @@
 #include "lazy_properties_hash.h"
 #include "printing/printing_info.h"
 
-#include <QDate>
+#include <QByteArray>
+#include <QChar>
 #include <QHash>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QMetaType>
-#include <QMutex>
+#include <QObject>
+#include <QSet>
 #include <QSharedPointer>
-#include <QVariant>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
@@ -21,7 +25,6 @@ inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
 class CardInfo;
 class CardSet;
 class CardRelation;
-class ICardDatabaseParser;
 
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
index cc0314e21..d0800e596 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
@@ -1,5 +1,11 @@
 #include "card_info_comparator.h"
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QMetaType>
+#include <QSharedPointer>
+#include <compare>
+
 CardInfoComparator::CardInfoComparator(const QStringList &properties, Qt::SortOrder order)
     : m_properties(properties), m_order(order)
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
index b6df8c7a3..b184f5d55 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
@@ -9,6 +9,9 @@
 
 #include "card_info.h"
 
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QVariant>
 #include <Qt>
 
diff --git a/libcockatrice_card/libcockatrice/card/card_localization.cpp b/libcockatrice_card/libcockatrice/card/card_localization.cpp
index 03c6c659b..4f91bac78 100644
--- a/libcockatrice_card/libcockatrice/card/card_localization.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_localization.cpp
@@ -1,8 +1,10 @@
 #include "card_localization.h"
 
 #include <QHash>
+#include <QList>
 #include <QLocale>
 #include <QStringList>
+#include <utility>
 
 namespace CardLocalization
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_localization.h b/libcockatrice_card/libcockatrice/card/card_localization.h
index 1bde506cb..ee2aaa9b7 100644
--- a/libcockatrice_card/libcockatrice/card/card_localization.h
+++ b/libcockatrice_card/libcockatrice/card/card_localization.h
@@ -1,6 +1,8 @@
 #ifndef CARD_LOCALIZATION_H
 #define CARD_LOCALIZATION_H
 
+#include <QLatin1String>
+#include <QSharedPointer>
 #include <QString>
 #include <QStringList>
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 209b9d2c2..f61da204f 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -1,17 +1,27 @@
 #include "card_database.h"
 
 #include "../relation/card_relation.h"
-#include "card_database_manager.h"
-#include "parser/cockatrice_xml_4.h"
+#include "libcockatrice/card/database/card_database_data.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/database/parser/card_database_parser.h"
+#include "libcockatrice/card/format/format_legality_rules.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/card/set/card_set_list.h"
 
-#include <QCryptographicHash>
 #include <QDebug>
-#include <QDirIterator>
-#include <QFile>
-#include <QRegularExpression>
-#include <algorithm>
+#include <QList>
+#include <QMessageLogger>
+#include <QMetaType>
+#include <QMutexLocker>
+#include <QSharedPointer>
 #include <utility>
 
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
+
 CardDatabase::CardDatabase(QObject *parent,
                            ICardPreferenceProvider *prefs,
                            ICardDatabasePathProvider *pathProvider,
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index b10e3c726..44d554df7 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -2,18 +2,26 @@
 #define CARDDATABASE_H
 
 #include "../set/card_set_list.h"
-#include "card_database_data.h"
 #include "card_database_loader.h"
-#include "card_database_querier.h"
+
+// IWYU pragma: keep
+// CardDatabaseData is passed by value to the swapInDatabaseData() slot, and
+// CardInfoPtr is passed by value to the cardAdded()/cardRemoved() signals, so
+// the moc-generated code needs the complete types.
+#include "card_database_data.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QBasicMutex>
-#include <QDate>
-#include <QHash>
-#include <QList>
 #include <QLoggingCategory>
-#include <QVector>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <utility>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardDatabaseQuerier;
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
index 3165ff871..4ab4d1fca 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
@@ -4,15 +4,32 @@
 #include "../format/format_legality_rules.h"
 #include "../printing/printing_info.h"
 #include "../relation/card_relation.h"
-#include "../relation/card_relation_type.h"
 #include "../set/card_set.h"
 #include "card_database_loader.h"
+#include "libcockatrice/card/database/card_database_data.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
 
 #include <QBuffer>
+#include <QByteArray>
 #include <QDataStream>
+#include <QDate>
+#include <QDebug>
 #include <QElapsedTimer>
 #include <QFile>
+#include <QIODevice>
+#include <QList>
+#include <QLoggingCategory>
+#include <QMap>
+#include <QMessageLogger>
 #include <QSaveFile>
+#include <QSet>
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class ICardSetPriorityController;
+enum class CardRelationType;
+template <typename Key, typename T> class QHash;
 
 namespace
 {
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.h b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
index 40ff96541..178b3ac6e 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
@@ -1,10 +1,11 @@
 #ifndef CARDDATABASE_CACHE_H
 #define CARDDATABASE_CACHE_H
 
-#include "card_database_data.h"
+#include <QString>
 
-#include <QByteArray>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
+class ICardSetPriorityController;
+class QByteArray;
+struct CardDatabaseData;
 
 namespace CardDatabaseCache
 {
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index 47f7eee6d..0f0b28b2a 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -2,6 +2,10 @@
 
 #include "card_database.h"
 #include "card_database_cache.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_data.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/interfaces/interface_card_database_path_provider.h"
 #include "parser/card_database_parser.h"
 #include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
@@ -9,11 +13,22 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QCryptographicHash>
+#include <QDateTime>
 #include <QDebug>
+#include <QDir>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
+#include <QIODevice>
+#include <QMessageLogger>
+#include <QMutexLocker>
+#include <QSharedPointer>
 #include <QTime>
+#include <qalgorithms.h>
+#include <utility>
+
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
 
 CardDatabaseLoader::CardDatabaseLoader(QObject *parent,
                                        CardDatabase *db,
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
index 6dcb06bf2..706e31ab2 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
@@ -2,12 +2,22 @@
 #define COCKATRICE_CARD_DATABASE_LOADER_H
 
 #include <QBasicMutex>
+#include <QByteArray>
 #include <QList>
 #include <QLoggingCategory>
-#include <libcockatrice/card/database/card_database_data.h>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
+
+// IWYU pragma: keep
+// CardDatabaseData is passed by value to the databaseDataReady() signal, so the
+// moc-generated code needs the complete type.
+#include "card_database_data.h"
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
index 614b4a7f8..b06c258fa 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
@@ -1,9 +1,16 @@
 #include "card_database_manager.h"
 
+#include "libcockatrice/card/database/card_database.h"
+
 #include <libcockatrice/interfaces/noop_card_database_path_provider.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
+class CardDatabaseQuerier;
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
+
 ICardPreferenceProvider *CardDatabaseManager::cardPreferenceProvider = new NoopCardPreferenceProvider();
 ICardDatabasePathProvider *CardDatabaseManager::pathProvider = new NoopCardDatabasePathProvider();
 ICardSetPriorityController *CardDatabaseManager::setPriorityController = new NoopCardSetPriorityController();
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
index c7de66a25..074154a41 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
@@ -2,7 +2,12 @@
 #define CARD_DATABASE_ACCESSOR_H
 
 #pragma once
-#include "card_database.h"
+
+class CardDatabase;
+class CardDatabaseQuerier;
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
 
 /**
  * @class CardDatabaseManager
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index 5b9c5a4b5..2fad5212d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -4,8 +4,15 @@
 #include "../printing/exact_card.h"
 #include "../set/card_set_comparator.h"
 #include "card_database.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/interfaces/interface_card_preference_provider.h"
+#include "libcockatrice/utility/card_ref.h"
 
-#include <qrandom.h>
+#include <QLatin1String>
+#include <QRandomGenerator>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <qnamespace.h>
 
 CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
                                          const CardDatabase *_db,
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
index f195a8170..a1409b3cc 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
@@ -3,12 +3,18 @@
 
 #include "../card_info.h"
 #include "../printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
+#include <QList>
+#include <QMap>
 #include <QObject>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class CardDatabase;
+class ICardPreferenceProvider;
+struct CardRef;
 
 /**
  * @class CardDatabaseQuerier
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
index 00ed9377d..1374533ca 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
@@ -1,6 +1,11 @@
 #include "card_database_parser.h"
 
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_data.h"
+
+#include <QSharedPointer>
+
+class ICardSetPriorityController;
 
 SetNameMap ICardDatabaseParser::sets;
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
index 6d9c91260..b82d9aed7 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
@@ -2,10 +2,17 @@
 #define CARDDATABASE_PARSER_H
 
 #include "../../card_info.h"
-#include "../card_database_data.h"
+#include "libcockatrice/card/database/parser/card_database_parser.h"
+#include "libcockatrice/card/set/card_set.h"
 
-#include <QIODevice>
+#include <QDate>
+#include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
+
+class ICardSetPriorityController;
+class QIODevice;
+struct CardDatabaseData;
 
 #define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
index 64202ab21..b17eb8b5e 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
@@ -2,13 +2,33 @@
 
 #include "../../relation/card_relation.h"
 #include "../../relation/card_relation_type.h"
+#include "libcockatrice/card/database/card_database_data.h"
+#include "libcockatrice/card/database/parser/card_database_parser.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QChar>
 #include <QCoreApplication>
+#include <QDate>
+#include <QDateTime>
 #include <QDebug>
 #include <QFile>
+#include <QHash>
+#include <QIODevice>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStringView>
+#include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
+#include <qnamespace.h>
 #include <version_string.h>
 
+class ICardSetPriorityController;
+
 #define COCKATRICE_XML3_TAGNAME "cockatrice_carddatabase"
 #define COCKATRICE_XML3_TAGVER 3
 #define COCKATRICE_XML3_SCHEMALOCATION                                                                                 \
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
index 83b736257..cb76e960d 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
@@ -2,9 +2,14 @@
 #define COCKATRICE_XML3_H
 
 #include "card_database_parser.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QLoggingCategory>
-#include <QXmlStreamReader>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ICardSetPriorityController;
+class QXmlStreamReader;
 
 inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
 
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
index 19e972a7a..eb1416817 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -1,14 +1,37 @@
 #include "cockatrice_xml_4.h"
 
 #include "../../relation/card_relation.h"
+#include "libcockatrice/card/database/card_database_data.h"
+#include "libcockatrice/card/database/parser/card_database_parser.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/relation/card_relation_type.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/interfaces/interface_card_preference_provider.h"
 
 #include <QCoreApplication>
+#include <QDate>
+#include <QDateTime>
 #include <QDebug>
 #include <QFile>
+#include <QIODevice>
+#include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QStringView>
+#include <QXmlStreamAttribute>
+#include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 #include <libcockatrice/card/format/format_legality_rules.h>
+#include <qnamespace.h>
+#include <utility>
 #include <version_string.h>
 
+class ICardSetPriorityController;
+
 #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase"
 #define COCKATRICE_XML4_TAGVER 4
 #define COCKATRICE_XML4_SCHEMALOCATION                                                                                 \
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
index 55f7c5a3b..5ddf672ee 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
@@ -2,10 +2,16 @@
 #define COCKATRICE_XML4_H
 
 #include "card_database_parser.h"
+#include "libcockatrice/card/card_info.h"
 
+#include <QHash>
 #include <QLoggingCategory>
-#include <QXmlStreamReader>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
+class QXmlStreamReader;
 
 inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
 
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
index a6b3bb038..64785759e 100644
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
@@ -1,6 +1,9 @@
 #include "format_legality_rules.h"
 
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include <libcockatrice/card/card_info.h>
+#include <qnamespace.h>
 
 bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond)
 {
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
index 8778ab17e..15ba46728 100644
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
@@ -1,11 +1,12 @@
 #ifndef COCKATRICE_FORMAT_LEGALITY_RULES_H
 #define COCKATRICE_FORMAT_LEGALITY_RULES_H
 
-#include <QRegularExpression>
+#include <QList>
 #include <QSharedPointer>
 #include <QString>
 
 class CardInfo;
+
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 struct CardCondition
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
index 91ebd6647..975f7f2d6 100644
--- a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
+++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
@@ -2,8 +2,14 @@
 
 #include "../database/card_database_manager.h"
 #include "../printing/exact_card.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QHash>
+#include <QList>
 #include <QRegularExpression>
+#include <QStringList>
+#include <libcockatrice/utility/card_ref.h>
+#include <utility>
 
 /**
  * @brief Resolves the complete display name of a card.
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
index 4d903a3bd..a12de469b 100644
--- a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
@@ -1,6 +1,8 @@
 #include "lazy_properties_hash.h"
 
-#include <QIODevice>
+#include <QDataStream>
+#include <QMutexLocker>
+#include <QSharedPointer>
 
 LazyPropertiesHash::LazyPropertiesHash() : isMaterialized(true)
 {
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
index 0ed8c215b..04f5d0251 100644
--- a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
@@ -1,8 +1,10 @@
 #ifndef COCKATRICE_LAZY_PROPERTIES_HASH_H
 #define COCKATRICE_LAZY_PROPERTIES_HASH_H
 
+#include <QByteArray>
 #include <QHash>
 #include <QMutex>
+#include <QString>
 
 /**
  * @brief A property map that can lazily deserialize blobs to avoid loading overhead.
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
index 993b5b96e..19e902b27 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
@@ -3,6 +3,10 @@
 #include "../card_info.h"
 #include "printing_info.h"
 
+#include <QLatin1String>
+#include <QSharedPointer>
+#include <qtmetamacros.h>
+
 /**
  * Default constructor.
  * This will set the CardInfoPtr to null.
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.h b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
index 74fc75da3..ea49072fb 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.h
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
@@ -2,6 +2,11 @@
 #define EXACT_CARD_H
 
 #include "../card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QByteArray>
+#include <QMetaType>
+#include <QString>
 
 /**
  * @class ExactCard
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
index 3d185583a..654efac5e 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
@@ -2,9 +2,6 @@
 
 #include "../set/card_set.h"
 
-#include <QDataStream>
-#include <QIODevice>
-
 PrintingInfo::PrintingInfo(const CardSetPtr &_set, const LazyPropertiesHash &_properties)
     : set(_set), properties(_properties)
 {
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
index 974c7bb95..038960e86 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
@@ -4,9 +4,12 @@
 #include "../set/card_set.h"
 #include "libcockatrice/card/lazy_properties_hash.h"
 
+#include <QHash>
 #include <QList>
 #include <QMap>
 #include <QSharedPointer>
+#include <QString>
+#include <QStringList>
 
 class PrintingInfo;
 
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
index 8903c892d..410b25682 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
@@ -1,7 +1,5 @@
 #include "card_relation.h"
 
-#include "card_relation_type.h"
-
 CardRelation::CardRelation(const QString &_name,
                            CardRelationType _attachType,
                            bool _isCreateAllExclusion,
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
index a1864f5b2..3a1366f2b 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.h
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
@@ -5,6 +5,7 @@
 
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
 
 /**
  * @class CardRelation
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
index 92060f6c4..e873eeeab 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
@@ -1,5 +1,7 @@
 #include "card_set.h"
 
+#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
+
 #include <QSet>
 #include <utility>
 
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
index 8e16e01df..538d78852 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.h
@@ -5,12 +5,14 @@
 #include <QList>
 #include <QSharedPointer>
 #include <QString>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
 
 class CardInfo;
+class ICardSetPriorityController;
+
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
 class CardSet;
+
 using CardSetPtr = QSharedPointer<CardSet>;
 
 /**
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
index 8d6aa7365..2e030adab 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
@@ -1,5 +1,12 @@
 #include "card_set_list.h"
 
+#include "libcockatrice/card/set/card_set.h"
+
+#include <QDate>
+#include <QString>
+#include <algorithm>
+#include <compare>
+
 class CardSetList::KeyCompareFunctor
 {
 public:
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.h b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
index 81d605374..b9c7b2a7a 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
@@ -4,6 +4,8 @@
 #include "card_set.h"
 
 #include <QList>
+#include <QSharedPointer>
+#include <QStringList>
 
 /**
  * @class CardSetList
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
index 90f63c09d..821b53dff 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -2,16 +2,26 @@
 
 #include "deck_list_memento.h"
 #include "deck_list_plain_text_parser.h"
-#include "tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/deck_list_node_tree.h"
+#include "libcockatrice/deck_list/sideboard_plan.h"
+#include "libcockatrice/utility/playmat_params.h"
 #include "tree/deck_list_card_node.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QCryptographicHash>
+#include <QAnyStringView>
 #include <QDebug>
-#include <QFile>
 #include <QSet>
+#include <QSharedPointer>
+#include <QStringView>
 #include <QTextStream>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 #include <algorithm>
+#include <iterator>
+#include <libcockatrice/utility/card_ref.h>
+#include <qlogging.h>
 
 static const QString CURRENT_SIDEBOARD_PLAN_KEY = "";
 
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
index 199d3a9a8..6796e9c33 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
@@ -12,20 +12,24 @@
 
 #include "deck_list_memento.h"
 #include "deck_list_node_tree.h"
+#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "sideboard_plan.h"
 #include "tree/inner_deck_list_node.h"
 
+#include <QList>
 #include <QMap>
-#include <QVector>
-#include <QtCore/QXmlStreamReader>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <functional>
 #include <libcockatrice/utility/playmat_params.h>
 
-class AbstractDecklistNode;
 class DecklistCardNode;
-class CardDatabase;
 class QIODevice;
 class QTextStream;
-class InnerDecklistNode;
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
 /**
  * @class DeckList
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
index b6d0687b4..cba926fd5 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
@@ -1,5 +1,10 @@
 #include "deck_list_history_manager.h"
 
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/deck_list_memento.h"
+
+#include <QString>
+
 void DeckListHistoryManager::save(const DeckListMemento &memento)
 {
     undoStack.push(memento);
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
index 6acdb199e..dce9e0af8 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
@@ -1,11 +1,13 @@
 #ifndef COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
 #define COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
 
-#include "deck_list.h"
 #include "deck_list_memento.h"
 
 #include <QObject>
 #include <QStack>
+#include <qtmetamacros.h>
+
+class DeckList;
 
 class DeckListHistoryManager : public QObject
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
index 66f228d19..5c26030bf 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
@@ -1,9 +1,19 @@
 #include "deck_list_node_tree.h"
 
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 #include "tree/deck_list_card_node.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QCryptographicHash>
 #include <QSet>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QStringView>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamReader>
+#include <QtGlobal>
 
 static constexpr int MAX_DECK_SIZE = 1e5;
 
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
index 2c66b34ff..08b4b0d73 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
@@ -1,11 +1,17 @@
 #ifndef COCKATRICE_DECKLIST_NODE_TREE_H
 #define COCKATRICE_DECKLIST_NODE_TREE_H
 
-#include "libcockatrice/utility/card_ref.h"
 #include "tree/deck_list_card_node.h"
 #include "tree/inner_deck_list_node.h"
 
+#include <QList>
 #include <QSet>
+#include <QString>
+#include <functional>
+
+class AbstractDecklistNode;
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
 class DecklistNodeTree
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
index de50d743b..61af36540 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
@@ -1,10 +1,17 @@
 #include "deck_list_plain_text_parser.h"
 
 #include "deck_list_node_tree.h"
+#include "libcockatrice/deck_list/deck_list.h"
 #include "tree/inner_deck_list_node.h"
 
+#include <QChar>
+#include <QList>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QString>
 #include <QTextStream>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 namespace DeckListPlainText
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
index e0f456a18..0845f7935 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
@@ -3,10 +3,11 @@
 
 #include "deck_list.h"
 
-#include <QString>
 #include <functional>
 
 class QTextStream;
+class DecklistNodeTree;
+class QString;
 
 namespace DeckListPlainText
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
index fd72fea0b..d1d44cca5 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
@@ -1,6 +1,12 @@
 #include "playmat_resolver.h"
 
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/utility/card_ref.h"
+
+#include <QList>
 #include <QRandomGenerator>
+#include <QString>
 
 PlaymatInfo resolveEffectivePlaymat(const DeckList &deck,
                                     const PlaymatInfo &force,
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
index 59bc449c8..411ca81fd 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
@@ -1,10 +1,13 @@
 #ifndef COCKATRICE_PLAYMAT_RESOLVER_H
 #define COCKATRICE_PLAYMAT_RESOLVER_H
 
-#include "deck_list.h"
+#include "libcockatrice/utility/playmat_params.h"
 
 #include <libcockatrice/interfaces/interface_interface_settings_provider.h>
 
+class DeckList;
+template <typename T> class QList;
+
 /**
  * @brief Resolves the effective playmat for a deck per the resolution chain:
  *        force override > deck-configured playmat > fallback list > none.
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
index 855062c18..3a47bf1a5 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
@@ -1,6 +1,12 @@
 #include "sideboard_plan.h"
 
+#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
+
+#include <QSharedPointer>
+#include <QStringView>
 #include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <string>
 
 namespace
 {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
index fff4ff2f3..ee29991d6 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
@@ -2,6 +2,7 @@
 #define COCKATRICE_SIDEBOARD_PLAN_H
 
 #include <QList>
+#include <QString>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class QXmlStreamWriter;
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
index 685238d53..5c7b4bf84 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
@@ -1,5 +1,10 @@
 #include "abstract_deck_list_card_node.h"
 
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+
+#include <QXmlStreamWriter>
+#include <compare>
+
 bool AbstractDecklistCardNode::compare(AbstractDecklistNode *other) const
 {
     switch (sortMethod) {
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
index 0942a4601..ebfd9a0b6 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
@@ -13,6 +13,10 @@
 
 #include "abstract_deck_list_node.h"
 
+#include <QString>
+
+class InnerDecklistNode;
+
 /**
  * @class AbstractDecklistCardNode
  * @ingroup DeckModels
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
index 38d1d44b8..406c6fb4d 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
@@ -17,7 +17,9 @@
 #ifndef COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 #define COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 
-#include <QtCore/QXmlStreamWriter>
+#include <QString>
+
+class QXmlStreamWriter;
 
 /**
  * @enum DeckSortMethod
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
index 1791c09a6..803737f1e 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
@@ -1,5 +1,9 @@
 #include "deck_list_card_node.h"
 
+#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
+
+class InnerDecklistNode;
+
 DecklistCardNode::DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent)
     : AbstractDecklistCardNode(_parent), name(other->getName()), number(other->getNumber()),
       cardSetShortName(other->getCardSetShortName()), cardSetNumber(other->getCardCollectorNumber()),
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
index 3bab5405a..c96a764af 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
@@ -14,7 +14,11 @@
 
 #include "abstract_deck_list_card_node.h"
 
+#include <QString>
 #include <libcockatrice/utility/card_ref.h>
+#include <utility>
+
+class InnerDecklistNode;
 
 /**
  * @class DecklistCardNode
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
index 86f7f5363..b7b1e0b8f 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
@@ -1,6 +1,18 @@
 #include "inner_deck_list_node.h"
 
 #include "deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QStringView>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
+#include <algorithm>
+#include <compare>
 
 InnerDecklistNode::InnerDecklistNode(InnerDecklistNode *other, InnerDecklistNode *_parent)
     : AbstractDecklistNode(_parent), name(other->getName())
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
index 8404d7116..6086f9efa 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
@@ -19,7 +19,13 @@
 #include "abstract_deck_list_node.h"
 
 #include <QList>
+#include <QPair>
 #include <QString>
+#include <QVector>
+#include <qnamespace.h>
+#include <utility>
+
+class QXmlStreamReader;
 
 /** @brief Constant for the "main" deck zone name. */
 #define DECK_ZONE_MAIN "main"
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
index 5fdce7ae0..26cddd53c 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
@@ -1,6 +1,9 @@
 #include "filter_card.h"
 
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <QSharedPointer>
 
 QJsonObject CardFilter::toJson() const
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h
index bb1e0ef53..e6a37ee40 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h
@@ -7,8 +7,10 @@
 #ifndef CARDFILTER_H
 #define CARDFILTER_H
 
+#include <QJsonObject>
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
 
 class CardFilter : public QObject
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index df0c70ae7..bc137b0f6 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -1,12 +1,35 @@
 #include "filter_string.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/card/set/card_set_list.h"
+
 #include <QByteArray>
+#include <QChar>
+#include <QDate>
 #include <QDebug>
+#include <QList>
+#include <QMessageLogger>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
 #include <QString>
+#include <QStringList>
+#include <algorithm>
+#include <any>
+#include <ctype.h>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/utility/peglib.h>
+#include <mutex>
+#include <qnamespace.h>
+#include <stddef.h>
+#include <string>
+#include <string_view>
+#include <vector>
 
 static peg::parser search(R"(
 Start <- QueryPartList
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h
index 015df0cf4..2abe95201 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h
@@ -7,15 +7,13 @@
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
 
-#include "filter_tree.h"
-
 #include <QLoggingCategory>
-#include <QMap>
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/card_localization.h>
-#include <utility>
+
+struct CardSearchLanguage;
 
 inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");
 
@@ -29,6 +27,7 @@ namespace peg
 {
 template <typename Annotation> struct AstBase;
 struct EmptyType;
+
 typedef AstBase<EmptyType> Ast;
 } // namespace peg
 
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index a5d91d9d3..742b44e97 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -1,8 +1,16 @@
 #include "filter_tree.h"
 
 #include "filter_card.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QChar>
 #include <QList>
+#include <QSharedPointer>
+#include <QStringList>
+#include <algorithm>
+#include <qnamespace.h>
 
 template <class T> FilterTreeNode *FilterTreeBranch<T>::nodeAt(int i) const
 {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
index dd47a1ebc..0defd466b 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
@@ -8,13 +8,16 @@
 #define FILTERTREE_H
 
 #include "filter_card.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QList>
 #include <QObject>
-#include <libcockatrice/card/card_localization.h>
-#include <libcockatrice/card/database/card_database.h>
+#include <QString>
+#include <qtmetamacros.h>
 #include <utility>
 
+struct CardSearchLanguage;
+
 class FilterTreeNode
 {
 private:
@@ -120,6 +123,7 @@ public:
 
 class FilterItemList;
 class FilterTree;
+
 class LogicMap : public FilterTreeBranch<FilterItemList *>
 {
 
@@ -142,6 +146,7 @@ public:
 };
 
 class FilterItem;
+
 class FilterItemList : public FilterTreeBranch<FilterItem *>
 {
 private:
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
index f31463b50..b99b8b0f7 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
@@ -1,5 +1,14 @@
 #include "card_completer_proxy_model.h"
 
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QRegularExpression>
+#include <QString>
+#include <QVariant>
+#include <qnamespace.h>
+
+class QObject;
+
 CardCompleterProxyModel::CardCompleterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {
 }
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
index 91dc06335..8aa671af7 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
@@ -8,6 +8,9 @@
 #define CARD_COMPLETER_PROXY_MODEL_H
 
 #include <QSortFilterProxyModel>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class CardCompleterProxyModel : public QSortFilterProxyModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
index 3a734ed37..5bde6e3fc 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
@@ -3,6 +3,10 @@
 #include "../card_database_display_model.h"
 #include "../card_database_model.h"
 
+#include <QAbstractItemModel>
+#include <QObject>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/utility/levenshtein.h>
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
index b877a9385..08d0e8636 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
@@ -7,9 +7,20 @@
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
-#include "../card_database_display_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/card_localization.h"
 
 #include <QAbstractListModel>
+#include <QList>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class CardDatabaseDisplayModel;
+class QObject;
 
 class CardSearchModel : public QAbstractListModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
index 7f89677c8..39bb8314c 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -1,6 +1,23 @@
 #include "card_database_display_model.h"
 
 #include "card_database_model.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/filters/filter_string.h"
+#include "libcockatrice/filters/filter_tree.h"
+
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
+
+class QObject;
 
 CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr)
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
index e6aadd8c6..d12dd1fb4 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
@@ -8,12 +8,21 @@
 #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QModelIndex>
+#include <QSet>
 #include <QSortFilterProxyModel>
+#include <QString>
 #include <QTimer>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/filters/filter_string.h>
+#include <qtmetamacros.h>
 
 class FilterTree;
+class QObject;
+template <class Key, class T> class QMap;
+
 class CardDatabaseDisplayModel : public QSortFilterProxyModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
index ecd26a9f8..1ede554f8 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
@@ -1,8 +1,16 @@
 #include "card_database_model.h"
 
-#include <QMap>
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+
+#include <QChar>
+#include <QSharedPointer>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database.h>
 
+class QObject;
+
 #define CARDDBMODEL_COLUMNS 6
 
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
index ad84de6f4..208240109 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
@@ -7,10 +7,17 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
+#include "libcockatrice/card/card_info.h"
+
 #include <QAbstractListModel>
 #include <QList>
+#include <QModelIndex>
 #include <QSet>
-#include <libcockatrice/card/database/card_database.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class CardDatabase;
+class QObject;
 
 class CardDatabaseModel : public QAbstractListModel
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
index 8fd5311f2..1bc1b9e38 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
@@ -1,6 +1,19 @@
 #include "card_sets_model.h"
 
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
+
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QDate>
+#include <QFlags>
+#include <QMultiMap>
+#include <QObject>
+#include <QSharedPointer>
 #include <QSortFilterProxyModel>
+#include <QVariant>
+#include <QVector>
 
 SetsModel::SetsModel(CardDatabase *_db, QObject *parent) : QAbstractTableModel(parent), sets(_db->getSetList())
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
index 2adf71def..354414dc8 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
@@ -7,13 +7,24 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/set/card_set_list.h"
+
 #include <QAbstractTableModel>
+#include <QList>
 #include <QMimeData>
+#include <QModelIndex>
+#include <QModelIndexList>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database.h>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
-class SetsProxyModel;
+class CardDatabase;
+class QObject;
 
 class SetsMimeData : public QMimeData
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
index 4282c6dc8..e08183576 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
@@ -1,6 +1,12 @@
 #include "token_display_model.h"
 
 #include "../card_database_model.h"
+#include "card_database_display_model.h"
+#include "libcockatrice/card/card_info.h"
+
+#include <QSortFilterProxyModel>
+
+class QObject;
 
 TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
index c8f767189..a8625368f 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
@@ -9,6 +9,11 @@
 
 #include "../card_database_display_model.h"
 
+#include <QModelIndex>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class TokenDisplayModel : public CardDatabaseDisplayModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
index 89a1f71b1..9636ed665 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
@@ -2,9 +2,13 @@
 
 #include "../card_database_display_model.h"
 #include "../card_database_model.h"
+#include "libcockatrice/card/set/card_set.h"
 
+#include <QSortFilterProxyModel>
 #include <libcockatrice/card/card_info.h>
 
+class QObject;
+
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
 }
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
index 92dfaadd7..2f3398899 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
@@ -9,6 +9,11 @@
 
 #include "../card_database_display_model.h"
 
+#include <QModelIndex>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class TokenEditModel : public CardDatabaseDisplayModel
 {
     Q_OBJECT
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
index a5628a844..4b4088972 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
@@ -1,6 +1,27 @@
 #include "deck_list_model.h"
 
+#include "deck_list_model_custom_zones.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/format/format_legality_rules.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/deck_list_node_tree.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+
+#include <QModelIndexList>
+#include <QSet>
+#include <QVariant>
+#include <algorithm>
+#include <compare>
+#include <iterator>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <utility>
+
+class QObject;
 
 DeckListModel::DeckListModel(QObject *parent)
     : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
index ce6d7f8cb..7334d48ef 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
@@ -1,18 +1,26 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "deck_list_model_custom_zones.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/utility/card_ref.h"
 
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h>
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <QAbstractItemModel>
 #include <QList>
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <functional>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
-class CardDatabase;
-class QPrinter;
-class QTextCursor;
+class AbstractDecklistNode;
+class DeckList;
+class ExactCard;
+class QObject;
 
 /**
  * @namespace DeckRoles
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
index 1dc745e63..419c38b04 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
@@ -1,10 +1,14 @@
 #include "deck_list_model_custom_zones.h"
 
 #include "deck_list_model.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <QHash>
+#include <QSharedPointer>
 #include <QVector>
+#include <utility>
 
 namespace DeckListModelCustomZones
 {
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
index 518a9e1d2..53bdeaa1e 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
@@ -4,7 +4,10 @@
 #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <QList>
 #include <QPair>
-#include <QtGlobal>
+#include <QString>
+#include <qnamespace.h>
+
+class AbstractDecklistNode;
 
 /**
  * @class DecklistModelSubZoneNode
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
index 3d433153a..dcb294ec8 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
@@ -1,6 +1,16 @@
 #include "deck_list_sort_filter_proxy_model.h"
 
 #include "deck_list_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_manager.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QVariant>
+#include <qnamespace.h>
 
 bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
index 1565417f0..522ed1e23 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
@@ -7,8 +7,13 @@
 #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 
+#include <QList>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class DeckListSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
index 687d93666..d66653fb1 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -1,6 +1,25 @@
 #include "abstract_client.h"
 
+#include "libcockatrice/protocol/pb/admin_commands.pb.h"
+#include "libcockatrice/protocol/pb/developer_commands.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_commands.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
+
+#include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QMetaType>
+#include <QSharedPointer>
+#include <QVariant>
+#include <QtGlobal>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
index af22a5c9d..442e96eb2 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -11,10 +11,27 @@
 
 #include <QElapsedTimer>
 #include <QLoggingCategory>
+#include <QMap>
 #include <QMutex>
-#include <QVariant>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QMutexLocker>
+#include <QObject>
+#include <QString>
+
+// IWYU pragma: keep
+// ServerInfo_User appears in signal signatures, including inside QList, so the
+// moc-generated code needs the complete type.
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qtmetamacros.h>
+
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(AbstractClientLog, "abstract_client");
 
@@ -36,7 +53,6 @@ class Event_NotifyUser;
 class Event_ConnectionClosed;
 class Event_ServerShutdown;
 class Event_ReplayAdded;
-class FeatureSet;
 
 enum ClientStatus
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
index 98b353fdf..bc6230621 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
@@ -1,7 +1,10 @@
 #include "latency_tracker.h"
 
+#include <QSharedPointer>
+#include <QtGlobal>
 #include <QtMath>
 #include <algorithm>
+#include <stddef.h>
 
 void LatencyTracker::addSample(qint64 ms)
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
index 75f18ac0c..cae11ea4d 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
@@ -6,8 +6,10 @@
 #ifndef LATENCY_TRACKER_H
 #define LATENCY_TRACKER_H
 
+#include <QByteArray>
 #include <QList>
 #include <QMetaType>
+#include <QtGlobal>
 #include <array>
 
 /**
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
index eefa3a2f3..c1c1cc976 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
@@ -1,9 +1,17 @@
 #include "local_client.h"
 
 #include "../../server/local/local_server_interface.h"
+#include "abstract_client.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
 
+#include <QDebug>
+#include <QMessageLogger>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <string>
+
+class QObject;
 
 LocalClient::LocalClient(LocalServerInterface *_lsi,
                          const QString &_playerName,
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
index 9e1c89ddd..3ae570255 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
@@ -10,6 +10,11 @@
 #include "../abstract/abstract_client.h"
 
 #include <QLoggingCategory>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+class ServerMessage;
 
 inline Q_LOGGING_CATEGORY(LocalClientLog, "local_client");
 
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index de2cc720f..feda9e3f4 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -1,5 +1,8 @@
 #include "remote_client.h"
 
+#include "abstract_client.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
@@ -7,13 +10,21 @@
 #include <QHostAddress>
 #include <QHostInfo>
 #include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QMutableMapIterator>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QThread>
 #include <QTimer>
+#include <QUrl>
 #include <QWebSocket>
+#include <QWebSocketProtocol>
+#include <QtGlobal>
+#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
-#include <libcockatrice/protocol/pb/response_activate.pb.h>
 #include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/response_password_salt.pb.h>
@@ -22,6 +33,10 @@
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/passwordhasher.h>
+#include <string>
+
+class Event_ConnectionClosed;
+class QObject;
 
 static const unsigned int protocolVersion = 14;
 
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
index 862dac06e..4d8c24fd2 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -8,11 +8,23 @@
 #define REMOTECLIENT_H
 
 #include "../abstract/abstract_client.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
 
+#include <QAbstractSocket>
+#include <QByteArray>
 #include <QLoggingCategory>
+#include <QString>
+#include <QTcpSocket>
 #include <QWebSocket>
-#include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class Event_ConnectionClosed;
+class Event_ServerIdentification;
+class INetworkSettingsProvider;
+class QObject;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client");
 
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
index 8f9d82aa4..ebfc9bdeb 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
@@ -1,8 +1,17 @@
 #include "local_server.h"
 
+#include "../remote/server.h"
+#include "../remote/server_database_interface.h"
+#include "../remote/server_protocolhandler.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "local_server_interface.h"
 
 #include <../remote/server_room.h>
+#include <QList>
+#include <QStringList>
+#include <string>
+
+class QObject;
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.h b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
index 0112afa72..ee8d487d2 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
@@ -9,8 +9,11 @@
 
 #include <../remote/server.h>
 #include <../remote/server_database_interface.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class LocalServerInterface;
+class QObject;
 
 class LocalServer : public Server
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
index bb86198af..b7c8d4bfa 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
@@ -1,8 +1,10 @@
 #include "local_server_interface.h"
 
+#include "../remote/server_protocolhandler.h"
 #include "local_server.h"
 
-#include <QDebug>
+class CommandContainer;
+class Server_DatabaseInterface;
 
 LocalServerInterface::LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface)
     : Server_ProtocolHandler(_server, _databaseInterface, _server)
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
index 44e3b3e53..8aadb40ca 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
@@ -8,8 +8,13 @@
 #define LOCALSERVERINTERFACE_H
 
 #include <../remote/server_protocolhandler.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class LocalServer;
+class CommandContainer;
+class ServerMessage;
+class Server_DatabaseInterface;
 
 class LocalServerInterface : public Server_ProtocolHandler
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
index a6280ffa1..5b8d901bb 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
@@ -4,10 +4,16 @@
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "server_card.h"
+#include "game/server_abstract_player.h"
+#include "libcockatrice/protocol/pb/event_leave.pb.h"
+#include "libcockatrice/protocol/pb/game_commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
 #include "server_game.h"
-#include "server_player.h"
+#include "server_response_containers.h"
+#include "serverinfo_user_container.h"
 
+#include <QMutexLocker>
+#include <QString>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
@@ -50,6 +56,7 @@
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <string>
 
 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
                                                        int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
index c78ae78c1..195da9b7f 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
@@ -5,8 +5,8 @@
 #include "server_arrowtarget.h"
 
 #include <QMutex>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
+#include <qtmetamacros.h>
 
 class Server_Game;
 class Server_AbstractUserInterface;
@@ -17,7 +17,6 @@ class GameEventContainer;
 class GameEventStorage;
 class ResponseContainer;
 class GameCommand;
-
 class Command_KickFromGame;
 class Command_LeaveGame;
 class Command_GameSay;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
index 6b4101a99..47c810d0d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
@@ -1,14 +1,33 @@
 #include "server_abstract_player.h"
 
+#include "game/server_abstract_participant.h"
+#include "game/server_arrowtarget.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
+#include "libcockatrice/protocol/pb/color.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_arrow.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_game.h"
 #include "server_move_card_struct.h"
+#include "server_response_containers.h"
 
-#include <QDebug>
-#include <QRegularExpression>
+#include <QList>
+#include <QListIterator>
+#include <QMapIterator>
+#include <QObject>
+#include <QSet>
+#include <QSharedPointer>
+#include <QVariant>
 #include <algorithm>
+#include <google/protobuf/stubs/port.h>
+#include <iterator>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
@@ -50,8 +69,11 @@
 #include <libcockatrice/utility/dice_limits.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <limits>
 #include <ranges>
+#include <set>
+#include <string>
+
+class Server_AbstractUserInterface;
 
 Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
                                              int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
index 4cc79c5fe..eff5034b4 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
@@ -1,25 +1,32 @@
 #ifndef ABSTRACT_PLAYER_H
 #define ABSTRACT_PLAYER_H
 
-#include "../serverinfo_user_container.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
 #include "server_abstract_participant.h"
 
 #include <QMap>
 #include <QString>
+#include <qtmetamacros.h>
 
 class CardToMove;
 class DeckList;
 class Server_Arrow;
 class Server_Card;
 class Server_CardZone;
-class Server_Counter;
 struct MoveCardStruct;
+class GameEventStorage;
+class ServerInfo_User;
+class Server_AbstractUserInterface;
+class Server_Game;
+enum CardAttribute : int;
+template <typename T> class QList;
 
 class Server_AbstractPlayer : public Server_AbstractParticipant
 {
     Q_OBJECT
 private:
     class MoveCardCompareFunctor;
+
     QMap<int, Server_Arrow *> arrows;
 
     void sendCreateTokenEvents(Server_CardZone *zone, Server_Card *card, int xCoord, int yCoord, GameEventStorage &ges);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
index 2ad38b977..b5ccff8fe 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
@@ -1,10 +1,16 @@
 #include "server_arrow.h"
 
+#include "game/server_abstract_player.h"
+#include "game/server_arrowtarget.h"
+#include "libcockatrice/protocol/pb/color.pb.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_player.h"
 
+#include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
+#include <string>
 
 Server_Arrow::Server_Arrow(int _id,
                            Server_Card *_startCard,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
index 5a080018d..c4da725c2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
@@ -2,6 +2,7 @@
 #define SERVER_ARROWTARGET_H
 
 #include <QObject>
+#include <qtmetamacros.h>
 
 class Server_ArrowTarget : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
index 8c7feadba..c79f13634 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
@@ -19,16 +19,22 @@
  ***************************************************************************/
 #include "server_card.h"
 
+#include "game/server_abstract_player.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_cardcounter.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "server_cardzone.h"
-#include "server_player.h"
 
+#include <QMapIterator>
+#include <QSharedPointer>
 #include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
-#include <limits>
+#include <string>
 
 Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
     : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false),
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
index a2698ad61..cffd9eb40 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
@@ -22,15 +22,18 @@
 
 #include "server_arrowtarget.h"
 
+#include <QList>
 #include <QMap>
 #include <QString>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <QtGlobal>
 #include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
 
 class Server_CardZone;
 class Event_SetCardCounter;
 class Event_SetCardAttr;
+class ServerInfo_Card;
+enum CardAttribute : int;
 
 class Server_Card : public Server_ArrowTarget
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
index 1db4f9c4c..5f40aa480 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
@@ -19,13 +19,21 @@
  ***************************************************************************/
 #include "server_cardzone.h"
 
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
 #include "server_abstract_player.h"
 #include "server_card.h"
 
 #include <QDebug>
+#include <QListIterator>
+#include <QMultiMap>
+#include <QPair>
 #include <QSet>
+#include <QSetIterator>
+#include <QSharedPointer>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
+#include <qlogging.h>
+#include <string>
 
 Server_CardZone::Server_CardZone(Server_AbstractPlayer *_player,
                                  const QString &_name,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
index 77fea54ca..9ed39a159 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
@@ -20,15 +20,16 @@
 #ifndef SERVER_CARDZONE_H
 #define SERVER_CARDZONE_H
 
+#include <QList>
 #include <QMap>
 #include <QSet>
 #include <QString>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
 
 class Server_Card;
 class Server_AbstractPlayer;
 class Server_AbstractParticipant;
-class Server_Game;
 class GameEventStorage;
 
 class Server_CardZone
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
index b18e11c2b..f3dcb0fb1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
@@ -1,6 +1,9 @@
 #include "server_counter.h"
 
+#include "libcockatrice/protocol/pb/color.pb.h"
+
 #include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
+#include <string>
 
 Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count)
     : id(_id), name(_name), counterColor(_counterColor), radius(_radius), count(_count)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
index 131ff1077..330d473b2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -23,21 +23,44 @@
 #include "../server_database_interface.h"
 #include "../server_protocolhandler.h"
 #include "../server_room.h"
+#include "game/game_config.h"
+#include "game/server_abstract_participant.h"
+#include "game/server_arrowtarget.h"
+#include "game/server_deck_validation_strategy.h"
+#include "game/server_game_lifecycle_strategy.h"
+#include "game/server_match_result_strategy.h"
 #include "libcockatrice/protocol/pb/command_move_card.pb.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "server_abstract_player.h"
+#include "server_abstractuserinterface.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_player.h"
+#include "server_response_containers.h"
 #include "server_spectator.h"
 
 #include <QDebug>
 #include <QElapsedTimer>
+#include <QMutexLocker>
+#include <QReadWriteLock>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QTimer>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
+#include <google/protobuf/message.h>
 #include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
@@ -53,6 +76,9 @@
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
 
 Server_Game::Server_Game(const GameConfig &config, Server_Room *_room)
     : QObject(), room(_room), nextPlayerId(0), hostId(0), creatorInfo(new ServerInfo_User(config.creatorInfo)),
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
index 1ed4fe4ca..c7f8d0929 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
@@ -21,21 +21,25 @@
 #define SERVERGAME_H
 
 #include "../server_response_containers.h"
-#include "game_config.h"
-#include "server_deck_validation_strategy.h"
-#include "server_game_lifecycle_strategy.h"
-#include "server_match_result_strategy.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
+// IWYU pragma: keep
+// ServerInfo_Game is passed by value to the gameInfoChanged() signal, so the
+// moc-generated code needs the complete type.
 #include <QDateTime>
+#include <QList>
 #include <QMap>
-#include <QMutex>
 #include <QObject>
+#include <QRecursiveMutex>
 #include <QScopedPointer>
 #include <QSet>
-#include <QStringList>
+#include <QString>
+#include <QtGlobal>
+#include <atomic>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <qtmetamacros.h>
 
 class QTimer;
 class GameEventContainer;
@@ -47,6 +51,17 @@ class ServerInfo_User;
 class ServerInfo_Game;
 class Server_AbstractUserInterface;
 class Event_GameStateChanged;
+class Server_DeckValidationStrategy;
+class Server_GameLifecycleStrategy;
+class Server_MatchResultStrategy;
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
+struct GameConfig;
 
 class Server_Game : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index cafa33c07..a4c904c01 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -1,23 +1,34 @@
 #include "server_player.h"
 
 #include "../server.h"
-#include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
+#include "game/server_abstract_participant.h"
+#include "game/server_abstract_player.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/protocol/pb/color.pb.h"
+#include "libcockatrice/protocol/pb/move_card_to_zone.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_counter.h"
 #include "server_game.h"
 #include "server_move_card_struct.h"
+#include "server_response_containers.h"
 
-#include <QDebug>
-#include <QRegularExpression>
-#include <algorithm>
+#include <QMapIterator>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/command_concede.pb.h>
 #include <libcockatrice/protocol/pb/command_create_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_del_counter.pb.h>
@@ -43,13 +54,15 @@
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <qalgorithms.h>
+#include <string>
+
+class Server_AbstractUserInterface;
 
 Server_Player::Server_Player(Server_Game *_game,
                              int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
index c35428480..5d514a344 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
@@ -1,8 +1,19 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "libcockatrice/protocol/pb/response.pb.h"
 #include "server_abstract_player.h"
 
+#include <QList>
+#include <QMap>
+#include <qtmetamacros.h>
+
+class GameEventStorage;
+class ServerInfo_User;
+class Server_AbstractUserInterface;
+class Server_Counter;
+class Server_Game;
+
 class Server_Player : public Server_AbstractPlayer
 {
     Q_OBJECT
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
index bc873e386..d1c369949 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
@@ -1,5 +1,11 @@
 #include "server_spectator.h"
 
+#include "game/server_abstract_participant.h"
+
+class ServerInfo_User;
+class Server_AbstractUserInterface;
+class Server_Game;
+
 Server_Spectator::Server_Spectator(Server_Game *_game,
                                    int _playerId,
                                    const ServerInfo_User &_userInfo,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
index 4d3928a63..2a8995ec3 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
@@ -3,6 +3,12 @@
 
 #include "server_abstract_participant.h"
 
+#include <qtmetamacros.h>
+
+class ServerInfo_User;
+class Server_AbstractUserInterface;
+class Server_Game;
+
 class Server_Spectator : public Server_AbstractParticipant
 {
     Q_OBJECT
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
index 7abccfca8..73b13e23e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -19,16 +19,36 @@
  ***************************************************************************/
 #include "server.h"
 
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.h"
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/game_commands.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_commands.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_ban.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "server_abstractuserinterface.h"
 #include "server_database_interface.h"
 #include "server_protocolhandler.h"
 #include "server_remoteuserinterface.h"
+#include "server_response_containers.h"
 #include "server_room.h"
+#include "serverinfo_user_container.h"
 
-#include <QCoreApplication>
+#include <QDateTime>
 #include <QDebug>
+#include <QMapIterator>
+#include <QMetaType>
+#include <QPair>
+#include <QReadLocker>
+#include <QSharedPointer>
 #include <QThread>
+#include <QWriteLocker>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
@@ -36,6 +56,10 @@
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
 #include <libcockatrice/protocol/pb/session_event.pb.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
 
 Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h
index 3d27f4210..99247bb67 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h
@@ -3,30 +3,32 @@
 
 #include "server_player_reference.h"
 
+#include <QList>
+#include <QMap>
 #include <QMultiMap>
 #include <QMutex>
+#include <QMutexLocker>
 #include <QObject>
 #include <QReadWriteLock>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class Server_DatabaseInterface;
-class Server_Game;
 class Server_Room;
 class Server_ProtocolHandler;
 class Server_AbstractUserInterface;
-class GameReplay;
 class IslMessage;
 class SessionEvent;
 class RoomEvent;
-class DeckList;
 class ServerInfo_Game;
 class ServerInfo_Room;
 class Response;
 class GameEventContainer;
 class CommandContainer;
 class Command_JoinGame;
+class QThread;
+class ServerInfo_User;
 
 enum AuthenticationResult
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
index 31fa13d81..25aa415fc 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -1,7 +1,13 @@
 #include "server_abstractuserinterface.h"
 
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "server.h"
 #include "server_player_reference.h"
 #include "server_response_containers.h"
@@ -9,8 +15,13 @@
 
 #include <QDebug>
 #include <QList>
+#include <QReadLocker>
+#include <QReadWriteLock>
+#include <QString>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
+#include <google/protobuf/message.h>
+#include <qlogging.h>
+#include <utility>
 
 void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::MessageType type,
                                                           const ::google::protobuf::Message &item)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
index 2da72c01d..a19475e34 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
@@ -5,6 +5,8 @@
 
 #include <QMap>
 #include <QMutex>
+#include <QMutexLocker>
+#include <QPair>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 
@@ -12,9 +14,15 @@ class SessionEvent;
 class GameEventContainer;
 class RoomEvent;
 class ResponseContainer;
-
 class Server;
 class Server_Game;
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
 
 class Server_AbstractUserInterface : public ServerInfo_User_Container
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
index 1e4fc990b..e0be7990b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
@@ -1,9 +1,22 @@
 #ifndef SERVER_DATABASE_INTERFACE_H
 #define SERVER_DATABASE_INTERFACE_H
 
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "server.h"
 
+#include <QMap>
 #include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class DeckList;
+class GameReplay;
+class ServerInfo_Game;
+class Server_ProtocolHandler;
+template <typename T> class QList;
+template <typename T> class QSet;
 
 class Server_DatabaseInterface : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index 8422d703d..fc5cfa148 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -1,20 +1,43 @@
 #include "server_protocolhandler.h"
 
 #include "game/game_config.h"
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.h"
+#include "libcockatrice/protocol/pb/admin_commands.pb.h"
+#include "libcockatrice/protocol/pb/developer_commands.pb.h"
+#include "libcockatrice/protocol/pb/game_commands.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
+#include "libcockatrice/protocol/pb/room_commands.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "server_database_interface.h"
+#include "server_response_containers.h"
 #include "server_room.h"
+#include "serverinfo_user_container.h"
 
+#include <QChar>
 #include <QDateTime>
 #include <QDebug>
+#include <QListIterator>
+#include <QMapIterator>
+#include <QMutexLocker>
+#include <QPair>
+#include <QReadLocker>
+#include <QReadWriteLock>
+#include <QRecursiveMutex>
+#include <QSharedPointer>
+#include <QtGlobal>
 #include <QtMath>
-#include <google/protobuf/descriptor.h>
+#include <google/protobuf/repeated_ptr_field.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_notify_user.pb.h>
 #include <libcockatrice/protocol/pb/event_room_say.pb.h>
@@ -28,6 +51,9 @@
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qlogging.h>
+#include <string>
+#include <utility>
 
 Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
                                                Server_DatabaseInterface *_databaseInterface,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
index 2c8efe50e..a12706757 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
@@ -4,34 +4,24 @@
 #include "server.h"
 #include "server_abstractuserinterface.h"
 
+#include <QList>
+#include <QMap>
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
+#include <qtmetamacros.h>
 
-class Features;
 class Server_DatabaseInterface;
-class Server_Player;
-class ServerInfo_User;
 class Server_Room;
-class QTimer;
-class FeatureSet;
-
 class ServerMessage;
-class Response;
-class SessionEvent;
-class GameEventContainer;
-class RoomEvent;
 class ResponseContainer;
-
 class CommandContainer;
 class SessionCommand;
 class ModeratorCommand;
 class AdminCommand;
 class DeveloperCommand;
-
 class Command_Ping;
 class Command_Login;
-class Command_Register;
 class Command_Message;
 class Command_ListUsers;
 class Command_GetGamesOfUser;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
index d68656b9d..3bdf04220 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
@@ -3,6 +3,9 @@
 
 #include "server_abstractuserinterface.h"
 
+class Server;
+class ServerInfo_User_Container;
+
 class Server_RemoteUserInterface : public Server_AbstractUserInterface
 {
 public:
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
index 22fb199fb..4c4f351c9 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
@@ -1,8 +1,13 @@
 #include "server_response_containers.h"
 
 #include "game/server_game.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <utility>
 
 GameEventStorageItem::GameEventStorageItem(const ::google::protobuf::Message &_event,
                                            int _playerId,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
index 118b32d38..32b7a80a2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
@@ -1,10 +1,14 @@
 #ifndef SERVER_RESPONSE_CONTAINERS_H
 #define SERVER_RESPONSE_CONTAINERS_H
 
+#include <QFlags>
 #include <QList>
 #include <QPair>
+#include <algorithm>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 
+class GameEvent;
+
 namespace google
 {
 namespace protobuf
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
index 1f29e62fb..614de8d63 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
@@ -1,11 +1,26 @@
 #include "server_room.h"
 
 #include "game/server_game.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_gametype.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "server.h"
+#include "server_abstractuserinterface.h"
 #include "server_protocolhandler.h"
+#include "server_response_containers.h"
+#include "serverinfo_user_container.h"
 
 #include <QDateTime>
-#include <QDebug>
+#include <QMapIterator>
+#include <QMutexLocker>
+#include <QReadLocker>
+#include <QRecursiveMutex>
+#include <QSharedPointer>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <iterator>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/event_join_room.pb.h>
 #include <libcockatrice/protocol/pb/event_leave_room.pb.h>
@@ -16,6 +31,10 @@
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
 
 Server_Room::Server_Room(int _id,
                          int _chatHistorySize,
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
index 3d9988f20..5933894d5 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
@@ -1,16 +1,16 @@
 #ifndef SERVER_ROOM_H
 #define SERVER_ROOM_H
 
-#include "serverinfo_user_container.h"
-
+#include <QList>
 #include <QMap>
-#include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
+#include <qtmetamacros.h>
 
-class Server_DatabaseInterface;
 class Server_ProtocolHandler;
 class RoomEvent;
 class ServerInfo_User;
@@ -18,10 +18,17 @@ class ServerInfo_Room;
 class ServerInfo_Game;
 class Server_Game;
 class Server;
-
 class Command_JoinGame;
 class ResponseContainer;
 class Server_AbstractUserInterface;
+class ServerInfo_User_Container;
+namespace google
+{
+namespace protobuf
+{
+class Message;
+} // namespace protobuf
+} // namespace google
 
 class Server_Room : public QObject
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
index 4d4889323..f892c3f15 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
@@ -1,11 +1,13 @@
 #include "debug_pb_message.h"
 
-#include <QList>
 #include <QString>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
+#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/text_format.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <string>
+#include <vector>
 
 // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it
 #if GOOGLE_PROTOBUF_VERSION > 3004000
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
index 3e687ef56..0f8fd4210 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
@@ -1,6 +1,7 @@
 #include "featureset.h"
 
 #include <QMap>
+#include <QSharedPointer>
 
 FeatureSet::FeatureSet()
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
index a693ea5a7..b9d2f18d0 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
@@ -2,6 +2,7 @@
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
+#include <vector>
 
 int getPbExtension(const ::google::protobuf::Message &message)
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
index 62d35313e..4a23fb6ef 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
@@ -1,5 +1,8 @@
 #include "pending_command.h"
 
+class CommandContainer;
+class Response;
+
 PendingCommand::PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData)
     : commandContainer(_commandContainer), extraData(_extraData), ticks(0)
 {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
index b8f861d08..9ed8a863c 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
@@ -8,9 +8,13 @@
 #define PENDING_COMMAND_H
 
 #include <QElapsedTimer>
+#include <QObject>
 #include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <qtmetamacros.h>
+
+class Response;
 
 class PendingCommand : public QObject
 {
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
index 82404d351..34a778ca9 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
@@ -1,6 +1,8 @@
 #include "rng_abstract.h"
 
 #include <QDebug>
+#include <QList>
+#include <qlogging.h>
 
 QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
 {
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
index 903e6ef1a..49fb89612 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QVector>
+#include <qtmetamacros.h>
 
 class RNG_Abstract : public QObject
 {
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
index 4c578b4e4..13e6fe680 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
@@ -1,8 +1,13 @@
 #include "rng_sfmt.h"
 
-#include <algorithm>
-#include <climits>
+#include "libcockatrice/rng/rng_abstract.h"
+#include "libcockatrice/rng/sfmt/SFMT.h"
+
+#include <QString>
 #include <stdexcept>
+#include <string>
+
+class QObject;
 
 // This is from gcc sources, namely from fixincludes/inclhack.def
 // On C++11 systems, <cstdint> could be included instead.
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
index a180dad99..e178812ab 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
@@ -5,7 +5,10 @@
 #include "sfmt/SFMT.h"
 
 #include <QMutex>
-#include <climits>
+#include <qtmetamacros.h>
+#include <stdint.h>
+
+class QObject;
 
 /**
  * This class encapsulates a state of the art PRNG and can be used
diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
index 839e33be4..14969dae6 100644
--- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
@@ -1,5 +1,11 @@
 #include "appearance_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 AppearanceSettings::AppearanceSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "appearance.ini", "appearance", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
index a4504798e..9d15caddd 100644
--- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
@@ -9,6 +9,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class AppearanceSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
index c800cc024..aaea87791 100644
--- a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
@@ -1,5 +1,11 @@
 #include "cache_storage_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 CacheStorageSettings::CacheStorageSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cache_storage.ini", "cache_storage", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
index 4a4e73461..a4c8a197d 100644
--- a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_cache_storage_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 // In MB (Increments of 64)
 #define PIXMAPCACHE_SIZE_DEFAULT 2048
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
index b55c97909..7d41e5165 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
@@ -1,6 +1,16 @@
 #include "card_database_settings.h"
 
+#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
 #include <QMutexLocker>
+#include <QSettings>
+#include <QStringList>
+#include <QVariant>
+#include <functional>
+
+class QObject;
 
 CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardDatabase.ini", QString(), QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
index 4553f197f..07a5788b9 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
@@ -12,7 +12,12 @@
 
 #include <QHash>
 #include <QMutex>
+#include <QString>
+#include <QVector>
 #include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class CardDatabaseSettings : public SettingsManager, public ICardSetPriorityController
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
index a61a4693b..5a853a927 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
@@ -1,5 +1,12 @@
 #include "card_override_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+#include "libcockatrice/utility/card_ref.h"
+
+#include <QVariant>
+
+class QObject;
+
 CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cardPreferenceOverrides.ini", "cards", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
index cd515d4da..a9e8b2d69 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
@@ -9,8 +9,11 @@
 
 #include "settings_manager.h"
 
-#include <QObject>
-#include <libcockatrice/utility/card_ref.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+struct CardRef;
 
 class CardOverrideSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
index 3af607198..1addef70f 100644
--- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
@@ -1,5 +1,13 @@
 #include "cards_display_settings.h"
 
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QSharedPointer>
+#include <QVariant>
+
+class QObject;
+
 CardsDisplaySettings::CardsDisplaySettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "cards_display.ini", "cards", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
index 77924d14c..4e6b92d27 100644
--- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
@@ -3,8 +3,11 @@
 
 #include "settings_manager.h"
 
-#include <libcockatrice/card/card_localization.h>
+#include <QString>
 #include <libcockatrice/interfaces/interface_cards_display_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class CardsDisplaySettings : public SettingsManager, public ICardsDisplaySettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
index 0ee29b4f5..d9ae0ddac 100644
--- a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
@@ -1,5 +1,11 @@
 #include "chat_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 ChatSettings::ChatSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "chat.ini", "chat", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.h b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
index d928b23b7..e00da4527 100644
--- a/libcockatrice_settings/libcockatrice/settings/chat_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_chat_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class ChatSettings : public SettingsManager, public IChatSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
index 0c5f5521e..eb692fe81 100644
--- a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
@@ -1,6 +1,16 @@
 #include "commander_bracket_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
+#include <QMap>
 #include <QSettings>
+#include <QStringList>
+#include <QVariant>
+#include <QVariantMap>
+#include <utility>
+
+class QObject;
 
 QVariantList CommanderBracketSettings::defaultDefinitions()
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
index 5a29f5dc7..ad012fc30 100644
--- a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
@@ -4,9 +4,11 @@
 #include "settings_manager.h"
 
 #include <QHash>
-#include <QObject>
 #include <QString>
 #include <QVariantList>
+#include <qtmetamacros.h>
+
+class QObject;
 
 struct CommanderBracketDefinition
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
index 5bf6eca30..c36e7187e 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
@@ -1,6 +1,11 @@
 #include "debug_settings.h"
 
-#include <QtCore/QFile>
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QFile>
+#include <QVariant>
+
+class QObject;
 
 DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "debug.ini", "debug", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
index acb5cf313..9521a7738 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
@@ -8,6 +8,11 @@
 #define DEBUG_SETTINGS_H
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class DebugSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
index 44cdcd86f..ee570ed67 100644
--- a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
@@ -1,5 +1,11 @@
 #include "deck_editor_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 DeckEditorSettings::DeckEditorSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "deck_editor.ini", "deckeditor", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
index 0c87a270a..aa024910d 100644
--- a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_deck_editor_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 enum commanderSpellbookIntegrationEnabledIndex
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
index 6e22a84f4..84a6a7509 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
@@ -2,6 +2,14 @@
 
 #include "settings_manager.h"
 
+#include <QList>
+#include <QSettings>
+#include <QVariant>
+#include <QtGlobal>
+#include <utility>
+
+class QObject;
+
 const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
     "https://cards.scryfall.io/large/!prop:side!/!set:uuid_substr_0_1!/!set:uuid_substr_1_1!/!set:uuid!.jpg",
     "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!&lang=!sflang!",
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h
index 7eca77df6..f7cf482e1 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h
@@ -10,6 +10,11 @@
 #include "settings_manager.h"
 
 #include <QHash>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class DownloadSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
index 0edba44dd..79d1bc9e2 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
@@ -1,7 +1,15 @@
 #include "game_filters_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QByteArray>
 #include <QCryptographicHash>
+#include <QList>
+#include <QSharedPointer>
 #include <QTime>
+#include <QVariant>
+
+class QObject;
 
 GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "gamefilters.ini", "filter_games", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
index 11480d483..ec5e3fdc2 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
@@ -10,6 +10,13 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <QStringList>
+#include <QTime>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class GameFiltersSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
index dfd67c98a..c8c6463e3 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
@@ -1,5 +1,11 @@
 #include "game_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 GameSettings::GameSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "game.ini", QString(), QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.h b/libcockatrice_settings/libcockatrice/settings/game_settings.h
index e0a484bac..3e64234fc 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_game_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class GameSettings : public SettingsManager, public IGameSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
index b5a172e85..256d9eb26 100644
--- a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
@@ -1,5 +1,16 @@
 #include "interface_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
+
+#include <QChar>
+#include <QList>
+#include <QVariant>
+#include <QtGlobal>
+
+class QObject;
+
 namespace
 {
 const QChar PLAYMAT_FIELD_SEP = QChar(0x1F); ///< Separator between PlaymatInfo fields.
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.h b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
index 6b226f307..41bb6ee17 100644
--- a/libcockatrice_settings/libcockatrice/settings/interface_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
@@ -3,7 +3,15 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
 #include <libcockatrice/interfaces/interface_interface_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
+struct PlaymatInfo;
+template <typename T> class QList;
 
 class InterfaceSettings : public SettingsManager, public IInterfaceSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
index e914dc2d8..aba620026 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
@@ -1,5 +1,11 @@
 #include "layouts_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 const static QString STATE_PROP = "state";
 const static QString GEOMETRY_PROP = "geometry";
 const static QString SIZE_PROP = "widgetSize";
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
index d5f26b61b..91b0a2ea6 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
@@ -9,7 +9,11 @@
 
 #include "settings_manager.h"
 
-#include <QSize>
+#include <QByteArray>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class LayoutsSettings : public SettingsManager
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
index 50da39df6..ca77246ef 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
@@ -1,5 +1,11 @@
 #include "message_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "messages.ini", "messages", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h
index 8276aa39d..83513d562 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.h
@@ -9,6 +9,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class MessageSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.cpp b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
index 2d34d47ad..6d0fa9d1c 100644
--- a/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
@@ -1,5 +1,11 @@
 #include "network_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 NetworkSettings::NetworkSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "network.ini", "network", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.h b/libcockatrice_settings/libcockatrice/settings/network_settings.h
index 446bb51d3..4367f9cb3 100644
--- a/libcockatrice_settings/libcockatrice/settings/network_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.h
@@ -9,6 +9,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class NetworkSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
index 67032e38f..5f5725395 100644
--- a/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
@@ -1,7 +1,10 @@
 #include "paths_settings.h"
 
-#include <QDir>
-#include <QFile>
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
 
 PathsSettings::PathsSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "paths.ini", "paths", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/paths_settings.h b/libcockatrice_settings/libcockatrice/settings/paths_settings.h
index ab1ea05c8..399337bbb 100644
--- a/libcockatrice_settings/libcockatrice/settings/paths_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_paths_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class PathsSettings : public SettingsManager, public IPathsSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
index d1cb74d09..682144485 100644
--- a/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
@@ -1,5 +1,12 @@
 #include "personal_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
+#include <QVariant>
+
+class QObject;
+
 PersonalSettings::PersonalSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "personal.ini", "personal", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.h b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
index 04eab2a8a..0819af41b 100644
--- a/libcockatrice_settings/libcockatrice/settings/personal_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
@@ -3,9 +3,12 @@
 
 #include "settings_manager.h"
 
-#include <QDate>
-#include <QList>
+#include <QString>
 #include <libcockatrice/interfaces/interface_personal_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
+template <typename T> class QList;
 
 class PersonalSettings : public SettingsManager, public IPersonalSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
index 5f16af179..4f2c06c88 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
@@ -1,5 +1,12 @@
 #include "recents_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
+#include <QVariant>
+
+class QObject;
+
 #define MAX_RECENT_DECK_COUNT 10
 
 RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
index 01b2a37bc..dc5853908 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
@@ -9,6 +9,12 @@
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class RecentsSettings : public SettingsManager
 {
     Q_OBJECT
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
index 436e260c5..c5c4b2592 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -1,8 +1,17 @@
 #include "servers_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
 #include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QVariant>
+#include <qnamespace.h>
 #include <utility>
 
+class QObject;
+
 ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "servers.ini", "server", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index 93651c813..40648baa9 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
@@ -10,7 +10,12 @@
 #include "settings_manager.h"
 
 #include <QLoggingCategory>
-#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
+
 #define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us"
 #define SERVERSETTINGS_DEFAULT_PORT "4748"
 
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
index 3d3c95d3e..8d3110106 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -7,9 +7,12 @@
 #ifndef SETTINGSMANAGER_H
 #define SETTINGSMANAGER_H
 
+#include <QObject>
 #include <QSettings>
-#include <QStringList>
+#include <QString>
 #include <QVariant>
+#include <functional>
+#include <qtmetamacros.h>
 
 class SettingsManager : public QObject
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
index c22bd3c02..d8b637210 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
@@ -1,15 +1,25 @@
 #include "settings_migration.h"
 
+#include <QChar>
 #include <QDateTime>
+#include <QDebug>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
+#include <QFileInfoList>
+#include <QFlags>
+#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QMessageLogger>
 #include <QSettings>
+#include <QSharedPointer>
 #include <QStringList>
+#include <QStringLiteral>
+#include <QVariant>
 #include <algorithm>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(SettingsMigrationLog, "settings_migration");
 
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
index 82b724a07..5de7f9105 100644
--- a/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
@@ -1,5 +1,11 @@
 #include "sound_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QVariant>
+
+class QObject;
+
 SoundSettings::SoundSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "sound.ini", "sound", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.h b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
index ffaed2a7c..df6332cae 100644
--- a/libcockatrice_settings/libcockatrice/settings/sound_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_sound_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class SoundSettings : public SettingsManager, public ISoundSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
index cf5bfd81a..7ed6c4433 100644
--- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
@@ -1,5 +1,12 @@
 #include "tabs_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QSharedPointer>
+#include <QVariant>
+
+class QObject;
+
 TabsSettings::TabsSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "tabs.ini", "tabs", QString(), parent)
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
index eb78d311b..5411a6721 100644
--- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
@@ -3,7 +3,11 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <libcockatrice/interfaces/interface_tabs_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 /**
  * @brief The tab the application selects after launch.
diff --git a/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
index 166bc0aa8..f1d638a99 100644
--- a/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
@@ -1,6 +1,13 @@
 #include "updates_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QDate>
 #include <QDateTime>
+#include <QSharedPointer>
+#include <QVariant>
+
+class QObject;
 
 UpdatesSettings::UpdatesSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "updates.ini", "updates", QString(), parent)
diff --git a/libcockatrice_settings/libcockatrice/settings/updates_settings.h b/libcockatrice_settings/libcockatrice/settings/updates_settings.h
index 6df0f8ce4..76bb07e86 100644
--- a/libcockatrice_settings/libcockatrice/settings/updates_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.h
@@ -3,8 +3,12 @@
 
 #include "settings_manager.h"
 
-#include <QDate>
+#include <QString>
 #include <libcockatrice/interfaces/interface_updates_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QDate;
+class QObject;
 
 class UpdatesSettings : public SettingsManager, public IUpdatesSettingsProvider
 {
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
index 3320598d8..4667a278c 100644
--- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
@@ -1,5 +1,12 @@
 #include "visual_deck_storage_settings.h"
 
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
+#include <QVariant>
+
+class QObject;
+
 namespace
 {
 QStringList defaultTags = {
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
index 9bc9d4172..12b96fd8b 100644
--- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
@@ -3,8 +3,12 @@
 
 #include "settings_manager.h"
 
+#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class VisualDeckStorageSettings : public SettingsManager, public IVisualDeckStorageSettingsProvider
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
index 416ef261b..fb59022de 100644
--- a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
@@ -1,6 +1,7 @@
 #include "cryptoutil.h"
 
 #include <openssl/rand.h>
+#include <qlogging.h>
 
 namespace CryptoUtil
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 718b0fe18..85d1cdddc 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -5,7 +5,12 @@
 #include <QByteArray>
 #include <QString>
 #include <QtMath>
+#include <cmath>
 #include <functional>
+#include <memory>
+#include <qnumeric.h>
+#include <string>
+#include <vector>
 
 peg::parser math(R"(
     EXPRESSION   <-  P0
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
index f39d325fb..f7d8459cb 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
@@ -1,5 +1,7 @@
 #include "levenshtein.h"
 
+#include <QChar>
+#include <QSharedPointer>
 #include <algorithm>
 #include <vector>
 
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
index 1c22fdcfa..b4a412fa6 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
@@ -1,5 +1,7 @@
 #include "passwordhasher.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QCryptographicHash>
 #include <libcockatrice/utility/cryptoutil.h>
 
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
index 811ecef15..8ad83f089 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
@@ -1,7 +1,7 @@
 #ifndef PASSWORDHASHER_H
 #define PASSWORDHASHER_H
 
-#include <QObject>
+#include <QString>
 
 class PasswordHasher
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
index 8551c1ca1..f3576d7fd 100644
--- a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
@@ -1,5 +1,8 @@
 #include "report_categories.h"
 
+#include <QList>
+#include <qnamespace.h>
+
 namespace ReportCategories
 {
 const QStringList &keys()
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
index 2a1e3b283..50340c350 100644
--- a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
@@ -1,5 +1,9 @@
 #include "server_rate_limiter.h"
 
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <compare>
+
 bool ServerRateLimiter::isRateLimited(const QString &host, const QDateTime &now) const
 {
     auto it = backoffUntil.constFind(host);
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
index e071b9189..cae26983d 100644
--- a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
@@ -4,6 +4,7 @@
 #include <QDateTime>
 #include <QMap>
 #include <QString>
+#include <QtGlobal>
 
 /**
  * @class ServerRateLimiter
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
index b06bcffc6..41c6107b3 100644
--- a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
@@ -1,13 +1,23 @@
 #include "translation_loader.h"
 
+#include <QChar>
 #include <QCoreApplication>
+#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QLatin1Char>
 #include <QLibraryInfo>
+#include <QMessageLogger>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include <QSet>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTranslator>
+#include <QtGlobal>
 #include <algorithm>
+#include <initializer_list>
 
 // Kept under the historical category name so existing QT_LOGGING_RULES filters keep working.
 Q_LOGGING_CATEGORY(TranslationLoaderLog, "qt_translator")
diff --git a/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
index b5ca563ff..ad0fc86f0 100644
--- a/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
@@ -1,5 +1,9 @@
 #include "warning_categories.h"
 
+#include <QChar>
+#include <QStringList>
+#include <qnamespace.h>
+
 QList<WarningCategory> parseWarningCategories(const QString &value)
 {
     QList<WarningCategory> categories;
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index 103c72784..cae2ee37d 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -5,8 +5,12 @@
 
 #include <../../cockatrice/src/client/settings/cache_settings.h>
 #include <QApplication>
+#include <QCommandLineOption>
 #include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QGuiApplication>
 #include <QIcon>
+#include <QString>
 #include <QTimer>
 #include <QTranslator>
 #include <libcockatrice/settings/personal_settings.h>
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 88b522197..b30565ed0 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -1,20 +1,36 @@
 #include "oracleimporter.h"
 
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/format/format_legality_rules.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
+#include "libcockatrice/card/relation/card_relation_type.h"
 #include "libcockatrice/interfaces/noop_card_preference_provider.h"
 #include "libcockatrice/interfaces/noop_card_set_priority_controller.h"
 #include "parsehelpers.h"
 
+#include <QChar>
 #include <QDebug>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
+#include <QJsonValue>
+#include <QJsonValueConstRef>
+#include <QJsonValueRef>
+#include <QPair>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #include <QSet>
+#include <QSharedPointer>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
 #include <climits>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <qlogging.h>
+
+class ICardSetPriorityController;
 
 static const QList<AllowedCount> kConstructedCounts = {{4, "legal"}, {0, "banned"}};
 
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index c8d3a19bf..4057144c1 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -1,18 +1,29 @@
 #ifndef ORACLEIMPORTER_H
 #define ORACLEIMPORTER_H
 
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
 #include "raw_json_scanner.h"
 
 #include <QAtomicInt>
 #include <QByteArray>
+#include <QDate>
+#include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QMap>
-#include <QRegularExpression>
-#include <QVariant>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/card/card_info.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 #include <utility>
 
+class CardRelation;
+class QRegularExpression;
+
 // many users prefer not to see these sets with non english arts
 // they will given priority PriorityLowest
 const QStringList nonEnglishSets = {"4BB", "FBB", "PS11", "PSAL", "REN", "RIN"};
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 9ce0d7b51..b92feae8f 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -6,17 +6,24 @@
 #include "pages.h"
 #include "pagetemplates.h"
 
-#include <QCheckBox>
-#include <QFileDialog>
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QNetworkReply>
-#include <QPushButton>
-#include <QScrollBar>
-#include <QtConcurrent>
-#include <QtGui>
+#include <QAbstractButton>
+#include <QApplication>
+#include <QDebug>
+#include <QDialog>
+#include <QEvent>
+#include <QFile>
+#include <QIODevice>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QSettings>
+#include <QVariant>
+#include <QWizardPage>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/personal_settings.h>
+#include <qlogging.h>
+
+class QWidget;
 
 OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
 {
diff --git a/oracle/src/oraclewizard.h b/oracle/src/oraclewizard.h
index 9a509ce5e..2dfcc2cdc 100644
--- a/oracle/src/oraclewizard.h
+++ b/oracle/src/oraclewizard.h
@@ -1,21 +1,16 @@
 #ifndef ORACLEWIZARD_H
 #define ORACLEWIZARD_H
 
+#include <QByteArray>
+#include <QString>
 #include <QWizard>
+#include <qtmetamacros.h>
 #include <utility>
 
-class QCheckBox;
-class QGroupBox;
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QRadioButton;
-class QProgressBar;
 class QNetworkAccessManager;
-class QTextEdit;
-class QVBoxLayout;
 class OracleImporter;
 class QSettings;
+class QWidget;
 
 class OracleWizard : public QWizard
 {
diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp
index 566c88520..43c863495 100644
--- a/oracle/src/pages.cpp
+++ b/oracle/src/pages.cpp
@@ -4,36 +4,59 @@
 #include "main.h"
 #include "oracleimporter.h"
 #include "oraclewizard.h"
-#include "pages.h"
 #include "pagetemplates.h"
 #include "version_string.h"
 
-#include <QAbstractButton>
 #include <QBuffer>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
+#include <QFile>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QGridLayout>
+#include <QIODevice>
+#include <QJsonDocument>
+#include <QJsonParseError>
 #include <QLabel>
 #include <QLineEdit>
+#include <QList>
+#include <QMap>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QObject>
 #include <QPointer>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QScrollBar>
-#include <QStandardPaths>
+#include <QSettings>
+#include <QSharedPointer>
 #include <QTextEdit>
 #include <QTextStream>
-#include <QtConcurrent>
-#include <QtGui>
+#include <QTimer>
+#include <QTranslator>
+#include <QUrl>
+#include <QVariant>
+#include <QWizard>
+#include <QtConcurrentRun>
+#include <QtGlobal>
 #include <cstdio>
+#include <functional>
 #include <libcockatrice/settings/personal_settings.h>
 #include <libcockatrice/utility/translation_loader.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
+#include <stdlib.h>
+#include <tuple>
+#include <utility>
+
+class QWidget;
 
 #ifdef HAS_LZMA
 #include "lzma/decompress.h"
diff --git a/oracle/src/pages.h b/oracle/src/pages.h
index d0a9fcd43..221f032d3 100644
--- a/oracle/src/pages.h
+++ b/oracle/src/pages.h
@@ -7,22 +7,20 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QString>
-#include <QTimer>
-#include <QWizard>
-#include <utility>
+#include <QStringList>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class QCheckBox;
-class QGroupBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QRadioButton;
 class QProgressBar;
-class QNetworkAccessManager;
 class QTextEdit;
-class QVBoxLayout;
-class OracleImporter;
-class QSettings;
+class QPushButton;
+class QUrl;
+class QWidget;
 
 class IntroPage : public OracleWizardPage
 {
diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp
index 0ffeabbb3..d37818dcb 100644
--- a/oracle/src/pagetemplates.cpp
+++ b/oracle/src/pagetemplates.cpp
@@ -3,17 +3,32 @@
 #include "oraclewizard.h"
 
 #include <QCheckBox>
+#include <QDebug>
 #include <QDir>
+#include <QFile>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QGridLayout>
+#include <QIODevice>
 #include <QLabel>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QObject>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QtGui>
+#include <QSettings>
+#include <QSharedPointer>
+#include <QUrl>
+#include <QVariant>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPage(parent)
 {
diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h
index ccad7ec62..2a996801d 100644
--- a/oracle/src/pagetemplates.h
+++ b/oracle/src/pagetemplates.h
@@ -1,15 +1,21 @@
 #ifndef PAGETEMPLATES_H
 #define PAGETEMPLATES_H
 
+#include <QByteArray>
+#include <QString>
 #include <QWizardPage>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
-class QFile;
 class QRadioButton;
 class OracleWizard;
 class QCheckBox;
 class QLabel;
 class QLineEdit;
 class QProgressBar;
+class QPushButton;
+class QUrl;
+class QWidget;
 
 class OracleWizardPage : public QWizardPage
 {
diff --git a/oracle/src/parsehelpers.cpp b/oracle/src/parsehelpers.cpp
index ee7c4eb2e..2c897031f 100644
--- a/oracle/src/parsehelpers.cpp
+++ b/oracle/src/parsehelpers.cpp
@@ -1,7 +1,11 @@
 #include "parsehelpers.h"
 
 #include <QChar>
+#include <QList>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringList>
 
 /**
  * Parses the card text to determine if the card should have the cipt tag
diff --git a/oracle/src/raw_json_scanner.cpp b/oracle/src/raw_json_scanner.cpp
index 8c4633598..2396b59ae 100644
--- a/oracle/src/raw_json_scanner.cpp
+++ b/oracle/src/raw_json_scanner.cpp
@@ -1,5 +1,9 @@
 #include "raw_json_scanner.h"
 
+#include <QByteArray>
+#include <QChar>
+#include <QSharedPointer>
+#include <QStringLiteral>
 #include <algorithm>
 #include <cstring>
 
diff --git a/oracle/src/raw_json_scanner.h b/oracle/src/raw_json_scanner.h
index 04fcc52e4..18030d834 100644
--- a/oracle/src/raw_json_scanner.h
+++ b/oracle/src/raw_json_scanner.h
@@ -1,11 +1,13 @@
 #ifndef RAW_JSON_SCANNER_H
 #define RAW_JSON_SCANNER_H
 
-#include <QByteArray>
 #include <QList>
 #include <QString>
+#include <QtGlobal>
 #include <functional>
 
+class QByteArray;
+
 namespace RawJson
 {
 
diff --git a/servatrice/src/email_parser.cpp b/servatrice/src/email_parser.cpp
index d8c30d852..44c788e67 100644
--- a/servatrice/src/email_parser.cpp
+++ b/servatrice/src/email_parser.cpp
@@ -1,6 +1,8 @@
 #include "email_parser.h"
 
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
 #include <QString>
 
 QPair<QString, QString> EmailParser::parseEmailAddress(const QString &dirtyEmailAddress)
diff --git a/servatrice/src/event_loop_watchdog.cpp b/servatrice/src/event_loop_watchdog.cpp
index e50bd4201..a2f20ff1c 100644
--- a/servatrice/src/event_loop_watchdog.cpp
+++ b/servatrice/src/event_loop_watchdog.cpp
@@ -8,6 +8,8 @@
 #include "servatrice.h"
 
 #include <QTimer>
+#include <QtGlobal>
+#include <utility>
 
 EventLoopWatchdog::EventLoopWatchdog(Servatrice *_servatrice, QString _threadName)
     : QObject(nullptr), servatrice(_servatrice), threadName(std::move(_threadName))
diff --git a/servatrice/src/event_loop_watchdog.h b/servatrice/src/event_loop_watchdog.h
index b9061ff97..d05430eaa 100644
--- a/servatrice/src/event_loop_watchdog.h
+++ b/servatrice/src/event_loop_watchdog.h
@@ -9,6 +9,7 @@
 #include <QElapsedTimer>
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
 
 class Servatrice;
 class QTimer;
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index b0ee201bf..b1a27bbaa 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -1,11 +1,34 @@
 #include "isl_interface.h"
 
+#include "libcockatrice/protocol/pb/commands.pb.h"
+#include "libcockatrice/protocol/pb/room_commands.pb.h"
+#include "libcockatrice/protocol/pb/room_event.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "main.h"
+#include "servatrice.h"
+#include "server_abstractuserinterface.h"
 #include "server_logger.h"
+#include "serverinfo_user_container.h"
 
+#include <QDebug>
+#include <QHostAddress>
+#include <QList>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QMapIterator>
+#include <QMessageLogger>
+#include <QMutexLocker>
+#include <QReadLocker>
+#include <QReadWriteLock>
+#include <QSharedPointer>
+#include <QSslError>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -17,8 +40,9 @@
 #include <libcockatrice/protocol/pb/event_server_complete_list.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 #include <server_protocolhandler.h>
 #include <server_room.h>
 
diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h
index 27e5b8293..f7680c0a2 100644
--- a/servatrice/src/isl_interface.h
+++ b/servatrice/src/isl_interface.h
@@ -1,21 +1,26 @@
 #ifndef ISL_INTERFACE_H
 #define ISL_INTERFACE_H
 
-#include "servatrice.h"
-
+#include <QAbstractSocket>
+#include <QByteArray>
+#include <QMutex>
+#include <QObject>
 #include <QSslCertificate>
-#include <QWaitCondition>
+#include <QString>
+
+// IWYU pragma: keep
+// ServerInfo_User and ServerInfo_Game are passed by value to signals, so the
+// moc-generated code needs the complete types.
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qtmetamacros.h>
 
 class Servatrice;
 class QSslSocket;
 class QSslKey;
 class IslMessage;
-
 class Event_ServerCompleteList;
-class Event_UserMessage;
 class Event_UserJoined;
 class Event_UserLeft;
 class Event_JoinRoom;
@@ -24,6 +29,11 @@ class Event_RoomSay;
 class Event_ListGames;
 class Event_RemoveMessages;
 class Command_JoinGame;
+class CommandContainer;
+class GameEventContainer;
+class Response;
+class RoomEvent;
+class SessionEvent;
 
 class IslInterface : public QObject
 {
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index 13bf95a82..eb019a2b7 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -18,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "libcockatrice/rng/rng_abstract.h"
 #include "servatrice.h"
 #include "server_logger.h"
 #include "settingscache.h"
@@ -25,16 +26,29 @@
 #include "smtpclient.h"
 #include "version_string.h"
 
+#include <QCommandLineOption>
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QDateTime>
+#include <QDebug>
 #include <QFile>
+#include <QList>
+#include <QMetaObject>
 #include <QMetaType>
-#include <QtGlobal>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QThread>
+#include <QVariant>
+#include <QVector>
+#include <google/protobuf/stubs/common.h>
 #include <iostream>
 #include <libcockatrice/rng/rng_sfmt.h>
 #include <libcockatrice/utility/cryptoutil.h>
 #include <libcockatrice/utility/passwordhasher.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <string>
 
 RNG_Abstract *rng;
 ServerLogger *logger;
diff --git a/servatrice/src/metrics_registry.cpp b/servatrice/src/metrics_registry.cpp
index 99ce390f1..51abb7e3e 100644
--- a/servatrice/src/metrics_registry.cpp
+++ b/servatrice/src/metrics_registry.cpp
@@ -1,6 +1,7 @@
 #include "metrics_registry.h"
 
 #include <QList>
+#include <stddef.h>
 
 void MetricsRegistry::observeCommand(int typeId, qint64 elapsedMs)
 {
diff --git a/servatrice/src/metrics_registry.h b/servatrice/src/metrics_registry.h
index 4df1057c2..1175d03c4 100644
--- a/servatrice/src/metrics_registry.h
+++ b/servatrice/src/metrics_registry.h
@@ -7,7 +7,7 @@
 #define METRICS_REGISTRY_H
 
 #include <QList>
-#include <QString>
+#include <QtGlobal>
 #include <array>
 #include <atomic>
 
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 3dd7ab510..0329a31fd 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -22,10 +22,14 @@
 #include "email_parser.h"
 #include "event_loop_watchdog.h"
 #include "isl_interface.h"
+#include "libcockatrice/protocol/pb/response_report_stats.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
 #include "main.h"
 #include "servatrice_connection_pool.h"
 #include "servatrice_database_interface.h"
+#include "server.h"
 #include "server_logger.h"
+#include "server_protocolhandler.h"
 #include "serversocketinterface.h"
 #include "settingscache.h"
 #include "smtpclient.h"
@@ -33,20 +37,37 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
+#include <QIODevice>
+#include <QMapIterator>
+#include <QMetaObject>
+#include <QMutableListIterator>
+#include <QObject>
 #include <QProcessEnvironment>
+#include <QReadLocker>
+#include <QSharedPointer>
+#include <QSqlDatabase>
 #include <QSqlQuery>
+#include <QSsl>
 #include <QString>
 #include <QStringList>
+#include <QThread>
 #include <QTimer>
+#include <QTypeInfo>
 #include <QUrl>
+#include <QVariant>
+#include <QtGlobal>
+#include <compare>
 #include <game/server_game.h>
-#include <iostream>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
+#include <new>
+#include <qlogging.h>
+#include <qnamespace.h>
 #include <server_room.h>
+#include <string>
 
 Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
                                              int _numberPools,
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index f39a44d51..242d445ad 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -22,34 +22,44 @@
 
 #include "metrics_registry.h"
 
+#include <QByteArray>
 #include <QDateTime>
 #include <QHostAddress>
+#include <QList>
+#include <QMap>
 #include <QMetaType>
 #include <QMutex>
+#include <QMutexLocker>
 #include <QReadWriteLock>
-#include <QSqlDatabase>
 #include <QSslCertificate>
 #include <QSslKey>
+#include <QString>
+
+// IWYU pragma: keep
+// Q_DECLARE_METATYPE below needs the complete type.
+#include <QSqlDatabase>
 #include <QTcpServer>
 #include <QWebSocketServer>
+#include <QtGlobal>
 #include <atomic>
 #include <libcockatrice/protocol/pb/response_report_stats.pb.h>
 #include <memory>
+#include <qtmetamacros.h>
 #include <server.h>
 #include <utility>
 
+class QObject;
+class QThread;
+class SessionEvent;
+
 Q_DECLARE_METATYPE(QSqlDatabase)
 
-class QSqlQuery;
 class QTimer;
-
-class GameReplay;
 class Servatrice;
 class Servatrice_ConnectionPool;
 class Servatrice_DatabaseInterface;
 class AbstractServerSocketInterface;
 class IslInterface;
-class FeatureSet;
 
 class Servatrice_GameServer : public QTcpServer
 {
diff --git a/servatrice/src/servatrice_connection_pool.h b/servatrice/src/servatrice_connection_pool.h
index 7479122cf..ddd12fc95 100644
--- a/servatrice/src/servatrice_connection_pool.h
+++ b/servatrice/src/servatrice_connection_pool.h
@@ -4,6 +4,7 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QObject>
+#include <qtmetamacros.h>
 
 class Servatrice_DatabaseInterface;
 
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index bb67d78eb..ac3a19c8e 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1,24 +1,46 @@
 #include "servatrice_database_interface.h"
 
 #include "deck_tag_serialization.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_chat_message.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user_alt.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user_session.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
 #include "servatrice.h"
-#include "serversocketinterface.h"
+#include "server.h"
+#include "server_protocolhandler.h"
 #include "settingscache.h"
 
+#include <QByteArray>
 #include <QChar>
 #include <QDateTime>
 #include <QDebug>
-#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonValue>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QMessageLogger>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSet>
+#include <QSetIterator>
+#include <QSharedPointer>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QStringList>
+#include <QVariant>
+#include <QVariantList>
+#include <google/protobuf/stubs/common.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/passwordhasher.h>
+#include <qalgorithms.h>
+#include <qnamespace.h>
+#include <string>
 
 inline Q_LOGGING_CATEGORY(DatabaseInterfaceLog, "database_interface");
 
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index ce51a2474..0509d1a03 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,18 +1,26 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
-#include <QChar>
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 #include <QHash>
-#include <QObject>
+#include <QList>
 #include <QSqlDatabase>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user_alt.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user_session.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_warning.pb.h>
+#include <qtmetamacros.h>
 #include <server.h>
 #include <server_database_interface.h>
 
+class QSqlQuery;
+
 #define DATABASE_SCHEMA_VERSION 37
 
 class Servatrice;
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 620780052..1972444f1 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -6,8 +6,16 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QForeach>
+#include <QIODevice>
 #include <QTextStream>
+#include <QThread>
+#include <QVariant>
+#include <QtGlobal>
 #include <iostream>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
+#include <string>
 
 ServerLogger::ServerLogger(bool _logToConsole, QObject *parent)
     : QObject(parent), logToConsole(_logToConsole), flushRunning(false)
diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h
index 0ad092b66..f2875a6a3 100644
--- a/servatrice/src/server_logger.h
+++ b/servatrice/src/server_logger.h
@@ -1,14 +1,14 @@
 #ifndef SERVER_LOGGER_H
 #define SERVER_LOGGER_H
 
+#include <QList>
 #include <QMutex>
 #include <QObject>
+#include <QString>
 #include <QStringList>
-#include <QThread>
-#include <QWaitCondition>
+#include <qtmetamacros.h>
 
 class QFile;
-class Server_ProtocolHandler;
 
 class ServerLogger : public QObject
 {
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index a8d13675d..a5332dab0 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -22,28 +22,63 @@
 
 #include "deck_tag_serialization.h"
 #include "email_parser.h"
+#include "libcockatrice/protocol/pb/admin_commands.pb.h"
+#include "libcockatrice/protocol/pb/developer_commands.pb.h"
+#include "libcockatrice/protocol/pb/moderator_commands.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_deck_share_summary.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_warning.pb.h"
+#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "libcockatrice/protocol/pb/session_event.pb.h"
+#include "libcockatrice/utility/card_ref.h"
 #include "main.h"
+#include "metrics_registry.h"
 #include "servatrice.h"
 #include "servatrice_database_interface.h"
+#include "server.h"
+#include "server_database_interface.h"
 #include "server_logger.h"
+#include "server_protocolhandler.h"
 #include "settingscache.h"
 #include "version_string.h"
 
+#include <QChar>
+#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QHostAddress>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonValueRef>
+#include <QListIterator>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QMutexLocker>
+#include <QNetworkRequest>
 #include <QRandomGenerator>
-#include <QRegularExpression>
+#include <QReadLocker>
+#include <QReadWriteLock>
+#include <QSharedPointer>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QString>
+#include <QStringLiteral>
+#include <QTextStream>
+#include <QVariant>
+#include <QtGlobal>
 #include <algorithm>
-#include <game/server_player.h>
+#include <exception>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/repeated_ptr_field.h>
+#include <google/protobuf/stubs/common.h>
+#include <google/protobuf/stubs/port.h>
+#include <initializer_list>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
@@ -85,8 +120,6 @@
 #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/response_ban_history.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
@@ -131,9 +164,16 @@
 #include <libcockatrice/utility/report_categories.h>
 #include <libcockatrice/utility/string_limits.h>
 #include <libcockatrice/utility/warning_categories.h>
+#include <memory>
+#include <qlogging.h>
+#include <qnamespace.h>
 #include <server_response_containers.h>
 #include <server_room.h>
+#include <stddef.h>
 #include <string>
+#include <utility>
+
+class QObject;
 
 inline Q_LOGGING_CATEGORY(AbstractServerSocketInterfaceLog, "abstract_server_socket_interface");
 inline Q_LOGGING_CATEGORY(TcpServerSocketInterfaceLog, "tcp_server_socket_interface");
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 36b900d28..27708ed27 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,28 +20,26 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+
+#include <QAbstractSocket>
+#include <QByteArray>
 #include <QHostAddress>
+#include <QList>
 #include <QMutex>
+#include <QString>
+#include <QStringList>
 #include <QTcpSocket>
 #include <QWebSocket>
-#include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
-#include <libcockatrice/protocol/pb/command_report.pb.h>
-#include <libcockatrice/protocol/pb/command_report_add_comment.pb.h>
-#include <libcockatrice/protocol/pb/command_report_assign.pb.h>
-#include <libcockatrice/protocol/pb/command_report_details.pb.h>
-#include <libcockatrice/protocol/pb/command_report_list.pb.h>
-#include <libcockatrice/protocol/pb/command_report_my_list.pb.h>
-#include <libcockatrice/protocol/pb/command_report_resolve.pb.h>
-#include <libcockatrice/protocol/pb/command_report_stats.pb.h>
-#include <libcockatrice/protocol/pb/command_report_user_info.pb.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 #include <server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;
 class DeckList;
 class ServerInfo_DeckStorage_Folder;
-
 class Command_AddToList;
 class Command_RemoveFromList;
 class Command_DeckList;
@@ -64,16 +62,51 @@ class Command_ReplayModifyMatch;
 class Command_ReplayDeleteMatch;
 class Command_ReplayGetCode;
 class Command_ReplaySubmitCode;
-
 class Command_BanFromServer;
 class Command_UpdateServerMessage;
 class Command_ShutdownServer;
 class Command_ReloadConfig;
 class Command_ReplayDownloadByGameId;
-
 class Command_AccountEdit;
 class Command_AccountImage;
 class Command_AccountPassword;
+class Command_Activate;
+class Command_AddCardArtRule;
+class Command_AdjustMod;
+class Command_ForceActivateUser;
+class Command_ForgotPasswordChallenge;
+class Command_ForgotPasswordRequest;
+class Command_ForgotPasswordReset;
+class Command_GetAdminNotes;
+class Command_GetBanHistory;
+class Command_GetModeratorLastLogins;
+class Command_GetServerStats;
+class Command_GetUserAlts;
+class Command_GetUserSessions;
+class Command_GetWarnHistory;
+class Command_GetWarnList;
+class Command_GrantReplayAccess;
+class Command_ListCardArtRules;
+class Command_Register;
+class Command_RemoveCardArtRule;
+class Command_RemoveUserAvatar;
+class Command_Report;
+class Command_ReportAddComment;
+class Command_ReportAssign;
+class Command_ReportDetails;
+class Command_ReportList;
+class Command_ReportMyList;
+class Command_ReportResolve;
+class Command_ReportStats;
+class Command_ReportUserInfo;
+class Command_RequestPasswordSalt;
+class Command_ResetUserPassword;
+class Command_SetCardArtParams;
+class Command_UpdateAdminNotes;
+class Command_ViewLogHistory;
+class Command_WarnUser;
+class QObject;
+class ResponseContainer;
 
 class AbstractServerSocketInterface : public Server_ProtocolHandler
 {
diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp
index f6c862904..4ecac7319 100644
--- a/servatrice/src/settingscache.cpp
+++ b/servatrice/src/settingscache.cpp
@@ -4,6 +4,13 @@
 #include <QDebug>
 #include <QFile>
 #include <QStandardPaths>
+#include <QStringList>
+#include <QVariant>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qsystemdetection.h>
+
+class QObject;
 
 SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format, QObject *parent)
     : QSettings(fileName, format, parent)
diff --git a/servatrice/src/settingscache.h b/servatrice/src/settingscache.h
index 6922d3508..817a62bfa 100644
--- a/servatrice/src/settingscache.h
+++ b/servatrice/src/settingscache.h
@@ -5,6 +5,9 @@
 #include <QRegularExpression>
 #include <QSettings>
 #include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class SettingsCache : public QSettings
 {
diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp
index b4513979f..32cd5b206 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -5,6 +5,10 @@
 #include "settingscache.h"
 
 #include <QSocketNotifier>
+#include <QThread>
+#include <QtGlobal>
+#include <qobjectdefs.h>
+#include <qsystemdetection.h>
 
 #ifdef Q_OS_UNIX
 #include <cstdio>
diff --git a/servatrice/src/signalhandler.h b/servatrice/src/signalhandler.h
index bf8d9e52a..82652a43a 100644
--- a/servatrice/src/signalhandler.h
+++ b/servatrice/src/signalhandler.h
@@ -2,6 +2,7 @@
 #define SIGNALHANDLER_H
 
 #include <QObject>
+#include <qtmetamacros.h>
 
 class QSocketNotifier;
 
diff --git a/servatrice/src/smtpclient.cpp b/servatrice/src/smtpclient.cpp
index 3ec333413..a45588b8b 100644
--- a/servatrice/src/smtpclient.cpp
+++ b/servatrice/src/smtpclient.cpp
@@ -1,10 +1,18 @@
 #include "smtpclient.h"
 
 #include "settingscache.h"
+#include "smtp/qxtmailmessage.h"
 #include "smtp/qxtsmtp.h"
 
+#include <QAbstractSocket>
+#include <QByteArray>
+#include <QDebug>
+#include <QSharedPointer>
 #include <QSslSocket>
 #include <QTcpSocket>
+#include <QVariant>
+#include <qlogging.h>
+#include <qobjectdefs.h>
 
 SmtpClient::SmtpClient(QObject *parent) : QObject(parent)
 {
diff --git a/servatrice/src/smtpclient.h b/servatrice/src/smtpclient.h
index be97ed44d..8fc4e35cb 100644
--- a/servatrice/src/smtpclient.h
+++ b/servatrice/src/smtpclient.h
@@ -2,9 +2,11 @@
 #define SMTPCLIENT_H
 
 #include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QxtSmtp;
-class QxtMailMessage;
+class QByteArray;
 
 class SmtpClient : public QObject
 {
diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
index 8fab42566..4f5282235 100644
--- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
+++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
@@ -1,6 +1,7 @@
 #include "card_zone_algorithms.h"
 
 #include <gtest/gtest.h>
+#include <string>
 #include <vector>
 
 struct MockCardRef
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index 392f6395a..0bfd8a5dd 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,7 +1,18 @@
-#include "mocks.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/card/set/card_set_list.h"
 #include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
+#include <QDate>
+#include <QFile>
+#include <QHash>
+#include <QIODevice>
+#include <QList>
+#include <QSharedPointer>
+#include <QString>
 #include <QTemporaryDir>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_data.h>
@@ -10,6 +21,8 @@
 #include <libcockatrice/card/printing/printing_info.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <string>
+
 namespace
 {
 
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index dcf1cf0a2..95225e28c 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -1,13 +1,29 @@
-#include "mocks.h"
+#include "libcockatrice/card/card_localization.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/set/card_set.h"
 #include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
+#include <QDate>
+#include <QHash>
+#include <QList>
+#include <QPair>
+#include <QSharedPointer>
+#include <QString>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/printing/printing_info.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <string>
+#include <utility>
+
+namespace
+{
+class CardQuery;
+}
 
 #define QUERY(name, card, query, match)                                                                                \
     TEST_F(CardQuery, name)                                                                                            \
diff --git a/tests/carddatabase/load_benchmark.cpp b/tests/carddatabase/load_benchmark.cpp
index 8e9e80e4d..5492b9531 100644
--- a/tests/carddatabase/load_benchmark.cpp
+++ b/tests/carddatabase/load_benchmark.cpp
@@ -12,25 +12,30 @@
  * (~/.local/share/Cockatrice/Cockatrice/...).
  */
 
-#include "mocks.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/set/card_set_list.h"
 
-#include "gtest/gtest.h"
 #include <QAbstractItemModel>
 #include <QCoreApplication>
-#include <QDateTime>
+#include <QDebug>
 #include <QDir>
 #include <QElapsedTimer>
-#include <QEventLoop>
 #include <QFile>
+#include <QHash>
+#include <QList>
 #include <QLoggingCategory>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
 #include <QStringList>
-#include <QTimer>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_loader.h>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/noop_card_preference_provider.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/models/database/card_database_model.h>
+#include <qlogging.h>
 
 static QString defaultXdgPath(const QString &file)
 {
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index 016642005..b7cfe8243 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -7,7 +7,7 @@
 
 #define PICTURELOADER_H
 
-#include <libcockatrice/card/database/card_database.h>
+#include "libcockatrice/card/card_info.h"
 
 class CardPictureLoader
 {
diff --git a/tests/clamped_arithmetic_test.cpp b/tests/clamped_arithmetic_test.cpp
index 2471d5870..e5fd070b0 100644
--- a/tests/clamped_arithmetic_test.cpp
+++ b/tests/clamped_arithmetic_test.cpp
@@ -6,6 +6,7 @@
 #include <gtest/gtest.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <limits>
+#include <string>
 
 TEST(AddClamped, AddsWithinBounds)
 {
diff --git a/tests/deck_hash_performance_test.cpp b/tests/deck_hash_performance_test.cpp
index 154283e8e..135c218c5 100644
--- a/tests/deck_hash_performance_test.cpp
+++ b/tests/deck_hash_performance_test.cpp
@@ -1,6 +1,10 @@
 #include "gtest/gtest.h"
-#include <QDebug>
+#include <QChar>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <string>
 
 static constexpr int amount = 1e5;
 QString repeatDeck;
diff --git a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
index 7f4ab81e1..95df74702 100644
--- a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
+++ b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
@@ -9,10 +9,19 @@
  * full model and card database machinery.
  */
 
+#include "deck_list_model_custom_zones.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+#include <string>
+#include <utility>
 
 namespace
 {
diff --git a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
index a4562c95d..63c904910 100644
--- a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
+++ b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
@@ -1,3 +1,12 @@
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+
+#include <QList>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
 #include <gtest/gtest.h>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -8,6 +17,10 @@
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+#include <string>
+
+class QModelIndex;
 
 namespace
 {
diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp
index 801f226a9..1903b70df 100644
--- a/tests/deck_list_zones/deck_list_zones_test.cpp
+++ b/tests/deck_list_zones/deck_list_zones_test.cpp
@@ -7,12 +7,20 @@
  * "main" are still mainboard cards for hashing, sideboard size, legality and export.
  */
 
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+
+#include <QList>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
 #include <QStringList>
+#include <functional>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_list_node_tree.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/dummy_test.cpp b/tests/dummy_test.cpp
index 31a01bcff..8fd9c78dd 100644
--- a/tests/dummy_test.cpp
+++ b/tests/dummy_test.cpp
@@ -1,4 +1,5 @@
 #include "gtest/gtest.h"
+#include <string>
 
 namespace
 {
diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp
index 4fbe98cb9..b3c4b586c 100644
--- a/tests/expression_test.cpp
+++ b/tests/expression_test.cpp
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 #include <QtMath>
 #include <libcockatrice/utility/expression.h>
+#include <string>
 
 #define TEST_EXPR(name, a, b)                                                                                          \
     TEST(ExpressionTest, name)                                                                                         \
diff --git a/tests/lag_monitor_test.cpp b/tests/lag_monitor_test.cpp
index 9948eeabb..b404a2c9e 100644
--- a/tests/lag_monitor_test.cpp
+++ b/tests/lag_monitor_test.cpp
@@ -5,6 +5,8 @@
 #include <QEvent>
 #include <QLoggingCategory>
 #include <gtest/gtest.h>
+#include <qnumeric.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/latency_tracker_test.cpp b/tests/latency_tracker_test.cpp
index 68631b7ca..a77051799 100644
--- a/tests/latency_tracker_test.cpp
+++ b/tests/latency_tracker_test.cpp
@@ -1,5 +1,9 @@
+#include <QList>
+#include <QtGlobal>
 #include <gtest/gtest.h>
+#include <initializer_list>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
+#include <string>
 
 TEST(LatencyTrackerTest, EmptyTrackerYieldsZeroedStats)
 {
diff --git a/tests/loader_local_matching_test.cpp b/tests/loader_local_matching_test.cpp
index 6ce684fdd..13d3e5bb3 100644
--- a/tests/loader_local_matching_test.cpp
+++ b/tests/loader_local_matching_test.cpp
@@ -1,7 +1,11 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_local.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
 #include "gtest/gtest.h"
+#include <QByteArray>
+#include <QByteArrayView>
 #include <QColor>
 #include <QCoreApplication>
 #include <QDir>
@@ -9,13 +13,18 @@
 #include <QImage>
 #include <QImageWriter>
 #include <QLoggingCategory>
+#include <QSharedPointer>
 #include <QStandardPaths>
+#include <QString>
 #include <QTemporaryDir>
+#include <QtGlobal>
 #include <libcockatrice/card/lazy_properties_hash.h>
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/card/set/card_set.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <qnamespace.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp
index a9977b800..3f652a495 100644
--- a/tests/loading_from_clipboard/clipboard_testing.cpp
+++ b/tests/loading_from_clipboard/clipboard_testing.cpp
@@ -1,6 +1,12 @@
 #include "clipboard_testing.h"
 
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+
+#include <QSharedPointer>
 #include <QTextStream>
+#include <functional>
+#include <gtest/gtest.h>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h
index 41d8ea794..c9852e5d7 100644
--- a/tests/loading_from_clipboard/clipboard_testing.h
+++ b/tests/loading_from_clipboard/clipboard_testing.h
@@ -1,8 +1,11 @@
 #ifndef CLIPBOARD_TESTING_H
 #define CLIPBOARD_TESTING_H
 
-#include "gtest/gtest.h"
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QList>
+#include <QString>
+#include <QVector>
+#include <string>
+#include <utility>
 
 // using std types because qt types aren't understood by gtest (without this you'll get less nice errors)
 using CardRows = QVector<std::pair<std::string, int>>;
diff --git a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
index fcfbb22db..840d926ff 100644
--- a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
+++ b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
@@ -1,5 +1,11 @@
 #include "clipboard_testing.h"
 
+#include <QList>
+#include <QString>
+#include <gtest/gtest.h>
+#include <string>
+#include <utility>
+
 // Testing is done by using the DeckList::loadFromString_Plain function in common/decklist.h
 // It does not check if cards are in the database at all, so no comparisons to the database will be made.
 
diff --git a/tests/metrics_registry_test.cpp b/tests/metrics_registry_test.cpp
index 1abef58e1..39a8f8aaf 100644
--- a/tests/metrics_registry_test.cpp
+++ b/tests/metrics_registry_test.cpp
@@ -2,6 +2,7 @@
 #include <QList>
 #include <gtest/gtest.h>
 #include <metrics_registry.h>
+#include <string>
 
 TEST(MetricsRegistryTest, EmptyRegistryHasZeroedCounters)
 {
diff --git a/tests/movecard_tests/reverse_card_move_test.cpp b/tests/movecard_tests/reverse_card_move_test.cpp
index 64c93078c..6bed20d18 100644
--- a/tests/movecard_tests/reverse_card_move_test.cpp
+++ b/tests/movecard_tests/reverse_card_move_test.cpp
@@ -3,15 +3,20 @@
 #include "game/server_card.h"
 #include "game/server_cardzone.h"
 #include "game/server_game.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
 #include "server_response_containers.h"
 #include "server_room.h"
 #include "server_test_helpers.h"
 
+#include <QList>
+#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/zone_names.h>
+#include <string>
 
 RNG_Abstract *rng = nullptr; // this needs to be defined due to other functions in server
 
diff --git a/tests/oracle/oracle_importer_benchmark_test.cpp b/tests/oracle/oracle_importer_benchmark_test.cpp
index 633c9e40a..77b44af71 100644
--- a/tests/oracle/oracle_importer_benchmark_test.cpp
+++ b/tests/oracle/oracle_importer_benchmark_test.cpp
@@ -1,21 +1,37 @@
 #include "../../oracle/src/oracleimporter.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/set/card_set.h"
 
 #include "gtest/gtest.h"
 #include <QBuffer>
+#include <QByteArray>
+#include <QChar>
 #include <QCoreApplication>
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QEventLoop>
 #include <QFile>
+#include <QIODevice>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <QList>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
 #include <QTimer>
 #include <QUrl>
+#include <QtGlobal>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <qlogging.h>
+#include <qsystemdetection.h>
+#include <string>
+#include <utility>
 
 #if defined(HAS_LZMA)
 #include "../../oracle/src/lzma/decompress.h"
diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp
index f66616e37..83d77d465 100644
--- a/tests/oracle/oracle_importer_test.cpp
+++ b/tests/oracle/oracle_importer_test.cpp
@@ -1,15 +1,34 @@
 #include "../../oracle/src/oracleimporter.h"
+#include "../../oracle/src/raw_json_scanner.h"
+#include "libcockatrice/card/card_info.h"
 
 #include "gtest/gtest.h"
+#include <QByteArray>
+#include <QChar>
+#include <QDate>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <QList>
+#include <QMap>
 #include <QObject>
 #include <QPair>
-#include <QSet>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QString>
+#include <QUuid>
+#include <QVariant>
+#include <QVariantMap>
+#include <QtGlobal>
 #include <libcockatrice/card/format/format_legality_rules.h>
 #include <libcockatrice/card/set/card_set.h>
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <string>
+#include <utility>
 
 class OracleImporterTest : public ::testing::Test
 {
diff --git a/tests/oracle/parse_cipt_test.cpp b/tests/oracle/parse_cipt_test.cpp
index f5036f962..10268d659 100644
--- a/tests/oracle/parse_cipt_test.cpp
+++ b/tests/oracle/parse_cipt_test.cpp
@@ -1,6 +1,7 @@
 #include "../../oracle/src/parsehelpers.h"
 
 #include "gtest/gtest.h"
+#include <string>
 
 TEST(ParseCiptTest, parsesThisEntersTapped)
 {
diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp
index 2b8f8bdb7..2a504b81c 100644
--- a/tests/password_hash_test.cpp
+++ b/tests/password_hash_test.cpp
@@ -1,6 +1,9 @@
 #include "gtest/gtest.h"
+#include <QChar>
+#include <QString>
 #include <cstring>
 #include <libcockatrice/utility/passwordhasher.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/picture_loader_benchmark/picture_loader_benchmark.cpp b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
index f991f2ec0..587cef65f 100644
--- a/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
+++ b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
@@ -25,22 +25,34 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_worker.h"
 #include "interface/card_picture_loader/card_picture_to_load.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_loader.h"
 
+#include <QByteArrayView>
 #include <QCoreApplication>
 #include <QDir>
 #include <QElapsedTimer>
 #include <QEventLoop>
 #include <QFile>
+#include <QFlags>
 #include <QImage>
+#include <QLatin1String>
 #include <QList>
 #include <QMessageLogContext>
 #include <QMetaType>
 #include <QMutex>
+#include <QMutexLocker>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <QThread>
 #include <QTimer>
 #include <QUrl>
-#include <QtLogging>
+#include <QtGlobal>
+#include <QtMessageHandler>
 #include <atomic>
 #include <cstdio>
 #include <libcockatrice/card/database/card_database.h>
@@ -51,6 +63,8 @@
 #include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <optional>
+#include <qsystemdetection.h>
+#include <utility>
 
 class BenchmarkCardDatabasePathProvider : public ICardDatabasePathProvider
 {
diff --git a/tests/picture_loader_benchmark/settings_cache_mock.cpp b/tests/picture_loader_benchmark/settings_cache_mock.cpp
index d93c7e002..13e831b62 100644
--- a/tests/picture_loader_benchmark/settings_cache_mock.cpp
+++ b/tests/picture_loader_benchmark/settings_cache_mock.cpp
@@ -17,15 +17,21 @@
 #include "client/settings/cache_settings.h"
 #include "interface/card_picture_loader/card_picture_loader_cache_method.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QFile>
+#include <QLoggingCategory>
+#include <QMessageLogger>
 #include <QSettings>
+#include <QSharedPointer>
 #include <QStandardPaths>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <utility>
+#include <qtmetamacros.h>
 
 QString SettingsCache::getDataPath()
 {
diff --git a/tests/playmat_resolver_test.cpp b/tests/playmat_resolver_test.cpp
index a931c0647..6730ec137 100644
--- a/tests/playmat_resolver_test.cpp
+++ b/tests/playmat_resolver_test.cpp
@@ -1,6 +1,15 @@
+#include "libcockatrice/interfaces/interface_interface_settings_provider.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <gtest/gtest.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/report_categories_test.cpp b/tests/report_categories_test.cpp
index 790b2cff6..1e08938db 100644
--- a/tests/report_categories_test.cpp
+++ b/tests/report_categories_test.cpp
@@ -3,6 +3,7 @@
 #include <QString>
 #include <QStringList>
 #include <libcockatrice/utility/report_categories.h>
+#include <string>
 
 TEST(ReportCategoriesTest, CanonicalListIsNonEmptyAndStable)
 {
diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp
index c8bc43f8f..6308d80b9 100644
--- a/tests/server_card_counter_test.cpp
+++ b/tests/server_card_counter_test.cpp
@@ -3,12 +3,14 @@
  *  @ingroup Tests
  */
 
+#include <QMap>
+#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_card.h>
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/counter_limits.h>
-#include <limits>
+#include <string>
 
 TEST(ServerCardCounter, IncrementNewCounter)
 {
diff --git a/tests/server_counter_test.cpp b/tests/server_counter_test.cpp
index 0f41f2cbd..492aecf66 100644
--- a/tests/server_counter_test.cpp
+++ b/tests/server_counter_test.cpp
@@ -3,9 +3,13 @@
  *  @ingroup Tests
  */
 
+#include "libcockatrice/protocol/pb/color.pb.h"
+
+#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_counter.h>
 #include <limits>
+#include <string>
 
 TEST(ServerCounter, IncrementDoesNotOverflow)
 {
diff --git a/tests/server_developer_role_test.cpp b/tests/server_developer_role_test.cpp
index 127f606a8..c77fc5b21 100644
--- a/tests/server_developer_role_test.cpp
+++ b/tests/server_developer_role_test.cpp
@@ -3,6 +3,10 @@
  *  @ingroup Tests
  */
 
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+
+#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/server.h>
 #include <libcockatrice/network/server/remote/server_protocolhandler.h>
@@ -11,6 +15,8 @@
 #include <libcockatrice/protocol/pb/developer_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
+#include <stdint.h>
+#include <string>
 
 // The server_remote library references the global RNG, which is normally
 // defined by the servatrice/client executable main(). Provide a stub so the
diff --git a/tests/server_game_join_test.cpp b/tests/server_game_join_test.cpp
index c84e4e066..8a2ae8c45 100644
--- a/tests/server_game_join_test.cpp
+++ b/tests/server_game_join_test.cpp
@@ -3,14 +3,19 @@
  *  @ingroup Tests
  */
 
+#include "game/game_config.h"
 #include "game/server_game.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
 #include "server.h"
 #include "server_database_interface.h"
 #include "server_room.h"
 
+#include <QList>
+#include <QString>
 #include <gtest/gtest.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/rng/rng_abstract.h>
+#include <string>
 
 RNG_Abstract *rng = nullptr; // referenced by the server_remote library
 
diff --git a/tests/server_rate_limiter_test.cpp b/tests/server_rate_limiter_test.cpp
index bc15ca421..8459c9690 100644
--- a/tests/server_rate_limiter_test.cpp
+++ b/tests/server_rate_limiter_test.cpp
@@ -1,7 +1,11 @@
 #include "gtest/gtest.h"
 #include <QDateTime>
+#include <QString>
 #include <QTimeZone>
+#include <QtGlobal>
+#include <compare>
 #include <libcockatrice/utility/server_rate_limiter.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/settings/settings_defaults_test.cpp b/tests/settings/settings_defaults_test.cpp
index 379f6cd84..03de21e8a 100644
--- a/tests/settings/settings_defaults_test.cpp
+++ b/tests/settings/settings_defaults_test.cpp
@@ -1,5 +1,10 @@
+#include "libcockatrice/card/card_localization.h"
+
 #include "gtest/gtest.h"
-#include <QSettings>
+#include <QHash>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QTemporaryDir>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
@@ -15,6 +20,8 @@
 #include <libcockatrice/settings/tabs_settings.h>
 #include <libcockatrice/settings/updates_settings.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <string>
+#include <utility>
 
 namespace
 {
diff --git a/tests/settings/settings_manager_test.cpp b/tests/settings/settings_manager_test.cpp
index 51eb66dbb..23d27aa78 100644
--- a/tests/settings/settings_manager_test.cpp
+++ b/tests/settings/settings_manager_test.cpp
@@ -1,7 +1,11 @@
 #include "gtest/gtest.h"
 #include <QSettings>
+#include <QString>
 #include <QTemporaryDir>
+#include <QVariant>
+#include <functional>
 #include <libcockatrice/settings/settings_manager.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/settings/settings_migration_test.cpp b/tests/settings/settings_migration_test.cpp
index 84b948d2e..8994ebca6 100644
--- a/tests/settings/settings_migration_test.cpp
+++ b/tests/settings/settings_migration_test.cpp
@@ -1,13 +1,24 @@
 #include "gtest/gtest.h"
+#include <QByteArray>
+#include <QByteArrayView>
+#include <QChar>
 #include <QColor>
 #include <QCoreApplication>
 #include <QDate>
 #include <QDir>
 #include <QFile>
+#include <QIODevice>
+#include <QList>
 #include <QSettings>
+#include <QString>
 #include <QStringList>
+#include <QStringLiteral>
 #include <QTemporaryDir>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/settings/settings_migration.h>
+#include <qnamespace.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/single_instance_manager_test.cpp b/tests/single_instance_manager_test.cpp
index 49193850d..bc8074580 100644
--- a/tests/single_instance_manager_test.cpp
+++ b/tests/single_instance_manager_test.cpp
@@ -1,12 +1,18 @@
 #include "single_instance_manager.h"
 
+#include <QByteArray>
 #include <QCoreApplication>
 #include <QDataStream>
 #include <QEventLoop>
+#include <QIODevice>
+#include <QList>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QStringLiteral>
 #include <QTimer>
+#include <QtGlobal>
 #include <gtest/gtest.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index 6a9d5d4af..8602ffdc0 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,5 +1,8 @@
 #include "gtest/gtest.h"
+#include <QDate>
+#include <QPair>
 #include <libcockatrice/utility/days_years_between.h>
+#include <string>
 
 namespace
 {
diff --git a/tests/theme_migration/theme_migration_test.cpp b/tests/theme_migration/theme_migration_test.cpp
index 147833630..d77c2f62d 100644
--- a/tests/theme_migration/theme_migration_test.cpp
+++ b/tests/theme_migration/theme_migration_test.cpp
@@ -1,11 +1,15 @@
 #include "interface/theme_manager.h"
 
+#include <QByteArray>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QIODevice>
 #include <QString>
+#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <gtest/gtest.h>
+#include <string>
 
 // Owned by main.cpp in the real application; pixel_map_generator.cpp references
 // it, so the test binary needs a definition even though it never renders.
diff --git a/tests/translation_loader_test.cpp b/tests/translation_loader_test.cpp
index d54001ad3..745cd04bc 100644
--- a/tests/translation_loader_test.cpp
+++ b/tests/translation_loader_test.cpp
@@ -1,12 +1,17 @@
 #include "gtest/gtest.h"
+#include <QByteArray>
 #include <QCoreApplication>
 #include <QDir>
 #include <QLibraryInfo>
+#include <QList>
 #include <QSet>
 #include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTemporaryDir>
 #include <QTranslator>
 #include <libcockatrice/utility/translation_loader.h>
+#include <string>
 
 // The directory holding translation_loader_test_de.qm, compiled from translation_loader_test.ts by the
 // build. QTranslator rejects anything that is not a real .qm file, so a stub cannot stand in here.
diff --git a/tests/warning_categories_test.cpp b/tests/warning_categories_test.cpp
index 432885dd9..549c373b5 100644
--- a/tests/warning_categories_test.cpp
+++ b/tests/warning_categories_test.cpp
@@ -1,6 +1,8 @@
 #include "gtest/gtest.h"
+#include <QList>
 #include <QString>
 #include <libcockatrice/utility/warning_categories.h>
+#include <string>
 
 TEST(WarningCategoriesTest, EmptyValueYieldsNoCategories)
 {