diff --git a/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt
index d8e2f06693..573be7c99f 100755
--- a/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt
@@ -120,6 +120,9 @@ set ( CORE_SRC   ${OPEN_SOURCE_DIR}/hsa-runtime/core/common/shared.cpp
 
 set ( CMDWRITER_SRC   ${TOOLS_SOURCE_DIR}/commandwriter/aql_hw_cmdwriter.cpp
                       ${TOOLS_SOURCE_DIR}/commandwriter/ci_aql_common.cpp
+                      ${TOOLS_SOURCE_DIR}/commandwriter/gfx9_cmdwriter.cpp
+                      ${TOOLS_SOURCE_DIR}/commandwriter/gfx9_factory.cpp
+                      ${TOOLS_SOURCE_DIR}/commandwriter/pre_gfx9_factory.cpp
                       ${TOOLS_SOURCE_DIR}/commandwriter/cmdwriter.cpp )
 
 set ( COMMON_SRC      ${TOOLS_SOURCE_DIR}/common/amd_tools_interface.cpp )