diff --git a/.ahub/sam/exclude.txt b/.ahub/sam/exclude.txt
index 4d170a829f6..6162bfccd3e 100644
--- a/.ahub/sam/exclude.txt
+++ b/.ahub/sam/exclude.txt
@@ -26,6 +26,7 @@
 
 # Flatbuffers generated
 /ONE/runtime/libs/circle-schema/include/circle_schema_generated.h
+/ONE/runtime/libs/circle-schema/include/circle_traininfo_generated.h
 /ONE/runtime/onert/core/src/loader/tflite_schema_generated.h
 
 # External code: Android NN API
diff --git a/runtime/onert/core/src/loader/circle_traininfo.fbs b/runtime/libs/circle-schema/include/circle_traininfo.fbs
similarity index 100%
rename from runtime/onert/core/src/loader/circle_traininfo.fbs
rename to runtime/libs/circle-schema/include/circle_traininfo.fbs
diff --git a/runtime/onert/core/src/loader/circle_traininfo_generated.h b/runtime/libs/circle-schema/include/circle_traininfo_generated.h
similarity index 100%
rename from runtime/onert/core/src/loader/circle_traininfo_generated.h
rename to runtime/libs/circle-schema/include/circle_traininfo_generated.h
diff --git a/tests/nnfw_api/CMakeLists.txt b/tests/nnfw_api/CMakeLists.txt
index 123fb5d3ef3..887ee9b1b74 100644
--- a/tests/nnfw_api/CMakeLists.txt
+++ b/tests/nnfw_api/CMakeLists.txt
@@ -30,10 +30,8 @@ if(Opencl_Headers_FOUND)
   target_compile_definitions(${RUNTIME_NNFW_API_TEST} PRIVATE TEST_GPU_CL_BACKEND)
 endif(Opencl_Headers_FOUND)
 
-# TODO: Fix this when circle_traininfo_generated.h is exported to other places
-set(CIRCLE_PLUS_HEADER_DIR ${NNAS_PROJECT_SOURCE_DIR}/runtime/onert/core/src/loader)
 set(RUNTIME_NNFW_API_TEST_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_include_directories(${RUNTIME_NNFW_API_TEST} PRIVATE ${RUNTIME_NNFW_API_TEST_INCLUDE} ${CIRCLE_PLUS_HEADER_DIR})
+target_include_directories(${RUNTIME_NNFW_API_TEST} PRIVATE ${RUNTIME_NNFW_API_TEST_INCLUDE})
 
 target_link_libraries(${RUNTIME_NNFW_API_TEST} nnfw-dev jsoncpp)
 target_link_libraries(${RUNTIME_NNFW_API_TEST} gtest gmock)