diff --git a/libclc/libspirv/lib/generic/SOURCES b/libclc/libspirv/lib/generic/SOURCES
index 8a5d0d279c464..583a0cafab905 100644
--- a/libclc/libspirv/lib/generic/SOURCES
+++ b/libclc/libspirv/lib/generic/SOURCES
@@ -39,6 +39,7 @@ geometric/scale.cl
 integer/abs.cl
 integer/abs_diff.cl
 integer/add_sat.cl
+integer/bit_reverse.cl
 integer/clamp.cl
 integer/clz.cl
 integer/ctz.cl
diff --git a/libclc/libspirv/lib/generic/integer/BitCount.cl b/libclc/libspirv/lib/generic/integer/BitCount.cl
index 849e0341ecb99..55fe1976a35b2 100644
--- a/libclc/libspirv/lib/generic/integer/BitCount.cl
+++ b/libclc/libspirv/lib/generic/integer/BitCount.cl
@@ -6,10 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <clc/integer/clc_popcount.h>
 #include <libspirv/spirv.h>
 
 #define __CLC_FUNCTION __spirv_BitCount
-#define __CLC_IMPL_FUNCTION(x) __spirv_ocl_popcount
+#define __CLC_IMPL_FUNCTION(x) __clc_popcount
 #define __CLC_BODY <clc/shared/unary_def.inc>
 
 #include <clc/integer/gentype.inc>
diff --git a/libclc/libspirv/lib/generic/integer/abs.cl b/libclc/libspirv/lib/generic/integer/abs.cl
index e2a1eeaa56830..f129b17b8ffb2 100644
--- a/libclc/libspirv/lib/generic/integer/abs.cl
+++ b/libclc/libspirv/lib/generic/integer/abs.cl
@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/internal/clc.h>
 #include <clc/integer/clc_abs.h>
 #include <libspirv/spirv.h>
 
diff --git a/libclc/libspirv/lib/generic/integer/abs_diff.cl b/libclc/libspirv/lib/generic/integer/abs_diff.cl
index 89e60078d9f94..9c16c9aeaa130 100644
--- a/libclc/libspirv/lib/generic/integer/abs_diff.cl
+++ b/libclc/libspirv/lib/generic/integer/abs_diff.cl
@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/internal/clc.h>
 #include <clc/integer/clc_abs_diff.h>
 #include <libspirv/spirv.h>
 
diff --git a/libclc/libspirv/lib/generic/integer/bit_reverse.cl b/libclc/libspirv/lib/generic/integer/bit_reverse.cl
new file mode 100644
index 0000000000000..730220590f90e
--- /dev/null
+++ b/libclc/libspirv/lib/generic/integer/bit_reverse.cl
@@ -0,0 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include <clc/integer/clc_bit_reverse.h>
+#include <libspirv/spirv.h>
+
+#define __CLC_FUNCTION __spirv_BitReverse
+#define __CLC_IMPL_FUNCTION(x) __clc_bit_reverse
+#define __CLC_BODY <clc/shared/unary_def.inc>
+#include <clc/integer/gentype.inc>
diff --git a/libclc/libspirv/lib/generic/integer/popcount.cl b/libclc/libspirv/lib/generic/integer/popcount.cl
index 75f772148c6d9..19fc92668c96a 100644
--- a/libclc/libspirv/lib/generic/integer/popcount.cl
+++ b/libclc/libspirv/lib/generic/integer/popcount.cl
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <libspirv/spirv.h>
 #include <clc/integer/clc_popcount.h>
+#include <libspirv/spirv.h>
 
 #define __CLC_FUNCTION __spirv_ocl_popcount
 #define __CLC_IMPL_FUNCTION(x) __clc_popcount