diff --git a/libclc/generic/include/as_type.h b/libclc/generic/include/as_type.h
index 51f347b4b5cbe..0e31dc4bdd796 100644
--- a/libclc/generic/include/as_type.h
+++ b/libclc/generic/include/as_type.h
@@ -1,89 +1,12 @@
 #ifndef CLC_AS_TYPE
 #define CLC_AS_TYPE
 
-#define as_char(x) __builtin_astype(x, char)
 #define as_schar(x) __builtin_astype(x, schar)
-#define as_uchar(x) __builtin_astype(x, uchar)
-#define as_short(x) __builtin_astype(x, short)
-#define as_ushort(x) __builtin_astype(x, ushort)
-#define as_int(x) __builtin_astype(x, int)
-#define as_uint(x) __builtin_astype(x, uint)
-#define as_long(x) __builtin_astype(x, long)
-#define as_ulong(x) __builtin_astype(x, ulong)
-#define as_float(x) __builtin_astype(x, float)
-
-#define as_char2(x) __builtin_astype(x, char2)
 #define as_schar2(x) __builtin_astype(x, schar2)
-#define as_uchar2(x) __builtin_astype(x, uchar2)
-#define as_short2(x) __builtin_astype(x, short2)
-#define as_ushort2(x) __builtin_astype(x, ushort2)
-#define as_int2(x) __builtin_astype(x, int2)
-#define as_uint2(x) __builtin_astype(x, uint2)
-#define as_long2(x) __builtin_astype(x, long2)
-#define as_ulong2(x) __builtin_astype(x, ulong2)
-#define as_float2(x) __builtin_astype(x, float2)
-
-#define as_char3(x) __builtin_astype(x, char3)
 #define as_schar3(x) __builtin_astype(x, schar3)
-#define as_uchar3(x) __builtin_astype(x, uchar3)
-#define as_short3(x) __builtin_astype(x, short3)
-#define as_ushort3(x) __builtin_astype(x, ushort3)
-#define as_int3(x) __builtin_astype(x, int3)
-#define as_uint3(x) __builtin_astype(x, uint3)
-#define as_long3(x) __builtin_astype(x, long3)
-#define as_ulong3(x) __builtin_astype(x, ulong3)
-#define as_float3(x) __builtin_astype(x, float3)
-
-#define as_char4(x) __builtin_astype(x, char4)
 #define as_schar4(x) __builtin_astype(x, schar4)
-#define as_uchar4(x) __builtin_astype(x, uchar4)
-#define as_short4(x) __builtin_astype(x, short4)
-#define as_ushort4(x) __builtin_astype(x, ushort4)
-#define as_int4(x) __builtin_astype(x, int4)
-#define as_uint4(x) __builtin_astype(x, uint4)
-#define as_long4(x) __builtin_astype(x, long4)
-#define as_ulong4(x) __builtin_astype(x, ulong4)
-#define as_float4(x) __builtin_astype(x, float4)
-
-#define as_char8(x) __builtin_astype(x, char8)
 #define as_schar8(x) __builtin_astype(x, schar8)
-#define as_uchar8(x) __builtin_astype(x, uchar8)
-#define as_short8(x) __builtin_astype(x, short8)
-#define as_ushort8(x) __builtin_astype(x, ushort8)
-#define as_int8(x) __builtin_astype(x, int8)
-#define as_uint8(x) __builtin_astype(x, uint8)
-#define as_long8(x) __builtin_astype(x, long8)
-#define as_ulong8(x) __builtin_astype(x, ulong8)
-#define as_float8(x) __builtin_astype(x, float8)
-
-#define as_char16(x) __builtin_astype(x, char16)
 #define as_schar16(x) __builtin_astype(x, schar16)
