diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 719733c9bd4..6d833094b99 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -189,7 +189,6 @@ target_link_dependencies(libdevilutionx_assets PUBLIC
   libdevilutionx_game_mode
   libdevilutionx_mpq
   libdevilutionx_sdl2_to_1_2_backports
-  libdevilutionx_sound
   libdevilutionx_strings
   ${DEVILUTIONX_PLATFORM_ASSETS_LINK_LIBRARIES}
 )
@@ -305,6 +304,7 @@ add_devilutionx_object_library(libdevilutionx_init
 target_link_dependencies(libdevilutionx_init PUBLIC
   libdevilutionx_assets
   libdevilutionx_config
+  libdevilutionx_options
 )
 
 add_devilutionx_object_library(libdevilutionx_lighting
@@ -434,6 +434,7 @@ target_link_dependencies(libdevilutionx_options PUBLIC
   DevilutionX::SDL
   fmt::fmt
   tl
+  unordered_dense::unordered_dense
   libdevilutionx_controller_buttons
   libdevilutionx_control_mode
   libdevilutionx_logged_fstream
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fa7d506dbfb..a4a1e98de3f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,6 @@ set(tests
   appfat_test
   automap_test
   cursor_test
-  data_file_test
   dead_test
   diablo_test
   drlg_common_test
@@ -41,6 +40,7 @@ set(tests
 set(standalone_tests
   codec_test
   crawl_test
+  data_file_test
   file_util_test
   format_int_test
   ini_test
@@ -91,6 +91,7 @@ target_link_dependencies(codec_test PRIVATE libdevilutionx_codec app_fatal_for_t
 target_link_dependencies(clx_render_benchmark PRIVATE libdevilutionx_so)
 target_link_dependencies(crawl_test PRIVATE libdevilutionx_crawl)
 target_link_dependencies(crawl_benchmark PRIVATE libdevilutionx_crawl)
+target_link_dependencies(data_file_test PRIVATE libdevilutionx_txtdata app_fatal_for_testing language_for_testing)
 target_link_dependencies(dun_render_benchmark PRIVATE libdevilutionx_so)
 target_link_dependencies(file_util_test PRIVATE libdevilutionx_file_util app_fatal_for_testing)
 target_link_dependencies(format_int_test PRIVATE libdevilutionx_format_int language_for_testing)