diff --git a/include/hcc_detail/hip_ldg.h b/include/hcc_detail/hip_ldg.h
index 71d39990ed..1b24060d44 100644
--- a/include/hcc_detail/hip_ldg.h
+++ b/include/hcc_detail/hip_ldg.h
@@ -21,7 +21,6 @@ THE SOFTWARE.
 #define HIP_LDG_H
 
 #if __HCC__
-#if defined (USE_LDG)
 #include"hip_vector_types.h"
 #include"host_defines.h"
 #if __hcc_workweek__ >= 16164 
@@ -100,8 +99,6 @@ __device__ double4              __ldg(const double4* );
 
 #endif  // __hcc_workweek__
 
-#endif  // USE_LDG
-
 #endif  // __HCC__
 
 #endif  // HIP_LDG_H
diff --git a/include/hcc_detail/hip_runtime.h b/include/hcc_detail/hip_runtime.h
index 30799bcd06..ee30c6db58 100644
--- a/include/hcc_detail/hip_runtime.h
+++ b/include/hcc_detail/hip_runtime.h
@@ -109,7 +109,6 @@ extern int HIP_TRACE_API;
 #define __HCC_C__
 #endif
 
-#ifdef DISABLED_MATH_FUNC // TODO - remove this flag.
 __device__ float acosf(float x);
 __device__ float acoshf(float x);
 __device__ float asinf(float x);
@@ -442,7 +441,6 @@ __device__ float __dsqrt_rd(double x);
 __device__ float __dsqrt_rn(double x);
 __device__ float __dsqrt_ru(double x);
 __device__ float __dsqrt_rz(double x);
-#endif /* DISABLED_MATH_FUNC*/
 /**
  * Kernel launching
  */
diff --git a/src/hip_ldg.cpp b/src/hip_ldg.cpp
index e3af9860e3..9c3189c322 100644
--- a/src/hip_ldg.cpp
+++ b/src/hip_ldg.cpp
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hc.hpp>
 #include"hcc_detail/hip_ldg.h"
 
-#if __hcc_workweek__ >= 16164 and defined (USE_LDG) 
+#if __hcc_workweek__ >= 16164 
 __device__ char                 __ldg(const char* ptr)
 {
     return ptr[0];