diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index e4f628ecede26653880d2bcaeb7e94c27cf33de1..09d96f014f09a63e23a89a5156bccd38388842d4 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -114,8 +114,8 @@ private:
 /**
  * Messages convey information about the state and result of transactions.
  *
- * A Message object can be thought of as kinf of a generalized error object in other frameworks.
- * Please have a look at MessageCodes for more details.
+ * A Message object can be thought of as kinf of a generalized error object in
+ * other frameworks. Please have a look at MessageCodes for more details.
  */
 class Message {
 public:
diff --git a/include/caosdb/logging.h b/include/caosdb/logging.h
index d111f784b25468b68784f347a7d4cc067939f6d2..fcebc6df8b5db2eb9f800893f8d296d6174285ce 100644
--- a/include/caosdb/logging.h
+++ b/include/caosdb/logging.h
@@ -82,16 +82,17 @@ auto initialize_logging(const LoggingConfiguration &configuration) -> void;
  *
  * Typical inheriting configurations exist for console, files and syslog.
  *
- * When a SinkConfiguration is created from a configuration, the sink configuration must contain a
- * \p destination key which matches one of the keywords for implemented sinks.  At the moment of
- * writing this documentation, valid destinations are:
+ * When a SinkConfiguration is created from a configuration, the sink
+ * configuration must contain a \p destination key which matches one of the
+ * keywords for implemented sinks.  At the moment of writing this documentation,
+ * valid destinations are:
  *
  * \li \p file
  * \li \p console
  * \li \p syslog
  *
- * A \p level keyword sets the logging level, if it exists at the sink or logging level of the
- * configuration.
+ * A \p level keyword sets the logging level, if it exists at the sink or
+ * logging level of the configuration.
  */
 class SinkConfiguration : public LevelConfiguration {
 public:
@@ -131,8 +132,8 @@ private:
 /**
  * The file name is the destination, the directory can be set separately.
  *
- * If there is a `directory` key in the configuration, that will be used as a default, otherwise it
- * is the current directory.
+ * If there is a `directory` key in the configuration, that will be used as a
+ * default, otherwise it is the current directory.
  */
 class FileSinkConfiguration : public SinkConfiguration {
 public:
diff --git a/include/caosdb/message_code.h b/include/caosdb/message_code.h
index ca08edf32e01d8535c77e1a3a82b45914159cfd4..34a73198e41e35e5306f2ffe5a8c4efcaffbb9a4 100644
--- a/include/caosdb/message_code.h
+++ b/include/caosdb/message_code.h
@@ -31,8 +31,9 @@
  * API. Messages (and their codes) represent the state of the entities in a
  * transaction or the server.
  *
- * For a specification of the message codes, look at the protobuf documentation.  The sources and
- * documentation can be found at https://gitlab.indiscale.com/caosdb/src/caosdb-proto.
+ * For a specification of the message codes, look at the protobuf documentation.
+ * The sources and documentation can be found at
+ * https://gitlab.indiscale.com/caosdb/src/caosdb-proto.
  */
 
 namespace caosdb::entity {
diff --git a/include/caosdb/transaction_status.h b/include/caosdb/transaction_status.h
index 32465c61e80c4f0f197a54b9c867ea1eb13801e1..6c5b7a6ee30c498f15c3c25c5ec5fbc3e1d93ea0 100644
--- a/include/caosdb/transaction_status.h
+++ b/include/caosdb/transaction_status.h
@@ -26,8 +26,9 @@
  * TransactionStatus indicates the current status of a transaction and, when it
  * has already terminated, whether the transaction has been successful or not.
  *
- * A status code of 0 denotes a generic success state, positive values indicate errors, and negative
- * values indicate other states, such as different stages of a transaction in process.
+ * A status code of 0 denotes a generic success state, positive values indicate
+ * errors, and negative values indicate other states, such as different stages
+ * of a transaction in process.
  */
 
 #include "caosdb/status_code.h"
diff --git a/include/caosdb/utility.h b/include/caosdb/utility.h
index fbfc5c181755bc08993b1c50c2baad30269c4d6b..30e21747ec4ce39493e24e10e09d7c53c7ab1308 100644
--- a/include/caosdb/utility.h
+++ b/include/caosdb/utility.h
@@ -53,8 +53,7 @@ inline auto load_string_file(const path &path) -> std::string {
 /**
  * @brief Return the environment variable KEY, or FALLBACK if it does not exist.
  */
-inline auto get_env_var(const char *key, const char *fallback) -> const
-  char * {
+inline auto get_env_var(const char *key, const char *fallback) -> const char * {
   const char *val = getenv(key);
   if (val == nullptr) {
     return fallback;
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index 4ed9188f2973f2056ca8cacf7a9d86edd878b5f8..5f89af16ed3da4de89df1d83e1de0bdecb79592f 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -56,8 +56,7 @@ const char *caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE() {
   return caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE;
 }
 
-const char *caosdb_utility_get_env_var(const char *name,
-                                       const char *fallback) {
+const char *caosdb_utility_get_env_var(const char *name, const char *fallback) {
   return caosdb::utility::get_env_var(name, fallback);
 }