[llvm-branch-commits] [libclc] 4be49b5 - Revert "[libclc][NFC] Change include style from <...> to "..." (#185788)"

[via llvm-branch-commits]

Author: Michał Górny
Date: 2026-03-11T15:09:26+01:00
New Revision: 4be49b556d0879f2041d540db3967af3594dcd9b

URL: https://github.com/llvm/llvm-project/commit/4be49b556d0879f2041d540db3967af3594dcd9b
DIFF: https://github.com/llvm/llvm-project/commit/4be49b556d0879f2041d540db3967af3594dcd9b.diff

LOG: Revert "[libclc][NFC] Change include style from <...> to "..." (#185788)"

This reverts commit c0c8b992ef25523562ee47ced197624c869aa355.

Added: 
    

Modified: 
    libclc/clc/include/clc/address_space/clc_qualifier.h
    libclc/clc/include/clc/async/clc_prefetch.h
    libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
    libclc/clc/include/clc/atomic/clc_atomic_dec.h
    libclc/clc/include/clc/atomic/clc_atomic_exchange.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
    libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
    libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
    libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
    libclc/clc/include/clc/atomic/clc_atomic_inc.h
    libclc/clc/include/clc/atomic/clc_atomic_load.h
    libclc/clc/include/clc/atomic/clc_atomic_store.h
    libclc/clc/include/clc/clc_convert.h
    libclc/clc/include/clc/collective/clc_work_group_broadcast.h
    libclc/clc/include/clc/collective/clc_work_group_reduce.h
    libclc/clc/include/clc/common/clc_degrees.h
    libclc/clc/include/clc/common/clc_radians.h
    libclc/clc/include/clc/common/clc_sign.h
    libclc/clc/include/clc/common/clc_smoothstep.h
    libclc/clc/include/clc/common/clc_step.h
    libclc/clc/include/clc/geometric/binary_def.inc
    libclc/clc/include/clc/geometric/clc_cross.h
    libclc/clc/include/clc/geometric/clc_distance.h
    libclc/clc/include/clc/geometric/clc_dot.h
    libclc/clc/include/clc/geometric/clc_fast_distance.h
    libclc/clc/include/clc/geometric/clc_fast_length.h
    libclc/clc/include/clc/geometric/clc_fast_normalize.h
    libclc/clc/include/clc/geometric/clc_length.h
    libclc/clc/include/clc/geometric/clc_normalize.h
    libclc/clc/include/clc/geometric/unary_def.inc
    libclc/clc/include/clc/integer/clc_abs.h
    libclc/clc/include/clc/integer/clc_abs_diff.h
    libclc/clc/include/clc/integer/clc_add_sat.h
    libclc/clc/include/clc/integer/clc_bit_reverse.h
    libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
    libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
    libclc/clc/include/clc/integer/clc_bitfield_insert.h
    libclc/clc/include/clc/integer/clc_clz.h
    libclc/clc/include/clc/integer/clc_ctz.h
    libclc/clc/include/clc/integer/clc_hadd.h
    libclc/clc/include/clc/integer/clc_mad24.h
    libclc/clc/include/clc/integer/clc_mad_hi.h
    libclc/clc/include/clc/integer/clc_mad_sat.h
    libclc/clc/include/clc/integer/clc_mul24.h
    libclc/clc/include/clc/integer/clc_mul_hi.h
    libclc/clc/include/clc/integer/clc_popcount.h
    libclc/clc/include/clc/integer/clc_rhadd.h
    libclc/clc/include/clc/integer/clc_rotate.h
    libclc/clc/include/clc/integer/clc_sub_sat.h
    libclc/clc/include/clc/integer/clc_upsample.h
    libclc/clc/include/clc/integer/gentype.inc
    libclc/clc/include/clc/integer/gentype24.inc
    libclc/clc/include/clc/internal/clc.h
    libclc/clc/include/clc/internal/math/clc_sw_fma.h
    libclc/clc/include/clc/math/clc_acos.h
    libclc/clc/include/clc/math/clc_acosh.h
    libclc/clc/include/clc/math/clc_acospi.h
    libclc/clc/include/clc/math/clc_asin.h
    libclc/clc/include/clc/math/clc_asinh.h
    libclc/clc/include/clc/math/clc_asinpi.h
    libclc/clc/include/clc/math/clc_atan.h
    libclc/clc/include/clc/math/clc_atan2.h
    libclc/clc/include/clc/math/clc_atan2pi.h
    libclc/clc/include/clc/math/clc_atanh.h
    libclc/clc/include/clc/math/clc_atanpi.h
    libclc/clc/include/clc/math/clc_cbrt.h
    libclc/clc/include/clc/math/clc_ceil.h
    libclc/clc/include/clc/math/clc_copysign.h
    libclc/clc/include/clc/math/clc_cos.h
    libclc/clc/include/clc/math/clc_cosh.h
    libclc/clc/include/clc/math/clc_cospi.h
    libclc/clc/include/clc/math/clc_div_cr.h
    libclc/clc/include/clc/math/clc_div_fast.h
    libclc/clc/include/clc/math/clc_ep_log.h
    libclc/clc/include/clc/math/clc_erf.h
    libclc/clc/include/clc/math/clc_erfc.h
    libclc/clc/include/clc/math/clc_exp.h
    libclc/clc/include/clc/math/clc_exp10.h
    libclc/clc/include/clc/math/clc_exp2.h
    libclc/clc/include/clc/math/clc_exp_helper.h
    libclc/clc/include/clc/math/clc_expm1.h
    libclc/clc/include/clc/math/clc_fabs.h
    libclc/clc/include/clc/math/clc_fdim.h
    libclc/clc/include/clc/math/clc_floor.h
    libclc/clc/include/clc/math/clc_fma.h
    libclc/clc/include/clc/math/clc_fmax.h
    libclc/clc/include/clc/math/clc_fmin.h
    libclc/clc/include/clc/math/clc_fmod.h
    libclc/clc/include/clc/math/clc_fract.h
    libclc/clc/include/clc/math/clc_frexp.h
    libclc/clc/include/clc/math/clc_half_cos.h
    libclc/clc/include/clc/math/clc_half_divide.h
    libclc/clc/include/clc/math/clc_half_exp.h
    libclc/clc/include/clc/math/clc_half_exp10.h
    libclc/clc/include/clc/math/clc_half_exp2.h
    libclc/clc/include/clc/math/clc_half_log.h
    libclc/clc/include/clc/math/clc_half_log10.h
    libclc/clc/include/clc/math/clc_half_log2.h
    libclc/clc/include/clc/math/clc_half_powr.h
    libclc/clc/include/clc/math/clc_half_recip.h
    libclc/clc/include/clc/math/clc_half_rsqrt.h
    libclc/clc/include/clc/math/clc_half_sin.h
    libclc/clc/include/clc/math/clc_half_sqrt.h
    libclc/clc/include/clc/math/clc_half_tan.h
    libclc/clc/include/clc/math/clc_hypot.h
    libclc/clc/include/clc/math/clc_ilogb.h
    libclc/clc/include/clc/math/clc_ldexp.h
    libclc/clc/include/clc/math/clc_lgamma.h
    libclc/clc/include/clc/math/clc_lgamma_r.h
    libclc/clc/include/clc/math/clc_log.h
    libclc/clc/include/clc/math/clc_log10.h
    libclc/clc/include/clc/math/clc_log1p.h
    libclc/clc/include/clc/math/clc_log2.h
    libclc/clc/include/clc/math/clc_logb.h
    libclc/clc/include/clc/math/clc_mad.h
    libclc/clc/include/clc/math/clc_maxmag.h
    libclc/clc/include/clc/math/clc_minmag.h
    libclc/clc/include/clc/math/clc_modf.h
    libclc/clc/include/clc/math/clc_nan.h
    libclc/clc/include/clc/math/clc_native_cos.h
    libclc/clc/include/clc/math/clc_native_divide.h
    libclc/clc/include/clc/math/clc_native_exp.h
    libclc/clc/include/clc/math/clc_native_exp10.h
    libclc/clc/include/clc/math/clc_native_exp2.h
    libclc/clc/include/clc/math/clc_native_log.h
    libclc/clc/include/clc/math/clc_native_log10.h
    libclc/clc/include/clc/math/clc_native_log2.h
    libclc/clc/include/clc/math/clc_native_powr.h
    libclc/clc/include/clc/math/clc_native_recip.h
    libclc/clc/include/clc/math/clc_native_rsqrt.h
    libclc/clc/include/clc/math/clc_native_sin.h
    libclc/clc/include/clc/math/clc_native_sqrt.h
    libclc/clc/include/clc/math/clc_native_tan.h
    libclc/clc/include/clc/math/clc_nextafter.h
    libclc/clc/include/clc/math/clc_pow.h
    libclc/clc/include/clc/math/clc_pown.h
    libclc/clc/include/clc/math/clc_powr.h
    libclc/clc/include/clc/math/clc_recip_fast.h
    libclc/clc/include/clc/math/clc_remainder.h
    libclc/clc/include/clc/math/clc_remquo.h
    libclc/clc/include/clc/math/clc_rint.h
    libclc/clc/include/clc/math/clc_rootn.h
    libclc/clc/include/clc/math/clc_round.h
    libclc/clc/include/clc/math/clc_rsqrt.h
    libclc/clc/include/clc/math/clc_sin.h
    libclc/clc/include/clc/math/clc_sincos.h
    libclc/clc/include/clc/math/clc_sincos_helpers.h
    libclc/clc/include/clc/math/clc_sinh.h
    libclc/clc/include/clc/math/clc_sinpi.h
    libclc/clc/include/clc/math/clc_sqrt.h
    libclc/clc/include/clc/math/clc_sqrt_cr.h
    libclc/clc/include/clc/math/clc_sqrt_fast.h
    libclc/clc/include/clc/math/clc_subnormal_config.h
    libclc/clc/include/clc/math/clc_tan.h
    libclc/clc/include/clc/math/clc_tanh.h
    libclc/clc/include/clc/math/clc_tanpi.h
    libclc/clc/include/clc/math/clc_tgamma.h
    libclc/clc/include/clc/math/clc_trunc.h
    libclc/clc/include/clc/math/gentype.inc
    libclc/clc/include/clc/math/math.h
    libclc/clc/include/clc/math/unary_def_with_int_ptr.inc
    libclc/clc/include/clc/math/unary_def_with_int_return.inc
    libclc/clc/include/clc/math/unary_def_with_ptr.inc
    libclc/clc/include/clc/mem_fence/clc_mem_fence.h
    libclc/clc/include/clc/misc/clc_shuffle.h
    libclc/clc/include/clc/misc/clc_shuffle2.h
    libclc/clc/include/clc/misc/shuffle2_def.inc
    libclc/clc/include/clc/misc/shuffle_def.inc
    libclc/clc/include/clc/relational/clc_all.h
    libclc/clc/include/clc/relational/clc_any.h
    libclc/clc/include/clc/relational/clc_bitselect.h
    libclc/clc/include/clc/relational/clc_isequal.h
    libclc/clc/include/clc/relational/clc_isfinite.h
    libclc/clc/include/clc/relational/clc_isgreater.h
    libclc/clc/include/clc/relational/clc_isgreaterequal.h
    libclc/clc/include/clc/relational/clc_isinf.h
    libclc/clc/include/clc/relational/clc_isless.h
    libclc/clc/include/clc/relational/clc_islessequal.h
    libclc/clc/include/clc/relational/clc_islessgreater.h
    libclc/clc/include/clc/relational/clc_isnan.h
    libclc/clc/include/clc/relational/clc_isnormal.h
    libclc/clc/include/clc/relational/clc_isnotequal.h
    libclc/clc/include/clc/relational/clc_isordered.h
    libclc/clc/include/clc/relational/clc_issubnormal.h
    libclc/clc/include/clc/relational/clc_isunordered.h
    libclc/clc/include/clc/relational/clc_select.h
    libclc/clc/include/clc/relational/clc_signbit.h
    libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc
    libclc/clc/include/clc/shared/binary_def.inc
    libclc/clc/include/clc/shared/binary_def_scalarize.inc
    libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc
    libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc
    libclc/clc/include/clc/shared/clc_clamp.h
    libclc/clc/include/clc/shared/clc_less_aligned_types.h
    libclc/clc/include/clc/shared/clc_max.h
    libclc/clc/include/clc/shared/clc_min.h
    libclc/clc/include/clc/shared/clc_vload.h
    libclc/clc/include/clc/shared/clc_vstore.h
    libclc/clc/include/clc/shared/ternary_def.inc
    libclc/clc/include/clc/shared/ternary_def_scalarize.inc
    libclc/clc/include/clc/shared/unary_def.inc
    libclc/clc/include/clc/shared/unary_def_scalarize.inc
    libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc
    libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc
    libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h
    libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h
    libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
    libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h
    libclc/clc/include/clc/workitem/clc_get_global_id.h
    libclc/clc/include/clc/workitem/clc_get_global_offset.h
    libclc/clc/include/clc/workitem/clc_get_global_size.h
    libclc/clc/include/clc/workitem/clc_get_group_id.h
    libclc/clc/include/clc/workitem/clc_get_local_id.h
    libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
    libclc/clc/include/clc/workitem/clc_get_local_size.h
    libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
    libclc/clc/include/clc/workitem/clc_get_num_groups.h
    libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
    libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
    libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
    libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
    libclc/clc/include/clc/workitem/clc_get_work_dim.h
    libclc/clc/lib/amdgpu/math/clc_exp.cl
    libclc/clc/lib/amdgpu/math/clc_exp10.cl
    libclc/clc/lib/amdgpu/math/clc_exp2.cl
    libclc/clc/lib/amdgpu/math/clc_frexp.cl
    libclc/clc/lib/amdgpu/math/clc_half_exp.cl
    libclc/clc/lib/amdgpu/math/clc_half_exp10.cl
    libclc/clc/lib/amdgpu/math/clc_half_exp2.cl
    libclc/clc/lib/amdgpu/math/clc_half_log.cl
    libclc/clc/lib/amdgpu/math/clc_half_log10.cl
    libclc/clc/lib/amdgpu/math/clc_half_log2.cl
    libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc
    libclc/clc/lib/amdgpu/math/clc_half_recip.cl
    libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl
    libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl
    libclc/clc/lib/amdgpu/math/clc_ldexp.cl
    libclc/clc/lib/amdgpu/math/clc_native_exp.cl
    libclc/clc/lib/amdgpu/math/clc_native_exp2.cl
    libclc/clc/lib/amdgpu/math/clc_native_log10.cl
    libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
    libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
    libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
    libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
    libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
    libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
    libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
    libclc/clc/lib/clspv/math/clc_sw_fma.cl
    libclc/clc/lib/generic/async/clc_prefetch.cl
    libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl
    libclc/clc/lib/generic/atomic/clc_atomic_dec.cl
    libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl
    libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl
    libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl
    libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl
    libclc/clc/lib/generic/atomic/clc_atomic_inc.cl
    libclc/clc/lib/generic/atomic/clc_atomic_load.cl
    libclc/clc/lib/generic/atomic/clc_atomic_store.cl
    libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl
    libclc/clc/lib/generic/collective/clc_work_group_reduce.cl
    libclc/clc/lib/generic/common/clc_degrees.cl
    libclc/clc/lib/generic/common/clc_radians.cl
    libclc/clc/lib/generic/common/clc_sign.cl
    libclc/clc/lib/generic/common/clc_smoothstep.cl
    libclc/clc/lib/generic/common/clc_step.cl
    libclc/clc/lib/generic/conversion/clc_convert_float2float.cl
    libclc/clc/lib/generic/conversion/clc_convert_float2int.cl
    libclc/clc/lib/generic/conversion/clc_convert_int2float.cl
    libclc/clc/lib/generic/conversion/clc_convert_integer.cl
    libclc/clc/lib/generic/geometric/clc_cross.cl
    libclc/clc/lib/generic/geometric/clc_distance.cl
    libclc/clc/lib/generic/geometric/clc_dot.cl
    libclc/clc/lib/generic/geometric/clc_fast_distance.cl
    libclc/clc/lib/generic/geometric/clc_fast_length.cl
    libclc/clc/lib/generic/geometric/clc_fast_normalize.cl
    libclc/clc/lib/generic/geometric/clc_length.cl
    libclc/clc/lib/generic/geometric/clc_normalize.cl
    libclc/clc/lib/generic/integer/clc_abs.cl
    libclc/clc/lib/generic/integer/clc_abs_diff.cl
    libclc/clc/lib/generic/integer/clc_add_sat.cl
    libclc/clc/lib/generic/integer/clc_bit_reverse.cl
    libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl
    libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl
    libclc/clc/lib/generic/integer/clc_bitfield_insert.cl
    libclc/clc/lib/generic/integer/clc_clz.cl
    libclc/clc/lib/generic/integer/clc_ctz.cl
    libclc/clc/lib/generic/integer/clc_hadd.cl
    libclc/clc/lib/generic/integer/clc_mad24.cl
    libclc/clc/lib/generic/integer/clc_mad_sat.cl
    libclc/clc/lib/generic/integer/clc_mul24.cl
    libclc/clc/lib/generic/integer/clc_mul_hi.cl
    libclc/clc/lib/generic/integer/clc_popcount.cl
    libclc/clc/lib/generic/integer/clc_rhadd.cl
    libclc/clc/lib/generic/integer/clc_rotate.cl
    libclc/clc/lib/generic/integer/clc_sub_sat.cl
    libclc/clc/lib/generic/integer/clc_upsample.cl
    libclc/clc/lib/generic/math/clc_acos.cl
    libclc/clc/lib/generic/math/clc_acosh.cl
    libclc/clc/lib/generic/math/clc_acospi.cl
    libclc/clc/lib/generic/math/clc_asin.cl
    libclc/clc/lib/generic/math/clc_asinh.cl
    libclc/clc/lib/generic/math/clc_asinpi.cl
    libclc/clc/lib/generic/math/clc_atan.cl
    libclc/clc/lib/generic/math/clc_atan2.cl
    libclc/clc/lib/generic/math/clc_atan2pi.cl
    libclc/clc/lib/generic/math/clc_atanh.cl
    libclc/clc/lib/generic/math/clc_atanpi.cl
    libclc/clc/lib/generic/math/clc_cbrt.cl
    libclc/clc/lib/generic/math/clc_ceil.cl
    libclc/clc/lib/generic/math/clc_copysign.cl
    libclc/clc/lib/generic/math/clc_cos.cl
    libclc/clc/lib/generic/math/clc_cosh.cl
    libclc/clc/lib/generic/math/clc_cospi.cl
    libclc/clc/lib/generic/math/clc_div_cr.cl
    libclc/clc/lib/generic/math/clc_div_fast.cl
    libclc/clc/lib/generic/math/clc_ep_log.cl
    libclc/clc/lib/generic/math/clc_erf.cl
    libclc/clc/lib/generic/math/clc_erfc.cl
    libclc/clc/lib/generic/math/clc_exp.cl
    libclc/clc/lib/generic/math/clc_exp10.cl
    libclc/clc/lib/generic/math/clc_exp2.cl
    libclc/clc/lib/generic/math/clc_exp_helper.cl
    libclc/clc/lib/generic/math/clc_expm1.cl
    libclc/clc/lib/generic/math/clc_fabs.cl
    libclc/clc/lib/generic/math/clc_fdim.cl
    libclc/clc/lib/generic/math/clc_floor.cl
    libclc/clc/lib/generic/math/clc_fma.cl
    libclc/clc/lib/generic/math/clc_fmax.cl
    libclc/clc/lib/generic/math/clc_fmin.cl
    libclc/clc/lib/generic/math/clc_fmod.cl
    libclc/clc/lib/generic/math/clc_fract.cl
    libclc/clc/lib/generic/math/clc_frexp.cl
    libclc/clc/lib/generic/math/clc_frexp.inc
    libclc/clc/lib/generic/math/clc_half_cos.cl
    libclc/clc/lib/generic/math/clc_half_divide.cl
    libclc/clc/lib/generic/math/clc_half_exp.cl
    libclc/clc/lib/generic/math/clc_half_exp10.cl
    libclc/clc/lib/generic/math/clc_half_exp2.cl
    libclc/clc/lib/generic/math/clc_half_log.cl
    libclc/clc/lib/generic/math/clc_half_log10.cl
    libclc/clc/lib/generic/math/clc_half_log2.cl
    libclc/clc/lib/generic/math/clc_half_powr.cl
    libclc/clc/lib/generic/math/clc_half_recip.cl
    libclc/clc/lib/generic/math/clc_half_rsqrt.cl
    libclc/clc/lib/generic/math/clc_half_sin.cl
    libclc/clc/lib/generic/math/clc_half_sqrt.cl
    libclc/clc/lib/generic/math/clc_half_tan.cl
    libclc/clc/lib/generic/math/clc_hypot.cl
    libclc/clc/lib/generic/math/clc_ilogb.cl
    libclc/clc/lib/generic/math/clc_ldexp.cl
    libclc/clc/lib/generic/math/clc_lgamma.cl
    libclc/clc/lib/generic/math/clc_lgamma_r.cl
    libclc/clc/lib/generic/math/clc_log.cl
    libclc/clc/lib/generic/math/clc_log10.cl
    libclc/clc/lib/generic/math/clc_log1p.cl
    libclc/clc/lib/generic/math/clc_log2.cl
    libclc/clc/lib/generic/math/clc_log_base.h
    libclc/clc/lib/generic/math/clc_logb.cl
    libclc/clc/lib/generic/math/clc_mad.cl
    libclc/clc/lib/generic/math/clc_maxmag.cl
    libclc/clc/lib/generic/math/clc_minmag.cl
    libclc/clc/lib/generic/math/clc_modf.cl
    libclc/clc/lib/generic/math/clc_nan.cl
    libclc/clc/lib/generic/math/clc_native_cos.cl
    libclc/clc/lib/generic/math/clc_native_divide.cl
    libclc/clc/lib/generic/math/clc_native_exp.cl
    libclc/clc/lib/generic/math/clc_native_exp10.cl
    libclc/clc/lib/generic/math/clc_native_exp2.cl
    libclc/clc/lib/generic/math/clc_native_log.cl
    libclc/clc/lib/generic/math/clc_native_log10.cl
    libclc/clc/lib/generic/math/clc_native_log2.cl
    libclc/clc/lib/generic/math/clc_native_powr.cl
    libclc/clc/lib/generic/math/clc_native_recip.cl
    libclc/clc/lib/generic/math/clc_native_rsqrt.cl
    libclc/clc/lib/generic/math/clc_native_sin.cl
    libclc/clc/lib/generic/math/clc_native_sqrt.cl
    libclc/clc/lib/generic/math/clc_native_tan.cl
    libclc/clc/lib/generic/math/clc_nextafter.cl
    libclc/clc/lib/generic/math/clc_pow.cl
    libclc/clc/lib/generic/math/clc_pown.cl
    libclc/clc/lib/generic/math/clc_powr.cl
    libclc/clc/lib/generic/math/clc_recip_fast.cl
    libclc/clc/lib/generic/math/clc_remainder.cl
    libclc/clc/lib/generic/math/clc_remquo.cl
    libclc/clc/lib/generic/math/clc_rint.cl
    libclc/clc/lib/generic/math/clc_rootn.cl
    libclc/clc/lib/generic/math/clc_round.cl
    libclc/clc/lib/generic/math/clc_rsqrt.cl
    libclc/clc/lib/generic/math/clc_sin.cl
    libclc/clc/lib/generic/math/clc_sincos.cl
    libclc/clc/lib/generic/math/clc_sincos_helpers.cl
    libclc/clc/lib/generic/math/clc_sinh.cl
    libclc/clc/lib/generic/math/clc_sinpi.cl
    libclc/clc/lib/generic/math/clc_sqrt.cl
    libclc/clc/lib/generic/math/clc_sqrt_cr.cl
    libclc/clc/lib/generic/math/clc_sqrt_fast.cl
    libclc/clc/lib/generic/math/clc_tables.cl
    libclc/clc/lib/generic/math/clc_tan.cl
    libclc/clc/lib/generic/math/clc_tanh.cl
    libclc/clc/lib/generic/math/clc_tanpi.cl
    libclc/clc/lib/generic/math/clc_tgamma.cl
    libclc/clc/lib/generic/math/clc_trunc.cl
    libclc/clc/lib/generic/misc/clc_shuffle.cl
    libclc/clc/lib/generic/misc/clc_shuffle2.cl
    libclc/clc/lib/generic/relational/clc_all.cl
    libclc/clc/lib/generic/relational/clc_any.cl
    libclc/clc/lib/generic/relational/clc_bitselect.cl
    libclc/clc/lib/generic/relational/clc_isequal.cl
    libclc/clc/lib/generic/relational/clc_isfinite.cl
    libclc/clc/lib/generic/relational/clc_isgreater.cl
    libclc/clc/lib/generic/relational/clc_isgreaterequal.cl
    libclc/clc/lib/generic/relational/clc_isinf.cl
    libclc/clc/lib/generic/relational/clc_isless.cl
    libclc/clc/lib/generic/relational/clc_islessequal.cl
    libclc/clc/lib/generic/relational/clc_islessgreater.cl
    libclc/clc/lib/generic/relational/clc_isnan.cl
    libclc/clc/lib/generic/relational/clc_isnormal.cl
    libclc/clc/lib/generic/relational/clc_isnotequal.cl
    libclc/clc/lib/generic/relational/clc_isordered.cl
    libclc/clc/lib/generic/relational/clc_issubnormal.cl
    libclc/clc/lib/generic/relational/clc_isunordered.cl
    libclc/clc/lib/generic/relational/clc_select.cl
    libclc/clc/lib/generic/relational/clc_signbit.cl
    libclc/clc/lib/generic/shared/clc_clamp.cl
    libclc/clc/lib/generic/shared/clc_max.cl
    libclc/clc/lib/generic/shared/clc_min.cl
    libclc/clc/lib/generic/shared/clc_vload.cl
    libclc/clc/lib/generic/shared/clc_vstore.cl
    libclc/clc/lib/generic/workitem/clc_get_global_id.cl
    libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl
    libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl
    libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl
    libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl
    libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl
    libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl
    libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl
    libclc/clc/lib/ptx-nvidiacl/mem_fence/clc_mem_fence.cl
    libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl
    libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl
    libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl
    libclc/clc/lib/spirv/math/clc_fmax.cl
    libclc/clc/lib/spirv/math/clc_fmin.cl
    libclc/opencl/include/clc/opencl/convert.h
    libclc/opencl/include/clc/opencl/opencl-base.h
    libclc/opencl/include/clc/opencl/synchronization/utils.h
    libclc/opencl/include/clc/opencl/utils.h
    libclc/opencl/lib/amdgpu/async/wait_group_events.cl
    libclc/opencl/lib/clspv/conversion/convert_float2float.cl
    libclc/opencl/lib/clspv/conversion/convert_float2int.cl
    libclc/opencl/lib/clspv/conversion/convert_int2float.cl
    libclc/opencl/lib/clspv/conversion/convert_integer.cl
    libclc/opencl/lib/clspv/math/fma.cl
    libclc/opencl/lib/clspv/shared/vstore_half.cl
    libclc/opencl/lib/generic/async/async_work_group_copy.cl
    libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl
    libclc/opencl/lib/generic/async/prefetch.cl
    libclc/opencl/lib/generic/async/wait_group_events.cl
    libclc/opencl/lib/generic/atomic/atom_add.cl
    libclc/opencl/lib/generic/atomic/atom_and.cl
    libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl
    libclc/opencl/lib/generic/atomic/atom_dec.cl
    libclc/opencl/lib/generic/atomic/atom_inc.cl
    libclc/opencl/lib/generic/atomic/atom_max.cl
    libclc/opencl/lib/generic/atomic/atom_min.cl
    libclc/opencl/lib/generic/atomic/atom_or.cl
    libclc/opencl/lib/generic/atomic/atom_sub.cl
    libclc/opencl/lib/generic/atomic/atom_xchg.cl
    libclc/opencl/lib/generic/atomic/atom_xor.cl
    libclc/opencl/lib/generic/atomic/atomic_add.cl
    libclc/opencl/lib/generic/atomic/atomic_and.cl
    libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl
    libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl
    libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl
    libclc/opencl/lib/generic/atomic/atomic_dec.cl
    libclc/opencl/lib/generic/atomic/atomic_exchange.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl
    libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl
    libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl
    libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl
    libclc/opencl/lib/generic/atomic/atomic_inc.cl
    libclc/opencl/lib/generic/atomic/atomic_init.cl
    libclc/opencl/lib/generic/atomic/atomic_load.cl
    libclc/opencl/lib/generic/atomic/atomic_max.cl
    libclc/opencl/lib/generic/atomic/atomic_min.cl
    libclc/opencl/lib/generic/atomic/atomic_or.cl
    libclc/opencl/lib/generic/atomic/atomic_store.cl
    libclc/opencl/lib/generic/atomic/atomic_sub.cl
    libclc/opencl/lib/generic/atomic/atomic_xchg.cl
    libclc/opencl/lib/generic/atomic/atomic_xor.cl
    libclc/opencl/lib/generic/collective/work_group_broadcast.cl
    libclc/opencl/lib/generic/collective/work_group_reduce.cl
    libclc/opencl/lib/generic/common/degrees.cl
    libclc/opencl/lib/generic/common/mix.cl
    libclc/opencl/lib/generic/common/radians.cl
    libclc/opencl/lib/generic/common/sign.cl
    libclc/opencl/lib/generic/common/smoothstep.cl
    libclc/opencl/lib/generic/common/step.cl
    libclc/opencl/lib/generic/conversion/convert_float2float.cl
    libclc/opencl/lib/generic/conversion/convert_float2int.cl
    libclc/opencl/lib/generic/conversion/convert_int2float.cl
    libclc/opencl/lib/generic/conversion/convert_integer.cl
    libclc/opencl/lib/generic/geometric/cross.cl
    libclc/opencl/lib/generic/geometric/distance.cl
    libclc/opencl/lib/generic/geometric/dot.cl
    libclc/opencl/lib/generic/geometric/fast_distance.cl
    libclc/opencl/lib/generic/geometric/fast_length.cl
    libclc/opencl/lib/generic/geometric/fast_normalize.cl
    libclc/opencl/lib/generic/geometric/length.cl
    libclc/opencl/lib/generic/geometric/normalize.cl
    libclc/opencl/lib/generic/integer/abs.cl
    libclc/opencl/lib/generic/integer/abs_diff.cl
    libclc/opencl/lib/generic/integer/add_sat.cl
    libclc/opencl/lib/generic/integer/bit_reverse.cl
    libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl
    libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl
    libclc/opencl/lib/generic/integer/bitfield_insert.cl
    libclc/opencl/lib/generic/integer/clz.cl
    libclc/opencl/lib/generic/integer/ctz.cl
    libclc/opencl/lib/generic/integer/hadd.cl
    libclc/opencl/lib/generic/integer/mad24.cl
    libclc/opencl/lib/generic/integer/mad_hi.cl
    libclc/opencl/lib/generic/integer/mad_sat.cl
    libclc/opencl/lib/generic/integer/mul24.cl
    libclc/opencl/lib/generic/integer/mul_hi.cl
    libclc/opencl/lib/generic/integer/popcount.cl
    libclc/opencl/lib/generic/integer/rhadd.cl
    libclc/opencl/lib/generic/integer/rotate.cl
    libclc/opencl/lib/generic/integer/sub_sat.cl
    libclc/opencl/lib/generic/integer/upsample.cl
    libclc/opencl/lib/generic/math/acos.cl
    libclc/opencl/lib/generic/math/acosh.cl
    libclc/opencl/lib/generic/math/acospi.cl
    libclc/opencl/lib/generic/math/asin.cl
    libclc/opencl/lib/generic/math/asinh.cl
    libclc/opencl/lib/generic/math/asinpi.cl
    libclc/opencl/lib/generic/math/atan.cl
    libclc/opencl/lib/generic/math/atan2.cl
    libclc/opencl/lib/generic/math/atan2pi.cl
    libclc/opencl/lib/generic/math/atanh.cl
    libclc/opencl/lib/generic/math/atanpi.cl
    libclc/opencl/lib/generic/math/cbrt.cl
    libclc/opencl/lib/generic/math/ceil.cl
    libclc/opencl/lib/generic/math/copysign.cl
    libclc/opencl/lib/generic/math/cos.cl
    libclc/opencl/lib/generic/math/cosh.cl
    libclc/opencl/lib/generic/math/cospi.cl
    libclc/opencl/lib/generic/math/erf.cl
    libclc/opencl/lib/generic/math/erfc.cl
    libclc/opencl/lib/generic/math/exp.cl
    libclc/opencl/lib/generic/math/exp10.cl
    libclc/opencl/lib/generic/math/exp2.cl
    libclc/opencl/lib/generic/math/expm1.cl
    libclc/opencl/lib/generic/math/fabs.cl
    libclc/opencl/lib/generic/math/fdim.cl
    libclc/opencl/lib/generic/math/floor.cl
    libclc/opencl/lib/generic/math/fma.cl
    libclc/opencl/lib/generic/math/fmax.cl
    libclc/opencl/lib/generic/math/fmin.cl
    libclc/opencl/lib/generic/math/fmod.cl
    libclc/opencl/lib/generic/math/fract.cl
    libclc/opencl/lib/generic/math/frexp.cl
    libclc/opencl/lib/generic/math/half_cos.cl
    libclc/opencl/lib/generic/math/half_divide.cl
    libclc/opencl/lib/generic/math/half_exp.cl
    libclc/opencl/lib/generic/math/half_exp10.cl
    libclc/opencl/lib/generic/math/half_exp2.cl
    libclc/opencl/lib/generic/math/half_log.cl
    libclc/opencl/lib/generic/math/half_log10.cl
    libclc/opencl/lib/generic/math/half_log2.cl
    libclc/opencl/lib/generic/math/half_powr.cl
    libclc/opencl/lib/generic/math/half_recip.cl
    libclc/opencl/lib/generic/math/half_rsqrt.cl
    libclc/opencl/lib/generic/math/half_sin.cl
    libclc/opencl/lib/generic/math/half_sqrt.cl
    libclc/opencl/lib/generic/math/half_tan.cl
    libclc/opencl/lib/generic/math/hypot.cl
    libclc/opencl/lib/generic/math/ilogb.cl
    libclc/opencl/lib/generic/math/ldexp.cl
    libclc/opencl/lib/generic/math/lgamma.cl
    libclc/opencl/lib/generic/math/lgamma_r.cl
    libclc/opencl/lib/generic/math/log.cl
    libclc/opencl/lib/generic/math/log10.cl
    libclc/opencl/lib/generic/math/log1p.cl
    libclc/opencl/lib/generic/math/log2.cl
    libclc/opencl/lib/generic/math/logb.cl
    libclc/opencl/lib/generic/math/mad.cl
    libclc/opencl/lib/generic/math/maxmag.cl
    libclc/opencl/lib/generic/math/minmag.cl
    libclc/opencl/lib/generic/math/modf.cl
    libclc/opencl/lib/generic/math/nan.cl
    libclc/opencl/lib/generic/math/native_cos.cl
    libclc/opencl/lib/generic/math/native_divide.cl
    libclc/opencl/lib/generic/math/native_exp.cl
    libclc/opencl/lib/generic/math/native_exp10.cl
    libclc/opencl/lib/generic/math/native_exp2.cl
    libclc/opencl/lib/generic/math/native_log.cl
    libclc/opencl/lib/generic/math/native_log10.cl
    libclc/opencl/lib/generic/math/native_log2.cl
    libclc/opencl/lib/generic/math/native_powr.cl
    libclc/opencl/lib/generic/math/native_recip.cl
    libclc/opencl/lib/generic/math/native_rsqrt.cl
    libclc/opencl/lib/generic/math/native_sin.cl
    libclc/opencl/lib/generic/math/native_sqrt.cl
    libclc/opencl/lib/generic/math/native_tan.cl
    libclc/opencl/lib/generic/math/nextafter.cl
    libclc/opencl/lib/generic/math/pow.cl
    libclc/opencl/lib/generic/math/pown.cl
    libclc/opencl/lib/generic/math/powr.cl
    libclc/opencl/lib/generic/math/remainder.cl
    libclc/opencl/lib/generic/math/remquo.cl
    libclc/opencl/lib/generic/math/rint.cl
    libclc/opencl/lib/generic/math/rootn.cl
    libclc/opencl/lib/generic/math/round.cl
    libclc/opencl/lib/generic/math/rsqrt.cl
    libclc/opencl/lib/generic/math/sin.cl
    libclc/opencl/lib/generic/math/sincos.cl
    libclc/opencl/lib/generic/math/sinh.cl
    libclc/opencl/lib/generic/math/sinpi.cl
    libclc/opencl/lib/generic/math/sqrt.cl
    libclc/opencl/lib/generic/math/tan.cl
    libclc/opencl/lib/generic/math/tanh.cl
    libclc/opencl/lib/generic/math/tanpi.cl
    libclc/opencl/lib/generic/math/tgamma.cl
    libclc/opencl/lib/generic/math/trunc.cl
    libclc/opencl/lib/generic/mem_fence/fence.cl
    libclc/opencl/lib/generic/misc/shuffle.cl
    libclc/opencl/lib/generic/misc/shuffle2.cl
    libclc/opencl/lib/generic/relational/all.cl
    libclc/opencl/lib/generic/relational/any.cl
    libclc/opencl/lib/generic/relational/binary_def.inc
    libclc/opencl/lib/generic/relational/bitselect.cl
    libclc/opencl/lib/generic/relational/isequal.cl
    libclc/opencl/lib/generic/relational/isfinite.cl
    libclc/opencl/lib/generic/relational/isgreater.cl
    libclc/opencl/lib/generic/relational/isgreaterequal.cl
    libclc/opencl/lib/generic/relational/isinf.cl
    libclc/opencl/lib/generic/relational/isless.cl
    libclc/opencl/lib/generic/relational/islessequal.cl
    libclc/opencl/lib/generic/relational/islessgreater.cl
    libclc/opencl/lib/generic/relational/isnan.cl
    libclc/opencl/lib/generic/relational/isnormal.cl
    libclc/opencl/lib/generic/relational/isnotequal.cl
    libclc/opencl/lib/generic/relational/isordered.cl
    libclc/opencl/lib/generic/relational/isunordered.cl
    libclc/opencl/lib/generic/relational/select.cl
    libclc/opencl/lib/generic/relational/signbit.cl
    libclc/opencl/lib/generic/relational/unary_def.inc
    libclc/opencl/lib/generic/shared/clamp.cl
    libclc/opencl/lib/generic/shared/max.cl
    libclc/opencl/lib/generic/shared/min.cl
    libclc/opencl/lib/generic/shared/vload.cl
    libclc/opencl/lib/generic/shared/vstore.cl
    libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl
    libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl
    libclc/opencl/lib/generic/subnormal_config.cl
    libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl
    libclc/opencl/lib/generic/workitem/get_global_id.cl
    libclc/opencl/lib/generic/workitem/get_global_offset.cl
    libclc/opencl/lib/generic/workitem/get_group_id.cl
    libclc/opencl/lib/generic/workitem/get_local_id.cl
    libclc/opencl/lib/generic/workitem/get_local_size.cl
    libclc/opencl/lib/generic/workitem/get_num_groups.cl
    libclc/opencl/lib/generic/workitem/get_work_dim.cl

Removed: 
    


################################################################################
diff  --git a/libclc/clc/include/clc/address_space/clc_qualifier.h b/libclc/clc/include/clc/address_space/clc_qualifier.h
index e495f18012684..28b8ab33d5df8 100644
--- a/libclc/clc/include/clc/address_space/clc_qualifier.h
+++ b/libclc/clc/include/clc/address_space/clc_qualifier.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_ADDRESS_SPACE_CLC_QUALIFIER_H__
 #define __CLC_ADDRESS_SPACE_CLC_QUALIFIER_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #if _CLC_GENERIC_AS_SUPPORTED
 

diff  --git a/libclc/clc/include/clc/async/clc_prefetch.h b/libclc/clc/include/clc/async/clc_prefetch.h
index c5331bc2150ac..a416d97fa0ae7 100644
--- a/libclc/clc/include/clc/async/clc_prefetch.h
+++ b/libclc/clc/include/clc/async/clc_prefetch.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_ASYNC_CLC_PREFETCH_H__
 #define __CLC_ASYNC_CLC_PREFETCH_H__
 
-#define __CLC_BODY "clc/async/clc_prefetch.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/async/clc_prefetch.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/async/clc_prefetch.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/async/clc_prefetch.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_ASYNC_CLC_PREFETCH_H__

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
index 5c68b21929c45..31b8167223502 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
@@ -9,16 +9,16 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_compare_exchange
 #define __CLC_COMPARE_EXCHANGE
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_COMPARE_EXCHANGE
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_dec.h b/libclc/clc/include/clc/atomic/clc_atomic_dec.h
index faef087ff4b54..66302b6b9ade2 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_dec.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_dec.h
@@ -9,13 +9,13 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_DEC_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_DEC_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_dec
 #define __CLC_NO_VALUE_ARG
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_NO_VALUE_ARG
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
index 6b4c743ec0114..321cfb4030851 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
@@ -9,15 +9,15 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_exchange
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
index 47a07ff5adae6..4ef29fce50af8 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
@@ -9,15 +9,15 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_add
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
index 4c3099a8fd3de..688c11287db50 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
@@ -9,12 +9,12 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_and
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
index 9752ed217442f..a4e44b88a697f 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
@@ -9,15 +9,15 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_max
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
index a19b053909207..b58b538649e19 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
@@ -9,15 +9,15 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_min
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
index f574895d91eca..ab303cc673ba2 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
@@ -9,12 +9,12 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_or
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
index dfb98d18dbf2a..d9deae085a61e 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
@@ -9,15 +9,15 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_sub
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
index 4cd6293e7bc5e..fe13a641fc1cd 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
@@ -9,12 +9,12 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_xor
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
index ea17a2f350c09..fee7c0506abc1 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_DECLARE_ATOMIC_FLAG_CLEAR(ADDRSPACE)                             \
   _CLC_OVERLOAD _CLC_DECL void __clc_atomic_flag_clear(                        \

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
index 8cf4c8e3ec836..afc373204ad70 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_DECLARE_ATOMIC_FLAG_TEST_AND_SET(ADDRSPACE)                      \
   _CLC_OVERLOAD _CLC_DECL bool __clc_atomic_flag_test_and_set(                 \

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_inc.h b/libclc/clc/include/clc/atomic/clc_atomic_inc.h
index fb81c2c56fc05..c6fcdad30949b 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_inc.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_inc.h
@@ -9,13 +9,13 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_INC_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_INC_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_inc
 #define __CLC_NO_VALUE_ARG
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_NO_VALUE_ARG
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_load.h b/libclc/clc/include/clc/atomic/clc_atomic_load.h
index da8c0d99e7d0c..3abfce86b1947 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_load.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_load.h
@@ -9,16 +9,16 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_load
 #define __CLC_NO_VALUE_ARG
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_NO_VALUE_ARG
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/atomic/clc_atomic_store.h b/libclc/clc/include/clc/atomic/clc_atomic_store.h
index 78698db9786b3..94d77621735d0 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_store.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_store.h
@@ -9,16 +9,16 @@
 #ifndef __CLC_ATOMIC_CLC_ATOMIC_STORE_H__
 #define __CLC_ATOMIC_CLC_ATOMIC_STORE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_atomic_store
 #define __CLC_RETURN_VOID
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/atomic/atomic_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/atomic/atomic_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_RETURN_VOID
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/clc_convert.h b/libclc/clc/include/clc/clc_convert.h
index 544b2bbdf3960..97cfa667c8b16 100644
--- a/libclc/clc/include/clc/clc_convert.h
+++ b/libclc/clc/include/clc/clc_convert.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_CLC_CONVERT_H__
 #define __CLC_CLC_CONVERT_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define _CLC_CONVERT_DECL(FROM_TYPE, TO_TYPE, SUFFIX)                          \
   _CLC_OVERLOAD _CLC_DECL TO_TYPE __clc_convert_##TO_TYPE##SUFFIX(FROM_TYPE x);

diff  --git a/libclc/clc/include/clc/collective/clc_work_group_broadcast.h b/libclc/clc/include/clc/collective/clc_work_group_broadcast.h
index 5d8e7fee3ae23..b8a5a1dff1f31 100644
--- a/libclc/clc/include/clc/collective/clc_work_group_broadcast.h
+++ b/libclc/clc/include/clc/collective/clc_work_group_broadcast.h
@@ -11,10 +11,10 @@
 
 #include "clc/internal/clc.h"
 
-#define __CLC_BODY "clc/collective/clc_work_group_broadcast.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/collective/clc_work_group_broadcast.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/collective/clc_work_group_broadcast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/collective/clc_work_group_broadcast.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_COLLECTIVE_CLC_WORK_GROUP_BROADCAST_H__

diff  --git a/libclc/clc/include/clc/collective/clc_work_group_reduce.h b/libclc/clc/include/clc/collective/clc_work_group_reduce.h
index 1efd367d3b688..5b78ead50370b 100644
--- a/libclc/clc/include/clc/collective/clc_work_group_reduce.h
+++ b/libclc/clc/include/clc/collective/clc_work_group_reduce.h
@@ -11,10 +11,10 @@
 
 #include "clc/internal/clc.h"
 
-#define __CLC_BODY "clc/collective/clc_work_group_reduce.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/collective/clc_work_group_reduce.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/collective/clc_work_group_reduce.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/collective/clc_work_group_reduce.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_COLLECTIVE_CLC_WORK_GROUP_REDUCE_H__

diff  --git a/libclc/clc/include/clc/common/clc_degrees.h b/libclc/clc/include/clc/common/clc_degrees.h
index d1ccb61fc7baf..5f04fac1f2612 100644
--- a/libclc/clc/include/clc/common/clc_degrees.h
+++ b/libclc/clc/include/clc/common/clc_degrees.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_COMMON_CLC_DEGREES_H__
 #define __CLC_COMMON_CLC_DEGREES_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_degrees
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/common/clc_radians.h b/libclc/clc/include/clc/common/clc_radians.h
index f391a1cf79bd8..03d7c4b9e3014 100644
--- a/libclc/clc/include/clc/common/clc_radians.h
+++ b/libclc/clc/include/clc/common/clc_radians.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_COMMON_CLC_RADIANS_H__
 #define __CLC_COMMON_CLC_RADIANS_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_radians
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/common/clc_sign.h b/libclc/clc/include/clc/common/clc_sign.h
index 1d59579a3fcbd..9737f1e54441b 100644
--- a/libclc/clc/include/clc/common/clc_sign.h
+++ b/libclc/clc/include/clc/common/clc_sign.h
@@ -10,9 +10,9 @@
 #define __CLC_COMMON_CLC_SIGN_H__
 
 #define __CLC_FUNCTION __clc_sign
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/common/clc_smoothstep.h b/libclc/clc/include/clc/common/clc_smoothstep.h
index 9cd518f682a22..80a28a1bbb1f8 100644
--- a/libclc/clc/include/clc/common/clc_smoothstep.h
+++ b/libclc/clc/include/clc/common/clc_smoothstep.h
@@ -12,7 +12,7 @@
 // note: Unlike OpenCL __clc_smoothstep is only defined for three matching
 // argument types.
 
-#define __CLC_BODY "clc/common/clc_smoothstep.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/common/clc_smoothstep.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_COMMON_CLC_SMOOTHSTEP_H__

diff  --git a/libclc/clc/include/clc/common/clc_step.h b/libclc/clc/include/clc/common/clc_step.h
index a4b0f2c9cb50b..6b093d06896c0 100644
--- a/libclc/clc/include/clc/common/clc_step.h
+++ b/libclc/clc/include/clc/common/clc_step.h
@@ -10,9 +10,9 @@
 #define __CLC_COMMON_CLC_STEP_H__
 
 #define __CLC_FUNCTION __clc_step
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/binary_def.inc b/libclc/clc/include/clc/geometric/binary_def.inc
index c29d85ff9a3a6..bbd4f57980023 100644
--- a/libclc/clc/include/clc/geometric/binary_def.inc
+++ b/libclc/clc/include/clc/geometric/binary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/geometric/clc_cross.h b/libclc/clc/include/clc/geometric/clc_cross.h
index cf9d35c3d0267..c0a9cacbc3383 100644
--- a/libclc/clc/include/clc/geometric/clc_cross.h
+++ b/libclc/clc/include/clc/geometric/clc_cross.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_GEOMETRIC_CLC_CROSS_H__
 #define __CLC_GEOMETRIC_CLC_CROSS_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL float3 __clc_cross(float3 p0, float3 p1);
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL float4 __clc_cross(float4 p0, float4 p1);

diff  --git a/libclc/clc/include/clc/geometric/clc_distance.h b/libclc/clc/include/clc/geometric/clc_distance.h
index 701331463f445..1acea411a08b6 100644
--- a/libclc/clc/include/clc/geometric/clc_distance.h
+++ b/libclc/clc/include/clc/geometric/clc_distance.h
@@ -10,9 +10,9 @@
 #define __CLC_GEOMETRIC_CLC_DISTANCE_H__
 
 #define __CLC_FUNCTION __clc_distance
-#define __CLC_BODY "clc/geometric/binary_decl.inc"
+#define __CLC_BODY <clc/geometric/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/clc_dot.h b/libclc/clc/include/clc/geometric/clc_dot.h
index c691778c538b4..a5a97d1bdd2bc 100644
--- a/libclc/clc/include/clc/geometric/clc_dot.h
+++ b/libclc/clc/include/clc/geometric/clc_dot.h
@@ -10,9 +10,9 @@
 #define __CLC_GEOMETRIC_CLC_DOT_H__
 
 #define __CLC_FUNCTION __clc_dot
-#define __CLC_BODY "clc/geometric/binary_decl.inc"
+#define __CLC_BODY <clc/geometric/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/clc_fast_distance.h b/libclc/clc/include/clc/geometric/clc_fast_distance.h
index 424c0db737523..47292130e9d68 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_distance.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_distance.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_fast_distance
-#define __CLC_BODY "clc/geometric/binary_decl.inc"
+#define __CLC_BODY <clc/geometric/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/clc_fast_length.h b/libclc/clc/include/clc/geometric/clc_fast_length.h
index ebc8b86dca316..2244d8c77feaa 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_length.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_length.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_fast_length
-#define __CLC_BODY "clc/geometric/unary_decl.inc"
+#define __CLC_BODY <clc/geometric/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/clc_fast_normalize.h b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
index a6e77bb66a8b5..ee9747c1af1e3 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_normalize.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
@@ -12,8 +12,8 @@
 #define __CLC_FLOAT_ONLY
 #define __CLC_GEOMETRIC_RET_GENTYPE
 #define __CLC_FUNCTION __clc_fast_normalize
-#define __CLC_BODY "clc/geometric/unary_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/unary_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 #undef __CLC_GEOMETRIC_RET_GENTYPE

diff  --git a/libclc/clc/include/clc/geometric/clc_length.h b/libclc/clc/include/clc/geometric/clc_length.h
index 5997d1e601444..f8ce12db07871 100644
--- a/libclc/clc/include/clc/geometric/clc_length.h
+++ b/libclc/clc/include/clc/geometric/clc_length.h
@@ -10,9 +10,9 @@
 #define __CLC_GEOMETRIC_CLC_LENGTH_H__
 
 #define __CLC_FUNCTION __clc_length
-#define __CLC_BODY "clc/geometric/unary_decl.inc"
+#define __CLC_BODY <clc/geometric/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/geometric/clc_normalize.h b/libclc/clc/include/clc/geometric/clc_normalize.h
index 59edff3fd7017..3058a72b2bbbe 100644
--- a/libclc/clc/include/clc/geometric/clc_normalize.h
+++ b/libclc/clc/include/clc/geometric/clc_normalize.h
@@ -11,8 +11,8 @@
 
 #define __CLC_GEOMETRIC_RET_GENTYPE
 #define __CLC_FUNCTION __clc_normalize
-#define __CLC_BODY "clc/geometric/unary_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/unary_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 #undef __CLC_GEOMETRIC_RET_GENTYPE

diff  --git a/libclc/clc/include/clc/geometric/unary_def.inc b/libclc/clc/include/clc/geometric/unary_def.inc
index dab8a59ace512..78c144b35af2c 100644
--- a/libclc/clc/include/clc/geometric/unary_def.inc
+++ b/libclc/clc/include/clc/geometric/unary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/integer/clc_abs.h b/libclc/clc/include/clc/integer/clc_abs.h
index 5eccf33993e5d..a3474dbe7d824 100644
--- a/libclc/clc/include/clc/integer/clc_abs.h
+++ b/libclc/clc/include/clc/integer/clc_abs.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_INTEGER_CLC_ABS_H__
 #define __CLC_INTEGER_CLC_ABS_H__
 
-#define __CLC_BODY "clc/integer/clc_abs.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/integer/clc_abs.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // __CLC_INTEGER_CLC_ABS_H__

diff  --git a/libclc/clc/include/clc/integer/clc_abs_
diff .h b/libclc/clc/include/clc/integer/clc_abs_
diff .h
index a980cd0fc91c5..1bad6dc0f469d 100644
--- a/libclc/clc/include/clc/integer/clc_abs_
diff .h
+++ b/libclc/clc/include/clc/integer/clc_abs_
diff .h
@@ -9,7 +9,7 @@
 #ifndef __CLC_INTEGER_CLC_ABS_DIFF_H__
 #define __CLC_INTEGER_CLC_ABS_DIFF_H__
 
-#define __CLC_BODY "clc/integer/clc_abs_
diff .inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/integer/clc_abs_
diff .inc>
+#include <clc/integer/gentype.inc>
 
 #endif // __CLC_INTEGER_CLC_ABS_DIFF_H__

diff  --git a/libclc/clc/include/clc/integer/clc_add_sat.h b/libclc/clc/include/clc/integer/clc_add_sat.h
index 24ef9d4b6e5d1..8c3495f6c5193 100644
--- a/libclc/clc/include/clc/integer/clc_add_sat.h
+++ b/libclc/clc/include/clc/integer/clc_add_sat.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_ADD_SAT_H__
 
 #define __CLC_FUNCTION __clc_add_sat
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_bit_reverse.h b/libclc/clc/include/clc/integer/clc_bit_reverse.h
index 3be068bb0cb72..de0c354b3fa4e 100644
--- a/libclc/clc/include/clc/integer/clc_bit_reverse.h
+++ b/libclc/clc/include/clc/integer/clc_bit_reverse.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_BIT_REVERSE_H__
 
 #define __CLC_FUNCTION __clc_bit_reverse
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
index 7b2175b597dbf..7998196512b30 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
@@ -9,13 +9,13 @@
 #ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
 #define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_bitfield_extract_signed
 #define __CLC_RETTYPE __CLC_S_GENTYPE
 
-#define __CLC_BODY "clc/integer/clc_bitfield_extract_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/integer/clc_bitfield_extract_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_RETTYPE
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
index 8e459cc7e2d62..84614056417f4 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
@@ -9,13 +9,13 @@
 #ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
 #define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_bitfield_extract_unsigned
 #define __CLC_RETTYPE __CLC_U_GENTYPE
 
-#define __CLC_BODY "clc/integer/clc_bitfield_extract_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/integer/clc_bitfield_extract_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_RETTYPE
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/integer/clc_bitfield_insert.h b/libclc/clc/include/clc/integer/clc_bitfield_insert.h
index f74a267de6c00..b284c0bf932d5 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_insert.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_insert.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_INTEGER_CLC_BITFIELD_INSERT_H__
 #define __CLC_INTEGER_CLC_BITFIELD_INSERT_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_bitfield_insert
-#define __CLC_BODY "clc/integer/clc_bitfield_insert.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/integer/clc_bitfield_insert.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // __CLC_INTEGER_CLC_BITFIELD_INSERT_H__

diff  --git a/libclc/clc/include/clc/integer/clc_clz.h b/libclc/clc/include/clc/integer/clc_clz.h
index b30004b21de59..dd62cc935f8cd 100644
--- a/libclc/clc/include/clc/integer/clc_clz.h
+++ b/libclc/clc/include/clc/integer/clc_clz.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_CLZ_H__
 
 #define __CLC_FUNCTION __clc_clz
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_ctz.h b/libclc/clc/include/clc/integer/clc_ctz.h
index 1f505e5676a79..3f2079e023f67 100644
--- a/libclc/clc/include/clc/integer/clc_ctz.h
+++ b/libclc/clc/include/clc/integer/clc_ctz.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_CTZ_H__
 
 #define __CLC_FUNCTION __clc_ctz
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_hadd.h b/libclc/clc/include/clc/integer/clc_hadd.h
index 548414592425f..679369d3c9d4e 100644
--- a/libclc/clc/include/clc/integer/clc_hadd.h
+++ b/libclc/clc/include/clc/integer/clc_hadd.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_HADD_H__
 
 #define __CLC_FUNCTION __clc_hadd
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_mad24.h b/libclc/clc/include/clc/integer/clc_mad24.h
index 1376a13b544c1..e19bd905d22eb 100644
--- a/libclc/clc/include/clc/integer/clc_mad24.h
+++ b/libclc/clc/include/clc/integer/clc_mad24.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_MAD24_H__
 
 #define __CLC_FUNCTION __clc_mad24
-#define __CLC_BODY "clc/shared/ternary_decl.inc"
+#define __CLC_BODY <clc/shared/ternary_decl.inc>
 
-#include "clc/integer/gentype24.inc"
+#include <clc/integer/gentype24.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_mad_hi.h b/libclc/clc/include/clc/integer/clc_mad_hi.h
index bef85050fb76d..07e8c0bb6beec 100644
--- a/libclc/clc/include/clc/integer/clc_mad_hi.h
+++ b/libclc/clc/include/clc/integer/clc_mad_hi.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_INTEGER_CLC_MAD_HI_H__
 #define __CLC_INTEGER_CLC_MAD_HI_H__
 
-#include "clc/integer/clc_mul_hi.h"
+#include <clc/integer/clc_mul_hi.h>
 
 #define __clc_mad_hi(a, b, c) (__clc_mul_hi((a), (b)) + (c))
 

diff  --git a/libclc/clc/include/clc/integer/clc_mad_sat.h b/libclc/clc/include/clc/integer/clc_mad_sat.h
index 3002f18b276e2..845378b3e7c46 100644
--- a/libclc/clc/include/clc/integer/clc_mad_sat.h
+++ b/libclc/clc/include/clc/integer/clc_mad_sat.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_MAD_SAT_H__
 
 #define __CLC_FUNCTION __clc_mad_sat
-#define __CLC_BODY "clc/shared/ternary_decl.inc"
+#define __CLC_BODY <clc/shared/ternary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_mul24.h b/libclc/clc/include/clc/integer/clc_mul24.h
index 004b49038aba8..f813de55c71e5 100644
--- a/libclc/clc/include/clc/integer/clc_mul24.h
+++ b/libclc/clc/include/clc/integer/clc_mul24.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_MUL24_H__
 
 #define __CLC_FUNCTION __clc_mul24
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype24.inc"
+#include <clc/integer/gentype24.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_mul_hi.h b/libclc/clc/include/clc/integer/clc_mul_hi.h
index a771098151668..e4738e5570e81 100644
--- a/libclc/clc/include/clc/integer/clc_mul_hi.h
+++ b/libclc/clc/include/clc/integer/clc_mul_hi.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_MUL_HI_H__
 
 #define __CLC_FUNCTION __clc_mul_hi
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_popcount.h b/libclc/clc/include/clc/integer/clc_popcount.h
index 3233487d223c9..55ca6ccfcec28 100644
--- a/libclc/clc/include/clc/integer/clc_popcount.h
+++ b/libclc/clc/include/clc/integer/clc_popcount.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_POPCOUNT_H__
 
 #define __CLC_FUNCTION __clc_popcount
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_INTRINSIC
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/include/clc/integer/clc_rhadd.h b/libclc/clc/include/clc/integer/clc_rhadd.h
index 4534233f917dd..b8b0b1a3a56ed 100644
--- a/libclc/clc/include/clc/integer/clc_rhadd.h
+++ b/libclc/clc/include/clc/integer/clc_rhadd.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_RHADD_H__
 
 #define __CLC_FUNCTION __clc_rhadd
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_rotate.h b/libclc/clc/include/clc/integer/clc_rotate.h
index c13f33c198c03..513bf98526233 100644
--- a/libclc/clc/include/clc/integer/clc_rotate.h
+++ b/libclc/clc/include/clc/integer/clc_rotate.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_ROTATE_H__
 
 #define __CLC_FUNCTION __clc_rotate
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_sub_sat.h b/libclc/clc/include/clc/integer/clc_sub_sat.h
index 62b167e756d43..94a5484adefcf 100644
--- a/libclc/clc/include/clc/integer/clc_sub_sat.h
+++ b/libclc/clc/include/clc/integer/clc_sub_sat.h
@@ -10,9 +10,9 @@
 #define __CLC_INTEGER_CLC_SUB_SAT_H__
 
 #define __CLC_FUNCTION __clc_sub_sat
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/integer/clc_upsample.h b/libclc/clc/include/clc/integer/clc_upsample.h
index 9380cc32616b3..ca3b8a9102991 100644
--- a/libclc/clc/include/clc/integer/clc_upsample.h
+++ b/libclc/clc/include/clc/integer/clc_upsample.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_INTEGER_CLC_UPSAMPLE_H__
 #define __CLC_INTEGER_CLC_UPSAMPLE_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define __CLC_UPSAMPLE_DECL(BGENTYPE, GENTYPE, UGENTYPE)                       \
   _CLC_OVERLOAD _CLC_DECL BGENTYPE __clc_upsample(GENTYPE hi, UGENTYPE lo);

diff  --git a/libclc/clc/include/clc/integer/gentype.inc b/libclc/clc/include/clc/integer/gentype.inc
index 74c1ce7cd311f..36d7ae95d1742 100644
--- a/libclc/clc/include/clc/integer/gentype.inc
+++ b/libclc/clc/include/clc/integer/gentype.inc
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clcfunc.h"
-#include "clc/utils.h"
+#include <clc/clcfunc.h>
+#include <clc/utils.h>
 
 #define __CLC_AS_GENTYPE __CLC_XCONCAT(__clc_as_, __CLC_GENTYPE)
 #define __CLC_CONVERT_GENTYPE __CLC_XCONCAT(__clc_convert_, __CLC_GENTYPE)

diff  --git a/libclc/clc/include/clc/integer/gentype24.inc b/libclc/clc/include/clc/integer/gentype24.inc
index c6dd9a1063d8a..c74ce0c3bab47 100644
--- a/libclc/clc/include/clc/integer/gentype24.inc
+++ b/libclc/clc/include/clc/integer/gentype24.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define __CLC_GENSIZE 32
 #undef __CLC_SCALAR_GENTYPE

diff  --git a/libclc/clc/include/clc/internal/clc.h b/libclc/clc/include/clc/internal/clc.h
index 99ce15309fdd3..fcfb223d5a12d 100644
--- a/libclc/clc/include/clc/internal/clc.h
+++ b/libclc/clc/include/clc/internal/clc.h
@@ -24,12 +24,12 @@
 #endif
 
 /* Function Attributes */
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 /* 6.1 Supported Data Types */
 
 /* 6.2.4.2 Reinterpreting Types Using __clc_as_type() and __clc_as_typen() */
-#include "clc/clc_as_type.h"
+#include <clc/clc_as_type.h>
 
 #pragma OPENCL EXTENSION all : disable
 

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 55718f26b0376..4338fb01861c1 100644
--- a/libclc/clc/include/clc/internal/math/clc_sw_fma.h
+++ b/libclc/clc/include/clc/internal/math/clc_sw_fma.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FUNCTION __clc_sw_fma
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc/shared/ternary_decl.inc"
+#define __CLC_BODY <clc/shared/ternary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_acos.h b/libclc/clc/include/clc/math/clc_acos.h
index 653f5ce1e6d51..1d484fa5b56c9 100644
--- a/libclc/clc/include/clc/math/clc_acos.h
+++ b/libclc/clc/include/clc/math/clc_acos.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ACOS_H__
 #define __CLC_MATH_CLC_ACOS_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_acos
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_acosh.h b/libclc/clc/include/clc/math/clc_acosh.h
index ce866c33a6283..9492724bb27ba 100644
--- a/libclc/clc/include/clc/math/clc_acosh.h
+++ b/libclc/clc/include/clc/math/clc_acosh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ACOSH_H__
 #define __CLC_MATH_CLC_ACOSH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_acosh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_acospi.h b/libclc/clc/include/clc/math/clc_acospi.h
index 8221b20e6cb13..90cfc06b7dffb 100644
--- a/libclc/clc/include/clc/math/clc_acospi.h
+++ b/libclc/clc/include/clc/math/clc_acospi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ACOSPI_H__
 #define __CLC_MATH_CLC_ACOSPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_acospi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_asin.h b/libclc/clc/include/clc/math/clc_asin.h
index ec87b576026b2..f6246c49f8022 100644
--- a/libclc/clc/include/clc/math/clc_asin.h
+++ b/libclc/clc/include/clc/math/clc_asin.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ASIN_H__
 #define __CLC_MATH_CLC_ASIN_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_asin
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_asinh.h b/libclc/clc/include/clc/math/clc_asinh.h
index 2b08649ad591a..05e44fa438cee 100644
--- a/libclc/clc/include/clc/math/clc_asinh.h
+++ b/libclc/clc/include/clc/math/clc_asinh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ASINH_H__
 #define __CLC_MATH_CLC_ASINH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_asinh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_asinpi.h b/libclc/clc/include/clc/math/clc_asinpi.h
index 0798677edf078..8f308dd06022e 100644
--- a/libclc/clc/include/clc/math/clc_asinpi.h
+++ b/libclc/clc/include/clc/math/clc_asinpi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ASINPI_H__
 #define __CLC_MATH_CLC_ASINPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_asinpi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_atan.h b/libclc/clc/include/clc/math/clc_atan.h
index d242cc5faab13..203e46c2b8a4a 100644
--- a/libclc/clc/include/clc/math/clc_atan.h
+++ b/libclc/clc/include/clc/math/clc_atan.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ATAN_H__
 #define __CLC_MATH_CLC_ATAN_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_atan
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_atan2.h b/libclc/clc/include/clc/math/clc_atan2.h
index cffef6bd34afa..6edc9dda48f4d 100644
--- a/libclc/clc/include/clc/math/clc_atan2.h
+++ b/libclc/clc/include/clc/math/clc_atan2.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ATAN2_H__
 #define __CLC_MATH_CLC_ATAN2_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_atan2
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_atan2pi.h b/libclc/clc/include/clc/math/clc_atan2pi.h
index b26c7c66ab287..2f26d1d9ae985 100644
--- a/libclc/clc/include/clc/math/clc_atan2pi.h
+++ b/libclc/clc/include/clc/math/clc_atan2pi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ATAN2PI_H__
 #define __CLC_MATH_CLC_ATAN2PI_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_atan2pi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_atanh.h b/libclc/clc/include/clc/math/clc_atanh.h
index 26eedfdfcddfa..85f9fc53be1a6 100644
--- a/libclc/clc/include/clc/math/clc_atanh.h
+++ b/libclc/clc/include/clc/math/clc_atanh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ATANH_H__
 #define __CLC_MATH_CLC_ATANH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_atanh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_atanpi.h b/libclc/clc/include/clc/math/clc_atanpi.h
index 3a3efa9177369..2b3c6b373ed42 100644
--- a/libclc/clc/include/clc/math/clc_atanpi.h
+++ b/libclc/clc/include/clc/math/clc_atanpi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ATANPI_H__
 #define __CLC_MATH_CLC_ATANPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_atanpi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_cbrt.h b/libclc/clc/include/clc/math/clc_cbrt.h
index 2a1caa3720b6e..fd9b750c8fd89 100644
--- a/libclc/clc/include/clc/math/clc_cbrt.h
+++ b/libclc/clc/include/clc/math/clc_cbrt.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_CBRT_H__
 #define __CLC_MATH_CLC_CBRT_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_cbrt
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_ceil.h b/libclc/clc/include/clc/math/clc_ceil.h
index d48cb3bca94bb..45668224c6176 100644
--- a/libclc/clc/include/clc/math/clc_ceil.h
+++ b/libclc/clc/include/clc/math/clc_ceil.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_CEIL_H__
 #define __CLC_MATH_CLC_CEIL_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_ceil
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_copysign.h b/libclc/clc/include/clc/math/clc_copysign.h
index 7d1f29212afc1..563dd2827839a 100644
--- a/libclc/clc/include/clc/math/clc_copysign.h
+++ b/libclc/clc/include/clc/math/clc_copysign.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_COPYSIGN_H__
 #define __CLC_MATH_CLC_COPYSIGN_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_copysign
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_cos.h b/libclc/clc/include/clc/math/clc_cos.h
index a116566fd62ef..44681608efc37 100644
--- a/libclc/clc/include/clc/math/clc_cos.h
+++ b/libclc/clc/include/clc/math/clc_cos.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_COS_H__
 #define __CLC_MATH_CLC_COS_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_cos
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_cosh.h b/libclc/clc/include/clc/math/clc_cosh.h
index fee11e577dc36..7bcfa2ea26e06 100644
--- a/libclc/clc/include/clc/math/clc_cosh.h
+++ b/libclc/clc/include/clc/math/clc_cosh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_COSH_H__
 #define __CLC_MATH_CLC_COSH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_cosh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_cospi.h b/libclc/clc/include/clc/math/clc_cospi.h
index 480cea5f55225..4d82100649b01 100644
--- a/libclc/clc/include/clc/math/clc_cospi.h
+++ b/libclc/clc/include/clc/math/clc_cospi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_COSPI_H__
 #define __CLC_MATH_CLC_COSPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_cospi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_div_cr.h b/libclc/clc/include/clc/math/clc_div_cr.h
index bebd6db8119fa..c88dc7573506f 100644
--- a/libclc/clc/include/clc/math/clc_div_cr.h
+++ b/libclc/clc/include/clc/math/clc_div_cr.h
@@ -17,9 +17,9 @@
 // correctly rounded and opencl precision versions.
 
 #define __CLC_FUNCTION __clc_div_cr
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_div_fast.h b/libclc/clc/include/clc/math/clc_div_fast.h
index b9368b10cb804..357bac4adc3d9 100644
--- a/libclc/clc/include/clc/math/clc_div_fast.h
+++ b/libclc/clc/include/clc/math/clc_div_fast.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_DIV_FAST_H__
 
 #define __CLC_FUNCTION __clc_div_fast
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_ep_log.h b/libclc/clc/include/clc/math/clc_ep_log.h
index b1d649dafd328..855e2f2b3300e 100644
--- a/libclc/clc/include/clc/math/clc_ep_log.h
+++ b/libclc/clc/include/clc/math/clc_ep_log.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_MATH_CLC_EP_LOG_H__
 #define __CLC_MATH_CLC_EP_LOG_H__
 
-#define __CLC_BODY "clc/math/clc_ep_log.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/clc_ep_log.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_MATH_CLC_EP_LOG_H__

diff  --git a/libclc/clc/include/clc/math/clc_erf.h b/libclc/clc/include/clc/math/clc_erf.h
index ffb0a329e58cb..01a21b36b352f 100644
--- a/libclc/clc/include/clc/math/clc_erf.h
+++ b/libclc/clc/include/clc/math/clc_erf.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ERF_H__
 #define __CLC_MATH_CLC_ERF_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_erf
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_erfc.h b/libclc/clc/include/clc/math/clc_erfc.h
index 6ea5819807bba..efd581542879f 100644
--- a/libclc/clc/include/clc/math/clc_erfc.h
+++ b/libclc/clc/include/clc/math/clc_erfc.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ERFC_H__
 #define __CLC_MATH_CLC_ERFC_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_erfc
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_exp.h b/libclc/clc/include/clc/math/clc_exp.h
index b60b1f38504fd..84369bb8fbdd6 100644
--- a/libclc/clc/include/clc/math/clc_exp.h
+++ b/libclc/clc/include/clc/math/clc_exp.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_EXP_H__
 #define __CLC_MATH_CLC_EXP_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_exp
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_exp10.h b/libclc/clc/include/clc/math/clc_exp10.h
index 946748e9826cf..500271cb07429 100644
--- a/libclc/clc/include/clc/math/clc_exp10.h
+++ b/libclc/clc/include/clc/math/clc_exp10.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_EXP10_H__
 #define __CLC_MATH_CLC_EXP10_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_exp10
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_exp2.h b/libclc/clc/include/clc/math/clc_exp2.h
index 2ca9b09408d9e..4ad0ddea48a7c 100644
--- a/libclc/clc/include/clc/math/clc_exp2.h
+++ b/libclc/clc/include/clc/math/clc_exp2.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_EXP2_H__
 #define __CLC_MATH_CLC_EXP2_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_exp2
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_exp_helper.h b/libclc/clc/include/clc/math/clc_exp_helper.h
index 8c44526e06371..a2b3f1bebaf49 100644
--- a/libclc/clc/include/clc/math/clc_exp_helper.h
+++ b/libclc/clc/include/clc/math/clc_exp_helper.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_EXP_HELPER
 
 #define __CLC_DOUBLE_ONLY
-#define __CLC_BODY "clc/math/clc_exp_helper.inc"
+#define __CLC_BODY <clc/math/clc_exp_helper.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #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 f117213ac0e55..5c60960ca5b03 100644
--- a/libclc/clc/include/clc/math/clc_expm1.h
+++ b/libclc/clc/include/clc/math/clc_expm1.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_EXPM1_H__
 #define __CLC_MATH_CLC_EXPM1_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_expm1
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fabs.h b/libclc/clc/include/clc/math/clc_fabs.h
index c9439d6eeb9e2..1ef38a8c75957 100644
--- a/libclc/clc/include/clc/math/clc_fabs.h
+++ b/libclc/clc/include/clc/math/clc_fabs.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_FABS_H__
 #define __CLC_MATH_CLC_FABS_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_fabs
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fdim.h b/libclc/clc/include/clc/math/clc_fdim.h
index 7bb0cc9f68f6d..50ad045db62cf 100644
--- a/libclc/clc/include/clc/math/clc_fdim.h
+++ b/libclc/clc/include/clc/math/clc_fdim.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_FDIM_H__
 #define __CLC_MATH_CLC_FDIM_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_fdim
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_floor.h b/libclc/clc/include/clc/math/clc_floor.h
index 9f926df5f2810..d243819e0a42c 100644
--- a/libclc/clc/include/clc/math/clc_floor.h
+++ b/libclc/clc/include/clc/math/clc_floor.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_FLOOR_H__
 #define __CLC_MATH_CLC_FLOOR_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_floor
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fma.h b/libclc/clc/include/clc/math/clc_fma.h
index e8aad41e021b4..5e87f4c470850 100644
--- a/libclc/clc/include/clc/math/clc_fma.h
+++ b/libclc/clc/include/clc/math/clc_fma.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_FMA_H__
 
 #define __CLC_FUNCTION __clc_fma
-#define __CLC_BODY "clc/shared/ternary_decl.inc"
+#define __CLC_BODY <clc/shared/ternary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fmax.h b/libclc/clc/include/clc/math/clc_fmax.h
index 6e1da7734d332..f367a9b6ea1ca 100644
--- a/libclc/clc/include/clc/math/clc_fmax.h
+++ b/libclc/clc/include/clc/math/clc_fmax.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_FMAX_H__
 
 #define __CLC_FUNCTION __clc_fmax
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fmin.h b/libclc/clc/include/clc/math/clc_fmin.h
index 818601124e5d6..47ed3fad2d8c2 100644
--- a/libclc/clc/include/clc/math/clc_fmin.h
+++ b/libclc/clc/include/clc/math/clc_fmin.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_FMIN_H__
 
 #define __CLC_FUNCTION __clc_fmin
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fmod.h b/libclc/clc/include/clc/math/clc_fmod.h
index 46b6f0d84685d..44179babd7fed 100644
--- a/libclc/clc/include/clc/math/clc_fmod.h
+++ b/libclc/clc/include/clc/math/clc_fmod.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_FMOD_H__
 
 #define __CLC_FUNCTION __clc_fmod
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_fract.h b/libclc/clc/include/clc/math/clc_fract.h
index 0a073d5f0290b..af762ecc59ea5 100644
--- a/libclc/clc/include/clc/math/clc_fract.h
+++ b/libclc/clc/include/clc/math/clc_fract.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_FRACT_H__
 
 #define __CLC_FUNCTION __clc_fract
-#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_frexp.h b/libclc/clc/include/clc/math/clc_frexp.h
index 6d256f44973c5..d6ed2754d0d40 100644
--- a/libclc/clc/include/clc/math/clc_frexp.h
+++ b/libclc/clc/include/clc/math/clc_frexp.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_FREXP_H__
 
 #define __CLC_FUNCTION __clc_frexp
-#define __CLC_BODY "clc/math/unary_decl_with_int_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_int_ptr.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_cos.h b/libclc/clc/include/clc/math/clc_half_cos.h
index 1c61c1700411a..d0122987899c3 100644
--- a/libclc/clc/include/clc/math/clc_half_cos.h
+++ b/libclc/clc/include/clc/math/clc_half_cos.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_cos
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_divide.h b/libclc/clc/include/clc/math/clc_half_divide.h
index 96c0735591e56..e5d5cdc9df34e 100644
--- a/libclc/clc/include/clc/math/clc_half_divide.h
+++ b/libclc/clc/include/clc/math/clc_half_divide.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_divide
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_exp.h b/libclc/clc/include/clc/math/clc_half_exp.h
index f2e68e8bc3bee..2284eaf8df360 100644
--- a/libclc/clc/include/clc/math/clc_half_exp.h
+++ b/libclc/clc/include/clc/math/clc_half_exp.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_exp10.h b/libclc/clc/include/clc/math/clc_half_exp10.h
index 9eb5a0884025c..662df93e06855 100644
--- a/libclc/clc/include/clc/math/clc_half_exp10.h
+++ b/libclc/clc/include/clc/math/clc_half_exp10.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp10
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_exp2.h b/libclc/clc/include/clc/math/clc_half_exp2.h
index 6f2a60db220ed..d2af0f2e3fa9a 100644
--- a/libclc/clc/include/clc/math/clc_half_exp2.h
+++ b/libclc/clc/include/clc/math/clc_half_exp2.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp2
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_log.h b/libclc/clc/include/clc/math/clc_half_log.h
index 38cacae95e1a2..8ae30e5abe5f8 100644
--- a/libclc/clc/include/clc/math/clc_half_log.h
+++ b/libclc/clc/include/clc/math/clc_half_log.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_log10.h b/libclc/clc/include/clc/math/clc_half_log10.h
index 2aebff382deb3..fe5248350abad 100644
--- a/libclc/clc/include/clc/math/clc_half_log10.h
+++ b/libclc/clc/include/clc/math/clc_half_log10.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log10
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_log2.h b/libclc/clc/include/clc/math/clc_half_log2.h
index 4d796f282576e..c57aa1bffb335 100644
--- a/libclc/clc/include/clc/math/clc_half_log2.h
+++ b/libclc/clc/include/clc/math/clc_half_log2.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log2
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_powr.h b/libclc/clc/include/clc/math/clc_half_powr.h
index 6b902a95f229a..188b32b8b49c6 100644
--- a/libclc/clc/include/clc/math/clc_half_powr.h
+++ b/libclc/clc/include/clc/math/clc_half_powr.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_powr
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_recip.h b/libclc/clc/include/clc/math/clc_half_recip.h
index e86e9c412e22b..f5f71fa1988c8 100644
--- a/libclc/clc/include/clc/math/clc_half_recip.h
+++ b/libclc/clc/include/clc/math/clc_half_recip.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_recip
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_rsqrt.h b/libclc/clc/include/clc/math/clc_half_rsqrt.h
index d46b161489d82..d5a05ac8b84ac 100644
--- a/libclc/clc/include/clc/math/clc_half_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_rsqrt.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_rsqrt
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_sin.h b/libclc/clc/include/clc/math/clc_half_sin.h
index d4b7b7e628de0..d2d3da9b11dbf 100644
--- a/libclc/clc/include/clc/math/clc_half_sin.h
+++ b/libclc/clc/include/clc/math/clc_half_sin.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_sin
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_sqrt.h b/libclc/clc/include/clc/math/clc_half_sqrt.h
index 89ed5a8bf492a..a54b8122cb15e 100644
--- a/libclc/clc/include/clc/math/clc_half_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_sqrt.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_sqrt
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_half_tan.h b/libclc/clc/include/clc/math/clc_half_tan.h
index 08d77ded73e75..503ebe29c3cec 100644
--- a/libclc/clc/include/clc/math/clc_half_tan.h
+++ b/libclc/clc/include/clc/math/clc_half_tan.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_tan
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_hypot.h b/libclc/clc/include/clc/math/clc_hypot.h
index 82acffa2f013a..40b354154fa53 100644
--- a/libclc/clc/include/clc/math/clc_hypot.h
+++ b/libclc/clc/include/clc/math/clc_hypot.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_HYPOT_H__
 #define __CLC_MATH_CLC_HYPOT_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_hypot
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_ilogb.h b/libclc/clc/include/clc/math/clc_ilogb.h
index d77fa4e37cd2a..6aeaf6be3ac6c 100644
--- a/libclc/clc/include/clc/math/clc_ilogb.h
+++ b/libclc/clc/include/clc/math/clc_ilogb.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_ILOGB_H__
 
 #define __CLC_FUNCTION __clc_ilogb
-#define __CLC_BODY "clc/math/unary_decl_with_int_return.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_int_return.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_ldexp.h b/libclc/clc/include/clc/math/clc_ldexp.h
index 31a794243984a..e90732680e2a6 100644
--- a/libclc/clc/include/clc/math/clc_ldexp.h
+++ b/libclc/clc/include/clc/math/clc_ldexp.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_MATH_CLC_LDEXP_H__
 #define __CLC_MATH_CLC_LDEXP_H__
 
-#define __CLC_BODY "clc/math/clc_ldexp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/clc_ldexp.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_MATH_CLC_LDEXP_H__

diff  --git a/libclc/clc/include/clc/math/clc_lgamma.h b/libclc/clc/include/clc/math/clc_lgamma.h
index d70b778da4df4..f54c5e2b61b67 100644
--- a/libclc/clc/include/clc/math/clc_lgamma.h
+++ b/libclc/clc/include/clc/math/clc_lgamma.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_LGAMMA_H__
 #define __CLC_MATH_CLC_LGAMMA_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_lgamma
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_lgamma_r.h b/libclc/clc/include/clc/math/clc_lgamma_r.h
index 93e8c8dcfcbe6..262e62372227a 100644
--- a/libclc/clc/include/clc/math/clc_lgamma_r.h
+++ b/libclc/clc/include/clc/math/clc_lgamma_r.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_LGAMMA_R_H__
 
 #define __CLC_FUNCTION __clc_lgamma_r
-#define __CLC_BODY "clc/math/unary_decl_with_int_ptr.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_int_ptr.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_log.h b/libclc/clc/include/clc/math/clc_log.h
index f867f5bb0a637..8b0e44b425a89 100644
--- a/libclc/clc/include/clc/math/clc_log.h
+++ b/libclc/clc/include/clc/math/clc_log.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_LOG_H__
 
 #define __CLC_FUNCTION __clc_log
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_log10.h b/libclc/clc/include/clc/math/clc_log10.h
index 67dae5222c8fb..6e086690c6ada 100644
--- a/libclc/clc/include/clc/math/clc_log10.h
+++ b/libclc/clc/include/clc/math/clc_log10.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_LOG10_H__
 
 #define __CLC_FUNCTION __clc_log10
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_log1p.h b/libclc/clc/include/clc/math/clc_log1p.h
index 5453fb49fd5e5..1be8c8548d488 100644
--- a/libclc/clc/include/clc/math/clc_log1p.h
+++ b/libclc/clc/include/clc/math/clc_log1p.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_LOG1P_H__
 #define __CLC_MATH_CLC_LOG1P_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_log1p
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_log2.h b/libclc/clc/include/clc/math/clc_log2.h
index 6df487ca1b2f5..c5f9e37f39845 100644
--- a/libclc/clc/include/clc/math/clc_log2.h
+++ b/libclc/clc/include/clc/math/clc_log2.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_LOG2_H__
 
 #define __CLC_FUNCTION __clc_log2
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_logb.h b/libclc/clc/include/clc/math/clc_logb.h
index 30ed02e5d0ba3..75a2ce7e578b1 100644
--- a/libclc/clc/include/clc/math/clc_logb.h
+++ b/libclc/clc/include/clc/math/clc_logb.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_LOGB_H__
 
 #define __CLC_FUNCTION __clc_logb
-#define __CLC_BODY "clc/shared/unary_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_mad.h b/libclc/clc/include/clc/math/clc_mad.h
index 68858c456a908..117e361380eda 100644
--- a/libclc/clc/include/clc/math/clc_mad.h
+++ b/libclc/clc/include/clc/math/clc_mad.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_MAD_H__
 #define __CLC_MATH_CLC_MAD_H__
 
-#define __CLC_BODY "clc/shared/ternary_decl.inc"
+#define __CLC_BODY <clc/shared/ternary_decl.inc>
 #define __CLC_FUNCTION __clc_mad
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_maxmag.h b/libclc/clc/include/clc/math/clc_maxmag.h
index 71e1523704ffc..857ad7867b05d 100644
--- a/libclc/clc/include/clc/math/clc_maxmag.h
+++ b/libclc/clc/include/clc/math/clc_maxmag.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_MAXMAG_H__
 #define __CLC_MATH_CLC_MAXMAG_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_maxmag
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_minmag.h b/libclc/clc/include/clc/math/clc_minmag.h
index 959a2551bea03..9615d029bfed2 100644
--- a/libclc/clc/include/clc/math/clc_minmag.h
+++ b/libclc/clc/include/clc/math/clc_minmag.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_MINMAG_H__
 #define __CLC_MATH_CLC_MINMAG_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_minmag
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_modf.h b/libclc/clc/include/clc/math/clc_modf.h
index d336d6e3f2654..aa8f9e20892ab 100644
--- a/libclc/clc/include/clc/math/clc_modf.h
+++ b/libclc/clc/include/clc/math/clc_modf.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_MODF_H__
 
 #define __CLC_FUNCTION __clc_modf
-#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_nan.h b/libclc/clc/include/clc/math/clc_nan.h
index 8ba041f75eb66..91901fd9369f2 100644
--- a/libclc/clc/include/clc/math/clc_nan.h
+++ b/libclc/clc/include/clc/math/clc_nan.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_NAN_H__
 
 #define __CLC_FUNCTION __clc_nan
-#define __CLC_BODY "clc/math/clc_nan.inc"
+#define __CLC_BODY <clc/math/clc_nan.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_cos.h b/libclc/clc/include/clc/math/clc_native_cos.h
index de240d8442a3d..eefd133911e48 100644
--- a/libclc/clc/include/clc/math/clc_native_cos.h
+++ b/libclc/clc/include/clc/math/clc_native_cos.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_cos
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_divide.h b/libclc/clc/include/clc/math/clc_native_divide.h
index b4fffe8c9d251..97d97c2670a6b 100644
--- a/libclc/clc/include/clc/math/clc_native_divide.h
+++ b/libclc/clc/include/clc/math/clc_native_divide.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_divide
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_exp.h b/libclc/clc/include/clc/math/clc_native_exp.h
index 1ef08f93d59ae..30c0d1edf18fb 100644
--- a/libclc/clc/include/clc/math/clc_native_exp.h
+++ b/libclc/clc/include/clc/math/clc_native_exp.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_exp
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_exp10.h b/libclc/clc/include/clc/math/clc_native_exp10.h
index b9130cc4fa420..a88b5a3897377 100644
--- a/libclc/clc/include/clc/math/clc_native_exp10.h
+++ b/libclc/clc/include/clc/math/clc_native_exp10.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_exp10
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_exp2.h b/libclc/clc/include/clc/math/clc_native_exp2.h
index f5c6a990c9c31..09f4bfe6979dd 100644
--- a/libclc/clc/include/clc/math/clc_native_exp2.h
+++ b/libclc/clc/include/clc/math/clc_native_exp2.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_exp2
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_log.h b/libclc/clc/include/clc/math/clc_native_log.h
index a4e9fb38ec2e5..c32fc812d4770 100644
--- a/libclc/clc/include/clc/math/clc_native_log.h
+++ b/libclc/clc/include/clc/math/clc_native_log.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_log10.h b/libclc/clc/include/clc/math/clc_native_log10.h
index ec65954b71537..329b8a7437556 100644
--- a/libclc/clc/include/clc/math/clc_native_log10.h
+++ b/libclc/clc/include/clc/math/clc_native_log10.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log10
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_log2.h b/libclc/clc/include/clc/math/clc_native_log2.h
index 6accba9468947..b8ad663b470d8 100644
--- a/libclc/clc/include/clc/math/clc_native_log2.h
+++ b/libclc/clc/include/clc/math/clc_native_log2.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log2
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_powr.h b/libclc/clc/include/clc/math/clc_native_powr.h
index acfa7565cb4ff..3a0c8cc8b9d58 100644
--- a/libclc/clc/include/clc/math/clc_native_powr.h
+++ b/libclc/clc/include/clc/math/clc_native_powr.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_powr
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_recip.h b/libclc/clc/include/clc/math/clc_native_recip.h
index 6661913ebac69..a6540e846f2b6 100644
--- a/libclc/clc/include/clc/math/clc_native_recip.h
+++ b/libclc/clc/include/clc/math/clc_native_recip.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_recip
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_rsqrt.h b/libclc/clc/include/clc/math/clc_native_rsqrt.h
index 60eb45a9fec84..0c8f3da039299 100644
--- a/libclc/clc/include/clc/math/clc_native_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_rsqrt.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_rsqrt
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_sin.h b/libclc/clc/include/clc/math/clc_native_sin.h
index 23b3a8e6d6a75..22ab7868e20fb 100644
--- a/libclc/clc/include/clc/math/clc_native_sin.h
+++ b/libclc/clc/include/clc/math/clc_native_sin.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_sin
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_sqrt.h b/libclc/clc/include/clc/math/clc_native_sqrt.h
index de0770a53a84e..fd071f1d463ab 100644
--- a/libclc/clc/include/clc/math/clc_native_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_sqrt.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_sqrt
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_native_tan.h b/libclc/clc/include/clc/math/clc_native_tan.h
index ec72913662173..4b381312d8d51 100644
--- a/libclc/clc/include/clc/math/clc_native_tan.h
+++ b/libclc/clc/include/clc/math/clc_native_tan.h
@@ -11,9 +11,9 @@
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_tan
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_nextafter.h b/libclc/clc/include/clc/math/clc_nextafter.h
index 500cbaf847d63..f24742b9e9c37 100644
--- a/libclc/clc/include/clc/math/clc_nextafter.h
+++ b/libclc/clc/include/clc/math/clc_nextafter.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_NEXTAFTER_H__
 #define __CLC_MATH_CLC_NEXTAFTER_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_nextafter
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_pow.h b/libclc/clc/include/clc/math/clc_pow.h
index 431cff8d8f6a3..5e37e5bf6da65 100644
--- a/libclc/clc/include/clc/math/clc_pow.h
+++ b/libclc/clc/include/clc/math/clc_pow.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_POW_H__
 #define __CLC_MATH_CLC_POW_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_pow
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_pown.h b/libclc/clc/include/clc/math/clc_pown.h
index 027687140e6bd..30628efb19001 100644
--- a/libclc/clc/include/clc/math/clc_pown.h
+++ b/libclc/clc/include/clc/math/clc_pown.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_POWN_H__
 #define __CLC_MATH_CLC_POWN_H__
 
-#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc"
+#define __CLC_BODY <clc/shared/binary_decl_with_int_second_arg.inc>
 #define __CLC_FUNCTION __clc_pown
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_powr.h b/libclc/clc/include/clc/math/clc_powr.h
index 40c57fab5a3c5..baa494cce6989 100644
--- a/libclc/clc/include/clc/math/clc_powr.h
+++ b/libclc/clc/include/clc/math/clc_powr.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_POWR_H__
 #define __CLC_MATH_CLC_POWR_H__
 
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 #define __CLC_FUNCTION __clc_powr
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_recip_fast.h b/libclc/clc/include/clc/math/clc_recip_fast.h
index b6d18da0b0342..82890d606249a 100644
--- a/libclc/clc/include/clc/math/clc_recip_fast.h
+++ b/libclc/clc/include/clc/math/clc_recip_fast.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_RECIP_FAST_H__
 
 #define __CLC_FUNCTION __clc_recip_fast
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_remainder.h b/libclc/clc/include/clc/math/clc_remainder.h
index 3677414d2b11e..a7700c95103b4 100644
--- a/libclc/clc/include/clc/math/clc_remainder.h
+++ b/libclc/clc/include/clc/math/clc_remainder.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_REMAINDER_H__
 
 #define __CLC_FUNCTION __clc_remainder
-#define __CLC_BODY "clc/shared/binary_decl.inc"
+#define __CLC_BODY <clc/shared/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_remquo.h b/libclc/clc/include/clc/math/clc_remquo.h
index 7896d4e2a76dd..48a8844a6e384 100644
--- a/libclc/clc/include/clc/math/clc_remquo.h
+++ b/libclc/clc/include/clc/math/clc_remquo.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_REMQUO_H__
 
 #define __CLC_FUNCTION __clc_remquo
-#define __CLC_BODY "clc/math/remquo_decl.inc"
+#define __CLC_BODY <clc/math/remquo_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_rint.h b/libclc/clc/include/clc/math/clc_rint.h
index fe008ec7c9a2c..17b1549f439b8 100644
--- a/libclc/clc/include/clc/math/clc_rint.h
+++ b/libclc/clc/include/clc/math/clc_rint.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_RINT_H__
 #define __CLC_MATH_CLC_RINT_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_rint
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_rootn.h b/libclc/clc/include/clc/math/clc_rootn.h
index 6372783528b8e..90a25ad52d867 100644
--- a/libclc/clc/include/clc/math/clc_rootn.h
+++ b/libclc/clc/include/clc/math/clc_rootn.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ROOTN_H__
 #define __CLC_MATH_CLC_ROOTN_H__
 
-#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc"
+#define __CLC_BODY <clc/shared/binary_decl_with_int_second_arg.inc>
 #define __CLC_FUNCTION __clc_rootn
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_round.h b/libclc/clc/include/clc/math/clc_round.h
index c56cbcbdd3d65..78ebf4db99e9f 100644
--- a/libclc/clc/include/clc/math/clc_round.h
+++ b/libclc/clc/include/clc/math/clc_round.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_ROUND_H__
 #define __CLC_MATH_CLC_ROUND_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_round
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_rsqrt.h b/libclc/clc/include/clc/math/clc_rsqrt.h
index 73a9c7b82f30b..59402fbead2b2 100644
--- a/libclc/clc/include/clc/math/clc_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_rsqrt.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_RSQRT_H__
 #define __CLC_MATH_CLC_RSQRT_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_rsqrt
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sin.h b/libclc/clc/include/clc/math/clc_sin.h
index b74962be0c937..de4c722ca123f 100644
--- a/libclc/clc/include/clc/math/clc_sin.h
+++ b/libclc/clc/include/clc/math/clc_sin.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_SIN_H__
 #define __CLC_MATH_CLC_SIN_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_sin
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sincos.h b/libclc/clc/include/clc/math/clc_sincos.h
index a3f6acfb8178d..e26dc7c024c9c 100644
--- a/libclc/clc/include/clc/math/clc_sincos.h
+++ b/libclc/clc/include/clc/math/clc_sincos.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_SINCOS_H__
 #define __CLC_MATH_CLC_SINCOS_H__
 
-#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc"
+#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
 #define __CLC_FUNCTION __clc_sincos
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sincos_helpers.h b/libclc/clc/include/clc/math/clc_sincos_helpers.h
index 6bbaa7755e56b..909afe476ad90 100644
--- a/libclc/clc/include/clc/math/clc_sincos_helpers.h
+++ b/libclc/clc/include/clc/math/clc_sincos_helpers.h
@@ -10,13 +10,13 @@
 #define __CLC_MATH_CLC_SINCOS_HELPERS_H__
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc/math/clc_sincos_helpers.inc"
+#define __CLC_BODY <clc/math/clc_sincos_helpers.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #define __CLC_DOUBLE_ONLY
-#define __CLC_BODY "clc/math/clc_sincos_helpers_fp64.inc"
+#define __CLC_BODY <clc/math/clc_sincos_helpers_fp64.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #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 4be80207ff768..fa9cabe79cb0e 100644
--- a/libclc/clc/include/clc/math/clc_sinh.h
+++ b/libclc/clc/include/clc/math/clc_sinh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_SINH_H__
 #define __CLC_MATH_CLC_SINH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_sinh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sinpi.h b/libclc/clc/include/clc/math/clc_sinpi.h
index c6597928dd2e9..db563c2e7e14a 100644
--- a/libclc/clc/include/clc/math/clc_sinpi.h
+++ b/libclc/clc/include/clc/math/clc_sinpi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_SINPI_H__
 #define __CLC_MATH_CLC_SINPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_sinpi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sqrt.h b/libclc/clc/include/clc/math/clc_sqrt.h
index c661e12500ead..7084515533291 100644
--- a/libclc/clc/include/clc/math/clc_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_sqrt.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_SQRT_H__
 #define __CLC_MATH_CLC_SQRT_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_sqrt
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sqrt_cr.h b/libclc/clc/include/clc/math/clc_sqrt_cr.h
index bf16424cfbf86..e50911c7f5d9b 100644
--- a/libclc/clc/include/clc/math/clc_sqrt_cr.h
+++ b/libclc/clc/include/clc/math/clc_sqrt_cr.h
@@ -17,9 +17,9 @@
 // correctly rounded and opencl precision versions.
 
 #define __CLC_FUNCTION __clc_sqrt_cr
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_sqrt_fast.h b/libclc/clc/include/clc/math/clc_sqrt_fast.h
index 9ae2470efd265..3d0f501979320 100644
--- a/libclc/clc/include/clc/math/clc_sqrt_fast.h
+++ b/libclc/clc/include/clc/math/clc_sqrt_fast.h
@@ -10,9 +10,9 @@
 #define __CLC_MATH_CLC_SQRT_FAST_H__
 
 #define __CLC_FUNCTION __clc_sqrt_fast
-#define __CLC_BODY "clc/shared/unary_decl.inc"
+#define __CLC_BODY <clc/shared/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_subnormal_config.h b/libclc/clc/include/clc/math/clc_subnormal_config.h
index b157720533d72..14693ed01e033 100644
--- a/libclc/clc/include/clc/math/clc_subnormal_config.h
+++ b/libclc/clc/include/clc/math/clc_subnormal_config.h
@@ -8,7 +8,7 @@
 #ifndef __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__
 #define __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 _CLC_DECL bool __clc_subnormals_disabled();
 _CLC_DECL bool __clc_fp16_subnormals_supported();

diff  --git a/libclc/clc/include/clc/math/clc_tan.h b/libclc/clc/include/clc/math/clc_tan.h
index 9d0943301b915..028ff28ecd69d 100644
--- a/libclc/clc/include/clc/math/clc_tan.h
+++ b/libclc/clc/include/clc/math/clc_tan.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_TAN_H__
 #define __CLC_MATH_CLC_TAN_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_tan
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_tanh.h b/libclc/clc/include/clc/math/clc_tanh.h
index 3be3b0a44dc2b..88fce2340d99b 100644
--- a/libclc/clc/include/clc/math/clc_tanh.h
+++ b/libclc/clc/include/clc/math/clc_tanh.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_TANH_H__
 #define __CLC_MATH_CLC_TANH_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_tanh
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_tanpi.h b/libclc/clc/include/clc/math/clc_tanpi.h
index 922d17046a613..596bb72b4b8de 100644
--- a/libclc/clc/include/clc/math/clc_tanpi.h
+++ b/libclc/clc/include/clc/math/clc_tanpi.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_TANPI_H__
 #define __CLC_MATH_CLC_TANPI_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_tanpi
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_tgamma.h b/libclc/clc/include/clc/math/clc_tgamma.h
index aeddbca0a54ca..dd76e041875d5 100644
--- a/libclc/clc/include/clc/math/clc_tgamma.h
+++ b/libclc/clc/include/clc/math/clc_tgamma.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_TGAMMA_H__
 #define __CLC_MATH_CLC_TGAMMA_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_tgamma
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/clc_trunc.h b/libclc/clc/include/clc/math/clc_trunc.h
index 90be54dec3cb2..33445f9fe15d6 100644
--- a/libclc/clc/include/clc/math/clc_trunc.h
+++ b/libclc/clc/include/clc/math/clc_trunc.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_MATH_CLC_TRUNC_H__
 #define __CLC_MATH_CLC_TRUNC_H__
 
-#define __CLC_BODY "clc/math/unary_decl.inc"
+#define __CLC_BODY <clc/math/unary_decl.inc>
 #define __CLC_FUNCTION __clc_trunc
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/math/gentype.inc b/libclc/clc/include/clc/math/gentype.inc
index 3ed5c34880d8b..d5664a249af33 100644
--- a/libclc/clc/include/clc/math/gentype.inc
+++ b/libclc/clc/include/clc/math/gentype.inc
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clcfunc.h"
-#include "clc/utils.h"
+#include <clc/clcfunc.h>
+#include <clc/utils.h>
 
 // Define some useful macros for type conversions.
 #define __CLC_AS_GENTYPE __CLC_XCONCAT(__clc_as_, __CLC_GENTYPE)

diff  --git a/libclc/clc/include/clc/math/math.h b/libclc/clc/include/clc/math/math.h
index f11296bdd00c4..59418eaac26fc 100644
--- a/libclc/clc/include/clc/math/math.h
+++ b/libclc/clc/include/clc/math/math.h
@@ -9,9 +9,9 @@
 #ifndef __CLC_MATH_MATH_H__
 #define __CLC_MATH_MATH_H__
 
-#include "clc/clc_as_type.h"
-#include "clc/clcfunc.h"
-#include "clc/math/clc_subnormal_config.h"
+#include <clc/clc_as_type.h>
+#include <clc/clcfunc.h>
+#include <clc/math/clc_subnormal_config.h>
 
 #define SNAN 0x001
 #define QNAN 0x002

diff  --git a/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc b/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc
index f62d24ed86b05..db6472ad0e645 100644
--- a/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc
+++ b/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/math/unary_def_with_int_return.inc b/libclc/clc/include/clc/math/unary_def_with_int_return.inc
index ff7a9aa2bf1e2..7a47aae8ce637 100644
--- a/libclc/clc/include/clc/math/unary_def_with_int_return.inc
+++ b/libclc/clc/include/clc/math/unary_def_with_int_return.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/math/unary_def_with_ptr.inc b/libclc/clc/include/clc/math/unary_def_with_ptr.inc
index 8d6f7251eaa82..8a490e1bba16d 100644
--- a/libclc/clc/include/clc/math/unary_def_with_ptr.inc
+++ b/libclc/clc/include/clc/math/unary_def_with_ptr.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
index 6a8bf2eaa6749..0776caddde0d5 100644
--- a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
+++ b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
@@ -9,8 +9,8 @@
 #ifndef __CLC_MEM_FENCE_CLC_MEM_FENCE_H__
 #define __CLC_MEM_FENCE_CLC_MEM_FENCE_H__
 
-#include "clc/internal/clc.h"
-#include "clc/mem_fence/clc_mem_semantic.h"
+#include <clc/internal/clc.h>
+#include <clc/mem_fence/clc_mem_semantic.h>
 
 _CLC_OVERLOAD _CLC_DECL void
 __clc_mem_fence(int memory_scope, int memory_order,

diff  --git a/libclc/clc/include/clc/misc/clc_shuffle.h b/libclc/clc/include/clc/misc/clc_shuffle.h
index 4665a3f4d99c9..ba3d7a2bddd62 100644
--- a/libclc/clc/include/clc/misc/clc_shuffle.h
+++ b/libclc/clc/include/clc/misc/clc_shuffle.h
@@ -12,12 +12,12 @@
 #define __CLC_FUNCTION __clc_shuffle
 
 // Integer-type decls
-#define __CLC_BODY "clc/misc/shuffle_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle_decl.inc>
+#include <clc/integer/gentype.inc>
 
 // Floating-point decls
-#define __CLC_BODY "clc/misc/shuffle_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/misc/clc_shuffle2.h b/libclc/clc/include/clc/misc/clc_shuffle2.h
index 3d67724d6ca87..84bafba12b211 100644
--- a/libclc/clc/include/clc/misc/clc_shuffle2.h
+++ b/libclc/clc/include/clc/misc/clc_shuffle2.h
@@ -12,12 +12,12 @@
 #define __CLC_FUNCTION __clc_shuffle2
 
 // Integer-type decls
-#define __CLC_BODY "clc/misc/shuffle2_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
+#include <clc/integer/gentype.inc>
 
 // Floating-point decls
-#define __CLC_BODY "clc/misc/shuffle2_decl.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/misc/shuffle2_def.inc b/libclc/clc/include/clc/misc/shuffle2_def.inc
index afc3b88d847c4..c319f57f880fe 100644
--- a/libclc/clc/include/clc/misc/shuffle2_def.inc
+++ b/libclc/clc/include/clc/misc/shuffle2_def.inc
@@ -9,7 +9,7 @@
 #if (__CLC_VECSIZE_OR_1 == 2 || __CLC_VECSIZE_OR_1 == 4 ||                     \
      __CLC_VECSIZE_OR_1 == 8 || __CLC_VECSIZE_OR_1 == 16)
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/misc/shuffle_def.inc b/libclc/clc/include/clc/misc/shuffle_def.inc
index b4e0006f12c08..0f0340979c557 100644
--- a/libclc/clc/include/clc/misc/shuffle_def.inc
+++ b/libclc/clc/include/clc/misc/shuffle_def.inc
@@ -9,7 +9,7 @@
 #if (__CLC_VECSIZE_OR_1 == 2 || __CLC_VECSIZE_OR_1 == 4 ||                     \
      __CLC_VECSIZE_OR_1 == 8 || __CLC_VECSIZE_OR_1 == 16)
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/relational/clc_all.h b/libclc/clc/include/clc/relational/clc_all.h
index e24fdcc5e929b..a99e2ae172d5c 100644
--- a/libclc/clc/include/clc/relational/clc_all.h
+++ b/libclc/clc/include/clc/relational/clc_all.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ALL_H__
 #define __CLC_RELATIONAL_CLC_ALL_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ALL_DECL(TYPE)                                                    \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL int __clc_all(TYPE v);

diff  --git a/libclc/clc/include/clc/relational/clc_any.h b/libclc/clc/include/clc/relational/clc_any.h
index 90e24c943efe8..5e52be4563f36 100644
--- a/libclc/clc/include/clc/relational/clc_any.h
+++ b/libclc/clc/include/clc/relational/clc_any.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ANY_H__
 #define __CLC_RELATIONAL_CLC_ANY_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ANY_DECL(TYPE)                                                    \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL int __clc_any(TYPE v);

diff  --git a/libclc/clc/include/clc/relational/clc_bitselect.h b/libclc/clc/include/clc/relational/clc_bitselect.h
index f591b9133bcaf..5490ea7374f8d 100644
--- a/libclc/clc/include/clc/relational/clc_bitselect.h
+++ b/libclc/clc/include/clc/relational/clc_bitselect.h
@@ -9,9 +9,9 @@
 #ifndef __CLC_RELATIONAL_CLC_BITSELECT_H__
 #define __CLC_RELATIONAL_CLC_BITSELECT_H__
 
-#define __CLC_BODY "clc/relational/clc_bitselect.inc"
-#include "clc/math/gentype.inc"
-#define __CLC_BODY "clc/relational/clc_bitselect.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/relational/clc_bitselect.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/clc_bitselect.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // __CLC_RELATIONAL_CLC_BITSELECT_H__

diff  --git a/libclc/clc/include/clc/relational/clc_isequal.h b/libclc/clc/include/clc/relational/clc_isequal.h
index ed87198fba0af..18e05387759e3 100644
--- a/libclc/clc/include/clc/relational/clc_isequal.h
+++ b/libclc/clc/include/clc/relational/clc_isequal.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ISEQUAL_H__
 #define __CLC_RELATIONAL_CLC_ISEQUAL_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ISEQUAL_DECL(TYPE, RETTYPE)                                       \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL RETTYPE __clc_isequal(TYPE x, TYPE y);

diff  --git a/libclc/clc/include/clc/relational/clc_isfinite.h b/libclc/clc/include/clc/relational/clc_isfinite.h
index 59d608898e305..596b81f51b853 100644
--- a/libclc/clc/include/clc/relational/clc_isfinite.h
+++ b/libclc/clc/include/clc/relational/clc_isfinite.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISFINITE_H__
 
 #define __CLC_FUNCTION __clc_isfinite
-#define __CLC_BODY "clc/relational/unary_decl.inc"
+#define __CLC_BODY <clc/relational/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isgreater.h b/libclc/clc/include/clc/relational/clc_isgreater.h
index 923c20761b9b6..fc5b3cdad084a 100644
--- a/libclc/clc/include/clc/relational/clc_isgreater.h
+++ b/libclc/clc/include/clc/relational/clc_isgreater.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISGREATER_H__
 
 #define __CLC_FUNCTION __clc_isgreater
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isgreaterequal.h b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
index 5c96e499a76f6..6209a066cf46d 100644
--- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
+++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
 
 #define __CLC_FUNCTION __clc_isgreaterequal
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isinf.h b/libclc/clc/include/clc/relational/clc_isinf.h
index 19b8a3db9c6db..a64b18bd564d3 100644
--- a/libclc/clc/include/clc/relational/clc_isinf.h
+++ b/libclc/clc/include/clc/relational/clc_isinf.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ISINF_H__
 #define __CLC_RELATIONAL_CLC_ISINF_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ISINF_DECL(RET_TYPE, ARG_TYPE)                                    \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_isinf(ARG_TYPE);

diff  --git a/libclc/clc/include/clc/relational/clc_isless.h b/libclc/clc/include/clc/relational/clc_isless.h
index 773d6a02f9a5b..4e340db121773 100644
--- a/libclc/clc/include/clc/relational/clc_isless.h
+++ b/libclc/clc/include/clc/relational/clc_isless.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISLESS_H__
 
 #define __CLC_FUNCTION __clc_isless
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_islessequal.h b/libclc/clc/include/clc/relational/clc_islessequal.h
index 5cba472321949..14c5a10301836 100644
--- a/libclc/clc/include/clc/relational/clc_islessequal.h
+++ b/libclc/clc/include/clc/relational/clc_islessequal.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
 
 #define __CLC_FUNCTION __clc_islessequal
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_islessgreater.h b/libclc/clc/include/clc/relational/clc_islessgreater.h
index 14a12150690cf..530564bbf0595 100644
--- a/libclc/clc/include/clc/relational/clc_islessgreater.h
+++ b/libclc/clc/include/clc/relational/clc_islessgreater.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
 
 #define __CLC_FUNCTION __clc_islessgreater
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isnan.h b/libclc/clc/include/clc/relational/clc_isnan.h
index 34702e56256cf..48cfa7f7fbb8e 100644
--- a/libclc/clc/include/clc/relational/clc_isnan.h
+++ b/libclc/clc/include/clc/relational/clc_isnan.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ISNAN_H__
 #define __CLC_RELATIONAL_CLC_ISNAN_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ISNAN_DECL(RET_TYPE, ARG_TYPE)                                    \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_isnan(ARG_TYPE);

diff  --git a/libclc/clc/include/clc/relational/clc_isnormal.h b/libclc/clc/include/clc/relational/clc_isnormal.h
index 3463b3ee2543e..9572b02004686 100644
--- a/libclc/clc/include/clc/relational/clc_isnormal.h
+++ b/libclc/clc/include/clc/relational/clc_isnormal.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISNORMAL_H__
 
 #define __CLC_FUNCTION __clc_isnormal
-#define __CLC_BODY "clc/relational/unary_decl.inc"
+#define __CLC_BODY <clc/relational/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isnotequal.h b/libclc/clc/include/clc/relational/clc_isnotequal.h
index 87f415427d05a..f90622db9fe1d 100644
--- a/libclc/clc/include/clc/relational/clc_isnotequal.h
+++ b/libclc/clc/include/clc/relational/clc_isnotequal.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
 
 #define __CLC_FUNCTION __clc_isnotequal
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_isordered.h b/libclc/clc/include/clc/relational/clc_isordered.h
index c9bf4f94ee6a0..3f5cc097f4a72 100644
--- a/libclc/clc/include/clc/relational/clc_isordered.h
+++ b/libclc/clc/include/clc/relational/clc_isordered.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISORDERED_H__
 
 #define __CLC_FUNCTION __clc_isordered
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_issubnormal.h b/libclc/clc/include/clc/relational/clc_issubnormal.h
index 46b5d40066ae6..548d50a08a6e3 100644
--- a/libclc/clc/include/clc/relational/clc_issubnormal.h
+++ b/libclc/clc/include/clc/relational/clc_issubnormal.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__
 #define __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__
 
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 #define _CLC_ISSUBNORMAL_DECL(RET_TYPE, ARG_TYPE)                              \
   _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_issubnormal(ARG_TYPE);

diff  --git a/libclc/clc/include/clc/relational/clc_isunordered.h b/libclc/clc/include/clc/relational/clc_isunordered.h
index cedf47363d448..6134ba849d229 100644
--- a/libclc/clc/include/clc/relational/clc_isunordered.h
+++ b/libclc/clc/include/clc/relational/clc_isunordered.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_ISUNORDERED_H__
 
 #define __CLC_FUNCTION __clc_isunordered
-#define __CLC_BODY "clc/relational/binary_decl.inc"
+#define __CLC_BODY <clc/relational/binary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/relational/clc_select.h b/libclc/clc/include/clc/relational/clc_select.h
index 31a95274e88bf..de0a9afa6b8cf 100644
--- a/libclc/clc/include/clc/relational/clc_select.h
+++ b/libclc/clc/include/clc/relational/clc_select.h
@@ -9,14 +9,14 @@
 #ifndef __CLC_RELATIONAL_CLC_SELECT_H__
 #define __CLC_RELATIONAL_CLC_SELECT_H__
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #define __CLC_SELECT_FN __clc_select
 
-#define __CLC_BODY "clc/relational/clc_select_decl.inc"
-#include "clc/math/gentype.inc"
-#define __CLC_BODY "clc/relational/clc_select_decl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/relational/clc_select_decl.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/clc_select_decl.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_SELECT_FN
 

diff  --git a/libclc/clc/include/clc/relational/clc_signbit.h b/libclc/clc/include/clc/relational/clc_signbit.h
index 45677fba6cb89..a8e04ce494f2c 100644
--- a/libclc/clc/include/clc/relational/clc_signbit.h
+++ b/libclc/clc/include/clc/relational/clc_signbit.h
@@ -10,9 +10,9 @@
 #define __CLC_RELATIONAL_CLC_SIGNBIT_H__
 
 #define __CLC_FUNCTION __clc_signbit
-#define __CLC_BODY "clc/relational/unary_decl.inc"
+#define __CLC_BODY <clc/relational/unary_decl.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
 

diff  --git a/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc b/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc
index 5d226318572df..25cf52c84811e 100644
--- a/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc
+++ b/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x,
                                                                 __CLC_INTN y);

diff  --git a/libclc/clc/include/clc/shared/binary_def.inc b/libclc/clc/include/clc/shared/binary_def.inc
index 847a360e3a629..5487ad926768d 100644
--- a/libclc/clc/include/clc/shared/binary_def.inc
+++ b/libclc/clc/include/clc/shared/binary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/shared/binary_def_scalarize.inc b/libclc/clc/include/clc/shared/binary_def_scalarize.inc
index 7a6929bb4bfd4..2505f2ee0da2d 100644
--- a/libclc/clc/include/clc/shared/binary_def_scalarize.inc
+++ b/libclc/clc/include/clc/shared/binary_def_scalarize.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifdef __CLC_SCALAR
 

diff  --git a/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc b/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc
index 0fce26821a08c..2c32754044db9 100644
--- a/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc
+++ b/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc b/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc
index 06ae65ed87d06..7a6283d7190da 100644
--- a/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc
+++ b/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/shared/clc_clamp.h b/libclc/clc/include/clc/shared/clc_clamp.h
index 2d5116e11e816..c4a482d12221e 100644
--- a/libclc/clc/include/clc/shared/clc_clamp.h
+++ b/libclc/clc/include/clc/shared/clc_clamp.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_SHARED_CLC_CLAMP_H__
 #define __CLC_SHARED_CLC_CLAMP_H__
 
-#define __CLC_BODY "clc/shared/clc_clamp.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_clamp.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_clamp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_clamp.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_CLAMP_H__

diff  --git a/libclc/clc/include/clc/shared/clc_less_aligned_types.h b/libclc/clc/include/clc/shared/clc_less_aligned_types.h
index 331e213eb6a48..73e436147ce0a 100644
--- a/libclc/clc/include/clc/shared/clc_less_aligned_types.h
+++ b/libclc/clc/include/clc/shared/clc_less_aligned_types.h
@@ -14,10 +14,10 @@
 #ifndef __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__
 #define __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__
 
-#define __CLC_BODY "clc/shared/clc_less_aligned_types.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_less_aligned_types.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_less_aligned_types.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_less_aligned_types.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__

diff  --git a/libclc/clc/include/clc/shared/clc_max.h b/libclc/clc/include/clc/shared/clc_max.h
index d727faeba6fc8..470d56cf31878 100644
--- a/libclc/clc/include/clc/shared/clc_max.h
+++ b/libclc/clc/include/clc/shared/clc_max.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_SHARED_CLC_MAX_H__
 #define __CLC_SHARED_CLC_MAX_H__
 
-#define __CLC_BODY "clc/shared/clc_max.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_max.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_max.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_max.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_MAX_H__

diff  --git a/libclc/clc/include/clc/shared/clc_min.h b/libclc/clc/include/clc/shared/clc_min.h
index 7eadbe39f639c..3931d4684aec0 100644
--- a/libclc/clc/include/clc/shared/clc_min.h
+++ b/libclc/clc/include/clc/shared/clc_min.h
@@ -9,10 +9,10 @@
 #ifndef __CLC_SHARED_CLC_MIN_H__
 #define __CLC_SHARED_CLC_MIN_H__
 
-#define __CLC_BODY "clc/shared/clc_min.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_min.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_min.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_min.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_MIN_H__

diff  --git a/libclc/clc/include/clc/shared/clc_vload.h b/libclc/clc/include/clc/shared/clc_vload.h
index 563015e1b4e5a..c3dbe0696cc19 100644
--- a/libclc/clc/include/clc/shared/clc_vload.h
+++ b/libclc/clc/include/clc/shared/clc_vload.h
@@ -9,12 +9,12 @@
 #ifndef __CLC_SHARED_CLC_VLOAD_H__
 #define __CLC_SHARED_CLC_VLOAD_H__
 
-#include "clc/shared/clc_less_aligned_types.h"
+#include <clc/shared/clc_less_aligned_types.h>
 
-#define __CLC_BODY "clc/shared/clc_vload.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_vload.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_vload.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_vload.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_VLOAD_H__

diff  --git a/libclc/clc/include/clc/shared/clc_vstore.h b/libclc/clc/include/clc/shared/clc_vstore.h
index f65fdbe643aef..647dc7da1afbe 100644
--- a/libclc/clc/include/clc/shared/clc_vstore.h
+++ b/libclc/clc/include/clc/shared/clc_vstore.h
@@ -9,12 +9,12 @@
 #ifndef __CLC_SHARED_CLC_VSTORE_H__
 #define __CLC_SHARED_CLC_VSTORE_H__
 
-#include "clc/shared/clc_less_aligned_types.h"
+#include <clc/shared/clc_less_aligned_types.h>
 
-#define __CLC_BODY "clc/shared/clc_vstore.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_vstore.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/shared/clc_vstore.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/clc_vstore.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SHARED_CLC_VSTORE_H__

diff  --git a/libclc/clc/include/clc/shared/ternary_def.inc b/libclc/clc/include/clc/shared/ternary_def.inc
index 4de174863b3bf..566cfb4ca58c9 100644
--- a/libclc/clc/include/clc/shared/ternary_def.inc
+++ b/libclc/clc/include/clc/shared/ternary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/shared/ternary_def_scalarize.inc b/libclc/clc/include/clc/shared/ternary_def_scalarize.inc
index 2b5848b14dd87..7bdaee85a612b 100644
--- a/libclc/clc/include/clc/shared/ternary_def_scalarize.inc
+++ b/libclc/clc/include/clc/shared/ternary_def_scalarize.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifdef __CLC_SCALAR
 

diff  --git a/libclc/clc/include/clc/shared/unary_def.inc b/libclc/clc/include/clc/shared/unary_def.inc
index 72ca5d159b137..b6826b023c70b 100644
--- a/libclc/clc/include/clc/shared/unary_def.inc
+++ b/libclc/clc/include/clc/shared/unary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifndef __CLC_IMPL_FUNCTION
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

diff  --git a/libclc/clc/include/clc/shared/unary_def_scalarize.inc b/libclc/clc/include/clc/shared/unary_def_scalarize.inc
index c52404b6549e4..e941918312da4 100644
--- a/libclc/clc/include/clc/shared/unary_def_scalarize.inc
+++ b/libclc/clc/include/clc/shared/unary_def_scalarize.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifdef __CLC_SCALAR
 

diff  --git a/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc b/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc
index 9e30e49144cef..544057b0e1378 100644
--- a/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc
+++ b/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #if __CLC_VECSIZE_OR_1 >= 2
 

diff  --git a/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc b/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc
index 76fcd70353e42..fff91d36e626d 100644
--- a/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc
+++ b/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #ifdef __CLC_SCALAR
 

diff  --git a/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h b/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h
index d61f57860fe5b..1e17b078f4836 100644
--- a/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h
+++ b/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h
@@ -13,10 +13,10 @@
 
 #define __CLC_FUNCTION __clc_sub_group_broadcast
 
-#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_subgroup_broadcast.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_subgroup_broadcast.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SUBGROUP_CLC_SUB_GROUP_BROADCAST_H__

diff  --git a/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h b/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h
index ca8f3cbea214a..6454b9915dffe 100644
--- a/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h
+++ b/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h
@@ -11,10 +11,10 @@
 
 #include "clc/internal/clc.h"
 
-#define __CLC_BODY "clc/subgroup/clc_sub_group_reduce.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_sub_group_reduce.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/subgroup/clc_sub_group_reduce.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_sub_group_reduce.inc>
+#include <clc/math/gentype.inc>
 
 #endif // __CLC_SUBGROUP_CLC_SUB_GROUP_REDUCE_H__

diff  --git a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
index c9a855b8101ba..e98dc38e1b0b3 100644
--- a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
+++ b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
@@ -9,8 +9,8 @@
 #ifndef __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__
 #define __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__
 
-#include "clc/internal/clc.h"
-#include "clc/mem_fence/clc_mem_semantic.h"
+#include <clc/internal/clc.h>
+#include <clc/mem_fence/clc_mem_semantic.h>
 
 _CLC_OVERLOAD _CLC_DECL void
 __clc_work_group_barrier(int memory_scope,

diff  --git a/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h b/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h
index b6e094bf8cae8..3a1137ef3998d 100644
--- a/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_ENQUEUED_LOCAL_SIZE_H__
 #define __CLC_WORKITEM_CLC_GET_ENQUEUED_LOCAL_SIZE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t
 __clc_get_enqueued_local_size(uint dim);

diff  --git a/libclc/clc/include/clc/workitem/clc_get_global_id.h b/libclc/clc/include/clc/workitem/clc_get_global_id.h
index d5d7b8a4d2e56..8a78c78bbc164 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__
 #define __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_id(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_global_offset.h b/libclc/clc/include/clc/workitem/clc_get_global_offset.h
index 2634f96bbfb3e..bf6d4e5c7642d 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_offset.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_offset.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__
 #define __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_offset(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_global_size.h b/libclc/clc/include/clc/workitem/clc_get_global_size.h
index 897b7027f4a6a..87b88d7d1b4b0 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_size.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__
 #define __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_size(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_group_id.h b/libclc/clc/include/clc/workitem/clc_get_group_id.h
index 44d938b3e77bf..cc1b0f13ad792 100644
--- a/libclc/clc/include/clc/workitem/clc_get_group_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_group_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_GROUP_ID_H__
 #define __CLC_WORKITEM_CLC_GET_GROUP_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_group_id(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_local_id.h b/libclc/clc/include/clc/workitem/clc_get_local_id.h
index 2bc8ccf76eb9c..a25e5ebaa5e45 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__
 #define __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_id(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
index 2afed829fdaed..9548644f05ca9 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__
 #define __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_linear_id();
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_local_size.h b/libclc/clc/include/clc/workitem/clc_get_local_size.h
index f2c356568e406..1272227b65e1b 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_size.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__
 #define __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_size(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
index a5c98aeba94b8..0e3b67f64b809 100644
--- a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__
 #define __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_max_sub_group_size(void);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_num_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_groups.h
index 38f5cc8f5f000..6071fc3f141fb 100644
--- a/libclc/clc/include/clc/workitem/clc_get_num_groups.h
+++ b/libclc/clc/include/clc/workitem/clc_get_num_groups.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__
 #define __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_num_groups(uint dim);
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
index b584df98e44a6..f94e898268921 100644
--- a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
+++ b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__
 #define __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_num_sub_groups();
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
index 44a4459aa48b4..61b54ecde4766 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__
 #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_id();
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
index 52e4b3f28083a..a158153bde1e9 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__
 #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_local_id();
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
index 4603bfdcbeb25..c4b1d928b20d2 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__
 #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_size();
 

diff  --git a/libclc/clc/include/clc/workitem/clc_get_work_dim.h b/libclc/clc/include/clc/workitem/clc_get_work_dim.h
index eaf547b9646a0..e93d3773b8ca9 100644
--- a/libclc/clc/include/clc/workitem/clc_get_work_dim.h
+++ b/libclc/clc/include/clc/workitem/clc_get_work_dim.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_WORKITEM_CLC_GET_WORK_DIM_H__
 #define __CLC_WORKITEM_CLC_GET_WORK_DIM_H__
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_work_dim();
 

diff  --git a/libclc/clc/lib/amdgpu/math/clc_exp.cl b/libclc/clc/lib/amdgpu/math/clc_exp.cl
index bf8521740d1f5..ae82bbb3a5c61 100644
--- a/libclc/clc/lib/amdgpu/math/clc_exp.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_exp.cl
@@ -10,6 +10,6 @@
 
 #define __CLC_FUNCTION __clc_exp
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_exp10.cl b/libclc/clc/lib/amdgpu/math/clc_exp10.cl
index b3734ec63d7a7..b7fc6bf8cabbe 100644
--- a/libclc/clc/lib/amdgpu/math/clc_exp10.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_exp10.cl
@@ -10,6 +10,6 @@
 
 #define __CLC_FUNCTION __clc_exp10
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_exp2.cl
index 5ba9033769eb5..4b351fdd935fa 100644
--- a/libclc/clc/lib/amdgpu/math/clc_exp2.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_exp2.cl
@@ -10,6 +10,6 @@
 
 #define __CLC_FUNCTION __clc_exp2
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_frexp.cl b/libclc/clc/lib/amdgpu/math/clc_frexp.cl
index 2acd830688ff8..9234f84b274df 100644
--- a/libclc/clc/lib/amdgpu/math/clc_frexp.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_frexp.cl
@@ -6,38 +6,38 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_frexp.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_frexp.h>
 
-#define __CLC_BODY "clc_frexp_builtin.inc"
+#define __CLC_BODY <clc_frexp_builtin.inc>
 #define __CLC_ADDRESS_SPACE private
 #define __CLC_PRIVATE
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 #undef __CLC_PRIVATE
 
-#define __CLC_BODY "clc_frexp_builtin.inc"
+#define __CLC_BODY <clc_frexp_builtin.inc>
 #define __CLC_ADDRESS_SPACE global
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 
-#define __CLC_BODY "clc_frexp_builtin.inc"
+#define __CLC_BODY <clc_frexp_builtin.inc>
 #define __CLC_ADDRESS_SPACE local
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 
 #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
-#define __CLC_BODY "clc_frexp_builtin.inc"
+#define __CLC_BODY <clc_frexp_builtin.inc>
 #define __CLC_ADDRESS_SPACE generic
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 #endif
 
 #define __CLC_FUNCTION __clc_frexp
 #define __CLC_ARG2_TYPE int
 #define __CLC_ADDRSPACE private
-#define __CLC_BODY "clc/shared/unary_def_with_ptr_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_with_ptr_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRSPACE
 #undef __CLC_ARG2_TYPE
 #undef __CLC_FUNCTION

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_exp.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp.cl
index 496c898887f89..c332708615e19 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_exp.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_exp.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_exp.h"
+#include <clc/math/clc_native_exp.h>
 
 #define __CLC_FUNC exp
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl
index de582386ead1b..5560f7ac97965 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_exp10.h"
+#include <clc/math/clc_native_exp10.h>
 
 #define __CLC_FUNC exp10
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl
index 91c6d517b2b87..3e38cbee3285c 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_exp2.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_exp2.h>
 
 #define __CLC_FUNC exp2
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_log.cl b/libclc/clc/lib/amdgpu/math/clc_half_log.cl
index 016e32c526ddf..0b731c202e20b 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_log.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_log.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log.h"
+#include <clc/math/clc_native_log.h>
 
 #define __CLC_FUNC log
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_log10.cl b/libclc/clc/lib/amdgpu/math/clc_half_log10.cl
index 1dcab8b19a25c..1fd8ba520411e 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_log10.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_log10.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log10.h"
+#include <clc/math/clc_native_log10.h>
 
 #define __CLC_FUNC log10
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_log2.cl b/libclc/clc/lib/amdgpu/math/clc_half_log2.cl
index 7c8debcc9e275..e4d27421f8fe0 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_log2.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_log2.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log2.h"
+#include <clc/math/clc_native_log2.h>
 
 #define __CLC_FUNC log2
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc b/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc
index 12e92b3bdd975..d62343400f2c4 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc
+++ b/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #define __CLC_HALF_FUNC(x) __CLC_CONCAT(__clc_half_, x)
 #define __CLC_NATIVE_FUNC(x) __CLC_CONCAT(__clc_native_, x)

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_recip.cl b/libclc/clc/lib/amdgpu/math/clc_half_recip.cl
index 99847f2db5193..0a1c170375314 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_recip.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_recip.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_recip.h"
+#include <clc/math/clc_native_recip.h>
 
 #define __CLC_FUNC recip
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl b/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl
index 0f6504057e7c9..a17ac508b5ad3 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_rsqrt.h"
+#include <clc/math/clc_native_rsqrt.h>
 
 #define __CLC_FUNC rsqrt
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl b/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl
index 6620d1a55a387..142a878818535 100644
--- a/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_sqrt.h"
+#include <clc/math/clc_native_sqrt.h>
 
 #define __CLC_FUNC sqrt
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_native_unary.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_half_native_unary.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_ldexp.cl b/libclc/clc/lib/amdgpu/math/clc_ldexp.cl
index 00716a0f0756b..bc6028ed13b2c 100644
--- a/libclc/clc/lib/amdgpu/math/clc_ldexp.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_ldexp.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_ldexp.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_ldexp.h>
 
 #define __CLC_FUNCTION __clc_ldexp
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_ldexp
-#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_int_second_arg.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_native_exp.cl b/libclc/clc/lib/amdgpu/math/clc_native_exp.cl
index ea5fe6c806a0b..946b9beed5be4 100644
--- a/libclc/clc/lib/amdgpu/math/clc_native_exp.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_native_exp.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_exp2.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_exp2.h>
 
-#define __CLC_BODY "clc_native_exp.inc"
+#define __CLC_BODY <clc_native_exp.inc>
 #define __CLC_FLOAT_ONLY
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl
index 46917b95bfd26..a940323b60a71 100644
--- a/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_MIN_VECSIZE 1
 #define __CLC_FUNCTION __clc_native_exp2
 #define __CLC_IMPL_FUNCTION __builtin_amdgcn_exp2f
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/math/clc_native_log10.cl b/libclc/clc/lib/amdgpu/math/clc_native_log10.cl
index 286cf68f5bcbc..c356b22b6b6e0 100644
--- a/libclc/clc/lib/amdgpu/math/clc_native_log10.cl
+++ b/libclc/clc/lib/amdgpu/math/clc_native_log10.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_log2.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_log2.h>
 
-#define __CLC_BODY "clc_native_log10.inc"
+#define __CLC_BODY <clc_native_log10.inc>
 #define __CLC_FLOAT_ONLY
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl b/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
index c5054ffe32ec7..f54c9e214752c 100644
--- a/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
+++ b/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/mem_fence/clc_mem_fence.h"
+#include <clc/mem_fence/clc_mem_fence.h>
 
 #define BUILTIN_FENCE_ORDER(memory_order, ...)                                 \
   switch (memory_order) {                                                      \

diff  --git a/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
index 969833bcd67d3..d6dc95b574910 100644
--- a/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
+++ b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl
@@ -78,8 +78,8 @@ __clc_sub_group_broadcast(double x, uint sub_group_local_id) {
   return __builtin_astype(broadcast, double);
 }
 
-#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast_scalarize.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_subgroup_broadcast_scalarize.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/subgroup/clc_subgroup_broadcast_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl b/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
index 178b95d44d9e5..0950af0aaf0d6 100644
--- a/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
+++ b/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/mem_fence/clc_mem_fence.h"
-#include "clc/synchronization/clc_work_group_barrier.h"
+#include <clc/mem_fence/clc_mem_fence.h>
+#include <clc/synchronization/clc_work_group_barrier.h>
 
 _CLC_OVERLOAD _CLC_DEF void
 __clc_work_group_barrier(int memory_scope,

diff  --git a/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
index 5fe6803685ebd..eca855072004e 100644
--- a/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
+++ b/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_global_offset.h"
 #include <amdhsa_abi.h>
+#include <clc/workitem/clc_get_global_offset.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t __clc_get_global_offset(uint dim) {
   __constant amdhsa_implicit_kernarg_v5 *implicit_args =

diff  --git a/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
index 56dc11c789e51..4dab7905ba301 100644
--- a/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
+++ b/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_group_id.h"
+#include <clc/workitem/clc_get_group_id.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t __clc_get_group_id(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
index bda46aa475183..8d1d16d4762fd 100644
--- a/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
+++ b/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_id.h"
+#include <clc/workitem/clc_get_local_id.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t __clc_get_local_id(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
index 9811772db9c4f..1c66d0be410ff 100644
--- a/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
+++ b/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_work_dim.h"
 #include <amdhsa_abi.h>
+#include <clc/workitem/clc_get_work_dim.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_work_dim() {
   __constant amdhsa_implicit_kernarg_v5 *implicit_args =

diff  --git a/libclc/clc/lib/clspv/math/clc_sw_fma.cl b/libclc/clc/lib/clspv/math/clc_sw_fma.cl
index 306aad5142120..c28b9441b05ff 100644
--- a/libclc/clc/lib/clspv/math/clc_sw_fma.cl
+++ b/libclc/clc/lib/clspv/math/clc_sw_fma.cl
@@ -10,18 +10,18 @@
 // (__clc_sw_fma), but avoids the use of ulong in favor of uint2. The logic has
 // been updated as appropriate.
 
-#include "clc/clc_as_type.h"
-#include "clc/float/definitions.h"
-#include "clc/integer/clc_abs.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/integer/clc_hadd.h"
-#include "clc/integer/clc_mul_hi.h"
-#include "clc/integer/definitions.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_max.h"
+#include <clc/clc_as_type.h>
+#include <clc/float/definitions.h>
+#include <clc/integer/clc_abs.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/integer/clc_hadd.h>
+#include <clc/integer/clc_mul_hi.h>
+#include <clc/integer/definitions.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_max.h>
 
 struct fp {
   uint2 mantissa;
@@ -270,5 +270,5 @@ _CLC_DEF _CLC_OVERLOAD float __clc_sw_fma(float a, float b, float c) {
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_sw_fma
-#define __CLC_BODY "clc/shared/ternary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/ternary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/async/clc_prefetch.cl b/libclc/clc/lib/generic/async/clc_prefetch.cl
index 58e32b0e0ae8f..1b8da199eb4ad 100644
--- a/libclc/clc/lib/generic/async/clc_prefetch.cl
+++ b/libclc/clc/lib/generic/async/clc_prefetch.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/async/clc_prefetch.h"
-#include "clc/internal/clc.h"
+#include <clc/async/clc_prefetch.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_prefetch.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_prefetch.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_prefetch.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_prefetch.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl b/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl
index 8cc9f767d8227..796dedcef3857 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_compare_exchange.h"
+#include <clc/atomic/clc_atomic_compare_exchange.h>
 
-#define __CLC_BODY "clc_atomic_compare_exchange.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_compare_exchange.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_atomic_compare_exchange.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_compare_exchange.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl b/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl
index a6c5119c6027e..4603e7ebd86de 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_dec.h"
+#include <clc/atomic/clc_atomic_dec.h>
 
 #define __CLC_FUNCTION __clc_atomic_dec
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_udec
 #define __CLC_INC_DEC
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl b/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl
index e138780739267..b2c26758103cd 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_exchange.h"
+#include <clc/atomic/clc_atomic_exchange.h>
 
 #define __CLC_FUNCTION __clc_atomic_exchange
 #define __CLC_IMPL_FUNCTION __scoped_atomic_exchange_n
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_CASTTYPE
 #undef __CLC_AS_RETTYPE
@@ -21,5 +21,5 @@
 #define __CLC_AS_RETTYPE(x) __CLC_AS_GENTYPE(x)
 #define __CLC_AS_CASTTYPE __CLC_AS_S_GENTYPE
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl
index d8536aa5f1cbf..06fa21344ec84 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_add.h"
+#include <clc/atomic/clc_atomic_fetch_add.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_add
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_add
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl
index ef21d82417965..7b9750d8d4db7 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_and.h"
+#include <clc/atomic/clc_atomic_fetch_and.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_and
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_and
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl
index 6a4995f955d38..6401d3e9439f0 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_max.h"
+#include <clc/atomic/clc_atomic_fetch_max.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_max
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_max
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl
index b138bfd21a3a3..51e3904a5c6e3 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_min.h"
+#include <clc/atomic/clc_atomic_fetch_min.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_min
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_min
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl
index 2d95e73a26577..e92e351db3f42 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_or.h"
+#include <clc/atomic/clc_atomic_fetch_or.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_or
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_or
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl
index 0797fd8f3e895..fbbf7a4def566 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_sub.h"
+#include <clc/atomic/clc_atomic_fetch_sub.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_sub
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_sub
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl
index 9a32125f8ca9c..d041fd164d386 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_xor.h"
+#include <clc/atomic/clc_atomic_fetch_xor.h>
 
 #define __CLC_FUNCTION __clc_atomic_fetch_xor
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_xor
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl b/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl
index 60fc30fde25cb..e03e63bd82d5a 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_flag_clear.h"
-#include "clc/atomic/clc_atomic_store.h"
+#include <clc/atomic/clc_atomic_flag_clear.h>
+#include <clc/atomic/clc_atomic_store.h>
 
 #define __CLC_ATOMIC_FLAG_FALSE 0
 

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl b/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl
index 515458ec88ad3..4a033e3532af9 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_exchange.h"
-#include "clc/atomic/clc_atomic_flag_test_and_set.h"
+#include <clc/atomic/clc_atomic_exchange.h>
+#include <clc/atomic/clc_atomic_flag_test_and_set.h>
 
 #define __CLC_ATOMIC_FLAG_TRUE 1
 

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl b/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl
index cd9ff8786fb93..53915c5887687 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_inc.h"
+#include <clc/atomic/clc_atomic_inc.h>
 
 #define __CLC_FUNCTION __clc_atomic_inc
 #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_uinc
 #define __CLC_INC_DEC
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_load.cl b/libclc/clc/lib/generic/atomic/clc_atomic_load.cl
index 5a8cb8da017c9..af808553a7110 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_load.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_load.cl
@@ -6,19 +6,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_load.h"
+#include <clc/atomic/clc_atomic_load.h>
 
 #define __CLC_FUNCTION __clc_atomic_load
 #define __CLC_IMPL_FUNCTION __scoped_atomic_load_n
 #define __CLC_NO_VALUE_ARG
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_CASTTYPE
 #undef __CLC_AS_RETTYPE
 #define __CLC_CASTTYPE __CLC_BIT_INTN
 #define __CLC_AS_RETTYPE(x) __CLC_AS_GENTYPE(x)
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/atomic/clc_atomic_store.cl b/libclc/clc/lib/generic/atomic/clc_atomic_store.cl
index e0429b0acf86a..66ae2ba98556d 100644
--- a/libclc/clc/lib/generic/atomic/clc_atomic_store.cl
+++ b/libclc/clc/lib/generic/atomic/clc_atomic_store.cl
@@ -6,19 +6,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_store.h"
+#include <clc/atomic/clc_atomic_store.h>
 
 #define __CLC_FUNCTION __clc_atomic_store
 #define __CLC_IMPL_FUNCTION __scoped_atomic_store_n
 #define __CLC_RETURN_VOID
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
 #undef __CLC_CASTTYPE
 #undef __CLC_AS_CASTTYPE
 #define __CLC_CASTTYPE __CLC_BIT_INTN
 #define __CLC_AS_CASTTYPE __CLC_AS_S_GENTYPE
 
-#define __CLC_BODY "clc_atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl b/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl
index ebf2d2eb1710f..d54bda65773f8 100644
--- a/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl
+++ b/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl
@@ -16,8 +16,8 @@
 
 #pragma OPENCL EXTENSION __cl_clang_function_scope_local_variables : enable
 
-#define __CLC_BODY "clc_work_group_broadcast.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_work_group_broadcast.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_work_group_broadcast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_work_group_broadcast.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl b/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl
index dbe0eaba656e4..a28b5cf1c2c58 100644
--- a/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl
+++ b/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl
@@ -23,8 +23,8 @@ enum __CLC_WORK_GROUP_REDUCE_OP {
   __CLC_WORK_GROUP_REDUCE_MAX
 };
 
-#define __CLC_BODY "clc_work_group_reduce.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_work_group_reduce.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_work_group_reduce.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_work_group_reduce.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/common/clc_degrees.cl b/libclc/clc/lib/generic/common/clc_degrees.cl
index 6938c6ca1202b..9c48f50f3518d 100644
--- a/libclc/clc/lib/generic/common/clc_degrees.cl
+++ b/libclc/clc/lib/generic/common/clc_degrees.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_degrees.h"
-#include "clc/internal/clc.h"
+#include <clc/common/clc_degrees.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_degrees.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_degrees.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/common/clc_radians.cl b/libclc/clc/lib/generic/common/clc_radians.cl
index 31340ddd19714..6e8d6f3638101 100644
--- a/libclc/clc/lib/generic/common/clc_radians.cl
+++ b/libclc/clc/lib/generic/common/clc_radians.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_radians.h"
-#include "clc/internal/clc.h"
+#include <clc/common/clc_radians.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_radians.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_radians.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/common/clc_sign.cl b/libclc/clc/lib/generic/common/clc_sign.cl
index 0dc29abf95633..07cfe4bfcfffb 100644
--- a/libclc/clc/lib/generic/common/clc_sign.cl
+++ b/libclc/clc/lib/generic/common/clc_sign.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_copysign.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/math/clc_copysign.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_sign.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sign.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/common/clc_smoothstep.cl b/libclc/clc/lib/generic/common/clc_smoothstep.cl
index 73d15c0dcded3..1c4d4a5a9b0bf 100644
--- a/libclc/clc/lib/generic/common/clc_smoothstep.cl
+++ b/libclc/clc/lib/generic/common/clc_smoothstep.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_smoothstep.h"
-#include "clc/internal/clc.h"
-#include "clc/shared/clc_clamp.h"
+#include <clc/common/clc_smoothstep.h>
+#include <clc/internal/clc.h>
+#include <clc/shared/clc_clamp.h>
 
-#define __CLC_BODY "clc_smoothstep.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_smoothstep.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/common/clc_step.cl b/libclc/clc/lib/generic/common/clc_step.cl
index 62370fe135a84..6bb9a66760e27 100644
--- a/libclc/clc/lib/generic/common/clc_step.cl
+++ b/libclc/clc/lib/generic/common/clc_step.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_step.h"
-#include "clc/internal/clc.h"
+#include <clc/common/clc_step.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_step.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_step.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl b/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl
index aa5dbaf1ab732..41dc43f67aa66 100644
--- a/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl
+++ b/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/common/clc_sign.h"
-#include "clc/float/definitions.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_nextafter.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_clamp.h"
+#include <clc/clc_convert.h>
+#include <clc/common/clc_sign.h>
+#include <clc/float/definitions.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_nextafter.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_clamp.h>
 
 #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE)
 
@@ -25,24 +25,24 @@
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 #define __CLC_SCALAR_TYPE_SRC half
 #define __CLC_SCALAR_TYPE_SRC_S short
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_SCALAR_TYPE_SRC_S
 #endif // cl_khr_fp16
 
 #define __CLC_SCALAR_TYPE_SRC float
 #define __CLC_SCALAR_TYPE_SRC_S int
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_SCALAR_TYPE_SRC_S
 
 #ifdef cl_khr_fp64
 #define __CLC_SCALAR_TYPE_SRC double
 #define __CLC_SCALAR_TYPE_SRC_S long
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_SCALAR_TYPE_SRC_S
 #endif // cl_khr_fp64

diff  --git a/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl b/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl
index 18036aef27b92..cc7016fcbefbd 100644
--- a/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl
+++ b/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/definitions.h"
-#include "clc/math/clc_ceil.h"
-#include "clc/math/clc_floor.h"
-#include "clc/math/clc_rint.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/definitions.h>
+#include <clc/math/clc_ceil.h>
+#include <clc/math/clc_floor.h>
+#include <clc/math/clc_rint.h>
+#include <clc/relational/clc_select.h>
 
 #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST
 #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST)
@@ -28,29 +28,29 @@
 
 #define __CLC_SCALAR_TYPE_DST char
 #define __CLC_GENSIZE_DST 8
-#define __CLC_BODY "clc_convert_float2int.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float2int.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 #undef __CLC_GENSIZE_DST
 
 #define __CLC_SCALAR_TYPE_DST short
 #define __CLC_GENSIZE_DST 16
-#define __CLC_BODY "clc_convert_float2int.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float2int.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 #undef __CLC_GENSIZE_DST
 
 #define __CLC_SCALAR_TYPE_DST int
 #define __CLC_GENSIZE_DST 32
-#define __CLC_BODY "clc_convert_float2int.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float2int.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 #undef __CLC_GENSIZE_DST
 
 #define __CLC_SCALAR_TYPE_DST long
 #define __CLC_GENSIZE_DST 64
-#define __CLC_BODY "clc_convert_float2int.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float2int.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 #undef __CLC_GENSIZE_DST
 

diff  --git a/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl b/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl
index 33e81a95a5f6d..70bb027d9e436 100644
--- a/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl
+++ b/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/common/clc_sign.h"
-#include "clc/float/definitions.h"
-#include "clc/integer/clc_abs.h"
-#include "clc/integer/definitions.h"
-#include "clc/math/clc_nextafter.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_clamp.h"
-#include "clc/shared/clc_max.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/common/clc_sign.h>
+#include <clc/float/definitions.h>
+#include <clc/integer/clc_abs.h>
+#include <clc/integer/definitions.h>
+#include <clc/math/clc_nextafter.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_clamp.h>
+#include <clc/shared/clc_max.h>
+#include <clc/shared/clc_min.h>
 
 #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE)
 
@@ -33,14 +33,14 @@
 
 #define __CLC_GEN_S
 #define __CLC_SCALAR_TYPE_SRC char
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GEN_S
 
 #define __CLC_SCALAR_TYPE_SRC uchar
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #undef __CLC_SCALAR_TYPE_SRC_S
@@ -50,14 +50,14 @@
 
 #define __CLC_GEN_S
 #define __CLC_SCALAR_TYPE_SRC short
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GEN_S
 
 #define __CLC_SCALAR_TYPE_SRC ushort
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #undef __CLC_SCALAR_TYPE_SRC_S
@@ -67,14 +67,14 @@
 
 #define __CLC_GEN_S
 #define __CLC_SCALAR_TYPE_SRC int
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GEN_S
 
 #define __CLC_SCALAR_TYPE_SRC uint
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #undef __CLC_SCALAR_TYPE_SRC_S
@@ -84,14 +84,14 @@
 
 #define __CLC_GEN_S
 #define __CLC_SCALAR_TYPE_SRC long
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GEN_S
 
 #define __CLC_SCALAR_TYPE_SRC ulong
-#define __CLC_BODY "clc_convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #undef __CLC_GENTYPE_SRC

diff  --git a/libclc/clc/lib/generic/conversion/clc_convert_integer.cl b/libclc/clc/lib/generic/conversion/clc_convert_integer.cl
index 2d509ab70c917..bef4ff7b3ad65 100644
--- a/libclc/clc/lib/generic/conversion/clc_convert_integer.cl
+++ b/libclc/clc/lib/generic/conversion/clc_convert_integer.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/definitions.h"
-#include "clc/shared/clc_clamp.h"
-#include "clc/shared/clc_max.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/definitions.h>
+#include <clc/shared/clc_clamp.h>
+#include <clc/shared/clc_max.h>
+#include <clc/shared/clc_min.h>
 
 #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC
 #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC)
@@ -25,30 +25,30 @@
 
 #define __CLC_SCALAR_TYPE_SRC char
 #define __CLC_GENSIZE_SRC 8
-#define __CLC_BODY "clc_convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GENSIZE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC short
 #define __CLC_GENSIZE_SRC 16
-#define __CLC_BODY "clc_convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GENSIZE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC int
 #define __CLC_GENSIZE_SRC 32
-#define __CLC_BODY "clc_convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GENSIZE_SRC
 
 #if defined cles_khr_int64 || !defined(__EMBEDDED_PROFILE__)
 #define __CLC_SCALAR_TYPE_SRC long
 #define __CLC_GENSIZE_SRC 64
-#define __CLC_BODY "clc_convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #undef __CLC_GENSIZE_SRC
 #endif // defined cles_khr_int64 || !defined(__EMBEDDED_PROFILE__)

diff  --git a/libclc/clc/lib/generic/geometric/clc_cross.cl b/libclc/clc/lib/generic/geometric/clc_cross.cl
index e7f82b346593e..4ed1d5797d9a2 100644
--- a/libclc/clc/lib/generic/geometric/clc_cross.cl
+++ b/libclc/clc/lib/generic/geometric/clc_cross.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_cross.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_cross.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_distance.cl b/libclc/clc/lib/generic/geometric/clc_distance.cl
index c317195ecb1e1..ba22c9e17330a 100644
--- a/libclc/clc/lib/generic/geometric/clc_distance.cl
+++ b/libclc/clc/lib/generic/geometric/clc_distance.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_length.h"
-#include "clc/internal/clc.h"
+#include <clc/geometric/clc_length.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_distance.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_distance.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_dot.cl b/libclc/clc/lib/generic/geometric/clc_dot.cl
index 52d75d3e2f267..a30f9bc6e301a 100644
--- a/libclc/clc/lib/generic/geometric/clc_dot.cl
+++ b/libclc/clc/lib/generic/geometric/clc_dot.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
 
-#define __CLC_BODY "clc_dot.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_dot.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_fast_distance.cl b/libclc/clc/lib/generic/geometric/clc_fast_distance.cl
index 9e40b589f9732..6b645df0b3ddb 100644
--- a/libclc/clc/lib/generic/geometric/clc_fast_distance.cl
+++ b/libclc/clc/lib/generic/geometric/clc_fast_distance.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_fast_length.h"
-#include "clc/internal/clc.h"
+#include <clc/geometric/clc_fast_length.h>
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_fast_distance.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_fast_distance.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_fast_length.cl b/libclc/clc/lib/generic/geometric/clc_fast_length.cl
index 484a0dcd60d31..ce6ec5283e524 100644
--- a/libclc/clc/lib/generic/geometric/clc_fast_length.cl
+++ b/libclc/clc/lib/generic/geometric/clc_fast_length.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_dot.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_half_sqrt.h"
+#include <clc/geometric/clc_dot.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_half_sqrt.h>
 
 _CLC_OVERLOAD _CLC_DEF float __clc_fast_length(float p) {
   return __clc_fabs(p);

diff  --git a/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl b/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl
index 47910cf191a3a..a5883efe7bd90 100644
--- a/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl
+++ b/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_dot.h"
-#include "clc/geometric/clc_normalize.h"
-#include "clc/math/clc_half_rsqrt.h"
+#include <clc/geometric/clc_dot.h>
+#include <clc/geometric/clc_normalize.h>
+#include <clc/math/clc_half_rsqrt.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_fast_normalize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_fast_normalize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_length.cl b/libclc/clc/lib/generic/geometric/clc_length.cl
index 9e41b35b31598..d9a9166b92ae7 100644
--- a/libclc/clc/lib/generic/geometric/clc_length.cl
+++ b/libclc/clc/lib/generic/geometric/clc_length.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/geometric/clc_dot.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sqrt.h"
+#include <clc/float/definitions.h>
+#include <clc/geometric/clc_dot.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sqrt.h>
 
-#define __CLC_BODY "clc_length.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_length.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/geometric/clc_normalize.cl b/libclc/clc/lib/generic/geometric/clc_normalize.cl
index 18188bf11b66a..ec4a67647c13e 100644
--- a/libclc/clc/lib/generic/geometric/clc_normalize.cl
+++ b/libclc/clc/lib/generic/geometric/clc_normalize.cl
@@ -6,17 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/common/clc_sign.h"
-#include "clc/float/definitions.h"
-#include "clc/geometric/clc_dot.h"
-#include "clc/geometric/clc_normalize.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_rsqrt.h"
-#include "clc/relational/clc_all.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/common/clc_sign.h>
+#include <clc/float/definitions.h>
+#include <clc/geometric/clc_dot.h>
+#include <clc/geometric/clc_normalize.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_rsqrt.h>
+#include <clc/relational/clc_all.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_normalize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_normalize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_abs.cl b/libclc/clc/lib/generic/integer/clc_abs.cl
index 269dcf1e564c6..c2bea5bec8123 100644
--- a/libclc/clc/lib/generic/integer/clc_abs.cl
+++ b/libclc/clc/lib/generic/integer/clc_abs.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_abs.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_abs.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_abs_
diff .cl b/libclc/clc/lib/generic/integer/clc_abs_
diff .cl
index 80a92934dd037..c168b06060aa3 100644
--- a/libclc/clc/lib/generic/integer/clc_abs_
diff .cl
+++ b/libclc/clc/lib/generic/integer/clc_abs_
diff .cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_abs_
diff .inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_abs_
diff .inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_add_sat.cl b/libclc/clc/lib/generic/integer/clc_add_sat.cl
index f60afb65f14cd..08337bf533fc0 100644
--- a/libclc/clc/lib/generic/integer/clc_add_sat.cl
+++ b/libclc/clc/lib/generic/integer/clc_add_sat.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_add_sat
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_add_sat
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_bit_reverse.cl b/libclc/clc/lib/generic/integer/clc_bit_reverse.cl
index 5cc72d13cadca..9bf57e2c7d83f 100644
--- a/libclc/clc/lib/generic/integer/clc_bit_reverse.cl
+++ b/libclc/clc/lib/generic/integer/clc_bit_reverse.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_bit_reverse.h"
+#include <clc/integer/clc_bit_reverse.h>
 
 #define __CLC_FUNCTION __clc_bit_reverse
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_bitreverse
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl b/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl
index 014efc99ab736..d779ed6a43593 100644
--- a/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl
+++ b/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_bitfield_extract_signed.h"
+#include <clc/integer/clc_bitfield_extract_signed.h>
 
-#define __CLC_BODY "clc_bitfield_extract_signed.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_bitfield_extract_signed.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl b/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl
index 8f7af6e604f5c..bf7db401034dc 100644
--- a/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl
+++ b/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_bitfield_extract_unsigned.h"
+#include <clc/integer/clc_bitfield_extract_unsigned.h>
 
-#define __CLC_BODY "clc_bitfield_extract_unsigned.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_bitfield_extract_unsigned.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl b/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl
index 4678bcfb22479..a40fc804f2187 100644
--- a/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl
+++ b/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_bitfield_insert.h"
+#include <clc/integer/clc_bitfield_insert.h>
 
-#define __CLC_BODY "clc_bitfield_insert.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_bitfield_insert.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_clz.cl b/libclc/clc/lib/generic/integer/clc_clz.cl
index 4f54cf3416f5d..48c4400f199f5 100644
--- a/libclc/clc/lib/generic/integer/clc_clz.cl
+++ b/libclc/clc/lib/generic/integer/clc_clz.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_clz.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_clz.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_ctz.cl b/libclc/clc/lib/generic/integer/clc_ctz.cl
index 01c4df09cd60b..42cfa90c3e66a 100644
--- a/libclc/clc/lib/generic/integer/clc_ctz.cl
+++ b/libclc/clc/lib/generic/integer/clc_ctz.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_ctz.h"
-#include "clc/internal/clc.h"
+#include <clc/integer/clc_ctz.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_ctz.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_ctz.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_hadd.cl b/libclc/clc/lib/generic/integer/clc_hadd.cl
index dee74b6d7c559..0f11e547c1ca1 100644
--- a/libclc/clc/lib/generic/integer/clc_hadd.cl
+++ b/libclc/clc/lib/generic/integer/clc_hadd.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_hadd.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_hadd.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_mad24.cl b/libclc/clc/lib/generic/integer/clc_mad24.cl
index bb394dd70e84b..12b72a20b35cf 100644
--- a/libclc/clc/lib/generic/integer/clc_mad24.cl
+++ b/libclc/clc/lib/generic/integer/clc_mad24.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mul24.h"
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
+#include <clc/integer/clc_mul24.h>
 
-#define __CLC_BODY "clc_mad24.inc"
-#include "clc/integer/gentype24.inc"
+#define __CLC_BODY <clc_mad24.inc>
+#include <clc/integer/gentype24.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_mad_sat.cl b/libclc/clc/lib/generic/integer/clc_mad_sat.cl
index 77470d17306e8..93088dc9f0b69 100644
--- a/libclc/clc/lib/generic/integer/clc_mad_sat.cl
+++ b/libclc/clc/lib/generic/integer/clc_mad_sat.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_add_sat.h"
-#include "clc/integer/clc_mad24.h"
-#include "clc/integer/clc_mul_hi.h"
-#include "clc/integer/clc_upsample.h"
-#include "clc/integer/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_clamp.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_add_sat.h>
+#include <clc/integer/clc_mad24.h>
+#include <clc/integer/clc_mul_hi.h>
+#include <clc/integer/clc_upsample.h>
+#include <clc/integer/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_clamp.h>
 
 #define __CLC_DEFINE_SIMPLE_MAD_SAT(TYPE, UP_TYPE, LIT_PREFIX)                 \
   _CLC_OVERLOAD _CLC_DEF TYPE __clc_mad_sat(TYPE x, TYPE y, TYPE z) {          \

diff  --git a/libclc/clc/lib/generic/integer/clc_mul24.cl b/libclc/clc/lib/generic/integer/clc_mul24.cl
index 3cda150c96f44..9b362af51ef74 100644
--- a/libclc/clc/lib/generic/integer/clc_mul24.cl
+++ b/libclc/clc/lib/generic/integer/clc_mul24.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_mul24.inc"
-#include "clc/integer/gentype24.inc"
+#define __CLC_BODY <clc_mul24.inc>
+#include <clc/integer/gentype24.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_mul_hi.cl b/libclc/clc/lib/generic/integer/clc_mul_hi.cl
index c627a6cb5034a..117d8471fb8a3 100644
--- a/libclc/clc/lib/generic/integer/clc_mul_hi.cl
+++ b/libclc/clc/lib/generic/integer/clc_mul_hi.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_hadd.h"
-#include "clc/integer/definitions.h"
-#include "clc/internal/clc.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_hadd.h>
+#include <clc/integer/definitions.h>
+#include <clc/internal/clc.h>
 
 // For all types EXCEPT long, which is implemented separately
 #define __CLC_MUL_HI_IMPL(BGENTYPE, GENTYPE, GENSIZE)                          \

diff  --git a/libclc/clc/lib/generic/integer/clc_popcount.cl b/libclc/clc/lib/generic/integer/clc_popcount.cl
index 9ac373799b252..2781ead638c97 100644
--- a/libclc/clc/lib/generic/integer/clc_popcount.cl
+++ b/libclc/clc/lib/generic/integer/clc_popcount.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_popcount
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_popcount
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_rhadd.cl b/libclc/clc/lib/generic/integer/clc_rhadd.cl
index 5a0738677f80d..e7dd5c7f4b536 100644
--- a/libclc/clc/lib/generic/integer/clc_rhadd.cl
+++ b/libclc/clc/lib/generic/integer/clc_rhadd.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_rhadd.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_rhadd.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_rotate.cl b/libclc/clc/lib/generic/integer/clc_rotate.cl
index 12eb8c5bf0c18..2abf0178ce3b6 100644
--- a/libclc/clc/lib/generic/integer/clc_rotate.cl
+++ b/libclc/clc/lib/generic/integer/clc_rotate.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/utils.h"
+#include <clc/internal/clc.h>
+#include <clc/utils.h>
 
-#define __CLC_BODY "clc_rotate.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_rotate.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_sub_sat.cl b/libclc/clc/lib/generic/integer/clc_sub_sat.cl
index 022d4c9c0eaba..8a7ffd06f8b0b 100644
--- a/libclc/clc/lib/generic/integer/clc_sub_sat.cl
+++ b/libclc/clc/lib/generic/integer/clc_sub_sat.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_sub_sat
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sub_sat
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/integer/clc_upsample.cl b/libclc/clc/lib/generic/integer/clc_upsample.cl
index 5aa23fa059b04..649bc7830f442 100644
--- a/libclc/clc/lib/generic/integer/clc_upsample.cl
+++ b/libclc/clc/lib/generic/integer/clc_upsample.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
 
 #define __CLC_UPSAMPLE_IMPL(BGENTYPE, GENTYPE, UGENTYPE, GENSIZE)              \
   _CLC_OVERLOAD _CLC_DEF BGENTYPE __clc_upsample(GENTYPE hi, UGENTYPE lo) {    \

diff  --git a/libclc/clc/lib/generic/math/clc_acos.cl b/libclc/clc/lib/generic/math/clc_acos.cl
index 526ee3b17649f..822c3f9f13e8e 100644
--- a/libclc/clc/lib/generic/math/clc_acos.cl
+++ b/libclc/clc/lib/generic/math/clc_acos.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_acos.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_acos.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_acosh.cl b/libclc/clc/lib/generic/math/clc_acosh.cl
index cc73b76dd32f4..a46606be59333 100644
--- a/libclc/clc/lib/generic/math/clc_acosh.cl
+++ b/libclc/clc/lib/generic/math/clc_acosh.cl
@@ -6,19 +6,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_ep_log.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_log1p.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_ep_log.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_log1p.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_acosh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_acosh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_acospi.cl b/libclc/clc/lib/generic/math/clc_acospi.cl
index b8100bbfd04b5..22134d3209e60 100644
--- a/libclc/clc/lib/generic/math/clc_acospi.cl
+++ b/libclc/clc/lib/generic/math/clc_acospi.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_acospi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_acospi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_asin.cl b/libclc/clc/lib/generic/math/clc_asin.cl
index 4abe4b6bcf109..195ede3907f3c 100644
--- a/libclc/clc/lib/generic/math/clc_asin.cl
+++ b/libclc/clc/lib/generic/math/clc_asin.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_asin.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_asin.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_asinh.cl b/libclc/clc/lib/generic/math/clc_asinh.cl
index 5500f4748b14c..763efb4e76aca 100644
--- a/libclc/clc/lib/generic/math/clc_asinh.cl
+++ b/libclc/clc/lib/generic/math/clc_asinh.cl
@@ -6,19 +6,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_ep_log.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_log.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_ep_log.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_log.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_asinh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_asinh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_asinpi.cl b/libclc/clc/lib/generic/math/clc_asinpi.cl
index cad756266bb0a..bc680df5f9b23 100644
--- a/libclc/clc/lib/generic/math/clc_asinpi.cl
+++ b/libclc/clc/lib/generic/math/clc_asinpi.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_asinpi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_asinpi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_atan.cl b/libclc/clc/lib/generic/math/clc_atan.cl
index 3219299dac2a2..d960f75baca2b 100644
--- a/libclc/clc/lib/generic/math/clc_atan.cl
+++ b/libclc/clc/lib/generic/math/clc_atan.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_atan.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atan.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_atan2.cl b/libclc/clc/lib/generic/math/clc_atan2.cl
index 1ba6751f5a0f1..b10bf32333a32 100644
--- a/libclc/clc/lib/generic/math/clc_atan2.cl
+++ b/libclc/clc/lib/generic/math/clc_atan2.cl
@@ -6,21 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_max.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_max.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_atan2.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atan2.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_atan2pi.cl b/libclc/clc/lib/generic/math/clc_atan2pi.cl
index cee4d8451d85a..7f75c11d15d7b 100644
--- a/libclc/clc/lib/generic/math/clc_atan2pi.cl
+++ b/libclc/clc/lib/generic/math/clc_atan2pi.cl
@@ -6,21 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_max.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_max.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_atan2pi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atan2pi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_atanh.cl b/libclc/clc/lib/generic/math/clc_atanh.cl
index 456a3ac2624c3..485e72479bce4 100644
--- a/libclc/clc/lib/generic/math/clc_atanh.cl
+++ b/libclc/clc/lib/generic/math/clc_atanh.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_log1p.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_log1p.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_atanh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atanh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_atanpi.cl b/libclc/clc/lib/generic/math/clc_atanpi.cl
index 6ed7bdf1c7805..fee72aa7efb47 100644
--- a/libclc/clc/lib/generic/math/clc_atanpi.cl
+++ b/libclc/clc/lib/generic/math/clc_atanpi.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_atanpi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_atanpi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_cbrt.cl b/libclc/clc/lib/generic/math/clc_cbrt.cl
index a3429483e0a69..935b7b7eae78c 100644
--- a/libclc/clc/lib/generic/math/clc_cbrt.cl
+++ b/libclc/clc/lib/generic/math/clc_cbrt.cl
@@ -6,17 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_cbrt.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_cbrt.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_cbrt.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_cbrt.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_ceil.cl b/libclc/clc/lib/generic/math/clc_ceil.cl
index 97a0942d3ecac..e48ad1a482ef7 100644
--- a/libclc/clc/lib/generic/math/clc_ceil.cl
+++ b/libclc/clc/lib/generic/math/clc_ceil.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_ceil
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_ceil
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_copysign.cl b/libclc/clc/lib/generic/math/clc_copysign.cl
index 864d13b5bc5d6..89829e2375ea3 100644
--- a/libclc/clc/lib/generic/math/clc_copysign.cl
+++ b/libclc/clc/lib/generic/math/clc_copysign.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_copysign
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_copysign
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_cos.cl b/libclc/clc/lib/generic/math/clc_cos.cl
index c6e9ed7d7f0a4..5529ec411a195 100644
--- a/libclc/clc/lib/generic/math/clc_cos.cl
+++ b/libclc/clc/lib/generic/math/clc_cos.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_cos.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_cos.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_cosh.cl b/libclc/clc/lib/generic/math/clc_cosh.cl
index 1a376685eeae9..4da78de2714e3 100644
--- a/libclc/clc/lib/generic/math/clc_cosh.cl
+++ b/libclc/clc/lib/generic/math/clc_cosh.cl
@@ -6,19 +6,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_cosh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_cosh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_cospi.cl b/libclc/clc/lib/generic/math/clc_cospi.cl
index 7ccaae3404925..6a10171c723d0 100644
--- a/libclc/clc/lib/generic/math/clc_cospi.cl
+++ b/libclc/clc/lib/generic/math/clc_cospi.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_cospi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_cospi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_div_cr.cl b/libclc/clc/lib/generic/math/clc_div_cr.cl
index 32aa4595ff72e..00af7708e28a0 100644
--- a/libclc/clc/lib/generic/math/clc_div_cr.cl
+++ b/libclc/clc/lib/generic/math/clc_div_cr.cl
@@ -7,5 +7,5 @@
 //===----------------------------------------------------------------------===//
 
 #include "clc/math/clc_div_cr.h"
-#define __CLC_BODY "clc_div_cr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_div_cr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_div_fast.cl b/libclc/clc/lib/generic/math/clc_div_fast.cl
index b9bc2234482d9..b5c477cfcb7c3 100644
--- a/libclc/clc/lib/generic/math/clc_div_fast.cl
+++ b/libclc/clc/lib/generic/math/clc_div_fast.cl
@@ -9,5 +9,5 @@
 #include "clc/math/clc_div_fast.h"
 
 #define __CLC_FUNCTION __clc_div_fast
-#define __CLC_BODY "clc_div_fast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_div_fast.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_ep_log.cl b/libclc/clc/lib/generic/math/clc_ep_log.cl
index 2d228a0dbf193..c6782f77a16d9 100644
--- a/libclc/clc/lib/generic/math/clc_ep_log.cl
+++ b/libclc/clc/lib/generic/math/clc_ep_log.cl
@@ -8,16 +8,16 @@
 
 #ifdef cl_khr_fp64
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_ep_log.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_ep_log.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
 
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 
-#define __CLC_BODY "clc_ep_log.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_ep_log.inc>
+#include <clc/math/gentype.inc>
 
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_erf.cl b/libclc/clc/lib/generic/math/clc_erf.cl
index a2c1adbd37615..61a7c9d684aab 100644
--- a/libclc/clc/lib/generic/math/clc_erf.cl
+++ b/libclc/clc/lib/generic/math/clc_erf.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
 /*
  * ====================================================
@@ -507,5 +507,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_erf(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_erf
-#define __CLC_BODY "clc/shared/unary_def_scalarize_loop.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize_loop.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_erfc.cl b/libclc/clc/lib/generic/math/clc_erfc.cl
index 72733ee93647a..64cabb53bbe9d 100644
--- a/libclc/clc/lib/generic/math/clc_erfc.cl
+++ b/libclc/clc/lib/generic/math/clc_erfc.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
 /*
  * ====================================================
@@ -506,7 +506,7 @@ _CLC_OVERLOAD _CLC_DEF double __clc_erfc(double x) {
 
 #ifdef cl_khr_fp16
 
-#include "clc/clc_convert.h"
+#include <clc/clc_convert.h>
 
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 
@@ -518,5 +518,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_erfc(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_erfc
-#define __CLC_BODY "clc/shared/unary_def_scalarize_loop.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize_loop.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_exp.cl b/libclc/clc/lib/generic/math/clc_exp.cl
index 1e7174c7541c5..6ff452721881c 100644
--- a/libclc/clc/lib/generic/math/clc_exp.cl
+++ b/libclc/clc/lib/generic/math/clc_exp.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp_helper.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp_helper.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_exp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_exp.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_exp10.cl b/libclc/clc/lib/generic/math/clc_exp10.cl
index 932ee0de64f25..0c394ee19475a 100644
--- a/libclc/clc/lib/generic/math/clc_exp10.cl
+++ b/libclc/clc/lib/generic/math/clc_exp10.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_exp10.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_exp10.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_exp2.cl b/libclc/clc/lib/generic/math/clc_exp2.cl
index 0516963ab620f..9635f84e5a9a6 100644
--- a/libclc/clc/lib/generic/math/clc_exp2.cl
+++ b/libclc/clc/lib/generic/math/clc_exp2.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp_helper.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_rint.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp_helper.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_rint.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_exp2.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_exp2.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_exp_helper.cl b/libclc/clc/lib/generic/math/clc_exp_helper.cl
index 106e2e0a6dd07..1670b73b6c980 100644
--- a/libclc/clc/lib/generic/math/clc_exp_helper.cl
+++ b/libclc/clc/lib/generic/math/clc_exp_helper.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isnan.h>
 
 #define __CLC_DOUBLE_ONLY
-#define __CLC_BODY "clc_exp_helper.inc"
+#define __CLC_BODY <clc_exp_helper.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_expm1.cl b/libclc/clc/lib/generic/math/clc_expm1.cl
index 45ce92d70838f..8695b46eb90ea 100644
--- a/libclc/clc/lib/generic/math/clc_expm1.cl
+++ b/libclc/clc/lib/generic/math/clc_expm1.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp_helper.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp_helper.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_expm1.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_expm1.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fabs.cl b/libclc/clc/lib/generic/math/clc_fabs.cl
index f0fa5190d4582..e0c7685bfdb64 100644
--- a/libclc/clc/lib/generic/math/clc_fabs.cl
+++ b/libclc/clc/lib/generic/math/clc_fabs.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_fabs
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_abs
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fdim.cl b/libclc/clc/lib/generic/math/clc_fdim.cl
index 5c0042fa7a0ca..4e76448cde88f 100644
--- a/libclc/clc/lib/generic/math/clc_fdim.cl
+++ b/libclc/clc/lib/generic/math/clc_fdim.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fmax.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fmax.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_fdim.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_fdim.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_floor.cl b/libclc/clc/lib/generic/math/clc_floor.cl
index 7f9619ca1e5fc..f31bed2e9ee64 100644
--- a/libclc/clc/lib/generic/math/clc_floor.cl
+++ b/libclc/clc/lib/generic/math/clc_floor.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_floor
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_floor
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fma.cl b/libclc/clc/lib/generic/math/clc_fma.cl
index 2ac63927623dd..9527460cb2c69 100644
--- a/libclc/clc/lib/generic/math/clc_fma.cl
+++ b/libclc/clc/lib/generic/math/clc_fma.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/math.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/math.h>
 
 #define __CLC_FUNCTION __clc_fma
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_fma
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fmax.cl b/libclc/clc/lib/generic/math/clc_fmax.cl
index 4677f5211f060..0fdbaa5eef5f6 100644
--- a/libclc/clc/lib/generic/math/clc_fmax.cl
+++ b/libclc/clc/lib/generic/math/clc_fmax.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_fmax
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_maximumnum
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fmin.cl b/libclc/clc/lib/generic/math/clc_fmin.cl
index 63034dfd61389..572d54b128a6f 100644
--- a/libclc/clc/lib/generic/math/clc_fmin.cl
+++ b/libclc/clc/lib/generic/math/clc_fmin.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_fmin
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_minimumnum
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_fmod.cl b/libclc/clc/lib/generic/math/clc_fmod.cl
index 2dd387860f684..7f60b403b53e6 100644
--- a/libclc/clc/lib/generic/math/clc_fmod.cl
+++ b/libclc/clc/lib/generic/math/clc_fmod.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_floor.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
-#include "clc/shared/clc_max.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_floor.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
+#include <clc/shared/clc_max.h>
 
 _CLC_DEF _CLC_OVERLOAD float __clc_fmod(float x, float y) {
   int ux = __clc_as_int(x);
@@ -65,8 +65,8 @@ _CLC_DEF _CLC_OVERLOAD float __clc_fmod(float x, float y) {
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_fmod
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNCTION
 
 #ifdef cl_khr_fp64
@@ -173,8 +173,8 @@ _CLC_DEF _CLC_OVERLOAD double __clc_fmod(double x, double y) {
 
 #define __CLC_DOUBLE_ONLY
 #define __CLC_FUNCTION __clc_fmod
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNCTION
 
 #endif
@@ -186,7 +186,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_fmod(double x, double y) {
 // Forward the half version of this builtin onto the float one
 #define __CLC_HALF_ONLY
 #define __CLC_FUNCTION __clc_fmod
-#define __CLC_BODY "clc/math/binary_def_via_fp32.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/binary_def_via_fp32.inc>
+#include <clc/math/gentype.inc>
 
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_fract.cl b/libclc/clc/lib/generic/math/clc_fract.cl
index 21a0dd2893712..681077cb9c899 100644
--- a/libclc/clc/lib/generic/math/clc_fract.cl
+++ b/libclc/clc/lib/generic/math/clc_fract.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_floor.h"
-#include "clc/math/clc_fmin.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_floor.h>
+#include <clc/math/clc_fmin.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
 
-#define __CLC_BODY "clc_fract.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_fract.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_frexp.cl b/libclc/clc/lib/generic/math/clc_frexp.cl
index 08af08e9e781e..7ff292ebb75c1 100644
--- a/libclc/clc/lib/generic/math/clc_frexp.cl
+++ b/libclc/clc/lib/generic/math/clc_frexp.cl
@@ -6,33 +6,33 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/clcfunc.h"
-#include "clc/internal/clc.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
-#include "clc/utils.h"
+#include <clc/clc_convert.h>
+#include <clc/clcfunc.h>
+#include <clc/internal/clc.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
+#include <clc/utils.h>
 
-#define __CLC_BODY "clc_frexp.inc"
+#define __CLC_BODY <clc_frexp.inc>
 #define __CLC_ADDRESS_SPACE private
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 
-#define __CLC_BODY "clc_frexp.inc"
+#define __CLC_BODY <clc_frexp.inc>
 #define __CLC_ADDRESS_SPACE global
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 
-#define __CLC_BODY "clc_frexp.inc"
+#define __CLC_BODY <clc_frexp.inc>
 #define __CLC_ADDRESS_SPACE local
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 
 #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
-#define __CLC_BODY "clc_frexp.inc"
+#define __CLC_BODY <clc_frexp.inc>
 #define __CLC_ADDRESS_SPACE generic
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRESS_SPACE
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_frexp.inc b/libclc/clc/lib/generic/math/clc_frexp.inc
index 725de0697ba3a..763266bc04931 100644
--- a/libclc/clc/lib/generic/math/clc_frexp.inc
+++ b/libclc/clc/lib/generic/math/clc_frexp.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #if __CLC_FPSIZE == 32
 _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE

diff  --git a/libclc/clc/lib/generic/math/clc_half_cos.cl b/libclc/clc/lib/generic/math/clc_half_cos.cl
index 6b942ea202015..4420ad31afae5 100644
--- a/libclc/clc/lib/generic/math/clc_half_cos.cl
+++ b/libclc/clc/lib/generic/math/clc_half_cos.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_cos.h"
+#include <clc/math/clc_cos.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_cos
 #define __CLC_IMPL_FUNCTION(x) __clc_cos
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_divide.cl b/libclc/clc/lib/generic/math/clc_half_divide.cl
index 7c6d902eb6008..16af197d29a75 100644
--- a/libclc/clc/lib/generic/math/clc_half_divide.cl
+++ b/libclc/clc/lib/generic/math/clc_half_divide.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_divide.inc"
+#define __CLC_BODY <clc_half_divide.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_exp.cl b/libclc/clc/lib/generic/math/clc_half_exp.cl
index 0d640eabf66e0..4b4717672d368 100644
--- a/libclc/clc/lib/generic/math/clc_half_exp.cl
+++ b/libclc/clc/lib/generic/math/clc_half_exp.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp.h"
+#include <clc/math/clc_exp.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp
 #define __CLC_IMPL_FUNCTION(x) __clc_exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_exp10.cl b/libclc/clc/lib/generic/math/clc_half_exp10.cl
index fc94c4dd56a48..5bacca1ee0b7d 100644
--- a/libclc/clc/lib/generic/math/clc_half_exp10.cl
+++ b/libclc/clc/lib/generic/math/clc_half_exp10.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp10.h"
+#include <clc/math/clc_exp10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp10
 #define __CLC_IMPL_FUNCTION(x) __clc_exp10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_exp2.cl b/libclc/clc/lib/generic/math/clc_half_exp2.cl
index b71caadadacff..9a8f2f980c5a7 100644
--- a/libclc/clc/lib/generic/math/clc_half_exp2.cl
+++ b/libclc/clc/lib/generic/math/clc_half_exp2.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp2.h"
+#include <clc/math/clc_exp2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_exp2
 #define __CLC_IMPL_FUNCTION(x) __clc_exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_log.cl b/libclc/clc/lib/generic/math/clc_half_log.cl
index 446b5d6f0a03e..160b193e8040c 100644
--- a/libclc/clc/lib/generic/math/clc_half_log.cl
+++ b/libclc/clc/lib/generic/math/clc_half_log.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log.h"
+#include <clc/math/clc_log.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log
 #define __CLC_IMPL_FUNCTION(x) __clc_log
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_log10.cl b/libclc/clc/lib/generic/math/clc_half_log10.cl
index 7787b5ce24623..83d57db1bdf2f 100644
--- a/libclc/clc/lib/generic/math/clc_half_log10.cl
+++ b/libclc/clc/lib/generic/math/clc_half_log10.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log10.h"
+#include <clc/math/clc_log10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log10
 #define __CLC_IMPL_FUNCTION(x) __clc_log10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_log2.cl b/libclc/clc/lib/generic/math/clc_half_log2.cl
index 8ce86d3d208af..7de0053fd7507 100644
--- a/libclc/clc/lib/generic/math/clc_half_log2.cl
+++ b/libclc/clc/lib/generic/math/clc_half_log2.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log2.h"
+#include <clc/math/clc_log2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_log2
 #define __CLC_IMPL_FUNCTION(x) __clc_log2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_powr.cl b/libclc/clc/lib/generic/math/clc_half_powr.cl
index 4f87978daf7da..7065377ede66c 100644
--- a/libclc/clc/lib/generic/math/clc_half_powr.cl
+++ b/libclc/clc/lib/generic/math/clc_half_powr.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_powr.h"
+#include <clc/math/clc_powr.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_powr
 #define __CLC_IMPL_FUNCTION(x) __clc_powr
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_recip.cl b/libclc/clc/lib/generic/math/clc_half_recip.cl
index 3d740c88a38d6..a988ad5e05a8f 100644
--- a/libclc/clc/lib/generic/math/clc_half_recip.cl
+++ b/libclc/clc/lib/generic/math/clc_half_recip.cl
@@ -7,6 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_half_recip.inc"
+#define __CLC_BODY <clc_half_recip.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_rsqrt.cl b/libclc/clc/lib/generic/math/clc_half_rsqrt.cl
index eed38f1f679c2..4e0cdd252f656 100644
--- a/libclc/clc/lib/generic/math/clc_half_rsqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_half_rsqrt.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_rsqrt.h"
+#include <clc/math/clc_rsqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_rsqrt
 #define __CLC_IMPL_FUNCTION(x) __clc_rsqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_sin.cl b/libclc/clc/lib/generic/math/clc_half_sin.cl
index 96fc3900efcec..acc5d43156ab8 100644
--- a/libclc/clc/lib/generic/math/clc_half_sin.cl
+++ b/libclc/clc/lib/generic/math/clc_half_sin.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sin.h"
+#include <clc/math/clc_sin.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_sin
 #define __CLC_IMPL_FUNCTION(x) __clc_sin
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_sqrt.cl b/libclc/clc/lib/generic/math/clc_half_sqrt.cl
index db6f1f4eba29e..01e779960df6c 100644
--- a/libclc/clc/lib/generic/math/clc_half_sqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_half_sqrt.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sqrt.h"
+#include <clc/math/clc_sqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_sqrt
 #define __CLC_IMPL_FUNCTION(x) __clc_sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_half_tan.cl b/libclc/clc/lib/generic/math/clc_half_tan.cl
index f0a90db323757..1427fe02555f1 100644
--- a/libclc/clc/lib/generic/math/clc_half_tan.cl
+++ b/libclc/clc/lib/generic/math/clc_half_tan.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_tan.h"
+#include <clc/math/clc_tan.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_half_tan
 #define __CLC_IMPL_FUNCTION(x) __clc_tan
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_hypot.cl b/libclc/clc/lib/generic/math/clc_hypot.cl
index 8eef0a5a58247..c934ab29da91b 100644
--- a/libclc/clc/lib/generic/math/clc_hypot.cl
+++ b/libclc/clc/lib/generic/math/clc_hypot.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_abs.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sqrt.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_clamp.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_abs.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sqrt.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_clamp.h>
 
-#define __CLC_BODY "clc_hypot.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_hypot.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_ilogb.cl b/libclc/clc/lib/generic/math/clc_ilogb.cl
index f89c798d0bf14..1ccc5754ca7f7 100644
--- a/libclc/clc/lib/generic/math/clc_ilogb.cl
+++ b/libclc/clc/lib/generic/math/clc_ilogb.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_ilogb.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_ilogb.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_ldexp.cl b/libclc/clc/lib/generic/math/clc_ldexp.cl
index a2a0e82b7f4e7..f9252a75ab4bf 100644
--- a/libclc/clc/lib/generic/math/clc_ldexp.cl
+++ b/libclc/clc/lib/generic/math/clc_ldexp.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_add_sat.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_clamp.h"
+#include <clc/integer/clc_add_sat.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_clamp.h>
 
 _CLC_DEF _CLC_OVERLOAD float __clc_ldexp(float x, int n) {
 
@@ -130,5 +130,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_ldexp(half x, int n) {
 
 #define __CLC_FUNCTION __clc_ldexp
 #define __CLC_ARG2_TYPE int
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_lgamma.cl b/libclc/clc/lib/generic/math/clc_lgamma.cl
index 6ebd3166dfdce..ca8f589c3b433 100644
--- a/libclc/clc/lib/generic/math/clc_lgamma.cl
+++ b/libclc/clc/lib/generic/math/clc_lgamma.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_lgamma_r.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_lgamma_r.h>
 
-#define __CLC_BODY "clc_lgamma.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_lgamma.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_lgamma_r.cl b/libclc/clc/lib/generic/math/clc_lgamma_r.cl
index 929aadeb5357b..2322ad54508fa 100644
--- a/libclc/clc/lib/generic/math/clc_lgamma_r.cl
+++ b/libclc/clc/lib/generic/math/clc_lgamma_r.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_log.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_sinpi.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_log.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_sinpi.h>
+#include <clc/math/math.h>
 
 // ====================================================
 // Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -597,25 +597,25 @@ _CLC_OVERLOAD _CLC_DEF half __clc_lgamma_r(half x, private int *iptr) {
 #define __CLC_FUNCTION __clc_lgamma_r
 #define __CLC_ARG2_TYPE int
 #define __CLC_ADDRSPACE private
-#define __CLC_BODY "clc/shared/unary_def_with_ptr_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_with_ptr_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRSPACE
 #undef __CLC_ARG2_TYPE
 #undef __CLC_FUNCTION
 
 #define __CLC_ADDRSPACE global
-#define __CLC_BODY "clc_lgamma_r.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_lgamma_r.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRSPACE
 
 #define __CLC_ADDRSPACE local
-#define __CLC_BODY "clc_lgamma_r.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_lgamma_r.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRSPACE
 
 #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
 #define __CLC_ADDRSPACE generic
-#define __CLC_BODY "clc_lgamma_r.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_lgamma_r.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_ADDRSPACE
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_log.cl b/libclc/clc/lib/generic/math/clc_log.cl
index ab7cdc07cd4cb..74ee1ed713751 100644
--- a/libclc/clc/lib/generic/math/clc_log.cl
+++ b/libclc/clc/lib/generic/math/clc_log.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_log2.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_log2.h>
 
 /*
  *log(x) = log2(x) * (1/log2(e))
@@ -39,5 +39,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_log(half x) {
 #endif // cl_khr_fp16
 
 #define __CLC_FUNCTION __clc_log
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_log10.cl b/libclc/clc/lib/generic/math/clc_log10.cl
index 71665cdaf8efe..741d21b5d831a 100644
--- a/libclc/clc/lib/generic/math/clc_log10.cl
+++ b/libclc/clc/lib/generic/math/clc_log10.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/tables.h"
+#include <clc/internal/clc.h>
+#include <clc/math/tables.h>
 
 #ifdef cl_khr_fp64
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
@@ -22,5 +22,5 @@
 #undef COMPILING_LOG10
 
 #define __CLC_FUNCTION __clc_log10
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_log1p.cl b/libclc/clc/lib/generic/math/clc_log1p.cl
index 6c32c1ffc361d..71ccba79a7289 100644
--- a/libclc/clc/lib/generic/math/clc_log1p.cl
+++ b/libclc/clc/lib/generic/math/clc_log1p.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
 
-#define __CLC_BODY "clc_log1p.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_log1p.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_log2.cl b/libclc/clc/lib/generic/math/clc_log2.cl
index 76819eaab6203..432ea5737bc2c 100644
--- a/libclc/clc/lib/generic/math/clc_log2.cl
+++ b/libclc/clc/lib/generic/math/clc_log2.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/tables.h"
+#include <clc/internal/clc.h>
+#include <clc/math/tables.h>
 
 #ifdef cl_khr_fp64
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
@@ -22,5 +22,5 @@
 #undef COMPILING_LOG2
 
 #define __CLC_FUNCTION __clc_log2
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_log_base.h b/libclc/clc/lib/generic/math/clc_log_base.h
index b1ce7e65d84db..ba92679dbaaf4 100644
--- a/libclc/clc/lib/generic/math/clc_log_base.h
+++ b/libclc/clc/lib/generic/math/clc_log_base.h
@@ -6,15 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
-#define CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
-
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
 
 /*
    Algorithm:
@@ -325,5 +322,3 @@ __clc_log(half x) {
 #endif
 
 #endif // cl_khr_fp16
-
-#endif // CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H

diff  --git a/libclc/clc/lib/generic/math/clc_logb.cl b/libclc/clc/lib/generic/math/clc_logb.cl
index 8d29632bf2c3c..879676eedff15 100644
--- a/libclc/clc/lib/generic/math/clc_logb.cl
+++ b/libclc/clc/lib/generic/math/clc_logb.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_logb.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_logb.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_mad.cl b/libclc/clc/lib/generic/math/clc_mad.cl
index 5ca5d6562a012..f8b04f90c858a 100644
--- a/libclc/clc/lib/generic/math/clc_mad.cl
+++ b/libclc/clc/lib/generic/math/clc_mad.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_mad.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_mad.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_maxmag.cl b/libclc/clc/lib/generic/math/clc_maxmag.cl
index 41faa2b31f343..e34fd5613c3f2 100644
--- a/libclc/clc/lib/generic/math/clc_maxmag.cl
+++ b/libclc/clc/lib/generic/math/clc_maxmag.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fmax.h"
-#include "clc/relational/clc_isequal.h"
-#include "clc/relational/clc_isgreater.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fmax.h>
+#include <clc/relational/clc_isequal.h>
+#include <clc/relational/clc_isgreater.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_maxmag.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_maxmag.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_minmag.cl b/libclc/clc/lib/generic/math/clc_minmag.cl
index 6bb86099b3262..8529beb8d83f0 100644
--- a/libclc/clc/lib/generic/math/clc_minmag.cl
+++ b/libclc/clc/lib/generic/math/clc_minmag.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fmin.h"
-#include "clc/relational/clc_isequal.h"
-#include "clc/relational/clc_isless.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fmin.h>
+#include <clc/relational/clc_isequal.h>
+#include <clc/relational/clc_isless.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_minmag.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_minmag.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_modf.cl b/libclc/clc/lib/generic/math/clc_modf.cl
index 8657ac87b4227..dd8ac493ddf91 100644
--- a/libclc/clc/lib/generic/math/clc_modf.cl
+++ b/libclc/clc/lib/generic/math/clc_modf.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
-#include "clc/relational/clc_isinf.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
+#include <clc/relational/clc_isinf.h>
 
-#define __CLC_BODY "clc_modf.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_modf.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_nan.cl b/libclc/clc/lib/generic/math/clc_nan.cl
index e252b84cfa7aa..0d480175b9c5e 100644
--- a/libclc/clc/lib/generic/math/clc_nan.cl
+++ b/libclc/clc/lib/generic/math/clc_nan.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/utils.h"
+#include <clc/internal/clc.h>
+#include <clc/utils.h>
 
-#define __CLC_BODY "clc_nan.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_nan.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_cos.cl b/libclc/clc/lib/generic/math/clc_native_cos.cl
index 3922a8ef784ec..4e9a6c91b4260 100644
--- a/libclc/clc/lib/generic/math/clc_native_cos.cl
+++ b/libclc/clc/lib/generic/math/clc_native_cos.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_cos
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_cos
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_divide.cl b/libclc/clc/lib/generic/math/clc_native_divide.cl
index 36b3d62181031..abec9add4fd62 100644
--- a/libclc/clc/lib/generic/math/clc_native_divide.cl
+++ b/libclc/clc/lib/generic/math/clc_native_divide.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_native_divide.inc"
+#define __CLC_BODY <clc_native_divide.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_exp.cl b/libclc/clc/lib/generic/math/clc_native_exp.cl
index 89cef355f691b..63b4e56913972 100644
--- a/libclc/clc/lib/generic/math/clc_native_exp.cl
+++ b/libclc/clc/lib/generic/math/clc_native_exp.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_exp
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_exp10.cl b/libclc/clc/lib/generic/math/clc_native_exp10.cl
index d42b6ec8b835d..2819cd59c4be9 100644
--- a/libclc/clc/lib/generic/math/clc_native_exp10.cl
+++ b/libclc/clc/lib/generic/math/clc_native_exp10.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_exp2.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_exp2.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_native_exp10.inc"
+#define __CLC_BODY <clc_native_exp10.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_exp2.cl b/libclc/clc/lib/generic/math/clc_native_exp2.cl
index 2574ad98f12b1..a995b0347cac4 100644
--- a/libclc/clc/lib/generic/math/clc_native_exp2.cl
+++ b/libclc/clc/lib/generic/math/clc_native_exp2.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_exp2
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_log.cl b/libclc/clc/lib/generic/math/clc_native_log.cl
index b62a768bb62ba..617908277fb6a 100644
--- a/libclc/clc/lib/generic/math/clc_native_log.cl
+++ b/libclc/clc/lib/generic/math/clc_native_log.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_log10.cl b/libclc/clc/lib/generic/math/clc_native_log10.cl
index bc7865a2e14c1..0558f8cb7049b 100644
--- a/libclc/clc/lib/generic/math/clc_native_log10.cl
+++ b/libclc/clc/lib/generic/math/clc_native_log10.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log10
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_log2.cl b/libclc/clc/lib/generic/math/clc_native_log2.cl
index 6f67bf85e3413..c897ac07acb45 100644
--- a/libclc/clc/lib/generic/math/clc_native_log2.cl
+++ b/libclc/clc/lib/generic/math/clc_native_log2.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_log2
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_powr.cl b/libclc/clc/lib/generic/math/clc_native_powr.cl
index 5c6937ff3428a..dac9b7edf78b9 100644
--- a/libclc/clc/lib/generic/math/clc_native_powr.cl
+++ b/libclc/clc/lib/generic/math/clc_native_powr.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_exp2.h"
-#include "clc/math/clc_native_log2.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_exp2.h>
+#include <clc/math/clc_native_log2.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_native_powr.inc"
+#define __CLC_BODY <clc_native_powr.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_recip.cl b/libclc/clc/lib/generic/math/clc_native_recip.cl
index 9826af2e3d4fc..75d832c8467ee 100644
--- a/libclc/clc/lib/generic/math/clc_native_recip.cl
+++ b/libclc/clc/lib/generic/math/clc_native_recip.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_native_recip.inc"
+#define __CLC_BODY <clc_native_recip.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_rsqrt.cl b/libclc/clc/lib/generic/math/clc_native_rsqrt.cl
index 619f8c45f8bdf..9b88e72126f88 100644
--- a/libclc/clc/lib/generic/math/clc_native_rsqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_native_rsqrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_sqrt.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_sqrt.h>
 
-#define __CLC_BODY "clc_native_rsqrt.inc"
+#define __CLC_BODY <clc_native_rsqrt.inc>
 #define __CLC_FLOAT_ONLY
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_sin.cl b/libclc/clc/lib/generic/math/clc_native_sin.cl
index e395030ca6e16..941342f387a1a 100644
--- a/libclc/clc/lib/generic/math/clc_native_sin.cl
+++ b/libclc/clc/lib/generic/math/clc_native_sin.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_sin
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sin
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_sqrt.cl b/libclc/clc/lib/generic/math/clc_native_sqrt.cl
index 85110e5389db5..cc18a4b7ba1d3 100644
--- a/libclc/clc/lib/generic/math/clc_native_sqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_native_sqrt.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_native_sqrt
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_native_tan.cl b/libclc/clc/lib/generic/math/clc_native_tan.cl
index 4915d1579f14d..6b69067be388e 100644
--- a/libclc/clc/lib/generic/math/clc_native_tan.cl
+++ b/libclc/clc/lib/generic/math/clc_native_tan.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_native_cos.h"
-#include "clc/math/clc_native_sin.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_native_cos.h>
+#include <clc/math/clc_native_sin.h>
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_native_tan.inc"
+#define __CLC_BODY <clc_native_tan.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_nextafter.cl b/libclc/clc/lib/generic/math/clc_nextafter.cl
index 00ab86862bc54..48e28c08edf75 100644
--- a/libclc/clc/lib/generic/math/clc_nextafter.cl
+++ b/libclc/clc/lib/generic/math/clc_nextafter.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/relational/clc_isnan.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/relational/clc_isnan.h>
 
 // This file provides OpenCL C implementations of __clc_nextafter for
 // targets that don't support the clang builtin.

diff  --git a/libclc/clc/lib/generic/math/clc_pow.cl b/libclc/clc/lib/generic/math/clc_pow.cl
index 77367312a2c44..70d3d614a8d36 100644
--- a/libclc/clc/lib/generic/math/clc_pow.cl
+++ b/libclc/clc/lib/generic/math/clc_pow.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_pow.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_pow.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_pown.cl b/libclc/clc/lib/generic/math/clc_pown.cl
index fc0f651a261df..5aa9560174b99 100644
--- a/libclc/clc/lib/generic/math/clc_pown.cl
+++ b/libclc/clc/lib/generic/math/clc_pown.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_pown.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_pown.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_powr.cl b/libclc/clc/lib/generic/math/clc_powr.cl
index 526bf890ede63..0556ec97d6f3c 100644
--- a/libclc/clc/lib/generic/math/clc_powr.cl
+++ b/libclc/clc/lib/generic/math/clc_powr.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_powr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_powr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_recip_fast.cl b/libclc/clc/lib/generic/math/clc_recip_fast.cl
index 32a52cf97b8e2..779acf8078881 100644
--- a/libclc/clc/lib/generic/math/clc_recip_fast.cl
+++ b/libclc/clc/lib/generic/math/clc_recip_fast.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_recip_fast
-#define __CLC_BODY "clc_recip_fast.inc"
+#define __CLC_BODY <clc_recip_fast.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_remainder.cl b/libclc/clc/lib/generic/math/clc_remainder.cl
index f1dba87ee5b43..622f05f85100c 100644
--- a/libclc/clc/lib/generic/math/clc_remainder.cl
+++ b/libclc/clc/lib/generic/math/clc_remainder.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_floor.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_remainder.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
-#include "clc/shared/clc_max.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_floor.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_remainder.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
+#include <clc/shared/clc_max.h>
 
 _CLC_DEF _CLC_OVERLOAD float __clc_remainder(float x, float y) {
   int ux = __clc_as_int(x);
@@ -75,8 +75,8 @@ _CLC_DEF _CLC_OVERLOAD float __clc_remainder(float x, float y) {
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION __clc_remainder
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNCTION
 
 #ifdef cl_khr_fp64
@@ -213,8 +213,8 @@ _CLC_DEF _CLC_OVERLOAD double __clc_remainder(double x, double y) {
 
 #define __CLC_DOUBLE_ONLY
 #define __CLC_FUNCTION __clc_remainder
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNCTION
 
 #endif
@@ -226,7 +226,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_remainder(double x, double y) {
 // Forward the half version of this builtin onto the float one
 #define __CLC_HALF_ONLY
 #define __CLC_FUNCTION __clc_remainder
-#define __CLC_BODY "clc/math/binary_def_via_fp32.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/binary_def_via_fp32.inc>
+#include <clc/math/gentype.inc>
 
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_remquo.cl b/libclc/clc/lib/generic/math/clc_remquo.cl
index 6f6a7fc6bdcfa..fd83ead06d89a 100644
--- a/libclc/clc/lib/generic/math/clc_remquo.cl
+++ b/libclc/clc/lib/generic/math/clc_remquo.cl
@@ -6,31 +6,31 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_floor.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
-#include "clc/shared/clc_max.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_floor.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
+#include <clc/shared/clc_max.h>
 
 #define __CLC_ADDRESS_SPACE private
-#include "clc_remquo.inc"
+#include <clc_remquo.inc>
 #undef __CLC_ADDRESS_SPACE
 
 #define __CLC_ADDRESS_SPACE global
-#include "clc_remquo.inc"
+#include <clc_remquo.inc>
 #undef __CLC_ADDRESS_SPACE
 
 #define __CLC_ADDRESS_SPACE local
-#include "clc_remquo.inc"
+#include <clc_remquo.inc>
 #undef __CLC_ADDRESS_SPACE
 
 #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
 #define __CLC_ADDRESS_SPACE generic
-#include "clc_remquo.inc"
+#include <clc_remquo.inc>
 #undef __CLC_ADDRESS_SPACE
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_rint.cl b/libclc/clc/lib/generic/math/clc_rint.cl
index 749a26e6923f2..e3aaae0ffec6f 100644
--- a/libclc/clc/lib/generic/math/clc_rint.cl
+++ b/libclc/clc/lib/generic/math/clc_rint.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_rint
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_rint
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_rootn.cl b/libclc/clc/lib/generic/math/clc_rootn.cl
index 3f0070699d1eb..da397cf66da62 100644
--- a/libclc/clc/lib/generic/math/clc_rootn.cl
+++ b/libclc/clc/lib/generic/math/clc_rootn.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_ldexp.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_ldexp.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
 
-#define __CLC_BODY "clc_rootn.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_rootn.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_round.cl b/libclc/clc/lib/generic/math/clc_round.cl
index 49e3e256126ac..5ed8d08ba4f45 100644
--- a/libclc/clc/lib/generic/math/clc_round.cl
+++ b/libclc/clc/lib/generic/math/clc_round.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_round
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_round
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_rsqrt.cl b/libclc/clc/lib/generic/math/clc_rsqrt.cl
index ef17b4926dd55..92a3d06f46eaf 100644
--- a/libclc/clc/lib/generic/math/clc_rsqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_rsqrt.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_rsqrt.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_rsqrt.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sin.cl b/libclc/clc/lib/generic/math/clc_sin.cl
index ec8727f717847..99338c95eb60c 100644
--- a/libclc/clc/lib/generic/math/clc_sin.cl
+++ b/libclc/clc/lib/generic/math/clc_sin.cl
@@ -6,18 +6,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
-#include "clc/shared/clc_max.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
+#include <clc/shared/clc_max.h>
 
-#define __CLC_BODY "clc_sin.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sin.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sincos.cl b/libclc/clc/lib/generic/math/clc_sincos.cl
index 6efe59cadea76..2209a41593a2d 100644
--- a/libclc/clc/lib/generic/math/clc_sincos.cl
+++ b/libclc/clc/lib/generic/math/clc_sincos.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_cos.h"
-#include "clc/math/clc_sin.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_cos.h>
+#include <clc/math/clc_sin.h>
 
-#define __CLC_BODY "clc_sincos.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sincos.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
index 4c8f4d6097de9..19705c42f6f07 100644
--- a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
+++ b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/integer/clc_clz.h"
-#include "clc/integer/clc_mul_hi.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/clc_native_divide.h"
-#include "clc/math/clc_trunc.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/integer/clc_clz.h>
+#include <clc/integer/clc_mul_hi.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/clc_native_divide.h>
+#include <clc/math/clc_trunc.h>
+#include <clc/math/math.h>
 
 #define bitalign(hi, lo, shift) ((hi) << (32 - (shift))) | ((lo) >> (shift));
 
@@ -28,17 +28,17 @@
   HI += LO < C ? 1U : 0U;
 
 #define __CLC_FLOAT_ONLY
-#define __CLC_BODY "clc_sincos_helpers.inc"
+#define __CLC_BODY <clc_sincos_helpers.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #ifdef cl_khr_fp64
 
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 
-#include "clc/math/clc_fract.h"
-#include "clc/math/tables.h"
-#include "clc/shared/clc_max.h"
+#include <clc/math/clc_fract.h>
+#include <clc/math/tables.h>
+#include <clc/shared/clc_max.h>
 
 #define bytealign(src0, src1, src2)                                            \
   (__CLC_CONVERT_UINTN(                                                        \
@@ -46,8 +46,8 @@
       (((src2) & 3) * 8)))
 
 #define __CLC_DOUBLE_ONLY
-#define __CLC_BODY "clc_sincos_helpers_fp64.inc"
+#define __CLC_BODY <clc_sincos_helpers_fp64.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 #endif

diff  --git a/libclc/clc/lib/generic/math/clc_sinh.cl b/libclc/clc/lib/generic/math/clc_sinh.cl
index 7252679235ccb..bd0b488b16047 100644
--- a/libclc/clc/lib/generic/math/clc_sinh.cl
+++ b/libclc/clc/lib/generic/math/clc_sinh.cl
@@ -6,18 +6,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_sinh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sinh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sinpi.cl b/libclc/clc/lib/generic/math/clc_sinpi.cl
index f9bed7ec78306..bb5de09f03c08 100644
--- a/libclc/clc/lib/generic/math/clc_sinpi.cl
+++ b/libclc/clc/lib/generic/math/clc_sinpi.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_sinpi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sinpi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sqrt.cl b/libclc/clc/lib/generic/math/clc_sqrt.cl
index 1dd5dd298a35c..3fa82fdd714b7 100644
--- a/libclc/clc/lib/generic/math/clc_sqrt.cl
+++ b/libclc/clc/lib/generic/math/clc_sqrt.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_sqrt.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sqrt.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sqrt_cr.cl b/libclc/clc/lib/generic/math/clc_sqrt_cr.cl
index 2f913458447cd..fd98fb3f6a80a 100644
--- a/libclc/clc/lib/generic/math/clc_sqrt_cr.cl
+++ b/libclc/clc/lib/generic/math/clc_sqrt_cr.cl
@@ -7,5 +7,5 @@
 //===----------------------------------------------------------------------===//
 
 #include "clc/math/clc_sqrt_cr.h"
-#define __CLC_BODY "clc_sqrt_cr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_sqrt_cr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_sqrt_fast.cl b/libclc/clc/lib/generic/math/clc_sqrt_fast.cl
index f46273e30db9b..89a478ac80908 100644
--- a/libclc/clc/lib/generic/math/clc_sqrt_fast.cl
+++ b/libclc/clc/lib/generic/math/clc_sqrt_fast.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_sqrt_fast
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_tables.cl b/libclc/clc/lib/generic/math/clc_tables.cl
index 43fa7387431de..67a17525014db 100644
--- a/libclc/clc/lib/generic/math/clc_tables.cl
+++ b/libclc/clc/lib/generic/math/clc_tables.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/tables.h"
+#include <clc/internal/clc.h>
+#include <clc/math/tables.h>
 
 __CLC_DECLARE_TABLE(float, LOG_INV_TBL_EP_HEAD, 129) = {
     0x1.000000p+1f, 0x1.fc0000p+0f, 0x1.f80000p+0f, 0x1.f40000p+0f,

diff  --git a/libclc/clc/lib/generic/math/clc_tan.cl b/libclc/clc/lib/generic/math/clc_tan.cl
index 30b56d756f4f0..7e68216ca43aa 100644
--- a/libclc/clc/lib/generic/math/clc_tan.cl
+++ b/libclc/clc/lib/generic/math/clc_tan.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/relational/clc_select.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/relational/clc_select.h>
 
-#define __CLC_BODY "clc_tan.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_tan.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_tanh.cl b/libclc/clc/lib/generic/math/clc_tanh.cl
index c0e6f60f6fe4c..aedcb0c38d5e3 100644
--- a/libclc/clc/lib/generic/math/clc_tanh.cl
+++ b/libclc/clc/lib/generic/math/clc_tanh.cl
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fma.h"
-#include "clc/math/clc_mad.h"
-#include "clc/math/math.h"
-#include "clc/math/tables.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_convert.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fma.h>
+#include <clc/math/clc_mad.h>
+#include <clc/math/math.h>
+#include <clc/math/tables.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_tanh.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_tanh.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_tanpi.cl b/libclc/clc/lib/generic/math/clc_tanpi.cl
index a75b5446a2557..099457c186314 100644
--- a/libclc/clc/lib/generic/math/clc_tanpi.cl
+++ b/libclc/clc/lib/generic/math/clc_tanpi.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_native_recip.h"
-#include "clc/math/clc_sincos_helpers.h"
-#include "clc/math/math.h"
+#include <clc/clc_convert.h>
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_native_recip.h>
+#include <clc/math/clc_sincos_helpers.h>
+#include <clc/math/math.h>
 
-#define __CLC_BODY "clc_tanpi.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_tanpi.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_tgamma.cl b/libclc/clc/lib/generic/math/clc_tgamma.cl
index 0631028b6ce2f..c379cd16b5a62 100644
--- a/libclc/clc/lib/generic/math/clc_tgamma.cl
+++ b/libclc/clc/lib/generic/math/clc_tgamma.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_exp.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_lgamma.h"
-#include "clc/math/clc_sinpi.h"
-#include "clc/math/math.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_exp.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_lgamma.h>
+#include <clc/math/clc_sinpi.h>
+#include <clc/math/math.h>
 
 _CLC_OVERLOAD _CLC_DEF float __clc_tgamma(float x) {
   const float pi = 3.1415926535897932384626433832795f;
@@ -66,5 +66,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_tgamma(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_tgamma
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/math/clc_trunc.cl b/libclc/clc/lib/generic/math/clc_trunc.cl
index 30281b6866361..d9c54a1888d94 100644
--- a/libclc/clc/lib/generic/math/clc_trunc.cl
+++ b/libclc/clc/lib/generic/math/clc_trunc.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define __CLC_FUNCTION __clc_trunc
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_trunc
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/misc/clc_shuffle.cl b/libclc/clc/lib/generic/misc/clc_shuffle.cl
index f1dbfff38d67b..bd7a6a18a6035 100644
--- a/libclc/clc/lib/generic/misc/clc_shuffle.cl
+++ b/libclc/clc/lib/generic/misc/clc_shuffle.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define _CLC_ELEMENT_CASES2(VAR)                                               \
   case 0:                                                                      \

diff  --git a/libclc/clc/lib/generic/misc/clc_shuffle2.cl b/libclc/clc/lib/generic/misc/clc_shuffle2.cl
index af255946ebdf4..786c2b6b6afd1 100644
--- a/libclc/clc/lib/generic/misc/clc_shuffle2.cl
+++ b/libclc/clc/lib/generic/misc/clc_shuffle2.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define _CLC_ELEMENT_CASES2(VAR)                                               \
   case 0:                                                                      \

diff  --git a/libclc/clc/lib/generic/relational/clc_all.cl b/libclc/clc/lib/generic/relational/clc_all.cl
index eee7e19b41b07..29f6d68366778 100644
--- a/libclc/clc/lib/generic/relational/clc_all.cl
+++ b/libclc/clc/lib/generic/relational/clc_all.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define _CLC_ALL(v) (((v) >> ((sizeof(v) * 8) - 1)) & 0x1)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_any.cl b/libclc/clc/lib/generic/relational/clc_any.cl
index 0162e413d9730..dc04ac5ae58a4 100644
--- a/libclc/clc/lib/generic/relational/clc_any.cl
+++ b/libclc/clc/lib/generic/relational/clc_any.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 #define _CLC_ANY(v) (((v) >> ((sizeof(v) * 8) - 1)) & 0x1)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_bitselect.cl b/libclc/clc/lib/generic/relational/clc_bitselect.cl
index 1b64066f215f4..b58fb8d3233f8 100644
--- a/libclc/clc/lib/generic/relational/clc_bitselect.cl
+++ b/libclc/clc/lib/generic/relational/clc_bitselect.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
-#define __CLC_BODY "clc_bitselect.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_bitselect.inc>
+#include <clc/integer/gentype.inc>
 
 #define __CLC_FLOAT_BITSELECT(f_type, i_type, width)                           \
   _CLC_OVERLOAD _CLC_DEF f_type##width __clc_bitselect(                        \

diff  --git a/libclc/clc/lib/generic/relational/clc_isequal.cl b/libclc/clc/lib/generic/relational/clc_isequal.cl
index 981735f091e40..8ee9d153d30c4 100644
--- a/libclc/clc/lib/generic/relational/clc_isequal.cl
+++ b/libclc/clc/lib/generic/relational/clc_isequal.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) == (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isfinite.cl b/libclc/clc/lib/generic/relational/clc_isfinite.cl
index dbd181e29aa17..9963e2e7dc53b 100644
--- a/libclc/clc/lib/generic/relational/clc_isfinite.cl
+++ b/libclc/clc/lib/generic/relational/clc_isfinite.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 _CLC_DEFINE_ISFPCLASS(int, int, __clc_isfinite, fcFinite, float)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isgreater.cl b/libclc/clc/lib/generic/relational/clc_isgreater.cl
index 9ae03bc5643a7..2f7a3a56faf63 100644
--- a/libclc/clc/lib/generic/relational/clc_isgreater.cl
+++ b/libclc/clc/lib/generic/relational/clc_isgreater.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) > (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl b/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl
index d221c994c1561..17cb755908923 100644
--- a/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl
+++ b/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) >= (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isinf.cl b/libclc/clc/lib/generic/relational/clc_isinf.cl
index 62bb8ed063459..de0d0f658ebe2 100644
--- a/libclc/clc/lib/generic/relational/clc_isinf.cl
+++ b/libclc/clc/lib/generic/relational/clc_isinf.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 _CLC_DEFINE_ISFPCLASS(int, int, __clc_isinf, fcInf, float)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isless.cl b/libclc/clc/lib/generic/relational/clc_isless.cl
index 186dc1ab2faa8..71ee5b0a07563 100644
--- a/libclc/clc/lib/generic/relational/clc_isless.cl
+++ b/libclc/clc/lib/generic/relational/clc_isless.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) < (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_islessequal.cl b/libclc/clc/lib/generic/relational/clc_islessequal.cl
index 766fb6bb5e3ff..eec8c1a89fcc9 100644
--- a/libclc/clc/lib/generic/relational/clc_islessequal.cl
+++ b/libclc/clc/lib/generic/relational/clc_islessequal.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) <= (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_islessgreater.cl b/libclc/clc/lib/generic/relational/clc_islessgreater.cl
index bde1dfe2107a9..da7cf17d2aab8 100644
--- a/libclc/clc/lib/generic/relational/clc_islessgreater.cl
+++ b/libclc/clc/lib/generic/relational/clc_islessgreater.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) ((X) < (Y)) || ((X) > (Y))
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isnan.cl b/libclc/clc/lib/generic/relational/clc_isnan.cl
index ba97f88ce76f7..c01d6122c9670 100644
--- a/libclc/clc/lib/generic/relational/clc_isnan.cl
+++ b/libclc/clc/lib/generic/relational/clc_isnan.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 _CLC_DEFINE_ISFPCLASS(int, int, __clc_isnan, fcNan, float)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isnormal.cl b/libclc/clc/lib/generic/relational/clc_isnormal.cl
index 3c1d363ad3898..9fabd19e74ceb 100644
--- a/libclc/clc/lib/generic/relational/clc_isnormal.cl
+++ b/libclc/clc/lib/generic/relational/clc_isnormal.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 _CLC_DEFINE_ISFPCLASS(int, int, __clc_isnormal, fcNormal, float)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isnotequal.cl b/libclc/clc/lib/generic/relational/clc_isnotequal.cl
index c6c1a486a0942..3b5af6f0095c0 100644
--- a/libclc/clc/lib/generic/relational/clc_isnotequal.cl
+++ b/libclc/clc/lib/generic/relational/clc_isnotequal.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y) (X) != (Y)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isordered.cl b/libclc/clc/lib/generic/relational/clc_isordered.cl
index e6d11b26721af..112bec568dbe1 100644
--- a/libclc/clc/lib/generic/relational/clc_isordered.cl
+++ b/libclc/clc/lib/generic/relational/clc_isordered.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/clc_isequal.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/clc_isequal.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y)                                               \
   __clc_isequal((X), (X)) && __clc_isequal((Y), (Y))

diff  --git a/libclc/clc/lib/generic/relational/clc_issubnormal.cl b/libclc/clc/lib/generic/relational/clc_issubnormal.cl
index d311d6683ef37..cdbae69ee0c92 100644
--- a/libclc/clc/lib/generic/relational/clc_issubnormal.cl
+++ b/libclc/clc/lib/generic/relational/clc_issubnormal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/clc_issubnormal.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/clc_issubnormal.h>
+#include <clc/relational/relational.h>
 
 _CLC_DEFINE_ISFPCLASS(int, int, __clc_issubnormal, fcSubnormal, float)
 

diff  --git a/libclc/clc/lib/generic/relational/clc_isunordered.cl b/libclc/clc/lib/generic/relational/clc_isunordered.cl
index 9b9669b217348..1a7c0c1387dd5 100644
--- a/libclc/clc/lib/generic/relational/clc_isunordered.cl
+++ b/libclc/clc/lib/generic/relational/clc_isunordered.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/clc_isequal.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/clc_isequal.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_RELATIONAL_OP(X, Y)                                               \
   !__clc_isequal((X), (X)) || !__clc_isequal((Y), (Y))

diff  --git a/libclc/clc/lib/generic/relational/clc_select.cl b/libclc/clc/lib/generic/relational/clc_select.cl
index 62c633ddee7d6..ddf24ed0b8685 100644
--- a/libclc/clc/lib/generic/relational/clc_select.cl
+++ b/libclc/clc/lib/generic/relational/clc_select.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/utils.h"
+#include <clc/internal/clc.h>
+#include <clc/utils.h>
 
 #define __CLC_SELECT_FN __clc_select
 #define __CLC_SELECT_DEF(x, y, z) return z ? y : x
 
-#define __CLC_BODY "clc/relational/clc_select_impl.inc"
-#include "clc/math/gentype.inc"
-#define __CLC_BODY "clc/relational/clc_select_impl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/relational/clc_select_impl.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/clc_select_impl.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/clc/lib/generic/relational/clc_signbit.cl b/libclc/clc/lib/generic/relational/clc_signbit.cl
index 05d2e8a0039ad..cb7000ddb0757 100644
--- a/libclc/clc/lib/generic/relational/clc_signbit.cl
+++ b/libclc/clc/lib/generic/relational/clc_signbit.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/relational/relational.h"
+#include <clc/internal/clc.h>
+#include <clc/relational/relational.h>
 
 #define _CLC_DEFINE_RELATIONAL_UNARY_VEC2(RET_TYPE, __CLC_FUNCTION, ARG_TYPE)  \
   _CLC_DEF _CLC_OVERLOAD RET_TYPE __CLC_FUNCTION(ARG_TYPE x) {                 \

diff  --git a/libclc/clc/lib/generic/shared/clc_clamp.cl b/libclc/clc/lib/generic/shared/clc_clamp.cl
index 6df9bfe77457d..1e81405f74197 100644
--- a/libclc/clc/lib/generic/shared/clc_clamp.cl
+++ b/libclc/clc/lib/generic/shared/clc_clamp.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/shared/clc_max.h"
-#include "clc/shared/clc_min.h"
+#include <clc/internal/clc.h>
+#include <clc/shared/clc_max.h>
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "clc_clamp.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_clamp.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_clamp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_clamp.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/shared/clc_max.cl b/libclc/clc/lib/generic/shared/clc_max.cl
index 63210e95fa7ab..a6e831d1eac0c 100644
--- a/libclc/clc/lib/generic/shared/clc_max.cl
+++ b/libclc/clc/lib/generic/shared/clc_max.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fmax.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fmax.h>
 
-#define __CLC_BODY "clc_max.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_max.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_max.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_max.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/shared/clc_min.cl b/libclc/clc/lib/generic/shared/clc_min.cl
index ee829586c3c1f..f345e55c33be7 100644
--- a/libclc/clc/lib/generic/shared/clc_min.cl
+++ b/libclc/clc/lib/generic/shared/clc_min.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/math/clc_fmin.h"
+#include <clc/internal/clc.h>
+#include <clc/math/clc_fmin.h>
 
-#define __CLC_BODY "clc_min.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc_min.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc_min.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc_min.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/generic/shared/clc_vload.cl b/libclc/clc/lib/generic/shared/clc_vload.cl
index 28ee5b016f3a6..5942f10d2de5b 100644
--- a/libclc/clc/lib/generic/shared/clc_vload.cl
+++ b/libclc/clc/lib/generic/shared/clc_vload.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
-#include "clc/shared/clc_vload.h"
+#include <clc/internal/clc.h>
+#include <clc/shared/clc_vload.h>
 
 #define __CLC_VLOAD_VECTORIZE(PRIM_TYPE, ADDR_SPACE)                           \
   _CLC_OVERLOAD _CLC_DEF PRIM_TYPE##2 __clc_vload2(                            \
@@ -115,7 +115,7 @@ __CLC_VLOAD_ADDR_SPACES(half)
   __CLC_FUNC_IMPL(SUFFIX, VEC_SIZE, OFFSET_SIZE, TYPE, AS)
 
 #define __CLC_BODY "clc_vload_half.inc"
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNC
 #undef __CLC_FUNC_IMPL
 #undef __CLC_VEC_LOAD16

diff  --git a/libclc/clc/lib/generic/shared/clc_vstore.cl b/libclc/clc/lib/generic/shared/clc_vstore.cl
index e2801bd579bd8..ac96927395120 100644
--- a/libclc/clc/lib/generic/shared/clc_vstore.cl
+++ b/libclc/clc/lib/generic/shared/clc_vstore.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/float/definitions.h"
-#include "clc/internal/clc.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_nextafter.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_min.h"
+#include <clc/float/definitions.h>
+#include <clc/internal/clc.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_nextafter.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_min.h>
 
 #pragma OPENCL EXTENSION cl_khr_byte_addressable_store : enable
 
@@ -256,7 +256,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_rte(double x) {
   __CLC_XFUNC(SUFFIX, VEC_SIZE, OFFSET, TYPE, AS, BUILTIN)
 
 #define __CLC_BODY "clc_vstore_half.inc"
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNC
 #undef __CLC_XFUNC
 #undef __CLC_XFUNC_IMPL

diff  --git a/libclc/clc/lib/generic/workitem/clc_get_global_id.cl b/libclc/clc/lib/generic/workitem/clc_get_global_id.cl
index 65eedc967f79f..e3da8fd48fa51 100644
--- a/libclc/clc/lib/generic/workitem/clc_get_global_id.cl
+++ b/libclc/clc/lib/generic/workitem/clc_get_global_id.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_enqueued_local_size.h"
-#include "clc/workitem/clc_get_global_offset.h"
-#include "clc/workitem/clc_get_group_id.h"
-#include "clc/workitem/clc_get_local_id.h"
+#include <clc/workitem/clc_get_enqueued_local_size.h>
+#include <clc/workitem/clc_get_global_offset.h>
+#include <clc/workitem/clc_get_group_id.h>
+#include <clc/workitem/clc_get_local_id.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_global_id(uint dim) {
   return __clc_get_group_id(dim) * __clc_get_enqueued_local_size(dim) +

diff  --git a/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl b/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl
index 7d6d922d52bc4..c61e838ebc693 100644
--- a/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl
+++ b/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_size.h"
-#include "clc/workitem/clc_get_max_sub_group_size.h"
-#include "clc/workitem/clc_get_num_sub_groups.h"
+#include <clc/workitem/clc_get_local_size.h>
+#include <clc/workitem/clc_get_max_sub_group_size.h>
+#include <clc/workitem/clc_get_num_sub_groups.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_num_sub_groups() {
   size_t linear_size = __clc_get_local_size(0) * __clc_get_local_size(1) *

diff  --git a/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl b/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl
index 681151b5e92c5..6f18c153df21b 100644
--- a/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl
+++ b/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_id.h"
-#include "clc/workitem/clc_get_local_size.h"
-#include "clc/workitem/clc_get_max_sub_group_size.h"
-#include "clc/workitem/clc_get_sub_group_id.h"
+#include <clc/workitem/clc_get_local_id.h>
+#include <clc/workitem/clc_get_local_size.h>
+#include <clc/workitem/clc_get_max_sub_group_size.h>
+#include <clc/workitem/clc_get_sub_group_id.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_id() {
   // sreg.warpid is volatile and doesn't represent virtual warp index

diff  --git a/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl b/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl
index 7944486aac0f0..8ab4afe1ae05f 100644
--- a/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl
+++ b/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_size.h"
-#include "clc/workitem/clc_get_max_sub_group_size.h"
-#include "clc/workitem/clc_get_num_sub_groups.h"
-#include "clc/workitem/clc_get_sub_group_id.h"
-#include "clc/workitem/clc_get_sub_group_size.h"
+#include <clc/workitem/clc_get_local_size.h>
+#include <clc/workitem/clc_get_max_sub_group_size.h>
+#include <clc/workitem/clc_get_num_sub_groups.h>
+#include <clc/workitem/clc_get_sub_group_id.h>
+#include <clc/workitem/clc_get_sub_group_size.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_size() {
   if (__clc_get_sub_group_id() != __clc_get_num_sub_groups() - 1) {

diff  --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl
index 6172e1e49d51e..4ccdfaf4e3fc9 100644
--- a/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log.h"
+#include <clc/math/clc_log.h>
 
 float __nv_logf(float);
 double __nv_log(double);
@@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_log(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_log
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl
index 97f18ad1224d1..786d57046728d 100644
--- a/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_rsqrt.h"
+#include <clc/math/clc_rsqrt.h>
 
 float __nv_rsqrtf(float);
 double __nv_rsqrt(double);
@@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_rsqrt(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_rsqrt
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl
index 4f65887054d02..78f7038b26443 100644
--- a/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sinpi.h"
+#include <clc/math/clc_sinpi.h>
 
 float __nv_sinpif(float);
 double __nv_sinpi(double);
@@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_sinpi(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_sinpi
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl
index f84045eabfec0..ac86a57fca3d6 100644
--- a/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sqrt.h"
+#include <clc/math/clc_sqrt.h>
 
 float __nv_sqrtf(float);
 double __nv_sqrt(double);
@@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_sqrt(half x) {
 #endif
 
 #define __CLC_FUNCTION __clc_sqrt
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/ptx-nvidiacl/mem_fence/clc_mem_fence.cl b/libclc/clc/lib/ptx-nvidiacl/mem_fence/clc_mem_fence.cl
index fdec76ebc3c57..afc72e831cd99 100644
--- a/libclc/clc/lib/ptx-nvidiacl/mem_fence/clc_mem_fence.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/mem_fence/clc_mem_fence.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/mem_fence/clc_mem_fence.h"
+#include <clc/mem_fence/clc_mem_fence.h>
 
 _CLC_OVERLOAD _CLC_DEF void
 __clc_mem_fence(int memory_scope, int memory_order,

diff  --git a/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl b/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl
index 3b0055e995aaf..93f14d79fe6b2 100644
--- a/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isinf.h"
+#include <clc/relational/clc_isinf.h>
 
 int __nv_isinff(float);
 int __nv_isinfd(double);
@@ -28,6 +28,6 @@ _CLC_OVERLOAD _CLC_DEF int __clc_isinf(half x) { return __clc_isinf((float)x); }
 #endif
 
 #define __CLC_FUNCTION __clc_isinf
-#define __CLC_BODY "clc/shared/unary_def_scalarize.inc"
+#define __CLC_BODY <clc/shared/unary_def_scalarize.inc>
 #define __CLC_RET_TYPE __CLC_BIT_INT
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl b/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl
index bd9b77945869e..35b381052367d 100644
--- a/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/synchronization/clc_work_group_barrier.h"
+#include <clc/synchronization/clc_work_group_barrier.h>
 
 _CLC_OVERLOAD _CLC_DEF void
 __clc_work_group_barrier(int memory_scope,

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl
index 508bac8fbeb9e..0782ef0b15813 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_global_id.h"
-#include "clc/workitem/clc_get_group_id.h"
-#include "clc/workitem/clc_get_local_id.h"
-#include "clc/workitem/clc_get_local_size.h"
+#include <clc/workitem/clc_get_global_id.h>
+#include <clc/workitem/clc_get_group_id.h>
+#include <clc/workitem/clc_get_local_id.h>
+#include <clc/workitem/clc_get_local_size.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_global_id(uint dim) {
   return __clc_get_group_id(dim) * __clc_get_local_size(dim) +

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl
index 1896a0627f154..200b1bfd70992 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_group_id.h"
+#include <clc/workitem/clc_get_group_id.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_group_id(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl
index 0e5e1dc2f32bd..8c5b313b8135c 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_id.h"
+#include <clc/workitem/clc_get_local_id.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_local_id(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl
index 5f14231c2cebb..2d547d3af249e 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_size.h"
+#include <clc/workitem/clc_get_local_size.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_local_size(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl
index 9a380c2fc4b8f..6f0634d6f90e7 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_max_sub_group_size.h"
+#include <clc/workitem/clc_get_max_sub_group_size.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_max_sub_group_size() {
   return __nvvm_read_ptx_sreg_warpsize();

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl
index d1002afb8dd24..87151ea4be625 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_num_groups.h"
+#include <clc/workitem/clc_get_num_groups.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t __clc_get_num_groups(uint dim) {
   switch (dim) {

diff  --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl
index 7e61e09bff1e3..1448f8a8b97dc 100644
--- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl
+++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_sub_group_local_id.h"
+#include <clc/workitem/clc_get_sub_group_local_id.h>
 
 _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_local_id() {
   return __nvvm_read_ptx_sreg_laneid();

diff  --git a/libclc/clc/lib/spirv/math/clc_fmax.cl b/libclc/clc/lib/spirv/math/clc_fmax.cl
index 57a2b5369db83..101f35c7108c2 100644
--- a/libclc/clc/lib/spirv/math/clc_fmax.cl
+++ b/libclc/clc/lib/spirv/math/clc_fmax.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_DEF _CLC_OVERLOAD float __clc_fmax(float x, float y) {
   return __builtin_fmaxf(x, y);
@@ -27,5 +27,5 @@ _CLC_DEF _CLC_OVERLOAD half __clc_fmax(half x, half y) {
 #endif
 
 #define __CLC_FUNCTION __clc_fmax
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/clc/lib/spirv/math/clc_fmin.cl b/libclc/clc/lib/spirv/math/clc_fmin.cl
index 867b403657901..9bef3a92d5ba4 100644
--- a/libclc/clc/lib/spirv/math/clc_fmin.cl
+++ b/libclc/clc/lib/spirv/math/clc_fmin.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/clc.h"
+#include <clc/internal/clc.h>
 
 _CLC_DEF _CLC_OVERLOAD float __clc_fmin(float x, float y) {
   return __builtin_fminf(x, y);
@@ -27,5 +27,5 @@ _CLC_DEF _CLC_OVERLOAD half __clc_fmin(half x, half y) {
 #endif
 
 #define __CLC_FUNCTION __clc_fmin
-#define __CLC_BODY "clc/shared/binary_def_scalarize.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_scalarize.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/include/clc/opencl/convert.h b/libclc/opencl/include/clc/opencl/convert.h
index c8da4efb9c84e..1f71f673619b9 100644
--- a/libclc/opencl/include/clc/opencl/convert.h
+++ b/libclc/opencl/include/clc/opencl/convert.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_OPENCL_CONVERT_H__
 #define __CLC_OPENCL_CONVERT_H__
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
 #define _CLC_CONVERT_DECL(FROM_TYPE, TO_TYPE, SUFFIX)                          \
   _CLC_OVERLOAD _CLC_DECL TO_TYPE convert_##TO_TYPE##SUFFIX(FROM_TYPE x);

diff  --git a/libclc/opencl/include/clc/opencl/opencl-base.h b/libclc/opencl/include/clc/opencl/opencl-base.h
index 65360300685c1..78fb9588d289d 100644
--- a/libclc/opencl/include/clc/opencl/opencl-base.h
+++ b/libclc/opencl/include/clc/opencl/opencl-base.h
@@ -18,7 +18,7 @@
 #endif
 
 /* Function Attributes */
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 /* 6.1 Supported Data Types */
 

diff  --git a/libclc/opencl/include/clc/opencl/synchronization/utils.h b/libclc/opencl/include/clc/opencl/synchronization/utils.h
index 718d77cacfa57..ec6401e11549e 100644
--- a/libclc/opencl/include/clc/opencl/synchronization/utils.h
+++ b/libclc/opencl/include/clc/opencl/synchronization/utils.h
@@ -9,8 +9,8 @@
 #ifndef __CLC_OPENCL_SYNCHRONIZATION_UTILS_H__
 #define __CLC_OPENCL_SYNCHRONIZATION_UTILS_H__
 
-#include "clc/mem_fence/clc_mem_semantic.h"
-#include "clc/opencl/opencl-base.h"
+#include <clc/mem_fence/clc_mem_semantic.h>
+#include <clc/opencl/opencl-base.h>
 
 static _CLC_INLINE int __opencl_get_memory_scope(cl_mem_fence_flags flag) {
   if (flag & CLK_GLOBAL_MEM_FENCE)

diff  --git a/libclc/opencl/include/clc/opencl/utils.h b/libclc/opencl/include/clc/opencl/utils.h
index a7f25f35c2fd6..fefcecf42c20c 100644
--- a/libclc/opencl/include/clc/opencl/utils.h
+++ b/libclc/opencl/include/clc/opencl/utils.h
@@ -9,7 +9,7 @@
 #ifndef __CLC_OPENCL_UTILS_H__
 #define __CLC_OPENCL_UTILS_H__
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
 static _CLC_INLINE int __opencl_get_clang_memory_scope(memory_scope scope) {
   switch (scope) {

diff  --git a/libclc/opencl/lib/amdgpu/async/wait_group_events.cl b/libclc/opencl/lib/amdgpu/async/wait_group_events.cl
index e65727ef0a894..f1c9925847de5 100644
--- a/libclc/opencl/lib/amdgpu/async/wait_group_events.cl
+++ b/libclc/opencl/lib/amdgpu/async/wait_group_events.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
 _CLC_DEF _CLC_OVERLOAD void wait_group_events(int n, __private event_t *evs) {
   (void)n;

diff  --git a/libclc/opencl/lib/clspv/conversion/convert_float2float.cl b/libclc/opencl/lib/clspv/conversion/convert_float2float.cl
index bb0baa8beb0af..be74b71f66b71 100644
--- a/libclc/opencl/lib/clspv/conversion/convert_float2float.cl
+++ b/libclc/opencl/lib/clspv/conversion/convert_float2float.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE)
 
@@ -19,19 +19,19 @@
 #ifdef cl_khr_fp16
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 #define __CLC_SCALAR_TYPE_SRC half
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #endif // cl_khr_fp16
 
 #define __CLC_SCALAR_TYPE_SRC float
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #ifdef cl_khr_fp64
 #define __CLC_SCALAR_TYPE_SRC double
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #endif // cl_khr_fp64

diff  --git a/libclc/opencl/lib/clspv/conversion/convert_float2int.cl b/libclc/opencl/lib/clspv/conversion/convert_float2int.cl
index 209b9cc4d497b..eca64bd3d1818 100644
--- a/libclc/opencl/lib/clspv/conversion/convert_float2int.cl
+++ b/libclc/opencl/lib/clspv/conversion/convert_float2int.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST
 #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST)
@@ -30,21 +30,21 @@
 #define __CLC_HAVE_RTE
 
 #define __CLC_SCALAR_TYPE_DST char
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST short
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST int
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST long
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST

diff  --git a/libclc/opencl/lib/clspv/conversion/convert_int2float.cl b/libclc/opencl/lib/clspv/conversion/convert_int2float.cl
index a59a556e0ef4d..e514d5a48b476 100644
--- a/libclc/opencl/lib/clspv/conversion/convert_int2float.cl
+++ b/libclc/opencl/lib/clspv/conversion/convert_int2float.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC
 #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC)
@@ -23,21 +23,21 @@
 #define __CLC_I2F
 
 #define __CLC_SCALAR_TYPE_SRC char
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC short
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC int
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC long
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC

diff  --git a/libclc/opencl/lib/clspv/conversion/convert_integer.cl b/libclc/opencl/lib/clspv/conversion/convert_integer.cl
index 695608ad18910..a2e217e924f77 100644
--- a/libclc/opencl/lib/clspv/conversion/convert_integer.cl
+++ b/libclc/opencl/lib/clspv/conversion/convert_integer.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC
 #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC)
@@ -23,21 +23,21 @@
 #define __CLC_IMPL_FUNCTION_SAT __CLC_XCONCAT(__CLC_IMPL_FUNCTION, _sat)
 
 #define __CLC_SCALAR_TYPE_SRC char
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC short
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC int
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC long
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC

diff  --git a/libclc/opencl/lib/clspv/math/fma.cl b/libclc/opencl/lib/clspv/math/fma.cl
index ab955a9a38ac6..172ec32b8a3b3 100644
--- a/libclc/opencl/lib/clspv/math/fma.cl
+++ b/libclc/opencl/lib/clspv/math/fma.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/internal/math/clc_sw_fma.h"
+#include <clc/internal/math/clc_sw_fma.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION fma
 #define __CLC_IMPL_FUNCTION(x) __clc_sw_fma
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/clspv/shared/vstore_half.cl b/libclc/opencl/lib/clspv/shared/vstore_half.cl
index 749718e13a350..cfcbf55caeae7 100644
--- a/libclc/opencl/lib/clspv/shared/vstore_half.cl
+++ b/libclc/opencl/lib/clspv/shared/vstore_half.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_as_type.h"
-#include "clc/float/definitions.h"
-#include "clc/math/clc_copysign.h"
-#include "clc/math/clc_fabs.h"
-#include "clc/math/clc_nextafter.h"
-#include "clc/opencl/opencl-base.h"
-#include "clc/relational/clc_isinf.h"
-#include "clc/relational/clc_isnan.h"
-#include "clc/shared/clc_min.h"
+#include <clc/clc_as_type.h>
+#include <clc/float/definitions.h>
+#include <clc/math/clc_copysign.h>
+#include <clc/math/clc_fabs.h>
+#include <clc/math/clc_nextafter.h>
+#include <clc/opencl/opencl-base.h>
+#include <clc/relational/clc_isinf.h>
+#include <clc/relational/clc_isnan.h>
+#include <clc/shared/clc_min.h>
 
 #pragma OPENCL EXTENSION cl_khr_byte_addressable_store : enable
 
@@ -145,7 +145,7 @@ _CLC_DEF _CLC_OVERLOAD float __clc_rte(float x) {
   __CLC_XFUNC(SUFFIX, VEC_SIZE, TYPE, AS)
 
 #define __CLC_BODY "vstore_half.inc"
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 #undef __CLC_FUNC
 #undef __CLC_XFUNC
 #undef __CLC_XFUNC_IMPL

diff  --git a/libclc/opencl/lib/generic/async/async_work_group_copy.cl b/libclc/opencl/lib/generic/async/async_work_group_copy.cl
index 1486c7dbb3019..787b9f8649512 100644
--- a/libclc/opencl/lib/generic/async/async_work_group_copy.cl
+++ b/libclc/opencl/lib/generic/async/async_work_group_copy.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
-#define __CLC_BODY "async_work_group_copy.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <async_work_group_copy.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "async_work_group_copy.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <async_work_group_copy.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl b/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl
index 24f50875d448f..cfb69f26cf5e3 100644
--- a/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl
+++ b/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
-#define __CLC_BODY "async_work_group_strided_copy.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <async_work_group_strided_copy.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "async_work_group_strided_copy.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <async_work_group_strided_copy.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/async/prefetch.cl b/libclc/opencl/lib/generic/async/prefetch.cl
index 609ac917fb09a..ec7a2e5469e54 100644
--- a/libclc/opencl/lib/generic/async/prefetch.cl
+++ b/libclc/opencl/lib/generic/async/prefetch.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/async/clc_prefetch.h"
+#include <clc/async/clc_prefetch.h>
 
-#define __CLC_BODY "prefetch.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <prefetch.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "prefetch.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <prefetch.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/async/wait_group_events.cl b/libclc/opencl/lib/generic/async/wait_group_events.cl
index dc63577d5bee7..76a9ee38bb89c 100644
--- a/libclc/opencl/lib/generic/async/wait_group_events.cl
+++ b/libclc/opencl/lib/generic/async/wait_group_events.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/opencl-base.h"
+#include <clc/opencl/opencl-base.h>
 
 _CLC_DEF _CLC_OVERLOAD void wait_group_events(int num_events,
                                               event_t *event_list) {

diff  --git a/libclc/opencl/lib/generic/atomic/atom_add.cl b/libclc/opencl/lib/generic/atomic/atom_add.cl
index a1a85b3bdec08..92df57576d1d0 100644
--- a/libclc/opencl/lib/generic/atomic/atom_add.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_add.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_add.h"
+#include <clc/atomic/clc_atomic_fetch_add.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_and.cl b/libclc/opencl/lib/generic/atomic/atom_and.cl
index fa82f3b45a30a..c09f10145bb30 100644
--- a/libclc/opencl/lib/generic/atomic/atom_and.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_and.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_and.h"
+#include <clc/atomic/clc_atomic_fetch_and.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl b/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl
index 2df86239a8b97..9ad3be5a6fe66 100644
--- a/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_compare_exchange.h"
+#include <clc/atomic/clc_atomic_compare_exchange.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_dec.cl b/libclc/opencl/lib/generic/atomic/atom_dec.cl
index 4e902ddfd460b..1f683b19b21cd 100644
--- a/libclc/opencl/lib/generic/atomic/atom_dec.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_dec.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_dec.h"
+#include <clc/atomic/clc_atomic_dec.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_inc.cl b/libclc/opencl/lib/generic/atomic/atom_inc.cl
index 66f467fefaf3c..a81c913dae426 100644
--- a/libclc/opencl/lib/generic/atomic/atom_inc.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_inc.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_inc.h"
+#include <clc/atomic/clc_atomic_inc.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_max.cl b/libclc/opencl/lib/generic/atomic/atom_max.cl
index ee1ea66772e0f..df39b1566de65 100644
--- a/libclc/opencl/lib/generic/atomic/atom_max.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_max.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_max.h"
+#include <clc/atomic/clc_atomic_fetch_max.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_min.cl b/libclc/opencl/lib/generic/atomic/atom_min.cl
index b0bdcc2511cdd..bbeb727a712fc 100644
--- a/libclc/opencl/lib/generic/atomic/atom_min.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_min.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_min.h"
+#include <clc/atomic/clc_atomic_fetch_min.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_or.cl b/libclc/opencl/lib/generic/atomic/atom_or.cl
index 6bc0ca77b800d..54fc99e67cbf3 100644
--- a/libclc/opencl/lib/generic/atomic/atom_or.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_or.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_or.h"
+#include <clc/atomic/clc_atomic_fetch_or.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_sub.cl b/libclc/opencl/lib/generic/atomic/atom_sub.cl
index 8a6594d89e512..10ece67cdf925 100644
--- a/libclc/opencl/lib/generic/atomic/atom_sub.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_sub.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_sub.h"
+#include <clc/atomic/clc_atomic_fetch_sub.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_xchg.cl b/libclc/opencl/lib/generic/atomic/atom_xchg.cl
index 941bdb20a193c..1888130b34ef3 100644
--- a/libclc/opencl/lib/generic/atomic/atom_xchg.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_xchg.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_exchange.h"
+#include <clc/atomic/clc_atomic_exchange.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atom_xor.cl b/libclc/opencl/lib/generic/atomic/atom_xor.cl
index 232dae2ea1984..abb10b43ef33b 100644
--- a/libclc/opencl/lib/generic/atomic/atom_xor.cl
+++ b/libclc/opencl/lib/generic/atomic/atom_xor.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_xor.h"
+#include <clc/atomic/clc_atomic_fetch_xor.h>
 
 // Non-volatile overloads are for backward compatibility with OpenCL 1.0.
 

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_add.cl b/libclc/opencl/lib/generic/atomic/atomic_add.cl
index 478ed08e02e1a..5eb459d0c9d60 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_add.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_add.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_add.h"
+#include <clc/atomic/clc_atomic_fetch_add.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_add(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_and.cl b/libclc/opencl/lib/generic/atomic/atomic_and.cl
index 7fc201787e4e7..3b7ecacee15e5 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_and.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_and.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_and.h"
+#include <clc/atomic/clc_atomic_fetch_and.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_and(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl b/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl
index 715cd64e066a5..40fb2f84e49dd 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_compare_exchange.h"
+#include <clc/atomic/clc_atomic_compare_exchange.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_cmpxchg(volatile AS TYPE *p, TYPE cmp,    \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl
index 655dc00f70644..9311a0d4a379c 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_compare_exchange.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_compare_exchange.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_compare_exchange_strong
 #define __CLC_IMPL_FUNCTION __clc_atomic_compare_exchange
 #define __CLC_COMPARE_EXCHANGE
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl
index 29fa2634c4b17..1f0e7259b0c94 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_compare_exchange.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_compare_exchange.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_compare_exchange_weak
 #define __CLC_IMPL_FUNCTION __clc_atomic_compare_exchange
 #define __CLC_COMPARE_EXCHANGE
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_dec.cl b/libclc/opencl/lib/generic/atomic/atomic_dec.cl
index 2eb772d01bf61..1ae3aa991367e 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_dec.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_dec.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_dec.h"
+#include <clc/atomic/clc_atomic_dec.h>
 
 #define __CLC_FUNCTION atomic_dec
 #define __CLC_IMPL_FUNCTION __clc_atomic_dec
 
-#define __CLC_BODY "atomic_inc_dec.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_inc_dec.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_exchange.cl b/libclc/opencl/lib/generic/atomic/atomic_exchange.cl
index d3c8710595ac5..b023b1ce18e61 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_exchange.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_exchange.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_exchange.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_exchange.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_exchange
 #define __CLC_IMPL_FUNCTION __clc_atomic_exchange
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl
index ff2115f4c4b41..fb0ee06f95dd6 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl
@@ -6,17 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_add.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_add.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_add
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_add
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>
 
 #if defined(__opencl_c_atomic_order_seq_cst) &&                                \
     defined(__opencl_c_atomic_scope_device)

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl
index 6e28a1c11de89..286f97ee1e432 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_and.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_and.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_and
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_and
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl
index 182c24ed7c566..e9fc0a83ceb4d 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_max.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_max.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_max
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_max
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl
index 262c96a10d40f..df7dac6c5b222 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_min.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_min.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_min
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_min
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl
index 5f2bfd3197074..bf4af8412c33c 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_or.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_or.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_or
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_or
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl
index 9740ff7c036db..a8ad0c193d2eb 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl
@@ -6,17 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_sub.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_sub.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_sub
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_sub
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>
 
 #if defined(__opencl_c_atomic_order_seq_cst) &&                                \
     defined(__opencl_c_atomic_scope_device)

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl
index 83ef34c666891..81302e54d5caa 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_xor.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_fetch_xor.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_fetch_xor
 #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_xor
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl b/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl
index b4f4bfd94f571..28b0101e77972 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_flag_clear.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_flag_clear.h>
+#include <clc/opencl/utils.h>
 
 #if defined(__opencl_c_atomic_order_seq_cst) &&                                \
     defined(__opencl_c_atomic_scope_device)

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl b/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl
index 86f60627b3a7a..c5a346cf423c9 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_flag_test_and_set.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_flag_test_and_set.h>
+#include <clc/opencl/utils.h>
 
 #if defined(__opencl_c_atomic_order_seq_cst) &&                                \
     defined(__opencl_c_atomic_scope_device)

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_inc.cl b/libclc/opencl/lib/generic/atomic/atomic_inc.cl
index 250473463c682..a408087bc0e32 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_inc.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_inc.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_inc.h"
+#include <clc/atomic/clc_atomic_inc.h>
 
 #define __CLC_FUNCTION atomic_inc
 #define __CLC_IMPL_FUNCTION __clc_atomic_inc
 
-#define __CLC_BODY "atomic_inc_dec.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_inc_dec.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_init.cl b/libclc/opencl/lib/generic/atomic/atomic_init.cl
index 1ebf8bb29d408..5255ab1f46c13 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_init.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_init.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/utils.h"
+#include <clc/opencl/utils.h>
 
 #define __CLC_ATOMIC_GENTYPE __CLC_XCONCAT(atomic_, __CLC_GENTYPE)
 
-#define __CLC_BODY "atomic_init.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_init.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_init.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_init.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_load.cl b/libclc/opencl/lib/generic/atomic/atomic_load.cl
index b8a230b37f907..9a5d5c92d599d 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_load.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_load.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_load.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_load.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_load
 #define __CLC_IMPL_FUNCTION __clc_atomic_load
 #define __CLC_NO_VALUE_ARG
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_max.cl b/libclc/opencl/lib/generic/atomic/atomic_max.cl
index 005d9f138488d..c9f92b7dfc082 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_max.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_max.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_max.h"
+#include <clc/atomic/clc_atomic_fetch_max.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_max(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_min.cl b/libclc/opencl/lib/generic/atomic/atomic_min.cl
index d4a49676b8013..a1954a558ef10 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_min.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_min.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_min.h"
+#include <clc/atomic/clc_atomic_fetch_min.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_min(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_or.cl b/libclc/opencl/lib/generic/atomic/atomic_or.cl
index 7db9cede1b518..2ed4f058d5b66 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_or.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_or.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_or.h"
+#include <clc/atomic/clc_atomic_fetch_or.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_or(volatile AS TYPE *p, TYPE val) {       \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_store.cl b/libclc/opencl/lib/generic/atomic/atomic_store.cl
index ff2791115a80b..5c348248b93ea 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_store.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_store.cl
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_store.h"
-#include "clc/opencl/utils.h"
+#include <clc/atomic/clc_atomic_store.h>
+#include <clc/opencl/utils.h>
 
 #define __CLC_FUNCTION atomic_store
 #define __CLC_IMPL_FUNCTION __clc_atomic_store
 #define __CLC_RETURN_VOID
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "atomic_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <atomic_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_sub.cl b/libclc/opencl/lib/generic/atomic/atomic_sub.cl
index c3a066aad623d..b722d5ceed2de 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_sub.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_sub.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_sub.h"
+#include <clc/atomic/clc_atomic_fetch_sub.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_sub(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_xchg.cl b/libclc/opencl/lib/generic/atomic/atomic_xchg.cl
index f682e2e90fff6..08dbbad0628f2 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_xchg.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_xchg.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_exchange.h"
+#include <clc/atomic/clc_atomic_exchange.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_xchg(volatile AS TYPE *p, TYPE val) {     \

diff  --git a/libclc/opencl/lib/generic/atomic/atomic_xor.cl b/libclc/opencl/lib/generic/atomic/atomic_xor.cl
index 120f75e681aff..7279f4437d7c5 100644
--- a/libclc/opencl/lib/generic/atomic/atomic_xor.cl
+++ b/libclc/opencl/lib/generic/atomic/atomic_xor.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/atomic/clc_atomic_fetch_xor.h"
+#include <clc/atomic/clc_atomic_fetch_xor.h>
 
 #define __CLC_IMPL(TYPE, AS)                                                   \
   _CLC_OVERLOAD _CLC_DEF TYPE atomic_xor(volatile AS TYPE *p, TYPE val) {      \

diff  --git a/libclc/opencl/lib/generic/collective/work_group_broadcast.cl b/libclc/opencl/lib/generic/collective/work_group_broadcast.cl
index 60ac0a9d0513f..fa4e8fbc26bb3 100644
--- a/libclc/opencl/lib/generic/collective/work_group_broadcast.cl
+++ b/libclc/opencl/lib/generic/collective/work_group_broadcast.cl
@@ -8,8 +8,8 @@
 
 #include "clc/collective/clc_work_group_broadcast.h"
 
-#define __CLC_BODY "work_group_broadcast.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <work_group_broadcast.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "work_group_broadcast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <work_group_broadcast.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/collective/work_group_reduce.cl b/libclc/opencl/lib/generic/collective/work_group_reduce.cl
index c9d8344b6b7d4..219106432cfc6 100644
--- a/libclc/opencl/lib/generic/collective/work_group_reduce.cl
+++ b/libclc/opencl/lib/generic/collective/work_group_reduce.cl
@@ -8,8 +8,8 @@
 
 #include "clc/collective/clc_work_group_reduce.h"
 
-#define __CLC_BODY "work_group_reduce.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <work_group_reduce.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "work_group_reduce.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <work_group_reduce.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/degrees.cl b/libclc/opencl/lib/generic/common/degrees.cl
index 6c46000ef873d..d0f692cc320fa 100644
--- a/libclc/opencl/lib/generic/common/degrees.cl
+++ b/libclc/opencl/lib/generic/common/degrees.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_degrees.h"
+#include <clc/common/clc_degrees.h>
 
 #define __CLC_FUNCTION degrees
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/mix.cl b/libclc/opencl/lib/generic/common/mix.cl
index 6b338300738da..2963ee62c3493 100644
--- a/libclc/opencl/lib/generic/common/mix.cl
+++ b/libclc/opencl/lib/generic/common/mix.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_mad.h"
+#include <clc/math/clc_mad.h>
 
-#define __CLC_BODY "mix.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <mix.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/radians.cl b/libclc/opencl/lib/generic/common/radians.cl
index 931016d02fd4b..80168bc569a6e 100644
--- a/libclc/opencl/lib/generic/common/radians.cl
+++ b/libclc/opencl/lib/generic/common/radians.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_radians.h"
+#include <clc/common/clc_radians.h>
 
 #define __CLC_FUNCTION radians
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/sign.cl b/libclc/opencl/lib/generic/common/sign.cl
index 712ddd184b44a..88c974cd7c5d5 100644
--- a/libclc/opencl/lib/generic/common/sign.cl
+++ b/libclc/opencl/lib/generic/common/sign.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_sign.h"
+#include <clc/common/clc_sign.h>
 
 #define __CLC_FUNCTION sign
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/smoothstep.cl b/libclc/opencl/lib/generic/common/smoothstep.cl
index 40bba97016240..9589d0b8afaa2 100644
--- a/libclc/opencl/lib/generic/common/smoothstep.cl
+++ b/libclc/opencl/lib/generic/common/smoothstep.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_smoothstep.h"
+#include <clc/common/clc_smoothstep.h>
 
-#define __CLC_BODY "smoothstep.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <smoothstep.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/common/step.cl b/libclc/opencl/lib/generic/common/step.cl
index 8e0986bdd19df..ab12570f54c06 100644
--- a/libclc/opencl/lib/generic/common/step.cl
+++ b/libclc/opencl/lib/generic/common/step.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/common/clc_step.h"
+#include <clc/common/clc_step.h>
 
-#define __CLC_BODY "step.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <step.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/conversion/convert_float2float.cl b/libclc/opencl/lib/generic/conversion/convert_float2float.cl
index bb0baa8beb0af..be74b71f66b71 100644
--- a/libclc/opencl/lib/generic/conversion/convert_float2float.cl
+++ b/libclc/opencl/lib/generic/conversion/convert_float2float.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE)
 
@@ -19,19 +19,19 @@
 #ifdef cl_khr_fp16
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 #define __CLC_SCALAR_TYPE_SRC half
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #endif // cl_khr_fp16
 
 #define __CLC_SCALAR_TYPE_SRC float
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #ifdef cl_khr_fp64
 #define __CLC_SCALAR_TYPE_SRC double
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 #endif // cl_khr_fp64

diff  --git a/libclc/opencl/lib/generic/conversion/convert_float2int.cl b/libclc/opencl/lib/generic/conversion/convert_float2int.cl
index 4b3d731edd301..7fe518f3105ce 100644
--- a/libclc/opencl/lib/generic/conversion/convert_float2int.cl
+++ b/libclc/opencl/lib/generic/conversion/convert_float2int.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST
 #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST)
@@ -29,21 +29,21 @@
 #define __CLC_F2I
 
 #define __CLC_SCALAR_TYPE_DST char
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST short
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST int
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST
 
 #define __CLC_SCALAR_TYPE_DST long
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_DST

diff  --git a/libclc/opencl/lib/generic/conversion/convert_int2float.cl b/libclc/opencl/lib/generic/conversion/convert_int2float.cl
index a59a556e0ef4d..e514d5a48b476 100644
--- a/libclc/opencl/lib/generic/conversion/convert_int2float.cl
+++ b/libclc/opencl/lib/generic/conversion/convert_int2float.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC
 #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC)
@@ -23,21 +23,21 @@
 #define __CLC_I2F
 
 #define __CLC_SCALAR_TYPE_SRC char
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC short
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC int
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC long
-#define __CLC_BODY "convert_float.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <convert_float.inc>
+#include <clc/math/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC

diff  --git a/libclc/opencl/lib/generic/conversion/convert_integer.cl b/libclc/opencl/lib/generic/conversion/convert_integer.cl
index 695608ad18910..a2e217e924f77 100644
--- a/libclc/opencl/lib/generic/conversion/convert_integer.cl
+++ b/libclc/opencl/lib/generic/conversion/convert_integer.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/clc_convert.h"
-#include "clc/opencl/convert.h"
+#include <clc/clc_convert.h>
+#include <clc/opencl/convert.h>
 
 #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC
 #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC)
@@ -23,21 +23,21 @@
 #define __CLC_IMPL_FUNCTION_SAT __CLC_XCONCAT(__CLC_IMPL_FUNCTION, _sat)
 
 #define __CLC_SCALAR_TYPE_SRC char
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC short
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC int
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC
 
 #define __CLC_SCALAR_TYPE_SRC long
-#define __CLC_BODY "convert_integer.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <convert_integer.inc>
+#include <clc/integer/gentype.inc>
 #undef __CLC_SCALAR_TYPE_SRC

diff  --git a/libclc/opencl/lib/generic/geometric/cross.cl b/libclc/opencl/lib/generic/geometric/cross.cl
index 9d55e0c3c94de..29dd6370a4d57 100644
--- a/libclc/opencl/lib/generic/geometric/cross.cl
+++ b/libclc/opencl/lib/generic/geometric/cross.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_cross.h"
+#include <clc/geometric/clc_cross.h>
 
 _CLC_OVERLOAD _CLC_DEF float3 cross(float3 p0, float3 p1) {
   return __clc_cross(p0, p1);

diff  --git a/libclc/opencl/lib/generic/geometric/distance.cl b/libclc/opencl/lib/generic/geometric/distance.cl
index 46c129fc643b2..9a39e9e0c3375 100644
--- a/libclc/opencl/lib/generic/geometric/distance.cl
+++ b/libclc/opencl/lib/generic/geometric/distance.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_distance.h"
+#include <clc/geometric/clc_distance.h>
 
 #define __CLC_FUNCTION distance
-#define __CLC_BODY "clc/geometric/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/dot.cl b/libclc/opencl/lib/generic/geometric/dot.cl
index 94bc5f5bc3c61..a622b209f48ba 100644
--- a/libclc/opencl/lib/generic/geometric/dot.cl
+++ b/libclc/opencl/lib/generic/geometric/dot.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_dot.h"
+#include <clc/geometric/clc_dot.h>
 
 #define __CLC_FUNCTION dot
-#define __CLC_BODY "clc/geometric/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/fast_distance.cl b/libclc/opencl/lib/generic/geometric/fast_distance.cl
index d0ddc15c599c4..2e5c22201c8ab 100644
--- a/libclc/opencl/lib/generic/geometric/fast_distance.cl
+++ b/libclc/opencl/lib/generic/geometric/fast_distance.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_fast_distance.h"
+#include <clc/geometric/clc_fast_distance.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION fast_distance
-#define __CLC_BODY "clc/geometric/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/fast_length.cl b/libclc/opencl/lib/generic/geometric/fast_length.cl
index 2a08305600414..13ac101e391df 100644
--- a/libclc/opencl/lib/generic/geometric/fast_length.cl
+++ b/libclc/opencl/lib/generic/geometric/fast_length.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_fast_length.h"
+#include <clc/geometric/clc_fast_length.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION fast_length
-#define __CLC_BODY "clc/geometric/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/fast_normalize.cl b/libclc/opencl/lib/generic/geometric/fast_normalize.cl
index cc8f2b7df7f00..ee3eed25fac55 100644
--- a/libclc/opencl/lib/generic/geometric/fast_normalize.cl
+++ b/libclc/opencl/lib/generic/geometric/fast_normalize.cl
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_fast_normalize.h"
+#include <clc/geometric/clc_fast_normalize.h>
 
 #define __CLC_FUNCTION fast_normalize
 #define __CLC_FLOAT_ONLY
 #define __CLC_GEOMETRIC_RET_GENTYPE
-#define __CLC_BODY "clc/geometric/unary_def.inc"
+#define __CLC_BODY <clc/geometric/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/length.cl b/libclc/opencl/lib/generic/geometric/length.cl
index d58e2b768a6b4..ce5dee508ca21 100644
--- a/libclc/opencl/lib/generic/geometric/length.cl
+++ b/libclc/opencl/lib/generic/geometric/length.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_length.h"
+#include <clc/geometric/clc_length.h>
 
 #define __CLC_FUNCTION length
-#define __CLC_BODY "clc/geometric/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/geometric/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/geometric/normalize.cl b/libclc/opencl/lib/generic/geometric/normalize.cl
index d103ff8aa831a..6dd96a3259e71 100644
--- a/libclc/opencl/lib/generic/geometric/normalize.cl
+++ b/libclc/opencl/lib/generic/geometric/normalize.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/geometric/clc_normalize.h"
+#include <clc/geometric/clc_normalize.h>
 
 #define __CLC_FUNCTION normalize
 #define __CLC_GEOMETRIC_RET_GENTYPE
-#define __CLC_BODY "clc/geometric/unary_def.inc"
+#define __CLC_BODY <clc/geometric/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/abs.cl b/libclc/opencl/lib/generic/integer/abs.cl
index 3088b223ce877..3a2aabf716ce4 100644
--- a/libclc/opencl/lib/generic/integer/abs.cl
+++ b/libclc/opencl/lib/generic/integer/abs.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_abs.h"
+#include <clc/integer/clc_abs.h>
 
-#define __CLC_BODY "abs.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <abs.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/abs_
diff .cl b/libclc/opencl/lib/generic/integer/abs_
diff .cl
index d1b3ea00de475..c738c99eb9e04 100644
--- a/libclc/opencl/lib/generic/integer/abs_
diff .cl
+++ b/libclc/opencl/lib/generic/integer/abs_
diff .cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_abs_
diff .h"
+#include <clc/integer/clc_abs_
diff .h>
 
-#define __CLC_BODY "abs_
diff .inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <abs_
diff .inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/add_sat.cl b/libclc/opencl/lib/generic/integer/add_sat.cl
index d3d539dcc1cfb..a4325054cf7eb 100644
--- a/libclc/opencl/lib/generic/integer/add_sat.cl
+++ b/libclc/opencl/lib/generic/integer/add_sat.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_add_sat.h"
+#include <clc/integer/clc_add_sat.h>
 
 #define __CLC_FUNCTION add_sat
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/bit_reverse.cl b/libclc/opencl/lib/generic/integer/bit_reverse.cl
index 2c921503f87c8..917be12b8e833 100644
--- a/libclc/opencl/lib/generic/integer/bit_reverse.cl
+++ b/libclc/opencl/lib/generic/integer/bit_reverse.cl
@@ -8,11 +8,11 @@
 
 #ifdef cl_khr_extended_bit_ops
 
-#include "clc/integer/clc_bit_reverse.h"
+#include <clc/integer/clc_bit_reverse.h>
 
 #define __CLC_FUNCTION bit_reverse
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #endif // cl_khr_extended_bit_ops

diff  --git a/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl b/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl
index 884a110d5490d..c54dd461f1713 100644
--- a/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl
+++ b/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl
@@ -8,12 +8,12 @@
 
 #ifdef cl_khr_extended_bit_ops
 
-#include "clc/integer/clc_bitfield_extract_signed.h"
+#include <clc/integer/clc_bitfield_extract_signed.h>
 
 #define __CLC_FUNCTION bitfield_extract_signed
 #define __CLC_RETTYPE __CLC_S_GENTYPE
 
-#define __CLC_BODY "bitfield_extract_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <bitfield_extract_def.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // cl_khr_extended_bit_ops

diff  --git a/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl b/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl
index 2cdc90fa2e534..b78d92c69cd03 100644
--- a/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl
+++ b/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl
@@ -8,12 +8,12 @@
 
 #ifdef cl_khr_extended_bit_ops
 
-#include "clc/integer/clc_bitfield_extract_unsigned.h"
+#include <clc/integer/clc_bitfield_extract_unsigned.h>
 
 #define __CLC_FUNCTION bitfield_extract_unsigned
 #define __CLC_RETTYPE __CLC_U_GENTYPE
 
-#define __CLC_BODY "bitfield_extract_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <bitfield_extract_def.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // cl_khr_extended_bit_ops

diff  --git a/libclc/opencl/lib/generic/integer/bitfield_insert.cl b/libclc/opencl/lib/generic/integer/bitfield_insert.cl
index 1f36e1141b0a8..bc75df9573926 100644
--- a/libclc/opencl/lib/generic/integer/bitfield_insert.cl
+++ b/libclc/opencl/lib/generic/integer/bitfield_insert.cl
@@ -8,10 +8,10 @@
 
 #ifdef cl_khr_extended_bit_ops
 
-#include "clc/integer/clc_bitfield_insert.h"
+#include <clc/integer/clc_bitfield_insert.h>
 
 #define __CLC_FUNCTION bitfield_insert
-#define __CLC_BODY "bitfield_insert.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <bitfield_insert.inc>
+#include <clc/integer/gentype.inc>
 
 #endif // cl_khr_extended_bit_ops

diff  --git a/libclc/opencl/lib/generic/integer/clz.cl b/libclc/opencl/lib/generic/integer/clz.cl
index 809771164b850..8e700ca397a94 100644
--- a/libclc/opencl/lib/generic/integer/clz.cl
+++ b/libclc/opencl/lib/generic/integer/clz.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_clz.h"
+#include <clc/integer/clc_clz.h>
 
 #define __CLC_FUNCTION clz
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/ctz.cl b/libclc/opencl/lib/generic/integer/ctz.cl
index 20a0bb98eb09d..a961e5b8c1d68 100644
--- a/libclc/opencl/lib/generic/integer/ctz.cl
+++ b/libclc/opencl/lib/generic/integer/ctz.cl
@@ -8,11 +8,11 @@
 
 #if __OPENCL_C_VERSION__ >= CL_VERSION_2_0
 
-#include "clc/integer/clc_ctz.h"
+#include <clc/integer/clc_ctz.h>
 
 #define __CLC_FUNCTION ctz
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #endif // __OPENCL_C_VERSION__ >= CL_VERSION_2_0

diff  --git a/libclc/opencl/lib/generic/integer/hadd.cl b/libclc/opencl/lib/generic/integer/hadd.cl
index 19e754769a4e6..5281e63a73623 100644
--- a/libclc/opencl/lib/generic/integer/hadd.cl
+++ b/libclc/opencl/lib/generic/integer/hadd.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_hadd.h"
+#include <clc/integer/clc_hadd.h>
 
 #define __CLC_FUNCTION hadd
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/mad24.cl b/libclc/opencl/lib/generic/integer/mad24.cl
index 6879ae710ef30..e964a3983cfbb 100644
--- a/libclc/opencl/lib/generic/integer/mad24.cl
+++ b/libclc/opencl/lib/generic/integer/mad24.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mad24.h"
+#include <clc/integer/clc_mad24.h>
 
 #define __CLC_FUNCTION mad24
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/integer/gentype24.inc"
+#include <clc/integer/gentype24.inc>

diff  --git a/libclc/opencl/lib/generic/integer/mad_hi.cl b/libclc/opencl/lib/generic/integer/mad_hi.cl
index 4d2a4272a3aec..24bfb6e1ee0dd 100644
--- a/libclc/opencl/lib/generic/integer/mad_hi.cl
+++ b/libclc/opencl/lib/generic/integer/mad_hi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mad_hi.h"
+#include <clc/integer/clc_mad_hi.h>
 
 #define __CLC_FUNCTION mad_hi
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/mad_sat.cl b/libclc/opencl/lib/generic/integer/mad_sat.cl
index b641a95625c48..c3875e340ff1f 100644
--- a/libclc/opencl/lib/generic/integer/mad_sat.cl
+++ b/libclc/opencl/lib/generic/integer/mad_sat.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mad_sat.h"
+#include <clc/integer/clc_mad_sat.h>
 
 #define __CLC_FUNCTION mad_sat
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/mul24.cl b/libclc/opencl/lib/generic/integer/mul24.cl
index 8b3d1d626cdc0..5c681ac4e7145 100644
--- a/libclc/opencl/lib/generic/integer/mul24.cl
+++ b/libclc/opencl/lib/generic/integer/mul24.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mul24.h"
+#include <clc/integer/clc_mul24.h>
 
 #define __CLC_FUNCTION mul24
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype24.inc"
+#include <clc/integer/gentype24.inc>

diff  --git a/libclc/opencl/lib/generic/integer/mul_hi.cl b/libclc/opencl/lib/generic/integer/mul_hi.cl
index 5ae69a4b87555..1a9c3a923a3e9 100644
--- a/libclc/opencl/lib/generic/integer/mul_hi.cl
+++ b/libclc/opencl/lib/generic/integer/mul_hi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_mul_hi.h"
+#include <clc/integer/clc_mul_hi.h>
 
 #define __CLC_FUNCTION mul_hi
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/popcount.cl b/libclc/opencl/lib/generic/integer/popcount.cl
index 623ab6d99eb39..0dc521fb409ea 100644
--- a/libclc/opencl/lib/generic/integer/popcount.cl
+++ b/libclc/opencl/lib/generic/integer/popcount.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_popcount.h"
+#include <clc/integer/clc_popcount.h>
 
 #define __CLC_FUNCTION popcount
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/rhadd.cl b/libclc/opencl/lib/generic/integer/rhadd.cl
index d07f5309d48a1..f660a21b4a019 100644
--- a/libclc/opencl/lib/generic/integer/rhadd.cl
+++ b/libclc/opencl/lib/generic/integer/rhadd.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_rhadd.h"
+#include <clc/integer/clc_rhadd.h>
 
 #define __CLC_FUNCTION rhadd
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/rotate.cl b/libclc/opencl/lib/generic/integer/rotate.cl
index 15793d0bdc7ca..82015803370b1 100644
--- a/libclc/opencl/lib/generic/integer/rotate.cl
+++ b/libclc/opencl/lib/generic/integer/rotate.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_rotate.h"
+#include <clc/integer/clc_rotate.h>
 
 #define __CLC_FUNCTION rotate
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/sub_sat.cl b/libclc/opencl/lib/generic/integer/sub_sat.cl
index c84992601e907..76d80c4172426 100644
--- a/libclc/opencl/lib/generic/integer/sub_sat.cl
+++ b/libclc/opencl/lib/generic/integer/sub_sat.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_sub_sat.h"
+#include <clc/integer/clc_sub_sat.h>
 
 #define __CLC_FUNCTION sub_sat
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/integer/upsample.cl b/libclc/opencl/lib/generic/integer/upsample.cl
index 52bdcdbf19e7e..2a63a13186d11 100644
--- a/libclc/opencl/lib/generic/integer/upsample.cl
+++ b/libclc/opencl/lib/generic/integer/upsample.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/integer/clc_upsample.h"
+#include <clc/integer/clc_upsample.h>
 
 #define __CLC_UPSAMPLE_IMPL(BGENTYPE, GENTYPE, UGENTYPE)                       \
   _CLC_OVERLOAD _CLC_DEF BGENTYPE upsample(GENTYPE hi, UGENTYPE lo) {          \

diff  --git a/libclc/opencl/lib/generic/math/acos.cl b/libclc/opencl/lib/generic/math/acos.cl
index c866509c48bfe..ca9fd9d4f1b07 100644
--- a/libclc/opencl/lib/generic/math/acos.cl
+++ b/libclc/opencl/lib/generic/math/acos.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_acos.h"
+#include <clc/math/clc_acos.h>
 
 #define __CLC_FUNCTION acos
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/acosh.cl b/libclc/opencl/lib/generic/math/acosh.cl
index 52c4bcf7f3c82..3e2c0b3d4a87f 100644
--- a/libclc/opencl/lib/generic/math/acosh.cl
+++ b/libclc/opencl/lib/generic/math/acosh.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_acosh.h"
+#include <clc/math/clc_acosh.h>
 
 #define __CLC_FUNCTION acosh
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/acospi.cl b/libclc/opencl/lib/generic/math/acospi.cl
index 608c72b4bb6e2..82e84c690e270 100644
--- a/libclc/opencl/lib/generic/math/acospi.cl
+++ b/libclc/opencl/lib/generic/math/acospi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_acospi.h"
+#include <clc/math/clc_acospi.h>
 
 #define __CLC_FUNCTION acospi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/asin.cl b/libclc/opencl/lib/generic/math/asin.cl
index aab2d1c73fa94..5c3ccd6532013 100644
--- a/libclc/opencl/lib/generic/math/asin.cl
+++ b/libclc/opencl/lib/generic/math/asin.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_asin.h"
+#include <clc/math/clc_asin.h>
 
 #define __CLC_FUNCTION asin
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/asinh.cl b/libclc/opencl/lib/generic/math/asinh.cl
index 7b48950160312..86d825f77f324 100644
--- a/libclc/opencl/lib/generic/math/asinh.cl
+++ b/libclc/opencl/lib/generic/math/asinh.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_asinh.h"
+#include <clc/math/clc_asinh.h>
 
 #define __CLC_FUNCTION asinh
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/asinpi.cl b/libclc/opencl/lib/generic/math/asinpi.cl
index 647f0db76db97..b093777600c40 100644
--- a/libclc/opencl/lib/generic/math/asinpi.cl
+++ b/libclc/opencl/lib/generic/math/asinpi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_asinpi.h"
+#include <clc/math/clc_asinpi.h>
 
 #define __CLC_FUNCTION asinpi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/atan.cl b/libclc/opencl/lib/generic/math/atan.cl
index 7a3155ed40480..a5dbfd052feb0 100644
--- a/libclc/opencl/lib/generic/math/atan.cl
+++ b/libclc/opencl/lib/generic/math/atan.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_atan.h"
+#include <clc/math/clc_atan.h>
 
 #define __CLC_FUNCTION atan
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/atan2.cl b/libclc/opencl/lib/generic/math/atan2.cl
index 2bbac431fcc98..64a06991a91df 100644
--- a/libclc/opencl/lib/generic/math/atan2.cl
+++ b/libclc/opencl/lib/generic/math/atan2.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_atan2.h"
+#include <clc/math/clc_atan2.h>
 
 #define __CLC_FUNCTION atan2
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/atan2pi.cl b/libclc/opencl/lib/generic/math/atan2pi.cl
index 2d37e012021de..854ca09990b44 100644
--- a/libclc/opencl/lib/generic/math/atan2pi.cl
+++ b/libclc/opencl/lib/generic/math/atan2pi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_atan2pi.h"
+#include <clc/math/clc_atan2pi.h>
 
 #define __CLC_FUNCTION atan2pi
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/atanh.cl b/libclc/opencl/lib/generic/math/atanh.cl
index 891c613d6d21b..3a38cfe69ade8 100644
--- a/libclc/opencl/lib/generic/math/atanh.cl
+++ b/libclc/opencl/lib/generic/math/atanh.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_atanh.h"
+#include <clc/math/clc_atanh.h>
 
 #define __CLC_FUNCTION atanh
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/atanpi.cl b/libclc/opencl/lib/generic/math/atanpi.cl
index 24017cd8afd9c..c3da0aba9e624 100644
--- a/libclc/opencl/lib/generic/math/atanpi.cl
+++ b/libclc/opencl/lib/generic/math/atanpi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_atanpi.h"
+#include <clc/math/clc_atanpi.h>
 
 #define __CLC_FUNCTION atanpi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/cbrt.cl b/libclc/opencl/lib/generic/math/cbrt.cl
index 2496e3f99e470..86b8415c688cc 100644
--- a/libclc/opencl/lib/generic/math/cbrt.cl
+++ b/libclc/opencl/lib/generic/math/cbrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_cbrt.h"
+#include <clc/math/clc_cbrt.h>
 
 #define __CLC_FUNCTION cbrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/ceil.cl b/libclc/opencl/lib/generic/math/ceil.cl
index 86b9383fc179f..5d0d8ad4238fc 100644
--- a/libclc/opencl/lib/generic/math/ceil.cl
+++ b/libclc/opencl/lib/generic/math/ceil.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_ceil.h"
+#include <clc/math/clc_ceil.h>
 
 #define __CLC_FUNCTION ceil
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/copysign.cl b/libclc/opencl/lib/generic/math/copysign.cl
index 7b0d056473493..fbb86b89a8bce 100644
--- a/libclc/opencl/lib/generic/math/copysign.cl
+++ b/libclc/opencl/lib/generic/math/copysign.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_copysign.h"
+#include <clc/math/clc_copysign.h>
 
 #define __CLC_FUNCTION copysign
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/cos.cl b/libclc/opencl/lib/generic/math/cos.cl
index da1877878aa8c..4b895b980c306 100644
--- a/libclc/opencl/lib/generic/math/cos.cl
+++ b/libclc/opencl/lib/generic/math/cos.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_cos.h"
+#include <clc/math/clc_cos.h>
 
 #define __CLC_FUNCTION cos
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/cosh.cl b/libclc/opencl/lib/generic/math/cosh.cl
index 39ca56fccfe21..4b44cb426dac0 100644
--- a/libclc/opencl/lib/generic/math/cosh.cl
+++ b/libclc/opencl/lib/generic/math/cosh.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_cosh.h"
+#include <clc/math/clc_cosh.h>
 
 #define __CLC_FUNCTION cosh
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/cospi.cl b/libclc/opencl/lib/generic/math/cospi.cl
index 2f15078a7bd05..d910c88c5c9c5 100644
--- a/libclc/opencl/lib/generic/math/cospi.cl
+++ b/libclc/opencl/lib/generic/math/cospi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_cospi.h"
+#include <clc/math/clc_cospi.h>
 
 #define __CLC_FUNCTION cospi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/erf.cl b/libclc/opencl/lib/generic/math/erf.cl
index 59d8c73c4d553..58b2d8d6937ba 100644
--- a/libclc/opencl/lib/generic/math/erf.cl
+++ b/libclc/opencl/lib/generic/math/erf.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_erf.h"
+#include <clc/math/clc_erf.h>
 
 #define __CLC_FUNCTION erf
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/erfc.cl b/libclc/opencl/lib/generic/math/erfc.cl
index ad332d504cfdc..5aa7d0fcc32e0 100644
--- a/libclc/opencl/lib/generic/math/erfc.cl
+++ b/libclc/opencl/lib/generic/math/erfc.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_erfc.h"
+#include <clc/math/clc_erfc.h>
 
 #define __CLC_FUNCTION erfc
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/exp.cl b/libclc/opencl/lib/generic/math/exp.cl
index 12c4f2ccbdb6b..2afeb89370794 100644
--- a/libclc/opencl/lib/generic/math/exp.cl
+++ b/libclc/opencl/lib/generic/math/exp.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp.h"
+#include <clc/math/clc_exp.h>
 
 #define __CLC_FUNCTION exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/exp10.cl b/libclc/opencl/lib/generic/math/exp10.cl
index 2119a42bc1a6e..befc5f16bb264 100644
--- a/libclc/opencl/lib/generic/math/exp10.cl
+++ b/libclc/opencl/lib/generic/math/exp10.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp10.h"
+#include <clc/math/clc_exp10.h>
 
 #define __CLC_FUNCTION exp10
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/exp2.cl b/libclc/opencl/lib/generic/math/exp2.cl
index c7f6a0c578022..f82b713a98920 100644
--- a/libclc/opencl/lib/generic/math/exp2.cl
+++ b/libclc/opencl/lib/generic/math/exp2.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_exp2.h"
+#include <clc/math/clc_exp2.h>
 
 #define __CLC_FUNCTION exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/expm1.cl b/libclc/opencl/lib/generic/math/expm1.cl
index a1e0a12005a3c..66661192b9915 100644
--- a/libclc/opencl/lib/generic/math/expm1.cl
+++ b/libclc/opencl/lib/generic/math/expm1.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_expm1.h"
+#include <clc/math/clc_expm1.h>
 
 #define __CLC_FUNCTION expm1
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fabs.cl b/libclc/opencl/lib/generic/math/fabs.cl
index 878eef0a26833..eed1a585b64cb 100644
--- a/libclc/opencl/lib/generic/math/fabs.cl
+++ b/libclc/opencl/lib/generic/math/fabs.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fabs.h"
+#include <clc/math/clc_fabs.h>
 
 #define __CLC_FUNCTION fabs
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fdim.cl b/libclc/opencl/lib/generic/math/fdim.cl
index f8348f4ccf0db..16fcce64f5178 100644
--- a/libclc/opencl/lib/generic/math/fdim.cl
+++ b/libclc/opencl/lib/generic/math/fdim.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fdim.h"
+#include <clc/math/clc_fdim.h>
 
 #define __CLC_FUNCTION fdim
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/floor.cl b/libclc/opencl/lib/generic/math/floor.cl
index 1be22eac7f1f8..9e2bd0abe3b3a 100644
--- a/libclc/opencl/lib/generic/math/floor.cl
+++ b/libclc/opencl/lib/generic/math/floor.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_floor.h"
+#include <clc/math/clc_floor.h>
 
 #define __CLC_FUNCTION floor
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fma.cl b/libclc/opencl/lib/generic/math/fma.cl
index efb3c1ae4193d..adac2c3960dd3 100644
--- a/libclc/opencl/lib/generic/math/fma.cl
+++ b/libclc/opencl/lib/generic/math/fma.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fma.h"
-#include "clc/math/math.h"
+#include <clc/math/clc_fma.h>
+#include <clc/math/math.h>
 
 #define __CLC_FUNCTION fma
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fmax.cl b/libclc/opencl/lib/generic/math/fmax.cl
index 31d4f29488006..987c605dc248a 100644
--- a/libclc/opencl/lib/generic/math/fmax.cl
+++ b/libclc/opencl/lib/generic/math/fmax.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fmax.h"
+#include <clc/math/clc_fmax.h>
 
 #define __CLC_FUNCTION fmax
-#define __CLC_BODY "clc/shared/binary_def_with_scalar_second_arg.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_scalar_second_arg.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fmin.cl b/libclc/opencl/lib/generic/math/fmin.cl
index 662e7055eb30e..b31a7c6621a66 100644
--- a/libclc/opencl/lib/generic/math/fmin.cl
+++ b/libclc/opencl/lib/generic/math/fmin.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fmin.h"
+#include <clc/math/clc_fmin.h>
 
 #define __CLC_FUNCTION fmin
-#define __CLC_BODY "clc/shared/binary_def_with_scalar_second_arg.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_scalar_second_arg.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fmod.cl b/libclc/opencl/lib/generic/math/fmod.cl
index e5a8a81d64dd7..7ff28defbdc01 100644
--- a/libclc/opencl/lib/generic/math/fmod.cl
+++ b/libclc/opencl/lib/generic/math/fmod.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fmod.h"
+#include <clc/math/clc_fmod.h>
 
 #define __CLC_FUNCTION fmod
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/fract.cl b/libclc/opencl/lib/generic/math/fract.cl
index cce99aad09201..3c749443ba1a3 100644
--- a/libclc/opencl/lib/generic/math/fract.cl
+++ b/libclc/opencl/lib/generic/math/fract.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_fract.h"
+#include <clc/math/clc_fract.h>
 
 #define __CLC_FUNCTION fract
-#define __CLC_BODY "clc/math/unary_def_with_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_ptr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/frexp.cl b/libclc/opencl/lib/generic/math/frexp.cl
index 27783d369838d..e8c1bff46581b 100644
--- a/libclc/opencl/lib/generic/math/frexp.cl
+++ b/libclc/opencl/lib/generic/math/frexp.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_frexp.h"
+#include <clc/math/clc_frexp.h>
 
 #define __CLC_FUNCTION frexp
-#define __CLC_BODY "clc/math/unary_def_with_int_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_int_ptr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_cos.cl b/libclc/opencl/lib/generic/math/half_cos.cl
index 484a0cd66772a..2d92636c08a4a 100644
--- a/libclc/opencl/lib/generic/math/half_cos.cl
+++ b/libclc/opencl/lib/generic/math/half_cos.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_cos.h"
+#include <clc/math/clc_half_cos.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_cos
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_divide.cl b/libclc/opencl/lib/generic/math/half_divide.cl
index 107c89e2802c7..3d3cb76528b63 100644
--- a/libclc/opencl/lib/generic/math/half_divide.cl
+++ b/libclc/opencl/lib/generic/math/half_divide.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_divide.h"
+#include <clc/math/clc_half_divide.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_divide
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_exp.cl b/libclc/opencl/lib/generic/math/half_exp.cl
index 671404a121695..367bcc94b0491 100644
--- a/libclc/opencl/lib/generic/math/half_exp.cl
+++ b/libclc/opencl/lib/generic/math/half_exp.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_exp.h"
+#include <clc/math/clc_half_exp.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_exp10.cl b/libclc/opencl/lib/generic/math/half_exp10.cl
index 586fd72738f41..58e2b5ec39d48 100644
--- a/libclc/opencl/lib/generic/math/half_exp10.cl
+++ b/libclc/opencl/lib/generic/math/half_exp10.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_exp10.h"
+#include <clc/math/clc_half_exp10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_exp10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_exp2.cl b/libclc/opencl/lib/generic/math/half_exp2.cl
index 9a118c7521fa1..6b98fdd25b7ca 100644
--- a/libclc/opencl/lib/generic/math/half_exp2.cl
+++ b/libclc/opencl/lib/generic/math/half_exp2.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_exp2.h"
+#include <clc/math/clc_half_exp2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_log.cl b/libclc/opencl/lib/generic/math/half_log.cl
index bb4e09e51aed1..a839f7e553b30 100644
--- a/libclc/opencl/lib/generic/math/half_log.cl
+++ b/libclc/opencl/lib/generic/math/half_log.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_log.h"
+#include <clc/math/clc_half_log.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_log
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_log10.cl b/libclc/opencl/lib/generic/math/half_log10.cl
index edc5c1f399901..8e193f8f215f2 100644
--- a/libclc/opencl/lib/generic/math/half_log10.cl
+++ b/libclc/opencl/lib/generic/math/half_log10.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_log10.h"
+#include <clc/math/clc_half_log10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_log10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_log2.cl b/libclc/opencl/lib/generic/math/half_log2.cl
index b5f6c22ba6fbe..2f072752750d1 100644
--- a/libclc/opencl/lib/generic/math/half_log2.cl
+++ b/libclc/opencl/lib/generic/math/half_log2.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_log2.h"
+#include <clc/math/clc_half_log2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_log2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_powr.cl b/libclc/opencl/lib/generic/math/half_powr.cl
index 5792a1f03080b..68e32a8142227 100644
--- a/libclc/opencl/lib/generic/math/half_powr.cl
+++ b/libclc/opencl/lib/generic/math/half_powr.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_powr.h"
+#include <clc/math/clc_half_powr.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_powr
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_recip.cl b/libclc/opencl/lib/generic/math/half_recip.cl
index dee3b0b198f9e..26379d751208a 100644
--- a/libclc/opencl/lib/generic/math/half_recip.cl
+++ b/libclc/opencl/lib/generic/math/half_recip.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_recip.h"
+#include <clc/math/clc_half_recip.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_recip
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_rsqrt.cl b/libclc/opencl/lib/generic/math/half_rsqrt.cl
index 6e9f999f3c446..7f77d737ff202 100644
--- a/libclc/opencl/lib/generic/math/half_rsqrt.cl
+++ b/libclc/opencl/lib/generic/math/half_rsqrt.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_rsqrt.h"
+#include <clc/math/clc_half_rsqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_rsqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_sin.cl b/libclc/opencl/lib/generic/math/half_sin.cl
index 54a1f033c9d88..e6f928a88e1d6 100644
--- a/libclc/opencl/lib/generic/math/half_sin.cl
+++ b/libclc/opencl/lib/generic/math/half_sin.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_sin.h"
+#include <clc/math/clc_half_sin.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_sin
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_sqrt.cl b/libclc/opencl/lib/generic/math/half_sqrt.cl
index 09700b2365845..562663644b137 100644
--- a/libclc/opencl/lib/generic/math/half_sqrt.cl
+++ b/libclc/opencl/lib/generic/math/half_sqrt.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_sqrt.h"
+#include <clc/math/clc_half_sqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/half_tan.cl b/libclc/opencl/lib/generic/math/half_tan.cl
index 895821ee0b334..1ff24376b207b 100644
--- a/libclc/opencl/lib/generic/math/half_tan.cl
+++ b/libclc/opencl/lib/generic/math/half_tan.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_half_tan.h"
+#include <clc/math/clc_half_tan.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION half_tan
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/hypot.cl b/libclc/opencl/lib/generic/math/hypot.cl
index c1d1518c95f7e..b81aed941ab40 100644
--- a/libclc/opencl/lib/generic/math/hypot.cl
+++ b/libclc/opencl/lib/generic/math/hypot.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_hypot.h"
+#include <clc/math/clc_hypot.h>
 
 #define __CLC_FUNCTION hypot
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/ilogb.cl b/libclc/opencl/lib/generic/math/ilogb.cl
index e28c25f53d873..f3060d3964bda 100644
--- a/libclc/opencl/lib/generic/math/ilogb.cl
+++ b/libclc/opencl/lib/generic/math/ilogb.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_ilogb.h"
+#include <clc/math/clc_ilogb.h>
 
 #define __CLC_FUNCTION ilogb
-#define __CLC_BODY "clc/math/unary_def_with_int_return.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_int_return.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/ldexp.cl b/libclc/opencl/lib/generic/math/ldexp.cl
index 7b0586bec3eeb..f8ef83f3de212 100644
--- a/libclc/opencl/lib/generic/math/ldexp.cl
+++ b/libclc/opencl/lib/generic/math/ldexp.cl
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_ldexp.h"
+#include <clc/math/clc_ldexp.h>
 
 #define __CLC_FUNCTION ldexp
 #define __CLC_IMPL_FUNCTION(x) __clc_ldexp
-#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_int_second_arg.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>
 
 // This defines all the ldexp(GENTYPE, int) variants
-#define __CLC_BODY "ldexp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <ldexp.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/lgamma.cl b/libclc/opencl/lib/generic/math/lgamma.cl
index fe89cd52b1506..a07de8ad4b37c 100644
--- a/libclc/opencl/lib/generic/math/lgamma.cl
+++ b/libclc/opencl/lib/generic/math/lgamma.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_lgamma.h"
+#include <clc/math/clc_lgamma.h>
 
 #define __CLC_FUNCTION lgamma
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/lgamma_r.cl b/libclc/opencl/lib/generic/math/lgamma_r.cl
index 805664c19f411..8cde1844a56fa 100644
--- a/libclc/opencl/lib/generic/math/lgamma_r.cl
+++ b/libclc/opencl/lib/generic/math/lgamma_r.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_lgamma_r.h"
+#include <clc/math/clc_lgamma_r.h>
 
 #define __CLC_FUNCTION lgamma_r
-#define __CLC_BODY "clc/math/unary_def_with_int_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_int_ptr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/log.cl b/libclc/opencl/lib/generic/math/log.cl
index 933e95f3b9d67..4e2890ad882ad 100644
--- a/libclc/opencl/lib/generic/math/log.cl
+++ b/libclc/opencl/lib/generic/math/log.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log.h"
+#include <clc/math/clc_log.h>
 
 #define __CLC_FUNCTION log
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/log10.cl b/libclc/opencl/lib/generic/math/log10.cl
index d78284d5dc266..d8c913570260c 100644
--- a/libclc/opencl/lib/generic/math/log10.cl
+++ b/libclc/opencl/lib/generic/math/log10.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log10.h"
+#include <clc/math/clc_log10.h>
 
 #define __CLC_FUNCTION log10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/log1p.cl b/libclc/opencl/lib/generic/math/log1p.cl
index c5082d368b2d8..8dbb5b26b3d3d 100644
--- a/libclc/opencl/lib/generic/math/log1p.cl
+++ b/libclc/opencl/lib/generic/math/log1p.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log1p.h"
+#include <clc/math/clc_log1p.h>
 
 #define __CLC_FUNCTION log1p
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/log2.cl b/libclc/opencl/lib/generic/math/log2.cl
index a56cd10aeef2b..3fbe354827626 100644
--- a/libclc/opencl/lib/generic/math/log2.cl
+++ b/libclc/opencl/lib/generic/math/log2.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_log2.h"
+#include <clc/math/clc_log2.h>
 
 #define __CLC_FUNCTION log2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/logb.cl b/libclc/opencl/lib/generic/math/logb.cl
index f2dba882b3daf..63a60ae014f01 100644
--- a/libclc/opencl/lib/generic/math/logb.cl
+++ b/libclc/opencl/lib/generic/math/logb.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_logb.h"
+#include <clc/math/clc_logb.h>
 
 #define __CLC_FUNCTION logb
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/mad.cl b/libclc/opencl/lib/generic/math/mad.cl
index 0e112aa8d34c1..5cc52b39eb684 100644
--- a/libclc/opencl/lib/generic/math/mad.cl
+++ b/libclc/opencl/lib/generic/math/mad.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_mad.h"
+#include <clc/math/clc_mad.h>
 
 #define __CLC_FUNCTION mad
-#define __CLC_BODY "clc/shared/ternary_def.inc"
+#define __CLC_BODY <clc/shared/ternary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/maxmag.cl b/libclc/opencl/lib/generic/math/maxmag.cl
index 63508b4259fb8..4a2e865a35530 100644
--- a/libclc/opencl/lib/generic/math/maxmag.cl
+++ b/libclc/opencl/lib/generic/math/maxmag.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_maxmag.h"
+#include <clc/math/clc_maxmag.h>
 
 #define __CLC_FUNCTION maxmag
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/minmag.cl b/libclc/opencl/lib/generic/math/minmag.cl
index 88e5a7b1a679f..86f2b08e5b095 100644
--- a/libclc/opencl/lib/generic/math/minmag.cl
+++ b/libclc/opencl/lib/generic/math/minmag.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_minmag.h"
+#include <clc/math/clc_minmag.h>
 
 #define __CLC_FUNCTION minmag
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/modf.cl b/libclc/opencl/lib/generic/math/modf.cl
index 22875fee0b751..fe524ba305e9e 100644
--- a/libclc/opencl/lib/generic/math/modf.cl
+++ b/libclc/opencl/lib/generic/math/modf.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_modf.h"
+#include <clc/math/clc_modf.h>
 
 #define __CLC_FUNCTION modf
-#define __CLC_BODY "clc/math/unary_def_with_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_ptr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/nan.cl b/libclc/opencl/lib/generic/math/nan.cl
index 6123ce74cfcfd..df0629fbf55ad 100644
--- a/libclc/opencl/lib/generic/math/nan.cl
+++ b/libclc/opencl/lib/generic/math/nan.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_nan.h"
+#include <clc/math/clc_nan.h>
 
-#define __CLC_BODY "nan.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <nan.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_cos.cl b/libclc/opencl/lib/generic/math/native_cos.cl
index 8a77805efd55a..d2b9cf859696b 100644
--- a/libclc/opencl/lib/generic/math/native_cos.cl
+++ b/libclc/opencl/lib/generic/math/native_cos.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_cos.h"
+#include <clc/math/clc_native_cos.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_cos
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_divide.cl b/libclc/opencl/lib/generic/math/native_divide.cl
index f601ceaf678e1..a1b8d5d2510cf 100644
--- a/libclc/opencl/lib/generic/math/native_divide.cl
+++ b/libclc/opencl/lib/generic/math/native_divide.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_divide.h"
+#include <clc/math/clc_native_divide.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_divide
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_exp.cl b/libclc/opencl/lib/generic/math/native_exp.cl
index e3561756d519c..19da3c269b28a 100644
--- a/libclc/opencl/lib/generic/math/native_exp.cl
+++ b/libclc/opencl/lib/generic/math/native_exp.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_exp.h"
+#include <clc/math/clc_native_exp.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_exp
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_exp10.cl b/libclc/opencl/lib/generic/math/native_exp10.cl
index d2be9616ffe05..58f8005463cf8 100644
--- a/libclc/opencl/lib/generic/math/native_exp10.cl
+++ b/libclc/opencl/lib/generic/math/native_exp10.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_exp10.h"
+#include <clc/math/clc_native_exp10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_exp10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_exp2.cl b/libclc/opencl/lib/generic/math/native_exp2.cl
index 1cb9ae02778dc..8bed47dd18ee2 100644
--- a/libclc/opencl/lib/generic/math/native_exp2.cl
+++ b/libclc/opencl/lib/generic/math/native_exp2.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_exp2.h"
+#include <clc/math/clc_native_exp2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_exp2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_log.cl b/libclc/opencl/lib/generic/math/native_log.cl
index c40ca2bf77992..0323f6668ba04 100644
--- a/libclc/opencl/lib/generic/math/native_log.cl
+++ b/libclc/opencl/lib/generic/math/native_log.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log.h"
+#include <clc/math/clc_native_log.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_log
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_log10.cl b/libclc/opencl/lib/generic/math/native_log10.cl
index 86ee71f83a88e..915fa8a2d4ede 100644
--- a/libclc/opencl/lib/generic/math/native_log10.cl
+++ b/libclc/opencl/lib/generic/math/native_log10.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log10.h"
+#include <clc/math/clc_native_log10.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_log10
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_log2.cl b/libclc/opencl/lib/generic/math/native_log2.cl
index c4256065b5d8f..b5d8ff586761b 100644
--- a/libclc/opencl/lib/generic/math/native_log2.cl
+++ b/libclc/opencl/lib/generic/math/native_log2.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_log2.h"
+#include <clc/math/clc_native_log2.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_log2
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_powr.cl b/libclc/opencl/lib/generic/math/native_powr.cl
index c508c1b261dd8..d1b2c5b93175f 100644
--- a/libclc/opencl/lib/generic/math/native_powr.cl
+++ b/libclc/opencl/lib/generic/math/native_powr.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_powr.h"
+#include <clc/math/clc_native_powr.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_powr
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_recip.cl b/libclc/opencl/lib/generic/math/native_recip.cl
index 78a7e17ab87b1..05df5e10cdbd7 100644
--- a/libclc/opencl/lib/generic/math/native_recip.cl
+++ b/libclc/opencl/lib/generic/math/native_recip.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_recip.h"
+#include <clc/math/clc_native_recip.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_recip
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_rsqrt.cl b/libclc/opencl/lib/generic/math/native_rsqrt.cl
index 87c313003c200..3c8c72098db00 100644
--- a/libclc/opencl/lib/generic/math/native_rsqrt.cl
+++ b/libclc/opencl/lib/generic/math/native_rsqrt.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_rsqrt.h"
+#include <clc/math/clc_native_rsqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_rsqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_sin.cl b/libclc/opencl/lib/generic/math/native_sin.cl
index 45280d8ad606e..4501e2f0fd8b1 100644
--- a/libclc/opencl/lib/generic/math/native_sin.cl
+++ b/libclc/opencl/lib/generic/math/native_sin.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_sin.h"
+#include <clc/math/clc_native_sin.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_sin
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_sqrt.cl b/libclc/opencl/lib/generic/math/native_sqrt.cl
index d8d55e1781ec6..a7eb715f0ef51 100644
--- a/libclc/opencl/lib/generic/math/native_sqrt.cl
+++ b/libclc/opencl/lib/generic/math/native_sqrt.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_sqrt.h"
+#include <clc/math/clc_native_sqrt.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/native_tan.cl b/libclc/opencl/lib/generic/math/native_tan.cl
index a45b44d64d7a1..0ee7e827338ae 100644
--- a/libclc/opencl/lib/generic/math/native_tan.cl
+++ b/libclc/opencl/lib/generic/math/native_tan.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_native_tan.h"
+#include <clc/math/clc_native_tan.h>
 
 #define __CLC_FLOAT_ONLY
 #define __CLC_FUNCTION native_tan
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/nextafter.cl b/libclc/opencl/lib/generic/math/nextafter.cl
index 35631c8105b3d..6862432a81c7d 100644
--- a/libclc/opencl/lib/generic/math/nextafter.cl
+++ b/libclc/opencl/lib/generic/math/nextafter.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_nextafter.h"
+#include <clc/math/clc_nextafter.h>
 
 #define __CLC_FUNCTION nextafter
 #define __CLC_IMPL_FUNCTION(x) __clc_nextafter
-#define __CLC_BODY "clc/shared/binary_def.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/pow.cl b/libclc/opencl/lib/generic/math/pow.cl
index 98fdb94a7ac29..2fd3a50733ed5 100644
--- a/libclc/opencl/lib/generic/math/pow.cl
+++ b/libclc/opencl/lib/generic/math/pow.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_pow.h"
+#include <clc/math/clc_pow.h>
 
 #define __CLC_FUNCTION pow
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/pown.cl b/libclc/opencl/lib/generic/math/pown.cl
index 68d09ad9b0431..e48bc10a636ab 100644
--- a/libclc/opencl/lib/generic/math/pown.cl
+++ b/libclc/opencl/lib/generic/math/pown.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_pown.h"
+#include <clc/math/clc_pown.h>
 
 #define __CLC_FUNCTION pown
-#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_int_second_arg.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/powr.cl b/libclc/opencl/lib/generic/math/powr.cl
index b6111b22ec6f2..168e30aa57b08 100644
--- a/libclc/opencl/lib/generic/math/powr.cl
+++ b/libclc/opencl/lib/generic/math/powr.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_powr.h"
+#include <clc/math/clc_powr.h>
 
 #define __CLC_FUNCTION powr
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/remainder.cl b/libclc/opencl/lib/generic/math/remainder.cl
index bbfd1a8e7d46a..cc5a4988b7c94 100644
--- a/libclc/opencl/lib/generic/math/remainder.cl
+++ b/libclc/opencl/lib/generic/math/remainder.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_remainder.h"
+#include <clc/math/clc_remainder.h>
 
 #define __CLC_FUNCTION remainder
-#define __CLC_BODY "clc/shared/binary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/remquo.cl b/libclc/opencl/lib/generic/math/remquo.cl
index 578a5feb3a4bd..2bd359ca547f5 100644
--- a/libclc/opencl/lib/generic/math/remquo.cl
+++ b/libclc/opencl/lib/generic/math/remquo.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_remquo.h"
+#include <clc/math/clc_remquo.h>
 
-#define __CLC_BODY "remquo.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <remquo.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/rint.cl b/libclc/opencl/lib/generic/math/rint.cl
index 95679ae463b92..1791123f637bc 100644
--- a/libclc/opencl/lib/generic/math/rint.cl
+++ b/libclc/opencl/lib/generic/math/rint.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_rint.h"
+#include <clc/math/clc_rint.h>
 
 #define __CLC_FUNCTION rint
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/rootn.cl b/libclc/opencl/lib/generic/math/rootn.cl
index dba413491beb9..8c9c7f4cc72f5 100644
--- a/libclc/opencl/lib/generic/math/rootn.cl
+++ b/libclc/opencl/lib/generic/math/rootn.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_rootn.h"
+#include <clc/math/clc_rootn.h>
 
 #define __CLC_FUNCTION rootn
-#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/binary_def_with_int_second_arg.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/round.cl b/libclc/opencl/lib/generic/math/round.cl
index ebdeead88c4f9..8af24a8ba0b1b 100644
--- a/libclc/opencl/lib/generic/math/round.cl
+++ b/libclc/opencl/lib/generic/math/round.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_round.h"
+#include <clc/math/clc_round.h>
 
 #define __CLC_FUNCTION round
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/rsqrt.cl b/libclc/opencl/lib/generic/math/rsqrt.cl
index a292db519c1cc..269462f85d951 100644
--- a/libclc/opencl/lib/generic/math/rsqrt.cl
+++ b/libclc/opencl/lib/generic/math/rsqrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_rsqrt.h"
+#include <clc/math/clc_rsqrt.h>
 
 #define __CLC_FUNCTION rsqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/sin.cl b/libclc/opencl/lib/generic/math/sin.cl
index 4ca81dc67c6fd..7ffdc3329749e 100644
--- a/libclc/opencl/lib/generic/math/sin.cl
+++ b/libclc/opencl/lib/generic/math/sin.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sin.h"
+#include <clc/math/clc_sin.h>
 
 #define __CLC_FUNCTION sin
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/sincos.cl b/libclc/opencl/lib/generic/math/sincos.cl
index 2774b36888380..aa1fc0cf4d806 100644
--- a/libclc/opencl/lib/generic/math/sincos.cl
+++ b/libclc/opencl/lib/generic/math/sincos.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sincos.h"
+#include <clc/math/clc_sincos.h>
 
 #define __CLC_FUNCTION sincos
-#define __CLC_BODY "clc/math/unary_def_with_ptr.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/math/unary_def_with_ptr.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/sinh.cl b/libclc/opencl/lib/generic/math/sinh.cl
index 40e2c63a528ee..e1f4d115d4d0d 100644
--- a/libclc/opencl/lib/generic/math/sinh.cl
+++ b/libclc/opencl/lib/generic/math/sinh.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sinh.h"
+#include <clc/math/clc_sinh.h>
 
 #define __CLC_FUNCTION sinh
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/sinpi.cl b/libclc/opencl/lib/generic/math/sinpi.cl
index 54a4f40308c69..2c0024b908ea4 100644
--- a/libclc/opencl/lib/generic/math/sinpi.cl
+++ b/libclc/opencl/lib/generic/math/sinpi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sinpi.h"
+#include <clc/math/clc_sinpi.h>
 
 #define __CLC_FUNCTION sinpi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/sqrt.cl b/libclc/opencl/lib/generic/math/sqrt.cl
index 969cb645d30e0..4c5a76d14a5de 100644
--- a/libclc/opencl/lib/generic/math/sqrt.cl
+++ b/libclc/opencl/lib/generic/math/sqrt.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_sqrt.h"
+#include <clc/math/clc_sqrt.h>
 
 #define __CLC_FUNCTION sqrt
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/tan.cl b/libclc/opencl/lib/generic/math/tan.cl
index 87418860862dd..7b9e504d7f25d 100644
--- a/libclc/opencl/lib/generic/math/tan.cl
+++ b/libclc/opencl/lib/generic/math/tan.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_tan.h"
+#include <clc/math/clc_tan.h>
 
 #define __CLC_FUNCTION tan
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/tanh.cl b/libclc/opencl/lib/generic/math/tanh.cl
index 39859b748a3e4..539085a3f243d 100644
--- a/libclc/opencl/lib/generic/math/tanh.cl
+++ b/libclc/opencl/lib/generic/math/tanh.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_tanh.h"
+#include <clc/math/clc_tanh.h>
 
 #define __CLC_FUNCTION tanh
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/tanpi.cl b/libclc/opencl/lib/generic/math/tanpi.cl
index 647c6d4e18217..4ebde1d1652e2 100644
--- a/libclc/opencl/lib/generic/math/tanpi.cl
+++ b/libclc/opencl/lib/generic/math/tanpi.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_tanpi.h"
+#include <clc/math/clc_tanpi.h>
 
 #define __CLC_FUNCTION tanpi
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/tgamma.cl b/libclc/opencl/lib/generic/math/tgamma.cl
index 2d6cc6e9efad0..1e11b5f5ed64f 100644
--- a/libclc/opencl/lib/generic/math/tgamma.cl
+++ b/libclc/opencl/lib/generic/math/tgamma.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_tgamma.h"
+#include <clc/math/clc_tgamma.h>
 
 #define __CLC_FUNCTION tgamma
-#define __CLC_BODY "clc/shared/unary_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/math/trunc.cl b/libclc/opencl/lib/generic/math/trunc.cl
index 505699ddf7e35..724b646afa153 100644
--- a/libclc/opencl/lib/generic/math/trunc.cl
+++ b/libclc/opencl/lib/generic/math/trunc.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_trunc.h"
+#include <clc/math/clc_trunc.h>
 
 #define __CLC_FUNCTION trunc
-#define __CLC_BODY "clc/shared/unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/mem_fence/fence.cl b/libclc/opencl/lib/generic/mem_fence/fence.cl
index eed8f6e0ce660..38fb15c2c1de8 100644
--- a/libclc/opencl/lib/generic/mem_fence/fence.cl
+++ b/libclc/opencl/lib/generic/mem_fence/fence.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/mem_fence/clc_mem_fence.h"
-#include "clc/opencl/synchronization/utils.h"
+#include <clc/mem_fence/clc_mem_fence.h>
+#include <clc/opencl/synchronization/utils.h>
 
 _CLC_DEF _CLC_OVERLOAD void mem_fence(cl_mem_fence_flags flags) {
   int memory_scope = __MEMORY_SCOPE_WRKGRP;

diff  --git a/libclc/opencl/lib/generic/misc/shuffle.cl b/libclc/opencl/lib/generic/misc/shuffle.cl
index 194e6e45b58b4..7c47fb8ea9cfc 100644
--- a/libclc/opencl/lib/generic/misc/shuffle.cl
+++ b/libclc/opencl/lib/generic/misc/shuffle.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/misc/clc_shuffle.h"
+#include <clc/misc/clc_shuffle.h>
 
 #define __CLC_FUNCTION shuffle
 
-#define __CLC_BODY "clc/misc/shuffle_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/misc/shuffle_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/misc/shuffle2.cl b/libclc/opencl/lib/generic/misc/shuffle2.cl
index 269241a80ae05..3fb3dbc2a5805 100644
--- a/libclc/opencl/lib/generic/misc/shuffle2.cl
+++ b/libclc/opencl/lib/generic/misc/shuffle2.cl
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/misc/clc_shuffle2.h"
+#include <clc/misc/clc_shuffle2.h>
 
 #define __CLC_FUNCTION shuffle2
 
-#define __CLC_BODY "clc/misc/shuffle2_def.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle2_def.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clc/misc/shuffle2_def.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clc/misc/shuffle2_def.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/all.cl b/libclc/opencl/lib/generic/relational/all.cl
index 6f9f5ec44a857..c896b811964f6 100644
--- a/libclc/opencl/lib/generic/relational/all.cl
+++ b/libclc/opencl/lib/generic/relational/all.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_all.h"
+#include <clc/relational/clc_all.h>
 
 #define __CLC_ALL_ID(TYPE) _CLC_OVERLOAD _CLC_DEF int all(TYPE v)
 

diff  --git a/libclc/opencl/lib/generic/relational/any.cl b/libclc/opencl/lib/generic/relational/any.cl
index ca4b9c8128813..e6fb84dd182f0 100644
--- a/libclc/opencl/lib/generic/relational/any.cl
+++ b/libclc/opencl/lib/generic/relational/any.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_any.h"
+#include <clc/relational/clc_any.h>
 
 #define __CLC_ANY_ID(TYPE) _CLC_OVERLOAD _CLC_DEF int any(TYPE v)
 

diff  --git a/libclc/opencl/lib/generic/relational/binary_def.inc b/libclc/opencl/lib/generic/relational/binary_def.inc
index d91b893207c55..b60d9bbe45e11 100644
--- a/libclc/opencl/lib/generic/relational/binary_def.inc
+++ b/libclc/opencl/lib/generic/relational/binary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)
 

diff  --git a/libclc/opencl/lib/generic/relational/bitselect.cl b/libclc/opencl/lib/generic/relational/bitselect.cl
index 52dbbf62b340d..b4b4707d28cdf 100644
--- a/libclc/opencl/lib/generic/relational/bitselect.cl
+++ b/libclc/opencl/lib/generic/relational/bitselect.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_bitselect.h"
+#include <clc/relational/clc_bitselect.h>
 
-#define __CLC_BODY "bitselect.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <bitselect.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "bitselect.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <bitselect.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isequal.cl b/libclc/opencl/lib/generic/relational/isequal.cl
index d3b40e883c1ad..6bbf7d4d664aa 100644
--- a/libclc/opencl/lib/generic/relational/isequal.cl
+++ b/libclc/opencl/lib/generic/relational/isequal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isequal.h"
+#include <clc/relational/clc_isequal.h>
 
 #define __CLC_FUNCTION isequal
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isfinite.cl b/libclc/opencl/lib/generic/relational/isfinite.cl
index cf4e416869f33..67c59ea42c426 100644
--- a/libclc/opencl/lib/generic/relational/isfinite.cl
+++ b/libclc/opencl/lib/generic/relational/isfinite.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isfinite.h"
+#include <clc/relational/clc_isfinite.h>
 
 #define __CLC_FUNCTION isfinite
 #define __CLC_BODY "unary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isgreater.cl b/libclc/opencl/lib/generic/relational/isgreater.cl
index 476d04bd14eaf..ca4c068855a46 100644
--- a/libclc/opencl/lib/generic/relational/isgreater.cl
+++ b/libclc/opencl/lib/generic/relational/isgreater.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isgreater.h"
+#include <clc/relational/clc_isgreater.h>
 
 #define __CLC_FUNCTION isgreater
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isgreaterequal.cl b/libclc/opencl/lib/generic/relational/isgreaterequal.cl
index 1cf10a457e401..e97b6f6119ae6 100644
--- a/libclc/opencl/lib/generic/relational/isgreaterequal.cl
+++ b/libclc/opencl/lib/generic/relational/isgreaterequal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isgreaterequal.h"
+#include <clc/relational/clc_isgreaterequal.h>
 
 #define __CLC_FUNCTION isgreaterequal
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isinf.cl b/libclc/opencl/lib/generic/relational/isinf.cl
index e04532a2872c3..2f5571b8b0124 100644
--- a/libclc/opencl/lib/generic/relational/isinf.cl
+++ b/libclc/opencl/lib/generic/relational/isinf.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isinf.h"
+#include <clc/relational/clc_isinf.h>
 
 #define __CLC_FUNCTION isinf
 #define __CLC_BODY "unary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isless.cl b/libclc/opencl/lib/generic/relational/isless.cl
index d70fa582e8fd5..3673c050c9157 100644
--- a/libclc/opencl/lib/generic/relational/isless.cl
+++ b/libclc/opencl/lib/generic/relational/isless.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isless.h"
+#include <clc/relational/clc_isless.h>
 
 #define __CLC_FUNCTION isless
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/islessequal.cl b/libclc/opencl/lib/generic/relational/islessequal.cl
index f63678534f888..c7e840cbe44cd 100644
--- a/libclc/opencl/lib/generic/relational/islessequal.cl
+++ b/libclc/opencl/lib/generic/relational/islessequal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_islessequal.h"
+#include <clc/relational/clc_islessequal.h>
 
 #define __CLC_FUNCTION islessequal
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/islessgreater.cl b/libclc/opencl/lib/generic/relational/islessgreater.cl
index 08b3d85929800..057c35c7c7ff3 100644
--- a/libclc/opencl/lib/generic/relational/islessgreater.cl
+++ b/libclc/opencl/lib/generic/relational/islessgreater.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_islessgreater.h"
+#include <clc/relational/clc_islessgreater.h>
 
 #define __CLC_FUNCTION islessgreater
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isnan.cl b/libclc/opencl/lib/generic/relational/isnan.cl
index fdeda97a295d1..248cc17af5159 100644
--- a/libclc/opencl/lib/generic/relational/isnan.cl
+++ b/libclc/opencl/lib/generic/relational/isnan.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isnan.h"
+#include <clc/relational/clc_isnan.h>
 
 #define __CLC_FUNCTION isnan
 #define __CLC_BODY "unary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isnormal.cl b/libclc/opencl/lib/generic/relational/isnormal.cl
index a707e7360bd2b..6d046c375b2a3 100644
--- a/libclc/opencl/lib/generic/relational/isnormal.cl
+++ b/libclc/opencl/lib/generic/relational/isnormal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isnormal.h"
+#include <clc/relational/clc_isnormal.h>
 
 #define __CLC_FUNCTION isnormal
 #define __CLC_BODY "unary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isnotequal.cl b/libclc/opencl/lib/generic/relational/isnotequal.cl
index c9fd15dd7b32f..5bf6907587672 100644
--- a/libclc/opencl/lib/generic/relational/isnotequal.cl
+++ b/libclc/opencl/lib/generic/relational/isnotequal.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isnotequal.h"
+#include <clc/relational/clc_isnotequal.h>
 
 #define __CLC_FUNCTION isnotequal
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isordered.cl b/libclc/opencl/lib/generic/relational/isordered.cl
index d33a78b47c4f7..0ce72493638c3 100644
--- a/libclc/opencl/lib/generic/relational/isordered.cl
+++ b/libclc/opencl/lib/generic/relational/isordered.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isordered.h"
+#include <clc/relational/clc_isordered.h>
 
 #define __CLC_FUNCTION isordered
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/isunordered.cl b/libclc/opencl/lib/generic/relational/isunordered.cl
index ea9bce1e0e46a..6bea618618591 100644
--- a/libclc/opencl/lib/generic/relational/isunordered.cl
+++ b/libclc/opencl/lib/generic/relational/isunordered.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_isunordered.h"
+#include <clc/relational/clc_isunordered.h>
 
 #define __CLC_FUNCTION isunordered
 #define __CLC_BODY "binary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/select.cl b/libclc/opencl/lib/generic/relational/select.cl
index d0150041f3485..4b3ea01d5303f 100644
--- a/libclc/opencl/lib/generic/relational/select.cl
+++ b/libclc/opencl/lib/generic/relational/select.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_select.h"
-#include "clc/utils.h"
+#include <clc/relational/clc_select.h>
+#include <clc/utils.h>
 
 #define __CLC_SELECT_FN select
 #define __CLC_SELECT_DEF(x, y, z) return __clc_select(x, y, z)
 
-#define __CLC_BODY "clc/relational/clc_select_impl.inc"
-#include "clc/math/gentype.inc"
-#define __CLC_BODY "clc/relational/clc_select_impl.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clc/relational/clc_select_impl.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/clc_select_impl.inc>
+#include <clc/integer/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/signbit.cl b/libclc/opencl/lib/generic/relational/signbit.cl
index b7474df8ae8d2..50c4b2ab2bf4a 100644
--- a/libclc/opencl/lib/generic/relational/signbit.cl
+++ b/libclc/opencl/lib/generic/relational/signbit.cl
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/relational/clc_signbit.h"
+#include <clc/relational/clc_signbit.h>
 
 #define __CLC_FUNCTION signbit
 #define __CLC_BODY "unary_def.inc"
 
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/relational/unary_def.inc b/libclc/opencl/lib/generic/relational/unary_def.inc
index a39c26cc2a521..1655ace114aa6 100644
--- a/libclc/opencl/lib/generic/relational/unary_def.inc
+++ b/libclc/opencl/lib/generic/relational/unary_def.inc
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/utils.h"
+#include <clc/utils.h>
 
 #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)
 

diff  --git a/libclc/opencl/lib/generic/shared/clamp.cl b/libclc/opencl/lib/generic/shared/clamp.cl
index 8d6fe0e98b26c..8f740dab47e04 100644
--- a/libclc/opencl/lib/generic/shared/clamp.cl
+++ b/libclc/opencl/lib/generic/shared/clamp.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/shared/clc_clamp.h"
+#include <clc/shared/clc_clamp.h>
 
-#define __CLC_BODY "clamp.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <clamp.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "clamp.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <clamp.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/shared/max.cl b/libclc/opencl/lib/generic/shared/max.cl
index 067add6d72e45..a0018c4b11fdc 100644
--- a/libclc/opencl/lib/generic/shared/max.cl
+++ b/libclc/opencl/lib/generic/shared/max.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/shared/clc_max.h"
+#include <clc/shared/clc_max.h>
 
-#define __CLC_BODY "max.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <max.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "max.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <max.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/shared/min.cl b/libclc/opencl/lib/generic/shared/min.cl
index d6cd031f560f2..f0ddca2a133b7 100644
--- a/libclc/opencl/lib/generic/shared/min.cl
+++ b/libclc/opencl/lib/generic/shared/min.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/shared/clc_min.h"
+#include <clc/shared/clc_min.h>
 
-#define __CLC_BODY "min.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <min.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "min.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <min.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/shared/vload.cl b/libclc/opencl/lib/generic/shared/vload.cl
index 41c0085ac232c..d31697378a2e5 100644
--- a/libclc/opencl/lib/generic/shared/vload.cl
+++ b/libclc/opencl/lib/generic/shared/vload.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/shared/clc_vload.h"
+#include <clc/shared/clc_vload.h>
 
 #define __CLC_BODY "vload.inc"
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #define __CLC_BODY "vload.inc"
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/shared/vstore.cl b/libclc/opencl/lib/generic/shared/vstore.cl
index 7f945b26489f7..915cd8754964e 100644
--- a/libclc/opencl/lib/generic/shared/vstore.cl
+++ b/libclc/opencl/lib/generic/shared/vstore.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/shared/clc_vstore.h"
+#include <clc/shared/clc_vstore.h>
 
 #define __CLC_BODY "vstore.inc"
-#include "clc/integer/gentype.inc"
+#include <clc/integer/gentype.inc>
 
 #define __CLC_BODY "vstore.inc"
-#include "clc/math/gentype.inc"
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl b/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl
index 828701adf2ebc..9401653d089bc 100644
--- a/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl
+++ b/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl
@@ -8,8 +8,8 @@
 
 #include "clc/subgroup/clc_sub_group_broadcast.h"
 
-#define __CLC_BODY "sub_group_broadcast.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <sub_group_broadcast.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "sub_group_broadcast.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <sub_group_broadcast.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl b/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl
index 7e1737327ff11..1614fafd0c6eb 100644
--- a/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl
+++ b/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl
@@ -8,8 +8,8 @@
 
 #include "clc/subgroup/clc_sub_group_reduce.h"
 
-#define __CLC_BODY "sub_group_reduce.inc"
-#include "clc/integer/gentype.inc"
+#define __CLC_BODY <sub_group_reduce.inc>
+#include <clc/integer/gentype.inc>
 
-#define __CLC_BODY "sub_group_reduce.inc"
-#include "clc/math/gentype.inc"
+#define __CLC_BODY <sub_group_reduce.inc>
+#include <clc/math/gentype.inc>

diff  --git a/libclc/opencl/lib/generic/subnormal_config.cl b/libclc/opencl/lib/generic/subnormal_config.cl
index be40607c69a3d..799acc063d350 100644
--- a/libclc/opencl/lib/generic/subnormal_config.cl
+++ b/libclc/opencl/lib/generic/subnormal_config.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_subnormal_config.h"
-#include "clc/opencl/opencl-base.h"
+#include <clc/math/clc_subnormal_config.h>
+#include <clc/opencl/opencl-base.h>
 
 _CLC_DEF bool __clc_fp16_subnormals_supported() { return false; }
 

diff  --git a/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl b/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl
index 5533d5c3aac22..416a3e9837cdc 100644
--- a/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl
+++ b/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/opencl/opencl-base.h"
-#include "clc/workitem/clc_get_enqueued_local_size.h"
+#include <clc/opencl/opencl-base.h>
+#include <clc/workitem/clc_get_enqueued_local_size.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t get_enqueued_local_size(uint dim) {
   return __clc_get_enqueued_local_size(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_global_id.cl b/libclc/opencl/lib/generic/workitem/get_global_id.cl
index a93027e473348..d134dfc3f8d72 100644
--- a/libclc/opencl/lib/generic/workitem/get_global_id.cl
+++ b/libclc/opencl/lib/generic/workitem/get_global_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_global_id.h"
+#include <clc/workitem/clc_get_global_id.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t get_global_id(uint dim) {
   return __clc_get_global_id(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_global_offset.cl b/libclc/opencl/lib/generic/workitem/get_global_offset.cl
index bddd0c191f448..7338f140ab084 100644
--- a/libclc/opencl/lib/generic/workitem/get_global_offset.cl
+++ b/libclc/opencl/lib/generic/workitem/get_global_offset.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_global_offset.h"
+#include <clc/workitem/clc_get_global_offset.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t get_global_offset(uint dim) {
   return __clc_get_global_offset(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_group_id.cl b/libclc/opencl/lib/generic/workitem/get_group_id.cl
index 612a335f8bc80..24b61c7488d3c 100644
--- a/libclc/opencl/lib/generic/workitem/get_group_id.cl
+++ b/libclc/opencl/lib/generic/workitem/get_group_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_group_id.h"
+#include <clc/workitem/clc_get_group_id.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t get_group_id(uint dim) {
   return __clc_get_group_id(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_local_id.cl b/libclc/opencl/lib/generic/workitem/get_local_id.cl
index 694523f258792..dc51a3557211e 100644
--- a/libclc/opencl/lib/generic/workitem/get_local_id.cl
+++ b/libclc/opencl/lib/generic/workitem/get_local_id.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_id.h"
+#include <clc/workitem/clc_get_local_id.h>
 
 _CLC_DEF _CLC_OVERLOAD size_t get_local_id(uint dim) {
   return __clc_get_local_id(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_local_size.cl b/libclc/opencl/lib/generic/workitem/get_local_size.cl
index 7b59a85f5afe1..61a6d8ef88f96 100644
--- a/libclc/opencl/lib/generic/workitem/get_local_size.cl
+++ b/libclc/opencl/lib/generic/workitem/get_local_size.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_local_size.h"
+#include <clc/workitem/clc_get_local_size.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t get_local_size(uint dim) {
   return __clc_get_local_size(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_num_groups.cl b/libclc/opencl/lib/generic/workitem/get_num_groups.cl
index d31c3b0747a20..6beadd3ca8982 100644
--- a/libclc/opencl/lib/generic/workitem/get_num_groups.cl
+++ b/libclc/opencl/lib/generic/workitem/get_num_groups.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_num_groups.h"
+#include <clc/workitem/clc_get_num_groups.h>
 
 _CLC_OVERLOAD _CLC_DEF size_t get_num_groups(uint dim) {
   return __clc_get_num_groups(dim);

diff  --git a/libclc/opencl/lib/generic/workitem/get_work_dim.cl b/libclc/opencl/lib/generic/workitem/get_work_dim.cl
index 51e4712e4cb84..c59432a0038e4 100644
--- a/libclc/opencl/lib/generic/workitem/get_work_dim.cl
+++ b/libclc/opencl/lib/generic/workitem/get_work_dim.cl
@@ -6,6 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/workitem/clc_get_work_dim.h"
+#include <clc/workitem/clc_get_work_dim.h>
 
 _CLC_DEF _CLC_OVERLOAD uint get_work_dim() { return __clc_get_work_dim(); }