Minimal should mean minimal.

hipamd/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__

hipamd/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"

hipamd/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

hipamd/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__

hipamd/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"
 

hipamd/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)

hipamd/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>
 

hipamd/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>