diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index ac21b5aad2c1937af111cd32e71cb8fe8395d69a..21e92b1f3e37f68d90790cecc3e445bb72be6fdd 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -31,18 +31,18 @@
 #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 "caosdb/entity/v1/main.pb.h"     // for EntityTransactionSe...
-#include "linkahead/info.h"               // for VersionInfo
-#include "caosdb/info/v1/main.grpc.pb.h"  // for GeneralInfoService:...
-#include "linkahead/transaction.h"        // for Transaction
-#include "linkahead/transaction_status.h" // for TransactionStatus
-#include <filesystem>                     // for path
-#include <grpcpp/channel.h>               // for Channel
-#include <map>                            // for map
-#include <memory>                         // for shared_ptr, unique_ptr
-#include <string>                         // for string, basic_string
+#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:...
+#include "linkahead/transaction.h"         // for Transaction
+#include "linkahead/transaction_status.h"  // for TransactionStatus
+#include <filesystem>                      // for path
+#include <grpcpp/channel.h>                // for Channel
+#include <map>                             // for map
+#include <memory>                          // for shared_ptr, unique_ptr
+#include <string>                          // for string, basic_string
 #ifdef BUILD_ACM
 #include <vector> // for vector
 #endif
diff --git a/include/linkahead/constants.h.in b/include/linkahead/constants.h.in
index e4304ea04f4bb50c9904e10842be183ef8995fea..f4454553fd5be00f01ecca60e81786d58b944fbc 100644
--- a/include/linkahead/constants.h.in
+++ b/include/linkahead/constants.h.in
@@ -29,13 +29,13 @@
 namespace linkahead {
 #endif
 // clang-format off
-static const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
-static const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
-static const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
-static const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
-static const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
-static const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
-__attribute__((unused)) static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
+static const int LIBCAOSDB_VERSION_MAJOR = @liblinkahead_VERSION_MAJOR@;
+static const int LIBCAOSDB_VERSION_MINOR = @liblinkahead_VERSION_MINOR@;
+static const int LIBCAOSDB_VERSION_PATCH = @liblinkahead_VERSION_PATCH@;
+static const int COMPATIBLE_SERVER_VERSION_MAJOR = @liblinkahead_COMPATIBLE_SERVER_VERSION_MAJOR@;
+static const int COMPATIBLE_SERVER_VERSION_MINOR = @liblinkahead_COMPATIBLE_SERVER_VERSION_MINOR@;
+static const int COMPATIBLE_SERVER_VERSION_PATCH = @liblinkahead_COMPATIBLE_SERVER_VERSION_PATCH@;
+__attribute__((unused)) static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@liblinkahead_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
 
 /**
  * Precedence of configuration files from highest to lowest.
diff --git a/test/test_protobuf.cpp b/test/test_protobuf.cpp
index ed9fbf13878897aa21a1a747b2f018ab3ec72ff1..adfd5e531587958b0fbab1215d86742138bfcfb1 100644
--- a/test/test_protobuf.cpp
+++ b/test/test_protobuf.cpp
@@ -31,9 +31,9 @@
 
 namespace caosdb {
 using ProtoEntity = caosdb::entity::v1::Entity;
-using linkahead::entity::Entity;
 using caosdb::entity::v1::Message;
 using google::protobuf::Arena;
+using linkahead::entity::Entity;
 
 TEST(test_protobuf, test_swap_trivial) {
   Arena arena;
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 666775eeda8dfc742bb62ba3b239e4811bafdd9a..1e96ef79766058a84acd5154b6ac5a0d51295a4f 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -47,8 +47,8 @@ using linkahead::connection::Connection;
 using linkahead::entity::Entity;
 using linkahead::exceptions::ConnectionError;
 using ProtoEntity = caosdb::entity::v1::Entity;
-using linkahead::entity::Role;
 using caosdb::entity::v1::RetrieveResponse;
+using linkahead::entity::Role;
 
 TEST(test_transaction, create_transaction) {
   const auto *host = "localhost";