diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index 21e92b1f3e37f68d90790cecc3e445bb72be6fdd..43e92469cd61aa9e4a6fcc49a6c52b509ea0ff4c 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -31,8 +31,8 @@
 #include "linkahead/acm/user.h"               // for User
 #include "caosdb/acm/v1alpha1/main.grpc.pb.h" // for AccessControlMan...
 #endif
-#include "linkahead/authentication.h" // for Authenticator
-#include "linkahead/configuration.h"  // for ConnectionConfigura...
+#include "linkahead/authentication.h"      // for Authenticator
+#include "linkahead/configuration.h"       // for ConnectionConfigura...
 #include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransactionSe...
 #include "linkahead/info.h"                // for VersionInfo
 #include "caosdb/info/v1/main.grpc.pb.h"   // for GeneralInfoService:...
diff --git a/include/linkahead/file_transmission/download_request_handler.h b/include/linkahead/file_transmission/download_request_handler.h
index 387a6b08eb00051c61e363ef51a9450f6f75853d..10ccea9c5c88413dedce8f3e18dd55a656f88558 100644
--- a/include/linkahead/file_transmission/download_request_handler.h
+++ b/include/linkahead/file_transmission/download_request_handler.h
@@ -51,7 +51,7 @@
 
 #include "linkahead/file_descriptor.h"               // for FileDescriptor
 #include "caosdb/entity/v1/main.pb.h"                // for FileTransmissionS...
-#include "caosdb/entity/v1/main.pb.h"                // for FileDownloadResponse
+#include "caosdb/entity/v1/main.grpc.pb.h"           // for FileDownloadResponse
 #include "linkahead/file_transmission/file_writer.h" // for FileWriter
 #include "linkahead/handler_interface.h"             // for HandlerTag, Handl...
 #include <cstdint>                                   // for uint64_t
diff --git a/include/linkahead/file_transmission/register_file_upload_handler.h b/include/linkahead/file_transmission/register_file_upload_handler.h
index 5b4afe7bb6a45629b4cfacbe97cfd4bc340c86b2..a8f3283d2f119173977149d29d3979a33b550bd0 100644
--- a/include/linkahead/file_transmission/register_file_upload_handler.h
+++ b/include/linkahead/file_transmission/register_file_upload_handler.h
@@ -50,7 +50,7 @@
 #define CAOSDB_FILE_TRANSMISSION_REGISTER_FILE_UPLOAD_H
 
 #include "caosdb/entity/v1/main.pb.h"        // for FileTransmissionS...
-#include "caosdb/entity/v1/main.pb.h"        // for FileDownloadResponse
+#include "caosdb/entity/v1/main.grpc.pb.h"   // for FileDownloadResponse
 #include "linkahead/handler_interface.h"     // for HandlerTag, Handl...
 #include "linkahead/unary_rpc_handler.h"     // for  UnaryRpcHandler
 #include <grpcpp/completion_queue.h>         // for CompletionQueue
diff --git a/include/linkahead/file_transmission/upload_request_handler.h b/include/linkahead/file_transmission/upload_request_handler.h
index f6a79857594ecab9df6b622587c307b61f896d46..82d749803248d380506badb87a1fa68092ddeb5d 100644
--- a/include/linkahead/file_transmission/upload_request_handler.h
+++ b/include/linkahead/file_transmission/upload_request_handler.h
@@ -50,6 +50,7 @@
 #define CAOSDB_FILE_TRANSMISSION_UPLOAD_REQUEST_HANDLER_H
 
 #include "caosdb/entity/v1/main.pb.h"                // for FileTransmissionS...
+#include "caosdb/entity/v1/main.grpc.pb.h"           // for FileTransmissionS...
 #include "linkahead/file_descriptor.h"               // for FileDescriptor
 #include "linkahead/file_transmission/file_reader.h" // for FileReader
 #include "linkahead/handler_interface.h"             // for HandlerTag, Handl...
diff --git a/include/linkahead/transaction.h b/include/linkahead/transaction.h
index 61ac3d609ed14d1b9107de245d4f2bc36ed84a2a..ff768917fbfa0d53febee933756f548ccfdced51 100644
--- a/include/linkahead/transaction.h
+++ b/include/linkahead/transaction.h
@@ -23,7 +23,7 @@
 
 #include "linkahead/entity.h"               // for Entity, FileDe...
 #include "caosdb/entity/v1/main.pb.h"       // for EntityTransact...
-#include "caosdb/entity/v1/main.pb.h"       // for MultiTransacti...
+#include "caosdb/entity/v1/main.grpc.pb.h"  // for MultiTransacti...
 #include "linkahead/file_descriptor.h"      // for FileDescriptor
 #include "linkahead/handler_interface.h"    // for HandlerInterface
 #include "linkahead/transaction_handler.h"  // for EntityTransactionHandler
diff --git a/include/linkahead/transaction_handler.h b/include/linkahead/transaction_handler.h
index cec7d71f1161e8cf8a288302da72769a996caffe..eb22c1447858b89d55a22f8b36b5162fa7998e66 100644
--- a/include/linkahead/transaction_handler.h
+++ b/include/linkahead/transaction_handler.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "caosdb/entity/v1/main.pb.h"        // for FileTransmissionS...
-#include "caosdb/entity/v1/main.pb.h"        // for FileDownloadResponse
+#include "caosdb/entity/v1/main.grpc.pb.h"   // for FileDownloadResponse
 #include "linkahead/handler_interface.h"     // for HandlerTag
 #include "linkahead/unary_rpc_handler.h"     // for HandlerTag, Handl...
 #include <grpcpp/completion_queue.h>         // for CompletionQueue