diff --git a/contrib/libprotobuf-mutator b/contrib/libprotobuf-mutator
index ffd86a32874..a304ec48dcf 160000
--- a/contrib/libprotobuf-mutator
+++ b/contrib/libprotobuf-mutator
@@ -1 +1 @@
-Subproject commit ffd86a32874e5c08a143019aad1aaf0907294c9f
+Subproject commit a304ec48dcf15d942607032151f7e9ee504b5dcf
diff --git a/contrib/libprotobuf-mutator-cmake/CMakeLists.txt b/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
index a623f95c418..9bbd6c17caa 100644
--- a/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
+++ b/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
@@ -14,8 +14,11 @@ add_library(_protobuf-mutator
     ${LIBRARY_DIR}/src/text_format.cc
     ${LIBRARY_DIR}/src/utf8_fix.cc)
 
-target_include_directories(_protobuf-mutator BEFORE INTERFACE "${LIBRARY_DIR}")
-target_include_directories(_protobuf-mutator BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/protobuf/src")
+# codegen_select_fuzzer includes <libfuzzer/libfuzzer_macro.h>...
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${LIBRARY_DIR}/src")
+# ... which includes <port/protobuf.h>
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${LIBRARY_DIR}")
+target_include_directories(_protobuf-mutator BEFORE PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/protobuf/src")
 
 target_link_libraries(_protobuf-mutator ch_contrib::protobuf)
 
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
index 3d416544419..86eb8bf36a5 100644
--- a/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
+++ b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
@@ -31,7 +31,8 @@ add_custom_command(
     DEPENDS "${CURRENT_DIR_IN_BINARY}/clickhouse.g"
 )
 
-PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS "${CURRENT_DIR_IN_BINARY}/out.proto")
+set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
+protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS "${CURRENT_DIR_IN_BINARY}/out.proto")
 set(FUZZER_SRCS codegen_select_fuzzer.cpp "${CURRENT_DIR_IN_BINARY}/out.cpp" ${PROTO_SRCS} ${PROTO_HDRS})
 
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)