diff --git a/libclc/libspirv/lib/generic/SOURCES b/libclc/libspirv/lib/generic/SOURCES
index 8a5d0d279c464..49684c0099b4d 100644
--- a/libclc/libspirv/lib/generic/SOURCES
+++ b/libclc/libspirv/lib/generic/SOURCES
@@ -22,6 +22,8 @@ atomic/atomic_load.cl
 atomic/atomic_store.cl
 common/degrees.cl
 common/fclamp.cl
+common/fmax_common.cl
+common/fmin_common.cl
 common/mix.cl
 common/radians.cl
 common/sign.cl
@@ -84,9 +86,7 @@ math/fdim.cl
 math/floor.cl
 math/fma.cl
 math/fmax.cl
-math/fmax_common.cl
 math/fmin.cl
-math/fmin_common.cl
 math/fmod.cl
 math/fract.cl
 math/frexp.cl
diff --git a/libclc/libspirv/lib/generic/math/fmax_common.cl b/libclc/libspirv/lib/generic/common/fmax_common.cl
similarity index 72%
rename from libclc/libspirv/lib/generic/math/fmax_common.cl
rename to libclc/libspirv/lib/generic/common/fmax_common.cl
index db2f1ca2636bc..84f41f52b76ff 100644
--- a/libclc/libspirv/lib/generic/math/fmax_common.cl
+++ b/libclc/libspirv/lib/generic/common/fmax_common.cl
@@ -6,7 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <clc/math/clc_fmax.h>
 #include <libspirv/spirv.h>
 
-#define __CLC_BODY <fmax_common.inc>
+#define __CLC_FUNCTION __spirv_ocl_fmax_common
+#define __CLC_IMPL_FUNCTION(x) __clc_fmax
+#define __CLC_BODY <clc/shared/binary_def.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/libspirv/lib/generic/math/fmin_common.cl b/libclc/libspirv/lib/generic/common/fmin_common.cl
similarity index 72%
rename from libclc/libspirv/lib/generic/math/fmin_common.cl
rename to libclc/libspirv/lib/generic/common/fmin_common.cl
index 1348001e07eda..5e697c087913e 100644
--- a/libclc/libspirv/lib/generic/math/fmin_common.cl
+++ b/libclc/libspirv/lib/generic/common/fmin_common.cl
@@ -6,7 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <clc/math/clc_fmin.h>
 #include <libspirv/spirv.h>
 
-#define __CLC_BODY <fmin_common.inc>
+#define __CLC_FUNCTION __spirv_ocl_fmin_common
+#define __CLC_IMPL_FUNCTION(x) __clc_fmin
+#define __CLC_BODY <clc/shared/binary_def.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/libspirv/lib/generic/math/fmax_common.inc b/libclc/libspirv/lib/generic/math/fmax_common.inc
deleted file mode 100644
index 0c45e89ec4b48..0000000000000
--- a/libclc/libspirv/lib/generic/math/fmax_common.inc
+++ /dev/null
@@ -1,12 +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_fmax_common(__CLC_GENTYPE x,
-                                                             __CLC_GENTYPE y) {
-  return (x < y) ? y : x;
-}
diff --git a/libclc/libspirv/lib/generic/math/fmin_common.inc b/libclc/libspirv/lib/generic/math/fmin_common.inc
deleted file mode 100644
index 6faa034f9d136..0000000000000
--- a/libclc/libspirv/lib/generic/math/fmin_common.inc
+++ /dev/null
@@ -1,12 +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_fmin_common(__CLC_GENTYPE x,
-                                                             __CLC_GENTYPE y) {
-  return (x < y) ? x : y;
-}