diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cf1a2e8aa057c85ff406892f07cf321cb6fc57a..d45c48c436f21b70932a0d99333f60a732f89d0e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -381,13 +381,14 @@ target_link_libraries(inkscape_base PUBLIC Boost::filesystem)
 target_link_libraries(inkscape_base
     PRIVATE
         ${INKSCAPE_TARGET_LIBS}
-    PUBLIC
         2Geom::2geom
+    INTERFACE
         ${INKSCAPE_LIBS}
   )
 
 # Link inkscape and inkview against inkscape_base
 target_link_libraries(inkscape inkscape_base)
+target_include_directories(inkscape PRIVATE 3rdparty/2geom/include)
 target_link_libraries(inkview inkscape_base)
 if(WIN32)
     target_link_libraries(inkscape_com inkscape_base)
diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt
index 7d4627edaf3526e07b06625e9357a3eac3d2b5d5..72a06aa819cfda84ff5ed4ab8991ce2b06f080c5 100644
--- a/testfiles/CMakeLists.txt
+++ b/testfiles/CMakeLists.txt
@@ -78,6 +78,7 @@ set(TEST_SOURCES
     sp-item-group-test)
 
 add_library(cpp_test_static_library SHARED unittest.cpp doc-per-case-test.cpp)
+target_include_directories(cpp_test_static_library PUBLIC "${CMAKE_SOURCE_DIR}/src/3rdparty/2geom/include")
 target_link_libraries(cpp_test_static_library PUBLIC ${GTEST_LIBRARIES} inkscape_base)
 
 add_custom_target(tests)
@@ -85,7 +86,7 @@ foreach(test_source ${TEST_SOURCES})
     string(REPLACE "-test" "" testname "test_${test_source}")
     add_executable(${testname} src/${test_source}.cpp)
     target_include_directories(${testname} SYSTEM PRIVATE ${GTEST_INCLUDE_DIRS})
-    target_link_libraries(${testname} cpp_test_static_library)
+    target_link_libraries(${testname} cpp_test_static_library 2Geom::2geom)
     add_test(NAME ${testname} COMMAND ${testname})
     set_tests_properties(${testname} PROPERTIES ENVIRONMENT "${INKSCAPE_TEST_PROFILE_DIR_ENV}/${testname};${CMAKE_CTEST_ENV}")
     add_dependencies(tests ${testname})