diff --git a/clang-tools-extra/clangd/index/remote/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/CMakeLists.txt
@@ -18,6 +18,9 @@
     protobuf
     grpc++
     clangDaemon
+
+    DEPENDS
+    RemoteIndexProtos
     )
 
   add_subdirectory(marshalling)
diff --git a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
@@ -6,4 +6,7 @@
 
   protobuf
   clangDaemon
+
+  DEPENDS
+  RemoteIndexProtos
   )
diff --git a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
@@ -4,6 +4,9 @@
   )
 add_clang_executable(clangd-index-server
   Server.cpp
+
+  DEPENDS
+  RemoteIndexProtos
   )
 target_link_libraries(clangd-index-server
   PRIVATE