diff --git a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
index cb4a3f8676..9d2e12d8af 100644
--- a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
@@ -171,8 +171,8 @@ inline static cudaMemcpyKind hipMemcpyKindToCudaMemcpyKind(hipMemcpyKind kind) {
 /**
  * Stream CallBack struct
  */
-typedef void(* hipStreamCallback_t)(hipStream_t stream,  hipError_t status, void* userData);
-
+#define HIPRT_CB CUDART_CB
+typedef void(HIPRT_CB * hipStreamCallback_t)(hipStream_t stream,  hipError_t status, void* userData);
 inline static hipError_t hipInit(unsigned int flags)
 {
     return hipCUResultTohipError(cuInit(flags));
@@ -589,8 +589,7 @@ inline static hipError_t hipStreamQuery(hipStream_t stream)
 
 inline static hipError_t hipStreamAddCallback(hipStream_t stream, hipStreamCallback_t callback, void *userData, unsigned int flags)
 {
-    return hipCUDAErrorTohipError(cudaStreamAddCallback(cudaStream_t stream,
-        cudaStreamCallback_t callback, void *userData, unsigned int flags));
+    return hipCUDAErrorTohipError(cudaStreamAddCallback(stream, (cudaStreamCallback_t)callback, userData, flags));
 }
 
 inline static hipError_t hipDriverGetVersion(int *driverVersion)