diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f1bc718..7a2993fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -979,11 +979,6 @@ add_cpp2_thrift_library(thrift/history.thrift
 add_cpp2_thrift_library(thrift/features.thrift
                         TARGET features_thrift OUTPUT_PATH dwarfs)
 
-target_link_libraries(metadata_thrift thrift_light)
-target_link_libraries(compression_thrift thrift_light)
-target_link_libraries(history_thrift thrift_light)
-target_link_libraries(features_thrift thrift_light)
-
 target_link_libraries(dwarfs_categorizer metadata_thrift)
 
 foreach(tgt dwarfs dwarfs_compression dwarfs_categorizer
diff --git a/cmake/thrift_library.cmake b/cmake/thrift_library.cmake
index 70598b0d..25d5c42b 100644
--- a/cmake/thrift_library.cmake
+++ b/cmake/thrift_library.cmake
@@ -126,12 +126,11 @@ function(add_cpp2_thrift_library idlfile)
   if(NOT _THRIFT_NO_LIBRARY)
     add_library(${_THRIFT_TARGET} ${_THRIFT_LIB_SRC})
     target_include_directories(${_THRIFT_TARGET} PUBLIC
-        ${CMAKE_CURRENT_BINARY_DIR}/folly
         ${CMAKE_CURRENT_BINARY_DIR}/thrift
-        ${CMAKE_CURRENT_SOURCE_DIR}/folly
         ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
         ${CMAKE_CURRENT_BINARY_DIR}
     )
+    target_link_libraries(${_THRIFT_TARGET} PUBLIC thrift_light)
     if(NOT WIN32)
       target_compile_options(${_THRIFT_TARGET} PRIVATE -Wno-deprecated-declarations)
     endif()