diff --git a/cub/util_ptx.cuh b/cub/util_ptx.cuh
index 4d135fe3..cc169025 100644
--- a/cub/util_ptx.cuh
+++ b/cub/util_ptx.cuh
@@ -504,7 +504,7 @@ int RowMajorTid(int block_dim_x, int block_dim_y, int block_dim_z)
  */
 __device__
 __forceinline__
-inline
+//inline
 unsigned int LaneId()
 {
     unsigned int ret;
@@ -523,7 +523,7 @@ unsigned int LaneId()
  */
 __device__
 __forceinline__
-inline
+//inline
 unsigned int WarpId()
 {
     unsigned int ret;
diff --git a/hip_helpers/forwarder.hpp b/hip_helpers/forwarder.hpp
index 0ce9e5b7..040ceee4 100644
--- a/hip_helpers/forwarder.hpp
+++ b/hip_helpers/forwarder.hpp
@@ -1,5 +1,6 @@
 #pragma once
-
+#ifndef HELPER_FORWARDER
+#define HELPER_FORWARDER
 #include <type_traits>
 #include <utility>
 
@@ -44,3 +45,4 @@ namespace
         return Forwarder<F>{std::move(f)};
     }
 }
+#endif