[Cleanup] Unused #includes (#6367)

* [Cleanup] Unused #includes Took 44 minutes * [Cleanup] More unused #includes Took 55 minutes * [Cleanup] Include QSet Took 4 minutes * [Cleanup] Include QDebug in deck_list.cpp Took 3 minutes * [Cleanup] Include protocol stuff in servatrice_database_interface.h Took 3 minutes * [Cleanup] Include QDialogButtonBox Took 8 minutes * [Cleanup] Include QUrl Took 8 minutes * [Cleanup] Include QTextOption in header. Took 3 minutes * [Cleanup] Include QMap in user_list_manager.h Took 8 minutes * [Cleanup] Adjust qjson Took 8 minutes * [Cleanup] include button box. Took 3 minutes * [Cleanup] Redo fwd declarations. * [Cleanup] Redo last removed fwd declarations. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-06-12 09:04:53 -07:00 · 2025-11-29 18:53:11 +01:00 · 2025-11-29 18:53:11 +01:00 · c5fde071e7
commit c5fde071e7
parent 8abd04dab1
227 changed files with 58 additions and 446 deletions
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@ -9,7 +9,6 @@
 #include <QFileInfo>
 #include <QMainWindow>
 #include <QMovie>
-#include <QNetworkDiskCache>
 #include <QNetworkRequest>
 #include <QPainter>
 #include <QPixmapCache>
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@ -5,7 +5,6 @@
 #include "card_picture_loader_worker.h"

 #include <QLoggingCategory>
-#include <libcockatrice/card/card_info.h>

 inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader");
 inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail");
--- 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,6 @@
 #ifndef PICTURE_LOADER_LOCAL_H
 #define PICTURE_LOADER_LOCAL_H

-#include <QLoggingCategory>
-#include <QObject>
 #include <QTimer>
 #include <libcockatrice/card/printing/exact_card.h>

--- 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,11 @@
 #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H

-#include "card_picture_loader_worker_work.h"
-
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QUrl>
 #include <QWidget>
