diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
index ca661376e..a51a6d734 100644
--- a/dbconverter/CMakeLists.txt
+++ b/dbconverter/CMakeLists.txt
@@ -26,6 +26,9 @@ elseif(Qt5_FOUND)
   )
 endif()
 
+# Include directories
+include_directories(../common) # Required due to card_ref.h
+
 # Build servatrice binary and link it
 add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES})
 
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index d474a5de8..79d2ae45a 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -79,6 +79,7 @@ elseif(Qt5_FOUND)
 endif()
 
 include_directories(../cockatrice/src)
+include_directories(../common)
 
 # Libz is required to support zipped files
 find_package(ZLIB)
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 403d14d1d..1f9139ff6 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -49,8 +49,8 @@ if(NOT GTEST_FOUND)
   add_dependencies(filter_string_test gtest)
 endif()
 
-target_link_libraries(carddatabase_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
-target_link_libraries(filter_string_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(carddatabase_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(filter_string_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 
 add_test(NAME carddatabase_test COMMAND carddatabase_test)
 add_test(NAME filter_string_test COMMAND filter_string_test)