diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index a404a07d2..1c967d0e5 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -44,6 +44,8 @@ set(cockatrice_SOURCES
     src/client/tabs/tab_server.cpp
     src/client/tabs/tab_supervisor.cpp
     src/client/tabs/tab_visual_database_display.cpp
+    src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+    src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
     src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
     src/client/tapped_out_interface.cpp
     src/client/translate_counter_name.cpp
@@ -60,6 +62,9 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/cards/additional_info/color_identity_widget.cpp
     src/client/ui/widgets/cards/additional_info/mana_cost_widget.cpp
     src/client/ui/widgets/cards/additional_info/mana_symbol_widget.cpp
+    src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+    src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+    src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
     src/client/ui/widgets/cards/card_info_display_widget.cpp
     src/client/ui/widgets/cards/card_info_frame_widget.cpp
     src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp
@@ -67,6 +72,7 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
     src/client/ui/widgets/cards/card_info_text_widget.cpp
     src/client/ui/widgets/cards/card_size_widget.cpp
+    src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
     src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
     src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
     src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -101,6 +107,7 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
     src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
     src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+    src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
     src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
     src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
     src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@@ -219,13 +226,6 @@ set(cockatrice_SOURCES
     src/utility/levenshtein.cpp
     src/utility/logger.cpp
     src/utility/sequence_edit.cpp
-    src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
-    src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
-    src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
-    src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
-    src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
-    src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
-    src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
 )
 
 add_subdirectory(sounds)
diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h
index aff0723f3..ba2324fed 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.h
+++ b/cockatrice/src/client/tabs/tab_supervisor.h
@@ -2,12 +2,12 @@
 #define TAB_SUPERVISOR_H
 
 #include "../../deck/deck_loader.h"
-#include "visual_deck_editor/tab_deck_editor_visual.h"
-#include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "../../server/user/user_list_proxy.h"
 #include "abstract_tab_deck_editor.h"
 #include "api/edhrec/tab_edhrec.h"
 #include "tab_visual_database_display.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 <QAbstractButton>