diff --git a/src/backend/codegen/utils/clang_compiler.cc b/src/backend/codegen/utils/clang_compiler.cc
index ecec8a3116ae011e5dde2799e9928393e4b80e7d..91aa9732f7be6166aab2414afb055f826c40f0ce 100644
--- a/src/backend/codegen/utils/clang_compiler.cc
+++ b/src/backend/codegen/utils/clang_compiler.cc
@@ -33,7 +33,7 @@
 #include "codegen/utils/temporary_file.h"
 #endif
 
-#include "clang/Codegen/CodegenAction.h"
+#include "clang/CodeGen/CodeGenAction.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Module.h"
diff --git a/src/backend/codegen/utils/codegen_utils.cc b/src/backend/codegen/utils/codegen_utils.cc
index d2b96e4ea9a230f3668270a4c87a30176f948d2a..1418650a30fb4c22650da4d282589a313864aa6f 100644
--- a/src/backend/codegen/utils/codegen_utils.cc
+++ b/src/backend/codegen/utils/codegen_utils.cc
@@ -40,7 +40,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
-#include "llvm/Support/Codegen.h"
+#include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/TargetSelect.h"
diff --git a/src/test/unit/mock/gpcodegen_mock.c b/src/test/unit/mock/gpcodegen_mock.c
index 813b5070f175f3443190332cf0b39c5a6b1caf5b..1bf84d3fbc93dec67ef2234507493607dbf7d75b 100644
--- a/src/test/unit/mock/gpcodegen_mock.c
+++ b/src/test/unit/mock/gpcodegen_mock.c
@@ -13,7 +13,7 @@ InitCodegen()
 
 // creates a manager for an operator
 void*
-CodeGeneratorManagerCreate()
+CodeGeneratorManagerCreate(const char* module_name)
 {
 	elog(ERROR, "mock implementation of CodeGeneratorManager_Create called");
 	return NULL;