diff -ura mesa.orig/src/gallium/state_trackers/clover/llvm/compat.hpp mesa.new/src/gallium/state_trackers/clover/llvm/compat.hpp
--- mesa.orig/src/gallium/state_trackers/clover/llvm/compat.hpp	2018-12-13 13:16:18.000000000 +0100
+++ mesa.new/src/gallium/state_trackers/clover/llvm/compat.hpp	2018-12-13 14:14:09.682660842 +0100
@@ -58,7 +58,7 @@
 #include <llvm/Analysis/TargetLibraryInfo.h>
 
 #include <clang/Basic/TargetInfo.h>
-#include <clang/Frontend/CodeGenOptions.h>
+#include <clang/Basic/CodeGenOptions.h>
 #include <clang/Frontend/CompilerInstance.h>
 
 namespace clover {