[libclc] [libclc][NFC] Change include style from <...> to "..." (PR #186537)

Wenju He via cfe-commits cfe-commits at lists.llvm.org
Tue Mar 17 19:16:28 PDT 2026


https://github.com/wenju-he updated https://github.com/llvm/llvm-project/pull/186537

>From 8729d4cf24b0dc57cef8ee877f7c98e99f17df01 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he at intel.com>
Date: Fri, 13 Mar 2026 12:57:44 +0100
Subject: [PATCH 1/3] [libclc][NFC] Change include style from <...> to "..."

project-specific headers should use "". Keep #include <amdhsa_abi.h>

llvm-diff shows no change to libclc.bc for spir--, spir64--, nvptx64--,
nvptx64--nvidiacl, nvptx64-nvidia-cuda and amdgcn-amd-amdhsa-llvm
when LIBCLC_TARGETS_TO_BUILD is "all".

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

diff --git a/libclc/clc/include/clc/address_space/clc_qualifier.h b/libclc/clc/include/clc/address_space/clc_qualifier.h
index 28b8ab33d5df8..e495f18012684 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 62ff4a77f8949..beb2145070d47 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/async/clc_prefetch_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/async/clc_prefetch_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/async/clc_prefetch_decl.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 31b8167223502..5c68b21929c45 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 66302b6b9ade2..faef087ff4b54 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 321cfb4030851..6b4c743ec0114 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 4ef29fce50af8..47a07ff5adae6 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 688c11287db50..4c3099a8fd3de 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 a4e44b88a697f..9752ed217442f 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 b58b538649e19..a19b053909207 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 ab303cc673ba2..f574895d91eca 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 d9deae085a61e..dfb98d18dbf2a 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 fe13a641fc1cd..4cd6293e7bc5e 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 fee7c0506abc1..ea17a2f350c09 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 afc373204ad70..8cf4c8e3ec836 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 c6fcdad30949b..fb81c2c56fc05 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 3abfce86b1947..da8c0d99e7d0c 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 94d77621735d0..78698db9786b3 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 97cfa667c8b16..544b2bbdf3960 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 1416575854e09..60832fba30f47 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/collective/clc_work_group_broadcast_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/collective/clc_work_group_broadcast_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/collective/clc_work_group_broadcast_decl.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 31ecb486fbdc1..f525110bd462c 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/collective/clc_work_group_reduce_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/collective/clc_work_group_reduce_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/collective/clc_work_group_reduce_decl.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 5f04fac1f2612..d1ccb61fc7baf 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 03d7c4b9e3014..f391a1cf79bd8 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 9737f1e54441b..1d59579a3fcbd 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 46ae63e76dcaf..12ce642aea3e1 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_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/common/clc_smoothstep_decl.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 6b093d06896c0..a4b0f2c9cb50b 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 bbd4f57980023..c29d85ff9a3a6 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 c0a9cacbc3383..cf9d35c3d0267 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 1acea411a08b6..701331463f445 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 a5a97d1bdd2bc..c691778c538b4 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 47292130e9d68..424c0db737523 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 2244d8c77feaa..ebc8b86dca316 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 ee9747c1af1e3..a6e77bb66a8b5 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 f8ce12db07871..5997d1e601444 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 3058a72b2bbbe..59edff3fd7017 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 78c144b35af2c..dab8a59ace512 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 120fb0f6a759c..f223cb4ae60e3 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/integer/clc_abs_decl.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 c789a4ca50ec7..78e3c30015a45 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/integer/clc_abs_diff_decl.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 8c3495f6c5193..24ef9d4b6e5d1 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 de0c354b3fa4e..3be068bb0cb72 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 7998196512b30..7b2175b597dbf 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 84614056417f4..8e459cc7e2d62 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 d5944497a4b53..9262e24674230 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/integer/clc_bitfield_insert_decl.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 dd62cc935f8cd..b30004b21de59 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 3f2079e023f67..1f505e5676a79 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 679369d3c9d4e..548414592425f 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 e19bd905d22eb..1376a13b544c1 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 07e8c0bb6beec..bef85050fb76d 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 845378b3e7c46..3002f18b276e2 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 f813de55c71e5..004b49038aba8 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 e4738e5570e81..a771098151668 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 55ca6ccfcec28..3233487d223c9 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 b8b0b1a3a56ed..4534233f917dd 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 513bf98526233..c13f33c198c03 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 94a5484adefcf..62b167e756d43 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 ca3b8a9102991..9380cc32616b3 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 36d7ae95d1742..74c1ce7cd311f 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 c74ce0c3bab47..c6dd9a1063d8a 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 fcfb223d5a12d..99ce15309fdd3 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 4338fb01861c1..55718f26b0376 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 1d484fa5b56c9..653f5ce1e6d51 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 9492724bb27ba..ce866c33a6283 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 90cfc06b7dffb..8221b20e6cb13 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 f6246c49f8022..ec87b576026b2 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 05e44fa438cee..2b08649ad591a 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 8f308dd06022e..0798677edf078 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 203e46c2b8a4a..d242cc5faab13 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 6edc9dda48f4d..cffef6bd34afa 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 2f26d1d9ae985..b26c7c66ab287 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 85f9fc53be1a6..26eedfdfcddfa 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 2b3c6b373ed42..3a3efa9177369 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 fd9b750c8fd89..2a1caa3720b6e 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 45668224c6176..d48cb3bca94bb 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 563dd2827839a..7d1f29212afc1 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 44681608efc37..a116566fd62ef 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 7bcfa2ea26e06..fee11e577dc36 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 4d82100649b01..480cea5f55225 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 c88dc7573506f..bebd6db8119fa 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 357bac4adc3d9..b9368b10cb804 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.h b/libclc/clc/include/clc/math/clc_ep.h
index a53e8ca539ea8..7e93ce417ff99 100644
--- a/libclc/clc/include/clc/math/clc_ep.h
+++ b/libclc/clc/include/clc/math/clc_ep.h
@@ -15,7 +15,7 @@
 
 #include "clc/internal/clc.h"
 
-#define __CLC_BODY <clc/math/clc_ep_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/math/clc_ep_decl.inc"
+#include "clc/math/gentype.inc"
 
 #endif // __CLC_MATH_CLC_EP_H__
diff --git a/libclc/clc/include/clc/math/clc_ep_log.h b/libclc/clc/include/clc/math/clc_ep_log.h
index cdd5f2fffbd3b..8ac9546a844ed 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_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/math/clc_ep_log_decl.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 01a21b36b352f..ffb0a329e58cb 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 efd581542879f..6ea5819807bba 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 84369bb8fbdd6..b60b1f38504fd 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 500271cb07429..946748e9826cf 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 4ad0ddea48a7c..2ca9b09408d9e 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 e1a2647c7b7c3..18647deebe387 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_decl.inc>
+#define __CLC_BODY "clc/math/clc_exp_helper_decl.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 5c60960ca5b03..f117213ac0e55 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 1ef38a8c75957..c9439d6eeb9e2 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 50ad045db62cf..7bb0cc9f68f6d 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 d243819e0a42c..9f926df5f2810 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 5e87f4c470850..e8aad41e021b4 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 f367a9b6ea1ca..6e1da7734d332 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 47ed3fad2d8c2..818601124e5d6 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 44179babd7fed..46b6f0d84685d 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 af762ecc59ea5..0a073d5f0290b 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 d6ed2754d0d40..6d256f44973c5 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 d0122987899c3..1c61c1700411a 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 e5d5cdc9df34e..96c0735591e56 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 2284eaf8df360..f2e68e8bc3bee 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 662df93e06855..9eb5a0884025c 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 d2af0f2e3fa9a..6f2a60db220ed 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 8ae30e5abe5f8..38cacae95e1a2 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 fe5248350abad..2aebff382deb3 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 c57aa1bffb335..4d796f282576e 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 188b32b8b49c6..6b902a95f229a 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 f5f71fa1988c8..e86e9c412e22b 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 d5a05ac8b84ac..d46b161489d82 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 d2d3da9b11dbf..d4b7b7e628de0 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 a54b8122cb15e..89ed5a8bf492a 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 503ebe29c3cec..08d77ded73e75 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 40b354154fa53..82acffa2f013a 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 6aeaf6be3ac6c..d77fa4e37cd2a 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 e90732680e2a6..31a794243984a 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 f54c5e2b61b67..d70b778da4df4 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 262e62372227a..93e8c8dcfcbe6 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 8b0e44b425a89..f867f5bb0a637 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 6e086690c6ada..67dae5222c8fb 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 1be8c8548d488..5453fb49fd5e5 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 c5f9e37f39845..6df487ca1b2f5 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 75a2ce7e578b1..30ed02e5d0ba3 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 117e361380eda..68858c456a908 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 857ad7867b05d..71e1523704ffc 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 9615d029bfed2..959a2551bea03 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 aa8f9e20892ab..d336d6e3f2654 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 2b0fe197c167e..0216cb78439e0 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_decl.inc>
+#define __CLC_BODY "clc/math/clc_nan_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_cos.h b/libclc/clc/include/clc/math/clc_native_cos.h
index eefd133911e48..de240d8442a3d 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 97d97c2670a6b..b4fffe8c9d251 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 30c0d1edf18fb..1ef08f93d59ae 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 a88b5a3897377..b9130cc4fa420 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 09f4bfe6979dd..f5c6a990c9c31 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 c32fc812d4770..a4e9fb38ec2e5 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 329b8a7437556..ec65954b71537 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 b8ad663b470d8..6accba9468947 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 3a0c8cc8b9d58..acfa7565cb4ff 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 a6540e846f2b6..6661913ebac69 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 0c8f3da039299..60eb45a9fec84 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 22ab7868e20fb..23b3a8e6d6a75 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 fd071f1d463ab..de0770a53a84e 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 4b381312d8d51..ec72913662173 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 f24742b9e9c37..500cbaf847d63 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_nextdown.h b/libclc/clc/include/clc/math/clc_nextdown.h
index f401abf1ca3a1..fbc8fd50db6f5 100644
--- a/libclc/clc/include/clc/math/clc_nextdown.h
+++ b/libclc/clc/include/clc/math/clc_nextdown.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_NEXTDOWN_H__
 
 #define __CLC_FUNCTION __clc_nextdown
-#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_nextup.h b/libclc/clc/include/clc/math/clc_nextup.h
index bfa44e8fc491b..ee84ff01f0328 100644
--- a/libclc/clc/include/clc/math/clc_nextup.h
+++ b/libclc/clc/include/clc/math/clc_nextup.h
@@ -10,8 +10,8 @@
 #define __CLC_MATH_CLC_NEXTUP_H__
 
 #define __CLC_FUNCTION __clc_nextup
-#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_pow.h b/libclc/clc/include/clc/math/clc_pow.h
index 5e37e5bf6da65..431cff8d8f6a3 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 30628efb19001..027687140e6bd 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 baa494cce6989..40c57fab5a3c5 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 82890d606249a..b6d18da0b0342 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 a7700c95103b4..3677414d2b11e 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 48a8844a6e384..7896d4e2a76dd 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 17b1549f439b8..fe008ec7c9a2c 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 90a25ad52d867..6372783528b8e 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 78ebf4db99e9f..c56cbcbdd3d65 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 59402fbead2b2..73a9c7b82f30b 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 de4c722ca123f..b74962be0c937 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 e26dc7c024c9c..a3f6acfb8178d 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 67bc54d433ef4..4dd6ac74354ad 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_decl.inc>
+#define __CLC_BODY "clc/math/clc_sincos_helpers_decl.inc"
 
-#include <clc/math/gentype.inc>
+#include "clc/math/gentype.inc"
 
 #define __CLC_DOUBLE_ONLY
-#define __CLC_BODY <clc/math/clc_sincos_helpers_fp64_decl.inc>
+#define __CLC_BODY "clc/math/clc_sincos_helpers_fp64_decl.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 fa9cabe79cb0e..4be80207ff768 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 db563c2e7e14a..c6597928dd2e9 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 7084515533291..c661e12500ead 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 e50911c7f5d9b..bf16424cfbf86 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 3d0f501979320..9ae2470efd265 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 14693ed01e033..b157720533d72 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 028ff28ecd69d..9d0943301b915 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 88fce2340d99b..3be3b0a44dc2b 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 596bb72b4b8de..922d17046a613 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 dd76e041875d5..aeddbca0a54ca 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 33445f9fe15d6..90be54dec3cb2 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 bee877c562123..302dbd2279d3f 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 59418eaac26fc..f11296bdd00c4 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 db6472ad0e645..f62d24ed86b05 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 7a47aae8ce637..ff7a9aa2bf1e2 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 8a490e1bba16d..8d6f7251eaa82 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 0776caddde0d5..6a8bf2eaa6749 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 ba3d7a2bddd62..4665a3f4d99c9 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 84bafba12b211..3d67724d6ca87 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 c319f57f880fe..afc3b88d847c4 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 0f0340979c557..b4e0006f12c08 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 a99e2ae172d5c..e24fdcc5e929b 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 5e52be4563f36..90e24c943efe8 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 815a4f4d9b6ef..190eb8f0ce430 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_decl.inc>
-#include <clc/math/gentype.inc>
-#define __CLC_BODY <clc/relational/clc_bitselect_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/relational/clc_bitselect_decl.inc"
+#include "clc/math/gentype.inc"
+#define __CLC_BODY "clc/relational/clc_bitselect_decl.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 18e05387759e3..ed87198fba0af 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 596b81f51b853..59d608898e305 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 fc5b3cdad084a..923c20761b9b6 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 6209a066cf46d..5c96e499a76f6 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 a64b18bd564d3..19b8a3db9c6db 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 4e340db121773..773d6a02f9a5b 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 14c5a10301836..5cba472321949 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 530564bbf0595..14a12150690cf 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 48cfa7f7fbb8e..34702e56256cf 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 9572b02004686..3463b3ee2543e 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 f90622db9fe1d..87f415427d05a 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 3f5cc097f4a72..c9bf4f94ee6a0 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 548d50a08a6e3..46b5d40066ae6 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 6134ba849d229..cedf47363d448 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 de0a9afa6b8cf..31a95274e88bf 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 a8e04ce494f2c..45677fba6cb89 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 25cf52c84811e..5d226318572df 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 5487ad926768d..847a360e3a629 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 2505f2ee0da2d..7a6929bb4bfd4 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 2c32754044db9..0fce26821a08c 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 7a6283d7190da..06ae65ed87d06 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 587a24ef9af13..8134806be789f 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_clamp_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/shared/clc_clamp_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_clamp_decl.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 73e436147ce0a..331e213eb6a48 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 1f5edca52660e..89ac45b735c0e 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_max_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/shared/clc_max_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_max_decl.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 edda93effa6ce..317e1718e9a27 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_decl.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_min_decl.inc"
+#include "clc/integer/gentype.inc"
 
-#define __CLC_BODY <clc/shared/clc_min_decl.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/shared/clc_min_decl.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 c3dbe0696cc19..563015e1b4e5a 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 647dc7da1afbe..f65fdbe643aef 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 566cfb4ca58c9..4de174863b3bf 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 7bdaee85a612b..2b5848b14dd87 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 b6826b023c70b..72ca5d159b137 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 e941918312da4..c52404b6549e4 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 544057b0e1378..9e30e49144cef 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 fff91d36e626d..76fcd70353e42 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 1e17b078f4836..d61f57860fe5b 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 6454b9915dffe..ca8f3cbea214a 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 e98dc38e1b0b3..c9a855b8101ba 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 3a1137ef3998d..b6e094bf8cae8 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 8a78c78bbc164..d5d7b8a4d2e56 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 bf6d4e5c7642d..2634f96bbfb3e 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 87b88d7d1b4b0..897b7027f4a6a 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 cc1b0f13ad792..44d938b3e77bf 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 a25e5ebaa5e45..2bc8ccf76eb9c 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 9548644f05ca9..2afed829fdaed 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 1272227b65e1b..f2c356568e406 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 0e3b67f64b809..a5c98aeba94b8 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 6071fc3f141fb..38f5cc8f5f000 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 f94e898268921..b584df98e44a6 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 61b54ecde4766..44a4459aa48b4 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 a158153bde1e9..52e4b3f28083a 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 c4b1d928b20d2..4603bfdcbeb25 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 e93d3773b8ca9..eaf547b9646a0 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 ae82bbb3a5c61..bf8521740d1f5 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 b7fc6bf8cabbe..b3734ec63d7a7 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 4b351fdd935fa..5ba9033769eb5 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 9234f84b274df..2acd830688ff8 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 c332708615e19..496c898887f89 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 5560f7ac97965..de582386ead1b 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 3e38cbee3285c..91c6d517b2b87 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 0b731c202e20b..016e32c526ddf 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 1fd8ba520411e..1dcab8b19a25c 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 e4d27421f8fe0..7c8debcc9e275 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 d62343400f2c4..12e92b3bdd975 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 0a1c170375314..99847f2db5193 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 a17ac508b5ad3..0f6504057e7c9 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 142a878818535..6620d1a55a387 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 bc6028ed13b2c..00716a0f0756b 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 946b9beed5be4..ea5fe6c806a0b 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 a940323b60a71..46917b95bfd26 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 c356b22b6b6e0..286cf68f5bcbc 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 f54c9e214752c..c5054ffe32ec7 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 d6dc95b574910..969833bcd67d3 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 0950af0aaf0d6..178b95d44d9e5 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 eca855072004e..5fe6803685ebd 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 4dab7905ba301..56dc11c789e51 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 8d1d16d4762fd..bda46aa475183 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 1c66d0be410ff..9811772db9c4f 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 c28b9441b05ff..306aad5142120 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 1b8da199eb4ad..58e32b0e0ae8f 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 796dedcef3857..8cc9f767d8227 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 4603e7ebd86de..a6c5119c6027e 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 b2c26758103cd..e138780739267 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 06fa21344ec84..d8536aa5f1cbf 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 7b9750d8d4db7..ef21d82417965 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 6401d3e9439f0..6a4995f955d38 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 51e3904a5c6e3..b138bfd21a3a3 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 e92e351db3f42..2d95e73a26577 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 fbbf7a4def566..0797fd8f3e895 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 d041fd164d386..9a32125f8ca9c 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 e03e63bd82d5a..60fc30fde25cb 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 4a033e3532af9..515458ec88ad3 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 53915c5887687..cd9ff8786fb93 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 af808553a7110..5a8cb8da017c9 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 66ae2ba98556d..e0429b0acf86a 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 d54bda65773f8..ebf2d2eb1710f 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 a28b5cf1c2c58..dbe0eaba656e4 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 9c48f50f3518d..6938c6ca1202b 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 6e8d6f3638101..31340ddd19714 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 07cfe4bfcfffb..0dc29abf95633 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 1c4d4a5a9b0bf..73d15c0dcded3 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 6bb9a66760e27..62370fe135a84 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 41dc43f67aa66..aa5dbaf1ab732 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 cc7016fcbefbd..18036aef27b92 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 70bb027d9e436..33e81a95a5f6d 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 bef4ff7b3ad65..2d509ab70c917 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 4ed1d5797d9a2..e7f82b346593e 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 ba22c9e17330a..c317195ecb1e1 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 a30f9bc6e301a..52d75d3e2f267 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 6b645df0b3ddb..9e40b589f9732 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 ce6ec5283e524..484a0dcd60d31 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 a5883efe7bd90..47910cf191a3a 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 d9a9166b92ae7..9e41b35b31598 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 ec4a67647c13e..18188bf11b66a 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 c2bea5bec8123..269dcf1e564c6 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 c168b06060aa3..80a92934dd037 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 08337bf533fc0..f60afb65f14cd 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 9bf57e2c7d83f..5cc72d13cadca 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 d779ed6a43593..014efc99ab736 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 bf7db401034dc..8f7af6e604f5c 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 a40fc804f2187..4678bcfb22479 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 48c4400f199f5..4f54cf3416f5d 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 42cfa90c3e66a..01c4df09cd60b 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 0f11e547c1ca1..dee74b6d7c559 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 12b72a20b35cf..bb394dd70e84b 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/internal/clc.h>
-#include <clc/integer/clc_mul24.h>
+#include "clc/integer/clc_mul24.h"
+#include "clc/internal/clc.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 93088dc9f0b69..77470d17306e8 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 9b362af51ef74..3cda150c96f44 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 117d8471fb8a3..c627a6cb5034a 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 2781ead638c97..9ac373799b252 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 e7dd5c7f4b536..5a0738677f80d 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 2abf0178ce3b6..12eb8c5bf0c18 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 8a7ffd06f8b0b..022d4c9c0eaba 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 649bc7830f442..5aa23fa059b04 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 822c3f9f13e8e..526ee3b17649f 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 a46606be59333..cc73b76dd32f4 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 22134d3209e60..b8100bbfd04b5 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 195ede3907f3c..4abe4b6bcf109 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 763efb4e76aca..5500f4748b14c 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 bc680df5f9b23..cad756266bb0a 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 d960f75baca2b..3219299dac2a2 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 b10bf32333a32..1ba6751f5a0f1 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 7f75c11d15d7b..cee4d8451d85a 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 485e72479bce4..456a3ac2624c3 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 fee72aa7efb47..6ed7bdf1c7805 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 935b7b7eae78c..a3429483e0a69 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 e48ad1a482ef7..97a0942d3ecac 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 89829e2375ea3..864d13b5bc5d6 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 5529ec411a195..c6e9ed7d7f0a4 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 4da78de2714e3..1a376685eeae9 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 6a10171c723d0..7ccaae3404925 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 00af7708e28a0..32aa4595ff72e 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 b5c477cfcb7c3..b9bc2234482d9 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.cl b/libclc/clc/lib/generic/math/clc_ep.cl
index f0e3020f65f6f..a45d57cdcf542 100644
--- a/libclc/clc/lib/generic/math/clc_ep.cl
+++ b/libclc/clc/lib/generic/math/clc_ep.cl
@@ -33,5 +33,5 @@ _CLC_DEF _CLC_OVERLOAD _CLC_CONST static double ep_high_fp_bits(double x) {
 }
 #endif
 
-#define __CLC_BODY <clc_ep.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc_ep.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 c6782f77a16d9..2d228a0dbf193 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 61a7c9d684aab..a2c1adbd37615 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 64cabb53bbe9d..72733ee93647a 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 6ff452721881c..1e7174c7541c5 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 0c394ee19475a..932ee0de64f25 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 9635f84e5a9a6..0516963ab620f 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 1670b73b6c980..106e2e0a6dd07 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 8695b46eb90ea..45ce92d70838f 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 e0c7685bfdb64..f0fa5190d4582 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 a2b3adac29c10..465a12e26935c 100644
--- a/libclc/clc/lib/generic/math/clc_fdim.cl
+++ b/libclc/clc/lib/generic/math/clc_fdim.cl
@@ -8,5 +8,5 @@
 
 #include "clc/relational/clc_isunordered.h"
 
-#define __CLC_BODY <clc_fdim.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 f31bed2e9ee64..7f9619ca1e5fc 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 9527460cb2c69..2ac63927623dd 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 0fdbaa5eef5f6..4677f5211f060 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 572d54b128a6f..63034dfd61389 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 629c610748618..8add0cefd621f 100644
--- a/libclc/clc/lib/generic/math/clc_fmod.cl
+++ b/libclc/clc/lib/generic/math/clc_fmod.cl
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/internal/clc.h>
+#include "clc/internal/clc.h"
 
 #define __CLC_FUNCTION __clc_fmod
 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_fmod
-#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_fract.cl b/libclc/clc/lib/generic/math/clc_fract.cl
index 681077cb9c899..21a0dd2893712 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 7ff292ebb75c1..08af08e9e781e 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 763266bc04931..725de0697ba3a 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 4420ad31afae5..6b942ea202015 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 16af197d29a75..7c6d902eb6008 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 4b4717672d368..0d640eabf66e0 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 5bacca1ee0b7d..fc94c4dd56a48 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 9a8f2f980c5a7..b71caadadacff 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 160b193e8040c..446b5d6f0a03e 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 83d57db1bdf2f..7787b5ce24623 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 7de0053fd7507..8ce86d3d208af 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 7065377ede66c..4f87978daf7da 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 a988ad5e05a8f..3d740c88a38d6 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 4e0cdd252f656..eed38f1f679c2 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 acc5d43156ab8..96fc3900efcec 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 01e779960df6c..db6f1f4eba29e 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 1427fe02555f1..f0a90db323757 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 bac8339ee2822..b609d680fe7fb 100644
--- a/libclc/clc/lib/generic/math/clc_hypot.cl
+++ b/libclc/clc/lib/generic/math/clc_hypot.cl
@@ -19,5 +19,5 @@
 #include "clc/relational/clc_isinf.h"
 #include "clc/relational/clc_isunordered.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 e96e547d2b6a1..99b25fae6fe90 100644
--- a/libclc/clc/lib/generic/math/clc_ilogb.cl
+++ b/libclc/clc/lib/generic/math/clc_ilogb.cl
@@ -16,5 +16,5 @@
 #include "clc/relational/clc_isnan.h"
 #include "clc/relational/clc_select.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 f9252a75ab4bf..a2a0e82b7f4e7 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 ca8f589c3b433..6ebd3166dfdce 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 2322ad54508fa..929aadeb5357b 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 74ee1ed713751..ab7cdc07cd4cb 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 741d21b5d831a..71665cdaf8efe 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 71ccba79a7289..6c32c1ffc361d 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 432ea5737bc2c..76819eaab6203 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 e7879c9dccedb..fda32f742b84f 100644
--- a/libclc/clc/lib/generic/math/clc_log_base.h
+++ b/libclc/clc/lib/generic/math/clc_log_base.h
@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/float/definitions.h>
-#include <clc/math/clc_ep.h>
-#include <clc/math/clc_fabs.h>
-#include <clc/math/clc_fma.h>
-#include <clc/math/clc_frexp.h>
-#include <clc/math/clc_ldexp.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/float/definitions.h"
+#include "clc/math/clc_ep.h"
+#include "clc/math/clc_fabs.h"
+#include "clc/math/clc_fma.h"
+#include "clc/math/clc_frexp.h"
+#include "clc/math/clc_ldexp.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:
diff --git a/libclc/clc/lib/generic/math/clc_logb.cl b/libclc/clc/lib/generic/math/clc_logb.cl
index d966cca483875..329975c060aa6 100644
--- a/libclc/clc/lib/generic/math/clc_logb.cl
+++ b/libclc/clc/lib/generic/math/clc_logb.cl
@@ -16,5 +16,5 @@
 #include "clc/relational/clc_isfinite.h"
 #include "clc/relational/clc_select.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 f8b04f90c858a..5ca5d6562a012 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 fd457db0c5097..496b54c3c7176 100644
--- a/libclc/clc/lib/generic/math/clc_maxmag.cl
+++ b/libclc/clc/lib/generic/math/clc_maxmag.cl
@@ -9,5 +9,5 @@
 #include "clc/math/clc_fabs.h"
 #include "clc/math/clc_fmax.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 b0d7a92729299..b00360f333a29 100644
--- a/libclc/clc/lib/generic/math/clc_minmag.cl
+++ b/libclc/clc/lib/generic/math/clc_minmag.cl
@@ -9,5 +9,5 @@
 #include "clc/math/clc_fabs.h"
 #include "clc/math/clc_fmin.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 dd8ac493ddf91..8657ac87b4227 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 0d480175b9c5e..e252b84cfa7aa 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 4e9a6c91b4260..3922a8ef784ec 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 abec9add4fd62..36b3d62181031 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 63b4e56913972..89cef355f691b 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 2819cd59c4be9..d42b6ec8b835d 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 a995b0347cac4..2574ad98f12b1 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 617908277fb6a..b62a768bb62ba 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 0558f8cb7049b..bc7865a2e14c1 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 c897ac07acb45..6f67bf85e3413 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 dac9b7edf78b9..5c6937ff3428a 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 75d832c8467ee..9826af2e3d4fc 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 9b88e72126f88..619f8c45f8bdf 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 941342f387a1a..e395030ca6e16 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 cc18a4b7ba1d3..85110e5389db5 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 6b69067be388e..4915d1579f14d 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 e68b95f0b6ac2..0470361d4f6d1 100644
--- a/libclc/clc/lib/generic/math/clc_nextafter.cl
+++ b/libclc/clc/lib/generic/math/clc_nextafter.cl
@@ -12,5 +12,5 @@
 #include "clc/math/clc_nextup.h"
 #include "clc/relational/clc_isunordered.h"
 
-#define __CLC_BODY <clc_nextafter.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc_nextafter.inc"
+#include "clc/math/gentype.inc"
diff --git a/libclc/clc/lib/generic/math/clc_nextdown.cl b/libclc/clc/lib/generic/math/clc_nextdown.cl
index ed8728e25e595..87943037e7b13 100644
--- a/libclc/clc/lib/generic/math/clc_nextdown.cl
+++ b/libclc/clc/lib/generic/math/clc_nextdown.cl
@@ -11,5 +11,5 @@
 #include "clc/math/clc_nextdown.h"
 #include "clc/relational/clc_isnan.h"
 
-#define __CLC_BODY <clc_nextdown.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc_nextdown.inc"
+#include "clc/math/gentype.inc"
diff --git a/libclc/clc/lib/generic/math/clc_nextup.cl b/libclc/clc/lib/generic/math/clc_nextup.cl
index bc86665923e20..309852f313f9c 100644
--- a/libclc/clc/lib/generic/math/clc_nextup.cl
+++ b/libclc/clc/lib/generic/math/clc_nextup.cl
@@ -10,5 +10,5 @@
 #include "clc/math/clc_nextup.h"
 #include "clc/relational/clc_isnan.h"
 
-#define __CLC_BODY <clc_nextup.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc_nextup.inc"
+#include "clc/math/gentype.inc"
diff --git a/libclc/clc/lib/generic/math/clc_pow.cl b/libclc/clc/lib/generic/math/clc_pow.cl
index 70d3d614a8d36..77367312a2c44 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 5aa9560174b99..fc0f651a261df 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 0556ec97d6f3c..526bf890ede63 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 779acf8078881..32a52cf97b8e2 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 622f05f85100c..f1dba87ee5b43 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 fd83ead06d89a..6f6a7fc6bdcfa 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 e3aaae0ffec6f..749a26e6923f2 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 da397cf66da62..3f0070699d1eb 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 5ed8d08ba4f45..49e3e256126ac 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 92a3d06f46eaf..ef17b4926dd55 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 99338c95eb60c..ec8727f717847 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 2209a41593a2d..6efe59cadea76 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 19705c42f6f07..4c8f4d6097de9 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 bd0b488b16047..7252679235ccb 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 bb5de09f03c08..f9bed7ec78306 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 3fa82fdd714b7..1dd5dd298a35c 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 fd98fb3f6a80a..2f913458447cd 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 89a478ac80908..f46273e30db9b 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 67a17525014db..43fa7387431de 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 7e68216ca43aa..30b56d756f4f0 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 aedcb0c38d5e3..c0e6f60f6fe4c 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 099457c186314..a75b5446a2557 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 c379cd16b5a62..0631028b6ce2f 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 d9c54a1888d94..30281b6866361 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 bd7a6a18a6035..f1dbfff38d67b 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 786c2b6b6afd1..af255946ebdf4 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 29f6d68366778..eee7e19b41b07 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 dc04ac5ae58a4..0162e413d9730 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 b58fb8d3233f8..1b64066f215f4 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 8ee9d153d30c4..981735f091e40 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 9963e2e7dc53b..dbd181e29aa17 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 2f7a3a56faf63..9ae03bc5643a7 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 17cb755908923..d221c994c1561 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 de0d0f658ebe2..62bb8ed063459 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 71ee5b0a07563..186dc1ab2faa8 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 eec8c1a89fcc9..766fb6bb5e3ff 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 da7cf17d2aab8..bde1dfe2107a9 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 c01d6122c9670..ba97f88ce76f7 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 9fabd19e74ceb..3c1d363ad3898 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 3b5af6f0095c0..c6c1a486a0942 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 112bec568dbe1..e6d11b26721af 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 cdbae69ee0c92..d311d6683ef37 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 1a7c0c1387dd5..9b9669b217348 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 ddf24ed0b8685..62c633ddee7d6 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 cb7000ddb0757..05d2e8a0039ad 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 1e81405f74197..6df9bfe77457d 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 a6e831d1eac0c..63210e95fa7ab 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 f345e55c33be7..ee829586c3c1f 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 5942f10d2de5b..28ee5b016f3a6 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 ac96927395120..e2801bd579bd8 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 e3da8fd48fa51..65eedc967f79f 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 c61e838ebc693..7d6d922d52bc4 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 6f18c153df21b..681151b5e92c5 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 8ab4afe1ae05f..7944486aac0f0 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 4ccdfaf4e3fc9..6172e1e49d51e 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 786d57046728d..97f18ad1224d1 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 78f7038b26443..4f65887054d02 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 ac86a57fca3d6..f84045eabfec0 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 afc72e831cd99..fdec76ebc3c57 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 93f14d79fe6b2..3b0055e995aaf 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 35b381052367d..bd9b77945869e 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 0782ef0b15813..508bac8fbeb9e 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 200b1bfd70992..1896a0627f154 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 8c5b313b8135c..0e5e1dc2f32bd 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 2d547d3af249e..5f14231c2cebb 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 6f0634d6f90e7..9a380c2fc4b8f 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 87151ea4be625..d1002afb8dd24 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 1448f8a8b97dc..7e61e09bff1e3 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 101f35c7108c2..57a2b5369db83 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 9bef3a92d5ba4..867b403657901 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 1f71f673619b9..c8da4efb9c84e 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 78fb9588d289d..65360300685c1 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 ec6401e11549e..718d77cacfa57 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 fefcecf42c20c..a7f25f35c2fd6 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 f1c9925847de5..e65727ef0a894 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 be74b71f66b71..bb0baa8beb0af 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 eca64bd3d1818..209b9cc4d497b 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 e514d5a48b476..a59a556e0ef4d 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 a2e217e924f77..695608ad18910 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 172ec32b8a3b3..ab955a9a38ac6 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 cfcbf55caeae7..749718e13a350 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 787b9f8649512..1486c7dbb3019 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 cfb69f26cf5e3..24f50875d448f 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 ec7a2e5469e54..609ac917fb09a 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 76a9ee38bb89c..dc63577d5bee7 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 92df57576d1d0..a1a85b3bdec08 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 c09f10145bb30..fa82f3b45a30a 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 9ad3be5a6fe66..2df86239a8b97 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 1f683b19b21cd..4e902ddfd460b 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 a81c913dae426..66f467fefaf3c 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 df39b1566de65..ee1ea66772e0f 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 bbeb727a712fc..b0bdcc2511cdd 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 54fc99e67cbf3..6bc0ca77b800d 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 10ece67cdf925..8a6594d89e512 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 1888130b34ef3..941bdb20a193c 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 abb10b43ef33b..232dae2ea1984 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 5eb459d0c9d60..478ed08e02e1a 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 3b7ecacee15e5..7fc201787e4e7 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 40fb2f84e49dd..715cd64e066a5 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 9311a0d4a379c..655dc00f70644 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 1f0e7259b0c94..29fa2634c4b17 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 1ae3aa991367e..2eb772d01bf61 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 b023b1ce18e61..d3c8710595ac5 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 fb0ee06f95dd6..ff2115f4c4b41 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 286f97ee1e432..6e28a1c11de89 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 e9fc0a83ceb4d..182c24ed7c566 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 df7dac6c5b222..262c96a10d40f 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 bf4af8412c33c..5f2bfd3197074 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 a8ad0c193d2eb..9740ff7c036db 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 81302e54d5caa..83ef34c666891 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 28b0101e77972..b4f4bfd94f571 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 c5a346cf423c9..86f60627b3a7a 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 a408087bc0e32..250473463c682 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 5255ab1f46c13..1ebf8bb29d408 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 9a5d5c92d599d..b8a230b37f907 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 c9f92b7dfc082..005d9f138488d 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 a1954a558ef10..d4a49676b8013 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 2ed4f058d5b66..7db9cede1b518 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 5c348248b93ea..ff2791115a80b 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 b722d5ceed2de..c3a066aad623d 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 08dbbad0628f2..f682e2e90fff6 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 7279f4437d7c5..120f75e681aff 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 fa4e8fbc26bb3..60ac0a9d0513f 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 219106432cfc6..c9d8344b6b7d4 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 d0f692cc320fa..6c46000ef873d 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 2963ee62c3493..6b338300738da 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 80168bc569a6e..931016d02fd4b 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 88c974cd7c5d5..712ddd184b44a 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 9589d0b8afaa2..40bba97016240 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 ab12570f54c06..8e0986bdd19df 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 be74b71f66b71..bb0baa8beb0af 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 7fe518f3105ce..4b3d731edd301 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 e514d5a48b476..a59a556e0ef4d 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 a2e217e924f77..695608ad18910 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 29dd6370a4d57..9d55e0c3c94de 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 9a39e9e0c3375..46c129fc643b2 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 a622b209f48ba..94bc5f5bc3c61 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 2e5c22201c8ab..d0ddc15c599c4 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 13ac101e391df..2a08305600414 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 ee3eed25fac55..cc8f2b7df7f00 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 ce5dee508ca21..d58e2b768a6b4 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 6dd96a3259e71..d103ff8aa831a 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 3a2aabf716ce4..3088b223ce877 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 c738c99eb9e04..d1b3ea00de475 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 a4325054cf7eb..d3d539dcc1cfb 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 917be12b8e833..2c921503f87c8 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 c54dd461f1713..884a110d5490d 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 b78d92c69cd03..2cdc90fa2e534 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 bc75df9573926..1f36e1141b0a8 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 8e700ca397a94..809771164b850 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 a961e5b8c1d68..20a0bb98eb09d 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 5281e63a73623..19e754769a4e6 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 e964a3983cfbb..6879ae710ef30 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 24bfb6e1ee0dd..4d2a4272a3aec 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 c3875e340ff1f..b641a95625c48 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 5c681ac4e7145..8b3d1d626cdc0 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 1a9c3a923a3e9..5ae69a4b87555 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 0dc521fb409ea..623ab6d99eb39 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 f660a21b4a019..d07f5309d48a1 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 82015803370b1..15793d0bdc7ca 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 76d80c4172426..c84992601e907 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 2a63a13186d11..52bdcdbf19e7e 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 ca9fd9d4f1b07..c866509c48bfe 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 3e2c0b3d4a87f..52c4bcf7f3c82 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 82e84c690e270..608c72b4bb6e2 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 5c3ccd6532013..aab2d1c73fa94 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 86d825f77f324..7b48950160312 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 b093777600c40..647f0db76db97 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 a5dbfd052feb0..7a3155ed40480 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 64a06991a91df..2bbac431fcc98 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 854ca09990b44..2d37e012021de 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 3a38cfe69ade8..891c613d6d21b 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 c3da0aba9e624..24017cd8afd9c 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 86b8415c688cc..2496e3f99e470 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 5d0d8ad4238fc..86b9383fc179f 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 fbb86b89a8bce..7b0d056473493 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 4b895b980c306..da1877878aa8c 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 4b44cb426dac0..39ca56fccfe21 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 d910c88c5c9c5..2f15078a7bd05 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 58b2d8d6937ba..59d8c73c4d553 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 5aa7d0fcc32e0..ad332d504cfdc 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 2afeb89370794..12c4f2ccbdb6b 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 befc5f16bb264..2119a42bc1a6e 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 f82b713a98920..c7f6a0c578022 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 66661192b9915..a1e0a12005a3c 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 eed1a585b64cb..878eef0a26833 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 16fcce64f5178..f8348f4ccf0db 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 9e2bd0abe3b3a..1be22eac7f1f8 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 adac2c3960dd3..efb3c1ae4193d 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 987c605dc248a..31d4f29488006 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 b31a7c6621a66..662e7055eb30e 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 7ff28defbdc01..e5a8a81d64dd7 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 3c749443ba1a3..cce99aad09201 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 e8c1bff46581b..27783d369838d 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 2d92636c08a4a..484a0cd66772a 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 3d3cb76528b63..107c89e2802c7 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 367bcc94b0491..671404a121695 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 58e2b5ec39d48..586fd72738f41 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 6b98fdd25b7ca..9a118c7521fa1 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 a839f7e553b30..bb4e09e51aed1 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 8e193f8f215f2..edc5c1f399901 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 2f072752750d1..b5f6c22ba6fbe 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 68e32a8142227..5792a1f03080b 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 26379d751208a..dee3b0b198f9e 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 7f77d737ff202..6e9f999f3c446 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 e6f928a88e1d6..54a1f033c9d88 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 562663644b137..09700b2365845 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 1ff24376b207b..895821ee0b334 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 b81aed941ab40..c1d1518c95f7e 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 f3060d3964bda..e28c25f53d873 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 f8ef83f3de212..7b0586bec3eeb 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 a07de8ad4b37c..fe89cd52b1506 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 8cde1844a56fa..805664c19f411 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 4e2890ad882ad..933e95f3b9d67 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 d8c913570260c..d78284d5dc266 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 8dbb5b26b3d3d..c5082d368b2d8 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 3fbe354827626..a56cd10aeef2b 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 63a60ae014f01..f2dba882b3daf 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 5cc52b39eb684..0e112aa8d34c1 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 4a2e865a35530..63508b4259fb8 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 86f2b08e5b095..88e5a7b1a679f 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 fe524ba305e9e..22875fee0b751 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 df0629fbf55ad..6123ce74cfcfd 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 d2b9cf859696b..8a77805efd55a 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 a1b8d5d2510cf..f601ceaf678e1 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 19da3c269b28a..e3561756d519c 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 58f8005463cf8..d2be9616ffe05 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 8bed47dd18ee2..1cb9ae02778dc 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 0323f6668ba04..c40ca2bf77992 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 915fa8a2d4ede..86ee71f83a88e 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 b5d8ff586761b..c4256065b5d8f 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 d1b2c5b93175f..c508c1b261dd8 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 05df5e10cdbd7..78a7e17ab87b1 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 3c8c72098db00..87c313003c200 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 4501e2f0fd8b1..45280d8ad606e 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 a7eb715f0ef51..d8d55e1781ec6 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 0ee7e827338ae..a45b44d64d7a1 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 6862432a81c7d..35631c8105b3d 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 2fd3a50733ed5..98fdb94a7ac29 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 e48bc10a636ab..68d09ad9b0431 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 168e30aa57b08..b6111b22ec6f2 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 cc5a4988b7c94..bbfd1a8e7d46a 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 2bd359ca547f5..578a5feb3a4bd 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 1791123f637bc..95679ae463b92 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 8c9c7f4cc72f5..dba413491beb9 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 8af24a8ba0b1b..ebdeead88c4f9 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 269462f85d951..a292db519c1cc 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 7ffdc3329749e..4ca81dc67c6fd 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 aa1fc0cf4d806..2774b36888380 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 e1f4d115d4d0d..40e2c63a528ee 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 2c0024b908ea4..54a4f40308c69 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 4c5a76d14a5de..969cb645d30e0 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 7b9e504d7f25d..87418860862dd 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 539085a3f243d..39859b748a3e4 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 4ebde1d1652e2..647c6d4e18217 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 1e11b5f5ed64f..2d6cc6e9efad0 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 724b646afa153..505699ddf7e35 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 38fb15c2c1de8..eed8f6e0ce660 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 7c47fb8ea9cfc..194e6e45b58b4 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 3fb3dbc2a5805..269241a80ae05 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 c896b811964f6..6f9f5ec44a857 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 e6fb84dd182f0..ca4b9c8128813 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/bitselect.cl b/libclc/opencl/lib/generic/relational/bitselect.cl
index b4b4707d28cdf..52dbbf62b340d 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 c82657333a8de..5f317d4edd2e9 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 "relational_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 58957be473fb0..6420f854f003d 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 "relational_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 5f450c2986d7a..3088f98f35dfc 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 "relational_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 03c04419e3cbd..7fcd6dd3125ed 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 "relational_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 db2c31bb4868e..78441297536cd 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 "relational_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 39a332b5dc6e8..d3d26b11ab2a3 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 "relational_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 84c960d494020..09ab8fa97d24b 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 "relational_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 ea8accc299d79..770fe75c61e21 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 "relational_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 41b54f3a10420..c8e56ae3e0630 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 "relational_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 a0a09f6f6abae..bd002b4afef45 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 "relational_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 8504b5ee77729..bdc50243c646e 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 "relational_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 cd79333f45aa1..ca28421cb66b4 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 "relational_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 90f5506e1f988..e92c097ac3768 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 "relational_binary_def.inc"
 
-#include <clc/math/gentype.inc>
+#include "clc/math/gentype.inc"
diff --git a/libclc/opencl/lib/generic/relational/relational_binary_def.inc b/libclc/opencl/lib/generic/relational/relational_binary_def.inc
index b60d9bbe45e11..d91b893207c55 100644
--- a/libclc/opencl/lib/generic/relational/relational_binary_def.inc
+++ b/libclc/opencl/lib/generic/relational/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/relational_unary_def.inc b/libclc/opencl/lib/generic/relational/relational_unary_def.inc
index 1655ace114aa6..a39c26cc2a521 100644
--- a/libclc/opencl/lib/generic/relational/relational_unary_def.inc
+++ b/libclc/opencl/lib/generic/relational/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/relational/select.cl b/libclc/opencl/lib/generic/relational/select.cl
index 4b3ea01d5303f..d0150041f3485 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 89e3e9f335403..121da4d8f4b55 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 "relational_unary_def.inc"
 
-#include <clc/math/gentype.inc>
+#include "clc/math/gentype.inc"
diff --git a/libclc/opencl/lib/generic/shared/clamp.cl b/libclc/opencl/lib/generic/shared/clamp.cl
index 8f740dab47e04..8d6fe0e98b26c 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 a0018c4b11fdc..067add6d72e45 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 f0ddca2a133b7..d6cd031f560f2 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 d31697378a2e5..41c0085ac232c 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 915cd8754964e..7f945b26489f7 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 9401653d089bc..828701adf2ebc 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 1614fafd0c6eb..7e1737327ff11 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 799acc063d350..be40607c69a3d 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 416a3e9837cdc..5533d5c3aac22 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 d134dfc3f8d72..a93027e473348 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 7338f140ab084..bddd0c191f448 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 24b61c7488d3c..612a335f8bc80 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 dc51a3557211e..694523f258792 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 61a6d8ef88f96..7b59a85f5afe1 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 6beadd3ca8982..d31c3b0747a20 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 c59432a0038e4..51e4712e4cb84 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(); }

