diff --git a/source/bin/rocprofv3.py b/source/bin/rocprofv3.py
index 1a14b3ce27..59de3d116d 100755
--- a/source/bin/rocprofv3.py
+++ b/source/bin/rocprofv3.py
@@ -181,7 +181,7 @@ For MPI applications (or other job launchers such as SLURM), place rocprofv3 ins
     add_parser_bool_argument(
         basic_tracing_options,
         "--hsa-trace",
-        help="For collecting --hsa-core-trace, --hsa-amd-trace,--hsa-image-trace and --hsa-finalizer-trace. This option only enables the tracing of the HSA API. Unlike previous iterations of rocprof, this does not enable kernel tracing, memory copy tracing, etc"
+        help="For collecting --hsa-core-trace, --hsa-amd-trace,--hsa-image-trace and --hsa-finalizer-trace. This option only enables the tracing of the HSA API. Unlike previous iterations of rocprof, this does not enable kernel tracing, memory copy tracing, etc",
     )
     add_parser_bool_argument(
         basic_tracing_options,
diff --git a/source/include/rocprofiler-sdk/callback_tracing.h b/source/include/rocprofiler-sdk/callback_tracing.h
index 124207d402..eba9aab878 100644
--- a/source/include/rocprofiler-sdk/callback_tracing.h
+++ b/source/include/rocprofiler-sdk/callback_tracing.h
@@ -27,7 +27,27 @@
 #include <rocprofiler-sdk/hip.h>
 #include <rocprofiler-sdk/hsa.h>
 #include <rocprofiler-sdk/marker.h>
-#include <rocprofiler-sdk/rccl.h>
+
+#if !defined(ROCPROFILER_SDK_USE_SYSTEM_RCCL)
+#    if defined __has_include
+#        if __has_include(<rccl/amd_detail/api_trace.h>)
+#            define ROCPROFILER_SDK_USE_SYSTEM_RCCL 1
+#        else
+#            define ROCPROFILER_SDK_USE_SYSTEM_RCCL 0
+#        endif
+#    else
+#        define ROCPROFILER_SDK_USE_SYSTEM_RCCL 0
+#    endif
+#endif
+
+#if ROCPROFILER_SDK_USE_SYSTEM_RCCL > 0
+#    include <rccl/amd_detail/api_trace.h>
+#    include <rccl/rccl.h>
+#else
+#    include <rocprofiler-sdk/rccl/api_args.h>
+#    include <rocprofiler-sdk/rccl/details/api_trace.h>
+#    include <rocprofiler-sdk/rccl/details/rccl.h>
+#endif
 
 #include <hsa/hsa.h>
 #include <hsa/hsa_amd_tool.h>