diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 88597d9ad..07675e121 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -16,7 +16,9 @@ set(cockatrice_SOURCES
     src/client/network/update/card_spoiler/spoiler_background_updater.cpp
     src/client/sound_engine.cpp
     src/client/settings/cache_settings.cpp
+    src/client/settings/card_counter_settings.cpp
     src/client/settings/shortcut_treeview.cpp
+    src/client/settings/shortcuts_settings.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 161bdf31d..c70af2a38 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -1,8 +1,8 @@
 #include "cache_settings.h"
 
-#include "../../../../libcockatrice_settings/libcockatrice/settings/card_counter_settings.h"
 #include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h"
 #include "../network/update/client/release_channel.h"
+#include "card_counter_settings.h"
 
 #include <QAbstractListModel>
 #include <QApplication>
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index 9c078d7e6..ad6acb469 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -7,22 +7,22 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "../../../../libcockatrice_settings/libcockatrice/settings/card_database_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/debug_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/download_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/game_filters_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/layouts_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/message_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/recents_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/servers_settings.h"
-#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h"
+#include "shortcuts_settings.h"
 
 #include <QDate>
 #include <QLoggingCategory>
 #include <QObject>
 #include <QSize>
 #include <QStringList>
+#include <libcockatrice/settings/card_database_settings.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/game_filters_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <libcockatrice/settings/message_settings.h>
+#include <libcockatrice/settings/recents_settings.h>
+#include <libcockatrice/settings/servers_settings.h>
 #include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
diff --git a/libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
similarity index 100%
rename from libcockatrice_settings/libcockatrice/settings/card_counter_settings.cpp
rename to cockatrice/src/client/settings/card_counter_settings.cpp
diff --git a/libcockatrice_settings/libcockatrice/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h
similarity index 87%
rename from libcockatrice_settings/libcockatrice/settings/card_counter_settings.h
rename to cockatrice/src/client/settings/card_counter_settings.h
index 94baeb9e2..dbf524873 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_counter_settings.h
+++ b/cockatrice/src/client/settings/card_counter_settings.h
@@ -7,7 +7,7 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
-#include "settings_manager.h"
+#include "../../../../libcockatrice_settings/libcockatrice/settings/settings_manager.h"
 
 #include <QObject>
 
diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp
index 387b684c1..6b329b23d 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/client/settings/shortcut_treeview.cpp
@@ -1,7 +1,7 @@
 #include "shortcut_treeview.h"
 
-#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h"
 #include "cache_settings.h"
+#include "shortcuts_settings.h"
 
 #include <QHeaderView>
 
diff --git a/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp b/cockatrice/src/client/settings/shortcuts_settings.cpp
similarity index 100%
rename from libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp
rename to cockatrice/src/client/settings/shortcuts_settings.cpp
diff --git a/libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h
similarity index 100%
rename from libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h
rename to cockatrice/src/client/settings/shortcuts_settings.h
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
index 5e7cd9b49..52e237897 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -11,13 +11,13 @@
 #include "arrow_item.h"
 #include "card_drag_item.h"
 
+#include <../../client/settings/card_counter_settings.h>
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPainter>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-#include <libcockatrice/settings/card_counter_settings.h>
 
 CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)
     : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false),
diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp
index b9ad47d61..d4af5d00d 100644
--- a/cockatrice/src/game/log/message_log_widget.cpp
+++ b/cockatrice/src/game/log/message_log_widget.cpp
@@ -8,10 +8,10 @@
 #include "../player/player.h"
 #include "../zones/card_zone.h"
 
+#include <../../client/settings/card_counter_settings.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/settings/card_counter_settings.h>
 #include <utility>
 
 static const QString TABLE_ZONE_NAME = "table";
diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp
index 65f6d0ef4..a6998b58f 100644
--- a/cockatrice/src/game/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game/player/menu/hand_menu.cpp
@@ -6,9 +6,9 @@
 #include "../player.h"
 #include "../player_actions.h"
 
+#include <../../../client/settings/shortcuts_settings.h>
 #include <QAction>
 #include <QMenu>
-#include <libcockatrice/settings/shortcuts_settings.h>
 
 HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp
index d39dbc747..d9efd9a6b 100644
--- a/cockatrice/src/game/player/menu/library_menu.cpp
+++ b/cockatrice/src/game/player/menu/library_menu.cpp
@@ -6,9 +6,9 @@
 #include "../player.h"
 #include "../player_actions.h"
 
