Everywhere: Mark dependencies of most targets as PRIVATE

Otherwise, we end up propagating those dependencies into targets that link against that library, which creates unnecessary link-time dependencies. Also included are changes to readd now missing dependencies to tools that actually need them.
lanmonster · Nov 1, 2022 · ce2f1b8 · ce2f1b8
1 parent 678db53
commit ce2f1b8
Show file tree

Hide file tree

Showing 174 changed files with 386 additions and 384 deletions.
diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake
@@ -8,7 +8,7 @@ function(serenity_set_implicit_links target_name)
  # The latter is a problem with Clang especially, since we might have the
  # slightly outdated stub in the sysroot, but have not yet installed the freshly
  # built LibC.
- target_link_libraries(${target_name} LibC)
+ target_link_libraries(${target_name} PRIVATE LibC)
 
  # Same goes for -lssp_nonshared, which is required during build time but is not
  # yet installed in the sysroot. However, we just want to add the link directory
@@ -118,9 +118,9 @@ function(serenity_test test_src sub_dir)
  add_dependencies(ComponentTests ${test_name})
  set_target_properties(${test_name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
  serenity_set_implicit_links(${test_name})
- target_link_libraries(${test_name} LibTest LibCore)
+ target_link_libraries(${test_name} PRIVATE LibTest LibCore)
  foreach(lib ${SERENITY_TEST_LIBS})
- target_link_libraries(${test_name} ${lib})
+ target_link_libraries(${test_name} PRIVATE ${lib})
  endforeach()
  install(TARGETS ${test_name} RUNTIME DESTINATION usr/Tests/${sub_dir} OPTIONAL)
 endfunction()
@@ -178,7 +178,7 @@ endfunction()
 
 function(link_with_locale_data target)
  if (ENABLE_UNICODE_DATABASE_DOWNLOAD AND SERENITYOS)
- target_link_libraries("${target}" LibLocaleData)
+ target_link_libraries("${target}" PRIVATE LibLocaleData)
  endif()
 endfunction()
 

diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
@@ -202,9 +202,9 @@ function(lagom_lib target_name fs_name)
  EXPORT_NAME ${library}
  OUTPUT_NAME lagom-${fs_name}
  )
- target_link_libraries(${target_name} ${LAGOM_LIBRARY_LIBS})
+ target_link_libraries(${target_name} PRIVATE ${LAGOM_LIBRARY_LIBS})
  if (NOT ${target_name} STREQUAL "LibCore")
- target_link_libraries(${target_name} LibCore)
+ target_link_libraries(${target_name} PRIVATE LibCore)
  endif()
  install(
  TARGETS ${target_name}
@@ -306,7 +306,7 @@ install(TARGETS LibC LibCrypt LibSystem NoCoverage EXPORT LagomTargets)
 # Note: AK is included in LibCore for the host build instead of LibC per the target build
 add_serenity_subdirectory(AK)
 add_serenity_subdirectory(Userland/Libraries/LibCore)
-target_link_libraries(LibCore Threads::Threads)
+target_link_libraries(LibCore PRIVATE Threads::Threads)
 target_sources(LibCore PRIVATE ${AK_SOURCES})
 
 # LibMain
@@ -385,7 +385,7 @@ if (BUILD_LAGOM)
  set(GENERATED_SOURCES ${LIBWEBVIEW_GENERATED_SOURCES})
  lagom_lib(LibWebView webview
  SOURCES ${LIBWEBVIEW_SOURCES} ${LIBWEBVIEW_GENERATED_SOURCES}
- LIBS LibGUI LibWeb)
+ LIBS LibGfx LibGUI LibIPC LibWeb)
  unset(GENERATED_SOURCES)
  endif()
 
@@ -425,7 +425,7 @@ if (BUILD_LAGOM)
 
  # FIXME: LibLocaleData is an object lib in Lagom, because the weak symbol trick we use on serenity
  # straight up isn't supposed to work per ELF rules
- target_link_libraries(LibLocale LibTimeZone)
+ target_link_libraries(LibLocale PRIVATE LibTimeZone)
  install(TARGETS LibLocaleData EXPORT LagomTargets)
 
  add_serenity_subdirectory(Userland/Shell)
@@ -457,11 +457,11 @@ if (BUILD_LAGOM)
 
  if (ENABLE_LAGOM_LIBWEB)
  add_executable(headless-browser ../../Userland/Utilities/headless-browser.cpp)
- target_link_libraries(headless-browser LibWeb LibWebSocket LibHTTP LibJS LibGfx LibMain)
+ target_link_libraries(headless-browser LibWeb LibWebSocket LibCrypto LibGemini LibHTTP LibJS LibGfx LibMain LibTLS)
  endif()
 
  add_executable(js ../../Userland/Utilities/js.cpp)
- target_link_libraries(js LibJS LibLine LibMain LibTextCodec Threads::Threads)
+ target_link_libraries(js LibCrypto LibJS LibLine LibLocale LibMain LibTextCodec Threads::Threads)
 
  add_executable(markdown-check ../../Userland/Utilities/markdown-check.cpp)
  target_link_libraries(markdown-check LibMarkdown LibMain)
@@ -486,7 +486,7 @@ if (BUILD_LAGOM)
  LibTest
  ${LIBTEST_SOURCES}
  )