>From 11990d919592923dbc0cd3c817cf31c82c048d20 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he at intel.com>
Date: Sat, 14 Mar 2026 08:12:34 +0800
Subject: [PATCH 2/3] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot at users.noreply.github.com>
---
 .../clc/include/clc/integer/clc_bitfield_extract_unsigned.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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..fe09b971cb144 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
-#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__
+#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__
 
 #include "clc/internal/clc.h"
 
@@ -20,4 +20,4 @@
 #undef __CLC_RETTYPE
 #undef __CLC_FUNCTION
 
-#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__

>From 4e5a029061a459206f3d67a18faaa7c02d4913d9 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he at intel.com>
Date: Wed, 18 Mar 2026 03:16:12 +0100
Subject: [PATCH 3/3] clang-format
 libclc/clc/lib/generic/math/clc_sincos_helpers.cl

---
 libclc/clc/lib/generic/math/clc_sincos_helpers.cl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
index 8140f4d4e2f4f..70d9cb980ccdd 100644
--- a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
+++ b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clc/math/clc_frexp.h"
-#include "clc/math/clc_ldexp.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_frexp.h"
+#include "clc/math/clc_ldexp.h"
 #include "clc/math/clc_mad.h"
 #include "clc/math/clc_native_divide.h"
 #include "clc/math/clc_trunc.h"



More information about the cfe-commits mailing list