diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
index 44049c13e..acf60bf03 100644
--- a/dbconverter/CMakeLists.txt
+++ b/dbconverter/CMakeLists.txt
@@ -19,22 +19,13 @@ set(CMAKE_AUTORCC ON)
 # ------------------------
 add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
 
-# ------------------------
-# Include directories
-# ------------------------
-target_include_directories(
-  dbconverter
-  PRIVATE ../common # shared common headers
-  PRIVATE ../libs/card/include # cardlib public headers
-)
-
 # ------------------------
 # Link libraries
 # ------------------------
 target_link_libraries(
   dbconverter
-  PRIVATE cardlib
-  PRIVATE settingslib
+  PRIVATE libcockatrice_card
+  PRIVATE libcockatrice_settings
   PRIVATE ${DB_CONVERTER_QT_MODULES}
 )
 
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index f35013c46..b02f48f3d 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -44,7 +44,7 @@ endif()
 # ------------------------
 # Include directories
 # ------------------------
-include_directories(../cockatrice/libs/card/include ../cockatrice/libs/settings/include ../cockatrice/src ../common)
+include_directories(../cockatrice/src)
 
 # ------------------------
 # Optional libraries
@@ -100,8 +100,8 @@ endif()
 # ------------------------
 target_link_libraries(
   oracle
-  PRIVATE cardlib
-  PRIVATE settingslib
+  PRIVATE libcockatrice_card
+  PRIVATE libcockatrice_settings
   PRIVATE ${ORACLE_QT_MODULES}
 )