diff --git a/include/hip/hcc_detail/hip_runtime.h b/include/hip/hcc_detail/hip_runtime.h
index cf4125be31..3db06bb15e 100644
--- a/include/hip/hcc_detail/hip_runtime.h
+++ b/include/hip/hcc_detail/hip_runtime.h
@@ -109,7 +109,9 @@ extern int HIP_TRACE_API;
 #include <hip/hcc_detail/device_functions.h>
 #include <hip/hcc_detail/surface_functions.h>
 #include <hip/hcc_detail/texture_functions.h>
-
+#if __HCC__
+    #include <hip/hcc_detail/math_functions.h>
+#endif
 // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
 #if defined(__KALMAR_ACCELERATOR__) && !defined(__HCC_ACCELERATOR__)
 #define __HCC_ACCELERATOR__ __KALMAR_ACCELERATOR__
diff --git a/tests/src/deviceLib/hipDoublePrecisionIntrinsics.cpp b/tests/src/deviceLib/hipDoublePrecisionIntrinsics.cpp
index 413f67d012..76b7a5de7a 100644
--- a/tests/src/deviceLib/hipDoublePrecisionIntrinsics.cpp
+++ b/tests/src/deviceLib/hipDoublePrecisionIntrinsics.cpp
@@ -28,7 +28,6 @@ THE SOFTWARE.
 
 #include <hip/hip_runtime.h>
 #include <hip/device_functions.h>
-#include <hip/math_functions.h>
 #include "test_common.h"
 
 #pragma GCC diagnostic ignored "-Wall"
diff --git a/tests/src/deviceLib/hipFloatMath.cpp b/tests/src/deviceLib/hipFloatMath.cpp
index fb7e4451dc..d363efc271 100644
--- a/tests/src/deviceLib/hipFloatMath.cpp
+++ b/tests/src/deviceLib/hipFloatMath.cpp
@@ -27,7 +27,6 @@ THE SOFTWARE.
  */
 
 #include "test_common.h"
-#include <hip/math_functions.h>
 #include <hip/device_functions.h>
 
 #define LEN 512
diff --git a/tests/src/deviceLib/hipMathFunctions.cpp b/tests/src/deviceLib/hipMathFunctions.cpp
index 3acafddcc0..f89bdae149 100644
--- a/tests/src/deviceLib/hipMathFunctions.cpp
+++ b/tests/src/deviceLib/hipMathFunctions.cpp
@@ -27,7 +27,6 @@ THE SOFTWARE.
  */
 
 #include "hip/hip_runtime.h"
-#include "hip/math_functions.h"
 #include "test_common.h"
 
 #if __HIP_ARCH_GFX803__ || __HIP_ARCH_GFX900__ || __HIP_ARCH_GFX906__
diff --git a/tests/src/deviceLib/hipSinglePrecisionIntrinsics.cpp b/tests/src/deviceLib/hipSinglePrecisionIntrinsics.cpp
index c0d21aade8..54f8118423 100644
--- a/tests/src/deviceLib/hipSinglePrecisionIntrinsics.cpp
+++ b/tests/src/deviceLib/hipSinglePrecisionIntrinsics.cpp
@@ -27,7 +27,6 @@ THE SOFTWARE.
 
 #include <hip/hip_runtime.h>
 #include <hip/device_functions.h>
-#include <hip/math_functions.h>
 
 #include "test_common.h"
 
diff --git a/tests/src/deviceLib/hipTestFMA.cpp b/tests/src/deviceLib/hipTestFMA.cpp
index 44b96d518d..2771fac585 100644
--- a/tests/src/deviceLib/hipTestFMA.cpp
+++ b/tests/src/deviceLib/hipTestFMA.cpp
@@ -26,7 +26,6 @@ THE SOFTWARE.
 #include "test_common.h"
 #include <hip/hip_runtime.h>
 #include <hip/hip_runtime_api.h>
-#include <hip/math_functions.h>
 #include <iostream>
 
 #define HIP_ASSERT(status) assert(status == hipSuccess)
diff --git a/tests/src/deviceLib/hip_trig.cpp b/tests/src/deviceLib/hip_trig.cpp
index 59eaeacadb..60f54a7a3d 100644
--- a/tests/src/deviceLib/hip_trig.cpp
+++ b/tests/src/deviceLib/hip_trig.cpp
@@ -30,7 +30,6 @@ THE SOFTWARE.
 #include <hip/hip_runtime.h>
 #include "test_common.h"
 #include <hip/device_functions.h>
-#include <hip/math_functions.h>
 
 #include <iostream>
 
diff --git a/tests/src/kernel/hipLanguageExtensions.cpp b/tests/src/kernel/hipLanguageExtensions.cpp
index d9b35a15ec..e9c8629662 100644
--- a/tests/src/kernel/hipLanguageExtensions.cpp
+++ b/tests/src/kernel/hipLanguageExtensions.cpp
@@ -28,7 +28,6 @@ THE SOFTWARE.
  */
 
 #include "hip/hip_runtime.h"
-#include "hip/math_functions.h"
 
 #include <test_common.h>