https://github.com/frasercrmck updated
https://github.com/llvm/llvm-project/pull/137959
>From ef6433ffa32a8f4ced865382bfd45de61f5aef53 Mon Sep 17 00:00:00 2001
From: Fraser Cormack <fra...@codeplay.com>
Date: Wed, 30 Apr 2025 13:48:16 +0100
Subject: [PATCH 1/2] [libclc] Clean up unnecessary #undef __CLC_BODYs
This macro is automatically undefined by the various gentype-like
helpers.
---
libclc/clc/include/clc/common/clc_degrees.h | 1 -
libclc/clc/include/clc/common/clc_radians.h | 1 -
libclc/clc/include/clc/common/clc_sign.h | 1 -
libclc/clc/include/clc/common/clc_smoothstep.h | 1 -
libclc/clc/include/clc/integer/clc_add_sat.h | 1 -
libclc/clc/include/clc/integer/clc_clz.h | 1 -
libclc/clc/include/clc/integer/clc_ctz.h | 1 -
libclc/clc/include/clc/integer/clc_hadd.h | 1 -
libclc/clc/include/clc/integer/clc_mad24.h | 1 -
libclc/clc/include/clc/integer/clc_mad_sat.h | 1 -
libclc/clc/include/clc/integer/clc_mul24.h | 1 -
libclc/clc/include/clc/integer/clc_mul_hi.h | 1 -
libclc/clc/include/clc/integer/clc_rhadd.h | 1 -
libclc/clc/include/clc/integer/clc_rotate.h | 1 -
libclc/clc/include/clc/integer/clc_sub_sat.h | 1 -
libclc/clc/include/clc/internal/math/clc_sw_fma.h | 1 -
libclc/clc/include/clc/math/clc_acos.h | 1 -
libclc/clc/include/clc/math/clc_acosh.h | 1 -
libclc/clc/include/clc/math/clc_acospi.h | 1 -
libclc/clc/include/clc/math/clc_asin.h | 1 -
libclc/clc/include/clc/math/clc_asinh.h | 1 -
libclc/clc/include/clc/math/clc_asinpi.h | 1 -
libclc/clc/include/clc/math/clc_atan.h | 1 -
libclc/clc/include/clc/math/clc_atan2.h | 1 -
libclc/clc/include/clc/math/clc_atan2pi.h | 1 -
libclc/clc/include/clc/math/clc_atanh.h | 1 -
libclc/clc/include/clc/math/clc_atanpi.h | 1 -
libclc/clc/include/clc/math/clc_cbrt.inc | 1 -
libclc/clc/include/clc/math/clc_ceil.h | 1 -
libclc/clc/include/clc/math/clc_copysign.h | 1 -
libclc/clc/include/clc/math/clc_cosh.h | 1 -
libclc/clc/include/clc/math/clc_cospi.h | 1 -
libclc/clc/include/clc/math/clc_exp.h | 1 -
libclc/clc/include/clc/math/clc_exp10.h | 1 -
libclc/clc/include/clc/math/clc_exp2.h | 1 -
libclc/clc/include/clc/math/clc_exp_helper.h | 1 -
libclc/clc/include/clc/math/clc_expm1.h | 1 -
libclc/clc/include/clc/math/clc_fabs.h | 1 -
libclc/clc/include/clc/math/clc_fdim.h | 1 -
libclc/clc/include/clc/math/clc_floor.h | 1 -
libclc/clc/include/clc/math/clc_fma.h | 1 -
libclc/clc/include/clc/math/clc_fmax.h | 1 -
libclc/clc/include/clc/math/clc_fmin.h | 1 -
libclc/clc/include/clc/math/clc_fmod.h | 1 -
libclc/clc/include/clc/math/clc_fract.h | 1 -
libclc/clc/include/clc/math/clc_frexp.h | 1 -
libclc/clc/include/clc/math/clc_hypot.h | 1 -
libclc/clc/include/clc/math/clc_lgamma.h | 1 -
libclc/clc/include/clc/math/clc_lgamma_r.h | 1 -
libclc/clc/include/clc/math/clc_log.h | 1 -
libclc/clc/include/clc/math/clc_log10.h | 1 -
libclc/clc/include/clc/math/clc_log1p.h | 1 -
libclc/clc/include/clc/math/clc_log2.h | 1 -
libclc/clc/include/clc/math/clc_mad.h | 1 -
libclc/clc/include/clc/math/clc_modf.h | 1 -
libclc/clc/include/clc/math/clc_nan.h | 1 -
libclc/clc/include/clc/math/clc_native_cos.h | 1 -
libclc/clc/include/clc/math/clc_native_divide.h | 1 -
libclc/clc/include/clc/math/clc_native_exp.h | 1 -
libclc/clc/include/clc/math/clc_native_exp10.h | 1 -
libclc/clc/include/clc/math/clc_native_exp2.h | 1 -
libclc/clc/include/clc/math/clc_native_log.h | 1 -
libclc/clc/include/clc/math/clc_native_log10.h | 1 -
libclc/clc/include/clc/math/clc_native_log2.h | 1 -
libclc/clc/include/clc/math/clc_native_powr.h | 1 -
libclc/clc/include/clc/math/clc_native_recip.h | 1 -
libclc/clc/include/clc/math/clc_native_rsqrt.h | 1 -
libclc/clc/include/clc/math/clc_native_sin.h | 1 -
libclc/clc/include/clc/math/clc_native_sqrt.h | 1 -
libclc/clc/include/clc/math/clc_native_tan.h | 1 -
libclc/clc/include/clc/math/clc_nextafter.h | 1 -
libclc/clc/include/clc/math/clc_pow.h | 1 -
libclc/clc/include/clc/math/clc_pown.h | 1 -
libclc/clc/include/clc/math/clc_powr.h | 1 -
libclc/clc/include/clc/math/clc_remainder.h | 1 -
libclc/clc/include/clc/math/clc_remquo.h | 1 -
libclc/clc/include/clc/math/clc_rint.h | 1 -
libclc/clc/include/clc/math/clc_rootn.h | 1 -
libclc/clc/include/clc/math/clc_round.h | 1 -
libclc/clc/include/clc/math/clc_rsqrt.h | 1 -
libclc/clc/include/clc/math/clc_sincos_helpers.h | 1 -
libclc/clc/include/clc/math/clc_sinh.h | 1 -
libclc/clc/include/clc/math/clc_sinpi.h | 1 -
libclc/clc/include/clc/math/clc_sqrt.h | 1 -
libclc/clc/include/clc/math/clc_tanh.h | 1 -
libclc/clc/include/clc/math/clc_tanpi.h | 1 -
libclc/clc/include/clc/math/clc_tgamma.h | 1 -
libclc/clc/include/clc/math/clc_trunc.h | 1 -
libclc/clc/include/clc/relational/clc_bitselect.h | 1 -
libclc/clc/include/clc/relational/clc_isfinite.h | 1 -
libclc/clc/include/clc/relational/clc_isgreater.h | 1 -
libclc/clc/include/clc/relational/clc_isgreaterequal.h | 1 -
libclc/clc/include/clc/relational/clc_isless.h | 1 -
libclc/clc/include/clc/relational/clc_islessequal.h | 1 -
libclc/clc/include/clc/relational/clc_islessgreater.h | 1 -
libclc/clc/include/clc/relational/clc_isnormal.h | 1 -
libclc/clc/include/clc/relational/clc_isnotequal.h | 1 -
libclc/clc/include/clc/relational/clc_isordered.h | 1 -
libclc/clc/include/clc/relational/clc_isunordered.h | 1 -
libclc/clc/include/clc/relational/clc_signbit.h | 1 -
libclc/clc/lib/generic/math/clc_hypot.cl | 1 -
libclc/clc/lib/generic/relational/clc_bitselect.cl | 1 -
libclc/clspv/lib/shared/vstore_half.cl | 1 -
libclc/generic/include/clc/async/async_work_group_copy.h | 4 ----
.../generic/include/clc/async/async_work_group_strided_copy.h | 4 ----
libclc/generic/include/clc/async/prefetch.h | 2 --
libclc/generic/include/clc/common/degrees.h | 1 -
libclc/generic/include/clc/common/radians.h | 1 -
libclc/generic/include/clc/common/sign.h | 1 -
libclc/generic/include/clc/common/smoothstep.h | 1 -
libclc/generic/include/clc/common/step.h | 1 -
libclc/generic/include/clc/integer/clz.h | 1 -
libclc/generic/include/clc/integer/ctz.h | 1 -
libclc/generic/include/clc/integer/hadd.h | 1 -
libclc/generic/include/clc/integer/mad_hi.h | 1 -
libclc/generic/include/clc/integer/mad_sat.h | 1 -
libclc/generic/include/clc/integer/mul24.h | 1 -
libclc/generic/include/clc/integer/mul_hi.h | 1 -
libclc/generic/include/clc/integer/popcount.h | 1 -
libclc/generic/include/clc/integer/rhadd.h | 1 -
libclc/generic/include/clc/math/acos.h | 1 -
libclc/generic/include/clc/math/acosh.h | 1 -
libclc/generic/include/clc/math/acospi.h | 1 -
libclc/generic/include/clc/math/asin.h | 1 -
libclc/generic/include/clc/math/asinh.h | 1 -
libclc/generic/include/clc/math/asinpi.h | 1 -
libclc/generic/include/clc/math/atan.h | 1 -
libclc/generic/include/clc/math/atan2.h | 1 -
libclc/generic/include/clc/math/atan2pi.h | 1 -
libclc/generic/include/clc/math/atanh.h | 1 -
libclc/generic/include/clc/math/atanpi.h | 1 -
libclc/generic/include/clc/math/cbrt.h | 1 -
libclc/generic/include/clc/math/ceil.h | 1 -
libclc/generic/include/clc/math/copysign.h | 1 -
libclc/generic/include/clc/math/cos.h | 1 -
libclc/generic/include/clc/math/cosh.h | 1 -
libclc/generic/include/clc/math/cospi.h | 1 -
libclc/generic/include/clc/math/erf.h | 1 -
libclc/generic/include/clc/math/erfc.h | 1 -
libclc/generic/include/clc/math/exp.h | 1 -
libclc/generic/include/clc/math/exp10.h | 1 -
libclc/generic/include/clc/math/exp2.h | 1 -
libclc/generic/include/clc/math/expm1.h | 1 -
libclc/generic/include/clc/math/fabs.h | 1 -
libclc/generic/include/clc/math/fdim.h | 1 -
libclc/generic/include/clc/math/floor.h | 1 -
libclc/generic/include/clc/math/fma.h | 1 -
libclc/generic/include/clc/math/fmax.h | 1 -
libclc/generic/include/clc/math/fmin.h | 1 -
libclc/generic/include/clc/math/half_cos.h | 1 -
libclc/generic/include/clc/math/half_divide.h | 1 -
libclc/generic/include/clc/math/half_exp.h | 1 -
libclc/generic/include/clc/math/half_exp10.h | 1 -
libclc/generic/include/clc/math/half_exp2.h | 1 -
libclc/generic/include/clc/math/half_log.h | 1 -
libclc/generic/include/clc/math/half_log10.h | 1 -
libclc/generic/include/clc/math/half_log2.h | 1 -
libclc/generic/include/clc/math/half_powr.h | 1 -
libclc/generic/include/clc/math/half_recip.h | 1 -
libclc/generic/include/clc/math/half_rsqrt.h | 1 -
libclc/generic/include/clc/math/half_sin.h | 1 -
libclc/generic/include/clc/math/half_sqrt.h | 1 -
libclc/generic/include/clc/math/half_tan.h | 1 -
libclc/generic/include/clc/math/hypot.h | 1 -
libclc/generic/include/clc/math/ilogb.h | 1 -
libclc/generic/include/clc/math/lgamma.h | 1 -
libclc/generic/include/clc/math/lgamma_r.h | 1 -
libclc/generic/include/clc/math/log.h | 1 -
libclc/generic/include/clc/math/log10.h | 1 -
libclc/generic/include/clc/math/log1p.h | 1 -
libclc/generic/include/clc/math/log2.h | 1 -
libclc/generic/include/clc/math/logb.h | 1 -
libclc/generic/include/clc/math/mad.h | 1 -
libclc/generic/include/clc/math/maxmag.h | 1 -
libclc/generic/include/clc/math/minmag.h | 1 -
libclc/generic/include/clc/math/native_cos.h | 1 -
libclc/generic/include/clc/math/native_divide.h | 1 -
libclc/generic/include/clc/math/native_exp.h | 1 -
libclc/generic/include/clc/math/native_exp10.h | 1 -
libclc/generic/include/clc/math/native_exp2.h | 1 -
libclc/generic/include/clc/math/native_log.h | 1 -
libclc/generic/include/clc/math/native_log10.h | 1 -
libclc/generic/include/clc/math/native_log2.h | 1 -
libclc/generic/include/clc/math/native_powr.h | 1 -
libclc/generic/include/clc/math/native_recip.h | 1 -
libclc/generic/include/clc/math/native_rsqrt.h | 1 -
libclc/generic/include/clc/math/native_sin.h | 1 -
libclc/generic/include/clc/math/native_sqrt.h | 1 -
libclc/generic/include/clc/math/native_tan.h | 1 -
libclc/generic/include/clc/math/nextafter.h | 1 -
libclc/generic/include/clc/math/pow.h | 1 -
libclc/generic/include/clc/math/pown.h | 1 -
libclc/generic/include/clc/math/powr.h | 1 -
libclc/generic/include/clc/math/rint.h | 1 -
libclc/generic/include/clc/math/rootn.h | 1 -
libclc/generic/include/clc/math/round.h | 1 -
libclc/generic/include/clc/math/rsqrt.h | 1 -
libclc/generic/include/clc/math/sin.h | 1 -
libclc/generic/include/clc/math/sinh.h | 1 -
libclc/generic/include/clc/math/sinpi.h | 1 -
libclc/generic/include/clc/math/sqrt.h | 1 -
libclc/generic/include/clc/math/tan.h | 1 -
libclc/generic/include/clc/math/tanh.h | 1 -
libclc/generic/include/clc/math/tanpi.h | 1 -
libclc/generic/include/clc/math/tgamma.h | 1 -
libclc/generic/include/clc/math/trunc.h | 1 -
libclc/generic/include/clc/relational/bitselect.h | 1 -
libclc/generic/include/clc/relational/isfinite.h | 1 -
libclc/generic/include/clc/relational/isgreater.h | 1 -
libclc/generic/include/clc/relational/isgreaterequal.h | 1 -
libclc/generic/include/clc/relational/isless.h | 1 -
libclc/generic/include/clc/relational/islessequal.h | 1 -
libclc/generic/include/clc/relational/islessgreater.h | 1 -
libclc/generic/include/clc/relational/isnormal.h | 1 -
libclc/generic/include/clc/relational/isnotequal.h | 1 -
libclc/generic/include/clc/relational/isordered.h | 1 -
libclc/generic/include/clc/relational/isunordered.h | 1 -
libclc/generic/include/clc/relational/signbit.h | 1 -
libclc/generic/include/math/clc_tan.h | 1 -
libclc/generic/lib/async/async_work_group_copy.cl | 2 --
libclc/generic/lib/async/async_work_group_strided_copy.cl | 2 --
libclc/generic/lib/async/prefetch.cl | 2 --
libclc/generic/lib/shared/vload.cl | 1 -
libclc/generic/lib/shared/vstore.cl | 1 -
224 files changed, 234 deletions(-)
diff --git a/libclc/clc/include/clc/common/clc_degrees.h
b/libclc/clc/include/clc/common/clc_degrees.h
index 59e06db8f80b0..5f04fac1f2612 100644
--- a/libclc/clc/include/clc/common/clc_degrees.h
+++ b/libclc/clc/include/clc/common/clc_degrees.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_COMMON_CLC_DEGREES_H__
diff --git a/libclc/clc/include/clc/common/clc_radians.h
b/libclc/clc/include/clc/common/clc_radians.h
index 4d5063a2b7578..03d7c4b9e3014 100644
--- a/libclc/clc/include/clc/common/clc_radians.h
+++ b/libclc/clc/include/clc/common/clc_radians.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_COMMON_CLC_RADIANS_H__
diff --git a/libclc/clc/include/clc/common/clc_sign.h
b/libclc/clc/include/clc/common/clc_sign.h
index da74a6ab98eec..9737f1e54441b 100644
--- a/libclc/clc/include/clc/common/clc_sign.h
+++ b/libclc/clc/include/clc/common/clc_sign.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_COMMON_CLC_SIGN_H__
diff --git a/libclc/clc/include/clc/common/clc_smoothstep.h
b/libclc/clc/include/clc/common/clc_smoothstep.h
index bf773c8033d8d..80a28a1bbb1f8 100644
--- a/libclc/clc/include/clc/common/clc_smoothstep.h
+++ b/libclc/clc/include/clc/common/clc_smoothstep.h
@@ -14,6 +14,5 @@
#define __CLC_BODY <clc/common/clc_smoothstep.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#endif // __CLC_COMMON_CLC_SMOOTHSTEP_H__
diff --git a/libclc/clc/include/clc/integer/clc_add_sat.h
b/libclc/clc/include/clc/integer/clc_add_sat.h
index 8e135173c93fa..8c3495f6c5193 100644
--- a/libclc/clc/include/clc/integer/clc_add_sat.h
+++ b/libclc/clc/include/clc/integer/clc_add_sat.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_ADD_SAT_H__
diff --git a/libclc/clc/include/clc/integer/clc_clz.h
b/libclc/clc/include/clc/integer/clc_clz.h
index 24115c11f1da3..dd62cc935f8cd 100644
--- a/libclc/clc/include/clc/integer/clc_clz.h
+++ b/libclc/clc/include/clc/integer/clc_clz.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_CLZ_H__
diff --git a/libclc/clc/include/clc/integer/clc_ctz.h
b/libclc/clc/include/clc/integer/clc_ctz.h
index 1e6365100827b..3f2079e023f67 100644
--- a/libclc/clc/include/clc/integer/clc_ctz.h
+++ b/libclc/clc/include/clc/integer/clc_ctz.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_CTZ_H__
diff --git a/libclc/clc/include/clc/integer/clc_hadd.h
b/libclc/clc/include/clc/integer/clc_hadd.h
index 6a372ab918d25..679369d3c9d4e 100644
--- a/libclc/clc/include/clc/integer/clc_hadd.h
+++ b/libclc/clc/include/clc/integer/clc_hadd.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_HADD_H__
diff --git a/libclc/clc/include/clc/integer/clc_mad24.h
b/libclc/clc/include/clc/integer/clc_mad24.h
index 560f042a5f6e0..e19bd905d22eb 100644
--- a/libclc/clc/include/clc/integer/clc_mad24.h
+++ b/libclc/clc/include/clc/integer/clc_mad24.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype24.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_MAD24_H__
diff --git a/libclc/clc/include/clc/integer/clc_mad_sat.h
b/libclc/clc/include/clc/integer/clc_mad_sat.h
index f8cbc9b2a398b..845378b3e7c46 100644
--- a/libclc/clc/include/clc/integer/clc_mad_sat.h
+++ b/libclc/clc/include/clc/integer/clc_mad_sat.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_MAD_SAT_H__
diff --git a/libclc/clc/include/clc/integer/clc_mul24.h
b/libclc/clc/include/clc/integer/clc_mul24.h
index d9d2be79cd6a2..f813de55c71e5 100644
--- a/libclc/clc/include/clc/integer/clc_mul24.h
+++ b/libclc/clc/include/clc/integer/clc_mul24.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype24.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_MUL24_H__
diff --git a/libclc/clc/include/clc/integer/clc_mul_hi.h
b/libclc/clc/include/clc/integer/clc_mul_hi.h
index ffc66dbae5479..e4738e5570e81 100644
--- a/libclc/clc/include/clc/integer/clc_mul_hi.h
+++ b/libclc/clc/include/clc/integer/clc_mul_hi.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_MUL_HI_H__
diff --git a/libclc/clc/include/clc/integer/clc_rhadd.h
b/libclc/clc/include/clc/integer/clc_rhadd.h
index dd5c680a45a33..b8b0b1a3a56ed 100644
--- a/libclc/clc/include/clc/integer/clc_rhadd.h
+++ b/libclc/clc/include/clc/integer/clc_rhadd.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_RHADD_H__
diff --git a/libclc/clc/include/clc/integer/clc_rotate.h
b/libclc/clc/include/clc/integer/clc_rotate.h
index 4ba64037344cb..513bf98526233 100644
--- a/libclc/clc/include/clc/integer/clc_rotate.h
+++ b/libclc/clc/include/clc/integer/clc_rotate.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_ROTATE_H__
diff --git a/libclc/clc/include/clc/integer/clc_sub_sat.h
b/libclc/clc/include/clc/integer/clc_sub_sat.h
index fa39abcdcfde9..94a5484adefcf 100644
--- a/libclc/clc/include/clc/integer/clc_sub_sat.h
+++ b/libclc/clc/include/clc/integer/clc_sub_sat.h
@@ -14,7 +14,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTEGER_CLC_SUB_SAT_H__
diff --git a/libclc/clc/include/clc/internal/math/clc_sw_fma.h
b/libclc/clc/include/clc/internal/math/clc_sw_fma.h
index 8261c04890c61..5d6c76879ceb9 100644
--- a/libclc/clc/include/clc/internal/math/clc_sw_fma.h
+++ b/libclc/clc/include/clc/internal/math/clc_sw_fma.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
diff --git a/libclc/clc/include/clc/math/clc_acos.h
b/libclc/clc/include/clc/math/clc_acos.h
index edf519344111d..1d484fa5b56c9 100644
--- a/libclc/clc/include/clc/math/clc_acos.h
+++ b/libclc/clc/include/clc/math/clc_acos.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ACOS_H__
diff --git a/libclc/clc/include/clc/math/clc_acosh.h
b/libclc/clc/include/clc/math/clc_acosh.h
index 915f4b3febaa9..9492724bb27ba 100644
--- a/libclc/clc/include/clc/math/clc_acosh.h
+++ b/libclc/clc/include/clc/math/clc_acosh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ACOSH_H__
diff --git a/libclc/clc/include/clc/math/clc_acospi.h
b/libclc/clc/include/clc/math/clc_acospi.h
index 789078d6ccd35..90cfc06b7dffb 100644
--- a/libclc/clc/include/clc/math/clc_acospi.h
+++ b/libclc/clc/include/clc/math/clc_acospi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ACOSPI_H__
diff --git a/libclc/clc/include/clc/math/clc_asin.h
b/libclc/clc/include/clc/math/clc_asin.h
index 11227a5e14d50..f6246c49f8022 100644
--- a/libclc/clc/include/clc/math/clc_asin.h
+++ b/libclc/clc/include/clc/math/clc_asin.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ASIN_H__
diff --git a/libclc/clc/include/clc/math/clc_asinh.h
b/libclc/clc/include/clc/math/clc_asinh.h
index b91ae4f0ebd23..05e44fa438cee 100644
--- a/libclc/clc/include/clc/math/clc_asinh.h
+++ b/libclc/clc/include/clc/math/clc_asinh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ASINH_H__
diff --git a/libclc/clc/include/clc/math/clc_asinpi.h
b/libclc/clc/include/clc/math/clc_asinpi.h
index 75b6709dd4fd3..8f308dd06022e 100644
--- a/libclc/clc/include/clc/math/clc_asinpi.h
+++ b/libclc/clc/include/clc/math/clc_asinpi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ASINPI_H__
diff --git a/libclc/clc/include/clc/math/clc_atan.h
b/libclc/clc/include/clc/math/clc_atan.h
index 903b15299d629..203e46c2b8a4a 100644
--- a/libclc/clc/include/clc/math/clc_atan.h
+++ b/libclc/clc/include/clc/math/clc_atan.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ATAN_H__
diff --git a/libclc/clc/include/clc/math/clc_atan2.h
b/libclc/clc/include/clc/math/clc_atan2.h
index 85b99d0279ee7..6edc9dda48f4d 100644
--- a/libclc/clc/include/clc/math/clc_atan2.h
+++ b/libclc/clc/include/clc/math/clc_atan2.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ATAN2_H__
diff --git a/libclc/clc/include/clc/math/clc_atan2pi.h
b/libclc/clc/include/clc/math/clc_atan2pi.h
index af41165f7dcf2..2f26d1d9ae985 100644
--- a/libclc/clc/include/clc/math/clc_atan2pi.h
+++ b/libclc/clc/include/clc/math/clc_atan2pi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ATAN2PI_H__
diff --git a/libclc/clc/include/clc/math/clc_atanh.h
b/libclc/clc/include/clc/math/clc_atanh.h
index aefbc1933fdc6..85f9fc53be1a6 100644
--- a/libclc/clc/include/clc/math/clc_atanh.h
+++ b/libclc/clc/include/clc/math/clc_atanh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ATANH_H__
diff --git a/libclc/clc/include/clc/math/clc_atanpi.h
b/libclc/clc/include/clc/math/clc_atanpi.h
index d22fd9b6c7e21..2b3c6b373ed42 100644
--- a/libclc/clc/include/clc/math/clc_atanpi.h
+++ b/libclc/clc/include/clc/math/clc_atanpi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ATANPI_H__
diff --git a/libclc/clc/include/clc/math/clc_cbrt.inc
b/libclc/clc/include/clc/math/clc_cbrt.inc
index 4c219efe2b5b7..fd9b750c8fd89 100644
--- a/libclc/clc/include/clc/math/clc_cbrt.inc
+++ b/libclc/clc/include/clc/math/clc_cbrt.inc
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_CBRT_H__
diff --git a/libclc/clc/include/clc/math/clc_ceil.h
b/libclc/clc/include/clc/math/clc_ceil.h
index 35c1b9f773064..45668224c6176 100644
--- a/libclc/clc/include/clc/math/clc_ceil.h
+++ b/libclc/clc/include/clc/math/clc_ceil.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_CEIL_H__
diff --git a/libclc/clc/include/clc/math/clc_copysign.h
b/libclc/clc/include/clc/math/clc_copysign.h
index d6476f2383891..563dd2827839a 100644
--- a/libclc/clc/include/clc/math/clc_copysign.h
+++ b/libclc/clc/include/clc/math/clc_copysign.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_COPYSIGN_H__
diff --git a/libclc/clc/include/clc/math/clc_cosh.h
b/libclc/clc/include/clc/math/clc_cosh.h
index 71e414ce28ac2..7bcfa2ea26e06 100644
--- a/libclc/clc/include/clc/math/clc_cosh.h
+++ b/libclc/clc/include/clc/math/clc_cosh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_COSH_H__
diff --git a/libclc/clc/include/clc/math/clc_cospi.h
b/libclc/clc/include/clc/math/clc_cospi.h
index 07565c23a2f07..4d82100649b01 100644
--- a/libclc/clc/include/clc/math/clc_cospi.h
+++ b/libclc/clc/include/clc/math/clc_cospi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_COSPI_H__
diff --git a/libclc/clc/include/clc/math/clc_exp.h
b/libclc/clc/include/clc/math/clc_exp.h
index 00b5a7f69779a..84369bb8fbdd6 100644
--- a/libclc/clc/include/clc/math/clc_exp.h
+++ b/libclc/clc/include/clc/math/clc_exp.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_EXP_H__
diff --git a/libclc/clc/include/clc/math/clc_exp10.h
b/libclc/clc/include/clc/math/clc_exp10.h
index 4f98bf7de6a74..500271cb07429 100644
--- a/libclc/clc/include/clc/math/clc_exp10.h
+++ b/libclc/clc/include/clc/math/clc_exp10.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_EXP10_H__
diff --git a/libclc/clc/include/clc/math/clc_exp2.h
b/libclc/clc/include/clc/math/clc_exp2.h
index 20ee54b0a2755..4ad0ddea48a7c 100644
--- a/libclc/clc/include/clc/math/clc_exp2.h
+++ b/libclc/clc/include/clc/math/clc_exp2.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_EXP2_H__
diff --git a/libclc/clc/include/clc/math/clc_exp_helper.h
b/libclc/clc/include/clc/math/clc_exp_helper.h
index 8a2db5de16764..89c725ca0d5c9 100644
--- a/libclc/clc/include/clc/math/clc_exp_helper.h
+++ b/libclc/clc/include/clc/math/clc_exp_helper.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __DOUBLE_ONLY
#endif // __CLC_MATH_CLC_EXP_HELPER
diff --git a/libclc/clc/include/clc/math/clc_expm1.h
b/libclc/clc/include/clc/math/clc_expm1.h
index 0359c3916f1c5..5c60960ca5b03 100644
--- a/libclc/clc/include/clc/math/clc_expm1.h
+++ b/libclc/clc/include/clc/math/clc_expm1.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_EXPM1_H__
diff --git a/libclc/clc/include/clc/math/clc_fabs.h
b/libclc/clc/include/clc/math/clc_fabs.h
index 87ad6ac36cf0b..1ef38a8c75957 100644
--- a/libclc/clc/include/clc/math/clc_fabs.h
+++ b/libclc/clc/include/clc/math/clc_fabs.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FABS_H__
diff --git a/libclc/clc/include/clc/math/clc_fdim.h
b/libclc/clc/include/clc/math/clc_fdim.h
index 4477d1ecb7d31..50ad045db62cf 100644
--- a/libclc/clc/include/clc/math/clc_fdim.h
+++ b/libclc/clc/include/clc/math/clc_fdim.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FDIM_H__
diff --git a/libclc/clc/include/clc/math/clc_floor.h
b/libclc/clc/include/clc/math/clc_floor.h
index 5b872f9ee343e..d243819e0a42c 100644
--- a/libclc/clc/include/clc/math/clc_floor.h
+++ b/libclc/clc/include/clc/math/clc_floor.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FLOOR_H__
diff --git a/libclc/clc/include/clc/math/clc_fma.h
b/libclc/clc/include/clc/math/clc_fma.h
index 17055891ca918..5e87f4c470850 100644
--- a/libclc/clc/include/clc/math/clc_fma.h
+++ b/libclc/clc/include/clc/math/clc_fma.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FMA_H__
diff --git a/libclc/clc/include/clc/math/clc_fmax.h
b/libclc/clc/include/clc/math/clc_fmax.h
index cc50c165bff85..f367a9b6ea1ca 100644
--- a/libclc/clc/include/clc/math/clc_fmax.h
+++ b/libclc/clc/include/clc/math/clc_fmax.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FMAX_H__
diff --git a/libclc/clc/include/clc/math/clc_fmin.h
b/libclc/clc/include/clc/math/clc_fmin.h
index b62a3e47b98c6..47ed3fad2d8c2 100644
--- a/libclc/clc/include/clc/math/clc_fmin.h
+++ b/libclc/clc/include/clc/math/clc_fmin.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FMIN_H__
diff --git a/libclc/clc/include/clc/math/clc_fmod.h
b/libclc/clc/include/clc/math/clc_fmod.h
index 59778fd0f6129..44179babd7fed 100644
--- a/libclc/clc/include/clc/math/clc_fmod.h
+++ b/libclc/clc/include/clc/math/clc_fmod.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FMOD_H__
diff --git a/libclc/clc/include/clc/math/clc_fract.h
b/libclc/clc/include/clc/math/clc_fract.h
index 8ea47d47d914f..af762ecc59ea5 100644
--- a/libclc/clc/include/clc/math/clc_fract.h
+++ b/libclc/clc/include/clc/math/clc_fract.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FRACT_H__
diff --git a/libclc/clc/include/clc/math/clc_frexp.h
b/libclc/clc/include/clc/math/clc_frexp.h
index a25f2a7dc6d73..d6ed2754d0d40 100644
--- a/libclc/clc/include/clc/math/clc_frexp.h
+++ b/libclc/clc/include/clc/math/clc_frexp.h
@@ -13,7 +13,6 @@
#define __CLC_BODY <clc/math/unary_decl_with_int_ptr.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_FREXP_H__
diff --git a/libclc/clc/include/clc/math/clc_hypot.h
b/libclc/clc/include/clc/math/clc_hypot.h
index 1d154b74ad761..40b354154fa53 100644
--- a/libclc/clc/include/clc/math/clc_hypot.h
+++ b/libclc/clc/include/clc/math/clc_hypot.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_HYPOT_H__
diff --git a/libclc/clc/include/clc/math/clc_lgamma.h
b/libclc/clc/include/clc/math/clc_lgamma.h
index 7e516c1f08793..f54c5e2b61b67 100644
--- a/libclc/clc/include/clc/math/clc_lgamma.h
+++ b/libclc/clc/include/clc/math/clc_lgamma.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LGAMMA_H__
diff --git a/libclc/clc/include/clc/math/clc_lgamma_r.h
b/libclc/clc/include/clc/math/clc_lgamma_r.h
index 5db55a13b4d82..262e62372227a 100644
--- a/libclc/clc/include/clc/math/clc_lgamma_r.h
+++ b/libclc/clc/include/clc/math/clc_lgamma_r.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LGAMMA_R_H__
diff --git a/libclc/clc/include/clc/math/clc_log.h
b/libclc/clc/include/clc/math/clc_log.h
index 64cbf641d48c9..8b0e44b425a89 100644
--- a/libclc/clc/include/clc/math/clc_log.h
+++ b/libclc/clc/include/clc/math/clc_log.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LOG_H__
diff --git a/libclc/clc/include/clc/math/clc_log10.h
b/libclc/clc/include/clc/math/clc_log10.h
index 03c598037dbca..6e086690c6ada 100644
--- a/libclc/clc/include/clc/math/clc_log10.h
+++ b/libclc/clc/include/clc/math/clc_log10.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LOG10_H__
diff --git a/libclc/clc/include/clc/math/clc_log1p.h
b/libclc/clc/include/clc/math/clc_log1p.h
index f08b44b69cb6f..1be8c8548d488 100644
--- a/libclc/clc/include/clc/math/clc_log1p.h
+++ b/libclc/clc/include/clc/math/clc_log1p.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LOG1P_H__
diff --git a/libclc/clc/include/clc/math/clc_log2.h
b/libclc/clc/include/clc/math/clc_log2.h
index 278ad794ac007..c5f9e37f39845 100644
--- a/libclc/clc/include/clc/math/clc_log2.h
+++ b/libclc/clc/include/clc/math/clc_log2.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_LOG2_H__
diff --git a/libclc/clc/include/clc/math/clc_mad.h
b/libclc/clc/include/clc/math/clc_mad.h
index 45eaa86a4a02e..117e361380eda 100644
--- a/libclc/clc/include/clc/math/clc_mad.h
+++ b/libclc/clc/include/clc/math/clc_mad.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_MAD_H__
diff --git a/libclc/clc/include/clc/math/clc_modf.h
b/libclc/clc/include/clc/math/clc_modf.h
index f8d6a89212278..aa8f9e20892ab 100644
--- a/libclc/clc/include/clc/math/clc_modf.h
+++ b/libclc/clc/include/clc/math/clc_modf.h
@@ -13,7 +13,6 @@
#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_MODF_H__
diff --git a/libclc/clc/include/clc/math/clc_nan.h
b/libclc/clc/include/clc/math/clc_nan.h
index 5969d59814f49..91901fd9369f2 100644
--- a/libclc/clc/include/clc/math/clc_nan.h
+++ b/libclc/clc/include/clc/math/clc_nan.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_NAN_H__
diff --git a/libclc/clc/include/clc/math/clc_native_cos.h
b/libclc/clc/include/clc/math/clc_native_cos.h
index 8a580f13ad2aa..f5837d5479133 100644
--- a/libclc/clc/include/clc/math/clc_native_cos.h
+++ b/libclc/clc/include/clc/math/clc_native_cos.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_divide.h
b/libclc/clc/include/clc/math/clc_native_divide.h
index b48c3e5d03b36..ed8118775e98b 100644
--- a/libclc/clc/include/clc/math/clc_native_divide.h
+++ b/libclc/clc/include/clc/math/clc_native_divide.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_exp.h
b/libclc/clc/include/clc/math/clc_native_exp.h
index 48a1be616ea3e..b9c4005585daa 100644
--- a/libclc/clc/include/clc/math/clc_native_exp.h
+++ b/libclc/clc/include/clc/math/clc_native_exp.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_exp10.h
b/libclc/clc/include/clc/math/clc_native_exp10.h
index 302482d670cc1..5c49e46330d60 100644
--- a/libclc/clc/include/clc/math/clc_native_exp10.h
+++ b/libclc/clc/include/clc/math/clc_native_exp10.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_exp2.h
b/libclc/clc/include/clc/math/clc_native_exp2.h
index bc0b32d6212b5..2fa368f69fef4 100644
--- a/libclc/clc/include/clc/math/clc_native_exp2.h
+++ b/libclc/clc/include/clc/math/clc_native_exp2.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_log.h
b/libclc/clc/include/clc/math/clc_native_log.h
index ea0362503f670..61fe0c0902d85 100644
--- a/libclc/clc/include/clc/math/clc_native_log.h
+++ b/libclc/clc/include/clc/math/clc_native_log.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_log10.h
b/libclc/clc/include/clc/math/clc_native_log10.h
index c5cceeeba2952..f9fca1d94aedb 100644
--- a/libclc/clc/include/clc/math/clc_native_log10.h
+++ b/libclc/clc/include/clc/math/clc_native_log10.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_log2.h
b/libclc/clc/include/clc/math/clc_native_log2.h
index 25375970cedc0..69aec752b832b 100644
--- a/libclc/clc/include/clc/math/clc_native_log2.h
+++ b/libclc/clc/include/clc/math/clc_native_log2.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_powr.h
b/libclc/clc/include/clc/math/clc_native_powr.h
index 55d409fffaab3..8d50f21a3124d 100644
--- a/libclc/clc/include/clc/math/clc_native_powr.h
+++ b/libclc/clc/include/clc/math/clc_native_powr.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_recip.h
b/libclc/clc/include/clc/math/clc_native_recip.h
index 9af36b0c7ce85..94d494ad07a17 100644
--- a/libclc/clc/include/clc/math/clc_native_recip.h
+++ b/libclc/clc/include/clc/math/clc_native_recip.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_rsqrt.h
b/libclc/clc/include/clc/math/clc_native_rsqrt.h
index 59fd2134107db..5b58d6efd7584 100644
--- a/libclc/clc/include/clc/math/clc_native_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_rsqrt.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_sin.h
b/libclc/clc/include/clc/math/clc_native_sin.h
index 878e19882ae6b..27f5ecbf40e72 100644
--- a/libclc/clc/include/clc/math/clc_native_sin.h
+++ b/libclc/clc/include/clc/math/clc_native_sin.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_sqrt.h
b/libclc/clc/include/clc/math/clc_native_sqrt.h
index afff77c89b22f..a45f8b7f21a21 100644
--- a/libclc/clc/include/clc/math/clc_native_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_sqrt.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_native_tan.h
b/libclc/clc/include/clc/math/clc_native_tan.h
index 5fc96f8d1797a..362088a5d58f3 100644
--- a/libclc/clc/include/clc/math/clc_native_tan.h
+++ b/libclc/clc/include/clc/math/clc_native_tan.h
@@ -15,7 +15,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#undef __FLOAT_ONLY
diff --git a/libclc/clc/include/clc/math/clc_nextafter.h
b/libclc/clc/include/clc/math/clc_nextafter.h
index e1a147b84bccb..f24742b9e9c37 100644
--- a/libclc/clc/include/clc/math/clc_nextafter.h
+++ b/libclc/clc/include/clc/math/clc_nextafter.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_NEXTAFTER_H__
diff --git a/libclc/clc/include/clc/math/clc_pow.h
b/libclc/clc/include/clc/math/clc_pow.h
index 3a1990d5ce091..5e37e5bf6da65 100644
--- a/libclc/clc/include/clc/math/clc_pow.h
+++ b/libclc/clc/include/clc/math/clc_pow.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_POW_H__
diff --git a/libclc/clc/include/clc/math/clc_pown.h
b/libclc/clc/include/clc/math/clc_pown.h
index 2b6d3220e7e58..67475503f92b7 100644
--- a/libclc/clc/include/clc/math/clc_pown.h
+++ b/libclc/clc/include/clc/math/clc_pown.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_POWN_H__
diff --git a/libclc/clc/include/clc/math/clc_powr.h
b/libclc/clc/include/clc/math/clc_powr.h
index 61ede783fe672..baa494cce6989 100644
--- a/libclc/clc/include/clc/math/clc_powr.h
+++ b/libclc/clc/include/clc/math/clc_powr.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_POWR_H__
diff --git a/libclc/clc/include/clc/math/clc_remainder.h
b/libclc/clc/include/clc/math/clc_remainder.h
index 2a1c88297d260..a7700c95103b4 100644
--- a/libclc/clc/include/clc/math/clc_remainder.h
+++ b/libclc/clc/include/clc/math/clc_remainder.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_REMAINDER_H__
diff --git a/libclc/clc/include/clc/math/clc_remquo.h
b/libclc/clc/include/clc/math/clc_remquo.h
index 6588342cf81b3..5dea818013c68 100644
--- a/libclc/clc/include/clc/math/clc_remquo.h
+++ b/libclc/clc/include/clc/math/clc_remquo.h
@@ -16,7 +16,6 @@
#include <clc/math/gentype.inc>
#undef __CLC_ADDRESS_SPACE
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_REMQUO_H__
diff --git a/libclc/clc/include/clc/math/clc_rint.h
b/libclc/clc/include/clc/math/clc_rint.h
index c26d735f6cc4c..17b1549f439b8 100644
--- a/libclc/clc/include/clc/math/clc_rint.h
+++ b/libclc/clc/include/clc/math/clc_rint.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_RINT_H__
diff --git a/libclc/clc/include/clc/math/clc_rootn.h
b/libclc/clc/include/clc/math/clc_rootn.h
index b1e69025d97a2..bf9dd5413c3de 100644
--- a/libclc/clc/include/clc/math/clc_rootn.h
+++ b/libclc/clc/include/clc/math/clc_rootn.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ROOTN_H__
diff --git a/libclc/clc/include/clc/math/clc_round.h
b/libclc/clc/include/clc/math/clc_round.h
index eeeea1760a9f0..78ebf4db99e9f 100644
--- a/libclc/clc/include/clc/math/clc_round.h
+++ b/libclc/clc/include/clc/math/clc_round.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_ROUND_H__
diff --git a/libclc/clc/include/clc/math/clc_rsqrt.h
b/libclc/clc/include/clc/math/clc_rsqrt.h
index e63b3e678f956..59402fbead2b2 100644
--- a/libclc/clc/include/clc/math/clc_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_rsqrt.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_RSQRT_H__
diff --git a/libclc/clc/include/clc/math/clc_sincos_helpers.h
b/libclc/clc/include/clc/math/clc_sincos_helpers.h
index 25ed60b3520e0..8029d439f4c62 100644
--- a/libclc/clc/include/clc/math/clc_sincos_helpers.h
+++ b/libclc/clc/include/clc/math/clc_sincos_helpers.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __FLOAT_ONLY
#endif // __CLC_MATH_CLC_SINCOS_HELPERS_H__
diff --git a/libclc/clc/include/clc/math/clc_sinh.h
b/libclc/clc/include/clc/math/clc_sinh.h
index da525b5cd0fe7..fa9cabe79cb0e 100644
--- a/libclc/clc/include/clc/math/clc_sinh.h
+++ b/libclc/clc/include/clc/math/clc_sinh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_SINH_H__
diff --git a/libclc/clc/include/clc/math/clc_sinpi.h
b/libclc/clc/include/clc/math/clc_sinpi.h
index 46fec465ceb03..db563c2e7e14a 100644
--- a/libclc/clc/include/clc/math/clc_sinpi.h
+++ b/libclc/clc/include/clc/math/clc_sinpi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_SINPI_H__
diff --git a/libclc/clc/include/clc/math/clc_sqrt.h
b/libclc/clc/include/clc/math/clc_sqrt.h
index 2018eaabab7a0..7084515533291 100644
--- a/libclc/clc/include/clc/math/clc_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_sqrt.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_SQRT_H__
diff --git a/libclc/clc/include/clc/math/clc_tanh.h
b/libclc/clc/include/clc/math/clc_tanh.h
index 972a31e248c67..88fce2340d99b 100644
--- a/libclc/clc/include/clc/math/clc_tanh.h
+++ b/libclc/clc/include/clc/math/clc_tanh.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_TANH_H__
diff --git a/libclc/clc/include/clc/math/clc_tanpi.h
b/libclc/clc/include/clc/math/clc_tanpi.h
index 0b8efce27dee8..596bb72b4b8de 100644
--- a/libclc/clc/include/clc/math/clc_tanpi.h
+++ b/libclc/clc/include/clc/math/clc_tanpi.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_TANPI_H__
diff --git a/libclc/clc/include/clc/math/clc_tgamma.h
b/libclc/clc/include/clc/math/clc_tgamma.h
index c4e5714616fae..dd76e041875d5 100644
--- a/libclc/clc/include/clc/math/clc_tgamma.h
+++ b/libclc/clc/include/clc/math/clc_tgamma.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_TGAMMA_H__
diff --git a/libclc/clc/include/clc/math/clc_trunc.h
b/libclc/clc/include/clc/math/clc_trunc.h
index d451e7dd4cbe1..33445f9fe15d6 100644
--- a/libclc/clc/include/clc/math/clc_trunc.h
+++ b/libclc/clc/include/clc/math/clc_trunc.h
@@ -14,7 +14,6 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_MATH_CLC_TRUNC_H__
diff --git a/libclc/clc/include/clc/relational/clc_bitselect.h
b/libclc/clc/include/clc/relational/clc_bitselect.h
index 38f9d86e579ec..cde5bd6d65740 100644
--- a/libclc/clc/include/clc/relational/clc_bitselect.h
+++ b/libclc/clc/include/clc/relational/clc_bitselect.h
@@ -14,6 +14,5 @@
#define __CLC_BODY <clc/relational/clc_bitselect.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#endif // __CLC_RELATIONAL_CLC_BITSELECT_H__
diff --git a/libclc/clc/include/clc/relational/clc_isfinite.h
b/libclc/clc/include/clc/relational/clc_isfinite.h
index 2534ec01ad55c..37483edd37613 100644
--- a/libclc/clc/include/clc/relational/clc_isfinite.h
+++ b/libclc/clc/include/clc/relational/clc_isfinite.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISFINITE_H__
diff --git a/libclc/clc/include/clc/relational/clc_isgreater.h
b/libclc/clc/include/clc/relational/clc_isgreater.h
index 8db7bbabb55da..4ce18ee631712 100644
--- a/libclc/clc/include/clc/relational/clc_isgreater.h
+++ b/libclc/clc/include/clc/relational/clc_isgreater.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISGREATER_H__
diff --git a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
index 0d310bb507fdf..c0a430cc61e97 100644
--- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
+++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isless.h
b/libclc/clc/include/clc/relational/clc_isless.h
index 50f3efeff8415..e680793970620 100644
--- a/libclc/clc/include/clc/relational/clc_isless.h
+++ b/libclc/clc/include/clc/relational/clc_isless.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISLESS_H__
diff --git a/libclc/clc/include/clc/relational/clc_islessequal.h
b/libclc/clc/include/clc/relational/clc_islessequal.h
index 35d144b85c713..8e95d04bf4752 100644
--- a/libclc/clc/include/clc/relational/clc_islessequal.h
+++ b/libclc/clc/include/clc/relational/clc_islessequal.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_islessgreater.h
b/libclc/clc/include/clc/relational/clc_islessgreater.h
index bd1d813e771d3..69c43e40b463e 100644
--- a/libclc/clc/include/clc/relational/clc_islessgreater.h
+++ b/libclc/clc/include/clc/relational/clc_islessgreater.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
diff --git a/libclc/clc/include/clc/relational/clc_isnormal.h
b/libclc/clc/include/clc/relational/clc_isnormal.h
index 5034d3c901d7a..4fee10a022444 100644
--- a/libclc/clc/include/clc/relational/clc_isnormal.h
+++ b/libclc/clc/include/clc/relational/clc_isnormal.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISNORMAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isnotequal.h
b/libclc/clc/include/clc/relational/clc_isnotequal.h
index ca2dfd03f4853..3aac82cfb9387 100644
--- a/libclc/clc/include/clc/relational/clc_isnotequal.h
+++ b/libclc/clc/include/clc/relational/clc_isnotequal.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isordered.h
b/libclc/clc/include/clc/relational/clc_isordered.h
index e70515088448c..20b5adb0cce72 100644
--- a/libclc/clc/include/clc/relational/clc_isordered.h
+++ b/libclc/clc/include/clc/relational/clc_isordered.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISORDERED_H__
diff --git a/libclc/clc/include/clc/relational/clc_isunordered.h
b/libclc/clc/include/clc/relational/clc_isunordered.h
index a0df44be631ce..7e693233ba344 100644
--- a/libclc/clc/include/clc/relational/clc_isunordered.h
+++ b/libclc/clc/include/clc/relational/clc_isunordered.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_ISUNORDERED_H__
diff --git a/libclc/clc/include/clc/relational/clc_signbit.h
b/libclc/clc/include/clc/relational/clc_signbit.h
index 183a2d6ae08ca..55159c9cc56d1 100644
--- a/libclc/clc/include/clc/relational/clc_signbit.h
+++ b/libclc/clc/include/clc/relational/clc_signbit.h
@@ -14,7 +14,6 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __CLC_RELATIONAL_CLC_SIGNBIT_H__
diff --git a/libclc/clc/lib/generic/math/clc_hypot.cl
b/libclc/clc/lib/generic/math/clc_hypot.cl
index 3ec8dcc1457d1..6990be3083eb6 100644
--- a/libclc/clc/lib/generic/math/clc_hypot.cl
+++ b/libclc/clc/lib/generic/math/clc_hypot.cl
@@ -20,4 +20,3 @@
#define __CLC_BODY <clc_hypot.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/clc/lib/generic/relational/clc_bitselect.cl
b/libclc/clc/lib/generic/relational/clc_bitselect.cl
index b4ed6f1ee91a1..2976b8947e544 100644
--- a/libclc/clc/lib/generic/relational/clc_bitselect.cl
+++ b/libclc/clc/lib/generic/relational/clc_bitselect.cl
@@ -11,7 +11,6 @@
#define __CLC_BODY <clc_bitselect.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define FLOAT_BITSELECT(f_type, i_type, width)
\
_CLC_OVERLOAD _CLC_DEF f_type##width __clc_bitselect(
\
diff --git a/libclc/clspv/lib/shared/vstore_half.cl
b/libclc/clspv/lib/shared/vstore_half.cl
index e705793f9dc30..ee74e5d028fa1 100644
--- a/libclc/clspv/lib/shared/vstore_half.cl
+++ b/libclc/clspv/lib/shared/vstore_half.cl
@@ -137,7 +137,6 @@ _CLC_DEF _CLC_OVERLOAD float __clc_rte(float x) {
#define __CLC_BODY "vstore_half.inc"
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef FUNC
#undef __XFUNC
#undef __FUNC
diff --git a/libclc/generic/include/clc/async/async_work_group_copy.h
b/libclc/generic/include/clc/async/async_work_group_copy.h
index e0d63e2ce34c6..81da21cd94d54 100644
--- a/libclc/generic/include/clc/async/async_work_group_copy.h
+++ b/libclc/generic/include/clc/async/async_work_group_copy.h
@@ -10,10 +10,8 @@
#define __CLC_SRC_ADDR_SPACE global
#define __CLC_BODY <clc/async/async_work_group_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <clc/async/async_work_group_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_DST_ADDR_SPACE
#undef __CLC_SRC_ADDR_SPACE
@@ -21,9 +19,7 @@
#define __CLC_SRC_ADDR_SPACE local
#define __CLC_BODY <clc/async/async_work_group_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <clc/async/async_work_group_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_DST_ADDR_SPACE
#undef __CLC_SRC_ADDR_SPACE
diff --git a/libclc/generic/include/clc/async/async_work_group_strided_copy.h
b/libclc/generic/include/clc/async/async_work_group_strided_copy.h
index a0a0c7bb425a2..a32e958f81ced 100644
--- a/libclc/generic/include/clc/async/async_work_group_strided_copy.h
+++ b/libclc/generic/include/clc/async/async_work_group_strided_copy.h
@@ -10,10 +10,8 @@
#define __CLC_SRC_ADDR_SPACE global
#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_DST_ADDR_SPACE
#undef __CLC_SRC_ADDR_SPACE
@@ -21,9 +19,7 @@
#define __CLC_SRC_ADDR_SPACE local
#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_DST_ADDR_SPACE
#undef __CLC_SRC_ADDR_SPACE
diff --git a/libclc/generic/include/clc/async/prefetch.h
b/libclc/generic/include/clc/async/prefetch.h
index 9cc32b267111b..01fc9215fa5e6 100644
--- a/libclc/generic/include/clc/async/prefetch.h
+++ b/libclc/generic/include/clc/async/prefetch.h
@@ -8,8 +8,6 @@
#define __CLC_BODY <clc/async/prefetch.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <clc/async/prefetch.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/common/degrees.h
b/libclc/generic/include/clc/common/degrees.h
index 0c7fe028a9417..b895a4cbeeeb7 100644
--- a/libclc/generic/include/clc/common/degrees.h
+++ b/libclc/generic/include/clc/common/degrees.h
@@ -8,4 +8,3 @@
#define __CLC_BODY <clc/common/degrees.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/common/radians.h
b/libclc/generic/include/clc/common/radians.h
index 2ad872b5d4784..f683e97778f28 100644
--- a/libclc/generic/include/clc/common/radians.h
+++ b/libclc/generic/include/clc/common/radians.h
@@ -8,4 +8,3 @@
#define __CLC_BODY <clc/common/radians.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/common/sign.h
b/libclc/generic/include/clc/common/sign.h
index daebbaf310a1e..2bb95716358fd 100644
--- a/libclc/generic/include/clc/common/sign.h
+++ b/libclc/generic/include/clc/common/sign.h
@@ -10,4 +10,3 @@
#define __CLC_BODY <clc/math/unary_decl.inc>
#include <clc/math/gentype.inc>
#undef __CLC_FUNCTION
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/common/smoothstep.h
b/libclc/generic/include/clc/common/smoothstep.h
index cff5bb7847d75..05c3a51ccddb1 100644
--- a/libclc/generic/include/clc/common/smoothstep.h
+++ b/libclc/generic/include/clc/common/smoothstep.h
@@ -8,4 +8,3 @@
#define __CLC_BODY <clc/common/smoothstep.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/common/step.h
b/libclc/generic/include/clc/common/step.h
index c3fb3465bb4e9..8c663c981975d 100644
--- a/libclc/generic/include/clc/common/step.h
+++ b/libclc/generic/include/clc/common/step.h
@@ -8,4 +8,3 @@
#define __CLC_BODY <clc/common/step.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/integer/clz.h
b/libclc/generic/include/clc/integer/clz.h
index f212efbe8b1a3..b215fc1d0bc94 100644
--- a/libclc/generic/include/clc/integer/clz.h
+++ b/libclc/generic/include/clc/integer/clz.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/ctz.h
b/libclc/generic/include/clc/integer/ctz.h
index 7c6da17a39d56..2ab6436440853 100644
--- a/libclc/generic/include/clc/integer/ctz.h
+++ b/libclc/generic/include/clc/integer/ctz.h
@@ -13,7 +13,6 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
#endif // __OPENCL_C_VERSION__ >= CL_VERSION_2_0
diff --git a/libclc/generic/include/clc/integer/hadd.h
b/libclc/generic/include/clc/integer/hadd.h
index e98f262ad3277..c05c9d50e67d3 100644
--- a/libclc/generic/include/clc/integer/hadd.h
+++ b/libclc/generic/include/clc/integer/hadd.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/mad_hi.h
b/libclc/generic/include/clc/integer/mad_hi.h
index 2a237794a0abc..e06ab8f3c11f1 100644
--- a/libclc/generic/include/clc/integer/mad_hi.h
+++ b/libclc/generic/include/clc/integer/mad_hi.h
@@ -12,4 +12,3 @@
#include <clc/integer/gentype.inc>
#undef __CLC_FUNCTION
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/integer/mad_sat.h
b/libclc/generic/include/clc/integer/mad_sat.h
index e0e9f97299e4d..e404b6438dfbc 100644
--- a/libclc/generic/include/clc/integer/mad_sat.h
+++ b/libclc/generic/include/clc/integer/mad_sat.h
@@ -8,4 +8,3 @@
#define __CLC_BODY <clc/integer/mad_sat.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/integer/mul24.h
b/libclc/generic/include/clc/integer/mul24.h
index 062b7462ea2e9..d2aca25fc3140 100644
--- a/libclc/generic/include/clc/integer/mul24.h
+++ b/libclc/generic/include/clc/integer/mul24.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype24.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/mul_hi.h
b/libclc/generic/include/clc/integer/mul_hi.h
index 3aa595746c0b3..4374ec73be32a 100644
--- a/libclc/generic/include/clc/integer/mul_hi.h
+++ b/libclc/generic/include/clc/integer/mul_hi.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/popcount.h
b/libclc/generic/include/clc/integer/popcount.h
index 868aded1dfd2e..4d43f26f489e6 100644
--- a/libclc/generic/include/clc/integer/popcount.h
+++ b/libclc/generic/include/clc/integer/popcount.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/integer/rhadd.h
b/libclc/generic/include/clc/integer/rhadd.h
index 22932e79ca2ac..3da5524df206c 100644
--- a/libclc/generic/include/clc/integer/rhadd.h
+++ b/libclc/generic/include/clc/integer/rhadd.h
@@ -11,5 +11,4 @@
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/acos.h
b/libclc/generic/include/clc/math/acos.h
index c6daafcd9d200..695e6560478c8 100644
--- a/libclc/generic/include/clc/math/acos.h
+++ b/libclc/generic/include/clc/math/acos.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/acosh.h
b/libclc/generic/include/clc/math/acosh.h
index a422604fff1d4..52197d448d6be 100644
--- a/libclc/generic/include/clc/math/acosh.h
+++ b/libclc/generic/include/clc/math/acosh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/acospi.h
b/libclc/generic/include/clc/math/acospi.h
index 8a17d0f58cc48..47e4e5f3e7f15 100644
--- a/libclc/generic/include/clc/math/acospi.h
+++ b/libclc/generic/include/clc/math/acospi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/asin.h
b/libclc/generic/include/clc/math/asin.h
index 81aecacc23272..eb83d2d2743f3 100644
--- a/libclc/generic/include/clc/math/asin.h
+++ b/libclc/generic/include/clc/math/asin.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/asinh.h
b/libclc/generic/include/clc/math/asinh.h
index 75f3b85c30150..74ce5ba6731c6 100644
--- a/libclc/generic/include/clc/math/asinh.h
+++ b/libclc/generic/include/clc/math/asinh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/asinpi.h
b/libclc/generic/include/clc/math/asinpi.h
index bb95f86e318b3..a7bd6469c93a9 100644
--- a/libclc/generic/include/clc/math/asinpi.h
+++ b/libclc/generic/include/clc/math/asinpi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/atan.h
b/libclc/generic/include/clc/math/atan.h
index 7d50d22751929..4c83c2d4c819b 100644
--- a/libclc/generic/include/clc/math/atan.h
+++ b/libclc/generic/include/clc/math/atan.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/atan2.h
b/libclc/generic/include/clc/math/atan2.h
index 0302621b970a9..5872e41218dc4 100644
--- a/libclc/generic/include/clc/math/atan2.h
+++ b/libclc/generic/include/clc/math/atan2.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/atan2pi.h
b/libclc/generic/include/clc/math/atan2pi.h
index abe7552e6531b..b68cf492e2925 100644
--- a/libclc/generic/include/clc/math/atan2pi.h
+++ b/libclc/generic/include/clc/math/atan2pi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/atanh.h
b/libclc/generic/include/clc/math/atanh.h
index 7046606d531e0..6ea99c2dedc40 100644
--- a/libclc/generic/include/clc/math/atanh.h
+++ b/libclc/generic/include/clc/math/atanh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/atanpi.h
b/libclc/generic/include/clc/math/atanpi.h
index e0cfa3fcd41c1..5c7d0a9130fd0 100644
--- a/libclc/generic/include/clc/math/atanpi.h
+++ b/libclc/generic/include/clc/math/atanpi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/cbrt.h
b/libclc/generic/include/clc/math/cbrt.h
index 4d87128509fde..f0599e0805ab7 100644
--- a/libclc/generic/include/clc/math/cbrt.h
+++ b/libclc/generic/include/clc/math/cbrt.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/ceil.h
b/libclc/generic/include/clc/math/ceil.h
index d07e7f040b71b..82e5dc4eec000 100644
--- a/libclc/generic/include/clc/math/ceil.h
+++ b/libclc/generic/include/clc/math/ceil.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/copysign.h
b/libclc/generic/include/clc/math/copysign.h
index d2d2955eeea9c..3956dcd2fc19c 100644
--- a/libclc/generic/include/clc/math/copysign.h
+++ b/libclc/generic/include/clc/math/copysign.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/cos.h
b/libclc/generic/include/clc/math/cos.h
index 32071ed85b99c..073282a3e0c1e 100644
--- a/libclc/generic/include/clc/math/cos.h
+++ b/libclc/generic/include/clc/math/cos.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/cosh.h
b/libclc/generic/include/clc/math/cosh.h
index 562f405d398f6..f156194cd9b14 100644
--- a/libclc/generic/include/clc/math/cosh.h
+++ b/libclc/generic/include/clc/math/cosh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/cospi.h
b/libclc/generic/include/clc/math/cospi.h
index 01ecf6607c04b..2e9ae1b2ed376 100644
--- a/libclc/generic/include/clc/math/cospi.h
+++ b/libclc/generic/include/clc/math/cospi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/erf.h
b/libclc/generic/include/clc/math/erf.h
index b3e578ad74305..cbbb58b6c35a7 100644
--- a/libclc/generic/include/clc/math/erf.h
+++ b/libclc/generic/include/clc/math/erf.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/erfc.h
b/libclc/generic/include/clc/math/erfc.h
index 5d3f32a8fb858..74cef50ecc7c8 100644
--- a/libclc/generic/include/clc/math/erfc.h
+++ b/libclc/generic/include/clc/math/erfc.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/exp.h
b/libclc/generic/include/clc/math/exp.h
index bc1207ff758e0..a6193a9eac844 100644
--- a/libclc/generic/include/clc/math/exp.h
+++ b/libclc/generic/include/clc/math/exp.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/exp10.h
b/libclc/generic/include/clc/math/exp10.h
index cd9806990774e..7b48c1ce0348f 100644
--- a/libclc/generic/include/clc/math/exp10.h
+++ b/libclc/generic/include/clc/math/exp10.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/exp2.h
b/libclc/generic/include/clc/math/exp2.h
index d3616afd3c7c6..7081050769e9a 100644
--- a/libclc/generic/include/clc/math/exp2.h
+++ b/libclc/generic/include/clc/math/exp2.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/expm1.h
b/libclc/generic/include/clc/math/expm1.h
index 21312bb6602c6..9f6a512df38e6 100644
--- a/libclc/generic/include/clc/math/expm1.h
+++ b/libclc/generic/include/clc/math/expm1.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/fabs.h
b/libclc/generic/include/clc/math/fabs.h
index afdabb296446f..41212d6f597c8 100644
--- a/libclc/generic/include/clc/math/fabs.h
+++ b/libclc/generic/include/clc/math/fabs.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/fdim.h
b/libclc/generic/include/clc/math/fdim.h
index 6fa83d8826bc3..fdc261072c164 100644
--- a/libclc/generic/include/clc/math/fdim.h
+++ b/libclc/generic/include/clc/math/fdim.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/floor.h
b/libclc/generic/include/clc/math/floor.h
index f9ae624da9e2e..80f8fcc5ac95d 100644
--- a/libclc/generic/include/clc/math/floor.h
+++ b/libclc/generic/include/clc/math/floor.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/fma.h
b/libclc/generic/include/clc/math/fma.h
index 8d30af5a25939..9a201bb98400f 100644
--- a/libclc/generic/include/clc/math/fma.h
+++ b/libclc/generic/include/clc/math/fma.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/fmax.h
b/libclc/generic/include/clc/math/fmax.h
index acfe362a87c04..6c943370e28da 100644
--- a/libclc/generic/include/clc/math/fmax.h
+++ b/libclc/generic/include/clc/math/fmax.h
@@ -11,6 +11,5 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/fmin.h
b/libclc/generic/include/clc/math/fmin.h
index cfb47eb5312b7..45d83909cef5c 100644
--- a/libclc/generic/include/clc/math/fmin.h
+++ b/libclc/generic/include/clc/math/fmin.h
@@ -11,6 +11,5 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_cos.h
b/libclc/generic/include/clc/math/half_cos.h
index 1aab4bd190996..c9a5a88f80910 100644
--- a/libclc/generic/include/clc/math/half_cos.h
+++ b/libclc/generic/include/clc/math/half_cos.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_divide.h
b/libclc/generic/include/clc/math/half_divide.h
index 914419551f432..a05eab5b1c78e 100644
--- a/libclc/generic/include/clc/math/half_divide.h
+++ b/libclc/generic/include/clc/math/half_divide.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_exp.h
b/libclc/generic/include/clc/math/half_exp.h
index 50d7b9ee8f7d0..65734878eb4e6 100644
--- a/libclc/generic/include/clc/math/half_exp.h
+++ b/libclc/generic/include/clc/math/half_exp.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_exp10.h
b/libclc/generic/include/clc/math/half_exp10.h
index c76c29a294b9c..4df20a7aa6222 100644
--- a/libclc/generic/include/clc/math/half_exp10.h
+++ b/libclc/generic/include/clc/math/half_exp10.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_exp2.h
b/libclc/generic/include/clc/math/half_exp2.h
index 9f57daeae2dfb..2eed851fa698f 100644
--- a/libclc/generic/include/clc/math/half_exp2.h
+++ b/libclc/generic/include/clc/math/half_exp2.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_log.h
b/libclc/generic/include/clc/math/half_log.h
index 052f399d59b09..3d44680570098 100644
--- a/libclc/generic/include/clc/math/half_log.h
+++ b/libclc/generic/include/clc/math/half_log.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_log10.h
b/libclc/generic/include/clc/math/half_log10.h
index 00c0df75de1b7..1c468f3f33985 100644
--- a/libclc/generic/include/clc/math/half_log10.h
+++ b/libclc/generic/include/clc/math/half_log10.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_log2.h
b/libclc/generic/include/clc/math/half_log2.h
index 1d50523bd702e..0695e2542962f 100644
--- a/libclc/generic/include/clc/math/half_log2.h
+++ b/libclc/generic/include/clc/math/half_log2.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_powr.h
b/libclc/generic/include/clc/math/half_powr.h
index 383e0e2ed5a3e..27aa2b0fab666 100644
--- a/libclc/generic/include/clc/math/half_powr.h
+++ b/libclc/generic/include/clc/math/half_powr.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_recip.h
b/libclc/generic/include/clc/math/half_recip.h
index 242098f2ef55c..8e2d16099f9f7 100644
--- a/libclc/generic/include/clc/math/half_recip.h
+++ b/libclc/generic/include/clc/math/half_recip.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_rsqrt.h
b/libclc/generic/include/clc/math/half_rsqrt.h
index 5a9db064435e9..e93973bc64575 100644
--- a/libclc/generic/include/clc/math/half_rsqrt.h
+++ b/libclc/generic/include/clc/math/half_rsqrt.h
@@ -11,5 +11,4 @@
#define __FLOAT_ONLY
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_sin.h
b/libclc/generic/include/clc/math/half_sin.h
index 5cbd794e0fa8e..50626f9d96fe6 100644
--- a/libclc/generic/include/clc/math/half_sin.h
+++ b/libclc/generic/include/clc/math/half_sin.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_sqrt.h
b/libclc/generic/include/clc/math/half_sqrt.h
index 32efdd2259f66..7298570984baa 100644
--- a/libclc/generic/include/clc/math/half_sqrt.h
+++ b/libclc/generic/include/clc/math/half_sqrt.h
@@ -11,5 +11,4 @@
#define __FLOAT_ONLY
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/half_tan.h
b/libclc/generic/include/clc/math/half_tan.h
index adeafbd02cf8c..40ae6e6c9aba9 100644
--- a/libclc/generic/include/clc/math/half_tan.h
+++ b/libclc/generic/include/clc/math/half_tan.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/hypot.h
b/libclc/generic/include/clc/math/hypot.h
index 540fe16498d1f..a9d464af95c0a 100644
--- a/libclc/generic/include/clc/math/hypot.h
+++ b/libclc/generic/include/clc/math/hypot.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/ilogb.h
b/libclc/generic/include/clc/math/ilogb.h
index 0e7c1c3445fb9..30bd0cd58ff1c 100644
--- a/libclc/generic/include/clc/math/ilogb.h
+++ b/libclc/generic/include/clc/math/ilogb.h
@@ -10,4 +10,3 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/math/lgamma.h
b/libclc/generic/include/clc/math/lgamma.h
index e290b555ebb2a..9f0be722b5f63 100644
--- a/libclc/generic/include/clc/math/lgamma.h
+++ b/libclc/generic/include/clc/math/lgamma.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/lgamma_r.h
b/libclc/generic/include/clc/math/lgamma_r.h
index 296d15e807297..78438b1be5514 100644
--- a/libclc/generic/include/clc/math/lgamma_r.h
+++ b/libclc/generic/include/clc/math/lgamma_r.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/log.h
b/libclc/generic/include/clc/math/log.h
index cd61ba89690e0..8fec73d7fb69b 100644
--- a/libclc/generic/include/clc/math/log.h
+++ b/libclc/generic/include/clc/math/log.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/log10.h
b/libclc/generic/include/clc/math/log10.h
index 783793e55b9d7..21cf2a976942d 100644
--- a/libclc/generic/include/clc/math/log10.h
+++ b/libclc/generic/include/clc/math/log10.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/log1p.h
b/libclc/generic/include/clc/math/log1p.h
index ac19dfa17d6b1..643207ebb9474 100644
--- a/libclc/generic/include/clc/math/log1p.h
+++ b/libclc/generic/include/clc/math/log1p.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/log2.h
b/libclc/generic/include/clc/math/log2.h
index 2b5640e9dd69f..26b407f1019b1 100644
--- a/libclc/generic/include/clc/math/log2.h
+++ b/libclc/generic/include/clc/math/log2.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/logb.h
b/libclc/generic/include/clc/math/logb.h
index 2207293a69556..a0daa98063810 100644
--- a/libclc/generic/include/clc/math/logb.h
+++ b/libclc/generic/include/clc/math/logb.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/mad.h
b/libclc/generic/include/clc/math/mad.h
index 1b5d93ad3fe0b..3daf9b9f8a0e9 100644
--- a/libclc/generic/include/clc/math/mad.h
+++ b/libclc/generic/include/clc/math/mad.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/maxmag.h
b/libclc/generic/include/clc/math/maxmag.h
index 12ae41902f6e8..d4616e60dc378 100644
--- a/libclc/generic/include/clc/math/maxmag.h
+++ b/libclc/generic/include/clc/math/maxmag.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/minmag.h
b/libclc/generic/include/clc/math/minmag.h
index 8d82d13268145..92c0f23a22b72 100644
--- a/libclc/generic/include/clc/math/minmag.h
+++ b/libclc/generic/include/clc/math/minmag.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_cos.h
b/libclc/generic/include/clc/math/native_cos.h
index 8cf9bbc72e4fa..e301634322b69 100644
--- a/libclc/generic/include/clc/math/native_cos.h
+++ b/libclc/generic/include/clc/math/native_cos.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_divide.h
b/libclc/generic/include/clc/math/native_divide.h
index 3989a256cf949..5fe0c32f67d8e 100644
--- a/libclc/generic/include/clc/math/native_divide.h
+++ b/libclc/generic/include/clc/math/native_divide.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_exp.h
b/libclc/generic/include/clc/math/native_exp.h
index 8d204cf730424..bfe24aa12808a 100644
--- a/libclc/generic/include/clc/math/native_exp.h
+++ b/libclc/generic/include/clc/math/native_exp.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_exp10.h
b/libclc/generic/include/clc/math/native_exp10.h
index 3de6bd3c99373..f775478eef3a9 100644
--- a/libclc/generic/include/clc/math/native_exp10.h
+++ b/libclc/generic/include/clc/math/native_exp10.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_exp2.h
b/libclc/generic/include/clc/math/native_exp2.h
index b22a0b586c349..c00632c99387b 100644
--- a/libclc/generic/include/clc/math/native_exp2.h
+++ b/libclc/generic/include/clc/math/native_exp2.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_log.h
b/libclc/generic/include/clc/math/native_log.h
index 91ababfc737ee..854f420723742 100644
--- a/libclc/generic/include/clc/math/native_log.h
+++ b/libclc/generic/include/clc/math/native_log.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_log10.h
b/libclc/generic/include/clc/math/native_log10.h
index 637cc7a422aab..6862124b0f69a 100644
--- a/libclc/generic/include/clc/math/native_log10.h
+++ b/libclc/generic/include/clc/math/native_log10.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_log2.h
b/libclc/generic/include/clc/math/native_log2.h
index 6e2e37c077cb9..576f50079d269 100644
--- a/libclc/generic/include/clc/math/native_log2.h
+++ b/libclc/generic/include/clc/math/native_log2.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_powr.h
b/libclc/generic/include/clc/math/native_powr.h
index 19ae2d1ef9a02..a9210092ed38d 100644
--- a/libclc/generic/include/clc/math/native_powr.h
+++ b/libclc/generic/include/clc/math/native_powr.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_recip.h
b/libclc/generic/include/clc/math/native_recip.h
index 6d5756ca6c628..7bc99233fe008 100644
--- a/libclc/generic/include/clc/math/native_recip.h
+++ b/libclc/generic/include/clc/math/native_recip.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_rsqrt.h
b/libclc/generic/include/clc/math/native_rsqrt.h
index f599908a07a1d..40a1f02cba075 100644
--- a/libclc/generic/include/clc/math/native_rsqrt.h
+++ b/libclc/generic/include/clc/math/native_rsqrt.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_sin.h
b/libclc/generic/include/clc/math/native_sin.h
index 1b3e11159176c..798d5b325f6f1 100644
--- a/libclc/generic/include/clc/math/native_sin.h
+++ b/libclc/generic/include/clc/math/native_sin.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_sqrt.h
b/libclc/generic/include/clc/math/native_sqrt.h
index fa21560708a3f..a41a0c104cc84 100644
--- a/libclc/generic/include/clc/math/native_sqrt.h
+++ b/libclc/generic/include/clc/math/native_sqrt.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/native_tan.h
b/libclc/generic/include/clc/math/native_tan.h
index bbfed5ede575d..658bb8f932743 100644
--- a/libclc/generic/include/clc/math/native_tan.h
+++ b/libclc/generic/include/clc/math/native_tan.h
@@ -13,5 +13,4 @@
#include <clc/math/gentype.inc>
#undef __FLOAT_ONLY
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/nextafter.h
b/libclc/generic/include/clc/math/nextafter.h
index cc975a323c2c9..ce1d549c0659b 100644
--- a/libclc/generic/include/clc/math/nextafter.h
+++ b/libclc/generic/include/clc/math/nextafter.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/pow.h
b/libclc/generic/include/clc/math/pow.h
index a95e64ea009df..5f8479332830e 100644
--- a/libclc/generic/include/clc/math/pow.h
+++ b/libclc/generic/include/clc/math/pow.h
@@ -9,5 +9,4 @@
#define __CLC_FUNCTION pow
#define __CLC_BODY <clc/shared/binary_decl.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/pown.h
b/libclc/generic/include/clc/math/pown.h
index a448f693c9096..1d38c68947ba1 100644
--- a/libclc/generic/include/clc/math/pown.h
+++ b/libclc/generic/include/clc/math/pown.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/powr.h
b/libclc/generic/include/clc/math/powr.h
index fe0e921cb921c..d128d79edb39f 100644
--- a/libclc/generic/include/clc/math/powr.h
+++ b/libclc/generic/include/clc/math/powr.h
@@ -9,5 +9,4 @@
#define __CLC_FUNCTION powr
#define __CLC_BODY <clc/shared/binary_decl.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/rint.h
b/libclc/generic/include/clc/math/rint.h
index c5e32b0a4900c..aa31c177882ca 100644
--- a/libclc/generic/include/clc/math/rint.h
+++ b/libclc/generic/include/clc/math/rint.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/rootn.h
b/libclc/generic/include/clc/math/rootn.h
index 41df8cd9a8210..789f31596d1cd 100644
--- a/libclc/generic/include/clc/math/rootn.h
+++ b/libclc/generic/include/clc/math/rootn.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/round.h
b/libclc/generic/include/clc/math/round.h
index 78e98ba1898f4..f4209f631d6ce 100644
--- a/libclc/generic/include/clc/math/round.h
+++ b/libclc/generic/include/clc/math/round.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/rsqrt.h
b/libclc/generic/include/clc/math/rsqrt.h
index 649d9065c156a..5f674b299adbd 100644
--- a/libclc/generic/include/clc/math/rsqrt.h
+++ b/libclc/generic/include/clc/math/rsqrt.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/sin.h
b/libclc/generic/include/clc/math/sin.h
index f72c89b8aec1b..5ef699395689f 100644
--- a/libclc/generic/include/clc/math/sin.h
+++ b/libclc/generic/include/clc/math/sin.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/sinh.h
b/libclc/generic/include/clc/math/sinh.h
index 02bfa4f9ad6fd..c6d7d9a936e2f 100644
--- a/libclc/generic/include/clc/math/sinh.h
+++ b/libclc/generic/include/clc/math/sinh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/sinpi.h
b/libclc/generic/include/clc/math/sinpi.h
index 73bc47951bb7d..0d90dbf153511 100644
--- a/libclc/generic/include/clc/math/sinpi.h
+++ b/libclc/generic/include/clc/math/sinpi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/sqrt.h
b/libclc/generic/include/clc/math/sqrt.h
index a8b198b9d5cb0..03faa0513c06e 100644
--- a/libclc/generic/include/clc/math/sqrt.h
+++ b/libclc/generic/include/clc/math/sqrt.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/tan.h
b/libclc/generic/include/clc/math/tan.h
index 2249f02796c73..bbc0b79ba0bba 100644
--- a/libclc/generic/include/clc/math/tan.h
+++ b/libclc/generic/include/clc/math/tan.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/tanh.h
b/libclc/generic/include/clc/math/tanh.h
index 1ef3b65c6adba..9017078740a0b 100644
--- a/libclc/generic/include/clc/math/tanh.h
+++ b/libclc/generic/include/clc/math/tanh.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/tanpi.h
b/libclc/generic/include/clc/math/tanpi.h
index 677205bfce49f..f02b5a9be81ff 100644
--- a/libclc/generic/include/clc/math/tanpi.h
+++ b/libclc/generic/include/clc/math/tanpi.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/tgamma.h
b/libclc/generic/include/clc/math/tgamma.h
index 8e04e04b40eb8..c74d67a857c5d 100644
--- a/libclc/generic/include/clc/math/tgamma.h
+++ b/libclc/generic/include/clc/math/tgamma.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/math/trunc.h
b/libclc/generic/include/clc/math/trunc.h
index 4ece7ddf1798f..5832e9e93bd8f 100644
--- a/libclc/generic/include/clc/math/trunc.h
+++ b/libclc/generic/include/clc/math/trunc.h
@@ -11,5 +11,4 @@
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/bitselect.h
b/libclc/generic/include/clc/relational/bitselect.h
index 21d59c6d99362..993796c954343 100644
--- a/libclc/generic/include/clc/relational/bitselect.h
+++ b/libclc/generic/include/clc/relational/bitselect.h
@@ -11,4 +11,3 @@
#define __CLC_BODY <clc/relational/bitselect.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/relational/isfinite.h
b/libclc/generic/include/clc/relational/isfinite.h
index f0109e5614996..e92a4d40a8cbe 100644
--- a/libclc/generic/include/clc/relational/isfinite.h
+++ b/libclc/generic/include/clc/relational/isfinite.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isgreater.h
b/libclc/generic/include/clc/relational/isgreater.h
index e5da58ac3593b..bec1e81f48baa 100644
--- a/libclc/generic/include/clc/relational/isgreater.h
+++ b/libclc/generic/include/clc/relational/isgreater.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isgreaterequal.h
b/libclc/generic/include/clc/relational/isgreaterequal.h
index 5d83659444a3e..da02167fc010a 100644
--- a/libclc/generic/include/clc/relational/isgreaterequal.h
+++ b/libclc/generic/include/clc/relational/isgreaterequal.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isless.h
b/libclc/generic/include/clc/relational/isless.h
index 19bb41c9d52d0..c930b6df6d083 100644
--- a/libclc/generic/include/clc/relational/isless.h
+++ b/libclc/generic/include/clc/relational/isless.h
@@ -11,5 +11,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/islessequal.h
b/libclc/generic/include/clc/relational/islessequal.h
index 3712590666d9c..335c29612446e 100644
--- a/libclc/generic/include/clc/relational/islessequal.h
+++ b/libclc/generic/include/clc/relational/islessequal.h
@@ -11,5 +11,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/islessgreater.h
b/libclc/generic/include/clc/relational/islessgreater.h
index 42995dea90dbf..f9a5fa8b01221 100644
--- a/libclc/generic/include/clc/relational/islessgreater.h
+++ b/libclc/generic/include/clc/relational/islessgreater.h
@@ -11,5 +11,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isnormal.h
b/libclc/generic/include/clc/relational/isnormal.h
index 19ba56eeddb24..33b7a7e894511 100644
--- a/libclc/generic/include/clc/relational/isnormal.h
+++ b/libclc/generic/include/clc/relational/isnormal.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isnotequal.h
b/libclc/generic/include/clc/relational/isnotequal.h
index 3e7f8e5f041ab..dfb9de1da3a18 100644
--- a/libclc/generic/include/clc/relational/isnotequal.h
+++ b/libclc/generic/include/clc/relational/isnotequal.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isordered.h
b/libclc/generic/include/clc/relational/isordered.h
index 9ada2a6284785..bc6dbdeba92a0 100644
--- a/libclc/generic/include/clc/relational/isordered.h
+++ b/libclc/generic/include/clc/relational/isordered.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/isunordered.h
b/libclc/generic/include/clc/relational/isunordered.h
index 7d0c6ab276213..73f05ce9edea8 100644
--- a/libclc/generic/include/clc/relational/isunordered.h
+++ b/libclc/generic/include/clc/relational/isunordered.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/relational/signbit.h
b/libclc/generic/include/clc/relational/signbit.h
index a9588ea7c2942..89785f5fc1030 100644
--- a/libclc/generic/include/clc/relational/signbit.h
+++ b/libclc/generic/include/clc/relational/signbit.h
@@ -13,5 +13,4 @@
#include <clc/relational/floatn.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/math/clc_tan.h
b/libclc/generic/include/math/clc_tan.h
index 96bcea8f60faa..52c0a3440baca 100644
--- a/libclc/generic/include/math/clc_tan.h
+++ b/libclc/generic/include/math/clc_tan.h
@@ -9,5 +9,4 @@
#define __CLC_FUNCTION __clc_tan
#define __CLC_BODY <clc/math/unary_decl.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef __CLC_FUNCTION
diff --git a/libclc/generic/lib/async/async_work_group_copy.cl
b/libclc/generic/lib/async/async_work_group_copy.cl
index 94452ef51c892..3ade4e9db9585 100644
--- a/libclc/generic/lib/async/async_work_group_copy.cl
+++ b/libclc/generic/lib/async/async_work_group_copy.cl
@@ -10,8 +10,6 @@
#define __CLC_BODY <async_work_group_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <async_work_group_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/lib/async/async_work_group_strided_copy.cl
b/libclc/generic/lib/async/async_work_group_strided_copy.cl
index 79aaf1f1c1337..899ed0a4e3aa1 100644
--- a/libclc/generic/lib/async/async_work_group_strided_copy.cl
+++ b/libclc/generic/lib/async/async_work_group_strided_copy.cl
@@ -10,8 +10,6 @@
#define __CLC_BODY <async_work_group_strided_copy.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <async_work_group_strided_copy.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/lib/async/prefetch.cl
b/libclc/generic/lib/async/prefetch.cl
index 116cde0360879..8c819d8210d9a 100644
--- a/libclc/generic/lib/async/prefetch.cl
+++ b/libclc/generic/lib/async/prefetch.cl
@@ -10,8 +10,6 @@
#define __CLC_BODY <prefetch.inc>
#include <clc/integer/gentype.inc>
-#undef __CLC_BODY
#define __CLC_BODY <prefetch.inc>
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
diff --git a/libclc/generic/lib/shared/vload.cl
b/libclc/generic/lib/shared/vload.cl
index 05737aaa88b71..dd3a0ada456ee 100644
--- a/libclc/generic/lib/shared/vload.cl
+++ b/libclc/generic/lib/shared/vload.cl
@@ -118,7 +118,6 @@ VLOAD_ADDR_SPACES(half)
#define __CLC_BODY "vload_half.inc"
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef FUNC
#undef __FUNC
#undef VEC_LOAD16
diff --git a/libclc/generic/lib/shared/vstore.cl
b/libclc/generic/lib/shared/vstore.cl
index 0c0513f08a778..5d039d07f5e29 100644
--- a/libclc/generic/lib/shared/vstore.cl
+++ b/libclc/generic/lib/shared/vstore.cl
@@ -236,7 +236,6 @@ _CLC_DEF _CLC_OVERLOAD double __clc_rte(double x) {
#define __CLC_BODY "vstore_half.inc"
#include <clc/math/gentype.inc>
-#undef __CLC_BODY
#undef FUNC
#undef __XFUNC
#undef __FUNC
>From 74d78db302917084245599b19b3b01de640447b2 Mon Sep 17 00:00:00 2001
From: Fraser Cormack <fra...@codeplay.com>
Date: Wed, 30 Apr 2025 14:51:16 +0100
Subject: [PATCH 2/2] fix formatting
---
libclc/clc/include/clc/relational/clc_bitselect.h | 1 -
libclc/generic/include/clc/math/ilogb.h | 1 -
libclc/generic/include/clc/relational/bitselect.h | 1 -
3 files changed, 3 deletions(-)
diff --git a/libclc/clc/include/clc/relational/clc_bitselect.h
b/libclc/clc/include/clc/relational/clc_bitselect.h
index cde5bd6d65740..5490ea7374f8d 100644
--- a/libclc/clc/include/clc/relational/clc_bitselect.h
+++ b/libclc/clc/include/clc/relational/clc_bitselect.h
@@ -14,5 +14,4 @@
#define __CLC_BODY <clc/relational/clc_bitselect.inc>
#include <clc/integer/gentype.inc>
-
#endif // __CLC_RELATIONAL_CLC_BITSELECT_H__
diff --git a/libclc/generic/include/clc/math/ilogb.h
b/libclc/generic/include/clc/math/ilogb.h
index 30bd0cd58ff1c..dd38c9df36865 100644
--- a/libclc/generic/include/clc/math/ilogb.h
+++ b/libclc/generic/include/clc/math/ilogb.h
@@ -9,4 +9,3 @@
#define __CLC_BODY <clc/math/ilogb.inc>
#include <clc/math/gentype.inc>
-
diff --git a/libclc/generic/include/clc/relational/bitselect.h
b/libclc/generic/include/clc/relational/bitselect.h
index 993796c954343..25cb0c2fd9241 100644
--- a/libclc/generic/include/clc/relational/bitselect.h
+++ b/libclc/generic/include/clc/relational/bitselect.h
@@ -10,4 +10,3 @@
#include <clc/math/gentype.inc>
#define __CLC_BODY <clc/relational/bitselect.inc>
#include <clc/integer/gentype.inc>
-
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