+#include <libcockatrice/card/printing/exact_card.h>

 /**
 * @class CardPictureLoaderRequestStatusDisplayWidget
--- 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
@ -6,7 +6,6 @@

 #include <QHBoxLayout>
 #include <QProgressBar>
-#include <QTimer>
 #include <QWidget>

 /**
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
@ -9,7 +9,6 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <utility>

 static constexpr int MAX_REQUESTS_PER_SEC = 10;
--- 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
@ -7,11 +7,9 @@
 #include <QDirIterator>
 #include <QLoggingCategory>
 #include <QMovie>
-#include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
 #include <QThreadPool>
-#include <libcockatrice/card/database/card_database_manager.h>

 // Card back returned by gatherer when card is not found
 static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};
--- 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,7 +1,6 @@
 #ifndef PICTURE_TO_LOAD_H
 #define PICTURE_TO_LOAD_H

-#include <QLoggingCategory>
 #include <libcockatrice/card/printing/exact_card.h>

 inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@ -5,7 +5,6 @@

 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPixmap>
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <QSize>
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
@ -4,7 +4,6 @@

 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPixmap>
 #include <QResizeEvent>
 #include <QSize>
 #include <qregularexpression.h>
--- 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
@ -3,7 +3,6 @@
 #include "../card_info_picture_with_text_overlay_widget.h"

 #include <QResizeEvent>
-#include <libcockatrice/card/card_info_comparator.h>
 #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>
--- 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
@ -15,7 +15,6 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 class CardGroupDisplayWidget : public QWidget
--- 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,9 +1,6 @@
 #include "flat_card_group_display_widget.h"

-#include "../card_info_picture_with_text_overlay_widget.h"
-
 #include <QResizeEvent>
-#include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@ -1,7 +1,6 @@
 #include "card_info_display_widget.h"

 #include "../../../game/board/card_item.h"
-#include "../../../main.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"

@ -9,7 +8,6 @@
 #include <QScreen>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <utility>

 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
    : QFrame(parent, flags), aspectRatio((qreal)CARD_HEIGHT / (qreal)CARD_WIDTH)
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@ -10,7 +10,6 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
-#include <utility>

 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
    : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@ -5,7 +5,6 @@

 #include <QPainterPath>
 #include <QStylePainter>
-#include <utility>

 /**
 * @brief Constructs a CardPictureEnlargedWidget.
--- 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,7 +8,6 @@
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H

-#include <QPixmap>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>

--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@ -10,7 +10,6 @@
 #include "card_info_picture_enlarged_widget.h"

 #include <QPropertyAnimation>
-#include <QTimer>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>

--- 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
@ -3,7 +3,6 @@
 #include <QFontMetrics>
 #include <QPainterPath>
 #include <QStylePainter>
-#include <QTextOption>

 /**
 * @brief Constructs a CardPictureWithTextOverlay widget.
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@ -6,7 +6,6 @@
 #include <QLabel>
 #include <QScrollArea>
 #include <QScrollBar>
-#include <QSizePolicy>
 #include <QTextEdit>
 #include <libcockatrice/card/game_specific_terms.h>
 #include <libcockatrice/card/relation/card_relation.h>
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@ -1,6 +1,5 @@
 #include "card_size_widget.h"

-#include "../../../client/settings/cache_settings.h"
 #include "../printing_selector/printing_selector.h"
 #include "../visual_deck_storage/visual_deck_storage_widget.h"

--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@ -4,7 +4,6 @@
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"

 #include <QResizeEvent>
-#include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h
@ -16,7 +16,6 @@

 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 class DeckCardZoneDisplayWidget : public QWidget
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@ -8,7 +8,6 @@
 #include <QMouseEvent>
 #include <QPainterPath>
 #include <QStylePainter>
-#include <QTextOption>

 /**
 * @brief Constructs a CardPictureWithTextOverlay widget.
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
@ -13,6 +13,7 @@
 #include <QColor>
 #include <QSize>
 #include <QTextOption>
+#include <QTimer>

 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@ -7,16 +7,13 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H

-#include "../general/layout_containers/flow_widget.h"
 #include "mana_base_widget.h"
 #include "mana_curve_widget.h"
 #include "mana_devotion_widget.h"

 #include <QHBoxLayout>
 #include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 class DeckAnalyticsWidget : public QWidget
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@ -1,16 +1,13 @@
 #include "mana_devotion_widget.h"

-#include "../../../main.h"
 #include "../../deck_loader/deck_loader.h"
 #include "../general/display/banner_widget.h"
 #include "../general/display/bar_widget.h"

-#include <iostream>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <regex>
-#include <string>
 #include <unordered_map>

 ManaDevotionWidget::ManaDevotionWidget(QWidget *parent, DeckListModel *_deckListModel)
--- 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
@ -7,10 +7,8 @@
 #include "../../pixel_map_generator.h"

 #include <QClipboard>
-#include <QFile>
 #include <QHeaderView>
 #include <QMenu>
-#include <QTextBrowser>
 #include <QToolButton>
 #include <QTreeView>
 #include <libcockatrice/card/database/card_database_manager.h>
--- 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
@ -15,7 +15,6 @@
 #include "deck_list_history_manager_widget.h"
 #include "deck_list_style_proxy.h"

-#include <QComboBox>
 #include <QDockWidget>
 #include <QLabel>
 #include <QTextEdit>
--- 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
@ -7,7 +7,6 @@
 #include <QGridLayout>
 #include <QMenu>
 #include <QToolButton>
-#include <libcockatrice/models/database/card_database_model.h>

 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
    : QDockWidget(parent), deckEditor(parent)
--- 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
@ -12,7 +12,6 @@
 #include "../../key_signals.h"

 #include <QDockWidget>
-#include <QTreeView>

 class FilterTreeModel;
 class AbstractTabDeckEditor;
--- 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
@ -10,7 +10,6 @@
 #include <QAction>
 #include <QHBoxLayout>
 #include <QListWidget>
-#include <QToolButton>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list_history_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@ -4,9 +4,7 @@

 #include <QCheckBox>
 #include <QComboBox>
-#include <QDebug>
 #include <QDialogButtonBox>
-#include <QEvent>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QKeyEvent>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@ -15,7 +15,6 @@
 #include <QRadioButton>
 #include <QSet>
 #include <QSpinBox>
-#include <QWizard>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@ -3,6 +3,7 @@
 #include "../../../client/settings/cache_settings.h"

 #include <QMessageBox>
+#include <QPushButton>
 #include <QVBoxLayout>

 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
@ -11,7 +11,6 @@
 #include <QDialog>
 #include <QLineEdit>
 #include <QListWidget>
-#include <QPushButton>
 #include <QVBoxLayout>

 class DlgDefaultTagsEditor : public QDialog
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
@ -3,7 +3,6 @@
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
-#include <QDir>
 #include <QFileDialog>
 #include <QImageReader>
 #include <QLabel>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
@ -7,7 +7,6 @@
 #ifndef DLG_EDITPASSWORD_H
 #define DLG_EDITPASSWORD_H

-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>

--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@ -1,7 +1,6 @@
 #include "dlg_edit_tokens.h"

 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "../main.h"

 #include <QAction>
 #include <QComboBox>
@ -16,7 +15,6 @@
 #include <QMessageBox>
 #include <QToolBar>
 #include <QTreeView>
-#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@ -2,7 +2,6 @@

 #include "../../../client/settings/cache_settings.h"

-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
@ -2,8 +2,6 @@

 #include "../../../client/settings/cache_settings.h"

-#include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
@ -2,8 +2,6 @@

 #include "../../../client/settings/cache_settings.h"

-#include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@ -2,8 +2,6 @@

 #include "../../../client/settings/cache_settings.h"

-#include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
@ -1,10 +1,8 @@
 #include "dlg_load_remote_deck.h"

 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
-#include "../main.h"

 #include <QDialogButtonBox>
-#include <QHBoxLayout>
 #include <QPushButton>
 #include <QVBoxLayout>

--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@ -3,11 +3,9 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
-#include "../main.h"

 #include <QAction>
 #include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
@ -15,7 +13,6 @@
 #include <QHeaderView>
 #include <QItemSelection>
 #include <QLabel>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QToolBar>
 #include <QTreeView>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
@ -11,7 +11,6 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QMainWindow>
-#include <QSet>

 class CardDatabase;
 class LineEditUnfocusable;
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@ -3,13 +3,11 @@
 #include "../../../client/settings/cache_settings.h"

 #include <QCheckBox>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/trice_limits.h>

 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@ -3,7 +3,6 @@
 #include "../../deck_loader/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
-#include "dlg_select_set_for_cards.h"

 #include <QCheckBox>
 #include <QDialogButtonBox>
@ -14,6 +13,7 @@
 #include <QPushButton>
 #include <QScrollBar>
 #include <QSplitter>
+#include <QTimer>
 #include <QVBoxLayout>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@ -36,7 +36,6 @@
 #include <QListWidget>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QRadioButton>
 #include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
--- 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,7 +7,6 @@
 #include <QDate>
 #include <QDebug>
 #include <QDialogButtonBox>
-#include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>

--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
@ -10,10 +10,8 @@
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
-#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QLoggingCategory>
-#include <QPushButton>
 #include <QVBoxLayout>

 inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day");
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@ -5,12 +5,10 @@
 #include "../client/network/update/client/release_channel.h"
 #include "../interface/window_main.h"

-#include <QApplication>
 #include <QDesktopServices>
 #include <QLabel>
 #include <QMessageBox>
 #include <QProgressBar>
-#include <QProgressDialog>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QtNetwork>
--- a/cockatrice/src/interface/widgets/general/display/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/bar_widget.h
@ -8,8 +8,6 @@
 #ifndef BAR_WIDGET_H
 #define BAR_WIDGET_H

-#include <QColor>
-#include <QString>
 #include <QWidget>

 class BarWidget : public QWidget
--- 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,6 @@
 #include "dynamic_font_size_label.h"
 #define FONT_PRECISION (0.5)

-#include <QDebug>
 #include <QElapsedTimer>

 DynamicFontSizeLabel::DynamicFontSizeLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
--- 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,6 @@

 #include "dynamic_font_size_label.h"

-#include <QDebug>
 #include <QPainter>

 DynamicFontSizePushButton::DynamicFontSizePushButton(QWidget *parent) : QPushButton(parent)
--- a/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
@ -8,7 +8,6 @@
 #ifndef PERCENT_BAR_WIDGET_H
 #define PERCENT_BAR_WIDGET_H

-#include <QColor>
 #include <QPainter>
 #include <QWidget>

--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@ -6,6 +6,7 @@
 #include "background_sources.h"
 #include "home_styled_button.h"

+#include <QGroupBox>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPushButton>
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@ -12,7 +12,6 @@
 #include "home_styled_button.h"

 #include <QGridLayout>
-#include <QGroupBox>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/abstract_client.h>

--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@ -2,6 +2,7 @@

 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../tabs/abstract_tab_deck_editor.h"

 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
@ -7,8 +7,6 @@
 #ifndef DECK_EDITOR_MENU_H
 #define DECK_EDITOR_MENU_H

-#include "../interface/widgets/tabs/abstract_tab_deck_editor.h"
-
 #include <QMenu>

 class AbstractTabDeckEditor;
--- 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
@ -10,7 +10,6 @@
 #include "../../deck_loader/deck_loader.h"
 #include "card_amount_widget.h"

-#include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@ -9,12 +9,10 @@
 #define CARD_AMOUNT_WIDGET_H

 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../deck_loader/deck_loader.h"
 #include "../general/display/dynamic_font_size_push_button.h"

 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPushButton>
 #include <QTreeView>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@ -8,9 +8,8 @@
 #include "printing_selector_card_selection_widget.h"
 #include "printing_selector_card_sorting_widget.h"

-#include <QFrame>
+#include <QBoxLayout>
 #include <QScrollBar>
-#include <qboxlayout.h>

 /**
 * @brief Constructs a PrintingSelector widget to display and manage card printings.
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@ -13,7 +13,6 @@

 #include <QCheckBox>
 #include <QLabel>
-#include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <QWidget>
--- 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,9 @@
 #include "printing_selector_card_display_widget.h"

-#include "card_amount_widget.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"

 #include <QGraphicsEffect>
-#include <QStackedWidget>
 #include <QVBoxLayout>
 #include <utility>

--- 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
@ -11,9 +11,7 @@
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"

-#include <QPainter>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 class PrintingSelectorCardDisplayWidget : public QWidget
--- 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
@ -8,12 +8,9 @@
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H

 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../cards/card_info_picture_widget.h"
 #include "all_zones_card_amount_widget.h"
-#include "card_amount_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"

-#include <libcockatrice/card/card_info.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>

 class PrintingSelectorCardOverlayWidget : public QWidget
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@ -4,7 +4,6 @@

 #include <QPainter>
 #include <QPainterPath>
-#include <QPalette>
 #include <QTimer>

 ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
@ -9,7 +9,6 @@

 #include "../../../game/player/event_processing_options.h"

-#include <QList>
 #include <QMouseEvent>
 #include <QWidget>

--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@ -10,17 +10,12 @@
 #include "games_model.h"
 #include "user/user_list_manager.h"

-#include <QApplication>
-#include <QCheckBox>
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QInputDialog>
-#include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTreeView>
-#include <QVBoxLayout>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
@ -6,7 +6,6 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QLineEdit>

 GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
+++ b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
@ -4,10 +4,7 @@
 #include "../tabs/tab_supervisor.h"
 #include "games_model.h"

-#include <QCheckBox>
-#include <QComboBox>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QLineEdit>
 #include <QWidget>

--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@ -7,10 +7,7 @@
 #include "user/user_list_widget.h"

 #include <QDateTime>
-#include <QDebug>
 #include <QIcon>
-#include <QStringList>
-#include <QTime>
 #include <QTimeZone>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>

--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@ -3,11 +3,9 @@

 #include "game_type_map.h"

-#include <QAbstractTableModel>
 #include <QList>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <QStringList>
 #include <QTime>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>

--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@ -3,8 +3,6 @@
 #include "../../../client/settings/cache_settings.h"

 #include <QJsonDocument>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QUrl>

--- 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,7 +8,6 @@
 #ifndef REMOTEDECKLIST_TREEWIDGET_H
 #define REMOTEDECKLIST_TREEWIDGET_H

-#include <QAbstractItemModel>
 #include <QDateTime>
 #include <QTreeView>

--- 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,7 +9,6 @@
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_H

-#include <QAbstractItemModel>
 #include <QDateTime>
 #include <QTreeView>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@ -12,8 +12,6 @@

 #include <QAction>
 #include <QMenu>
-#include <QMessageBox>
-#include <QSignalMapper>
 #include <QtGui>
 #include <QtWidgets>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@ -5,7 +5,6 @@
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 #include "../game_selector.h"
 #include "user_context_menu.h"
-#include "user_list_manager.h"

 #include <QApplication>
 #include <QCheckBox>
@ -14,21 +13,15 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSpinBox>
-#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_get_games_of_user.pb.h>
-#include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/trice_limits.h>

 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@ -14,7 +14,6 @@
 #include "../client/network/interfaces/tapped_out_interface.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/cards/card_info_frame_widget.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"
@ -22,15 +21,11 @@

 #include <QAction>
 #include <QApplication>
-#include <QClipboard>
 #include <QCloseEvent>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDir>
 #include <QFileDialog>
 #include <QHeaderView>
 #include <QLineEdit>
-#include <QMenuBar>
 #include <QMessageBox>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
@ -38,7 +33,6 @@
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QSplitter>
-#include <QTextStream>
 #include <QTreeView>
 #include <QUrl>
 #include <libcockatrice/card/database/card_database_manager.h>
--- 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
@ -2,7 +2,6 @@

 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonDocument>
 #include <QJsonObject>

 void EdhrecApiResponseArchidektLink::fromJson(const QJsonObject &json)
--- 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,6 @@
 #ifndef ARCHIDEKTENTRY_H
 #define ARCHIDEKTENTRY_H

-#include <QDebug>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
@ -6,7 +6,6 @@
 #include "../commander/edhrec_commander_api_response_average_deck_statistics.h"
 #include "edhrec_deck_api_response.h"

-#include <QDebug>
 #include <QJsonObject>
 #include <QString>

--- 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
@ -6,7 +6,6 @@
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QMainWindow>

 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
--- 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
@ -9,12 +9,6 @@

 #include "../../../../../../deck_loader/deck_loader.h"

-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
 class EdhrecDeckApiResponse
 {
 public:
--- 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
@ -10,8 +10,6 @@
 #include "edhrec_api_response_card_list.h"
 #include "edhrec_commander_api_response_commander_details.h"

-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
--- 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
@ -10,7 +10,6 @@
 #include "edhrec_api_response_card_details.h"

 #include <QJsonArray>
-#include <QJsonObject>
 #include <QList>
 #include <QString>

--- 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,7 +10,6 @@
 #include "../card_prices/edhrec_api_response_card_prices.h"

 #include <QJsonArray>
-#include <QJsonObject>
 #include <QString>
 #include <QVector>

--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
@ -5,7 +5,6 @@
 #include "../cards/edhrec_api_response_card_container.h"
 #include "edhrec_commander_api_response_average_deck_statistics.h"

-#include <QDebug>
 #include <QJsonObject>
 #include <QString>

--- 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,7 +9,6 @@

 #include "../cards/edhrec_api_response_card_container.h"

-#include <QDebug>
 #include <QString>

 class EdhrecTopCardsApiResponse
--- 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,7 +9,6 @@

 #include "../cards/edhrec_api_response_card_container.h"

-#include <QDebug>
 #include <QString>

 class EdhrecTopCommandersApiResponse
--- 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,7 +9,6 @@

 #include "../cards/edhrec_api_response_card_container.h"

-#include <QDebug>
 #include <QString>

 class EdhrecTopTagsApiResponse
--- 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
@ -9,7 +9,6 @@

 #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"

-#include <QResizeEvent>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
@ -4,7 +4,6 @@
 #include "display/commander/edhrec_commander_api_response_display_widget.h"

 #include <QDebug>
-#include <QHBoxLayout>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@ -22,7 +22,6 @@
 #include <QNetworkReply>
 #include <QPushButton>
 #include <QRegularExpression>
-#include <QResizeEvent>
 #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>
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
@ -8,7 +8,6 @@
 #define TAB_EDHREC_MAIN_H

 #include "../../interface/widgets/cards/card_size_widget.h"
-#include "../../interface/widgets/general/layout_containers/flow_widget.h"
 #include "../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@ -1,39 +1,22 @@
 #include "tab_deck_editor.h"

 #include "../../../client/settings/cache_settings.h"
-#include "../client/network/interfaces/tapped_out_interface.h"
 #include "../filters/filter_builder.h"
-#include "../filters/filter_tree_model.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/dialogs/dlg_load_deck.h"
-#include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../interface/widgets/menus/deck_editor_menu.h"
 #include "tab_supervisor.h"

 #include <QAction>
-#include <QApplication>
 #include <QCloseEvent>
-#include <QComboBox>
 #include <QDebug>
 #include <QDir>
 #include <QDockWidget>
-#include <QFileDialog>
 #include <QHeaderView>
-#include <QLabel>
-#include <QLineEdit>
 #include <QMenuBar>
-#include <QMessageBox>
-#include <QPrintPreviewDialog>
 #include <QProcessEnvironment>
-#include <QSplitter>
-#include <QTextEdit>
 #include <QTimer>
-#include <QToolButton>
-#include <QTreeView>
-#include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@ -11,7 +11,6 @@
 #include <QDesktopServices>
 #include <QFileSystemModel>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QInputDialog>
 #include <QMessageBox>
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@ -13,11 +13,9 @@
 #include "../game/player/player.h"
 #include "../game/player/player_list_widget.h"
 #include "../game/replay.h"
-#include "../game/zones/card_zone.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
-#include "../interface/widgets/replay/replay_timeline_widget.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/line_edit_completer.h"
 #include "../interface/window_main.h"
@ -28,15 +26,12 @@
 #include <QCompleter>
 #include <QDebug>
 #include <QDockWidget>
-#include <QFileDialog>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMenu>
 #include <QMessageBox>
-#include <QSplitter>
 #include <QStackedWidget>
 #include <QTimer>
-#include <QToolButton>
 #include <QWidget>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@ -14,13 +14,11 @@
 #include "../game/player/player.h"
 #include "../interface/widgets/menus/tearoff_menu.h"
 #include "../interface/widgets/replay/replay_manager.h"
-#include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "tab.h"

 #include <QCompleter>
 #include <QLoggingCategory>
 #include <QMap>
-#include <libcockatrice/protocol/pb/event_leave.pb.h>

 class ServerInfo_PlayerProperties;
 class TabbedDeckViewContainer;
--- a/Show more
+++ b/Show more