-#define as_uchar16(x) __builtin_astype(x, uchar16)
-#define as_short16(x) __builtin_astype(x, short16)
-#define as_ushort16(x) __builtin_astype(x, ushort16)
-#define as_int16(x) __builtin_astype(x, int16)
-#define as_uint16(x) __builtin_astype(x, uint16)
-#define as_long16(x) __builtin_astype(x, long16)
-#define as_ulong16(x) __builtin_astype(x, ulong16)
-#define as_float16(x) __builtin_astype(x, float16)
-
-#ifdef cl_khr_fp64
-#define as_double(x) __builtin_astype(x, double)
-#define as_double2(x) __builtin_astype(x, double2)
-#define as_double3(x) __builtin_astype(x, double3)
-#define as_double4(x) __builtin_astype(x, double4)
-#define as_double8(x) __builtin_astype(x, double8)
-#define as_double16(x) __builtin_astype(x, double16)
-#endif
-
-#ifdef cl_khr_fp16
-#define as_half(x) __builtin_astype(x, half)
-#define as_half2(x) __builtin_astype(x, half2)
-#define as_half3(x) __builtin_astype(x, half3)
-#define as_half4(x) __builtin_astype(x, half4)
-#define as_half8(x) __builtin_astype(x, half8)
-#define as_half16(x) __builtin_astype(x, half16)
-#endif
 
 #ifdef __CLC_HAS_FLOAT16
 #define as_float16_t(x) __builtin_astype(x, __clc_float16_t)
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index 8ff94f8c89ea8..faa450519d8fa 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -205,7 +205,6 @@
 #include <clc/relational/signbit.h>
 
 /* 6.11.8 Synchronization Functions */
-#include <clc/synchronization/cl_mem_fence_flags.h>
 #include <clc/synchronization/barrier.h>
 
 /* 6.11.9 Explicit Memory Fence Functions */
diff --git a/libclc/generic/include/clc/float/definitions.h b/libclc/generic/include/clc/float/definitions.h
index 15d436b26484e..7e46d45221406 100644
--- a/libclc/generic/include/clc/float/definitions.h
+++ b/libclc/generic/include/clc/float/definitions.h
@@ -1,7 +1,4 @@
 #define MAXFLOAT        0x1.fffffep127f
-#define HUGE_VALF       __builtin_huge_valf()
-#define INFINITY        __builtin_inff()
-#define NAN             __builtin_nanf("")
 
 #define FLT_DIG         6
 #define FLT_MANT_DIG    24
@@ -10,35 +7,15 @@
 #define FLT_MIN_10_EXP  -37
 #define FLT_MIN_EXP     -125
 #define FLT_RADIX       2
-#define FLT_MAX         MAXFLOAT
 #define FLT_MIN         0x1.0p-126f
 #define FLT_EPSILON     0x1.0p-23f
 
-#define FP_ILOGB0 (-2147483647 - 1)
-#define FP_ILOGBNAN 2147483647
-
-#define M_E_F           0x1.5bf0a8p+1f
-#define M_LOG2E_F       0x1.715476p+0f
-#define M_LOG10E_F      0x1.bcb7b2p-2f
-#define M_LN2_F         0x1.62e430p-1f
-#define M_LN10_F        0x1.26bb1cp+1f
-#define M_PI_F          0x1.921fb6p+1f
-#define M_PI_2_F        0x1.921fb6p+0f
-#define M_PI_4_F        0x1.921fb6p-1f
-#define M_1_PI_F        0x1.45f306p-2f
-#define M_2_PI_F        0x1.45f306p-1f
-#define M_2_SQRTPI_F    0x1.20dd76p+0f
-#define M_SQRT2_F       0x1.6a09e6p+0f
-#define M_SQRT1_2_F     0x1.6a09e6p-1f
-
 #ifdef __CLC_INTERNAL
 #define M_LOG210_F      0x1.a934f0p+1f
 #endif
 
 #ifdef cl_khr_fp64
 
-#define HUGE_VAL        __builtin_huge_val()
-
 #define DBL_DIG         15
 #define DBL_MANT_DIG    53
 #define DBL_MAX_10_EXP  +308
@@ -79,9 +56,6 @@
 #define HALF_MIN_EXP    -13
 
 #define HALF_RADIX      2
-#define HALF_MAX        0x1.ffcp15h
-#define HALF_MIN        0x1.0p-14h
-#define HALF_EPSILON    0x1.0p-10h
 #define HALF_MAX_SQRT 0x1.0p+8h
 #define HALF_MIN_SQRT 0x1.0p-8h
 
diff --git a/libclc/generic/include/clc/image/image_defines.h b/libclc/generic/include/clc/image/image_defines.h
index 0b3350b7694d7..934386c14470b 100644
--- a/libclc/generic/include/clc/image/image_defines.h
+++ b/libclc/generic/include/clc/image/image_defines.h
@@ -30,20 +30,7 @@
 #define CLK_RGx                      0x10BB
 #define CLK_RGBx                     0x10BC
 
