diff --git a/include/hip/hcc_detail/math_functions.h b/include/hip/hcc_detail/math_functions.h
index 5457a99cfd..b44d3f00bd 100644
--- a/include/hip/hcc_detail/math_functions.h
+++ b/include/hip/hcc_detail/math_functions.h
@@ -1306,30 +1306,22 @@ __DEF_FLOAT_FUN2I(scalbn)
 
 #if __HCC__
 template<class T>
-__DEVICE__ __host__ inline static const T min(T arg1, T arg2) {
+__DEVICE__ inline static T min(T arg1, T arg2) {
   return std::min(arg1, arg2);
 }
 
 template<class T>
-__DEVICE__ __host__ inline static const T max(T arg1, T arg2) {
+__DEVICE__ inline static T max(T arg1, T arg2) {
   return std::max(arg1, arg2);
 }
 #else
-__device__ inline static int min(int arg1, int arg2) {
+__DEVICE__ inline static int min(int arg1, int arg2) {
   return (arg1 < arg2) ? arg1 : arg2;
 }
-__device__ inline static int max(int arg1, int arg2) {
+__DEVICE__ inline static int max(int arg1, int arg2) {
   return (arg1 > arg2) ? arg1 : arg2;
 }
 
-__host__ inline static int min(int arg1, int arg2) {
-  return std::min(arg1, arg2);
-}
-
-__host__ inline static int max(int arg1, int arg2) {
-  return std::max(arg1, arg2);
-}
-
 __DEVICE__
 inline
 float max(float x, float y) {
@@ -1359,6 +1351,15 @@ __HIP_OVERLOAD2(double, min)
 
 #endif
 
+__host__ inline static int min(int arg1, int arg2) {
+  return std::min(arg1, arg2);
+}
+
+__host__ inline static int max(int arg1, int arg2) {
+  return std::max(arg1, arg2);
+}
+
+
 #pragma pop_macro("__DEF_FLOAT_FUN")
 #pragma pop_macro("__DEF_FLOAT_FUN2")
 #pragma pop_macro("__DEF_FLOAT_FUN2I")