diff --git a/projects/rocshmem/src/reverse_offload/context_ro_host.hpp b/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
index 80e8a6f6e5..62710da395 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_host.hpp
@@ -148,42 +148,42 @@ class ROHostContext : public Context {
                        int nreduce);
 
   template <typename T>
-  __host__ void wait_until(T *ivars, roc_shmem_cmps cmp, T val);
+  __host__ void wait_until(T *ivars, int cmp, T val);
 
   template <typename T>
   __host__ void wait_until_all(T *ivars, size_t nelems,
                                const int *status,
-                               roc_shmem_cmps cmp, T val);
+                               int cmp, T val);
 
   template <typename T>
   __host__ size_t wait_until_any(T *ivars, size_t nelems,
                                  const int *status,
-                                 roc_shmem_cmps cmp, T val);
+                                 int cmp, T val);
 
   template <typename T>
   __host__ size_t wait_until_some(T *ivars, size_t nelems,
                                 size_t* indices,
                                 const int *status,
-                                roc_shmem_cmps cmp, T val);
+                                int cmp, T val);
 
   template <typename T>
   __host__ void wait_until_all_vector(T *ivars, size_t nelems,
                                       const int *status,
-                                      roc_shmem_cmps cmp, T* vals);
+                                      int cmp, T* vals);
 
   template <typename T>
   __host__ size_t wait_until_any_vector(T *ivars, size_t nelems,
                                         const int *status,
-                                        roc_shmem_cmps cmp, T* vals);
+                                        int cmp, T* vals);
 
   template <typename T>
   __host__ size_t wait_until_some_vector(T *ivars, size_t nelems,
                                        size_t* indices,
                                        const int *status,
-                                       roc_shmem_cmps cmp, T* vals);
+                                       int cmp, T* vals);
 
   template <typename T>
-  __host__ int test(T *ivars, roc_shmem_cmps cmp, T val);
+  __host__ int test(T *ivars, int cmp, T val);
 };
 
 }  // namespace rocshmem
diff --git a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
index 4e3b1855d7..25d2e72c35 100644
--- a/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
+++ b/projects/rocshmem/src/reverse_offload/context_ro_tmpl_host.hpp
@@ -141,20 +141,20 @@ __host__ void ROHostContext::to_all(roc_shmem_team_t team, T *dest,
 }
 
 template <typename T>
-__host__ void ROHostContext::wait_until(T *ivars, roc_shmem_cmps cmp, T val) {
+__host__ void ROHostContext::wait_until(T *ivars, int cmp, T val) {
   host_interface->wait_until<T>(ivars, cmp, val, context_window_info);
 }
 
 template <typename T>
 __host__ size_t ROHostContext::wait_until_any(T *ivars, size_t nelems,
-      const int *status, roc_shmem_cmps cmp, T val) {
+      const int *status, int cmp, T val) {
   return host_interface->wait_until_any<T>(ivars, nelems, status, cmp, val, context_window_info);
 }
 
 template <typename T>
 __host__
 void ROHostContext::wait_until_all(T *ivars, size_t nelems,
-    const int *status, roc_shmem_cmps cmp, T val) {
+    const int *status, int cmp, T val) {
   host_interface->wait_until_all(ivars, nelems, status, cmp, val, context_window_info);
 }
 
@@ -163,7 +163,7 @@ __host__
 size_t ROHostContext::wait_until_some(T *ivars, size_t nelems,
                               size_t* indices,
                               const int *status,
-                              roc_shmem_cmps cmp, T val) {
+                              int cmp, T val) {
   return host_interface->wait_until_some(ivars, nelems, indices, status, cmp, val, context_window_info);
 }
 
@@ -171,14 +171,14 @@ template <typename T>
 __host__
 void ROHostContext::wait_until_all_vector(T *ivars, size_t nelems,
                                     const int *status,
-                                    roc_shmem_cmps cmp, T* vals) {
+                                    int cmp, T* vals) {
   host_interface->wait_until_all_vector(ivars, nelems, status, cmp, vals, context_window_info);
 }
 
 template <typename T>
 __host__ size_t ROHostContext::wait_until_any_vector(T *ivars, size_t nelems,
                                       const int *status,
-                                      roc_shmem_cmps cmp, T* vals) {
+                                      int cmp, T* vals) {
   return host_interface->wait_until_any_vector(ivars, nelems, status, cmp, vals, context_window_info);
 }
 
@@ -186,12 +186,12 @@ template <typename T>
 __host__ size_t ROHostContext::wait_until_some_vector(T *ivars, size_t nelems,
                                      size_t* indices,
                                      const int *status,
-                                     roc_shmem_cmps cmp, T* vals) {
+                                     int cmp, T* vals) {
   return host_interface->wait_until_some_vector(ivars, nelems, indices, status, cmp, vals, context_window_info);
 }
 
 template <typename T>
-__host__ int ROHostContext::test(T *ivars, roc_shmem_cmps cmp, T val) {
+__host__ int ROHostContext::test(T *ivars, int cmp, T val) {
   return host_interface->test<T>(ivars, cmp, val, context_window_info);
 }