- target_link_libraries(LibTest LibCore)
+ target_link_libraries(LibTest PRIVATE LibCore)
  set_target_properties(LibTest PROPERTIES OUTPUT_NAME lagom-test)
  add_library(
  LibTestMain
@@ -527,7 +527,7 @@ if (BUILD_LAGOM)
  file(COPY "${SERENITY_PROJECT_ROOT}/Tests/LibGL/reference-images" DESTINATION "./")
  file(GLOB LIBGL_TESTS CONFIGURE_DEPENDS "../../Tests/LibGL/*.cpp")
  foreach(source ${LIBGL_TESTS})
- lagom_test(${source} LIBS LibGL LibGPU LibSoftGPU)
+ lagom_test(${source} LIBS LibGfx LibGL LibGPU LibSoftGPU)
  endforeach()
 
  # Locale
@@ -567,7 +567,7 @@ if (BUILD_LAGOM)
  # TLS
  file(GLOB LIBTLS_TESTS CONFIGURE_DEPENDS "../../Tests/LibTLS/*.cpp")
  foreach(source ${LIBTLS_TESTS})
- lagom_test(${source} LIBS LibTLS
+ lagom_test(${source} LIBS LibCrypto LibTLS
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Tests/LibTLS)
  endforeach()
 

diff --git a/Tests/Kernel/CMakeLists.txt b/Tests/Kernel/CMakeLists.txt
@@ -25,11 +25,13 @@ set(TEST_SOURCES
 foreach(source IN LISTS TEST_SOURCES)
  get_filename_component(test_name "${source}" NAME_WE)
  add_executable("${test_name}" "${source}")
- target_link_libraries("${test_name}" LibCore)
+ target_link_libraries("${test_name}" PRIVATE LibCore)
  serenity_set_implicit_links("${test_name}")
  install(TARGETS "${test_name}" RUNTIME DESTINATION usr/Tests/Kernel/Legacy)
 endforeach()
 
+target_link_libraries(fuzz-syscalls PRIVATE LibSystem)
+
 serenity_test("crash.cpp" Kernel MAIN_ALREADY_DEFINED)
 
 set(LIBTEST_BASED_SOURCES

diff --git a/Tests/LibCore/CMakeLists.txt b/Tests/LibCore/CMakeLists.txt
@@ -13,7 +13,7 @@ foreach(source IN LISTS TEST_SOURCES)
 endforeach()
 
 # NOTE: Required because of the LocalServer tests
-target_link_libraries(TestLibCoreStream LibThreading)
-target_link_libraries(TestLibCoreSharedSingleProducerCircularQueue LibThreading)
+target_link_libraries(TestLibCoreStream PRIVATE LibThreading)
+target_link_libraries(TestLibCoreSharedSingleProducerCircularQueue PRIVATE LibThreading)
 
 install(FILES long_lines.txt 10kb.txt small.txt DESTINATION usr/Tests/LibCore)
diff --git a/Tests/LibELF/CMakeLists.txt b/Tests/LibELF/CMakeLists.txt
@@ -3,7 +3,7 @@ macro(add_dlopen_lib NAME FUNCTION)
  add_library(${NAME} SHARED Dynlib.cpp)
  target_compile_definitions(${NAME} PRIVATE -DFUNCTION=${FUNCTION})
  # LibLine is not special, just an "external" dependency
- target_link_libraries(${NAME} LibLine)
+ target_link_libraries(${NAME} PRIVATE LibLine)
  serenity_set_implicit_links(${NAME})
  # Avoid execution by the test runner
  install(TARGETS ${NAME}
@@ -16,7 +16,7 @@ add_dlopen_lib(DynlibB dynlibb_function)
 add_dlopen_lib(DynlibC dynlibc_function)
 set(CMAKE_INSTALL_RPATH $ORIGIN)
 add_dlopen_lib(DynlibD dynlibd_function)
-target_link_libraries(DynlibD DynlibC)
+target_link_libraries(DynlibD PRIVATE DynlibC)
 unset(CMAKE_INSTALL_RPATH)
 
 set(TEST_SOURCES

diff --git a/Tests/LibGL/CMakeLists.txt b/Tests/LibGL/CMakeLists.txt
@@ -4,7 +4,7 @@ set(TEST_SOURCES
 )
 
 foreach(source IN LISTS TEST_SOURCES)
- serenity_test("${source}" LibGL LIBS LibCore LibGL)
+ serenity_test("${source}" LibGL LIBS LibCore LibGfx LibGL)
 endforeach()
 
 install(DIRECTORY reference-images DESTINATION usr/Tests/LibGL)
diff --git a/Tests/LibGfx/CMakeLists.txt b/Tests/LibGfx/CMakeLists.txt
@@ -5,7 +5,7 @@ set(TEST_SOURCES
 )
 
 foreach(source IN LISTS TEST_SOURCES)
- serenity_test("${source}" LibGfx LIBS LibGUI)
+ serenity_test("${source}" LibGfx LIBS LibGfx LibGUI)
 endforeach()
 
 install(FILES TestFont.font DESTINATION usr/Tests/LibGfx)
diff --git a/Tests/LibJS/CMakeLists.txt b/Tests/LibJS/CMakeLists.txt
@@ -1,23 +1,23 @@
-serenity_testjs_test(test-js.cpp test-js)
+serenity_testjs_test(test-js.cpp test-js LIBS LibLocale)
 
 install(TARGETS test-js RUNTIME DESTINATION bin OPTIONAL)
 link_with_locale_data(test-js)
 
-serenity_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS)
+serenity_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS LibLocale)
 link_with_locale_data(test-invalid-unicode-js)
 
-serenity_test(test-bytecode-js.cpp LibJS LIBS LibJS)
+serenity_test(test-bytecode-js.cpp LibJS LIBS LibJS LibLocale)
 link_with_locale_data(test-bytecode-js)
 
-serenity_test(test-value-js.cpp LibJS LIBS LibJS)
+serenity_test(test-value-js.cpp LibJS LIBS LibJS LibLocale)
 link_with_locale_data(test-value-js)
 
 serenity_component(
  test262-runner
  TARGETS test262-runner
 )
 add_executable(test262-runner test262-runner.cpp)
-target_link_libraries(test262-runner LibJS LibCore)
+target_link_libraries(test262-runner PRIVATE LibJS LibCore LibLocale)
 serenity_set_implicit_links(test262-runner)
 link_with_locale_data(test262-runner)
 install(TARGETS test262-runner RUNTIME DESTINATION bin OPTIONAL)
@@ -27,6 +27,6 @@ serenity_component(
  TARGETS test-test262
 )
 add_executable(test-test262 test-test262.cpp)
-target_link_libraries(test-test262 LibMain LibCore)
+target_link_libraries(test-test262 PRIVATE LibMain LibCore)
 serenity_set_implicit_links(test-test262)
 install(TARGETS test-test262 RUNTIME DESTINATION bin OPTIONAL)
diff --git a/Tests/UserspaceEmulator/CMakeLists.txt b/Tests/UserspaceEmulator/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TEST_SOURCES
 foreach(source IN LISTS TEST_SOURCES)
  get_filename_component(test_name "${source}" NAME_WE)
  add_executable("${test_name}" "${source}")
- target_link_libraries("${test_name}" LibCore)
+ target_link_libraries("${test_name}" PRIVATE LibCore)
  serenity_set_implicit_links("${test_name}")
  install(TARGETS "${test_name}" RUNTIME DESTINATION usr/Tests/UserEmulator)
 endforeach()
diff --git a/Userland/Applets/Audio/CMakeLists.txt b/Userland/Applets/Audio/CMakeLists.txt
@@ -9,4 +9,4 @@ set(SOURCES
 )
 
 serenity_app(Audio.Applet ICON audio-volume-high)
-target_link_libraries(Audio.Applet LibGUI LibGfx LibAudio LibCore LibConfig LibMain)
+target_link_libraries(Audio.Applet PRIVATE LibGUI LibGfx LibAudio LibCore LibConfig LibIPC LibMain)
diff --git a/Userland/Applets/ClipboardHistory/CMakeLists.txt b/Userland/Applets/ClipboardHistory/CMakeLists.txt
@@ -10,4 +10,4 @@ set(SOURCES
 )
 
 serenity_app(ClipboardHistory.Applet ICON edit-copy)
-target_link_libraries(ClipboardHistory.Applet LibGUI LibCore LibGfx LibConfig LibMain)
+target_link_libraries(ClipboardHistory.Applet PRIVATE LibGUI LibCore LibGfx LibConfig LibMain)
diff --git a/Userland/Applets/Keymap/CMakeLists.txt b/Userland/Applets/Keymap/CMakeLists.txt
@@ -11,4 +11,4 @@ set(SOURCES
 )
 
 serenity_bin(Keymap.Applet)
-target_link_libraries(Keymap.Applet LibGUI LibCore LibGfx LibMain LibKeyboard)
+target_link_libraries(Keymap.Applet PRIVATE LibGUI LibCore LibGfx LibIPC LibMain LibKeyboard)
diff --git a/Userland/Applets/Network/CMakeLists.txt b/Userland/Applets/Network/CMakeLists.txt
@@ -9,4 +9,4 @@ set(SOURCES
 )
 
 serenity_app(Network.Applet ICON network)
-target_link_libraries(Network.Applet LibGUI LibCore LibGfx LibMain)
+target_link_libraries(Network.Applet PRIVATE LibGUI LibCore LibGfx LibMain)
diff --git a/Userland/Applets/ResourceGraph/CMakeLists.txt b/Userland/Applets/ResourceGraph/CMakeLists.txt
@@ -9,4 +9,4 @@ set(SOURCES
 )
 
 serenity_bin(ResourceGraph.Applet)
-target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx LibMain)
+target_link_libraries(ResourceGraph.Applet PRIVATE LibGUI LibCore LibGfx LibMain)
diff --git a/Userland/Applets/WorkspacePicker/CMakeLists.txt b/Userland/Applets/WorkspacePicker/CMakeLists.txt
@@ -10,4 +10,4 @@ set(SOURCES
 )
 
 serenity_bin(WorkspacePicker.Applet)
-target_link_libraries(WorkspacePicker.Applet LibGUI LibCore LibGfx LibMain)
+target_link_libraries(WorkspacePicker.Applet PRIVATE LibGUI LibCore LibGfx LibIPC LibMain)
diff --git a/Userland/Applications/3DFileViewer/CMakeLists.txt b/Userland/Applications/3DFileViewer/CMakeLists.txt
@@ -12,4 +12,4 @@ set(SOURCES
 )
 
 serenity_app(3DFileViewer ICON app-3d-file-viewer)
-target_link_libraries(3DFileViewer LibGUI LibGL LibFileSystemAccessClient LibMain)
+target_link_libraries(3DFileViewer PRIVATE LibCore LibGfx LibGUI LibGL LibFileSystemAccessClient LibMain)
diff --git a/Userland/Applications/About/CMakeLists.txt b/Userland/Applications/About/CMakeLists.txt
@@ -15,4 +15,4 @@ execute_process(COMMAND "git diff-index --quiet HEAD -- && echo tracked || echo
 add_definitions(-DGIT_COMMIT="${GIT_COMMIT}" -DGIT_BRANCH="${GIT_BRANCH}" -DGIT_CHANGES="${GIT_CHANGES}")
 
 serenity_bin(About)
-target_link_libraries(About LibGUI LibMain)
+target_link_libraries(About PRIVATE LibCore LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/AnalogClock/CMakeLists.txt b/Userland/Applications/AnalogClock/CMakeLists.txt
@@ -10,4 +10,4 @@ set(SOURCES
  )
 
 serenity_app(AnalogClock ICON app-analog-clock)
-target_link_libraries(AnalogClock LibGUI LibMain)
+target_link_libraries(AnalogClock PRIVATE LibCore LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/Assistant/CMakeLists.txt b/Userland/Applications/Assistant/CMakeLists.txt
@@ -10,4 +10,4 @@ set(SOURCES
  )
 
 serenity_app(Assistant ICON app-run)
-target_link_libraries(Assistant LibCore LibDesktop LibGUI LibJS LibMain LibThreading)
+target_link_libraries(Assistant PRIVATE LibCore LibDesktop LibGfx LibGUI LibJS LibMain LibThreading)
diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt
@@ -42,5 +42,5 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(Browser ICON app-browser)
-target_link_libraries(Browser LibWebView LibWeb LibProtocol LibGUI LibDesktop LibConfig LibMain)
+target_link_libraries(Browser PRIVATE LibCore LibWebView LibWeb LibProtocol LibGUI LibDesktop LibConfig LibGfx LibIPC LibJS LibLocale LibMain LibSyntax)
 link_with_locale_data(Browser)
diff --git a/Userland/Applications/BrowserSettings/CMakeLists.txt b/Userland/Applications/BrowserSettings/CMakeLists.txt
@@ -19,4 +19,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(BrowserSettings ICON app-browser)
-target_link_libraries(BrowserSettings LibGUI LibConfig LibMain)
+target_link_libraries(BrowserSettings PRIVATE LibCore LibGfx LibGUI LibConfig LibMain)
diff --git a/Userland/Applications/Calculator/CMakeLists.txt b/Userland/Applications/Calculator/CMakeLists.txt
@@ -18,4 +18,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(Calculator ICON app-calculator)
-target_link_libraries(Calculator LibGUI LibMain)
+target_link_libraries(Calculator PRIVATE LibCore LibCrypto LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/Calendar/CMakeLists.txt b/Userland/Applications/Calendar/CMakeLists.txt
@@ -15,4 +15,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(Calendar ICON app-calendar)
-target_link_libraries(Calendar LibGUI LibMain)
+target_link_libraries(Calendar PRIVATE LibConfig LibCore LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/CalendarSettings/CMakeLists.txt b/Userland/Applications/CalendarSettings/CMakeLists.txt
@@ -16,4 +16,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(CalendarSettings ICON app-calendar)
-target_link_libraries(CalendarSettings LibConfig LibGUI LibMain)
+target_link_libraries(CalendarSettings PRIVATE LibConfig LibCore LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/CharacterMap/CMakeLists.txt b/Userland/Applications/CharacterMap/CMakeLists.txt
@@ -19,4 +19,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(CharacterMap ICON app-character-map)
-target_link_libraries(CharacterMap LibDesktop LibGUI LibMain LibUnicode)
+target_link_libraries(CharacterMap PRIVATE LibConfig LibCore LibDesktop LibGfx LibGUI LibMain LibUnicode)
diff --git a/Userland/Applications/ClockSettings/CMakeLists.txt b/Userland/Applications/ClockSettings/CMakeLists.txt
@@ -19,5 +19,5 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(ClockSettings ICON app-analog-clock) # FIXME: Create a ClockSettings icon.
-target_link_libraries(ClockSettings LibGUI LibMain LibLocale)
+target_link_libraries(ClockSettings PRIVATE LibConfig LibCore LibGfx LibGUI LibMain LibLocale)
 link_with_locale_data(ClockSettings)
diff --git a/Userland/Applications/CrashReporter/CMakeLists.txt b/Userland/Applications/CrashReporter/CMakeLists.txt
@@ -16,4 +16,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(CrashReporter ICON app-crash-reporter)
-target_link_libraries(CrashReporter LibCore LibCoredump LibDesktop LibFileSystemAccessClient LibGUI LibMain)
+target_link_libraries(CrashReporter PRIVATE LibCore LibCoredump LibDebug LibDesktop LibFileSystemAccessClient LibGfx LibGUI LibMain LibThreading)
diff --git a/Userland/Applications/Debugger/CMakeLists.txt b/Userland/Applications/Debugger/CMakeLists.txt
@@ -8,4 +8,4 @@ set(SOURCES
 )
 
 serenity_bin(Debugger)
-target_link_libraries(Debugger LibCore LibDebug LibLine LibMain LibX86)
+target_link_libraries(Debugger PRIVATE LibCore LibDebug LibLine LibMain LibX86)
diff --git a/Userland/Applications/DisplaySettings/CMakeLists.txt b/Userland/Applications/DisplaySettings/CMakeLists.txt
@@ -33,4 +33,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(DisplaySettings ICON app-display-settings)
-target_link_libraries(DisplaySettings LibDesktop LibGUI LibConfig LibMain LibEDID)
+target_link_libraries(DisplaySettings PRIVATE LibCore LibDesktop LibGfx LibGUI LibConfig LibIPC LibMain LibEDID LibThreading)
diff --git a/Userland/Applications/Escalator/CMakeLists.txt b/Userland/Applications/Escalator/CMakeLists.txt
@@ -16,4 +16,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(Escalator ICON app-escalator)
-target_link_libraries(Escalator LibCore LibDesktop LibGUI LibMain)
+target_link_libraries(Escalator PRIVATE LibCore LibDesktop LibGfx LibGUI LibMain)
diff --git a/Userland/Applications/FileManager/CMakeLists.txt b/Userland/Applications/FileManager/CMakeLists.txt
@@ -25,4 +25,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(FileManager ICON app-file-manager)
-target_link_libraries(FileManager LibGUI LibDesktop LibConfig LibMain)
+target_link_libraries(FileManager PRIVATE LibCore LibGfx LibGUI LibDesktop LibConfig LibMain)
diff --git a/Userland/Applications/FontEditor/CMakeLists.txt b/Userland/Applications/FontEditor/CMakeLists.txt
@@ -25,4 +25,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(FontEditor ICON app-font-editor)
-target_link_libraries(FontEditor LibGUI LibDesktop LibGfx LibMain LibUnicode)
+target_link_libraries(FontEditor PRIVATE LibConfig LibCore LibGUI LibDesktop LibGfx LibMain LibUnicode)
diff --git a/Userland/Applications/GamesSettings/CMakeLists.txt b/Userland/Applications/GamesSettings/CMakeLists.txt
@@ -16,4 +16,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(GamesSettings ICON games)
-target_link_libraries(GamesSettings LibGUI LibMain LibCards)
+target_link_libraries(GamesSettings PRIVATE LibConfig LibCore LibGfx LibGUI LibMain LibCards)
diff --git a/Userland/Applications/Help/CMakeLists.txt b/Userland/Applications/Help/CMakeLists.txt
@@ -21,4 +21,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(Help ICON app-help)
-target_link_libraries(Help LibWebView LibWeb LibMarkdown LibGUI LibDesktop LibMain)
+target_link_libraries(Help PRIVATE LibCore LibWebView LibWeb LibMarkdown LibGfx LibGUI LibDesktop LibMain)
diff --git a/Userland/Applications/HexEditor/CMakeLists.txt b/Userland/Applications/HexEditor/CMakeLists.txt
@@ -24,4 +24,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(HexEditor ICON app-hex-editor)
-target_link_libraries(HexEditor LibGUI LibConfig LibDesktop LibFileSystemAccessClient LibMain)
+target_link_libraries(HexEditor PRIVATE LibCore LibGfx LibGUI LibConfig LibDesktop LibFileSystemAccessClient LibMain)
diff --git a/Userland/Applications/ImageViewer/CMakeLists.txt b/Userland/Applications/ImageViewer/CMakeLists.txt
@@ -11,4 +11,4 @@ set(SOURCES
 )
 
 serenity_app(ImageViewer ICON filetype-image)
-target_link_libraries(ImageViewer LibDesktop LibGUI LibGfx LibImageDecoderClient LibMain)
+target_link_libraries(ImageViewer PRIVATE LibCore LibDesktop LibGUI LibGfx LibImageDecoderClient LibMain)
diff --git a/Userland/Applications/KeyboardMapper/CMakeLists.txt b/Userland/Applications/KeyboardMapper/CMakeLists.txt
@@ -11,4 +11,4 @@ set(SOURCES
 )
 
 serenity_app(KeyboardMapper ICON app-keyboard-mapper)
-target_link_libraries(KeyboardMapper LibGUI LibKeyboard LibMain)
+target_link_libraries(KeyboardMapper PRIVATE LibCore LibGfx LibGUI LibKeyboard LibMain)
diff --git a/Userland/Applications/KeyboardSettings/CMakeLists.txt b/Userland/Applications/KeyboardSettings/CMakeLists.txt
@@ -18,4 +18,4 @@ set(GENERATED_SOURCES
 )
 
 serenity_app(KeyboardSettings ICON app-keyboard-settings)
-target_link_libraries(KeyboardSettings LibGUI LibKeyboard LibConfig LibMain)
+target_link_libraries(KeyboardSettings PRIVATE LibCore LibGfx LibGUI LibKeyboard LibConfig LibMain)
diff --git a/Userland/Applications/Magnifier/CMakeLists.txt b/Userland/Applications/Magnifier/CMakeLists.txt
@@ -10,4 +10,4 @@ set(SOURCES
 )
 
 serenity_app(Magnifier ICON app-magnifier)
-target_link_libraries(Magnifier LibGfx LibGUI LibMain LibFileSystemAccessClient)
+target_link_libraries(Magnifier PRIVATE LibCore LibGfx LibGUI LibIPC LibMain LibFileSystemAccessClient)