diff --git a/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt b/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
index 6816f3fa15..2edd2be274 100644
--- a/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt
@@ -64,31 +64,41 @@ if ( DEFINED VERSION_BUILD )
 endif ()
 set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" )
 
-set ( PACKAGE_DIRECTORIES
-      "hsa/lib")
+set ( PACKAGE_DIRECTORIES "hsa/lib")
 
-add_custom_command ( OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   COMMAND mkdir -p hsa/lib )
+add_custom_command ( OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory "hsa/lib" ) 
 
 add_custom_target (create_dirs DEPENDS ${PACKAGE_DIRECTORIES} )
 
+set ( TOOLS_NAME     "libhsa-runtime-tools64" )
 set ( IMAGE_NAME     "libhsa-ext-image64" )
 
+set ( TOOLS_LIBRARY_SOURCE     "${OUT_DIR}/lib/${TOOLS_NAME}.so.${LIB_VERSION_STRING}" )
 set ( IMAGE_LIBRARY_SOURCE     "${OUT_DIR}/lib/${IMAGE_NAME}.so.${LIB_VERSION_STRING}" )
 
+set ( TOOLS_LIBRARY_TARGET     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${LIB_VERSION_STRING}" )
 set ( IMAGE_LIBRARY_TARGET     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${LIB_VERSION_STRING}" )
 
+set ( TOOLS_LIBRARY_SONAME     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${TOOLS_NAME}.so.${BUILD_VERSION_MAJOR}" )
 set ( IMAGE_LIBRARY_SONAME     "${CMAKE_CURRENT_BINARY_DIR}/hsa/lib/${IMAGE_NAME}.so.${BUILD_VERSION_MAJOR}" )
 
+add_custom_command ( OUTPUT ${TOOLS_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                     COMMAND ${CMAKE_COMMAND} -E copy ${TOOLS_LIBRARY_SOURCE} ${TOOLS_LIBRARY_TARGET} )
+
 add_custom_command ( OUTPUT ${IMAGE_LIBRARY_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                      COMMAND ${CMAKE_COMMAND} -E copy ${IMAGE_LIBRARY_SOURCE} ${IMAGE_LIBRARY_TARGET} )
 
+add_custom_command ( OUTPUT ${TOOLS_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib
+                     COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOOLS_NAME}.so.${VERSION_STRING} ${TOOLS_NAME}.so.${BUILD_VERSION_MAJOR} )
+
 add_custom_command ( OUTPUT ${IMAGE_LIBRARY_SONAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/lib
                      COMMAND ${CMAKE_COMMAND} -E create_symlink ${IMAGE_NAME}.so.${VERSION_STRING} ${IMAGE_NAME}.so.${BUILD_VERSION_MAJOR} )
 
 add_custom_target ( copy_targets ALL DEPENDS create_dirs
+                                        ${TOOLS_LIBRARY_TARGET}
                                         ${IMAGE_LIBRARY_TARGET}
                                         ${TOOLS_LIBRARY_SONAME}
+                                        ${IMAGE_LIBRARY_SONAME}
                                         )
 
 install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hsa/ DESTINATION hsa USE_SOURCE_PERMISSIONS )
diff --git a/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt b/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt
index aff517b72c..df6971a297 100644
--- a/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/packages/hsa-rocr-dev/CMakeLists.txt
@@ -92,15 +92,21 @@ set ( RUNTIME_HEADER_NAMES
       "hsa_ven_amd_aqlprofile.h"
      )
 
-#set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
+set ( RUNTIME_TOOLS_HEADER_NAMES
+      "hsa_ext_profiler.h"
+      "hsa_ext_debugger.h"
+      "amd_hsa_tools_interfaces.h"
+    )
+
+set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
 
 set ( TOPLEVEL_INCLUDE_LINK "${CMAKE_CURRENT_BINARY_DIR}/include/hsa" )
 
 add_custom_command(OUTPUT ${PACKAGE_DIRECTORIES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   COMMAND mkdir -p include
-                   COMMAND mkdir -p lib
-                   COMMAND mkdir -p hsa/lib
-                   COMMAND mkdir -p hsa/include/hsa )
+                   COMMAND ${CMAKE_COMMAND} -E make_directory "include"
+                   COMMAND ${CMAKE_COMMAND} -E make_directory "lib"
+                   COMMAND ${CMAKE_COMMAND} -E make_directory "hsa/lib"
+                   COMMAND ${CMAKE_COMMAND} -E make_directory "hsa/include/hsa" )
 
 add_custom_target (create_dirs DEPENDS ${PACKAGE_DIRECTORIES} )
 
@@ -129,6 +135,17 @@ foreach ( HEADER_FILE ${RUNTIME_HEADER_NAMES} )
 
 endforeach()
 
+foreach ( HEADER_FILE ${RUNTIME_TOOLS_HEADER_NAMES} )
+
+    set ( HEADER_TARGET "${CMAKE_CURRENT_BINARY_DIR}/hsa/include/hsa/${HEADER_FILE}" )
+
+    add_custom_command( OUTPUT ${HEADER_TARGET} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                        COMMAND ${CMAKE_COMMAND} -E copy ${RUNTIME_TOOLS_INCLUDE_DIR}/${HEADER_FILE} ${HEADER_TARGET} )
+
+    list ( APPEND RUNTIME_HEADERS ${HEADER_TARGET} )
+
+endforeach()
+
 add_custom_target (copy_headers DEPENDS ${RUNTIME_HEADERS} create_dirs)
 
 add_custom_target (copy_targets ALL DEPENDS create_dirs