diff --git a/cockatrice/src/client/tabs/deck_view_container.cpp b/cockatrice/src/client/tabs/deck_view_container.cpp
index bccbf68fd..7e1b17e7f 100644
--- a/cockatrice/src/client/tabs/deck_view_container.cpp
+++ b/cockatrice/src/client/tabs/deck_view_container.cpp
@@ -2,21 +2,16 @@
 
 #include "../../deck/deck_loader.h"
 #include "../../deck/deck_view.h"
-#include "../../dialogs/dlg_create_game.h"
 #include "../../dialogs/dlg_load_deck.h"
 #include "../../dialogs/dlg_load_remote_deck.h"
 #include "../../game/cards/card_database.h"
 #include "../../game/cards/card_database_manager.h"
 #include "../../game/game_scene.h"
 #include "../../game/game_view.h"
-#include "../../game/player/player.h"
-#include "../../server/message_log_widget.h"
 #include "../../server/pending_command.h"
 #include "../../settings/cache_settings.h"
 #include "../game_logic/abstract_client.h"
 #include "../ui/picture_loader.h"
-#include "../ui/window_main.h"
-#include "pb/command_concede.pb.h"
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_ready_start.pb.h"
 #include "pb/command_set_sideboard_lock.pb.h"
@@ -25,10 +20,8 @@
 #include "tab_game.h"
 #include "trice_limits.h"
 
-#include <QCompleter>
-#include <QDockWidget>
-#include <QFileDialog>
 #include <QMessageBox>
+#include <QMouseEvent>
 #include <QToolButton>
 #include <google/protobuf/descriptor.h>
 
diff --git a/cockatrice/src/client/tabs/deck_view_container.h b/cockatrice/src/client/tabs/deck_view_container.h
index 2bbb68d50..9565b7e75 100644
--- a/cockatrice/src/client/tabs/deck_view_container.h
+++ b/cockatrice/src/client/tabs/deck_view_container.h
@@ -1,17 +1,15 @@
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../client/ui/widgets/cards/card_info_frame_widget.h"
 #include "../../deck/deck_loader.h"
-#include "pb/event_leave.pb.h"
-#include "tab.h"
 
-#include <QCompleter>
 #include <QPushButton>
-#include <pb/response.pb.h>
 
+class QVBoxLayout;
+class AbstractCardItem;
 class VisualDeckStorageWidget;
 class DeckPreviewWidget;
+class Response;
 class TabGame;
 class DeckView;
 
diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp
index 35818e8f5..a77bd4001 100644
--- a/cockatrice/src/client/tabs/tab_game.cpp
+++ b/cockatrice/src/client/tabs/tab_game.cpp
@@ -1,12 +1,7 @@
 #include "tab_game.h"
 
 #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
-#include "../../deck/deck_loader.h"
-#include "../../deck/deck_view.h"
 #include "../../dialogs/dlg_create_game.h"
-#include "../../dialogs/dlg_load_deck.h"
-#include "../../dialogs/dlg_load_remote_deck.h"
-#include "../../dialogs/dlg_manage_sets.h"
 #include "../../game/board/arrow_item.h"
 #include "../../game/cards/card_database.h"
 #include "../../game/cards/card_database_manager.h"
@@ -15,8 +10,7 @@
 #include "../../game/game_view.h"
 #include "../../game/player/player.h"
 #include "../../game/player/player_list_widget.h"
-#include "../../game/zones/view_zone.h"
-#include "../../game/zones/view_zone_widget.h"
+#include "../../game/zones/card_zone.h"
 #include "../../main.h"
 #include "../../server/message_log_widget.h"
 #include "../../server/pending_command.h"
@@ -27,18 +21,15 @@
 #include "../ui/phases_toolbar.h"
 #include "../ui/picture_loader/picture_loader.h"
 #include "../ui/window_main.h"
+#include "./deck_view_container.h"
 #include "get_pb_extension.h"
 #include "pb/command_concede.pb.h"
-#include "pb/command_deck_select.pb.h"
 #include "pb/command_delete_arrow.pb.h"
 #include "pb/command_game_say.pb.h"
 #include "pb/command_leave_game.pb.h"
 #include "pb/command_next_turn.pb.h"
-#include "pb/command_ready_start.pb.h"
 #include "pb/command_reverse_turn.pb.h"
 #include "pb/command_set_active_phase.pb.h"
-#include "pb/command_set_sideboard_lock.pb.h"
-#include "pb/command_set_sideboard_plan.pb.h"
 #include "pb/context_connection_state_changed.pb.h"
 #include "pb/context_deck_select.pb.h"
 #include "pb/context_ping_changed.pb.h"
@@ -56,7 +47,6 @@
 #include "pb/event_set_active_player.pb.h"
 #include "pb/game_event_container.pb.h"
 #include "pb/game_replay.pb.h"
-#include "pb/response_deck_download.pb.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
 
@@ -74,7 +64,6 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QWidget>
-#include <google/protobuf/descriptor.h>
 
 void TabGame::refreshShortcuts()
 {
diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h
index e75441535..4e59712c6 100644
--- a/cockatrice/src/client/tabs/tab_game.h
+++ b/cockatrice/src/client/tabs/tab_game.h
@@ -10,19 +10,17 @@
 
 #include <QCompleter>
 #include <QMap>
-#include <QPushButton>
 
+class DeckViewContainer;
 class AbstractClient;
 class CardDatabase;
 class GameView;
-class DeckView;
 class GameScene;
 class CardInfoFrameWidget;
 class MessageLogWidget;
 class QTimer;
 class QSplitter;
 class QLabel;
-class QPushButton;
 class QToolButton;
 class QMenu;
 class ZoneViewLayout;
@@ -52,7 +50,6 @@ class Event_ReverseTurn;
 class CardZone;
 class AbstractCardItem;
 class CardItem;
-class TabGame;
 class DeckLoader;
 class QVBoxLayout;
 class QHBoxLayout;