+#include <../../../client/settings/shortcuts_settings.h>
 #include <QAction>
 #include <QMenu>
-#include <libcockatrice/settings/shortcuts_settings.h>
 
 LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
index 798a06f73..4f21d7543 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@@ -1,9 +1,9 @@
 #include "dlg_load_deck.h"
 
-#include <libcockatrice/models/deck_list/deck_loader.h>
-
 #include "../../../client/settings/cache_settings.h"
 
+#include <libcockatrice/models/deck_list/deck_loader.h>
+
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
     QString startingDir = SettingsCache::instance().recents().getLatestDeckDirPath();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index 9db1ee2ef..c12c37141 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -14,6 +14,7 @@
 #include "../interface/widgets/utility/sequence_edit.h"
 #include "../main.h"
 
+#include <../../../client/settings/card_counter_settings.h>
 #include <QAbstractButton>
 #include <QAbstractListModel>
 #include <QAction>
@@ -47,7 +48,6 @@
 #include <QVariant>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/settings/card_counter_settings.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/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index f0542deaa..3dd0fedb3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -1,7 +1,6 @@
 #include "dlg_view_log.h"
 
 #include "../../../client/settings/cache_settings.h"
-
 #include "../../logger.h"
 
 #include <QClipboard>
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
index d2abf9c9d..4654dde20 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 
-#include <libcockatrice/settings/shortcuts_settings.h>
+#include <../../../client/settings/shortcuts_settings.h>
 
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
index 802a52538..916a1ebd4 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@@ -2,12 +2,12 @@
 
 #include "../../../client/settings/cache_settings.h"
 
+#include <../../../client/settings/shortcuts_settings.h>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QObject>
 #include <QTreeView>
 #include <QWidget>
-#include <libcockatrice/settings/shortcuts_settings.h>
 
 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index 93c17000b..4f1280d74 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -5,7 +5,6 @@
 #include "relation/card_relation.h"
 #include "set/card_set.h"
 
-#include <../../../cockatrice/src/client/settings/cache_settings.h>
 #include <QDir>
 #include <QRegularExpression>
 #include <QSharedPointer>
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index c32e8a5b1..6dc74dbb5 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -1,6 +1,5 @@
 #include "card_database_querier.h"
 
-#include "../../../../cockatrice/src/database/interface/settings_card_preference_provider.h"
 #include "../card_info.h"
 #include "../printing/exact_card.h"
 #include "../set/card_set_comparator.h"
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
index 93331756c..beab0d707 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
@@ -7,7 +7,6 @@
 #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
 #define COCKATRICE_CARD_DATABASE_QUERIER_H
 
-#include "../../../../cockatrice/src/database/interface/settings_card_preference_provider.h"
 #include "../card_info.h"
 #include "../printing/exact_card.h"
 #include "interface/interface_card_preference_provider.h"
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
index 72596b4b0..d9f76898d 100644
--- a/libcockatrice_settings/CMakeLists.txt
+++ b/libcockatrice_settings/CMakeLists.txt
@@ -3,7 +3,6 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    libcockatrice/settings/card_counter_settings.h
     libcockatrice/settings/card_database_settings.h
     libcockatrice/settings/card_override_settings.h
     libcockatrice/settings/debug_settings.h
@@ -14,7 +13,6 @@ set(HEADERS
     libcockatrice/settings/recents_settings.h
     libcockatrice/settings/servers_settings.h
     libcockatrice/settings/settings_manager.h
-    libcockatrice/settings/shortcuts_settings.h
 )
 
 if(Qt6_FOUND)
@@ -26,7 +24,6 @@ endif()
 add_library(
   libcockatrice_settings STATIC
   ${MOC_SOURCES}
-  libcockatrice/settings/card_counter_settings.cpp
   libcockatrice/settings/card_database_settings.cpp
   libcockatrice/settings/card_override_settings.cpp
   libcockatrice/settings/debug_settings.cpp
@@ -37,7 +34,6 @@ add_library(
   libcockatrice/settings/recents_settings.cpp
   libcockatrice/settings/servers_settings.cpp
   libcockatrice/settings/settings_manager.cpp
-  libcockatrice/settings/shortcuts_settings.cpp
 )
 
 target_include_directories(
@@ -46,4 +42,4 @@ target_include_directories(
   PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
 )
 
-target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_utility ${COCKATRICE_QT_MODULES})
+target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_utility ${QT_CORE_MODULE})