diff --git a/cmake/find_capnp.cmake b/cmake/find_capnp.cmake
index b72746b436a..abe46316676 100644
--- a/cmake/find_capnp.cmake
+++ b/cmake/find_capnp.cmake
@@ -42,7 +42,7 @@ if (ENABLE_CAPNP)
         set (CAPNP_LIBRARY capnpc)
         set (USE_CAPNP 1)
         set (CAPNP_BIN_PATH ${ClickHouse_BINARY_DIR}/contrib/capnproto/c++/src/capnp)
-        set (CAPNP_BIN_TARGET capnp_tool)
+        set (CAPNP_BIN_TARGETS capnp_tool capnpc_cpp capnpc_capnp)
     endif ()
 endif ()
 
diff --git a/dbms/src/Proto/CMakeLists.txt b/dbms/src/Proto/CMakeLists.txt
index 1f5d07089af..1e150d9f86b 100644
--- a/dbms/src/Proto/CMakeLists.txt
+++ b/dbms/src/Proto/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_custom_command (OUTPUT ServerMessage.capnp.c++ ServerMessage.capnp.h
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CMAKE_CURRENT_BINARY_DIR}/ServerMessage.capnp
     COMMAND ${CMAKE_COMMAND} -E env PATH=${CAPNP_BIN_PATH} capnp compile -I ${CAPNP_INCLUDE_DIR} -oc++ ServerMessage.capnp
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CAPNP_BIN_TARGET})
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CAPNP_BIN_TARGETS})
 
 add_library (clickhouse_proto ServerMessage.capnp.c++ protoHelpers.cpp)
 target_link_libraries (clickhouse_proto clickhouse_common_io ${CAPNP_LIBRARY})
diff --git a/dbms/src/Proto/protoHelpers.h b/dbms/src/Proto/protoHelpers.h
index 2909ebc3e9d..7cef5a28013 100644
--- a/dbms/src/Proto/protoHelpers.h
+++ b/dbms/src/Proto/protoHelpers.h
@@ -5,7 +5,7 @@ namespace DB
 {
     class Context;
     class Block;
-    class TableMetadata;
+    struct TableMetadata;
 
     Block storeTableMetadata(const TableMetadata & table_meta);
     void loadTableMetadata(const Block & block, TableMetadata & table_meta);