diff --git a/xla/stream_executor/gpu/BUILD b/xla/stream_executor/gpu/BUILD
index ec2793349575df..779edad407627a 100644
--- a/xla/stream_executor/gpu/BUILD
+++ b/xla/stream_executor/gpu/BUILD
@@ -528,7 +528,9 @@ tsl_gpu_library(
     srcs = [
         "gpu_cudamallocasync_allocator.cc",
     ],
-    hdrs = ["gpu_cudamallocasync_allocator.h"],
+    hdrs = ["gpu_cudamallocasync_allocator.h",
+	        "gpu_types.h",
+	       ], 
     cuda_deps = [
         "//xla/stream_executor/cuda:cuda_activation",
         "//xla/stream_executor/cuda:cuda_executor",
@@ -545,7 +547,8 @@ tsl_gpu_library(
         "@tsl//tsl/platform:macros",
         "@tsl//tsl/platform:mutex",
         "@tsl//tsl/util:env_var",
-    ],
+    ] + if_rocm_is_configured([
+		         "//xla/stream_executor/rocm:rocm_activation"]),
 )
 
 cc_library(
diff --git a/xla/stream_executor/gpu/gpu_cudamallocasync_allocator.cc b/xla/stream_executor/gpu/gpu_cudamallocasync_allocator.cc
index 635f23666bfcda..63a7d76cbb40c3 100644
--- a/xla/stream_executor/gpu/gpu_cudamallocasync_allocator.cc
+++ b/xla/stream_executor/gpu/gpu_cudamallocasync_allocator.cc
@@ -93,11 +93,16 @@ using cuuint64_t = uint64_t;
 namespace stream_executor {
 
 #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
-static std::string GetCudaErrorMessage(GpuStatus result) {
+static std::string GetCudaErrorMessage(gpu::GpuStatus result) {
   const char* error;
-  GpuGetErrorString(result, &error);
   const char* name;
+#if GOOGLE_CUDA
+  GpuGetErrorString(result, &error);
   GpuGetErrorName(result, &name);
+#elif TENSORFLOW_USE_ROCM
+  error = GpuGetErrorString(result);
+  name = GpuGetErrorName(result);
+#endif
   return absl::StrCat("CUDA error: ", error ? error : "<unknown>", " (",
                       name ? name : "Unknown", ")");
 }
@@ -281,7 +286,7 @@ GpuCudaMallocAsyncAllocator::GpuCudaMallocAsyncAllocator(
   DCHECK(all_pools_->size() == all_ids_->size());
   for (int i = 0; i < all_pools_->size(); ++i) {
     // Set the current pool access to the previous GPUs.
-    GpuMemAccessDesc map;
+	gpu::GpuMemAccessDesc map;
     map.flags = GPU_MEM_ACCESS_FLAGS_PROT_READWRITE;
     map.location.id = (*all_ids_)[i].value();
 
diff --git a/xla/stream_executor/gpu/gpu_types.h b/xla/stream_executor/gpu/gpu_types.h
index 1b804725cc2151..23c5d9adb458cc 100644
--- a/xla/stream_executor/gpu/gpu_types.h
+++ b/xla/stream_executor/gpu/gpu_types.h
@@ -63,7 +63,7 @@ using GpuGraphExecHandle = hipGraphExec_t;
 using GpuGraphNodeHandle = hipGraphNode_t;
 using GpuGraphConditionalHandle = UnsupportedGpuFeature;
 using GpuMemoryPoolHandle = hipMemPool_t;
-using GpuMemAccessDes = hipMemAccessDesc;
+using GpuMemAccessDesc = hipMemAccessDesc;
 #else  // CUDA
 
 using GpuContextHandle = CUcontext;
@@ -85,7 +85,7 @@ using GpuGraphHandle = CUgraph;
 using GpuGraphExecHandle = CUgraphExec;
 using GpuGraphNodeHandle = CUgraphNode;
 using GpuMemoryPoolHandle = CUmemoryPool;
-using GpuMemAccessDes = CUmemAccessDesc;
+using GpuMemAccessDesc = CUmemAccessDesc;
 
 #if CUDA_VERSION >= 12030
 using GpuGraphConditionalHandle = CUgraphConditionalHandle;