diff --git a/src/intel/dev/gen_wa_helpers.py b/src/intel/dev/gen_wa_helpers.py
index b0eb50d28f9..2097be9d300 100644
--- a/src/intel/dev/gen_wa_helpers.py
+++ b/src/intel/dev/gen_wa_helpers.py
@@ -54,14 +54,18 @@ HEADER_TEMPLATE = Template("""\
 #ifndef INTEL_WA_H
 #define INTEL_WA_H
 
+#ifndef __OPENCL_VERSION__
 #include "util/macros.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef __OPENCL_VERSION__
 struct intel_device_info;
 void intel_device_info_init_was(struct intel_device_info *devinfo);
+#endif
 
 enum intel_wa_steppings {
 % for a in stepping_enum:
diff --git a/src/intel/shaders/libintel_shaders.h b/src/intel/shaders/libintel_shaders.h
index 85956055994..1f5fca24fd9 100644
--- a/src/intel/shaders/libintel_shaders.h
+++ b/src/intel/shaders/libintel_shaders.h
@@ -12,6 +12,7 @@
 #include "util/macros.h"
 
 #else
+#define PRAGMA_POISON(param)
 #define BITFIELD_BIT(i) (1u << i)
 
 typedef ulong uint64_t;