diff --git a/libs/card/CMakeLists.txt b/libs/card/CMakeLists.txt
index 78eb3cc3c..73f9e006c 100644
--- a/libs/card/CMakeLists.txt
+++ b/libs/card/CMakeLists.txt
@@ -57,7 +57,6 @@ add_library(cockatrice_card STATIC
 target_include_directories(cockatrice_card
     PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/common
-    PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include
     PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
 )
 
diff --git a/libs/deck_list/CMakeLists.txt b/libs/deck_list/CMakeLists.txt
index 60d20c0b0..14ddb49e7 100644
--- a/libs/deck_list/CMakeLists.txt
+++ b/libs/deck_list/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(cockatrice_deck_list STATIC
 
 target_include_directories(cockatrice_deck_list
     PUBLIC include
-    PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
+    PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
 )
 
 target_link_libraries(cockatrice_deck_list
diff --git a/libs/server/CMakeLists.txt b/libs/server/CMakeLists.txt
index 7ab0b19b2..38bd42e8f 100644
--- a/libs/server/CMakeLists.txt
+++ b/libs/server/CMakeLists.txt
@@ -56,8 +56,6 @@ add_library(cockatrice_server STATIC
 target_include_directories(cockatrice_server
     PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/common
-    PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
-    PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility
     PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
 )
 
diff --git a/libs/settings/CMakeLists.txt b/libs/settings/CMakeLists.txt
index f810de9d5..fc9f90b9f 100644
--- a/libs/settings/CMakeLists.txt
+++ b/libs/settings/CMakeLists.txt
@@ -46,10 +46,9 @@ add_library(cockatrice_settings STATIC
 target_include_directories(cockatrice_settings
     PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/common
-    PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
     PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
 )
 
 target_link_libraries(cockatrice_settings
-    PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES}
+    PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES}
 )
diff --git a/libs/settings/include/settings/cache_settings.h b/libs/settings/include/settings/cache_settings.h
index 3c27dbd92..12110a380 100644
--- a/libs/settings/include/settings/cache_settings.h
+++ b/libs/settings/include/settings/cache_settings.h
@@ -17,13 +17,13 @@
 #include "recents_settings.h"
 #include "servers_settings.h"
 #include "shortcuts_settings.h"
+#include "utility/macros.h"
 
 #include <QDate>
 #include <QLoggingCategory>
 #include <QObject>
 #include <QSize>
 #include <QStringList>
-#include <utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");