diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_interfaces.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_interfaces.cmake
index 2a10b8a2a705..afcbe5227192 100644
--- a/projects/rocprofiler-sdk/cmake/rocprofiler_interfaces.cmake
+++ b/projects/rocprofiler-sdk/cmake/rocprofiler_interfaces.cmake
@@ -124,3 +124,6 @@ rocprofiler_add_nolink_interface_library(
 rocprofiler_add_nolink_interface_library(
     rocprofiler-sdk-hipfile-nolink "hipFILE headers without linking to hipFILE library"
     IMPORTED)
+rocprofiler_add_nolink_interface_library(
+    rocprofiler-sdk-sqlite3-nolink "SQLite3 headers without linking to SQLite3 library"
+    IMPORTED)
diff --git a/projects/rocprofiler-sdk/external/CMakeLists.txt b/projects/rocprofiler-sdk/external/CMakeLists.txt
index 97728eca4a54..a5b17cfdf06f 100644
--- a/projects/rocprofiler-sdk/external/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/external/CMakeLists.txt
@@ -4,6 +4,7 @@
 #
 #
 include(rocprofiler_utilities)
+include(rocprofiler_config_nolink_target)
 
 cmake_policy(PUSH)
 cmake_policy(SET CMP0077 NEW) # option() honors normal variables
@@ -305,9 +306,20 @@ if(ROCPROFILER_BUILD_SQLITE3)
     add_dependencies(rocprofiler-sdk-sqlite3 rocprofiler-sdk-sqlite-build)
 else()
     find_package(SQLite3 REQUIRED)
-    target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite::SQLite3)
+    if(TARGET SQLite::SQLite3)
+        target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite::SQLite3)
+    elseif(TARGET SQLite3::SQLite3)
+        target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE SQLite3::SQLite3)
+    else()
+        target_link_libraries(rocprofiler-sdk-sqlite3 INTERFACE ${SQLite3_LIBRARIES})
+        target_include_directories(rocprofiler-sdk-sqlite3 SYSTEM
+                                   INTERFACE ${SQLite3_INCLUDE_DIRS})
+    endif()
 endif()
 
+rocprofiler_config_nolink_target(rocprofiler-sdk-sqlite3-nolink
+                                 rocprofiler-sdk::rocprofiler-sdk-sqlite3)
+
 #
 # PyBind11
 #
diff --git a/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt
index 6bab86b825f8..c2991e2ca722 100644
--- a/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries(
     rocprofiler-sdk-output-library
     PUBLIC rocprofiler-sdk::rocprofiler-sdk-rocpd-library
            rocprofiler-sdk::rocprofiler-sdk-aqlprofile
+           rocprofiler-sdk::rocprofiler-sdk-sqlite3-nolink
     PRIVATE rocprofiler-sdk::rocprofiler-sdk-headers
             rocprofiler-sdk::rocprofiler-sdk-build-flags
             rocprofiler-sdk::rocprofiler-sdk-sanitizer
diff --git a/projects/rocprofiler-sdk/source/lib/python/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/python/CMakeLists.txt
index 58d07db58311..bbe7107b9392 100644
--- a/projects/rocprofiler-sdk/source/lib/python/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/lib/python/CMakeLists.txt
@@ -3,7 +3,9 @@
 #
 
 set(CMAKE_MESSAGE_INDENT "[${PROJECT_NAME}][python] ")
-set(DEFAULT_PYTHON_RPATH "\$ORIGIN:\$ORIGIN/../../..:\$ORIGIN/../../../rocprofiler-sdk")
+set(DEFAULT_PYTHON_RPATH
+    "\$ORIGIN:\$ORIGIN/../../..:\$ORIGIN/../../../rocprofiler-sdk:\$ORIGIN/../../../rocm_sysdeps/lib"
+    )
 
 include("${CMAKE_CURRENT_LIST_DIR}/utilities.cmake")
 
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt
index d95305dc360d..f5c851ec8d64 100644
--- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt
@@ -58,7 +58,7 @@ set_target_properties(
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
-               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
+               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..:\$ORIGIN/../rocm_sysdeps/lib")
 
 install(
     TARGETS rocprofiler-sdk-tool
@@ -67,3 +67,4 @@ install(
     EXPORT rocprofiler-sdk-tool-targets)
 
 add_subdirectory(kokkosp)
+add_subdirectory(list-avail)
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/CMakeLists.txt
similarity index 96%
rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/CMakeLists.txt
rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/CMakeLists.txt
index 0061a71068a7..9988a2a2cc73 100644
--- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties(
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
-               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
+               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..:\$ORIGIN/../rocm_sysdeps/lib")
 
 install(
     TARGETS rocprofv3-list-avail
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/rocprofv3_avail.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/rocprofv3_avail.cpp
similarity index 100%
rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/rocprofv3_avail.cpp
rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/rocprofv3_avail.cpp
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/rocprofv3_avail.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/rocprofv3_avail.hpp
similarity index 100%
rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler-avail/rocprofv3_avail.hpp
rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/list-avail/rocprofv3_avail.hpp
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt
index 841f8e92834d..12f2724e26eb 100644
--- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt
@@ -204,5 +204,3 @@ set_target_properties(
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)
 endif()
-
-add_subdirectory(rocprofiler-avail)