diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index a975c0d33f2f..c7c8dfbe1783 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -11,9 +11,6 @@
 /* Function Attributes */
 #include <clc/clcfunc.h>
 
-/* Pattern Macro Definitions */
-#include <clc/clcmacro.h>
-
 /* 6.1 Supported Data Types */
 #include <clc/clctypes.h>
 
diff --git a/libclc/generic/include/clc/clcmacro.h b/libclc/generic/lib/clcmacro.h
similarity index 100%
rename from libclc/generic/include/clc/clcmacro.h
rename to libclc/generic/lib/clcmacro.h
diff --git a/libclc/generic/lib/common/sign.cl b/libclc/generic/lib/common/sign.cl
index 070abd55db66..25832e0b4f8b 100644
--- a/libclc/generic/lib/common/sign.cl
+++ b/libclc/generic/lib/common/sign.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 #define SIGN(TYPE, F) \
 _CLC_DEF _CLC_OVERLOAD TYPE sign(TYPE x) { \
diff --git a/libclc/generic/lib/integer/add_sat.cl b/libclc/generic/lib/integer/add_sat.cl
index 7eb4e3974efa..d4df66db3ede 100644
--- a/libclc/generic/lib/integer/add_sat.cl
+++ b/libclc/generic/lib/integer/add_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From add_sat.ll
 _CLC_DECL char   __clc_add_sat_s8(char, char);
diff --git a/libclc/generic/lib/integer/clz.cl b/libclc/generic/lib/integer/clz.cl
index 83ef2dd800cf..17e3fe014741 100644
--- a/libclc/generic/lib/integer/clz.cl
+++ b/libclc/generic/lib/integer/clz.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From clz.ll
 _CLC_DECL char   __clc_clz_s8(char);
diff --git a/libclc/generic/lib/integer/sub_sat.cl b/libclc/generic/lib/integer/sub_sat.cl
index 9555b6d71795..6b42cc86a74c 100644
--- a/libclc/generic/lib/integer/sub_sat.cl
+++ b/libclc/generic/lib/integer/sub_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From sub_sat.ll
 _CLC_DECL char   __clc_sub_sat_s8(char, char);
diff --git a/libclc/generic/lib/math/clc_nextafter.cl b/libclc/generic/lib/math/clc_nextafter.cl
index 92b990d13831..e53837d179fb 100644
--- a/libclc/generic/lib/math/clc_nextafter.cl
+++ b/libclc/generic/lib/math/clc_nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // This file provides OpenCL C implementations of nextafter for targets that
 // don't support the clang builtin.
diff --git a/libclc/generic/lib/math/nextafter.cl b/libclc/generic/lib/math/nextafter.cl
index 1a7f1699bdc0..cbe54cd4e266 100644
--- a/libclc/generic/lib/math/nextafter.cl
+++ b/libclc/generic/lib/math/nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __builtin_nextafterf, float, float)
 
diff --git a/libclc/generic/lib/math/pown.cl b/libclc/generic/lib/math/pown.cl
index 46b354b5eaa0..f3b27d4ccab7 100644
--- a/libclc/generic/lib/math/pown.cl
+++ b/libclc/generic/lib/math/pown.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_BINARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, pown, float, int)
 
diff --git a/libclc/generic/lib/relational/isnan.cl b/libclc/generic/lib/relational/isnan.cl
index 1a64f67dbd21..ab5d58a92088 100644
--- a/libclc/generic/lib/relational/isnan.cl
+++ b/libclc/generic/lib/relational/isnan.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_UNARY_BUILTIN(int, isnan, __builtin_isnan, float)
 
diff --git a/libclc/r600/lib/math/nextafter.cl b/libclc/r600/lib/math/nextafter.cl
index 54bed5f04a0a..4611c81ae91e 100644
--- a/libclc/r600/lib/math/nextafter.cl
+++ b/libclc/r600/lib/math/nextafter.cl
@@ -1,3 +1,4 @@
 #include <clc/clc.h>
+#include "../lib/clcmacro.h"
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __clc_nextafter, float, float)