diff --git a/libclc/clc/lib/generic/math/clc_nan.inc b/libclc/clc/lib/generic/math/clc_nan.inc
index 46e828ba48c7e..47527088960da 100644
--- a/libclc/clc/lib/generic/math/clc_nan.inc
+++ b/libclc/clc/lib/generic/math/clc_nan.inc
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #if __CLC_FPSIZE == 64
-#define NAN_MASK 0x7ff0000000000000ul
+#define NAN_MASK 0x7ff8000000000000ul
 #elif __CLC_FPSIZE == 32
 #define NAN_MASK 0x7fc00000
 #elif __CLC_FPSIZE == 16
diff --git a/libclc/libspirv/lib/generic/math/nan.cl b/libclc/libspirv/lib/generic/math/nan.cl
index b264bd80cbcd3..f38d2d57ea987 100644
--- a/libclc/libspirv/lib/generic/math/nan.cl
+++ b/libclc/libspirv/lib/generic/math/nan.cl
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/clc_as_type.h>
-#include <clc/utils.h>
+#include <clc/math/clc_nan.h>
 #include <libspirv/spirv.h>
 
 #define __CLC_BODY <nan.inc>
diff --git a/libclc/libspirv/lib/generic/math/nan.inc b/libclc/libspirv/lib/generic/math/nan.inc
index db7f9e43ecb3e..24257e8076ac6 100644
--- a/libclc/libspirv/lib/generic/math/nan.inc
+++ b/libclc/libspirv/lib/generic/math/nan.inc
@@ -6,27 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if __CLC_FPSIZE == 64
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_ULONGN code) {
-  return __CLC_AS_GENTYPE(code | 0x7ff8000000000000ul);
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_U_GENTYPE code) {
+  return __clc_nan(code);
 }
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_LONGN code) {
-  return __spirv_ocl_nan(__CLC_AS_ULONGN(code));
-}
-#elif __CLC_FPSIZE == 32
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_UINTN code) {
-  return __CLC_AS_GENTYPE(code | 0x7fc00000);
-}
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_INTN code) {
-  return __spirv_ocl_nan(__CLC_AS_UINTN(code));
-}
-#elif __CLC_FPSIZE == 16
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_USHORTN code) {
-  const ushort mask = 0x7e00;
-  const __CLC_USHORTN res = code | mask;
-  return __CLC_AS_GENTYPE(res);
-}
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_SHORTN code) {
-  return __spirv_ocl_nan(__CLC_AS_USHORTN(code));
+
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_nan(__CLC_S_GENTYPE code) {
+  return __clc_nan(code);
 }
-#endif
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/integer/mul24.cl b/libclc/libspirv/lib/ptx-nvidiacl/integer/mul24.cl
index 639794c84fe1a..0b58403002b71 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/integer/mul24.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/integer/mul24.cl
@@ -23,12 +23,12 @@ _CLC_OVERLOAD _CLC_DEF uint __spirv_ocl_u_mul24(uint x, uint y) {
 #define __CLC_GENTYPE int
 #include <clc/shared/binary_def_scalarize.inc>
 #undef __CLC_GENTYPE
-#undef FUNCTION
+#undef __CLC_FUNCTION
 
 #define __CLC_FUNCTION __spirv_ocl_u_mul24
 #define __CLC_GENTYPE uint
 #include <clc/shared/binary_def_scalarize.inc>
 #undef __CLC_GENTYPE
-#undef FUNCTION
+#undef __CLC_FUNCTION
 
 #undef __CLC_SCALAR
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/integer/mul_hi.cl b/libclc/libspirv/lib/ptx-nvidiacl/integer/mul_hi.cl
index 60dc263243908..a02fbfea25a14 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/integer/mul_hi.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/integer/mul_hi.cl
@@ -52,7 +52,7 @@ __CLC_MUL_HI_IMPL(uint, __spirv_ocl_u_mul_hi, ushort, 16)
 #define __CLC_GENTYPE long
 #include <clc/shared/binary_def_scalarize.inc>
 #undef __CLC_GENTYPE
-#undef FUNCTION
+#undef __CLC_FUNCTION
 
 #define __CLC_FUNCTION __spirv_ocl_u_mul_hi
 #define __CLC_GENTYPE uchar
@@ -67,6 +67,6 @@ __CLC_MUL_HI_IMPL(uint, __spirv_ocl_u_mul_hi, ushort, 16)
 #define __CLC_GENTYPE ulong
 #include <clc/shared/binary_def_scalarize.inc>
 #undef __CLC_GENTYPE
-#undef FUNCTION
+#undef __CLC_FUNCTION
 
 #undef __CLC_SCALAR
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/fma.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/fma.cl
index 4bd219171d139..366085b2f258d 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/math/fma.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/math/fma.cl
@@ -67,7 +67,7 @@ _CLC_DEF _CLC_OVERLOAD half2 __spirv_ocl_fma(half2 x, half2 y, half2 z) {
 
 #endif
 
-#undef FUNCTION
+#undef __CLC_FUNCTION
 #define __CLC_FUNCTION __clc_fma
 
 // Requires at least sm_80
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/fmax.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/fmax.cl
index 270f790b7d00b..5a96400bf1935 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/math/fmax.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/math/fmax.cl
@@ -64,7 +64,7 @@ _CLC_DEF _CLC_OVERLOAD half2 __spirv_ocl_fmax(half2 x, half2 y) {
 
 #endif
 
-#undef FUNCTION
+#undef __CLC_FUNCTION
 #define __CLC_FUNCTION __clc_fmax
 #define __CLC_SCALAR
 
@@ -91,4 +91,4 @@ _CLC_DEF _CLC_OVERLOAD uint __clc_fmax(uint x, uint y) {
 #undef __CLC_GENTYPE
 
 #undef __CLC_SCALAR
-#undef FUNCTION
+#undef __CLC_FUNCTION
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/fmin.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/fmin.cl
index 95e3de9c9e884..68cb812d6e3c8 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/math/fmin.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/math/fmin.cl
@@ -64,7 +64,7 @@ _CLC_DEF _CLC_OVERLOAD half2 __spirv_ocl_fmin(half2 x, half2 y) {
 
 #endif
 
-#undef FUNCTION
+#undef __CLC_FUNCTION
 #define __CLC_FUNCTION __clc_fmin
 #define __CLC_SCALAR
 
@@ -91,4 +91,4 @@ _CLC_DEF _CLC_OVERLOAD uint __clc_fmin(uint x, uint y) {
 #undef __CLC_GENTYPE
 
 #undef __CLC_SCALAR
-#undef FUNCTION
+#undef __CLC_FUNCTION
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp2.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp2.cl
index cd8e1d50f01af..dc5782fe598fb 100644
--- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp2.cl
+++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp2.cl
@@ -40,7 +40,7 @@ _CLC_DEF _CLC_OVERLOAD half2 __clc_native_exp2(half2 x) {
                        __spirv_ocl_native_exp2((float)x.y));
 }
 
-#undef FUNCTION
+#undef __CLC_FUNCTION
 #define __CLC_FUNCTION __clc_native_exp2
 
 #undef __CLC_MIN_VECSIZE