diff --git a/libclc/libspirv/lib/generic/relational/bitselect.cl b/libclc/libspirv/lib/generic/relational/bitselect.cl
index 33f67636d95ac..fd91305d03784 100644
--- a/libclc/libspirv/lib/generic/relational/bitselect.cl
+++ b/libclc/libspirv/lib/generic/relational/bitselect.cl
@@ -6,11 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/relational/clc_bitselect.h>
-#include <libspirv/spirv.h>
+#include "clc/relational/clc_bitselect.h"
+#include "libspirv/spirv.h"
 
-#define __CLC_BODY <bitselect.inc>
-#include <clc/integer/gentype.inc>
+#define __CLC_FUNCTION __spirv_ocl_bitselect
+#define __CLC_IMPL_FUNCTION(x) __clc_bitselect
 
-#define __CLC_BODY <bitselect.inc>
-#include <clc/math/gentype.inc>
+#define __CLC_BODY "clc/shared/ternary_def.inc"
+#include "clc/integer/gentype.inc"
+
+#define __CLC_BODY "clc/shared/ternary_def.inc"
+#include "clc/math/gentype.inc"
diff --git a/libclc/libspirv/lib/generic/relational/bitselect.inc b/libclc/libspirv/lib/generic/relational/bitselect.inc
deleted file mode 100644
index 793264132cf2a..0000000000000
--- a/libclc/libspirv/lib/generic/relational/bitselect.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __spirv_ocl_bitselect(__CLC_GENTYPE x,
-                                                           __CLC_GENTYPE y,
-                                                           __CLC_GENTYPE z) {
-  return __clc_bitselect(x, y, z);
-}