diff --git a/include/caosdb/file_transmission/download_request_handler.h b/include/caosdb/file_transmission/download_request_handler.h
index e4e405e1d778f673efe302dd21cdfc5e76ff1431..9c82b232bed9e0b702c38eeeeb762899a3071528 100644
--- a/include/caosdb/file_transmission/download_request_handler.h
+++ b/include/caosdb/file_transmission/download_request_handler.h
@@ -55,10 +55,10 @@
 #include "caosdb/file_transmission/file_writer.h" // for FileWriter
 #include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
 #include <cstdint>                                // for uint64_t
-#include <grpcpp/client_context.h>                 // for ClientContext
-#include <grpcpp/completion_queue.h>               // for CompletionQueue
-#include <grpcpp/support/async_stream.h>           // for ClientAsyncReader
-#include <grpcpp/support/status.h>                 // for Status
+#include <grpcpp/client_context.h>                // for ClientContext
+#include <grpcpp/completion_queue.h>              // for CompletionQueue
+#include <grpcpp/support/async_stream.h>          // for ClientAsyncReader
+#include <grpcpp/support/status.h>                // for Status
 #include <memory>                                 // for unique_ptr
 
 namespace caosdb::transaction {
diff --git a/include/caosdb/file_transmission/upload_request_handler.h b/include/caosdb/file_transmission/upload_request_handler.h
index 5da89b7c92ce6c9bfd91aae0c2555d9f8b975be8..f9d6aab9abf1800ab7e5ebece6f2f7011f86cca0 100644
--- a/include/caosdb/file_transmission/upload_request_handler.h
+++ b/include/caosdb/file_transmission/upload_request_handler.h
@@ -55,10 +55,10 @@
 #include "caosdb/file_transmission/file_reader.h" // for FileReader
 #include "caosdb/handler_interface.h"             // for HandlerTag, Handl...
 #include <cstdint>                                // for uint64_t
-#include <grpcpp/client_context.h>                 // for ClientContext
-#include <grpcpp/completion_queue.h>               // for CompletionQueue
-#include <grpcpp/support/async_stream.h>           // for ClientAsyncReader
-#include <grpcpp/support/status.h>                 // for Status
+#include <grpcpp/client_context.h>                // for ClientContext
+#include <grpcpp/completion_queue.h>              // for CompletionQueue
+#include <grpcpp/support/async_stream.h>          // for ClientAsyncReader
+#include <grpcpp/support/status.h>                // for Status
 #include <memory>                                 // for unique_ptr
 
 namespace caosdb::transaction {
diff --git a/src/caosdb/file_transmission/download_request_handler.cpp b/src/caosdb/file_transmission/download_request_handler.cpp
index b282720a9aee1a7c32837158fdfd60b1a39e5fc0..821ed79477045f4e3bf49c061cfac622b814700d 100644
--- a/src/caosdb/file_transmission/download_request_handler.cpp
+++ b/src/caosdb/file_transmission/download_request_handler.cpp
@@ -47,21 +47,21 @@
  * > DEALINGS IN THE SOFTWARE.
  */
 #include "caosdb/file_transmission/download_request_handler.h"
-#include "caosdb/logging.h"            // for CAOSDB_LOG_TRACE
-#include "caosdb/protobuf_helper.h"    // for get_arena
-#include "caosdb/status_code.h"        // for GENERIC_RPC_E...
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <exception>                   // IWYU pragma: keep
-#include <filesystem>                             // for operator<<, path
-#include <google/protobuf/arena.h>                // for Arena
-#include <grpcpp/client_context.h>                 // for ClientContext
-#include <grpcpp/completion_queue.h>               // for CompletionQueue
-#include <grpcpp/support/async_stream.h>           // for ClientAsyncReader
-#include <grpcpp/support/status.h>                 // for Status
-#include <grpcpp/support/status_code_enum.h>  // for OK
-#include <stdexcept>                              // for runtime_error
-#include <string>                                 // for string, opera...
-#include <utility>                                // for move
+#include "caosdb/logging.h"                  // for CAOSDB_LOG_TRACE
+#include "caosdb/protobuf_helper.h"          // for get_arena
+#include "caosdb/status_code.h"              // for GENERIC_RPC_E...
+#include "caosdb/transaction_status.h"       // for TransactionStatus
+#include <exception>                         // IWYU pragma: keep
+#include <filesystem>                        // for operator<<, path
+#include <google/protobuf/arena.h>           // for Arena
+#include <grpcpp/client_context.h>           // for ClientContext
+#include <grpcpp/completion_queue.h>         // for CompletionQueue
+#include <grpcpp/support/async_stream.h>     // for ClientAsyncReader
+#include <grpcpp/support/status.h>           // for Status
+#include <grpcpp/support/status_code_enum.h> // for OK
+#include <stdexcept>                         // for runtime_error
+#include <string>                            // for string, opera...
+#include <utility>                           // for move
 // IWYU pragma: no_include <bits/exception.h>
 //
 namespace caosdb::transaction {
diff --git a/src/caosdb/file_transmission/upload_request_handler.cpp b/src/caosdb/file_transmission/upload_request_handler.cpp
index 9b9a3e8500f6e1e857d9f6e603a1b08b0d80048d..32bb8132e0b4a966774c5f8111800151895b6ced 100644
--- a/src/caosdb/file_transmission/upload_request_handler.cpp
+++ b/src/caosdb/file_transmission/upload_request_handler.cpp
@@ -47,22 +47,21 @@
  * > DEALINGS IN THE SOFTWARE.
  */
 #include "caosdb/file_transmission/upload_request_handler.h"
-#include "caosdb/logging.h"            // for CAOSDB_LOG_ERROR
-#include "caosdb/protobuf_helper.h"    // for get_arena
-#include "caosdb/status_code.h"        // for GENERIC_RPC_E...
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <algorithm>                   // for min
-#include <cstdint>                     // for uint64_t
-#include <exception>                   // IWYU pragma: keep
-#include <filesystem>                             // for operator<<, path
-#include <google/protobuf/arena.h>                // for Arena
-#include <grpcpp/impl/codegen/call_op_set.h>  // for WriteOptions
-#include <grpcpp/support/status_code_enum.h>  // for OK
-#include <string>                                 // for basic_string
-#include <utility>                                // for move
+#include "caosdb/logging.h"                  // for CAOSDB_LOG_ERROR
+#include "caosdb/protobuf_helper.h"          // for get_arena
+#include "caosdb/status_code.h"              // for GENERIC_RPC_E...
+#include "caosdb/transaction_status.h"       // for TransactionStatus
+#include <algorithm>                         // for min
+#include <cstdint>                           // for uint64_t
+#include <exception>                         // IWYU pragma: keep
+#include <filesystem>                        // for operator<<, path
+#include <google/protobuf/arena.h>           // for Arena
+#include <grpcpp/impl/codegen/call_op_set.h> // for WriteOptions
+#include <grpcpp/support/status_code_enum.h> // for OK
+#include <string>                            // for basic_string
+#include <utility>                           // for move
 // IWYU pragma: no_include <bits/exception.h>
 
-
 namespace caosdb::transaction {
 using caosdb::StatusCode;
 using caosdb::utility::get_arena;
diff --git a/src/caosdb/unary_rpc_handler.cpp b/src/caosdb/unary_rpc_handler.cpp
index 14e6a427babc4ce70fdb0dd98c156bfd9276ec23..d6f970663a6a8f92a5afe4ae402e73b886a3fe0e 100644
--- a/src/caosdb/unary_rpc_handler.cpp
+++ b/src/caosdb/unary_rpc_handler.cpp
@@ -47,11 +47,11 @@
  * > DEALINGS IN THE SOFTWARE.
  */
 #include "caosdb/unary_rpc_handler.h"
-#include "caosdb/logging.h"     // for CAOSDB_LOG_TRACE
-#include "caosdb/status_code.h" // for GENERIC_RPC_E...
-#include <exception>                              // IWYU pragma: keep
-#include <grpcpp/support/status_code_enum.h>  // for OK
-#include <string>                                 // for string, opera...
+#include "caosdb/logging.h"                  // for CAOSDB_LOG_TRACE
+#include "caosdb/status_code.h"              // for GENERIC_RPC_E...
+#include <exception>                         // IWYU pragma: keep
+#include <grpcpp/support/status_code_enum.h> // for OK
+#include <string>                            // for string, opera...
 // IWYU pragma: no_include <bits/exception.h>
 
 namespace caosdb::transaction {
diff --git a/test/test_user.cpp b/test/test_user.cpp
index 7687696157a2ce57ed5404e5fd77c0488c9ef113..5715833d0f23c5e8b887a8198fe5f96324dcafd8 100644
--- a/test/test_user.cpp
+++ b/test/test_user.cpp
@@ -25,7 +25,7 @@
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRe...
 #include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, TEST
 #include <string>                  // for allocator, string
-#include <utility>                  // for move
+#include <utility>                 // for move
 
 namespace caosdb::acm {