diff --git a/lib/jpegli.cmake b/lib/jpegli.cmake
index 0fb0a79c..e6993c7f 100644
--- a/lib/jpegli.cmake
+++ b/lib/jpegli.cmake
@@ -37,8 +37,6 @@ target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})
 set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_include_directories(jpegli-static PRIVATE
   "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
   "${JXL_HWY_INCLUDE_DIRS}"
 )
 target_include_directories(jpegli-static PUBLIC
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index aa632eaa..fb83a14d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -80,7 +80,9 @@ if(JPEGXL_ENABLE_TOOLS)
   # Depends on parts of jxl_extras that are only built if libjpeg is found and
   # jpegli is enabled.
   add_executable(cjpegli cjpegli.cc)
+  target_link_libraries(cjpegli jpegli-static)
   add_executable(djpegli djpegli.cc)
+  target_link_libraries(djpegli jpegli-static)
   list(APPEND INTERNAL_TOOL_BINARIES cjpegli djpegli)
 endif()  # JPEGXL_ENABLE_TOOLS