diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44b9fd81a3..7a65896baa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,17 +17,15 @@ target_link_libraries( ${TARGET_LIB} PRIVATE ${HSA_RUNTIME_LIB} c stdc++ )
 execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/hsaap.py ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH}" )
 
 # Generating KFD/Thunk tracing primitives
-if ( DEFINED KFD_WRAPPER )
-  set ( KFD_LIB "kfdwrapper64" )
-  set ( KFD_LIB_SRC
-    ${LIB_DIR}/kfd/kfd_wrapper.cpp
-  )
-  execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/gen_ostream_ops.py -in ${HSA_KMT_INC_PATH}/hsakmttypes.h -out ${ROOT_DIR}/inc/kfd_ostream_ops.h" )
-  add_library ( ${KFD_LIB} SHARED ${KFD_LIB_SRC} )
-  target_include_directories ( ${KFD_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HSA_KMT_INC_PATH} )
-  target_link_libraries( ${KFD_LIB} PRIVATE c stdc++ )
-  execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/kfdap.py ${ROOT_DIR} ${HSA_KMT_INC_PATH}" )
-endif()
+set ( KFD_LIB "kfdwrapper64" )
+set ( KFD_LIB_SRC
+  ${LIB_DIR}/kfd/kfd_wrapper.cpp
+)
+execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/gen_ostream_ops.py -in ${HSA_KMT_INC_PATH}/hsakmttypes.h -out ${ROOT_DIR}/inc/kfd_ostream_ops.h" )
+add_library ( ${KFD_LIB} SHARED ${KFD_LIB_SRC} )
+target_include_directories ( ${KFD_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HSA_KMT_INC_PATH} )
+target_link_libraries( ${KFD_LIB} PRIVATE c stdc++ )
+execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/kfdap.py ${ROOT_DIR} ${HSA_KMT_INC_PATH}" )
 
 set ( ROCTX_LIB "roctx64" )
 set ( ROCTX_LIB_SRC