-/* sampler normalized coords */
-#define CLK_NORMALIZED_COORDS_FALSE  0x0000
-#define CLK_NORMALIZED_COORDS_TRUE   0x0001
-#define __CLC_NORMALIZED_COORDS_MASK 0x0001
-
-/* sampler addressing mode */
-#define CLK_ADDRESS_NONE             0x0000
-#define CLK_ADDRESS_CLAMP_TO_EDGE    0x0002
-#define CLK_ADDRESS_CLAMP            0x0004
-#define CLK_ADDRESS_REPEAT           0x0006
-#define CLK_ADDRESS_MIRRORED_REPEAT  0x0008
+/* sampler masks */
 #define __CLC_ADDRESS_MASK           0x000E
-
-/* sampler filter mode */
-#define CLK_FILTER_NEAREST           0x0000
-#define CLK_FILTER_LINEAR            0x0010
 #define __CLC_FILTER_MASK            0x0010
+#define __CLC_NORMALIZED_COORDS_MASK 0x0001
diff --git a/libclc/generic/include/clc/integer/definitions.h b/libclc/generic/include/clc/integer/definitions.h
index 0079c30123db8..5d3a6508a6c7d 100644
--- a/libclc/generic/include/clc/integer/definitions.h
+++ b/libclc/generic/include/clc/integer/definitions.h
@@ -1,14 +1,10 @@
 #define CHAR_BIT 8
 #define INT_MAX 2147483647
-#define INT_MIN (-2147483647 - 1)
 #define LONG_MAX  0x7fffffffffffffffL
-#define LONG_MIN (-0x7fffffffffffffffL - 1)
 #define CHAR_MAX SCHAR_MAX
 #define CHAR_MIN SCHAR_MIN
 #define SCHAR_MAX 127
-#define SCHAR_MIN (-127 - 1)
 #define SHRT_MAX 32767
-#define SHRT_MIN (-32767 - 1)
 #define UCHAR_MAX 255
 #define USHRT_MAX 65535
 #define UINT_MAX 0xffffffff
diff --git a/libclc/generic/include/clc/synchronization/cl_mem_fence_flags.h b/libclc/generic/include/clc/synchronization/cl_mem_fence_flags.h
deleted file mode 100644
index c57eb4249a413..0000000000000
--- a/libclc/generic/include/clc/synchronization/cl_mem_fence_flags.h
+++ /dev/null
@@ -1,4 +0,0 @@
-typedef uint cl_mem_fence_flags;
-
-#define CLK_LOCAL_MEM_FENCE 1
-#define CLK_GLOBAL_MEM_FENCE 2
diff --git a/libclc/generic/include/macros.h b/libclc/generic/include/macros.h
index ba70db7365e5a..6e1c5ceddff6b 100644
--- a/libclc/generic/include/macros.h
+++ b/libclc/generic/include/macros.h
@@ -14,10 +14,4 @@
 
 #define NULL ((void*)0)
 
-#define __kernel_exec(X, typen) __kernel \
-                                __attribute__((work_group_size_hint(X, 1, 1))) \
-                                __attribute__((vec_type_hint(typen)))
-
-#define kernel_exec(X, typen) __kernel_exec(X, typen)
-
 #endif // CLC_MACROS
diff --git a/libclc/generic/include/spirv/image/image_defines.h b/libclc/generic/include/spirv/image/image_defines.h
index 07a02e11fb470..1f002b86206ab 100644
--- a/libclc/generic/include/spirv/image/image_defines.h
+++ b/libclc/generic/include/spirv/image/image_defines.h
@@ -38,20 +38,7 @@
 #define CLK_RGx                      0x10BB
 #define CLK_RGBx                     0x10BC
 
-/* sampler normalized coords */
-#define CLK_NORMALIZED_COORDS_FALSE  0x0000
-#define CLK_NORMALIZED_COORDS_TRUE   0x0001
-#define __SPIRV_NORMALIZED_COORDS_MASK 0x0001
-
-/* sampler addressing mode */
-#define CLK_ADDRESS_NONE             0x0000
-#define CLK_ADDRESS_CLAMP_TO_EDGE    0x0002
-#define CLK_ADDRESS_CLAMP            0x0004
-#define CLK_ADDRESS_REPEAT           0x0006
-#define CLK_ADDRESS_MIRRORED_REPEAT  0x0008
+/* sampler masks */
 #define __SPIRV_ADDRESS_MASK           0x000E
-
-/* sampler filter mode */
-#define CLK_FILTER_NEAREST           0x0000
-#define CLK_FILTER_LINEAR            0x0010
 #define __SPIRV_FILTER_MASK            0x0010
+#define __SPIRV_NORMALIZED_COORDS_MASK 0x0001