uncrustify as demanded.

118 files changed, 5005 insertions, 5506 deletions

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 399b34962..2e94e8c02 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -37,8 +37,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * This is the structure describing an DNS exit service.
  */
-struct GNUNET_DNS_Advertisement
-{
+struct GNUNET_DNS_Advertisement {
   /**
    * Signature of the peer affirming that it is offering the service.
    */
@@ -59,7 +58,6 @@ struct GNUNET_DNS_Advertisement
    * The peer providing this service
    */
   struct GNUNET_PeerIdentity peer;
-
 };
 GNUNET_NETWORK_STRUCT_END
 
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index b5c8d71d4..fb651909a 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -47,9 +47,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * @brief universal block for keyword and namespace search results
  */
-struct UBlock
-{
-
+struct UBlock {
   /**
    * Signature using pseudonym and search keyword / identifier.
    */
@@ -72,7 +70,6 @@ struct UBlock
   /* 0-terminated URI here */
 
   /* variable-size Meta-Data follows here */
-
 };
 
 
@@ -81,8 +78,7 @@ struct UBlock
  *        can be obtained directly from reading
  *        the plaintext file)
  */
-struct OnDemandBlock
-{
+struct OnDemandBlock {
   /**
    * Hash code of the entire content of the
    * file that was indexed (used to uniquely
@@ -95,7 +91,6 @@ struct OnDemandBlock
    * this on-demand encoded block? (in NBO)
    */
   uint64_t offset GNUNET_PACKED;
-
 };
 GNUNET_NETWORK_STRUCT_END
 
diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 499655977..e29785cdf 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file
@@ -31,7 +31,7 @@
 extern "C"
 {
 #if 0
-  /* keep Emacsens' auto-indent happy */
+/* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -46,9 +46,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * @brief Block to announce a peer accepting a state.
  */
-struct RegexAcceptBlock
-{
-
+struct RegexAcceptBlock {
   /**
    * Accept blocks must be signed.  Signature
    * goes over expiration time and key.
diff --git a/src/include/compat.h b/src/include/compat.h
index b24d09653..1a1103a81 100644
--- a/src/include/compat.h
+++ b/src/include/compat.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Martin Schanzenbach
@@ -33,7 +33,7 @@ extern "C"
 {
 #endif
 
-  /**
+/**
  * memrchr as defined in glibc
  *
  * @param s pointer to memory
@@ -41,11 +41,11 @@ extern "C"
  * @param n search character limit
  */
 void*
-GN_memrchr_ (const void *s,
-             int c,
-             size_t n);
+GN_memrchr_(const void *s,
+            int c,
+            size_t n);
 #ifndef HAVE_MEMRCHR
-#define memrchr(s,c,n) GN_memrchr_(s,c,n)
+#define memrchr(s, c, n) GN_memrchr_(s, c, n)
 #endif
 
 #ifdef __cplusplus
diff --git a/src/include/gauger.h b/src/include/gauger.h
index 54ba7f1f7..d23883742 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -17,67 +17,67 @@
 #include <stdio.h>
 #include <sys/wait.h>
 
-#define GAUGER(category, counter, value, unit)\
-{\
-    char* __gauger_v[10];\
-    char __gauger_s[32];\
-    pid_t __gauger_p;\
-    if(!(__gauger_p=fork())){\
-        close (1);           \
-        close (2);           \
-        if(!fork()){\
-            sprintf(__gauger_s,"%Lf", (long double) (value));\
-            __gauger_v[0] = "gauger";\
-            __gauger_v[1] = "-n";\
-            __gauger_v[2] = (char*) (counter);  \
-            __gauger_v[3] = "-d";\
-            __gauger_v[4] = __gauger_s;\
-            __gauger_v[5] = "-u";\
-            __gauger_v[6] = (char*) (unit);     \
-            __gauger_v[7] = "-c";\
-            __gauger_v[8] = (char*) (category); \
-            __gauger_v[9] = (char*) NULL;\
-            execvp("gauger",__gauger_v);\
-            _exit(1);\
-        }else{\
-            _exit(0);\
-        }\
-    }else{\
-        waitpid(__gauger_p,NULL,0);\
-    }\
-}
+#define GAUGER(category, counter, value, unit) \
+  { \
+    char* __gauger_v[10]; \
+    char __gauger_s[32]; \
+    pid_t __gauger_p; \
+    if (!(__gauger_p = fork())) { \
+        close(1);           \
+        close(2);           \
+        if (!fork()) { \
+            sprintf(__gauger_s, "%Lf", (long double)(value)); \
+            __gauger_v[0] = "gauger"; \
+            __gauger_v[1] = "-n"; \
+            __gauger_v[2] = (char*)(counter);  \
+            __gauger_v[3] = "-d"; \
+            __gauger_v[4] = __gauger_s; \
+            __gauger_v[5] = "-u"; \
+            __gauger_v[6] = (char*)(unit);     \
+            __gauger_v[7] = "-c"; \
+            __gauger_v[8] = (char*)(category); \
+            __gauger_v[9] = (char*)NULL; \
+            execvp("gauger", __gauger_v); \
+            _exit(1); \
+          }else{ \
+            _exit(0); \
+          } \
+      }else{ \
+        waitpid(__gauger_p, NULL, 0); \
+      } \
+  }
 
-#define GAUGER_ID(category, counter, value, unit, id)\
-{\
-    char* __gauger_v[12];\
-    char __gauger_s[32];\
-    pid_t __gauger_p;\
-    if(!(__gauger_p=fork())){\
-        close (1);           \
-        close (2);           \
-        if(!fork()){\
-            sprintf(__gauger_s,"%Lf", (long double) (value));\
-            __gauger_v[0] = "gauger";\
-            __gauger_v[1] = "-n";\
-            __gauger_v[2] = (char*) (counter);  \
-            __gauger_v[3] = "-d";\
-            __gauger_v[4] = __gauger_s;\
-            __gauger_v[5] = "-u";\
-            __gauger_v[6] = (char*) (unit);     \
-            __gauger_v[7] = "-i";\
-            __gauger_v[8] = id;\
-            __gauger_v[9] = "-c";\
-            __gauger_v[10] = (char *) (category);       \
-            __gauger_v[11] = (char *) NULL;\
-            execvp("gauger",__gauger_v);\
-            _exit(1);\
-        }else{\
-            _exit(0);\
-        }\
-    }else{\
-        waitpid(__gauger_p, NULL, 0);\
-    }\
-}
+#define GAUGER_ID(category, counter, value, unit, id) \
+  { \
+    char* __gauger_v[12]; \
+    char __gauger_s[32]; \
+    pid_t __gauger_p; \
+    if (!(__gauger_p = fork())) { \
+        close(1);           \
+        close(2);           \
+        if (!fork()) { \
+            sprintf(__gauger_s, "%Lf", (long double)(value)); \
+            __gauger_v[0] = "gauger"; \
+            __gauger_v[1] = "-n"; \
+            __gauger_v[2] = (char*)(counter);  \
+            __gauger_v[3] = "-d"; \
+            __gauger_v[4] = __gauger_s; \
+            __gauger_v[5] = "-u"; \
+            __gauger_v[6] = (char*)(unit);     \
+            __gauger_v[7] = "-i"; \
+            __gauger_v[8] = id; \
+            __gauger_v[9] = "-c"; \
+            __gauger_v[10] = (char *)(category);       \
+            __gauger_v[11] = (char *)NULL; \
+            execvp("gauger", __gauger_v); \
+            _exit(1); \
+          }else{ \
+            _exit(0); \
+          } \
+      }else{ \
+        waitpid(__gauger_p, NULL, 0); \
+      } \
+  }
 
 #else /* WINDOWS */
 
@@ -85,25 +85,25 @@
 #include <stdio.h>
 #include <windef.h>
 
-#define GAUGER(category, counter, value, unit)\
-{\
-    char __gauger_commandline[MAX_PATH];\
+#define GAUGER(category, counter, value, unit) \
+  { \
+    char __gauger_commandline[MAX_PATH]; \
     \
-    snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"",\
-              (counter), (long double) (value), (unit), (category));    \
-    __gauger_commandline[MAX_PATH - 1] = '\0';\
-    system (__gauger_commandline);\
-}
+    snprintf(__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"", \
+             (counter), (long double)(value), (unit), (category));    \
+    __gauger_commandline[MAX_PATH - 1] = '\0'; \
+    system(__gauger_commandline); \
+  }
 
-#define GAUGER_ID(category, counter, value, unit, id)\
-{\
-    char __gauger_commandline[MAX_PATH];\
+#define GAUGER_ID(category, counter, value, unit, id) \
+  { \
+    char __gauger_commandline[MAX_PATH]; \
     \
-    snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"",\
-              (counter), (long double) (value), (unit), (id), (category)); \
-    __gauger_commandline[MAX_PATH - 1] = '\0';\
-    system (__gauger_commandline);\
-}
+    snprintf(__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"", \
+             (counter), (long double)(value), (unit), (id), (category)); \
+    __gauger_commandline[MAX_PATH - 1] = '\0'; \
+    system(__gauger_commandline); \
+  }
 
 #endif // WINDOWS
 
diff --git a/src/include/gettext.h b/src/include/gettext.h
index 9a5be728f..1eb6cee93 100644
--- a/src/include/gettext.h
+++ b/src/include/gettext.h
@@ -42,20 +42,20 @@
    for invalid uses of the value returned from these functions.
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
-#define gettext(Msgid) ((const char *) (Msgid))
-#define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-#define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+#define gettext(Msgid) ((const char *)(Msgid))
+#define dgettext(Domainname, Msgid) ((const char *)(Msgid))
+#define dcgettext(Domainname, Msgid, Category) ((const char *)(Msgid))
 #define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+  ((N) == 1 ? (const char *)(Msgid1) : (const char *)(Msgid2))
 #define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+  ((N) == 1 ? (const char *)(Msgid1) : (const char *)(Msgid2))
 #define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+  ((N) == 1 ? (const char *)(Msgid1) : (const char *)(Msgid2))
 /* slight modification here to avoid warnings: generate GNUNET_NO code,
    not even the cast... */
 #define textdomain(Domainname)
 #define bindtextdomain(Domainname, Dirname)
-#define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+#define bind_textdomain_codeset(Domainname, Codeset) ((const char *)(Codeset))
 
 #endif
 
diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h
index 89129ea32..1988f4dec 100644
--- a/src/include/gnunet_abe_lib.h
+++ b/src/include/gnunet_abe_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file include/gnunet_abe_lib.h
@@ -60,7 +60,7 @@ struct GNUNET_CRYPTO_AbeKey;
  * @return fresh private key; free using #GNUNET_ABE_cpabe_delete_master_key
  */
 struct GNUNET_ABE_AbeMasterKey *
-GNUNET_ABE_cpabe_create_master_key (void);
+GNUNET_ABE_cpabe_create_master_key(void);
 
 /**
  * @ingroup abe
@@ -70,7 +70,7 @@ GNUNET_ABE_cpabe_create_master_key (void);
  * @return fresh private key; free using #GNUNET_free
  */
 void
-GNUNET_ABE_cpabe_delete_master_key (struct GNUNET_ABE_AbeMasterKey *key);
+GNUNET_ABE_cpabe_delete_master_key(struct GNUNET_ABE_AbeMasterKey *key);
 
 /**
  * @ingroup abe
@@ -81,8 +81,8 @@ GNUNET_ABE_cpabe_delete_master_key (struct GNUNET_ABE_AbeMasterKey *key);
  * @return fresh private key; free using #GNUNET_ABE_cpabe_delete_key
  */
 struct GNUNET_ABE_AbeKey *
-GNUNET_ABE_cpabe_create_key (struct GNUNET_ABE_AbeMasterKey *key,
-                                char **attrs);
+GNUNET_ABE_cpabe_create_key(struct GNUNET_ABE_AbeMasterKey *key,
+                            char **attrs);
 
 /**
  * @ingroup abe
@@ -93,8 +93,8 @@ GNUNET_ABE_cpabe_create_key (struct GNUNET_ABE_AbeMasterKey *key,
  * @return fresh private key; free using #GNUNET_free
  */
 void
-GNUNET_ABE_cpabe_delete_key (struct GNUNET_ABE_AbeKey *key,
-                                int delete_pub);
+GNUNET_ABE_cpabe_delete_key(struct GNUNET_ABE_AbeKey *key,
+                            int delete_pub);
 
 
 /**
@@ -109,11 +109,11 @@ GNUNET_ABE_cpabe_delete_key (struct GNUNET_ABE_AbeKey *key,
  * @return the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_ABE_cpabe_encrypt (const void *block,
-                             size_t size,
-                             const char *policy,
-                             const struct GNUNET_ABE_AbeMasterKey *key,
-                             void **result);
+GNUNET_ABE_cpabe_encrypt(const void *block,
+                         size_t size,
+                         const char *policy,
+                         const struct GNUNET_ABE_AbeMasterKey *key,
+                         void **result);
 
 /**
  * @ingroup abe
@@ -126,10 +126,10 @@ GNUNET_ABE_cpabe_encrypt (const void *block,
  * @return the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_ABE_cpabe_decrypt (const void *block,
-                             size_t size,
-                             const struct GNUNET_ABE_AbeKey *key,
-                             void **result);
+GNUNET_ABE_cpabe_decrypt(const void *block,
+                         size_t size,
+                         const struct GNUNET_ABE_AbeKey *key,
+                         void **result);
 
 /**
  * @ingroup abe
@@ -140,8 +140,8 @@ GNUNET_ABE_cpabe_decrypt (const void *block,
  * @return the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_ABE_cpabe_serialize_key (const struct GNUNET_ABE_AbeKey *key,
-                                   void **result);
+GNUNET_ABE_cpabe_serialize_key(const struct GNUNET_ABE_AbeKey *key,
+                               void **result);
 
 /**
  * @ingroup abe
@@ -152,8 +152,8 @@ GNUNET_ABE_cpabe_serialize_key (const struct GNUNET_ABE_AbeKey *key,
  * @return the ABE key. NULL of unsuccessful
  */
 struct GNUNET_ABE_AbeKey*
-GNUNET_ABE_cpabe_deserialize_key (const void *data,
-                                     size_t len);
+GNUNET_ABE_cpabe_deserialize_key(const void *data,
+                                 size_t len);
 
 /**
  * @ingroup abe
@@ -164,8 +164,8 @@ GNUNET_ABE_cpabe_deserialize_key (const void *data,
  * @return the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_ABE_cpabe_serialize_master_key (const struct GNUNET_ABE_AbeMasterKey *key,
-                                          void **result);
+GNUNET_ABE_cpabe_serialize_master_key(const struct GNUNET_ABE_AbeMasterKey *key,
+                                      void **result);
 
 /**
  * @ingroup abe
@@ -176,8 +176,8 @@ GNUNET_ABE_cpabe_serialize_master_key (const struct GNUNET_ABE_AbeMasterKey *key
  * @return the ABE key. NULL of unsuccessful
  */
 struct GNUNET_ABE_AbeMasterKey*
-GNUNET_ABE_cpabe_deserialize_master_key (const void *data,
-                                            size_t len);
+GNUNET_ABE_cpabe_deserialize_master_key(const void *data,
+                                        size_t len);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h
index 493e1f53e..1e2ac59f7 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 1f9d250d0..faf89128f 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -54,8 +54,7 @@ extern "C"
 /**
  * Statuses of the requests that client can send to ARM.
  */
-enum GNUNET_ARM_RequestStatus
-{
+enum GNUNET_ARM_RequestStatus {
   /**
    * Message was sent successfully.
    */
@@ -65,15 +64,13 @@ enum GNUNET_ARM_RequestStatus
    * We disconnected from ARM, and request was not sent.
    */
   GNUNET_ARM_REQUEST_DISCONNECTED = 2
-
 };
 
 
 /**
  * Statuses of services.
  */
-enum GNUNET_ARM_ServiceStatus
-{
+enum GNUNET_ARM_ServiceStatus {
   /**
    * Dummy message.
    */
@@ -99,8 +96,7 @@ enum GNUNET_ARM_ServiceStatus
 /**
  * Replies to ARM requests
  */
-enum GNUNET_ARM_Result
-{
+enum GNUNET_ARM_Result {
   /**
    * Service was stopped (never sent for ARM itself).
    */
@@ -222,9 +218,9 @@ typedef void
  * @return context to use for further ARM operations, NULL on error.
  */
 struct GNUNET_ARM_Handle *
-GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_ARM_ConnectionStatusCallback conn_status,
-                    void *conn_status_cls);
+GNUNET_ARM_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                   GNUNET_ARM_ConnectionStatusCallback conn_status,
+                   void *conn_status_cls);
 
 
 /**
@@ -233,7 +229,7 @@ GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h the handle that was being used
  */
 void
-GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h);
+GNUNET_ARM_disconnect(struct GNUNET_ARM_Handle *h);
 
 
 /**
@@ -243,7 +239,7 @@ GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h);
  * @param op operation to cancel
  */
 void
-GNUNET_ARM_operation_cancel (struct GNUNET_ARM_Operation *op);
+GNUNET_ARM_operation_cancel(struct GNUNET_ARM_Operation *op);
 
 
 /**
@@ -255,9 +251,9 @@ GNUNET_ARM_operation_cancel (struct GNUNET_ARM_Operation *op);
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
-                                 GNUNET_ARM_ServiceListCallback cont,
-                                 void *cont_cls);
+GNUNET_ARM_request_service_list(struct GNUNET_ARM_Handle *h,
+                                GNUNET_ARM_ServiceListCallback cont,
+                                void *cont_cls);
 
 
 /**
@@ -275,10 +271,10 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                 const char *service_name,
-                                 GNUNET_ARM_ResultCallback cont,
-                                 void *cont_cls);
+GNUNET_ARM_request_service_stop(struct GNUNET_ARM_Handle *h,
+                                const char *service_name,
+                                GNUNET_ARM_ResultCallback cont,
+                                void *cont_cls);
 
 
 /**
@@ -292,11 +288,11 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-                                  const char *service_name,
-                                  enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                                  GNUNET_ARM_ResultCallback cont,
-                                  void *cont_cls);
+GNUNET_ARM_request_service_start(struct GNUNET_ARM_Handle *h,
+                                 const char *service_name,
+                                 enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                                 GNUNET_ARM_ResultCallback cont,
+                                 void *cont_cls);
 
 
 /**
@@ -330,9 +326,9 @@ typedef void
  * @return context to use for further ARM monitor operations, NULL on error.
  */
 struct GNUNET_ARM_MonitorHandle *
-GNUNET_ARM_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          GNUNET_ARM_ServiceStatusCallback cont,
-                          void *cont_cls);
+GNUNET_ARM_monitor_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                         GNUNET_ARM_ServiceStatusCallback cont,
+                         void *cont_cls);
 
 
 /**
@@ -341,7 +337,7 @@ GNUNET_ARM_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h the handle that was being used
  */
 void
-GNUNET_ARM_monitor_stop (struct GNUNET_ARM_MonitorHandle *h);
+GNUNET_ARM_monitor_stop(struct GNUNET_ARM_MonitorHandle *h);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_ats_application_service.h b/src/include/gnunet_ats_application_service.h
index fbc6f48ac..f11807f22 100644
--- a/src/include/gnunet_ats_application_service.h
+++ b/src/include/gnunet_ats_application_service.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet.
- Copyright (C) 2010-2015, 2018 GNUnet e.V.
+   This file is part of GNUnet.
+   Copyright (C) 2010-2015, 2018 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -51,7 +51,7 @@ struct GNUNET_ATS_ApplicationHandle;
  * @return ats application handle, NULL on error
  */
 struct GNUNET_ATS_ApplicationHandle *
-GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_ATS_application_init(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -60,7 +60,7 @@ GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param ch handle to destroy
  */
 void
-GNUNET_ATS_application_done (struct GNUNET_ATS_ApplicationHandle *ch);
+GNUNET_ATS_application_done(struct GNUNET_ATS_ApplicationHandle *ch);
 
 
 /**
@@ -82,10 +82,10 @@ struct GNUNET_ATS_ApplicationSuggestHandle;
  * @return suggestion handle, NULL if request is already pending
  */
 struct GNUNET_ATS_ApplicationSuggestHandle *
-GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch,
-                                const struct GNUNET_PeerIdentity *peer,
-                                enum GNUNET_MQ_PreferenceKind pk,
-                                struct GNUNET_BANDWIDTH_Value32NBO bw);
+GNUNET_ATS_application_suggest(struct GNUNET_ATS_ApplicationHandle *ch,
+                               const struct GNUNET_PeerIdentity *peer,
+                               enum GNUNET_MQ_PreferenceKind pk,
+                               struct GNUNET_BANDWIDTH_Value32NBO bw);
 
 
 /**
@@ -94,7 +94,7 @@ GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch,
  * @param sh handle
  */
 void
-GNUNET_ATS_application_suggest_cancel (struct GNUNET_ATS_ApplicationSuggestHandle *sh);
+GNUNET_ATS_application_suggest_cancel(struct GNUNET_ATS_ApplicationSuggestHandle *sh);
 
 /** @} */  /* end of group */
 
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index da00f277c..e2f052678 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet
- Copyright (C) 2009-2015 GNUnet e.V.
+   This file is part of GNUnet
+   Copyright (C) 2009-2015 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -163,9 +163,7 @@ typedef void
  * Each solver is required to set up and return an instance
  * of this struct during initialization.
  */
-struct GNUNET_ATS_SolverFunctions
-{
-
+struct GNUNET_ATS_SolverFunctions {
   /**
    * Closure to pass to all solver functions in this struct.
    */
@@ -248,8 +246,7 @@ struct GNUNET_ATS_SolverFunctions
  * #GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP
  *
  */
-enum GAS_Solver_Operation
-{
+enum GAS_Solver_Operation {
   /**
    * A solution iteration has been started
    */
@@ -311,8 +308,7 @@ enum GAS_Solver_Operation
 /**
  * Status of a GAS_Solver_Operation operation
  */
-enum GAS_Solver_Status
-{
+enum GAS_Solver_Status {
   /**
    * Success
    */
@@ -328,8 +324,7 @@ enum GAS_Solver_Status
 /**
  * Status of the operation
  */
-enum GAS_Solver_Additional_Information
-{
+enum GAS_Solver_Additional_Information {
   /**
    * No more specific information
    */
@@ -416,8 +411,7 @@ typedef unsigned int
  * of this type as to the initialization function
  * of the ATS plugins.
  */
-struct GNUNET_ATS_PluginEnvironment
-{
+struct GNUNET_ATS_PluginEnvironment {
   /**
    * Configuration handle to be used by the solver
    */
diff --git a/src/include/gnunet_ats_plugin_new.h b/src/include/gnunet_ats_plugin_new.h
index 633343272..f9005ee73 100644
--- a/src/include/gnunet_ats_plugin_new.h
+++ b/src/include/gnunet_ats_plugin_new.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet
- Copyright (C) 2009-2015, 2018 GNUnet e.V.
+   This file is part of GNUnet
+   Copyright (C) 2009-2015, 2018 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -47,7 +47,6 @@
  * Preference being expressed by an application client.
  */
 struct GNUNET_ATS_Preference {
-
   /**
    * Peer to get address suggestions for.
    */
@@ -74,7 +73,6 @@ struct GNUNET_ATS_Session;
  * Plugin-relevant information about a session.
  */
 struct GNUNET_ATS_SessionData {
-
   /**
    * Peer the session is with.
    */
@@ -89,12 +87,11 @@ struct GNUNET_ATS_SessionData {
    * Handle to the session that has the given properties.
    */
   struct GNUNET_ATS_Session *session;
-  
+
   /**
    * Is the session inbound only?
    */
   int inbound_only;
-  
 };
 
 /**
@@ -116,9 +113,7 @@ struct GNUNET_ATS_SessionHandle;
  * Each solver is required to set up and return an instance
  * of this struct during initialization.
  */
-struct GNUNET_ATS_SolverFunctions
-{
-
+struct GNUNET_ATS_SolverFunctions {
   /**
    * Closure to pass to all solver functions in this struct.
    */
@@ -133,20 +128,20 @@ struct GNUNET_ATS_SolverFunctions
    */
   struct GNUNET_ATS_PreferenceHandle *
   (*preference_add)(void *cls,
-                    const struct GNUNET_ATS_Preference *pref);
+                    const struct GNUNET_ATS_Preference *pref);
 
   /**
    * The plugin should end respecting a preference.
    *
    * @param cls the closure
-   * @param ph whatever @e preference_add returned 
+   * @param ph whatever @e preference_add returned
    * @param pref the preference to delete
    * @return plugin's internal representation, or NULL
    */
   void
-  (*preference_del)(void *cls,              
-                    struct GNUNET_ATS_PreferenceHandle *ph,
-                    const struct GNUNET_ATS_Preference *pref);
+  (*preference_del)(void *cls,
+                    struct GNUNET_ATS_PreferenceHandle *ph,
+                    const struct GNUNET_ATS_Preference *pref);
 
   /**
    * Transport established a new session with performance
@@ -159,8 +154,8 @@ struct GNUNET_ATS_SolverFunctions
    */
   struct GNUNET_ATS_SessionHandle *
   (*session_add)(void *cls,
-                 const struct GNUNET_ATS_SessionData *data,
-                 const char *address);
+                 const struct GNUNET_ATS_SessionData *data,
+                 const char *address);
 
   /**
    * @a data changed for a given @a sh, solver should consider
@@ -172,8 +167,8 @@ struct GNUNET_ATS_SolverFunctions
    */
   void
   (*session_update)(void *cls,
-                    struct GNUNET_ATS_SessionHandle *sh,
-                    const struct GNUNET_ATS_SessionData *data);
+                    struct GNUNET_ATS_SessionHandle *sh,
+                    const struct GNUNET_ATS_SessionData *data);
 
   /**
    * A session went away. Solver should update accordingly.
@@ -184,9 +179,8 @@ struct GNUNET_ATS_SolverFunctions
    */
   void
   (*session_del)(void *cls,
-                 struct GNUNET_ATS_SessionHandle *sh,
-                 const struct GNUNET_ATS_SessionData *data);
-  
+                 struct GNUNET_ATS_SessionHandle *sh,
+                 const struct GNUNET_ATS_SessionData *data);
 };
 
 
@@ -195,8 +189,7 @@ struct GNUNET_ATS_SolverFunctions
  * of this type as to the initialization function
  * of the ATS plugins.
  */
-struct GNUNET_ATS_PluginEnvironment
-{
+struct GNUNET_ATS_PluginEnvironment {
   /**
    * Configuration handle to be used by the solver
    */
@@ -222,11 +215,11 @@ struct GNUNET_ATS_PluginEnvironment
    */
   void
   (*suggest_cb) (void *cls,
-                 const struct GNUNET_PeerIdentity *pid,
-                 const char *address);
+                 const struct GNUNET_PeerIdentity *pid,
+                 const char *address);
 
   /**
-   * Tell the transport that it should allocate the given 
+   * Tell the transport that it should allocate the given
    * bandwidth to the specified session.
    *
    * @param cls closure, NULL
@@ -237,15 +230,14 @@ struct GNUNET_ATS_PluginEnvironment
    */
   void
   (*allocate_cb) (void *cls,
-                  struct GNUNET_ATS_Session *session,
-                  const struct GNUNET_PeerIdentity *peer,
-                  struct GNUNET_BANDWIDTH_Value32NBO bw_in,
-                  struct GNUNET_BANDWIDTH_Value32NBO bw_out);
-  
+                  struct GNUNET_ATS_Session *session,
+                  const struct GNUNET_PeerIdentity *peer,
+                  struct GNUNET_BANDWIDTH_Value32NBO bw_in,
+                  struct GNUNET_BANDWIDTH_Value32NBO bw_out);
 };
 
 
-  
+
 #endif
 
 /** @} */  /* end of group */
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 7ea624f5e..a226c7b55 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet.
- Copyright (C) 2010-2015 GNUnet e.V.
+   This file is part of GNUnet.
+   Copyright (C) 2010-2015 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -68,9 +68,7 @@
 /**
  * ATS performance characteristics for an address.
  */
-struct GNUNET_ATS_Properties
-{
-
+struct GNUNET_ATS_Properties {
   /**
    * Delay.  Time between when the time packet is sent and the packet
    * arrives.  FOREVER if we did not measure yet.
@@ -104,7 +102,6 @@ struct GNUNET_ATS_Properties
    * This property does not change.
    */
   enum GNUNET_NetworkType scope;
-
 };
 
 
@@ -112,9 +109,7 @@ struct GNUNET_ATS_Properties
  * ATS performance characteristics for an address in
  * network byte order (for IPC).
  */
-struct GNUNET_ATS_PropertiesNBO
-{
-
+struct GNUNET_ATS_PropertiesNBO {
   /**
    * Actual traffic on this connection from this peer to the other peer.
    * Includes transport overhead.
@@ -148,7 +143,6 @@ struct GNUNET_ATS_PropertiesNBO
    * arrives.  FOREVER if we did not measure yet.
    */
   struct GNUNET_TIME_RelativeNBO delay;
-
 };
 
 
@@ -164,8 +158,8 @@ struct GNUNET_ATS_PropertiesNBO
  * @param hbo value read
  */
 void
-GNUNET_ATS_properties_hton (struct GNUNET_ATS_PropertiesNBO *nbo,
-                            const struct GNUNET_ATS_Properties *hbo);
+GNUNET_ATS_properties_hton(struct GNUNET_ATS_PropertiesNBO *nbo,
+                           const struct GNUNET_ATS_Properties *hbo);
 
 
 /**
@@ -175,8 +169,8 @@ GNUNET_ATS_properties_hton (struct GNUNET_ATS_PropertiesNBO *nbo,
  * @param nbo value read
  */
 void
-GNUNET_ATS_properties_ntoh (struct GNUNET_ATS_Properties *hbo,
-                            const struct GNUNET_ATS_PropertiesNBO *nbo);
+GNUNET_ATS_properties_ntoh(struct GNUNET_ATS_Properties *hbo,
+                           const struct GNUNET_ATS_PropertiesNBO *nbo);
 
 
 
@@ -201,7 +195,7 @@ struct GNUNET_ATS_ConnectivitySuggestHandle;
  * @return ats connectivity handle, NULL on error
  */
 struct GNUNET_ATS_ConnectivityHandle *
-GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_ATS_connectivity_init(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -210,7 +204,7 @@ GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param ch handle to destroy
  */
 void
-GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch);
+GNUNET_ATS_connectivity_done(struct GNUNET_ATS_ConnectivityHandle *ch);
 
 
 /**
@@ -223,9 +217,9 @@ GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch);
  * @return suggestion handle, NULL if request is already pending
  */
 struct GNUNET_ATS_ConnectivitySuggestHandle *
-GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
-                                 const struct GNUNET_PeerIdentity *peer,
-                                 uint32_t strength);
+GNUNET_ATS_connectivity_suggest(struct GNUNET_ATS_ConnectivityHandle *ch,
+                                const struct GNUNET_PeerIdentity *peer,
+                                uint32_t strength);
 
 
 /**
@@ -234,7 +228,7 @@ GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
  * @param sh handle
  */
 void
-GNUNET_ATS_connectivity_suggest_cancel (struct GNUNET_ATS_ConnectivitySuggestHandle *sh);
+GNUNET_ATS_connectivity_suggest_cancel(struct GNUNET_ATS_ConnectivitySuggestHandle *sh);
 
 
 /* ******************************** Scheduling API ***************************** */
@@ -284,9 +278,9 @@ typedef void
  * @return ats context
  */
 struct GNUNET_ATS_SchedulingHandle *
-GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            GNUNET_ATS_AddressSuggestionCallback suggest_cb,
-                            void *suggest_cb_cls);
+GNUNET_ATS_scheduling_init(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           GNUNET_ATS_AddressSuggestionCallback suggest_cb,
+                           void *suggest_cb_cls);
 
 
 /**
@@ -295,7 +289,7 @@ GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param sh handle to release
  */
 void
-GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh);
+GNUNET_ATS_scheduling_done(struct GNUNET_ATS_SchedulingHandle *sh);
 
 
 /**
@@ -317,10 +311,10 @@ struct GNUNET_ATS_AddressRecord;
  *         address is invalid)
  */
 struct GNUNET_ATS_AddressRecord *
-GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
-                        const struct GNUNET_HELLO_Address *address,
-                        struct GNUNET_ATS_Session *session,
-                        const struct GNUNET_ATS_Properties *prop);
+GNUNET_ATS_address_add(struct GNUNET_ATS_SchedulingHandle *sh,
+                       const struct GNUNET_HELLO_Address *address,
+                       struct GNUNET_ATS_Session *session,
+                       const struct GNUNET_ATS_Properties *prop);
 
 
 /**
@@ -330,8 +324,8 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
  * @param session session handle
  */
 void
-GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
-                                struct GNUNET_ATS_Session *session);
+GNUNET_ATS_address_add_session(struct GNUNET_ATS_AddressRecord *ar,
+                               struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -347,8 +341,8 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
  *                    use it still to establish a new session
  */
 int
-GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
-                                struct GNUNET_ATS_Session *session);
+GNUNET_ATS_address_del_session(struct GNUNET_ATS_AddressRecord *ar,
+                               struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -365,8 +359,8 @@ GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
  * @param prop performance data for the address
  */
 void
-GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar,
-                           const struct GNUNET_ATS_Properties *prop);
+GNUNET_ATS_address_update(struct GNUNET_ATS_AddressRecord *ar,
+                          const struct GNUNET_ATS_Properties *prop);
 
 
 /**
@@ -376,7 +370,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar,
  *           expired and ATS may no longer use it
  */
 void
-GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar);
+GNUNET_ATS_address_destroy(struct GNUNET_ATS_AddressRecord *ar);
 
 
 
@@ -422,14 +416,14 @@ struct GNUNET_ATS_AddressListHandle;
  *
  * @param cfg configuration to use
  * @param addr_info_cb callback called when performance characteristics for
- *      an address change
+ *      an address change
  * @param addr_info_cb_cls closure for @a addr_info_cb
  * @return ats performance context
  */
 struct GNUNET_ATS_PerformanceHandle *
-GNUNET_ATS_performance_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                             GNUNET_ATS_AddressInformationCallback addr_info_cb,
-                             void *addr_info_cb_cls);
+GNUNET_ATS_performance_init(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                            GNUNET_ATS_AddressInformationCallback addr_info_cb,
+                            void *addr_info_cb_cls);
 
 
 /**
@@ -445,11 +439,11 @@ GNUNET_ATS_performance_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return handle to abort the operation
  */
 struct GNUNET_ATS_AddressListHandle *
-GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph,
-                                       const struct GNUNET_PeerIdentity *peer,
-                                       int all,
-                                       GNUNET_ATS_AddressInformationCallback infocb,
-                                       void *infocb_cls);
+GNUNET_ATS_performance_list_addresses(struct GNUNET_ATS_PerformanceHandle *ph,
+                                      const struct GNUNET_PeerIdentity *peer,
+                                      int all,
+                                      GNUNET_ATS_AddressInformationCallback infocb,
+                                      void *infocb_cls);
 
 
 /**
@@ -458,7 +452,7 @@ GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph,
  * @param alh the `struct GNUNET_ATS_AddressListHandle` handle to cancel
  */
 void
-GNUNET_ATS_performance_list_addresses_cancel (struct GNUNET_ATS_AddressListHandle *alh);
+GNUNET_ATS_performance_list_addresses_cancel(struct GNUNET_ATS_AddressListHandle *alh);
 
 
 /**
@@ -467,7 +461,7 @@ GNUNET_ATS_performance_list_addresses_cancel (struct GNUNET_ATS_AddressListHandl
  * @param ph handle
  */
 void
-GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph);
+GNUNET_ATS_performance_done(struct GNUNET_ATS_PerformanceHandle *ph);
 
 
 /**
@@ -508,11 +502,11 @@ struct GNUNET_ATS_ReservationContext;
  * @deprecated will be replaced soon
  */
 struct GNUNET_ATS_ReservationContext *
-GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph,
-                              const struct GNUNET_PeerIdentity *peer,
-                              int32_t amount,
-                              GNUNET_ATS_ReservationCallback rcb,
-                              void *rcb_cls);
+GNUNET_ATS_reserve_bandwidth(struct GNUNET_ATS_PerformanceHandle *ph,
+                             const struct GNUNET_PeerIdentity *peer,
+                             int32_t amount,
+                             GNUNET_ATS_ReservationCallback rcb,
+                             void *rcb_cls);
 
 
 /**
@@ -521,25 +515,23 @@ GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph,
  * @param rc context returned by the original GNUNET_ATS_reserve_bandwidth call
  */
 void
-GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc);
+GNUNET_ATS_reserve_bandwidth_cancel(struct GNUNET_ATS_ReservationContext *rc);
 
 
 /**
  * ATS preference types as array initializer
  */
-#define GNUNET_ATS_PreferenceType {GNUNET_ATS_PREFERENCE_BANDWIDTH, GNUNET_ATS_PREFERENCE_LATENCY, GNUNET_ATS_PREFERENCE_END}
+#define GNUNET_ATS_PreferenceType { GNUNET_ATS_PREFERENCE_BANDWIDTH, GNUNET_ATS_PREFERENCE_LATENCY, GNUNET_ATS_PREFERENCE_END }
 
 /**
  * ATS preference types as string array initializer
  */
-#define GNUNET_ATS_PreferenceTypeString {"BANDWIDTH", "LATENCY", "END" }
+#define GNUNET_ATS_PreferenceTypeString { "BANDWIDTH", "LATENCY", "END" }
 
 /**
  * Enum defining all known preference categories.
  */
-enum GNUNET_ATS_PreferenceKind
-{
-
+enum GNUNET_ATS_PreferenceKind {
   /**
    * Change the peer's bandwidth value (value per byte of bandwidth in
    * the goal function) to the given amount.  The argument is followed
@@ -561,7 +553,6 @@ enum GNUNET_ATS_PreferenceKind
    * End of preference list.
    */
   GNUNET_ATS_PREFERENCE_END = 2
-
 };
 
 
@@ -572,7 +563,7 @@ enum GNUNET_ATS_PreferenceKind
  * @return a string or NULL if invalid
  */
 const char *
-GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type);
+GNUNET_ATS_print_preference_type(enum GNUNET_ATS_PreferenceKind type);
 
 
 /**
@@ -584,9 +575,9 @@ GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type);
  * desired changes
  */
 void
-GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *ph,
-                                          const struct GNUNET_PeerIdentity *peer,
-                                          ...);
+GNUNET_ATS_performance_change_preference(struct GNUNET_ATS_PerformanceHandle *ph,
+                                         const struct GNUNET_PeerIdentity *peer,
+                                         ...);
 
 
 /**
@@ -607,10 +598,10 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *p
  * @param ... #GNUNET_ATS_PREFERENCE_END-terminated specification of the desired changes
  */
 void
-GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
-                                      const struct GNUNET_PeerIdentity *peer,
-                                      const struct GNUNET_TIME_Relative scope,
-                                      ...);
+GNUNET_ATS_performance_give_feedback(struct GNUNET_ATS_PerformanceHandle *ph,
+                                     const struct GNUNET_PeerIdentity *peer,
+                                     const struct GNUNET_TIME_Relative scope,
+                                     ...);
 
 #endif
 
diff --git a/src/include/gnunet_ats_transport_service.h b/src/include/gnunet_ats_transport_service.h
index 287f0600d..67138ae92 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet.
- Copyright (C) 2010-2015, 2018 GNUnet e.V.
+   This file is part of GNUnet.
+   Copyright (C) 2010-2015, 2018 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -43,9 +43,7 @@
 /**
  * ATS performance characteristics for a session.
  */
-struct GNUNET_ATS_Properties
-{
-
+struct GNUNET_ATS_Properties {
   /**
    * Delay.  Time between when the time packet is sent and the packet
    * arrives.  FOREVER if we did not (successfully) measure yet.
@@ -106,7 +104,6 @@ struct GNUNET_ATS_Properties
    * What characteristics does this communicator have?
    */
   enum GNUNET_TRANSPORT_CommunicatorCharacteristics cc;
-
 };
 
 
@@ -166,11 +163,11 @@ typedef void
  * @return ats context
  */
 struct GNUNET_ATS_TransportHandle *
-GNUNET_ATS_transport_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                           GNUNET_ATS_AllocationCallback alloc_cb,
-                           void *alloc_cb_cls,
-                           GNUNET_ATS_SuggestionCallback suggest_cb,
-                           void *suggest_cb_cls);
+GNUNET_ATS_transport_init(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                          GNUNET_ATS_AllocationCallback alloc_cb,
+                          void *alloc_cb_cls,
+                          GNUNET_ATS_SuggestionCallback suggest_cb,
+                          void *suggest_cb_cls);
 
 
 /**
@@ -179,7 +176,7 @@ GNUNET_ATS_transport_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param ath handle to release
  */
 void
-GNUNET_ATS_transport_done (struct GNUNET_ATS_TransportHandle *ath);
+GNUNET_ATS_transport_done(struct GNUNET_ATS_TransportHandle *ath);
 
 
 /**
@@ -203,11 +200,11 @@ struct GNUNET_ATS_SessionRecord;
  *         session is invalid)
  */
 struct GNUNET_ATS_SessionRecord *
-GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath,
-                        const struct GNUNET_PeerIdentity *pid,
-                        const char *address,
-                        struct GNUNET_ATS_Session *session,
-                        const struct GNUNET_ATS_Properties *prop);
+GNUNET_ATS_session_add(struct GNUNET_ATS_TransportHandle *ath,
+                       const struct GNUNET_PeerIdentity *pid,
+                       const char *address,
+                       struct GNUNET_ATS_Session *session,
+                       const struct GNUNET_ATS_Properties *prop);
 
 
 /**
@@ -218,8 +215,8 @@ GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath,
  * @param prop performance data for the session
  */
 void
-GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar,
-                           const struct GNUNET_ATS_Properties *prop);
+GNUNET_ATS_session_update(struct GNUNET_ATS_SessionRecord *ar,
+                          const struct GNUNET_ATS_Properties *prop);
 
 
 /**
@@ -230,7 +227,7 @@ GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar,
  * @param ar session record to drop
  */
 void
-GNUNET_ATS_session_del (struct GNUNET_ATS_SessionRecord *ar);
+GNUNET_ATS_session_del(struct GNUNET_ATS_SessionRecord *ar);
 
 
 #endif
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index f941624af..945c0321a 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -47,8 +47,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * 32-bit bandwidth used for network exchange by GNUnet, in bytes per second.
  */
-struct GNUNET_BANDWIDTH_Value32NBO
-{
+struct GNUNET_BANDWIDTH_Value32NBO {
   /**
    * The actual value (bytes per second).
    */
@@ -83,8 +82,7 @@ typedef void (*GNUNET_BANDWIDTH_ExcessNotificationCallback) (void *cls);
  * structures (reducing malloc-ing); however, values should not be
  * accessed directly by clients (hence the '__').
  */
-struct GNUNET_BANDWIDTH_Tracker
-{
+struct GNUNET_BANDWIDTH_Tracker {
   /**
    * Closure for @e update_cb.
    */
@@ -140,7 +138,7 @@ struct GNUNET_BANDWIDTH_Tracker
 /**
  * Convenience definition to use for 0-bandwidth.
  */
-#define GNUNET_BANDWIDTH_ZERO GNUNET_BANDWIDTH_value_init (0)
+#define GNUNET_BANDWIDTH_ZERO GNUNET_BANDWIDTH_value_init(0)
 
 
 /**
@@ -150,13 +148,13 @@ struct GNUNET_BANDWIDTH_Tracker
  * @return the new bandwidth value
  */
 struct GNUNET_BANDWIDTH_Value32NBO
-GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second);
+GNUNET_BANDWIDTH_value_init(uint32_t bytes_per_second);
 
 
 /**
  * Maximum possible bandwidth value.
  */
-#define GNUNET_BANDWIDTH_VALUE_MAX GNUNET_BANDWIDTH_value_init (UINT32_MAX)
+#define GNUNET_BANDWIDTH_VALUE_MAX GNUNET_BANDWIDTH_value_init(UINT32_MAX)
 
 
 /**
@@ -168,7 +166,7 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second);
  * @return number of bytes available at bps until deadline
  */
 uint64_t
-GNUNET_BANDWIDTH_value_get_available_until (
+GNUNET_BANDWIDTH_value_get_available_until(
   struct GNUNET_BANDWIDTH_Value32NBO bps,
   struct GNUNET_TIME_Relative deadline);
 
@@ -182,8 +180,8 @@ GNUNET_BANDWIDTH_value_get_available_until (
  * @return how long it would take
  */
 struct GNUNET_TIME_Relative
-GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps,
-                                      uint64_t size);
+GNUNET_BANDWIDTH_value_get_delay_for(struct GNUNET_BANDWIDTH_Value32NBO bps,
+                                     uint64_t size);
 
 
 /**
@@ -194,8 +192,8 @@ GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps,
  * @return the min of b1 and b2
  */
 struct GNUNET_BANDWIDTH_Value32NBO
-GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1,
-                            struct GNUNET_BANDWIDTH_Value32NBO b2);
+GNUNET_BANDWIDTH_value_min(struct GNUNET_BANDWIDTH_Value32NBO b1,
+                           struct GNUNET_BANDWIDTH_Value32NBO b2);
 
 
 /**
@@ -206,8 +204,8 @@ GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1,
  * @return the min of b1 and b2
  */
 struct GNUNET_BANDWIDTH_Value32NBO
-GNUNET_BANDWIDTH_value_max (struct GNUNET_BANDWIDTH_Value32NBO b1,
-                            struct GNUNET_BANDWIDTH_Value32NBO b2);
+GNUNET_BANDWIDTH_value_max(struct GNUNET_BANDWIDTH_Value32NBO b1,
+                           struct GNUNET_BANDWIDTH_Value32NBO b2);
 
 
 /**
@@ -218,8 +216,8 @@ GNUNET_BANDWIDTH_value_max (struct GNUNET_BANDWIDTH_Value32NBO b1,
  * @return the sum of b1 and b2
  */
 struct GNUNET_BANDWIDTH_Value32NBO
-GNUNET_BANDWIDTH_value_sum (struct GNUNET_BANDWIDTH_Value32NBO b1,
-                            struct GNUNET_BANDWIDTH_Value32NBO b2);
+GNUNET_BANDWIDTH_value_sum(struct GNUNET_BANDWIDTH_Value32NBO b1,
+                           struct GNUNET_BANDWIDTH_Value32NBO b2);
 
 
 /**
@@ -239,7 +237,7 @@ GNUNET_BANDWIDTH_value_sum (struct GNUNET_BANDWIDTH_Value32NBO b1,
  *        may accumulate before it expires
  */
 void
-GNUNET_BANDWIDTH_tracker_init (
+GNUNET_BANDWIDTH_tracker_init(
   struct GNUNET_BANDWIDTH_Tracker *av,
   GNUNET_BANDWIDTH_TrackerUpdateCallback update_cb,
   void *update_cb_cls,
@@ -266,7 +264,7 @@ GNUNET_BANDWIDTH_tracker_init (
  * @param excess_cb_cls closure for @a excess_cb
  */
 void
-GNUNET_BANDWIDTH_tracker_init2 (
+GNUNET_BANDWIDTH_tracker_init2(
   struct GNUNET_BANDWIDTH_Tracker *av,
   GNUNET_BANDWIDTH_TrackerUpdateCallback update_cb,
   void *update_cb_cls,
@@ -282,7 +280,7 @@ GNUNET_BANDWIDTH_tracker_init2 (
  * @param av the respective trackers
  */
 void
-GNUNET_BANDWIDTH_tracker_notification_stop (
+GNUNET_BANDWIDTH_tracker_notification_stop(
   struct GNUNET_BANDWIDTH_Tracker *av);
 
 
@@ -298,8 +296,8 @@ GNUNET_BANDWIDTH_tracker_notification_stop (
  * @return #GNUNET_YES if this consumption is above the limit
  */
 int
-GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
-                                  ssize_t size);
+GNUNET_BANDWIDTH_tracker_consume(struct GNUNET_BANDWIDTH_Tracker *av,
+                                 ssize_t size);
 
 
 /**
@@ -312,8 +310,8 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
  * @return time to wait for consumption to be OK
  */
 struct GNUNET_TIME_Relative
-GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
-                                    size_t size);
+GNUNET_BANDWIDTH_tracker_get_delay(struct GNUNET_BANDWIDTH_Tracker *av,
+                                   size_t size);
 
 
 /**
@@ -324,7 +322,7 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
  * @return number of bytes available for consumption right now
  */
 int64_t
-GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av);
+GNUNET_BANDWIDTH_tracker_get_available(struct GNUNET_BANDWIDTH_Tracker *av);
 
 
 /**
@@ -334,7 +332,7 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av);
  * @param bytes_per_second_limit new limit to assume
  */
 void
-GNUNET_BANDWIDTH_tracker_update_quota (
+GNUNET_BANDWIDTH_tracker_update_quota(
   struct GNUNET_BANDWIDTH_Tracker *av,
   struct GNUNET_BANDWIDTH_Value32NBO bytes_per_second_limit);
 
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index e90e85832..a1fd0e6ac 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -55,7 +55,7 @@ struct GNUNET_BIO_ReadHandle;
  * @return IO handle on success, NULL on error
  */
 struct GNUNET_BIO_ReadHandle *
-GNUNET_BIO_read_open (const char *fn);
+GNUNET_BIO_read_open(const char *fn);
 
 
 /**
@@ -67,7 +67,7 @@ GNUNET_BIO_read_open (const char *fn);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg);
+GNUNET_BIO_read_close(struct GNUNET_BIO_ReadHandle *h, char **emsg);
 
 
 /**
@@ -80,8 +80,8 @@ GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h, const char *what,
-                 void *result, size_t len);
+GNUNET_BIO_read(struct GNUNET_BIO_ReadHandle *h, const char *what,
+                void *result, size_t len);
 
 
 /**
@@ -95,9 +95,9 @@ GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
-                    const char *file, int line,
-                    void *result, size_t len);
+GNUNET_BIO_read_fn(struct GNUNET_BIO_ReadHandle *h,
+                   const char *file, int line,
+                   void *result, size_t len);
 
 /**
  * Read 0-terminated string from a file.
@@ -110,8 +110,8 @@ GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h, const char *what,
-                        char **result, size_t max_length);
+GNUNET_BIO_read_string(struct GNUNET_BIO_ReadHandle *h, const char *what,
+                       char **result, size_t max_length);
 
 
 /**
@@ -123,8 +123,8 @@ GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
-                           struct GNUNET_CONTAINER_MetaData **result);
+GNUNET_BIO_read_meta_data(struct GNUNET_BIO_ReadHandle *h, const char *what,
+                          struct GNUNET_CONTAINER_MetaData **result);
 
 
 /**
@@ -133,7 +133,7 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @param h hande to open file
  * @param f address of float to read
  */
-#define GNUNET_BIO_read_float(h, f) (GNUNET_BIO_read_fn (h, __FILE__, __LINE__, f, sizeof(float)))
+#define GNUNET_BIO_read_float(h, f) (GNUNET_BIO_read_fn(h, __FILE__, __LINE__, f, sizeof(float)))
 
 
 
@@ -143,7 +143,7 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @param h hande to open file
  * @param f address of double to read
  */
-#define GNUNET_BIO_read_double(h, f) (GNUNET_BIO_read_fn (h, __FILE__, __LINE__, f, sizeof(double)))
+#define GNUNET_BIO_read_double(h, f) (GNUNET_BIO_read_fn(h, __FILE__, __LINE__, f, sizeof(double)))
 
 
 /**
@@ -156,8 +156,8 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
-                         int line, int32_t * i);
+GNUNET_BIO_read_int32__(struct GNUNET_BIO_ReadHandle *h, const char *file,
+                        int line, int32_t * i);
 
 
 /**
@@ -166,7 +166,7 @@ GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
  * @param h hande to open file
  * @param i address of 32-bit integer to read
  */
-#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__ (h, __FILE__, __LINE__, (int32_t*) i)
+#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__(h, __FILE__, __LINE__, (int32_t*)i)
 
 
 /**
@@ -179,8 +179,8 @@ GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
-                         int line, int64_t * i);
+GNUNET_BIO_read_int64__(struct GNUNET_BIO_ReadHandle *h, const char *file,
+                        int line, int64_t * i);
 
 
 /**
@@ -189,7 +189,7 @@ GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h, const char *file,
  * @param h hande to open file
  * @param i address of 64-bit integer to read
  */
-#define GNUNET_BIO_read_int64(h, i) GNUNET_BIO_read_int64__ (h, __FILE__, __LINE__, (int64_t*) i)
+#define GNUNET_BIO_read_int64(h, i) GNUNET_BIO_read_int64__(h, __FILE__, __LINE__, (int64_t*)i)
 
 
 /**
@@ -204,7 +204,7 @@ struct GNUNET_BIO_WriteHandle;
  * @return IO handle on success, NULL on error
  */
 struct GNUNET_BIO_WriteHandle *
-GNUNET_BIO_write_open (const char *fn);
+GNUNET_BIO_write_open(const char *fn);
 
 
 /**
@@ -214,7 +214,7 @@ GNUNET_BIO_write_open (const char *fn);
  * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
  */
 int
-GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h);
+GNUNET_BIO_write_close(struct GNUNET_BIO_WriteHandle *h);
 
 
 /**
@@ -226,8 +226,8 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_write (struct GNUNET_BIO_WriteHandle *h, const void *buffer,
-                  size_t n);
+GNUNET_BIO_write(struct GNUNET_BIO_WriteHandle *h, const void *buffer,
+                 size_t n);
 
 
 /**
@@ -238,7 +238,7 @@ GNUNET_BIO_write (struct GNUNET_BIO_WriteHandle *h, const void *buffer,
  *           the file is closed
  */
 int
-GNUNET_BIO_flush (struct GNUNET_BIO_WriteHandle *h);
+GNUNET_BIO_flush(struct GNUNET_BIO_WriteHandle *h);
 
 
 /**
@@ -249,7 +249,7 @@ GNUNET_BIO_flush (struct GNUNET_BIO_WriteHandle *h);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_write_string (struct GNUNET_BIO_WriteHandle *h, const char *s);
+GNUNET_BIO_write_string(struct GNUNET_BIO_WriteHandle *h, const char *s);
 
 
 /**
@@ -260,8 +260,8 @@ GNUNET_BIO_write_string (struct GNUNET_BIO_WriteHandle *h, const char *s);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
-                            const struct GNUNET_CONTAINER_MetaData *m);
+GNUNET_BIO_write_meta_data(struct GNUNET_BIO_WriteHandle *h,
+                           const struct GNUNET_CONTAINER_MetaData *m);
 
 
 
@@ -271,7 +271,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  * @param h hande to open file
  * @param f float to write (must be a variable)
  */
-#define GNUNET_BIO_write_float(h, f) GNUNET_BIO_write (h, &f, sizeof(float))
+#define GNUNET_BIO_write_float(h, f) GNUNET_BIO_write(h, &f, sizeof(float))
 
 
 
@@ -281,7 +281,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  * @param h hande to open file
  * @param f double to write (must be a variable)
  */
-#define GNUNET_BIO_write_double(h, f) GNUNET_BIO_write (h, &f, sizeof(double))
+#define GNUNET_BIO_write_double(h, f) GNUNET_BIO_write(h, &f, sizeof(double))
 
 
 /**
@@ -292,7 +292,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_write_int32 (struct GNUNET_BIO_WriteHandle *h, int32_t i);
+GNUNET_BIO_write_int32(struct GNUNET_BIO_WriteHandle *h, int32_t i);
 
 
 /**
@@ -303,7 +303,7 @@ GNUNET_BIO_write_int32 (struct GNUNET_BIO_WriteHandle *h, int32_t i);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BIO_write_int64 (struct GNUNET_BIO_WriteHandle *h, int64_t i);
+GNUNET_BIO_write_int64(struct GNUNET_BIO_WriteHandle *h, int64_t i);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h
index 777ef7dd6..91d193015 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -57,8 +57,8 @@ extern "C"
  * @return must be a power of two and smaller or equal to 2^15.
  */
 size_t
-GNUNET_BLOCK_GROUP_compute_bloomfilter_size (unsigned int entry_count,
-                                             unsigned int k);
+GNUNET_BLOCK_GROUP_compute_bloomfilter_size(unsigned int entry_count,
+                                            unsigned int k);
 
 
 /**
@@ -75,13 +75,13 @@ GNUNET_BLOCK_GROUP_compute_bloomfilter_size (unsigned int entry_count,
  *         by this @a type of block (this is not an error)
  */
 struct GNUNET_BLOCK_Group *
-GNUNET_BLOCK_GROUP_bf_create (void *cls,
-                              size_t bf_size,
-                              unsigned int bf_k,
-                              enum GNUNET_BLOCK_Type type,
-                              uint32_t nonce,
-                              const void *raw_data,
-                              size_t raw_data_size);
+GNUNET_BLOCK_GROUP_bf_create(void *cls,
+                             size_t bf_size,
+                             unsigned int bf_k,
+                             enum GNUNET_BLOCK_Type type,
+                             uint32_t nonce,
+                             const void *raw_data,
+                             size_t raw_data_size);
 
 
 /**
@@ -95,8 +95,8 @@ GNUNET_BLOCK_GROUP_bf_create (void *cls,
  *         #GNUNET_NO if @a hc was definitively not in @bg (but now is)
  */
 int
-GNUNET_BLOCK_GROUP_bf_test_and_set (struct GNUNET_BLOCK_Group *bg,
-                                    const struct GNUNET_HashCode *hc);
+GNUNET_BLOCK_GROUP_bf_test_and_set(struct GNUNET_BLOCK_Group *bg,
+                                   const struct GNUNET_HashCode *hc);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index c85d3702b..29b64759c 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -44,8 +44,7 @@ extern "C"
 /**
  * Blocks in the datastore and the datacache must have a unique type.
  */
-enum GNUNET_BLOCK_Type
-{
+enum GNUNET_BLOCK_Type {
   /**
    * Any type of block, used as a wildcard when searching.  Should
    * never be attached to a specific block.
@@ -143,9 +142,7 @@ enum GNUNET_BLOCK_Type
 /**
  * Flags that can be set to control the evaluation.
  */
-enum GNUNET_BLOCK_EvaluationOptions
-{
-
+enum GNUNET_BLOCK_EvaluationOptions {
   /**
    * Default behavior.
    */
@@ -162,8 +159,7 @@ enum GNUNET_BLOCK_EvaluationOptions
 /**
  * Possible ways for how a block may relate to a query.
  */
-enum GNUNET_BLOCK_EvaluationResult
-{
+enum GNUNET_BLOCK_EvaluationResult {
   /**
    * Valid result, and there may be more.
    */
@@ -222,9 +218,9 @@ struct GNUNET_BLOCK_Context;
  * @param hc where to store the result.
  */
 void
-GNUNET_BLOCK_mingle_hash (const struct GNUNET_HashCode *in,
-                          uint32_t mingle_number,
-                          struct GNUNET_HashCode *hc);
+GNUNET_BLOCK_mingle_hash(const struct GNUNET_HashCode *in,
+                         uint32_t mingle_number,
+                         struct GNUNET_HashCode *hc);
 
 
 /**
@@ -234,7 +230,7 @@ GNUNET_BLOCK_mingle_hash (const struct GNUNET_HashCode *in,
  * @return NULL on error
  */
 struct GNUNET_BLOCK_Context *
-GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_BLOCK_context_create(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -243,7 +239,7 @@ GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param ctx context to destroy
  */
 void
-GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx);
+GNUNET_BLOCK_context_destroy(struct GNUNET_BLOCK_Context *ctx);
 
 
 /**
@@ -267,12 +263,12 @@ struct GNUNET_BLOCK_Group;
  *         by this @a type of block (this is not an error)
  */
 struct GNUNET_BLOCK_Group *
-GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
-                           enum GNUNET_BLOCK_Type type,
-                           uint32_t nonce,
-                           const void *raw_data,
-                           size_t raw_data_size,
-                           ...);
+GNUNET_BLOCK_group_create(struct GNUNET_BLOCK_Context *ctx,
+                          enum GNUNET_BLOCK_Type type,
+                          uint32_t nonce,
+                          const void *raw_data,
+                          size_t raw_data_size,
+                          ...);
 
 
 /**
@@ -286,10 +282,10 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
  *         supported, #GNUNET_SYSERR on error
  */
 int
-GNUNET_BLOCK_group_serialize (struct GNUNET_BLOCK_Group *bg,
-                              uint32_t *nonce,
-                              void **raw_data,
-                              size_t *raw_data_size);
+GNUNET_BLOCK_group_serialize(struct GNUNET_BLOCK_Group *bg,
+                             uint32_t *nonce,
+                             void **raw_data,
+                             size_t *raw_data_size);
 
 
 /**
@@ -298,7 +294,7 @@ GNUNET_BLOCK_group_serialize (struct GNUNET_BLOCK_Group *bg,
  * @param bg group to destroy, NULL is allowed
  */
 void
-GNUNET_BLOCK_group_destroy (struct GNUNET_BLOCK_Group *bg);
+GNUNET_BLOCK_group_destroy(struct GNUNET_BLOCK_Group *bg);
 
 
 /**
@@ -320,15 +316,15 @@ GNUNET_BLOCK_group_destroy (struct GNUNET_BLOCK_Group *bg);
  * @return characterization of result
  */
 enum GNUNET_BLOCK_EvaluationResult
-GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
-                       enum GNUNET_BLOCK_Type type,
-                       struct GNUNET_BLOCK_Group *group,
-                       enum GNUNET_BLOCK_EvaluationOptions eo,
-                       const struct GNUNET_HashCode *query,
-                       const void *xquery,
-                       size_t xquery_size,
-                       const void *reply_block,
-                       size_t reply_block_size);
+GNUNET_BLOCK_evaluate(struct GNUNET_BLOCK_Context *ctx,
+                      enum GNUNET_BLOCK_Type type,
+                      struct GNUNET_BLOCK_Group *group,
+                      enum GNUNET_BLOCK_EvaluationOptions eo,
+                      const struct GNUNET_HashCode *query,
+                      const void *xquery,
+                      size_t xquery_size,
+                      const void *reply_block,
+                      size_t reply_block_size);
 
 
 /**
@@ -345,11 +341,11 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
  *         (or if extracting a key from a block of this type does not work)
  */
 int
-GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx,
-                      enum GNUNET_BLOCK_Type type,
-                      const void *block,
-                      size_t block_size,
-                      struct GNUNET_HashCode *key);
+GNUNET_BLOCK_get_key(struct GNUNET_BLOCK_Context *ctx,
+                     enum GNUNET_BLOCK_Type type,
+                     const void *block,
+                     size_t block_size,
+                     struct GNUNET_HashCode *key);
 
 
 /**
@@ -364,9 +360,9 @@ GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx,
  * @return #GNUNET_SYSERR if not supported, #GNUNET_OK on success
  */
 int
-GNUNET_BLOCK_group_set_seen (struct GNUNET_BLOCK_Group *bg,
-                             const struct GNUNET_HashCode *seen_results,
-                             unsigned int seen_results_count);
+GNUNET_BLOCK_group_set_seen(struct GNUNET_BLOCK_Group *bg,
+                            const struct GNUNET_HashCode *seen_results,
+                            unsigned int seen_results_count);
 
 
 /**
@@ -382,8 +378,8 @@ GNUNET_BLOCK_group_set_seen (struct GNUNET_BLOCK_Group *bg,
  *         #GNUNET_SYSERR if merging is not supported
  */
 int
-GNUNET_BLOCK_group_merge (struct GNUNET_BLOCK_Group *bg1,
-                          struct GNUNET_BLOCK_Group *bg2);
+GNUNET_BLOCK_group_merge(struct GNUNET_BLOCK_Group *bg1,
+                         struct GNUNET_BLOCK_Group *bg2);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index f0438c82f..025d33c45 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -97,9 +97,7 @@ typedef void
  * Block group data.  The plugin must initialize the callbacks
  * and can use the @e internal_cls as it likes.
  */
-struct GNUNET_BLOCK_Group
-{
-
+struct GNUNET_BLOCK_Group {
   /**
    * Context owning the block group. Set by the main block library.
    */
@@ -138,7 +136,6 @@ struct GNUNET_BLOCK_Group
    * Internal data structure of the plugin.
    */
   void *internal_cls;
-
 };
 
 
@@ -183,16 +180,16 @@ typedef struct GNUNET_BLOCK_Group *
  * @return characterization of result
  */
 typedef enum GNUNET_BLOCK_EvaluationResult
-(*GNUNET_BLOCK_EvaluationFunction) (void *cls,
-                                    struct GNUNET_BLOCK_Context *ctx,
-                                    enum GNUNET_BLOCK_Type type,
-                                    struct GNUNET_BLOCK_Group *group,
-                                    enum GNUNET_BLOCK_EvaluationOptions eo,
-                                    const struct GNUNET_HashCode *query,
-                                    const void *xquery,
-                                    size_t xquery_size,
-                                    const void *reply_block,
-                                    size_t reply_block_size);
+(*GNUNET_BLOCK_EvaluationFunction)(void *cls,
+                                   struct GNUNET_BLOCK_Context *ctx,
+                                   enum GNUNET_BLOCK_Type type,
+                                   struct GNUNET_BLOCK_Group *group,
+                                   enum GNUNET_BLOCK_EvaluationOptions eo,
+                                   const struct GNUNET_HashCode *query,
+                                   const void *xquery,
+                                   size_t xquery_size,
+                                   const void *reply_block,
+                                   size_t reply_block_size);
 
 
 /**
@@ -221,9 +218,7 @@ typedef int
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_BLOCK_PluginFunctions
-{
-
+struct GNUNET_BLOCK_PluginFunctions {
   /**
    * Closure for all of the callbacks.
    */
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index 819e39353..dccc51464 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  * @author Bart Polot
@@ -70,8 +70,7 @@ struct GNUNET_CADET_Port;
 /**
  * Hash uniquely identifying a connection below a tunnel.
  */
-struct GNUNET_CADET_ConnectionTunnelIdentifier
-{
+struct GNUNET_CADET_ConnectionTunnelIdentifier {
   struct GNUNET_ShortHashCode connection_of_tunnel;
 };
 
@@ -79,8 +78,7 @@ struct GNUNET_CADET_ConnectionTunnelIdentifier
 /**
  * Number identifying a CADET channel within a tunnel.
  */
-struct GNUNET_CADET_ChannelTunnelNumber
-{
+struct GNUNET_CADET_ChannelTunnelNumber {
   /**
    * Which number does this channel have that uniquely identfies
    * it within its tunnel, in network byte order.
@@ -154,7 +152,7 @@ typedef void (*GNUNET_CADET_WindowSizeEventHandler) (
  * @return Handle to the cadet service NULL on error.
  */
 struct GNUNET_CADET_Handle *
-GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CADET_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -166,7 +164,7 @@ GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param handle connection to cadet to disconnect
  */
 void
-GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle);
+GNUNET_CADET_disconnect(struct GNUNET_CADET_Handle *handle);
 
 
 /**
@@ -183,13 +181,13 @@ GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle);
  * @return Port handle, NULL if port is in use
  */
 struct GNUNET_CADET_Port *
-GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
-                        const struct GNUNET_HashCode *port,
-                        GNUNET_CADET_ConnectEventHandler connects,
-                        void *connects_cls,
-                        GNUNET_CADET_WindowSizeEventHandler window_changes,
-                        GNUNET_CADET_DisconnectEventHandler disconnects,
-                        const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_CADET_open_port(struct GNUNET_CADET_Handle *h,
+                       const struct GNUNET_HashCode *port,
+                       GNUNET_CADET_ConnectEventHandler connects,
+                       void *connects_cls,
+                       GNUNET_CADET_WindowSizeEventHandler window_changes,
+                       GNUNET_CADET_DisconnectEventHandler disconnects,
+                       const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -199,7 +197,7 @@ GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
  * @param p Port handle.
  */
 void
-GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p);
+GNUNET_CADET_close_port(struct GNUNET_CADET_Port *p);
 
 
 /**
@@ -223,13 +221,13 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p);
  * @return Handle to the channel.
  */
 struct GNUNET_CADET_Channel *
-GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
-                             void *channel_cls,
-                             const struct GNUNET_PeerIdentity *destination,
-                             const struct GNUNET_HashCode *port,
-                             GNUNET_CADET_WindowSizeEventHandler window_changes,
-                             GNUNET_CADET_DisconnectEventHandler disconnects,
-                             const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_CADET_channel_create(struct GNUNET_CADET_Handle *h,
+                            void *channel_cls,
+                            const struct GNUNET_PeerIdentity *destination,
+                            const struct GNUNET_HashCode *port,
+                            GNUNET_CADET_WindowSizeEventHandler window_changes,
+                            GNUNET_CADET_DisconnectEventHandler disconnects,
+                            const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -242,7 +240,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
  * @param channel Channel handle, becomes invalid after this call.
  */
 void
-GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel);
+GNUNET_CADET_channel_destroy(struct GNUNET_CADET_Channel *channel);
 
 
 /**
@@ -252,7 +250,7 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel);
  * @return The message queue of the channel.
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CADET_get_mq (const struct GNUNET_CADET_Channel *channel);
+GNUNET_CADET_get_mq(const struct GNUNET_CADET_Channel *channel);
 
 
 /**
@@ -263,7 +261,7 @@ GNUNET_CADET_get_mq (const struct GNUNET_CADET_Channel *channel);
  * @param channel Channel that will be allowed to call another handler.
  */
 void
-GNUNET_CADET_receive_done (struct GNUNET_CADET_Channel *channel);
+GNUNET_CADET_receive_done(struct GNUNET_CADET_Channel *channel);
 
 
 /**
@@ -276,25 +274,21 @@ GNUNET_CADET_receive_done (struct GNUNET_CADET_Channel *channel);
  * @return A GNUNET_HashCode usable for the new CADET API.
  */
 const struct GNUNET_HashCode *
-GC_u2h (uint32_t port);
+GC_u2h(uint32_t port);
 
-enum GNUNET_CADET_ChannelInfoOption
-{
+enum GNUNET_CADET_ChannelInfoOption {
   /**
    * Who is the peer at the other end of the channel.
    * Only for use in @c GNUNET_CADET_channel_get_info
    * struct GNUNET_PeerIdentity *peer
    */
   GNUNET_CADET_OPTION_PEER = 0x0
-
 };
 
 /**
  * Union to retrieve info about a channel.
  */
-union GNUNET_CADET_ChannelInfo
-{
-
+union GNUNET_CADET_ChannelInfo {
   /**
    * #GNUNET_YES / #GNUNET_NO, for binary flags.
    */
@@ -315,9 +309,9 @@ union GNUNET_CADET_ChannelInfo
  * @return Union with an answer to the query.
  */
 const union GNUNET_CADET_ChannelInfo *
-GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel,
-                               enum GNUNET_CADET_ChannelInfoOption option,
-                               ...);
+GNUNET_CADET_channel_get_info(struct GNUNET_CADET_Channel *channel,
+                              enum GNUNET_CADET_ChannelInfoOption option,
+                              ...);
 
 
 /******************************************************************************/
@@ -334,8 +328,7 @@ GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel,
 /**
  * Internal details about a channel.
  */
-struct GNUNET_CADET_ChannelInternals
-{
+struct GNUNET_CADET_ChannelInternals {
   /**
    * Root of the channel
    */
@@ -377,10 +370,10 @@ struct GNUNET_CADET_ChannelMonitor;
  * @param callback_cls Closure for @c callback.
  */
 struct GNUNET_CADET_ChannelMonitor *
-GNUNET_CADET_get_channel (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          struct GNUNET_PeerIdentity *peer,
-                          GNUNET_CADET_ChannelCB callback,
-                          void *callback_cls);
+GNUNET_CADET_get_channel(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                         struct GNUNET_PeerIdentity *peer,
+                         GNUNET_CADET_ChannelCB callback,
+                         void *callback_cls);
 
 
 /**
@@ -390,14 +383,13 @@ GNUNET_CADET_get_channel (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return Closure that was given to #GNUNET_CADET_get_channel().
  */
 void *
-GNUNET_CADET_get_channel_cancel (struct GNUNET_CADET_ChannelMonitor *cm);
+GNUNET_CADET_get_channel_cancel(struct GNUNET_CADET_ChannelMonitor *cm);
 
 
 /**
  * Information we return per peer.
  */
-struct GNUNET_CADET_PeerListEntry
-{
+struct GNUNET_CADET_PeerListEntry {
   /**
    * Which peer is the information about?
    */
@@ -451,9 +443,9 @@ struct GNUNET_CADET_PeersLister;
  * @return NULL on error
  */
 struct GNUNET_CADET_PeersLister *
-GNUNET_CADET_list_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         GNUNET_CADET_PeersCB callback,
-                         void *callback_cls);
+GNUNET_CADET_list_peers(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                        GNUNET_CADET_PeersCB callback,
+                        void *callback_cls);
 
 
 /**
@@ -463,14 +455,13 @@ GNUNET_CADET_list_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return Closure that was given to #GNUNET_CADET_list_peers().
  */
 void *
-GNUNET_CADET_list_peers_cancel (struct GNUNET_CADET_PeersLister *pl);
+GNUNET_CADET_list_peers_cancel(struct GNUNET_CADET_PeersLister *pl);
 
 
 /**
  * Detailed information we return per peer.
  */
-struct GNUNET_CADET_PeerPathDetail
-{
+struct GNUNET_CADET_PeerPathDetail {
   /**
    * Peer this is about.
    */
@@ -523,10 +514,10 @@ struct GNUNET_CADET_GetPath;
  * @return NULL on error
  */
 struct GNUNET_CADET_GetPath *
-GNUNET_CADET_get_path (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                       const struct GNUNET_PeerIdentity *id,
-                       GNUNET_CADET_PathCB callback,
-                       void *callback_cls);
+GNUNET_CADET_get_path(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                      const struct GNUNET_PeerIdentity *id,
+                      GNUNET_CADET_PathCB callback,
+                      void *callback_cls);
 
 
 /**
@@ -536,14 +527,13 @@ GNUNET_CADET_get_path (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return closure from #GNUNET_CADET_get_path().
  */
 void *
-GNUNET_CADET_get_path_cancel (struct GNUNET_CADET_GetPath *gp);
+GNUNET_CADET_get_path_cancel(struct GNUNET_CADET_GetPath *gp);
 
 
 /**
  * Details about a tunnel managed by CADET.
  */
-struct GNUNET_CADET_TunnelDetails
-{
+struct GNUNET_CADET_TunnelDetails {
   /**
    * Target of the tunnel.
    */
@@ -602,9 +592,9 @@ struct GNUNET_CADET_ListTunnels;
  * @return NULL on error
  */
 struct GNUNET_CADET_ListTunnels *
-GNUNET_CADET_list_tunnels (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                           GNUNET_CADET_TunnelsCB callback,
-                           void *callback_cls);
+GNUNET_CADET_list_tunnels(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                          GNUNET_CADET_TunnelsCB callback,
+                          void *callback_cls);
 
 
 /**
@@ -614,7 +604,7 @@ GNUNET_CADET_list_tunnels (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return Closure given to #GNUNET_CADET_list_tunnels(), if any.
  */
 void *
-GNUNET_CADET_list_tunnels_cancel (struct GNUNET_CADET_ListTunnels *lt);
+GNUNET_CADET_list_tunnels_cancel(struct GNUNET_CADET_ListTunnels *lt);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index c8c5c2885..8e4984124 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -57,11 +57,11 @@ extern "C"
  * @return the message queue, NULL on error
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                       const char *service_name,
-                       const struct GNUNET_MQ_MessageHandler *handlers,
-                       GNUNET_MQ_ErrorHandler error_handler,
-                       void *error_handler_cls);
+GNUNET_CLIENT_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                      const char *service_name,
+                      const struct GNUNET_MQ_MessageHandler *handlers,
+                      GNUNET_MQ_ErrorHandler error_handler,
+                      void *error_handler_cls);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 6eed12ddb..afaf3a4de 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file include/gnunet_common.h
@@ -116,7 +116,7 @@ extern "C" {
 /**
  * wrap va_arg for enums
  */
-#define GNUNET_VA_ARG_ENUM(va, X) ((enum X) va_arg (va, int))
+#define GNUNET_VA_ARG_ENUM(va, X) ((enum X)va_arg(va, int))
 
 
 /**
@@ -133,36 +133,36 @@ extern "C" {
  */
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#define GNUNET_htobe16(x) __bswap_16 (x)
+#define GNUNET_htobe16(x) __bswap_16(x)
 #define GNUNET_htole16(x) (x)
-#define GNUNET_be16toh(x) __bswap_16 (x)
+#define GNUNET_be16toh(x) __bswap_16(x)
 #define GNUNET_le16toh(x) (x)
 
-#define GNUNET_htobe32(x) __bswap_32 (x)
+#define GNUNET_htobe32(x) __bswap_32(x)
 #define GNUNET_htole32(x) (x)
-#define GNUNET_be32toh(x) __bswap_32 (x)
+#define GNUNET_be32toh(x) __bswap_32(x)
 #define GNUNET_le32toh(x) (x)
 
-#define GNUNET_htobe64(x) __bswap_64 (x)
+#define GNUNET_htobe64(x) __bswap_64(x)
 #define GNUNET_htole64(x) (x)
-#define GNUNET_be64toh(x) __bswap_64 (x)
+#define GNUNET_be64toh(x) __bswap_64(x)
 #define GNUNET_le64toh(x) (x)
 #endif
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define GNUNET_htobe16(x) (x)
-#define GNUNET_htole16(x) __bswap_16 (x)
+#define GNUNET_htole16(x) __bswap_16(x)
 #define GNUNET_be16toh(x) (x)
-#define GNUNET_le16toh(x) __bswap_16 (x)
+#define GNUNET_le16toh(x) __bswap_16(x)
 
 #define GNUNET_htobe32(x) (x)
-#define GNUNET_htole32(x) __bswap_32 (x)
+#define GNUNET_htole32(x) __bswap_32(x)
 #define GNUNET_be32toh(x) (x)
-#define GNUNET_le32toh(x) __bswap_32 (x)
+#define GNUNET_le32toh(x) __bswap_32(x)
 
 #define GNUNET_htobe64(x) (x)
-#define GNUNET_htole64(x) __bswap_64 (x)
+#define GNUNET_htole64(x) __bswap_64(x)
 #define GNUNET_be64toh(x) (x)
-#define GNUNET_le64toh(x) __bswap_64 (x)
+#define GNUNET_le64toh(x) __bswap_64(x)
 #endif
 
 
@@ -178,7 +178,7 @@ extern "C" {
  * on the stack with a variable-length that might be zero, write
  * "int[GNUNET_NZL(n)] x;" instead of "int[n] x".
  */
-#define GNUNET_NZL(l) GNUNET_MAX (1, l)
+#define GNUNET_NZL(l) GNUNET_MAX(1, l)
 
 
 /**
@@ -201,9 +201,9 @@ extern "C" {
  * bug #33594.
  */
 #ifdef __BIGGEST_ALIGNMENT__
-#define GNUNET_ALIGN __attribute__ ((aligned (__BIGGEST_ALIGNMENT__)))
+#define GNUNET_ALIGN __attribute__ ((aligned(__BIGGEST_ALIGNMENT__)))
 #else
-#define GNUNET_ALIGN __attribute__ ((aligned (8)))
+#define GNUNET_ALIGN __attribute__ ((aligned(8)))
 #endif
 
 /**
@@ -224,7 +224,7 @@ extern "C" {
  * so we *only* use this on W32 (see #670578 from Debian); fortunately,
  * W32 doesn't run on sparc anyway.
  */
-#define GNUNET_NETWORK_STRUCT_BEGIN _Pragma ("pack(push)") _Pragma ("pack(1)")
+#define GNUNET_NETWORK_STRUCT_BEGIN _Pragma("pack(push)") _Pragma ("pack(1)")
 
 /**
  * gcc 4.x-ism to pack structures even on W32 (to be used after structs)
@@ -232,7 +232,7 @@ extern "C" {
  * so we *only* use this on W32 (see #670578 from Debian); fortunately,
  * W32 doesn't run on sparc anyway.
  */
-#define GNUNET_NETWORK_STRUCT_END _Pragma ("pack(pop)")
+#define GNUNET_NETWORK_STRUCT_END _Pragma("pack(pop)")
 
 #else
 #error gcc 4.x or higher required on W32 systems
@@ -256,9 +256,8 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * @brief A 512-bit hashcode.  These are the default length for GNUnet, using SHA-512.
  */
-struct GNUNET_HashCode
-{
-  uint32_t bits[512 / 8 / sizeof (uint32_t)]; /* = 16 */
+struct GNUNET_HashCode {
+  uint32_t bits[512 / 8 / sizeof(uint32_t)];  /* = 16 */
 };
 
 
@@ -266,17 +265,15 @@ struct GNUNET_HashCode
  * @brief A 256-bit hashcode.  Used under special conditions, like when space
  * is critical and security is not impacted by it.
  */
-struct GNUNET_ShortHashCode
-{
-  uint32_t bits[256 / 8 / sizeof (uint32_t)]; /* = 8 */
+struct GNUNET_ShortHashCode {
+  uint32_t bits[256 / 8 / sizeof(uint32_t)];  /* = 8 */
 };
 
 
 /**
  * A UUID, a 128 bit random value.
  */
-struct GNUNET_Uuid
-{
+struct GNUNET_Uuid {
   /**
    * 128 random bits.
    */
@@ -287,9 +284,7 @@ struct GNUNET_Uuid
 /**
  * Header for all communications.
  */
-struct GNUNET_MessageHeader
-{
-
+struct GNUNET_MessageHeader {
   /**
    * The length of the struct (in bytes, including the length field itself),
    * in big-endian format.
@@ -306,8 +301,7 @@ struct GNUNET_MessageHeader
 /**
  * Answer from service to client about last operation.
  */
-struct GNUNET_OperationResultMessage
-{
+struct GNUNET_OperationResultMessage {
   struct GNUNET_MessageHeader header;
 
   uint32_t reserved GNUNET_PACKED;
@@ -329,9 +323,8 @@ struct GNUNET_OperationResultMessage
 /**
  * Identifier for an asynchronous execution context.
  */
-struct GNUNET_AsyncScopeId
-{
-  uint32_t bits[16 / sizeof (uint32_t)]; /* = 16 bytes */
+struct GNUNET_AsyncScopeId {
+  uint32_t bits[16 / sizeof(uint32_t)];  /* = 16 bytes */
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -340,8 +333,7 @@ GNUNET_NETWORK_STRUCT_END
 /**
  * Saved async scope identifier or root scope.
  */
-struct GNUNET_AsyncScopeSave
-{
+struct GNUNET_AsyncScopeSave {
   /**
    * Saved scope.  Unused if 'have_scope==GNUNET_NO'.
    */
@@ -398,8 +390,7 @@ typedef void (*GNUNET_ResultCallback) (void *cls,
  * @ingroup logging
  * Types of errors.
  */
-enum GNUNET_ErrorType
-{
+enum GNUNET_ErrorType {
   GNUNET_ERROR_TYPE_UNSPECIFIED = -1,
   GNUNET_ERROR_TYPE_NONE = 0,
   GNUNET_ERROR_TYPE_ERROR = 1,
@@ -439,16 +430,16 @@ typedef void (*GNUNET_Logger) (void *cls,
  * @return number of log calls to be ignored
  */
 int
-GNUNET_get_log_skip (void);
+GNUNET_get_log_skip(void);
 
 
-#if ! defined(GNUNET_CULL_LOGGING)
+#if !defined(GNUNET_CULL_LOGGING)
 int
-GNUNET_get_log_call_status (int caller_level,
-                            const char *comp,
-                            const char *file,
-                            const char *function,
-                            int line);
+GNUNET_get_log_call_status(int caller_level,
+                           const char *comp,
+                           const char *file,
+                           const char *function,
+                           int line);
 #endif
 
 
@@ -461,8 +452,8 @@ GNUNET_get_log_call_status (int caller_level,
  * @param ... arguments for format string
  */
 void
-GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...)
-  __attribute__ ((format (printf, 2, 3)));
+GNUNET_log_nocheck(enum GNUNET_ErrorType kind, const char *message, ...)
+__attribute__ ((format(printf, 2, 3)));
 
 /* from glib */
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
@@ -470,19 +461,19 @@ GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...)
   __extension__({                  \
     int _gnunet_boolean_var_;      \
     if (expr)                      \
-      _gnunet_boolean_var_ = 1;    \
+    _gnunet_boolean_var_ = 1;    \
     else                           \
-      _gnunet_boolean_var_ = 0;    \
+    _gnunet_boolean_var_ = 0;    \
     _gnunet_boolean_var_;          \
-  })
-#define GN_LIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 1))
-#define GN_UNLIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 0))
+    })
+#define GN_LIKELY(expr) (__builtin_expect(_GNUNET_BOOLEAN_EXPR(expr), 1))
+#define GN_UNLIKELY(expr) (__builtin_expect(_GNUNET_BOOLEAN_EXPR(expr), 0))
 #else
 #define GN_LIKELY(expr) (expr)
 #define GN_UNLIKELY(expr) (expr)
 #endif
 
-#if ! defined(GNUNET_LOG_CALL_STATUS)
+#if !defined(GNUNET_LOG_CALL_STATUS)
 #define GNUNET_LOG_CALL_STATUS -1
 #endif
 
@@ -498,12 +489,12 @@ GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...)
  * @param ... arguments for format string
  */
 void
-GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
-                         const char *comp,
-                         const char *message,
-                         ...);
+GNUNET_log_from_nocheck(enum GNUNET_ErrorType kind,
+                        const char *comp,
+                        const char *message,
+                        ...);
 
-#if ! defined(GNUNET_CULL_LOGGING)
+#if !defined(GNUNET_CULL_LOGGING)
 #define GNUNET_log_from(kind, comp, ...)                                  \
   do                                                                      \
   {                                                                       \
@@ -511,21 +502,21 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
     if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
         ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
     {                                                                     \
-      if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      (comp),                             \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
-      if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
+      if (GN_UNLIKELY(log_call_enabled == -1))                           \
+      log_call_enabled =                                                \
+        GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                    (comp),                             \
+                                    __FILE__,                           \
+                                    __FUNCTION__,                       \
+                                    __LINE__);                          \
+      if (GN_UNLIKELY(GNUNET_get_log_skip() > 0))                       \
       {                                                                   \
-        GNUNET_log_skip (-1, GNUNET_NO);                                  \
+        GNUNET_log_skip(-1, GNUNET_NO);                                  \
       }                                                                   \
       else                                                                \
       {                                                                   \
-        if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
+        if (GN_UNLIKELY(log_call_enabled))                               \
+        GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
       }                                                                   \
     }                                                                     \
   } while (0)
@@ -537,21 +528,21 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
     if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
         ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
     {                                                                     \
-      if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      NULL,                               \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
-      if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
+      if (GN_UNLIKELY(log_call_enabled == -1))                           \
+      log_call_enabled =                                                \
+        GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                    NULL,                               \
+                                    __FILE__,                           \
+                                    __FUNCTION__,                       \
+                                    __LINE__);                          \
+      if (GN_UNLIKELY(GNUNET_get_log_skip() > 0))                       \
       {                                                                   \
-        GNUNET_log_skip (-1, GNUNET_NO);                                  \
+        GNUNET_log_skip(-1, GNUNET_NO);                                  \
       }                                                                   \
       else                                                                \
       {                                                                   \
-        if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
+        if (GN_UNLIKELY(log_call_enabled))                               \
+        GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
       }                                                                   \
     }                                                                     \
   } while (0)
@@ -570,9 +561,9 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
  * @param option name of missing option
  */
 void
-GNUNET_log_config_missing (enum GNUNET_ErrorType kind,
-                           const char *section,
-                           const char *option);
+GNUNET_log_config_missing(enum GNUNET_ErrorType kind,
+                          const char *section,
+                          const char *option);
 
 
 /**
@@ -585,10 +576,10 @@ GNUNET_log_config_missing (enum GNUNET_ErrorType kind,
  * @param required what is required that is invalid about the option
  */
 void
-GNUNET_log_config_invalid (enum GNUNET_ErrorType kind,
-                           const char *section,
-                           const char *option,
-                           const char *required);
+GNUNET_log_config_invalid(enum GNUNET_ErrorType kind,
+                          const char *section,
+                          const char *option,
+                          const char *required);
 
 
 /**
@@ -598,7 +589,7 @@ GNUNET_log_config_invalid (enum GNUNET_ErrorType kind,
  * first log the location of the failure.
  */
 void
-GNUNET_abort_ (void) GNUNET_NORETURN;
+GNUNET_abort_(void) GNUNET_NORETURN;
 
 
 /**
@@ -609,7 +600,7 @@ GNUNET_abort_ (void) GNUNET_NORETURN;
  * @param check_reset #GNUNET_YES to assert that the log skip counter is currently zero
  */
 void
-GNUNET_log_skip (int n, int check_reset);
+GNUNET_log_skip(int n, int check_reset);
 
 
 /**
@@ -622,7 +613,7 @@ GNUNET_log_skip (int n, int check_reset);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if logfile could not be opened
  */
 int
-GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
+GNUNET_log_setup(const char *comp, const char *loglevel, const char *logfile);
 
 
 /**
@@ -636,7 +627,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
  * @param logger_cls closure for @a logger
  */
 void
-GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_add(GNUNET_Logger logger, void *logger_cls);
 
 
 /**
@@ -647,7 +638,7 @@ GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls);
  * @param logger_cls closure for @a logger
  */
 void
-GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_remove(GNUNET_Logger logger, void *logger_cls);
 
 
 /**
@@ -660,7 +651,7 @@ GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
  * @return string
  */
 const char *
-GNUNET_sh2s (const struct GNUNET_ShortHashCode *shc);
+GNUNET_sh2s(const struct GNUNET_ShortHashCode *shc);
 
 
 /**
@@ -673,7 +664,7 @@ GNUNET_sh2s (const struct GNUNET_ShortHashCode *shc);
  * @return string
  */
 const char *
-GNUNET_uuid2s (const struct GNUNET_Uuid *uuid);
+GNUNET_uuid2s(const struct GNUNET_Uuid *uuid);
 
 
 /**
@@ -686,7 +677,7 @@ GNUNET_uuid2s (const struct GNUNET_Uuid *uuid);
  * @return string
  */
 const char *
-GNUNET_h2s (const struct GNUNET_HashCode *hc);
+GNUNET_h2s(const struct GNUNET_HashCode *hc);
 
 
 /**
@@ -701,7 +692,7 @@ GNUNET_h2s (const struct GNUNET_HashCode *hc);
  * @return string
  */
 const char *
-GNUNET_h2s2 (const struct GNUNET_HashCode *hc);
+GNUNET_h2s2(const struct GNUNET_HashCode *hc);
 
 
 /**
@@ -715,7 +706,7 @@ GNUNET_h2s2 (const struct GNUNET_HashCode *hc);
  * @return string
  */
 const char *
-GNUNET_h2s_full (const struct GNUNET_HashCode *hc);
+GNUNET_h2s_full(const struct GNUNET_HashCode *hc);
 
 
 /**
@@ -740,7 +731,7 @@ struct GNUNET_CRYPTO_EcdhePublicKey;
  * @return string
  */
 const char *
-GNUNET_p2s (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
+GNUNET_p2s(const struct GNUNET_CRYPTO_EddsaPublicKey *p);
 
 
 /**
@@ -753,7 +744,7 @@ GNUNET_p2s (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
  * @return string
  */
 const char *
-GNUNET_p2s2 (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
+GNUNET_p2s2(const struct GNUNET_CRYPTO_EddsaPublicKey *p);
 
 
 /**
@@ -766,7 +757,7 @@ GNUNET_p2s2 (const struct GNUNET_CRYPTO_EddsaPublicKey *p);
  * @return string
  */
 const char *
-GNUNET_e2s (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
+GNUNET_e2s(const struct GNUNET_CRYPTO_EcdhePublicKey *p);
 
 
 /**
@@ -779,7 +770,7 @@ GNUNET_e2s (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
  * @return string
  */
 const char *
-GNUNET_e2s2 (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
+GNUNET_e2s2(const struct GNUNET_CRYPTO_EcdhePublicKey *p);
 
 
 /**
@@ -793,7 +784,7 @@ GNUNET_e2s2 (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
  *         call to #GNUNET_i2s().
  */
 const char *
-GNUNET_i2s (const struct GNUNET_PeerIdentity *pid);
+GNUNET_i2s(const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -809,7 +800,7 @@ GNUNET_i2s (const struct GNUNET_PeerIdentity *pid);
  *         call to #GNUNET_i2s().
  */
 const char *
-GNUNET_i2s2 (const struct GNUNET_PeerIdentity *pid);
+GNUNET_i2s2(const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -823,7 +814,7 @@ GNUNET_i2s2 (const struct GNUNET_PeerIdentity *pid);
  *         call to #GNUNET_i2s_full().
  */
 const char *
-GNUNET_i2s_full (const struct GNUNET_PeerIdentity *pid);
+GNUNET_i2s_full(const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -838,7 +829,7 @@ GNUNET_i2s_full (const struct GNUNET_PeerIdentity *pid);
  *  will be overwritten by next call to #GNUNET_a2s().
  */
 const char *
-GNUNET_a2s (const struct sockaddr *addr, socklen_t addrlen);
+GNUNET_a2s(const struct sockaddr *addr, socklen_t addrlen);
 
 
 /**
@@ -849,7 +840,7 @@ GNUNET_a2s (const struct sockaddr *addr, socklen_t addrlen);
  * @return string corresponding to the type
  */
 const char *
-GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
+GNUNET_error_type_to_string(enum GNUNET_ErrorType kind);
 
 
 /**
@@ -859,13 +850,13 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_assert(cond)                                     \
   do                                                            \
   {                                                             \
-    if (! (cond))                                               \
+    if (!(cond))                                               \
     {                                                           \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
-                  _ ("Assertion failed at %s:%d. Aborting.\n"), \
-                  __FILE__,                                     \
-                  __LINE__);                                    \
-      GNUNET_abort_ ();                                         \
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,                      \
+                 _("Assertion failed at %s:%d. Aborting.\n"), \
+                 __FILE__,                                     \
+                 __LINE__);                                    \
+      GNUNET_abort_();                                         \
     }                                                           \
   } while (0)
 
@@ -877,13 +868,13 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_assert_at(cond, f, l)                            \
   do                                                            \
   {                                                             \
-    if (! (cond))                                               \
+    if (!(cond))                                               \
     {                                                           \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
-                  _ ("Assertion failed at %s:%d. Aborting.\n"), \
-                  f,                                            \
-                  l);                                           \
-      GNUNET_abort_ ();                                         \
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,                      \
+                 _("Assertion failed at %s:%d. Aborting.\n"), \
+                 f,                                            \
+                 l);                                           \
+      GNUNET_abort_();                                         \
     }                                                           \
   } while (0)
 
@@ -898,14 +889,14 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_assert_from(cond, comp)                               \
   do                                                                 \
   {                                                                  \
-    if (! (cond))                                                    \
+    if (!(cond))                                                    \
     {                                                                \
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,                      \
-                       comp,                                         \
-                       _ ("Assertion failed at %s:%d. Aborting.\n"), \
-                       __FILE__,                                     \
-                       __LINE__);                                    \
-      GNUNET_abort_ ();                                              \
+      GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR,                      \
+                      comp,                                         \
+                      _("Assertion failed at %s:%d. Aborting.\n"), \
+                      __FILE__,                                     \
+                      __LINE__);                                    \
+      GNUNET_abort_();                                              \
     }                                                                \
   } while (0)
 
@@ -918,12 +909,12 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_break(cond)                            \
   do                                                  \
   {                                                   \
-    if (! (cond))                                     \
+    if (!(cond))                                     \
     {                                                 \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,            \
-                  _ ("Assertion failed at %s:%d.\n"), \
-                  __FILE__,                           \
-                  __LINE__);                          \
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,            \
+                 _("Assertion failed at %s:%d.\n"), \
+                 __FILE__,                           \
+                 __LINE__);                          \
     }                                                 \
   } while (0)
 
@@ -940,12 +931,12 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_break_op(cond)                                             \
   do                                                                      \
   {                                                                       \
-    if (! (cond))                                                         \
+    if (!(cond))                                                         \
     {                                                                     \
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,     \
-                  _ ("External protocol violation detected at %s:%d.\n"), \
-                  __FILE__,                                               \
-                  __LINE__);                                              \
+      GNUNET_log(GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,     \
+                 _("External protocol violation detected at %s:%d.\n"), \
+                 __FILE__,                                               \
+                 __LINE__);                                              \
     }                                                                     \
   } while (0)
 
@@ -959,12 +950,12 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_log_strerror(level, cmd)                      \
   do                                                         \
   {                                                          \
-    GNUNET_log (level,                                       \
-                _ ("`%s' failed at %s:%d with error: %s\n"), \
-                cmd,                                         \
-                __FILE__,                                    \
-                __LINE__,                                    \
-                strerror (errno));                           \
+    GNUNET_log(level,                                       \
+               _("`%s' failed at %s:%d with error: %s\n"), \
+               cmd,                                         \
+               __FILE__,                                    \
+               __LINE__,                                    \
+               strerror(errno));                           \
   } while (0)
 
 
@@ -977,13 +968,13 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_log_from_strerror(level, component, cmd)           \
   do                                                              \
   {                                                               \
-    GNUNET_log_from (level,                                       \
-                     component,                                   \
-                     _ ("`%s' failed at %s:%d with error: %s\n"), \
-                     cmd,                                         \
-                     __FILE__,                                    \
-                     __LINE__,                                    \
-                     strerror (errno));                           \
+    GNUNET_log_from(level,                                       \
+                    component,                                   \
+                    _("`%s' failed at %s:%d with error: %s\n"), \
+                    cmd,                                         \
+                    __FILE__,                                    \
+                    __LINE__,                                    \
+                    strerror(errno));                           \
   } while (0)
 
 
@@ -996,13 +987,13 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_log_strerror_file(level, cmd, filename)                    \
   do                                                                      \
   {                                                                       \
-    GNUNET_log (level,                                                    \
-                _ ("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
-                cmd,                                                      \
-                filename,                                                 \
-                __FILE__,                                                 \
-                __LINE__,                                                 \
-                strerror (errno));                                        \
+    GNUNET_log(level,                                                    \
+               _("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+               cmd,                                                      \
+               filename,                                                 \
+               __FILE__,                                                 \
+               __LINE__,                                                 \
+               strerror(errno));                                        \
   } while (0)
 
 
@@ -1015,14 +1006,14 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 #define GNUNET_log_from_strerror_file(level, component, cmd, filename)         \
   do                                                                           \
   {                                                                            \
-    GNUNET_log_from (level,                                                    \
-                     component,                                                \
-                     _ ("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
-                     cmd,                                                      \
-                     filename,                                                 \
-                     __FILE__,                                                 \
-                     __LINE__,                                                 \
-                     strerror (errno));                                        \
+    GNUNET_log_from(level,                                                    \
+                    component,                                                \
+                    _("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+                    cmd,                                                      \
+                    filename,                                                 \
+                    __FILE__,                                                 \
+                    __LINE__,                                                 \
+                    strerror(errno));                                        \
   } while (0)
 
 /* ************************* endianess conversion ****************** */
@@ -1036,7 +1027,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * @return The same value in network byte order.
  */
 uint64_t
-GNUNET_htonll (uint64_t n);
+GNUNET_htonll(uint64_t n);
 
 
 /**
@@ -1048,7 +1039,7 @@ GNUNET_htonll (uint64_t n);
  * @return The same value in host byte order.
  */
 uint64_t
-GNUNET_ntohll (uint64_t n);
+GNUNET_ntohll(uint64_t n);
 
 
 /**
@@ -1060,7 +1051,7 @@ GNUNET_ntohll (uint64_t n);
  * @return The same value in network byte order.
  */
 double
-GNUNET_hton_double (double d);
+GNUNET_hton_double(double d);
 
 
 /**
@@ -1072,7 +1063,7 @@ GNUNET_hton_double (double d);
  * @return The same value in host byte order.
  */
 double
-GNUNET_ntoh_double (double d);
+GNUNET_ntoh_double(double d);
 
 
 /* ************************* allocation functions ****************** */
@@ -1091,7 +1082,7 @@ GNUNET_ntoh_double (double d);
  *
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
-#define GNUNET_new(type) (type *) GNUNET_malloc (sizeof (type))
+#define GNUNET_new(type) (type *)GNUNET_malloc(sizeof(type))
 
 
 /**
@@ -1100,9 +1091,9 @@ GNUNET_ntoh_double (double d);
  */
 #define GNUNET_memcmp(a, b)       \
   ({                              \
-    const typeof (*b) *_a = (a);  \
-    const typeof (*a) *_b = (b);  \
-    memcmp (_a, _b, sizeof (*a)); \
+    const typeof (*b) * _a = (a);  \
+    const typeof (*a) * _b = (b);  \
+    memcmp(_a, _b, sizeof(*a)); \
   })
 
 
@@ -1115,7 +1106,7 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_is_zero(a)           \
   ({                                \
     static const typeof (*a) _z;    \
-    memcmp ((a), &_z, sizeof (_z)); \
+    memcmp((a), &_z, sizeof(_z)); \
   })
 
 
@@ -1133,7 +1124,7 @@ GNUNET_ntoh_double (double d);
   {                                \
     if (0 != n)                    \
     {                              \
-      (void) memcpy (dst, src, n); \
+      (void)memcpy(dst, src, n); \
     }                              \
   } while (0)
 
@@ -1147,7 +1138,7 @@ GNUNET_ntoh_double (double d);
  * @param n number of elements in the array
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
-#define GNUNET_new_array(n, type) (type *) GNUNET_malloc ((n) * sizeof (type))
+#define GNUNET_new_array(n, type) (type *)GNUNET_malloc((n) * sizeof(type))
 
 /**
  * @ingroup memory
@@ -1159,7 +1150,7 @@ GNUNET_ntoh_double (double d);
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
 #define GNUNET_new_array_2d(n, m, type) \
-  (type **) GNUNET_xnew_array_2d_ (n, m, sizeof (type), __FILE__, __LINE__)
+  (type **)GNUNET_xnew_array_2d_(n, m, sizeof(type), __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1172,7 +1163,7 @@ GNUNET_ntoh_double (double d);
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
 #define GNUNET_new_array_3d(n, m, o, type) \
-  (type ***) GNUNET_xnew_array_3d_ (n, m, o, sizeof (type), __FILE__, __LINE__)
+  (type ***)GNUNET_xnew_array_3d_(n, m, o, sizeof(type), __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1183,7 +1174,7 @@ GNUNET_ntoh_double (double d);
  *        smaller than 40 MB.
  * @return pointer to size bytes of memory, never NULL (!)
  */
-#define GNUNET_malloc(size) GNUNET_xmalloc_ (size, __FILE__, __LINE__)
+#define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1193,7 +1184,7 @@ GNUNET_ntoh_double (double d);
  * @param size the number of bytes in buf (and size of the allocation)
  * @return pointer to size bytes of memory, never NULL (!)
  */
-#define GNUNET_memdup(buf, size) GNUNET_xmemdup_ (buf, size, __FILE__, __LINE__)
+#define GNUNET_memdup(buf, size) GNUNET_xmemdup_(buf, size, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1204,7 +1195,7 @@ GNUNET_ntoh_double (double d);
  * @return pointer to size bytes of memory, NULL if we do not have enough memory
  */
 #define GNUNET_malloc_large(size) \
-  GNUNET_xmalloc_unchecked_ (size, __FILE__, __LINE__)
+  GNUNET_xmalloc_unchecked_(size, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1216,7 +1207,7 @@ GNUNET_ntoh_double (double d);
  * @return pointer to size bytes of memory
  */
 #define GNUNET_realloc(ptr, size) \
-  GNUNET_xrealloc_ (ptr, size, __FILE__, __LINE__)
+  GNUNET_xrealloc_(ptr, size, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1227,7 +1218,7 @@ GNUNET_ntoh_double (double d);
  * @param ptr location where to free the memory. ptr must have
  *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.
  */
-#define GNUNET_free(ptr) GNUNET_xfree_ (ptr, __FILE__, __LINE__)
+#define GNUNET_free(ptr) GNUNET_xfree_(ptr, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1242,7 +1233,7 @@ GNUNET_ntoh_double (double d);
     void *__x__ = ptr;            \
     if (__x__ != NULL)            \
     {                             \
-      GNUNET_free (__x__);        \
+      GNUNET_free(__x__);        \
     }                             \
   } while (0)
 
@@ -1254,7 +1245,7 @@ GNUNET_ntoh_double (double d);
  * @param a pointer to a zero-terminated string
  * @return a copy of the string including zero-termination
  */
-#define GNUNET_strdup(a) GNUNET_xstrdup_ (a, __FILE__, __LINE__)
+#define GNUNET_strdup(a) GNUNET_xstrdup_(a, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1266,7 +1257,7 @@ GNUNET_ntoh_double (double d);
  * @return a partial copy of the string including zero-termination
  */
 #define GNUNET_strndup(a, length) \
-  GNUNET_xstrndup_ (a, length, __FILE__, __LINE__)
+  GNUNET_xstrndup_(a, length, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1304,12 +1295,12 @@ GNUNET_ntoh_double (double d);
  *        free the vector (then, arr will be NULL afterwards).
  */
 #define GNUNET_array_grow(arr, size, tsize) \
-  GNUNET_xgrow_ ((void **) &(arr),          \
-                 sizeof ((arr)[0]),         \
-                 &size,                     \
-                 tsize,                     \
-                 __FILE__,                  \
-                 __LINE__)
+  GNUNET_xgrow_((void **)&(arr),          \
+                sizeof((arr)[0]),         \
+                &size,                     \
+                tsize,                     \
+                __FILE__,                  \
+                __LINE__)
 
 /**
  * @ingroup memory
@@ -1327,7 +1318,7 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_array_append(arr, size, element) \
   do                                            \
   {                                             \
-    GNUNET_array_grow (arr, size, size + 1);    \
+    GNUNET_array_grow(arr, size, size + 1);    \
     (arr)[size - 1] = element;                  \
   } while (0)
 
@@ -1342,7 +1333,7 @@ GNUNET_ntoh_double (double d);
  * @return number of bytes written to buf or negative value on error
  */
 int
-GNUNET_snprintf (char *buf, size_t size, const char *format, ...);
+GNUNET_snprintf(char *buf, size_t size, const char *format, ...);
 
 
 /**
@@ -1355,7 +1346,7 @@ GNUNET_snprintf (char *buf, size_t size, const char *format, ...);
  * @return number of bytes in "*buf" excluding 0-termination
  */
 int
-GNUNET_asprintf (char **buf, const char *format, ...);
+GNUNET_asprintf(char **buf, const char *format, ...);
 
 
 /* ************** internal implementations, use macros above! ************** */
@@ -1372,7 +1363,7 @@ GNUNET_asprintf (char **buf, const char *format, ...);
  * @return allocated memory, never NULL
  */
 void *
-GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
+GNUNET_xmalloc_(size_t size, const char *filename, int linenumber);
 
 
 /**
@@ -1390,11 +1381,11 @@ GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
  * @return allocated memory, never NULL
  */
 void **
-GNUNET_xnew_array_2d_ (size_t n,
-                       size_t m,
-                       size_t elementSize,
-                       const char *filename,
-                       int linenumber);
+GNUNET_xnew_array_2d_(size_t n,
+                      size_t m,
+                      size_t elementSize,
+                      const char *filename,
+                      int linenumber);
 
 
 /**
@@ -1413,12 +1404,12 @@ GNUNET_xnew_array_2d_ (size_t n,
  * @return allocated memory, never NULL
  */
 void ***
-GNUNET_xnew_array_3d_ (size_t n,
-                       size_t m,
-                       size_t o,
-                       size_t elementSize,
-                       const char *filename,
-                       int linenumber);
+GNUNET_xnew_array_3d_(size_t n,
+                      size_t m,
+                      size_t o,
+                      size_t elementSize,
+                      const char *filename,
+                      int linenumber);
 
 
 /**
@@ -1433,10 +1424,10 @@ GNUNET_xnew_array_3d_ (size_t n,
  * @return allocated memory, never NULL
  */
 void *
-GNUNET_xmemdup_ (const void *buf,
-                 size_t size,
-                 const char *filename,
-                 int linenumber);
+GNUNET_xmemdup_(const void *buf,
+                size_t size,
+                const char *filename,
+                int linenumber);
 
 
 /**
@@ -1452,7 +1443,7 @@ GNUNET_xmemdup_ (const void *buf,
  * @return pointer to size bytes of memory, NULL if we do not have enough memory
  */
 void *
-GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
+GNUNET_xmalloc_unchecked_(size_t size, const char *filename, int linenumber);
 
 
 /**
@@ -1460,7 +1451,7 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
  * memory is available.
  */
 void *
-GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
+GNUNET_xrealloc_(void *ptr, size_t n, const char *filename, int linenumber);
 
 
 /**
@@ -1473,7 +1464,7 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
  * @param linenumber line where this call is being made (for debugging)
  */
 void
-GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
+GNUNET_xfree_(void *ptr, const char *filename, int linenumber);
 
 
 /**
@@ -1484,7 +1475,7 @@ GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
  * @return the duplicated string
  */
 char *
-GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
+GNUNET_xstrdup_(const char *str, const char *filename, int linenumber);
 
 /**
  * Dup partially a string. Don't call GNUNET_xstrndup_ directly. Use the #GNUNET_strndup macro.
@@ -1496,10 +1487,10 @@ GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
  * @return the duplicated string
  */
 char *
-GNUNET_xstrndup_ (const char *str,
-                  size_t len,
-                  const char *filename,
-                  int linenumber);
+GNUNET_xstrndup_(const char *str,
+                 size_t len,
+                 const char *filename,
+                 int linenumber);
 
 /**
  * Grow an array, the new elements are zeroed out.
@@ -1517,12 +1508,12 @@ GNUNET_xstrndup_ (const char *str,
  * @param linenumber line where this call is being made (for debugging)
  */
 void
-GNUNET_xgrow_ (void **old,
-               size_t elementSize,
-               unsigned int *oldCount,
-               unsigned int newCount,
-               const char *filename,
-               int linenumber);
+GNUNET_xgrow_(void **old,
+              size_t elementSize,
+              unsigned int *oldCount,
+              unsigned int newCount,
+              const char *filename,
+              int linenumber);
 
 
 /**
@@ -1533,7 +1524,7 @@ GNUNET_xgrow_ (void **old,
  * @return duplicate of the message
  */
 struct GNUNET_MessageHeader *
-GNUNET_copy_message (const struct GNUNET_MessageHeader *msg);
+GNUNET_copy_message(const struct GNUNET_MessageHeader *msg);
 
 
 /**
@@ -1543,8 +1534,8 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg);
  * @param old_scope[out] location to save the old scope
  */
 void
-GNUNET_async_scope_enter (const struct GNUNET_AsyncScopeId *aid,
-                          struct GNUNET_AsyncScopeSave *old_scope);
+GNUNET_async_scope_enter(const struct GNUNET_AsyncScopeId *aid,
+                         struct GNUNET_AsyncScopeSave *old_scope);
 
 
 /**
@@ -1553,7 +1544,7 @@ GNUNET_async_scope_enter (const struct GNUNET_AsyncScopeId *aid,
  * @param old_scope scope to restore
  */
 void
-GNUNET_async_scope_restore (struct GNUNET_AsyncScopeSave *old_scope);
+GNUNET_async_scope_restore(struct GNUNET_AsyncScopeSave *old_scope);
 
 
 /**
@@ -1562,7 +1553,7 @@ GNUNET_async_scope_restore (struct GNUNET_AsyncScopeSave *old_scope);
  * @param[out] scope_ret pointer to where the result is stored
  */
 void
-GNUNET_async_scope_get (struct GNUNET_AsyncScopeSave *scope_ret);
+GNUNET_async_scope_get(struct GNUNET_AsyncScopeSave *scope_ret);
 
 
 /**
@@ -1571,7 +1562,7 @@ GNUNET_async_scope_get (struct GNUNET_AsyncScopeSave *scope_ret);
  * @param[out] aid_ret pointer to where the result is stored
  */
 void
-GNUNET_async_scope_fresh (struct GNUNET_AsyncScopeId *aid_ret);
+GNUNET_async_scope_fresh(struct GNUNET_AsyncScopeId *aid_ret);
 
 
 #if __STDC_VERSION__ < 199901L
@@ -1590,8 +1581,7 @@ GNUNET_async_scope_fresh (struct GNUNET_AsyncScopeId *aid_ret);
  * be in gnunet_scheduler_lib.h, but it works if we declare it here.
  * Naturally, logically this is part of the scheduler.
  */
-enum GNUNET_SCHEDULER_Priority
-{
+enum GNUNET_SCHEDULER_Priority {
   /**
    * Run with the same priority as the current job.
    */
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index a0e73f474..4d1bb6b79 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -51,7 +51,7 @@ struct GNUNET_CONFIGURATION_Handle;
  * @return fresh configuration object
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_CONFIGURATION_create (void);
+GNUNET_CONFIGURATION_create(void);
 
 
 /**
@@ -61,7 +61,7 @@ GNUNET_CONFIGURATION_create (void);
  * @return duplicate configuration
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_dup(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -70,7 +70,7 @@ GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param cfg configuration to destroy
  */
 void
-GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_destroy(struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -83,8 +83,8 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
-                           const char *filename);
+GNUNET_CONFIGURATION_load(struct GNUNET_CONFIGURATION_Handle *cfg,
+                          const char *filename);
 
 
 /**
@@ -96,8 +96,8 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                const char *defaults_d);
+GNUNET_CONFIGURATION_load_from(struct GNUNET_CONFIGURATION_Handle *cfg,
+                               const char *defaults_d);
 
 
 /**
@@ -109,8 +109,8 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *filename);
+GNUNET_CONFIGURATION_parse(struct GNUNET_CONFIGURATION_Handle *cfg,
+                           const char *filename);
 
 
 /**
@@ -122,8 +122,8 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
  *           present. This memory should be freed by the caller
  */
 char *
-GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                size_t *size);
+GNUNET_CONFIGURATION_serialize(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               size_t *size);
 
 
 /**
@@ -138,10 +138,10 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  const char *mem,
-                                  size_t size,
-                                  const char *basedir);
+GNUNET_CONFIGURATION_deserialize(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 const char *mem,
+                                 size_t size,
+                                 const char *basedir);
 
 
 /**
@@ -152,8 +152,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *filename);
+GNUNET_CONFIGURATION_write(struct GNUNET_CONFIGURATION_Handle *cfg,
+                           const char *filename);
 
 
 /**
@@ -164,9 +164,9 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_write_diffs (const struct GNUNET_CONFIGURATION_Handle *cfg_default,
-                                  const struct GNUNET_CONFIGURATION_Handle *cfg_new,
-                                  const char *filename);
+GNUNET_CONFIGURATION_write_diffs(const struct GNUNET_CONFIGURATION_Handle *cfg_default,
+                                 const struct GNUNET_CONFIGURATION_Handle *cfg_new,
+                                 const char *filename);
 
 
 /**
@@ -177,8 +177,8 @@ GNUNET_CONFIGURATION_write_diffs (const struct GNUNET_CONFIGURATION_Handle *cfg_
  * @return configuration with only the differences, never NULL
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_CONFIGURATION_get_diff (const struct GNUNET_CONFIGURATION_Handle *cfg_default,
-                               const struct GNUNET_CONFIGURATION_Handle *cfg_new);
+GNUNET_CONFIGURATION_get_diff(const struct GNUNET_CONFIGURATION_Handle *cfg_default,
+                              const struct GNUNET_CONFIGURATION_Handle *cfg_new);
 
 
 /**
@@ -189,7 +189,7 @@ GNUNET_CONFIGURATION_get_diff (const struct GNUNET_CONFIGURATION_Handle *cfg_def
  * @return #GNUNET_NO if clean, #GNUNET_YES if dirty, #GNUNET_SYSERR on error (i.e. last save failed)
  */
 int
-GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_is_dirty(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -201,7 +201,7 @@ GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg);
  */
 typedef int
 (*GNUNET_CONFIGURATION_Callback)(void *cls,
-                                 const struct GNUNET_CONFIGURATION_Handle *cfg);
+                                 const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -216,9 +216,9 @@ typedef int
  *   otherwise return value from @a cb.
  */
 int
-GNUNET_CONFIGURATION_parse_and_run (const char *filename,
-                                    GNUNET_CONFIGURATION_Callback cb,
-                                    void *cb_cls);
+GNUNET_CONFIGURATION_parse_and_run(const char *filename,
+                                   GNUNET_CONFIGURATION_Callback cb,
+                                   void *cb_cls);
 
 
 /**
@@ -255,9 +255,9 @@ typedef void
  * @param iter_cls closure for @a iter
  */
 void
-GNUNET_CONFIGURATION_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              GNUNET_CONFIGURATION_Iterator iter,
-                              void *iter_cls);
+GNUNET_CONFIGURATION_iterate(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                             GNUNET_CONFIGURATION_Iterator iter,
+                             void *iter_cls);
 
 
 /**
@@ -268,9 +268,9 @@ GNUNET_CONFIGURATION_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param iter_cls closure for @a iter
  */
 void
-GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       GNUNET_CONFIGURATION_Section_Iterator iter,
-                                       void *iter_cls);
+GNUNET_CONFIGURATION_iterate_sections(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      GNUNET_CONFIGURATION_Section_Iterator iter,
+                                      void *iter_cls);
 
 
 /**
@@ -280,8 +280,8 @@ GNUNET_CONFIGURATION_iterate_sections (const struct GNUNET_CONFIGURATION_Handle
  * @param section name of the section to remove
  */
 void
-GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     const char *section);
+GNUNET_CONFIGURATION_remove_section(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    const char *section);
 
 
 /**
@@ -294,10 +294,10 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       unsigned long long *number);
+GNUNET_CONFIGURATION_get_value_number(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const char *section,
+                                      const char *option,
+                                      unsigned long long *number);
 
 
 /**
@@ -310,10 +310,10 @@ GNUNET_CONFIGURATION_get_value_number (const struct GNUNET_CONFIGURATION_Handle
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_float  (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       float *number);
+GNUNET_CONFIGURATION_get_value_float(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                     const char *section,
+                                     const char *option,
+                                     float *number);
 
 
 /**
@@ -326,10 +326,10 @@ GNUNET_CONFIGURATION_get_value_float  (const struct GNUNET_CONFIGURATION_Handle
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     const char *section,
-                                     const char *option,
-                                     struct GNUNET_TIME_Relative *time);
+GNUNET_CONFIGURATION_get_value_time(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    const char *section,
+                                    const char *option,
+                                    struct GNUNET_TIME_Relative *time);
 
 
 
@@ -343,10 +343,10 @@ GNUNET_CONFIGURATION_get_value_time (const struct GNUNET_CONFIGURATION_Handle *c
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_size (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     const char *section,
-                                     const char *option,
-                                     unsigned long long *size);
+GNUNET_CONFIGURATION_get_value_size(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    const char *section,
+                                    const char *option,
+                                    unsigned long long *size);
 
 
 /**
@@ -358,9 +358,9 @@ GNUNET_CONFIGURATION_get_value_size (const struct GNUNET_CONFIGURATION_Handle *c
  * @return #GNUNET_YES if so, #GNUNET_NO if not.
  */
 int
-GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                 const char *section,
-                                 const char *option);
+GNUNET_CONFIGURATION_have_value(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                const char *section,
+                                const char *option);
 
 
 /**
@@ -374,10 +374,10 @@ GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       char **value);
+GNUNET_CONFIGURATION_get_value_string(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const char *section,
+                                      const char *option,
+                                      char **value);
 
 
 /**
@@ -392,10 +392,10 @@ GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_filename (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                         const char *section,
-                                         const char *option,
-                                         char **value);
+GNUNET_CONFIGURATION_get_value_filename(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                        const char *section,
+                                        const char *option,
+                                        char **value);
 
 
 /**
@@ -409,11 +409,11 @@ GNUNET_CONFIGURATION_get_value_filename (const struct GNUNET_CONFIGURATION_Handl
  * @return number of filenames iterated over, -1 on error
  */
 int
-GNUNET_CONFIGURATION_iterate_value_filenames (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                              const char *section,
-                                              const char *option,
-                                              GNUNET_FileNameCallback cb,
-                                              void *cb_cls);
+GNUNET_CONFIGURATION_iterate_value_filenames(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                             const char *section,
+                                             const char *option,
+                                             GNUNET_FileNameCallback cb,
+                                             void *cb_cls);
 
 /**
  * Iterate over values of a section in the configuration.
@@ -424,10 +424,10 @@ GNUNET_CONFIGURATION_iterate_value_filenames (const struct GNUNET_CONFIGURATION_
  * @param iter_cls closure for @a iter
  */
 void
-GNUNET_CONFIGURATION_iterate_section_values (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                             const char *section,
-                                             GNUNET_CONFIGURATION_Iterator iter,
-                                             void *iter_cls);
+GNUNET_CONFIGURATION_iterate_section_values(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                            const char *section,
+                                            GNUNET_CONFIGURATION_Iterator iter,
+                                            void *iter_cls);
 
 /**
  * Get a configuration value that should be in a set of
@@ -442,11 +442,11 @@ GNUNET_CONFIGURATION_iterate_section_values (const struct GNUNET_CONFIGURATION_H
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       const char *const *choices,
-                                       const char **value);
+GNUNET_CONFIGURATION_get_value_choice(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const char *section,
+                                      const char *option,
+                                      const char *const *choices,
+                                      const char **value);
 
 /**
  * Get a configuration value that should be in a set of
@@ -458,9 +458,9 @@ GNUNET_CONFIGURATION_get_value_choice (const struct GNUNET_CONFIGURATION_Handle
  * @return #GNUNET_YES, #GNUNET_NO or if option has no valid value, #GNUNET_SYSERR
  */
 int
-GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                      const char *section,
-                                      const char *option);
+GNUNET_CONFIGURATION_get_value_yesno(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                     const char *section,
+                                     const char *option);
 
 
 /**
@@ -476,11 +476,11 @@ GNUNET_CONFIGURATION_get_value_yesno (const struct GNUNET_CONFIGURATION_Handle *
  *         #GNUNET_SYSERR on decoding error
  */
 int
-GNUNET_CONFIGURATION_get_data (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const char *section,
-                               const char *option,
-                               void *buf,
-                               size_t buf_size);
+GNUNET_CONFIGURATION_get_data(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                              const char *section,
+                              const char *option,
+                              void *buf,
+                              size_t buf_size);
 
 
 /**
@@ -500,8 +500,8 @@ GNUNET_CONFIGURATION_get_data (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return $-expanded string
  */
 char *
-GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                    char *orig);
+GNUNET_CONFIGURATION_expand_dollar(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                   char *orig);
 
 
 /**
@@ -513,10 +513,10 @@ GNUNET_CONFIGURATION_expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cf
  * @param number value to set
  */
 void
-GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       unsigned long long number);
+GNUNET_CONFIGURATION_set_value_number(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const char *section,
+                                      const char *option,
+                                      unsigned long long number);
 
 
 /**
@@ -528,10 +528,10 @@ GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param value value to set
  */
 void
-GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       const char *value);
+GNUNET_CONFIGURATION_set_value_string(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const char *section,
+                                      const char *option,
+                                      const char *value);
 
 
 /**
@@ -546,10 +546,10 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
  *         #GNUNET_SYSERR if the filename is not in the list
  */
 int
-GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                            const char *section,
-                                            const char *option,
-                                            const char *value);
+GNUNET_CONFIGURATION_remove_value_filename(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                           const char *section,
+                                           const char *option,
+                                           const char *value);
 
 
 /**
@@ -564,10 +564,10 @@ GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle *
  *         #GNUNET_SYSERR if the filename already in the list
  */
 int
-GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                            const char *section,
-                                            const char *option,
-                                            const char *value);
+GNUNET_CONFIGURATION_append_value_filename(struct GNUNET_CONFIGURATION_Handle *cfg,
+                                           const char *section,
+                                           const char *option,
+                                           const char *value);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index 19736f241..e864b5337 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -93,14 +93,14 @@ struct GNUNET_CONSENSUS_Handle;
  * @return handle to use, NULL on error
  */
 struct GNUNET_CONSENSUS_Handle *
-GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         unsigned int num_peers,
-                         const struct GNUNET_PeerIdentity *peers,
-                         const struct GNUNET_HashCode *session_id,
-                         struct GNUNET_TIME_Absolute start,
-                         struct GNUNET_TIME_Absolute deadline,
-                         GNUNET_CONSENSUS_ElementCallback new_element_cb,
-                         void *new_element_cls);
+GNUNET_CONSENSUS_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                        unsigned int num_peers,
+                        const struct GNUNET_PeerIdentity *peers,
+                        const struct GNUNET_HashCode *session_id,
+                        struct GNUNET_TIME_Absolute start,
+                        struct GNUNET_TIME_Absolute deadline,
+                        GNUNET_CONSENSUS_ElementCallback new_element_cb,
+                        void *new_element_cls);
 
 
 /**
@@ -132,10 +132,10 @@ typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls,
  * @param idc_cls closure for @a idc
  */
 void
-GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus,
-                         const struct GNUNET_SET_Element *element,
-                         GNUNET_CONSENSUS_InsertDoneCallback idc,
-                         void *idc_cls);
+GNUNET_CONSENSUS_insert(struct GNUNET_CONSENSUS_Handle *consensus,
+                        const struct GNUNET_SET_Element *element,
+                        GNUNET_CONSENSUS_InsertDoneCallback idc,
+                        void *idc_cls);
 
 
 
@@ -156,9 +156,9 @@ typedef void (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls);
  * @param conclude_cls closure for the conclude callback
  */
 void
-GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
-                           GNUNET_CONSENSUS_ConcludeCallback conclude,
-                           void *conclude_cls);
+GNUNET_CONSENSUS_conclude(struct GNUNET_CONSENSUS_Handle *consensus,
+                          GNUNET_CONSENSUS_ConcludeCallback conclude,
+                          void *conclude_cls);
 
 
 /**
@@ -168,7 +168,7 @@ GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
  * @param consensus handle to destroy
  */
 void
-GNUNET_CONSENSUS_destroy (struct GNUNET_CONSENSUS_Handle *consensus);
+GNUNET_CONSENSUS_destroy(struct GNUNET_CONSENSUS_Handle *consensus);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 7e4653a97..39dbd4425 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -48,35 +48,35 @@ extern "C"
  * so that at least one maximum-size message can be send roughly once
  * per minute.
  */
-#define GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT GNUNET_BANDWIDTH_value_init (1024)
+#define GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT GNUNET_BANDWIDTH_value_init(1024)
 
 /**
  * After how long do we consider a connection to a peer dead
  * if we don't receive messages from the peer?
  */
-#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
 /**
  * How long do we delay reading more from a peer after a quota violation?
  */
-#define GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
+#define GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2)
 
 /**
  * After how long do we consider a service unresponsive
  * even if we assume that the service commonly does not
  * respond instantly (DNS, Database, etc.).
  */
-#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10)
+#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 10)
 
 /**
  * How long do we delay messages to get larger packet sizes (CORKing)?
  */
-#define GNUNET_CONSTANTS_MAX_CORK_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define GNUNET_CONSTANTS_MAX_CORK_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
 
 /**
  * After what amount of latency for a message do we print a warning?
  */
-#define GNUNET_CONSTANTS_LATENCY_WARN GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
+#define GNUNET_CONSTANTS_LATENCY_WARN GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
 
 /**
  * Until which load do we consider the peer overly idle
@@ -100,20 +100,20 @@ extern "C"
  * validated?  This value is also used for our own addresses when we
  * create a HELLO.
  */
-#define GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
+#define GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_HOURS, 12)
 
 
 /**
  * How long do we cache records at most in the DHT?
  */
-#define GNUNET_CONSTANTS_DHT_MAX_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 24)
+#define GNUNET_CONSTANTS_DHT_MAX_EXPIRATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_HOURS, 24)
 
 
 /**
  * Size of the `struct EncryptedMessage` of the core (which
  * is the per-message overhead of the core).
  */
-#define GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE (24 + sizeof (struct GNUNET_HashCode))
+#define GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE (24 + sizeof(struct GNUNET_HashCode))
 
 /**
  * What is the maximum size for encrypted messages?  Note that this
@@ -141,7 +141,7 @@ extern "C"
  * Maximum message size that can be sent on CADET.
  */
 #define GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE \
-(GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE - GNUNET_CONSTANTS_CADET_P2P_OVERHEAD)
+  (GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE - GNUNET_CONSTANTS_CADET_P2P_OVERHEAD)
 
 /**
  * Largest block that can be stored in the DHT.
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 8796fdcb6..d811995ff 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -67,10 +67,10 @@
  *         #GNUNET_NO if compression did not help
  */
 int
-GNUNET_try_compression (const char *data,
-                        size_t old_size,
-                        char **result,
-                        size_t *new_size);
+GNUNET_try_compression(const char *data,
+                       size_t old_size,
+                       char **result,
+                       size_t *new_size);
 
 
 /**
@@ -84,7 +84,7 @@ GNUNET_try_compression (const char *data,
  * @return NULL on error, buffer of @a output_size decompressed bytes otherwise
  */
 char *
-GNUNET_decompress (const char *input, size_t input_size, size_t output_size);
+GNUNET_decompress(const char *input, size_t input_size, size_t output_size);
 
 
 #if HAVE_EXTRACTOR_H
@@ -99,8 +99,7 @@ GNUNET_decompress (const char *input, size_t input_size, size_t output_size);
  * Enumeration defining various sources of keywords.  See also
  * http://dublincore.org/documents/1998/09/dces/
  */
-enum EXTRACTOR_MetaType
-{
+enum EXTRACTOR_MetaType {
   EXTRACTOR_METATYPE_RESERVED = 0,
   EXTRACTOR_METATYPE_MIMETYPE = 1,
   EXTRACTOR_METATYPE_FILENAME = 2,
@@ -124,14 +123,12 @@ enum EXTRACTOR_MetaType
   EXTRACTOR_METATYPE_ORIGINAL_TITLE = 162,
   EXTRACTOR_METATYPE_GNUNET_FULL_DATA = 174,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME = 180,
-
 };
 
 /**
  * Format in which the extracted meta data is presented.
  */
-enum EXTRACTOR_MetaFormat
-{
+enum EXTRACTOR_MetaFormat {
   /**
    * Format is unknown.
    */
@@ -231,9 +228,9 @@ typedef int (*GNUNET_CONTAINER_HashCodeIterator) (void *cls,
  * @return the bloomfilter
  */
 struct GNUNET_CONTAINER_BloomFilter *
-GNUNET_CONTAINER_bloomfilter_load (const char *filename,
-                                   size_t size,
-                                   unsigned int k);
+GNUNET_CONTAINER_bloomfilter_load(const char *filename,
+                                  size_t size,
+                                  unsigned int k);
 
 
 /**
@@ -251,9 +248,9 @@ GNUNET_CONTAINER_bloomfilter_load (const char *filename,
  * @return the bloomfilter
  */
 struct GNUNET_CONTAINER_BloomFilter *
-GNUNET_CONTAINER_bloomfilter_init (const char *data,
-                                   size_t size,
-                                   unsigned int k);
+GNUNET_CONTAINER_bloomfilter_init(const char *data,
+                                  size_t size,
+                                  unsigned int k);
 
 
 /**
@@ -266,7 +263,7 @@ GNUNET_CONTAINER_bloomfilter_init (const char *data,
  * @return #GNUNET_SYSERR if the data array of the wrong size
  */
 int
-GNUNET_CONTAINER_bloomfilter_get_raw_data (
+GNUNET_CONTAINER_bloomfilter_get_raw_data(
   const struct GNUNET_CONTAINER_BloomFilter *bf,
   char *data,
   size_t size);
@@ -281,7 +278,7 @@ GNUNET_CONTAINER_bloomfilter_get_raw_data (
  * @return #GNUNET_YES if the element is in the filter, #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_bloomfilter_test (
+GNUNET_CONTAINER_bloomfilter_test(
   const struct GNUNET_CONTAINER_BloomFilter *bf,
   const struct GNUNET_HashCode *e);
 
@@ -294,8 +291,8 @@ GNUNET_CONTAINER_bloomfilter_test (
  * @param e the element
  */
 void
-GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf,
-                                  const struct GNUNET_HashCode *e);
+GNUNET_CONTAINER_bloomfilter_add(struct GNUNET_CONTAINER_BloomFilter *bf,
+                                 const struct GNUNET_HashCode *e);
 
 
 /**
@@ -306,8 +303,8 @@ GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf,
  * @param e the element to remove
  */
 void
-GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf,
-                                     const struct GNUNET_HashCode *e);
+GNUNET_CONTAINER_bloomfilter_remove(struct GNUNET_CONTAINER_BloomFilter *bf,
+                                    const struct GNUNET_HashCode *e);
 
 
 /**
@@ -318,7 +315,7 @@ GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf,
  * @return copy of bf
  */
 struct GNUNET_CONTAINER_BloomFilter *
-GNUNET_CONTAINER_bloomfilter_copy (
+GNUNET_CONTAINER_bloomfilter_copy(
   const struct GNUNET_CONTAINER_BloomFilter *bf);
 
 
@@ -331,7 +328,7 @@ GNUNET_CONTAINER_bloomfilter_copy (
  * @param bf the filter
  */
 void
-GNUNET_CONTAINER_bloomfilter_free (struct GNUNET_CONTAINER_BloomFilter *bf);
+GNUNET_CONTAINER_bloomfilter_free(struct GNUNET_CONTAINER_BloomFilter *bf);
 
 
 /**
@@ -341,7 +338,7 @@ GNUNET_CONTAINER_bloomfilter_free (struct GNUNET_CONTAINER_BloomFilter *bf);
  * @return addresses set per element in the bf
  */
 size_t
-GNUNET_CONTAINER_bloomfilter_get_element_addresses (
+GNUNET_CONTAINER_bloomfilter_get_element_addresses(
   const struct GNUNET_CONTAINER_BloomFilter *bf);
 
 
@@ -353,7 +350,7 @@ GNUNET_CONTAINER_bloomfilter_get_element_addresses (
  * @return number of bytes used for the data of the bloom filter
  */
 size_t
-GNUNET_CONTAINER_bloomfilter_get_size (
+GNUNET_CONTAINER_bloomfilter_get_size(
   const struct GNUNET_CONTAINER_BloomFilter *bf);
 
 
@@ -364,7 +361,7 @@ GNUNET_CONTAINER_bloomfilter_get_size (
  * @param bf the filter
  */
 void
-GNUNET_CONTAINER_bloomfilter_clear (struct GNUNET_CONTAINER_BloomFilter *bf);
+GNUNET_CONTAINER_bloomfilter_clear(struct GNUNET_CONTAINER_BloomFilter *bf);
 
 
 /**
@@ -380,9 +377,9 @@ GNUNET_CONTAINER_bloomfilter_clear (struct GNUNET_CONTAINER_BloomFilter *bf);
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CONTAINER_bloomfilter_or (struct GNUNET_CONTAINER_BloomFilter *bf,
-                                 const char *data,
-                                 size_t size);
+GNUNET_CONTAINER_bloomfilter_or(struct GNUNET_CONTAINER_BloomFilter *bf,
+                                const char *data,
+                                size_t size);
 
 
 /**
@@ -396,7 +393,7 @@ GNUNET_CONTAINER_bloomfilter_or (struct GNUNET_CONTAINER_BloomFilter *bf,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CONTAINER_bloomfilter_or2 (
+GNUNET_CONTAINER_bloomfilter_or2(
   struct GNUNET_CONTAINER_BloomFilter *bf,
   const struct GNUNET_CONTAINER_BloomFilter *to_or);
 
@@ -414,11 +411,11 @@ GNUNET_CONTAINER_bloomfilter_or2 (
  * @param k the new number of #GNUNET_CRYPTO_hash-function to apply per element
  */
 void
-GNUNET_CONTAINER_bloomfilter_resize (struct GNUNET_CONTAINER_BloomFilter *bf,
-                                     GNUNET_CONTAINER_HashCodeIterator iterator,
-                                     void *iterator_cls,
-                                     size_t size,
-                                     unsigned int k);
+GNUNET_CONTAINER_bloomfilter_resize(struct GNUNET_CONTAINER_BloomFilter *bf,
+                                    GNUNET_CONTAINER_HashCodeIterator iterator,
+                                    void *iterator_cls,
+                                    size_t size,
+                                    unsigned int k);
 
 
 /* ****************** metadata ******************* */
@@ -437,7 +434,7 @@ struct GNUNET_CONTAINER_MetaData;
  * @return empty meta-data container
  */
 struct GNUNET_CONTAINER_MetaData *
-GNUNET_CONTAINER_meta_data_create (void);
+GNUNET_CONTAINER_meta_data_create(void);
 
 
 /**
@@ -448,7 +445,7 @@ GNUNET_CONTAINER_meta_data_create (void);
  * @return duplicate meta-data container
  */
 struct GNUNET_CONTAINER_MetaData *
-GNUNET_CONTAINER_meta_data_duplicate (
+GNUNET_CONTAINER_meta_data_duplicate(
   const struct GNUNET_CONTAINER_MetaData *md);
 
 
@@ -459,7 +456,7 @@ GNUNET_CONTAINER_meta_data_duplicate (
  * @param md what to free
  */
 void
-GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md);
+GNUNET_CONTAINER_meta_data_destroy(struct GNUNET_CONTAINER_MetaData *md);
 
 
 /**
@@ -474,7 +471,7 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md);
  * @return #GNUNET_YES if they are equal
  */
 int
-GNUNET_CONTAINER_meta_data_test_equal (
+GNUNET_CONTAINER_meta_data_test_equal(
   const struct GNUNET_CONTAINER_MetaData *md1,
   const struct GNUNET_CONTAINER_MetaData *md2);
 
@@ -498,13 +495,13 @@ GNUNET_CONTAINER_meta_data_test_equal (
  *         data_mime_type and plugin_name are not considered for "exists" checks
  */
 int
-GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
-                                   const char *plugin_name,
-                                   enum EXTRACTOR_MetaType type,
-                                   enum EXTRACTOR_MetaFormat format,
-                                   const char *data_mime_type,
-                                   const char *data,
-                                   size_t data_size);
+GNUNET_CONTAINER_meta_data_insert(struct GNUNET_CONTAINER_MetaData *md,
+                                  const char *plugin_name,
+                                  enum EXTRACTOR_MetaType type,
+                                  enum EXTRACTOR_MetaFormat format,
+                                  const char *data_mime_type,
+                                  const char *data,
+                                  size_t data_size);
 
 
 /**
@@ -516,8 +513,8 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
  * @param in metadata to merge
  */
 void
-GNUNET_CONTAINER_meta_data_merge (struct GNUNET_CONTAINER_MetaData *md,
-                                  const struct GNUNET_CONTAINER_MetaData *in);
+GNUNET_CONTAINER_meta_data_merge(struct GNUNET_CONTAINER_MetaData *md,
+                                 const struct GNUNET_CONTAINER_MetaData *in);
 
 
 /**
@@ -532,10 +529,10 @@ GNUNET_CONTAINER_meta_data_merge (struct GNUNET_CONTAINER_MetaData *md,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if the item does not exist in md
  */
 int
-GNUNET_CONTAINER_meta_data_delete (struct GNUNET_CONTAINER_MetaData *md,
-                                   enum EXTRACTOR_MetaType type,
-                                   const char *data,
-                                   size_t data_size);
+GNUNET_CONTAINER_meta_data_delete(struct GNUNET_CONTAINER_MetaData *md,
+                                  enum EXTRACTOR_MetaType type,
+                                  const char *data,
+                                  size_t data_size);
 
 
 /**
@@ -545,7 +542,7 @@ GNUNET_CONTAINER_meta_data_delete (struct GNUNET_CONTAINER_MetaData *md,
  * @param md metadata to manipulate
  */
 void
-GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md);
+GNUNET_CONTAINER_meta_data_clear(struct GNUNET_CONTAINER_MetaData *md);
 
 
 /**
@@ -556,7 +553,7 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md);
  * @param md metadata to modify
  */
 void
-GNUNET_CONTAINER_meta_data_add_publication_date (
+GNUNET_CONTAINER_meta_data_add_publication_date(
   struct GNUNET_CONTAINER_MetaData *md);
 
 
@@ -571,9 +568,9 @@ GNUNET_CONTAINER_meta_data_add_publication_date (
  * @return number of entries
  */
 int
-GNUNET_CONTAINER_meta_data_iterate (const struct GNUNET_CONTAINER_MetaData *md,
-                                    EXTRACTOR_MetaDataProcessor iter,
-                                    void *iter_cls);
+GNUNET_CONTAINER_meta_data_iterate(const struct GNUNET_CONTAINER_MetaData *md,
+                                   EXTRACTOR_MetaDataProcessor iter,
+                                   void *iter_cls);
 
 
 /**
@@ -588,7 +585,7 @@ GNUNET_CONTAINER_meta_data_iterate (const struct GNUNET_CONTAINER_MetaData *md,
  * @return NULL if no entry was found
  */
 char *
-GNUNET_CONTAINER_meta_data_get_by_type (
+GNUNET_CONTAINER_meta_data_get_by_type(
   const struct GNUNET_CONTAINER_MetaData *md,
   enum EXTRACTOR_MetaType type);
 
@@ -606,7 +603,7 @@ GNUNET_CONTAINER_meta_data_get_by_type (
  *  otherwise client is responsible for freeing the value!
  */
 char *
-GNUNET_CONTAINER_meta_data_get_first_by_types (
+GNUNET_CONTAINER_meta_data_get_first_by_types(
   const struct GNUNET_CONTAINER_MetaData *md,
   ...);
 
@@ -621,7 +618,7 @@ GNUNET_CONTAINER_meta_data_get_first_by_types (
  * @return number of bytes in thumbnail, 0 if not available
  */
 size_t
-GNUNET_CONTAINER_meta_data_get_thumbnail (
+GNUNET_CONTAINER_meta_data_get_thumbnail(
   const struct GNUNET_CONTAINER_MetaData *md,
   unsigned char **thumb);
 
@@ -630,8 +627,7 @@ GNUNET_CONTAINER_meta_data_get_thumbnail (
  * @ingroup metadata
  * Options for metadata serialization.
  */
-enum GNUNET_CONTAINER_MetaDataSerializationOptions
-{
+enum GNUNET_CONTAINER_MetaDataSerializationOptions {
   /**
    * @ingroup metadata
    * Serialize all of the data.
@@ -669,7 +665,7 @@ enum GNUNET_CONTAINER_MetaDataSerializationOptions
  *         space)
  */
 ssize_t
-GNUNET_CONTAINER_meta_data_serialize (
+GNUNET_CONTAINER_meta_data_serialize(
   const struct GNUNET_CONTAINER_MetaData *md,
   char **target,
   size_t max,
@@ -684,7 +680,7 @@ GNUNET_CONTAINER_meta_data_serialize (
  * @return number of bytes needed for serialization, -1 on error
  */
 ssize_t
-GNUNET_CONTAINER_meta_data_get_serialized_size (
+GNUNET_CONTAINER_meta_data_get_serialized_size(
   const struct GNUNET_CONTAINER_MetaData *md);
 
 
@@ -698,7 +694,7 @@ GNUNET_CONTAINER_meta_data_get_serialized_size (
  *         bad format)
  */
 struct GNUNET_CONTAINER_MetaData *
-GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size);
+GNUNET_CONTAINER_meta_data_deserialize(const char *input, size_t size);
 
 
 /* ******************************* HashMap **************************** */
@@ -720,9 +716,7 @@ struct GNUNET_CONTAINER_MultiHashMapIterator;
  * @ingroup hashmap
  * Options for storing values in the HashMap.
  */
-enum GNUNET_CONTAINER_MultiHashMapOption
-{
-
+enum GNUNET_CONTAINER_MultiHashMapOption {
   /**
    * @ingroup hashmap
    * If a value with the given key exists, replace it.  Note that the
@@ -791,7 +785,7 @@ typedef int (*GNUNET_CONTAINER_MulitHashMapIteratorCallback) (
  * @return NULL on error
  */
 struct GNUNET_CONTAINER_MultiHashMap *
-GNUNET_CONTAINER_multihashmap_create (unsigned int len, int do_not_copy_keys);
+GNUNET_CONTAINER_multihashmap_create(unsigned int len, int do_not_copy_keys);
 
 
 /**
@@ -802,7 +796,7 @@ GNUNET_CONTAINER_multihashmap_create (unsigned int len, int do_not_copy_keys);
  * @param map the map
  */
 void
-GNUNET_CONTAINER_multihashmap_destroy (
+GNUNET_CONTAINER_multihashmap_destroy(
   struct GNUNET_CONTAINER_MultiHashMap *map);
 
 
@@ -818,7 +812,7 @@ GNUNET_CONTAINER_multihashmap_destroy (
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multihashmap_get (
+GNUNET_CONTAINER_multihashmap_get(
   const struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key);
 
@@ -836,9 +830,9 @@ GNUNET_CONTAINER_multihashmap_get (
  *  is not in the map
  */
 int
-GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
-                                      const struct GNUNET_HashCode *key,
-                                      const void *value);
+GNUNET_CONTAINER_multihashmap_remove(struct GNUNET_CONTAINER_MultiHashMap *map,
+                                     const struct GNUNET_HashCode *key,
+                                     const void *value);
 
 /**
  * @ingroup hashmap
@@ -850,7 +844,7 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map,
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multihashmap_remove_all (
+GNUNET_CONTAINER_multihashmap_remove_all(
   struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key);
 
@@ -864,7 +858,7 @@ GNUNET_CONTAINER_multihashmap_remove_all (
  * @return number of values removed
  */
 unsigned int
-GNUNET_CONTAINER_multihashmap_clear (struct GNUNET_CONTAINER_MultiHashMap *map);
+GNUNET_CONTAINER_multihashmap_clear(struct GNUNET_CONTAINER_MultiHashMap *map);
 
 
 /**
@@ -878,7 +872,7 @@ GNUNET_CONTAINER_multihashmap_clear (struct GNUNET_CONTAINER_MultiHashMap *map);
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap_contains (
+GNUNET_CONTAINER_multihashmap_contains(
   const struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key);
 
@@ -895,7 +889,7 @@ GNUNET_CONTAINER_multihashmap_contains (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap_contains_value (
+GNUNET_CONTAINER_multihashmap_contains_value(
   const struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key,
   const void *value);
@@ -915,7 +909,7 @@ GNUNET_CONTAINER_multihashmap_contains_value (
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multihashmap_put (
+GNUNET_CONTAINER_multihashmap_put(
   struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key,
   void *value,
@@ -929,7 +923,7 @@ GNUNET_CONTAINER_multihashmap_put (
  * @return the number of key value pairs
  */
 unsigned int
-GNUNET_CONTAINER_multihashmap_size (
+GNUNET_CONTAINER_multihashmap_size(
   const struct GNUNET_CONTAINER_MultiHashMap *map);
 
 
@@ -944,7 +938,7 @@ GNUNET_CONTAINER_multihashmap_size (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multihashmap_iterate (
+GNUNET_CONTAINER_multihashmap_iterate(
   struct GNUNET_CONTAINER_MultiHashMap *map,
   GNUNET_CONTAINER_MulitHashMapIteratorCallback it,
   void *it_cls);
@@ -964,7 +958,7 @@ GNUNET_CONTAINER_multihashmap_iterate (
  * @return an iterator over the given multihashmap @a map
  */
 struct GNUNET_CONTAINER_MultiHashMapIterator *
-GNUNET_CONTAINER_multihashmap_iterator_create (
+GNUNET_CONTAINER_multihashmap_iterator_create(
   const struct GNUNET_CONTAINER_MultiHashMap *map);
 
 
@@ -984,7 +978,7 @@ GNUNET_CONTAINER_multihashmap_iterator_create (
  *         #GNUNET_NO if we are out of elements
  */
 int
-GNUNET_CONTAINER_multihashmap_iterator_next (
+GNUNET_CONTAINER_multihashmap_iterator_next(
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter,
   struct GNUNET_HashCode *key,
   const void **value);
@@ -997,7 +991,7 @@ GNUNET_CONTAINER_multihashmap_iterator_next (
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multihashmap_iterator_destroy (
+GNUNET_CONTAINER_multihashmap_iterator_destroy(
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter);
 
 
@@ -1013,7 +1007,7 @@ GNUNET_CONTAINER_multihashmap_iterator_destroy (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multihashmap_get_multiple (
+GNUNET_CONTAINER_multihashmap_get_multiple(
   struct GNUNET_CONTAINER_MultiHashMap *map,
   const struct GNUNET_HashCode *key,
   GNUNET_CONTAINER_MulitHashMapIteratorCallback it,
@@ -1032,7 +1026,7 @@ GNUNET_CONTAINER_multihashmap_get_multiple (
  * @return the number of key value pairs processed, zero or one.
  */
 unsigned int
-GNUNET_CONTAINER_multihashmap_get_random (
+GNUNET_CONTAINER_multihashmap_get_random(
   const struct GNUNET_CONTAINER_MultiHashMap *map,
   GNUNET_CONTAINER_MulitHashMapIteratorCallback it,
   void *it_cls);
@@ -1080,7 +1074,7 @@ struct GNUNET_CONTAINER_MultiPeerMap;
  * @return NULL on error
  */
 struct GNUNET_CONTAINER_MultiPeerMap *
-GNUNET_CONTAINER_multipeermap_create (unsigned int len, int do_not_copy_keys);
+GNUNET_CONTAINER_multipeermap_create(unsigned int len, int do_not_copy_keys);
 
 
 /**
@@ -1091,7 +1085,7 @@ GNUNET_CONTAINER_multipeermap_create (unsigned int len, int do_not_copy_keys);
  * @param map the map
  */
 void
-GNUNET_CONTAINER_multipeermap_destroy (
+GNUNET_CONTAINER_multipeermap_destroy(
   struct GNUNET_CONTAINER_MultiPeerMap *map);
 
 
@@ -1107,7 +1101,7 @@ GNUNET_CONTAINER_multipeermap_destroy (
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multipeermap_get (
+GNUNET_CONTAINER_multipeermap_get(
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key);
 
@@ -1125,9 +1119,9 @@ GNUNET_CONTAINER_multipeermap_get (
  *  is not in the map
  */
 int
-GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
-                                      const struct GNUNET_PeerIdentity *key,
-                                      const void *value);
+GNUNET_CONTAINER_multipeermap_remove(struct GNUNET_CONTAINER_MultiPeerMap *map,
+                                     const struct GNUNET_PeerIdentity *key,
+                                     const void *value);
 
 /**
  * @ingroup hashmap
@@ -1139,7 +1133,7 @@ GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map,
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multipeermap_remove_all (
+GNUNET_CONTAINER_multipeermap_remove_all(
   struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key);
 
@@ -1155,7 +1149,7 @@ GNUNET_CONTAINER_multipeermap_remove_all (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multipeermap_contains (
+GNUNET_CONTAINER_multipeermap_contains(
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key);
 
@@ -1172,7 +1166,7 @@ GNUNET_CONTAINER_multipeermap_contains (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multipeermap_contains_value (
+GNUNET_CONTAINER_multipeermap_contains_value(
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key,
   const void *value);
@@ -1192,7 +1186,7 @@ GNUNET_CONTAINER_multipeermap_contains_value (
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multipeermap_put (
+GNUNET_CONTAINER_multipeermap_put(
   struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key,
   void *value,
@@ -1207,7 +1201,7 @@ GNUNET_CONTAINER_multipeermap_put (
  * @return the number of key value pairs
  */
 unsigned int
-GNUNET_CONTAINER_multipeermap_size (
+GNUNET_CONTAINER_multipeermap_size(
   const struct GNUNET_CONTAINER_MultiPeerMap *map);
 
 
@@ -1222,7 +1216,7 @@ GNUNET_CONTAINER_multipeermap_size (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multipeermap_iterate (
+GNUNET_CONTAINER_multipeermap_iterate(
   struct GNUNET_CONTAINER_MultiPeerMap *map,
   GNUNET_CONTAINER_PeerMapIterator it,
   void *it_cls);
@@ -1243,7 +1237,7 @@ struct GNUNET_CONTAINER_MultiPeerMapIterator;
  * @return an iterator over the given multihashmap @a map
  */
 struct GNUNET_CONTAINER_MultiPeerMapIterator *
-GNUNET_CONTAINER_multipeermap_iterator_create (
+GNUNET_CONTAINER_multipeermap_iterator_create(
   const struct GNUNET_CONTAINER_MultiPeerMap *map);
 
 
@@ -1263,7 +1257,7 @@ GNUNET_CONTAINER_multipeermap_iterator_create (
  *         #GNUNET_NO if we are out of elements
  */
 int
-GNUNET_CONTAINER_multipeermap_iterator_next (
+GNUNET_CONTAINER_multipeermap_iterator_next(
   struct GNUNET_CONTAINER_MultiPeerMapIterator *iter,
   struct GNUNET_PeerIdentity *key,
   const void **value);
@@ -1276,7 +1270,7 @@ GNUNET_CONTAINER_multipeermap_iterator_next (
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multipeermap_iterator_destroy (
+GNUNET_CONTAINER_multipeermap_iterator_destroy(
   struct GNUNET_CONTAINER_MultiPeerMapIterator *iter);
 
 
@@ -1292,7 +1286,7 @@ GNUNET_CONTAINER_multipeermap_iterator_destroy (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multipeermap_get_multiple (
+GNUNET_CONTAINER_multipeermap_get_multiple(
   struct GNUNET_CONTAINER_MultiPeerMap *map,
   const struct GNUNET_PeerIdentity *key,
   GNUNET_CONTAINER_PeerMapIterator it,
@@ -1311,7 +1305,7 @@ GNUNET_CONTAINER_multipeermap_get_multiple (
  * @return the number of key value pairs processed, zero or one.
  */
 unsigned int
-GNUNET_CONTAINER_multipeermap_get_random (
+GNUNET_CONTAINER_multipeermap_get_random(
   const struct GNUNET_CONTAINER_MultiPeerMap *map,
   GNUNET_CONTAINER_PeerMapIterator it,
   void *it_cls);
@@ -1359,7 +1353,7 @@ struct GNUNET_CONTAINER_MultiShortmap;
  * @return NULL on error
  */
 struct GNUNET_CONTAINER_MultiShortmap *
-GNUNET_CONTAINER_multishortmap_create (unsigned int len, int do_not_copy_keys);
+GNUNET_CONTAINER_multishortmap_create(unsigned int len, int do_not_copy_keys);
 
 
 /**
@@ -1370,7 +1364,7 @@ GNUNET_CONTAINER_multishortmap_create (unsigned int len, int do_not_copy_keys);
  * @param map the map
  */
 void
-GNUNET_CONTAINER_multishortmap_destroy (
+GNUNET_CONTAINER_multishortmap_destroy(
   struct GNUNET_CONTAINER_MultiShortmap *map);
 
 
@@ -1386,7 +1380,7 @@ GNUNET_CONTAINER_multishortmap_destroy (
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multishortmap_get (
+GNUNET_CONTAINER_multishortmap_get(
   const struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key);
 
@@ -1404,7 +1398,7 @@ GNUNET_CONTAINER_multishortmap_get (
  *  is not in the map
  */
 int
-GNUNET_CONTAINER_multishortmap_remove (
+GNUNET_CONTAINER_multishortmap_remove(
   struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key,
   const void *value);
@@ -1419,7 +1413,7 @@ GNUNET_CONTAINER_multishortmap_remove (
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multishortmap_remove_all (
+GNUNET_CONTAINER_multishortmap_remove_all(
   struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key);
 
@@ -1435,7 +1429,7 @@ GNUNET_CONTAINER_multishortmap_remove_all (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multishortmap_contains (
+GNUNET_CONTAINER_multishortmap_contains(
   const struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key);
 
@@ -1452,7 +1446,7 @@ GNUNET_CONTAINER_multishortmap_contains (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multishortmap_contains_value (
+GNUNET_CONTAINER_multishortmap_contains_value(
   const struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key,
   const void *value);
@@ -1472,7 +1466,7 @@ GNUNET_CONTAINER_multishortmap_contains_value (
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multishortmap_put (
+GNUNET_CONTAINER_multishortmap_put(
   struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key,
   void *value,
@@ -1487,7 +1481,7 @@ GNUNET_CONTAINER_multishortmap_put (
  * @return the number of key value pairs
  */
 unsigned int
-GNUNET_CONTAINER_multishortmap_size (
+GNUNET_CONTAINER_multishortmap_size(
   const struct GNUNET_CONTAINER_MultiShortmap *map);
 
 
@@ -1502,7 +1496,7 @@ GNUNET_CONTAINER_multishortmap_size (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multishortmap_iterate (
+GNUNET_CONTAINER_multishortmap_iterate(
   struct GNUNET_CONTAINER_MultiShortmap *map,
   GNUNET_CONTAINER_ShortmapIterator it,
   void *it_cls);
@@ -1525,7 +1519,7 @@ struct GNUNET_CONTAINER_MultiShortmapIterator;
  * @return an iterator over the given multihashmap @a map
  */
 struct GNUNET_CONTAINER_MultiShortmapIterator *
-GNUNET_CONTAINER_multishortmap_iterator_create (
+GNUNET_CONTAINER_multishortmap_iterator_create(
   const struct GNUNET_CONTAINER_MultiShortmap *map);
 
 
@@ -1545,7 +1539,7 @@ GNUNET_CONTAINER_multishortmap_iterator_create (
  *         #GNUNET_NO if we are out of elements
  */
 int
-GNUNET_CONTAINER_multishortmap_iterator_next (
+GNUNET_CONTAINER_multishortmap_iterator_next(
   struct GNUNET_CONTAINER_MultiShortmapIterator *iter,
   struct GNUNET_ShortHashCode *key,
   const void **value);
@@ -1558,7 +1552,7 @@ GNUNET_CONTAINER_multishortmap_iterator_next (
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multishortmap_iterator_destroy (
+GNUNET_CONTAINER_multishortmap_iterator_destroy(
   struct GNUNET_CONTAINER_MultiShortmapIterator *iter);
 
 
@@ -1574,7 +1568,7 @@ GNUNET_CONTAINER_multishortmap_iterator_destroy (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multishortmap_get_multiple (
+GNUNET_CONTAINER_multishortmap_get_multiple(
   struct GNUNET_CONTAINER_MultiShortmap *map,
   const struct GNUNET_ShortHashCode *key,
   GNUNET_CONTAINER_ShortmapIterator it,
@@ -1593,7 +1587,7 @@ GNUNET_CONTAINER_multishortmap_get_multiple (
  * @return the number of key value pairs processed, zero or one.
  */
 unsigned int
-GNUNET_CONTAINER_multishortmap_get_random (
+GNUNET_CONTAINER_multishortmap_get_random(
   const struct GNUNET_CONTAINER_MultiShortmap *map,
   GNUNET_CONTAINER_ShortmapIterator it,
   void *it_cls);
@@ -1642,7 +1636,7 @@ struct GNUNET_CONTAINER_MultiUuidmap;
  * @return NULL on error
  */
 struct GNUNET_CONTAINER_MultiUuidmap *
-GNUNET_CONTAINER_multiuuidmap_create (unsigned int len, int do_not_copy_keys);
+GNUNET_CONTAINER_multiuuidmap_create(unsigned int len, int do_not_copy_keys);
 
 
 /**
@@ -1653,7 +1647,7 @@ GNUNET_CONTAINER_multiuuidmap_create (unsigned int len, int do_not_copy_keys);
  * @param map the map
  */
 void
-GNUNET_CONTAINER_multiuuidmap_destroy (
+GNUNET_CONTAINER_multiuuidmap_destroy(
   struct GNUNET_CONTAINER_MultiUuidmap *map);
 
 
@@ -1669,7 +1663,7 @@ GNUNET_CONTAINER_multiuuidmap_destroy (
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multiuuidmap_get (
+GNUNET_CONTAINER_multiuuidmap_get(
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key);
 
@@ -1687,9 +1681,9 @@ GNUNET_CONTAINER_multiuuidmap_get (
  *  is not in the map
  */
 int
-GNUNET_CONTAINER_multiuuidmap_remove (struct GNUNET_CONTAINER_MultiUuidmap *map,
-                                      const struct GNUNET_Uuid *key,
-                                      const void *value);
+GNUNET_CONTAINER_multiuuidmap_remove(struct GNUNET_CONTAINER_MultiUuidmap *map,
+                                     const struct GNUNET_Uuid *key,
+                                     const void *value);
 
 /**
  * @ingroup hashmap
@@ -1701,7 +1695,7 @@ GNUNET_CONTAINER_multiuuidmap_remove (struct GNUNET_CONTAINER_MultiUuidmap *map,
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multiuuidmap_remove_all (
+GNUNET_CONTAINER_multiuuidmap_remove_all(
   struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key);
 
@@ -1717,7 +1711,7 @@ GNUNET_CONTAINER_multiuuidmap_remove_all (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multiuuidmap_contains (
+GNUNET_CONTAINER_multiuuidmap_contains(
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key);
 
@@ -1734,7 +1728,7 @@ GNUNET_CONTAINER_multiuuidmap_contains (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multiuuidmap_contains_value (
+GNUNET_CONTAINER_multiuuidmap_contains_value(
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key,
   const void *value);
@@ -1754,7 +1748,7 @@ GNUNET_CONTAINER_multiuuidmap_contains_value (
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multiuuidmap_put (
+GNUNET_CONTAINER_multiuuidmap_put(
   struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key,
   void *value,
@@ -1769,7 +1763,7 @@ GNUNET_CONTAINER_multiuuidmap_put (
  * @return the number of key value pairs
  */
 unsigned int
-GNUNET_CONTAINER_multiuuidmap_size (
+GNUNET_CONTAINER_multiuuidmap_size(
   const struct GNUNET_CONTAINER_MultiUuidmap *map);
 
 
@@ -1784,7 +1778,7 @@ GNUNET_CONTAINER_multiuuidmap_size (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multiuuidmap_iterate (
+GNUNET_CONTAINER_multiuuidmap_iterate(
   struct GNUNET_CONTAINER_MultiUuidmap *map,
   GNUNET_CONTAINER_MultiUuidmapIteratorCallback it,
   void *it_cls);
@@ -1807,7 +1801,7 @@ struct GNUNET_CONTAINER_MultiUuidmapIterator;
  * @return an iterator over the given multihashmap @a map
  */
 struct GNUNET_CONTAINER_MultiUuidmapIterator *
-GNUNET_CONTAINER_multiuuidmap_iterator_create (
+GNUNET_CONTAINER_multiuuidmap_iterator_create(
   const struct GNUNET_CONTAINER_MultiUuidmap *map);
 
 
@@ -1827,7 +1821,7 @@ GNUNET_CONTAINER_multiuuidmap_iterator_create (
  *         #GNUNET_NO if we are out of elements
  */
 int
-GNUNET_CONTAINER_multiuuidmap_iterator_next (
+GNUNET_CONTAINER_multiuuidmap_iterator_next(
   struct GNUNET_CONTAINER_MultiUuidmapIterator *iter,
   struct GNUNET_Uuid *key,
   const void **value);
@@ -1840,7 +1834,7 @@ GNUNET_CONTAINER_multiuuidmap_iterator_next (
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multiuuidmap_iterator_destroy (
+GNUNET_CONTAINER_multiuuidmap_iterator_destroy(
   struct GNUNET_CONTAINER_MultiUuidmapIterator *iter);
 
 
@@ -1856,7 +1850,7 @@ GNUNET_CONTAINER_multiuuidmap_iterator_destroy (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multiuuidmap_get_multiple (
+GNUNET_CONTAINER_multiuuidmap_get_multiple(
   struct GNUNET_CONTAINER_MultiUuidmap *map,
   const struct GNUNET_Uuid *key,
   GNUNET_CONTAINER_MultiUuidmapIteratorCallback it,
@@ -1875,7 +1869,7 @@ GNUNET_CONTAINER_multiuuidmap_get_multiple (
  * @return the number of key value pairs processed, zero or one.
  */
 unsigned int
-GNUNET_CONTAINER_multiuuidmap_get_random (
+GNUNET_CONTAINER_multiuuidmap_get_random(
   const struct GNUNET_CONTAINER_MultiUuidmap *map,
   GNUNET_CONTAINER_MultiUuidmapIteratorCallback it,
   void *it_cls);
@@ -1922,7 +1916,7 @@ typedef int (*GNUNET_CONTAINER_MulitHashMapIterator32Callback) (void *cls,
  * @return NULL on error
  */
 struct GNUNET_CONTAINER_MultiHashMap32 *
-GNUNET_CONTAINER_multihashmap32_create (unsigned int len);
+GNUNET_CONTAINER_multihashmap32_create(unsigned int len);
 
 
 /**
@@ -1933,7 +1927,7 @@ GNUNET_CONTAINER_multihashmap32_create (unsigned int len);
  * @param map the map
  */
 void
-GNUNET_CONTAINER_multihashmap32_destroy (
+GNUNET_CONTAINER_multihashmap32_destroy(
   struct GNUNET_CONTAINER_MultiHashMap32 *map);
 
 
@@ -1945,7 +1939,7 @@ GNUNET_CONTAINER_multihashmap32_destroy (
  * @return the number of key value pairs
  */
 unsigned int
-GNUNET_CONTAINER_multihashmap32_size (
+GNUNET_CONTAINER_multihashmap32_size(
   const struct GNUNET_CONTAINER_MultiHashMap32 *map);
 
 
@@ -1961,7 +1955,7 @@ GNUNET_CONTAINER_multihashmap32_size (
  *   key-value pairs with value NULL
  */
 void *
-GNUNET_CONTAINER_multihashmap32_get (
+GNUNET_CONTAINER_multihashmap32_get(
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key);
 
@@ -1977,7 +1971,7 @@ GNUNET_CONTAINER_multihashmap32_get (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multihashmap32_iterate (
+GNUNET_CONTAINER_multihashmap32_iterate(
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
   GNUNET_CONTAINER_MulitHashMapIterator32Callback it,
   void *it_cls);
@@ -1996,7 +1990,7 @@ GNUNET_CONTAINER_multihashmap32_iterate (
  *  is not in the map
  */
 int
-GNUNET_CONTAINER_multihashmap32_remove (
+GNUNET_CONTAINER_multihashmap32_remove(
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key,
   const void *value);
@@ -2012,7 +2006,7 @@ GNUNET_CONTAINER_multihashmap32_remove (
  * @return number of values removed
  */
 int
-GNUNET_CONTAINER_multihashmap32_remove_all (
+GNUNET_CONTAINER_multihashmap32_remove_all(
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key);
 
@@ -2028,7 +2022,7 @@ GNUNET_CONTAINER_multihashmap32_remove_all (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap32_contains (
+GNUNET_CONTAINER_multihashmap32_contains(
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key);
 
@@ -2045,7 +2039,7 @@ GNUNET_CONTAINER_multihashmap32_contains (
  *         #GNUNET_NO if not
  */
 int
-GNUNET_CONTAINER_multihashmap32_contains_value (
+GNUNET_CONTAINER_multihashmap32_contains_value(
   const struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key,
   const void *value);
@@ -2065,7 +2059,7 @@ GNUNET_CONTAINER_multihashmap32_contains_value (
  *                       value already exists
  */
 int
-GNUNET_CONTAINER_multihashmap32_put (
+GNUNET_CONTAINER_multihashmap32_put(
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key,
   void *value,
@@ -2084,7 +2078,7 @@ GNUNET_CONTAINER_multihashmap32_put (
  *         #GNUNET_SYSERR if it aborted iteration
  */
 int
-GNUNET_CONTAINER_multihashmap32_get_multiple (
+GNUNET_CONTAINER_multihashmap32_get_multiple(
   struct GNUNET_CONTAINER_MultiHashMap32 *map,
   uint32_t key,
   GNUNET_CONTAINER_MulitHashMapIterator32Callback it,
@@ -2104,7 +2098,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (
  * @return an iterator over the given multihashmap map
  */
 struct GNUNET_CONTAINER_MultiHashMap32Iterator *
-GNUNET_CONTAINER_multihashmap32_iterator_create (
+GNUNET_CONTAINER_multihashmap32_iterator_create(
   const struct GNUNET_CONTAINER_MultiHashMap32 *map);
 
 
@@ -2123,7 +2117,7 @@ GNUNET_CONTAINER_multihashmap32_iterator_create (
  *         #GNUNET_NO if we are out of elements
  */
 int
-GNUNET_CONTAINER_multihashmap32_iterator_next (
+GNUNET_CONTAINER_multihashmap32_iterator_next(
   struct GNUNET_CONTAINER_MultiHashMap32Iterator *iter,
   uint32_t *key,
   const void **value);
@@ -2135,7 +2129,7 @@ GNUNET_CONTAINER_multihashmap32_iterator_next (
  * @param iter the iterator to destroy
  */
 void
-GNUNET_CONTAINER_multihashmap32_iterator_destroy (
+GNUNET_CONTAINER_multihashmap32_iterator_destroy(
   struct GNUNET_CONTAINER_MultiHashMapIterator *iter);
 
 
@@ -2153,17 +2147,17 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_DLL_insert(head, tail, element)                \
   do                                                                    \
-  {                                                                     \
-    GNUNET_assert (((element)->prev == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next == NULL) && ((tail) != (element))); \
-    (element)->next = (head);                                           \
-    (element)->prev = NULL;                                             \
-    if ((tail) == NULL)                                                 \
+    {                                                                     \
+      GNUNET_assert(((element)->prev == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next == NULL) && ((tail) != (element))); \
+      (element)->next = (head);                                           \
+      (element)->prev = NULL;                                             \
+      if ((tail) == NULL)                                                 \
       (tail) = element;                                                 \
-    else                                                                \
-      (head)->prev = element;                                           \
-    (head) = (element);                                                 \
-  } while (0)
+      else                                                                \
+      (head) ->prev = element;                                           \
+      (head) = (element);                                                 \
+    } while (0)
 
 
 /**
@@ -2177,17 +2171,17 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_DLL_insert_tail(head, tail, element)           \
   do                                                                    \
-  {                                                                     \
-    GNUNET_assert (((element)->prev == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next == NULL) && ((tail) != (element))); \
-    (element)->prev = (tail);                                           \
-    (element)->next = NULL;                                             \
-    if ((head) == NULL)                                                 \
+    {                                                                     \
+      GNUNET_assert(((element)->prev == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next == NULL) && ((tail) != (element))); \
+      (element)->prev = (tail);                                           \
+      (element)->next = NULL;                                             \
+      if ((head) == NULL)                                                 \
       (head) = element;                                                 \
-    else                                                                \
-      (tail)->next = element;                                           \
-    (tail) = (element);                                                 \
-  } while (0)
+      else                                                                \
+      (tail) ->next = element;                                           \
+      (tail) = (element);                                                 \
+    } while (0)
 
 
 /**
@@ -2202,25 +2196,25 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_DLL_insert_after(head, tail, other, element)   \
   do                                                                    \
-  {                                                                     \
-    GNUNET_assert (((element)->prev == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next == NULL) && ((tail) != (element))); \
-    (element)->prev = (other);                                          \
-    if (NULL == other)                                                  \
-    {                                                                   \
-      (element)->next = (head);                                         \
-      (head) = (element);                                               \
-    }                                                                   \
-    else                                                                \
-    {                                                                   \
-      (element)->next = (other)->next;                                  \
-      (other)->next = (element);                                        \
-    }                                                                   \
-    if (NULL == (element)->next)                                        \
+    {                                                                     \
+      GNUNET_assert(((element)->prev == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next == NULL) && ((tail) != (element))); \
+      (element)->prev = (other);                                          \
+      if (NULL == other)                                                  \
+        {                                                                   \
+          (element)->next = (head);                                         \
+          (head) = (element);                                               \
+        }                                                                   \
+      else                                                                \
+        {                                                                   \
+          (element)->next = (other)->next;                                  \
+          (other)->next = (element);                                        \
+        }                                                                   \
+      if (NULL == (element)->next)                                        \
       (tail) = (element);                                               \
-    else                                                                \
-      (element)->next->prev = (element);                                \
-  } while (0)
+      else                                                                \
+      (element) ->next->prev = (element);                                \
+    } while (0)
 
 
 /**
@@ -2235,25 +2229,25 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_DLL_insert_before(head, tail, other, element)  \
   do                                                                    \
-  {                                                                     \
-    GNUNET_assert (((element)->prev == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next == NULL) && ((tail) != (element))); \
-    (element)->next = (other);                                          \
-    if (NULL == other)                                                  \
-    {                                                                   \
-      (element)->prev = (tail);                                         \
-      (tail) = (element);                                               \
-    }                                                                   \
-    else                                                                \
-    {                                                                   \
-      (element)->prev = (other)->prev;                                  \
-      (other)->prev = (element);                                        \
-    }                                                                   \
-    if (NULL == (element)->prev)                                        \
+    {                                                                     \
+      GNUNET_assert(((element)->prev == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next == NULL) && ((tail) != (element))); \
+      (element)->next = (other);                                          \
+      if (NULL == other)                                                  \
+        {                                                                   \
+          (element)->prev = (tail);                                         \
+          (tail) = (element);                                               \
+        }                                                                   \
+      else                                                                \
+        {                                                                   \
+          (element)->prev = (other)->prev;                                  \
+          (other)->prev = (element);                                        \
+        }                                                                   \
+      if (NULL == (element)->prev)                                        \
       (head) = (element);                                               \
-    else                                                                \
-      (element)->prev->next = (element);                                \
-  } while (0)
+      else                                                                \
+      (element) ->prev->next = (element);                                \
+    } while (0)
 
 
 /**
@@ -2272,20 +2266,20 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_DLL_remove(head, tail, element)                \
   do                                                                    \
-  {                                                                     \
-    GNUNET_assert (((element)->prev != NULL) || ((head) == (element))); \
-    GNUNET_assert (((element)->next != NULL) || ((tail) == (element))); \
-    if ((element)->prev == NULL)                                        \
+    {                                                                     \
+      GNUNET_assert(((element)->prev != NULL) || ((head) == (element))); \
+      GNUNET_assert(((element)->next != NULL) || ((tail) == (element))); \
+      if ((element)->prev == NULL)                                        \
       (head) = (element)->next;                                         \
-    else                                                                \
-      (element)->prev->next = (element)->next;                          \
-    if ((element)->next == NULL)                                        \
+      else                                                                \
+      (element) ->prev->next = (element)->next;                          \
+      if ((element)->next == NULL)                                        \
       (tail) = (element)->prev;                                         \
-    else                                                                \
-      (element)->next->prev = (element)->prev;                          \
-    (element)->next = NULL;                                             \
-    (element)->prev = NULL;                                             \
-  } while (0)
+      else                                                                \
+      (element) ->next->prev = (element)->prev;                          \
+      (element)->next = NULL;                                             \
+      (element)->prev = NULL;                                             \
+    } while (0)
 
 
 /* ************ Multi-DLL interface, allows DLL elements to be
@@ -2303,17 +2297,17 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_MDLL_insert(mdll, head, tail, element)                \
   do                                                                           \
-  {                                                                            \
-    GNUNET_assert (((element)->prev_##mdll == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next_##mdll == NULL) && ((tail) != (element))); \
-    (element)->next_##mdll = (head);                                           \
-    (element)->prev_##mdll = NULL;                                             \
-    if ((tail) == NULL)                                                        \
+    {                                                                            \
+      GNUNET_assert(((element)->prev_ ## mdll == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next_ ## mdll == NULL) && ((tail) != (element))); \
+      (element)->next_ ## mdll = (head);                                           \
+      (element)->prev_ ## mdll = NULL;                                             \
+      if ((tail) == NULL)                                                        \
       (tail) = element;                                                        \
-    else                                                                       \
-      (head)->prev_##mdll = element;                                           \
-    (head) = (element);                                                        \
-  } while (0)
+      else                                                                       \
+      (head) ->prev_ ## mdll = element;                                           \
+      (head) = (element);                                                        \
+    } while (0)
 
 
 /**
@@ -2328,17 +2322,17 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_MDLL_insert_tail(mdll, head, tail, element)           \
   do                                                                           \
-  {                                                                            \
-    GNUNET_assert (((element)->prev_##mdll == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next_##mdll == NULL) && ((tail) != (element))); \
-    (element)->prev_##mdll = (tail);                                           \
-    (element)->next_##mdll = NULL;                                             \
-    if ((head) == NULL)                                                        \
+    {                                                                            \
+      GNUNET_assert(((element)->prev_ ## mdll == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next_ ## mdll == NULL) && ((tail) != (element))); \
+      (element)->prev_ ## mdll = (tail);                                           \
+      (element)->next_ ## mdll = NULL;                                             \
+      if ((head) == NULL)                                                        \
       (head) = element;                                                        \
-    else                                                                       \
-      (tail)->next_##mdll = element;                                           \
-    (tail) = (element);                                                        \
-  } while (0)
+      else                                                                       \
+      (tail) ->next_ ## mdll = element;                                           \
+      (tail) = (element);                                                        \
+    } while (0)
 
 
 /**
@@ -2354,25 +2348,25 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_MDLL_insert_after(mdll, head, tail, other, element)   \
   do                                                                           \
-  {                                                                            \
-    GNUNET_assert (((element)->prev_##mdll == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next_##mdll == NULL) && ((tail) != (element))); \
-    (element)->prev_##mdll = (other);                                          \
-    if (NULL == other)                                                         \
-    {                                                                          \
-      (element)->next_##mdll = (head);                                         \
-      (head) = (element);                                                      \
-    }                                                                          \
-    else                                                                       \
-    {                                                                          \
-      (element)->next_##mdll = (other)->next_##mdll;                           \
-      (other)->next_##mdll = (element);                                        \
-    }                                                                          \
-    if (NULL == (element)->next_##mdll)                                        \
+    {                                                                            \
+      GNUNET_assert(((element)->prev_ ## mdll == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next_ ## mdll == NULL) && ((tail) != (element))); \
+      (element)->prev_ ## mdll = (other);                                          \
+      if (NULL == other)                                                         \
+        {                                                                          \
+          (element)->next_ ## mdll = (head);                                         \
+          (head) = (element);                                                      \
+        }                                                                          \
+      else                                                                       \
+        {                                                                          \
+          (element)->next_ ## mdll = (other)->next_ ## mdll;                           \
+          (other)->next_ ## mdll = (element);                                        \
+        }                                                                          \
+      if (NULL == (element)->next_ ## mdll)                                        \
       (tail) = (element);                                                      \
-    else                                                                       \
-      (element)->next_##mdll->prev_##mdll = (element);                         \
-  } while (0)
+      else                                                                       \
+      (element) ->next_ ## mdll->prev_ ## mdll = (element);                         \
+    } while (0)
 
 
 /**
@@ -2388,25 +2382,25 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_MDLL_insert_before(mdll, head, tail, other, element)  \
   do                                                                           \
-  {                                                                            \
-    GNUNET_assert (((element)->prev_##mdll == NULL) && ((head) != (element))); \
-    GNUNET_assert (((element)->next_##mdll == NULL) && ((tail) != (element))); \
-    (element)->next_##mdll = (other);                                          \
-    if (NULL == other)                                                         \
-    {                                                                          \
-      (element)->prev = (tail);                                                \
-      (tail) = (element);                                                      \
-    }                                                                          \
-    else                                                                       \
-    {                                                                          \
-      (element)->prev_##mdll = (other)->prev_##mdll;                           \
-      (other)->prev_##mdll = (element);                                        \
-    }                                                                          \
-    if (NULL == (element)->prev_##mdll)                                        \
+    {                                                                            \
+      GNUNET_assert(((element)->prev_ ## mdll == NULL) && ((head) != (element))); \
+      GNUNET_assert(((element)->next_ ## mdll == NULL) && ((tail) != (element))); \
+      (element)->next_ ## mdll = (other);                                          \
+      if (NULL == other)                                                         \
+        {                                                                          \
+          (element)->prev = (tail);                                                \
+          (tail) = (element);                                                      \
+        }                                                                          \
+      else                                                                       \
+        {                                                                          \
+          (element)->prev_ ## mdll = (other)->prev_ ## mdll;                           \
+          (other)->prev_ ## mdll = (element);                                        \
+        }                                                                          \
+      if (NULL == (element)->prev_ ## mdll)                                        \
       (head) = (element);                                                      \
-    else                                                                       \
-      (element)->prev_##mdll->next_##mdll = (element);                         \
-  } while (0)
+      else                                                                       \
+      (element) ->prev_ ## mdll->next_ ## mdll = (element);                         \
+    } while (0)
 
 
 /**
@@ -2422,20 +2416,20 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  */
 #define GNUNET_CONTAINER_MDLL_remove(mdll, head, tail, element)                \
   do                                                                           \
-  {                                                                            \
-    GNUNET_assert (((element)->prev_##mdll != NULL) || ((head) == (element))); \
-    GNUNET_assert (((element)->next_##mdll != NULL) || ((tail) == (element))); \
-    if ((element)->prev_##mdll == NULL)                                        \
-      (head) = (element)->next_##mdll;                                         \
-    else                                                                       \
-      (element)->prev_##mdll->next_##mdll = (element)->next_##mdll;            \
-    if ((element)->next_##mdll == NULL)                                        \
-      (tail) = (element)->prev_##mdll;                                         \
-    else                                                                       \
-      (element)->next_##mdll->prev_##mdll = (element)->prev_##mdll;            \
-    (element)->next_##mdll = NULL;                                             \
-    (element)->prev_##mdll = NULL;                                             \
-  } while (0)
+    {                                                                            \
+      GNUNET_assert(((element)->prev_ ## mdll != NULL) || ((head) == (element))); \
+      GNUNET_assert(((element)->next_ ## mdll != NULL) || ((tail) == (element))); \
+      if ((element)->prev_ ## mdll == NULL)                                        \
+      (head) = (element)->next_ ## mdll;                                         \
+      else                                                                       \
+      (element) ->prev_ ## mdll->next_ ## mdll = (element)->next_ ## mdll;            \
+      if ((element)->next_ ## mdll == NULL)                                        \
+      (tail) = (element)->prev_ ## mdll;                                         \
+      else                                                                       \
+      (element) ->next_ ## mdll->prev_ ## mdll = (element)->prev_ ## mdll;            \
+      (element)->next_ ## mdll = NULL;                                             \
+      (element)->prev_ ## mdll = NULL;                                             \
+    } while (0)
 
 
 /**
@@ -2458,29 +2452,29 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
                                            tail,                            \
                                            element)                         \
   do                                                                        \
-  {                                                                         \
-    if ((NULL == head) || (0 < comparator (comparator_cls, element, head))) \
-    {                                                                       \
-      /* insert at head, element < head */                                  \
-      GNUNET_CONTAINER_DLL_insert (head, tail, element);                    \
-    }                                                                       \
-    else                                                                    \
-    {                                                                       \
-      TYPE *pos;                                                            \
+    {                                                                         \
+      if ((NULL == head) || (0 < comparator(comparator_cls, element, head))) \
+        {                                                                       \
+          /* insert at head, element < head */                                  \
+          GNUNET_CONTAINER_DLL_insert(head, tail, element);                    \
+        }                                                                       \
+      else                                                                    \
+        {                                                                       \
+          TYPE *pos;                                                            \
                                                                             \
-      for (pos = head; NULL != pos; pos = pos->next)                        \
-        if (0 < comparator (comparator_cls, element, pos))                  \
+          for (pos = head; NULL != pos; pos = pos->next)                        \
+          if (0 < comparator(comparator_cls, element, pos))                  \
           break; /* element < pos */                                        \
-      if (NULL == pos) /* => element > tail */                              \
-      {                                                                     \
-        GNUNET_CONTAINER_DLL_insert_tail (head, tail, element);             \
-      }                                                                     \
-      else /* prev < element < pos */                                       \
-      {                                                                     \
-        GNUNET_CONTAINER_DLL_insert_after (head, tail, pos->prev, element); \
-      }                                                                     \
-    }                                                                       \
-  } while (0)
+          if (NULL == pos) /* => element > tail */                              \
+            {                                                                     \
+              GNUNET_CONTAINER_DLL_insert_tail(head, tail, element);             \
+            }                                                                     \
+          else /* prev < element < pos */                                       \
+            {                                                                     \
+              GNUNET_CONTAINER_DLL_insert_after(head, tail, pos->prev, element); \
+            }                                                                     \
+        }                                                                       \
+    } while (0)
 
 
 /* ******************** Heap *************** */
@@ -2497,8 +2491,7 @@ typedef uint64_t GNUNET_CONTAINER_HeapCostType;
  * @ingroup heap
  * Heap type, either max or min.
  */
-enum GNUNET_CONTAINER_HeapOrder
-{
+enum GNUNET_CONTAINER_HeapOrder {
   /**
    * @ingroup heap
    * Heap with the maximum cost at the root.
@@ -2535,7 +2528,7 @@ struct GNUNET_CONTAINER_HeapNode;
  * @return handle to the heap
  */
 struct GNUNET_CONTAINER_Heap *
-GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order);
+GNUNET_CONTAINER_heap_create(enum GNUNET_CONTAINER_HeapOrder order);
 
 
 /**
@@ -2546,7 +2539,7 @@ GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order);
  * @param heap heap to destroy
  */
 void
-GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap);
+GNUNET_CONTAINER_heap_destroy(struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -2557,7 +2550,7 @@ GNUNET_CONTAINER_heap_destroy (struct GNUNET_CONTAINER_Heap *heap);
  * @return Element at the root, or NULL if heap is empty.
  */
 void *
-GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
+GNUNET_CONTAINER_heap_peek(const struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -2570,9 +2563,9 @@ GNUNET_CONTAINER_heap_peek (const struct GNUNET_CONTAINER_Heap *heap);
  *         #GNUNET_NO  if the heap is empty.
  */
 int
-GNUNET_CONTAINER_heap_peek2 (const struct GNUNET_CONTAINER_Heap *heap,
-                             void **element,
-                             GNUNET_CONTAINER_HeapCostType *cost);
+GNUNET_CONTAINER_heap_peek2(const struct GNUNET_CONTAINER_Heap *heap,
+                            void **element,
+                            GNUNET_CONTAINER_HeapCostType *cost);
 
 
 /**
@@ -2583,7 +2576,7 @@ GNUNET_CONTAINER_heap_peek2 (const struct GNUNET_CONTAINER_Heap *heap,
  * @return number of elements stored
  */
 unsigned int
-GNUNET_CONTAINER_heap_get_size (const struct GNUNET_CONTAINER_Heap *heap);
+GNUNET_CONTAINER_heap_get_size(const struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -2594,7 +2587,7 @@ GNUNET_CONTAINER_heap_get_size (const struct GNUNET_CONTAINER_Heap *heap);
  * @return cost of the node
  */
 GNUNET_CONTAINER_HeapCostType
-GNUNET_CONTAINER_heap_node_get_cost (
+GNUNET_CONTAINER_heap_node_get_cost(
   const struct GNUNET_CONTAINER_HeapNode *node);
 
 
@@ -2625,9 +2618,9 @@ typedef int (*GNUNET_CONTAINER_HeapIterator) (
  * @param iterator_cls closure for @a iterator
  */
 void
-GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
-                               GNUNET_CONTAINER_HeapIterator iterator,
-                               void *iterator_cls);
+GNUNET_CONTAINER_heap_iterate(const struct GNUNET_CONTAINER_Heap *heap,
+                              GNUNET_CONTAINER_HeapIterator iterator,
+                              void *iterator_cls);
 
 /**
  * @ingroup heap
@@ -2642,7 +2635,7 @@ GNUNET_CONTAINER_heap_iterate (const struct GNUNET_CONTAINER_Heap *heap,
  *         NULL if the tree is empty.
  */
 void *
-GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap *heap);
+GNUNET_CONTAINER_heap_walk_get_next(struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -2655,9 +2648,9 @@ GNUNET_CONTAINER_heap_walk_get_next (struct GNUNET_CONTAINER_Heap *heap);
  * @return node for the new element
  */
 struct GNUNET_CONTAINER_HeapNode *
-GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap,
-                              void *element,
-                              GNUNET_CONTAINER_HeapCostType cost);
+GNUNET_CONTAINER_heap_insert(struct GNUNET_CONTAINER_Heap *heap,
+                             void *element,
+                             GNUNET_CONTAINER_HeapCostType cost);
 
 
 /**
@@ -2668,7 +2661,7 @@ GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap,
  * @return element data stored at the root node
  */
 void *
-GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
+GNUNET_CONTAINER_heap_remove_root(struct GNUNET_CONTAINER_Heap *heap);
 
 
 /**
@@ -2679,7 +2672,7 @@ GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
  * @return element data stored at the node, NULL if heap is empty
  */
 void *
-GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_HeapNode *node);
+GNUNET_CONTAINER_heap_remove_node(struct GNUNET_CONTAINER_HeapNode *node);
 
 
 /**
@@ -2690,8 +2683,8 @@ GNUNET_CONTAINER_heap_remove_node (struct GNUNET_CONTAINER_HeapNode *node);
  * @param new_cost new cost for the node
  */
 void
-GNUNET_CONTAINER_heap_update_cost (struct GNUNET_CONTAINER_HeapNode *node,
-                                   GNUNET_CONTAINER_HeapCostType new_cost);
+GNUNET_CONTAINER_heap_update_cost(struct GNUNET_CONTAINER_HeapNode *node,
+                                  GNUNET_CONTAINER_HeapCostType new_cost);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index 64da5380e..a15e71f0d 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -1,19 +1,19 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2013, 2014, 2016 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2013, 2014, 2016 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -53,7 +53,7 @@
 #ifdef __cplusplus
 extern "C"
 {
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -86,9 +86,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * may also specify the phone line that is used (typically zero).
  * The version is also right now always zero.
  */
-struct GNUNET_CONVERSATION_PhoneRecord
-{
-
+struct GNUNET_CONVERSATION_PhoneRecord {
   /**
    * Version of the phone record, for now always one.  We may
    * use other versions for anonymously hosted phone lines in
@@ -110,7 +108,6 @@ struct GNUNET_CONVERSATION_PhoneRecord
    * Phone line (CADET port) to connect to.
    */
   struct GNUNET_HashCode line_port;
-
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -118,8 +115,7 @@ GNUNET_NETWORK_STRUCT_END
 /**
  * Information about active callers to a phone.
  */
-enum GNUNET_CONVERSATION_PhoneEventCode
-{
+enum GNUNET_CONVERSATION_PhoneEventCode {
   /**
    * We are the callee and the phone is ringing.
    * We should accept the call or hang up.
@@ -131,7 +127,6 @@ enum GNUNET_CONVERSATION_PhoneEventCode
    * We must no longer use the caller's handle.
    */
   GNUNET_CONVERSATION_EC_PHONE_HUNG_UP
-
 };
 
 
@@ -155,9 +150,7 @@ typedef void
  * progresses from ring over ready to terminated.  Steps may
  * be skipped.
  */
-enum GNUNET_CONVERSATION_CallerEventCode
-{
-
+enum GNUNET_CONVERSATION_CallerEventCode {
   /**
    * We are the callee and the caller suspended the call.  Note that
    * both sides can independently suspend and resume calls; a call is
@@ -171,7 +164,6 @@ enum GNUNET_CONVERSATION_CallerEventCode
    * only "working" of both sides are active.
    */
   GNUNET_CONVERSATION_EC_CALLER_RESUME
-
 };
 
 
@@ -212,10 +204,10 @@ struct GNUNET_CONVERSATION_Phone;
  * @param event_handler_cls closure for @a event_handler
  */
 struct GNUNET_CONVERSATION_Phone *
-GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  const struct GNUNET_IDENTITY_Ego *ego,
-                                  GNUNET_CONVERSATION_PhoneEventHandler event_handler,
-                                  void *event_handler_cls);
+GNUNET_CONVERSATION_phone_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 const struct GNUNET_IDENTITY_Ego *ego,
+                                 GNUNET_CONVERSATION_PhoneEventHandler event_handler,
+                                 void *event_handler_cls);
 
 
 /**
@@ -227,8 +219,8 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param rd namestore record to fill in
  */
 void
-GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
-                                      struct GNUNET_GNSRECORD_Data *rd);
+GNUNET_CONVERSATION_phone_get_record(struct GNUNET_CONVERSATION_Phone *phone,
+                                     struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -242,11 +234,11 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_caller_pick_up (struct GNUNET_CONVERSATION_Caller *caller,
-                                    GNUNET_CONVERSATION_CallerEventHandler event_handler,
-                                    void *event_handler_cls,
-                                    struct GNUNET_SPEAKER_Handle *speaker,
-                                    struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_caller_pick_up(struct GNUNET_CONVERSATION_Caller *caller,
+                                   GNUNET_CONVERSATION_CallerEventHandler event_handler,
+                                   void *event_handler_cls,
+                                   struct GNUNET_SPEAKER_Handle *speaker,
+                                   struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -257,7 +249,7 @@ GNUNET_CONVERSATION_caller_pick_up (struct GNUNET_CONVERSATION_Caller *caller,
  * @param caller call to suspend
  */
 void
-GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller);
+GNUNET_CONVERSATION_caller_suspend(struct GNUNET_CONVERSATION_Caller *caller);
 
 
 /**
@@ -268,9 +260,9 @@ GNUNET_CONVERSATION_caller_suspend (struct GNUNET_CONVERSATION_Caller *caller);
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller,
-                                   struct GNUNET_SPEAKER_Handle *speaker,
-                                   struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_caller_resume(struct GNUNET_CONVERSATION_Caller *caller,
+                                  struct GNUNET_SPEAKER_Handle *speaker,
+                                  struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -280,7 +272,7 @@ GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller,
  * @param caller who should we hang up on
  */
 void
-GNUNET_CONVERSATION_caller_hang_up (struct GNUNET_CONVERSATION_Caller *caller);
+GNUNET_CONVERSATION_caller_hang_up(struct GNUNET_CONVERSATION_Caller *caller);
 
 
 /**
@@ -289,7 +281,7 @@ GNUNET_CONVERSATION_caller_hang_up (struct GNUNET_CONVERSATION_Caller *caller);
  * @param phone phone to destroy
  */
 void
-GNUNET_CONVERSATION_phone_destroy (struct GNUNET_CONVERSATION_Phone *phone);
+GNUNET_CONVERSATION_phone_destroy(struct GNUNET_CONVERSATION_Phone *phone);
 
 
 /* *********************** CALL API ************************ */
@@ -303,9 +295,7 @@ struct GNUNET_CONVERSATION_Call;
 /**
  * Information about the current status of a call.
  */
-enum GNUNET_CONVERSATION_CallEventCode
-{
-
+enum GNUNET_CONVERSATION_CallEventCode {
   /**
    * We are the caller and are now ringing the other party (GNS lookup
    * succeeded).
@@ -354,7 +344,6 @@ enum GNUNET_CONVERSATION_CallEventCode
    * is restarted during a call.
    */
   GNUNET_CONVERSATION_EC_CALL_ERROR
-
 };
 
 
@@ -385,13 +374,13 @@ typedef void
  * @return handle for the call
  */
 struct GNUNET_CONVERSATION_Call *
-GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                struct GNUNET_IDENTITY_Ego *caller_id,
-                                const char *callee,
-                                struct GNUNET_SPEAKER_Handle *speaker,
-                                struct GNUNET_MICROPHONE_Handle *mic,
-                                GNUNET_CONVERSATION_CallEventHandler event_handler,
-                                void *event_handler_cls);
+GNUNET_CONVERSATION_call_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               struct GNUNET_IDENTITY_Ego *caller_id,
+                               const char *callee,
+                               struct GNUNET_SPEAKER_Handle *speaker,
+                               struct GNUNET_MICROPHONE_Handle *mic,
+                               GNUNET_CONVERSATION_CallEventHandler event_handler,
+                               void *event_handler_cls);
 
 
 /**
@@ -401,7 +390,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param call call to pause
  */
 void
-GNUNET_CONVERSATION_call_suspend (struct GNUNET_CONVERSATION_Call *call);
+GNUNET_CONVERSATION_call_suspend(struct GNUNET_CONVERSATION_Call *call);
 
 
 /**
@@ -412,9 +401,9 @@ GNUNET_CONVERSATION_call_suspend (struct GNUNET_CONVERSATION_Call *call);
  * @param mic microphone to use
  */
 void
-GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call,
-                                 struct GNUNET_SPEAKER_Handle *speaker,
-                                 struct GNUNET_MICROPHONE_Handle *mic);
+GNUNET_CONVERSATION_call_resume(struct GNUNET_CONVERSATION_Call *call,
+                                struct GNUNET_SPEAKER_Handle *speaker,
+                                struct GNUNET_MICROPHONE_Handle *mic);
 
 
 /**
@@ -423,10 +412,10 @@ GNUNET_CONVERSATION_call_resume (struct GNUNET_CONVERSATION_Call *call,
  * @param call call to terminate
  */
 void
-GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call);
+GNUNET_CONVERSATION_call_stop(struct GNUNET_CONVERSATION_Call *call);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index 111eb529d..4e6c48ee8 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -125,12 +125,12 @@ typedef void (*GNUNET_CORE_StartupCallback) (
  *           NULL on error (in this case, init is never called)
  */
 struct GNUNET_CORE_Handle *
-GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     void *cls,
-                     GNUNET_CORE_StartupCallback init,
-                     GNUNET_CORE_ConnectEventHandler connects,
-                     GNUNET_CORE_DisconnectEventHandler disconnects,
-                     const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_CORE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                    void *cls,
+                    GNUNET_CORE_StartupCallback init,
+                    GNUNET_CORE_ConnectEventHandler connects,
+                    GNUNET_CORE_DisconnectEventHandler disconnects,
+                    const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -139,7 +139,7 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle connection to core to disconnect
  */
 void
-GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle);
+GNUNET_CORE_disconnect(struct GNUNET_CORE_Handle *handle);
 
 
 /**
@@ -150,8 +150,8 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle);
  * @return NULL if @a pid is not connected
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CORE_get_mq (const struct GNUNET_CORE_Handle *h,
-                    const struct GNUNET_PeerIdentity *pid);
+GNUNET_CORE_get_mq(const struct GNUNET_CORE_Handle *h,
+                   const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -173,8 +173,7 @@ struct GNUNET_CORE_MonitorHandle;
  * #GNUNET_CORE_KX_STATE_REKEY_SENT until the rekey operation is
  * confirmed by a PONG from the other peer.
  */
-enum GNUNET_CORE_KxState
-{
+enum GNUNET_CORE_KxState {
   /**
    * No handshake yet.
    */
@@ -228,7 +227,6 @@ enum GNUNET_CORE_KxState
    * crashed and thus all connection state should be assumed lost.
    */
   GNUNET_CORE_KX_CORE_DISCONNECT
-
 };
 
 
@@ -265,9 +263,9 @@ typedef void (*GNUNET_CORE_MonitorCallback) (
  * @return NULL on error
  */
 struct GNUNET_CORE_MonitorHandle *
-GNUNET_CORE_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                           GNUNET_CORE_MonitorCallback peer_cb,
-                           void *peer_cb_cls);
+GNUNET_CORE_monitor_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                          GNUNET_CORE_MonitorCallback peer_cb,
+                          void *peer_cb_cls);
 
 
 /**
@@ -276,7 +274,7 @@ GNUNET_CORE_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param mh monitor to stop
  */
 void
-GNUNET_CORE_monitor_stop (struct GNUNET_CORE_MonitorHandle *mh);
+GNUNET_CORE_monitor_stop(struct GNUNET_CORE_MonitorHandle *mh);
 
 
 /**
@@ -292,8 +290,8 @@ GNUNET_CORE_monitor_stop (struct GNUNET_CORE_MonitorHandle *mh);
  * @return #GNUNET_YES if the peer is connected to us; #GNUNET_NO if not
  */
 int
-GNUNET_CORE_is_peer_connected_sync (const struct GNUNET_CORE_Handle *h,
-                                    const struct GNUNET_PeerIdentity *pid);
+GNUNET_CORE_is_peer_connected_sync(const struct GNUNET_CORE_Handle *h,
+                                   const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -310,8 +308,8 @@ GNUNET_CORE_is_peer_connected_sync (const struct GNUNET_CORE_Handle *h,
  *         to the target peer
  */
 struct GNUNET_MQ_Handle *
-GNUNET_CORE_mq_create (struct GNUNET_CORE_Handle *h,
-                       const struct GNUNET_PeerIdentity *target);
+GNUNET_CORE_mq_create(struct GNUNET_CORE_Handle *h,
+                      const struct GNUNET_PeerIdentity *target);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h
index c925b0da8..9e1672ba3 100644
--- a/src/include/gnunet_credential_service.h
+++ b/src/include/gnunet_credential_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -56,10 +56,9 @@ struct GNUNET_CREDENTIAL_Handle;
 struct GNUNET_CREDENTIAL_Request;
 
 /*
-* Enum used for checking whether the issuer has the authority to issue credentials or is just a subject
-*/
+ * Enum used for checking whether the issuer has the authority to issue credentials or is just a subject
+ */
 enum GNUNET_CREDENTIAL_CredentialFlags {
-
   //Subject had credentials before, but have been revoked now
   GNUNET_CREDENTIAL_FLAG_REVOKED=0,
 
@@ -68,7 +67,6 @@ enum GNUNET_CREDENTIAL_CredentialFlags {
 
   //Issuer flag is used to signify that the subject is allowed to issue this credential and delegate issuance
   GNUNET_CREDENTIAL_FLAG_ISSUER=2
-
 };
 
 GNUNET_NETWORK_STRUCT_BEGIN
@@ -76,7 +74,6 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * The attribute delegation record
  */
 struct GNUNET_CREDENTIAL_DelegationRecord {
-
   /**
    * Number of delegation sets in this record
    */
@@ -96,7 +93,6 @@ struct GNUNET_CREDENTIAL_DelegationRecord {
  * The attribute delegation record
  */
 struct GNUNET_CREDENTIAL_DelegationRecordSet {
-
   /**
    * Public key of the subject this attribute was delegated to
    */
@@ -115,7 +111,6 @@ GNUNET_NETWORK_STRUCT_END
  * The attribute delegation record
  */
 struct GNUNET_CREDENTIAL_DelegationSet {
-
   /**
    * Public key of the subject this attribute was delegated to
    */
@@ -134,7 +129,6 @@ struct GNUNET_CREDENTIAL_DelegationSet {
  * A delegation
  */
 struct GNUNET_CREDENTIAL_Delegation {
-
   /**
    * The issuer of the delegation
    */
@@ -171,7 +165,6 @@ struct GNUNET_CREDENTIAL_Delegation {
  * A credential
  */
 struct GNUNET_CREDENTIAL_Credential {
-
   /**
    * The issuer of the credential
    */
@@ -201,7 +194,6 @@ struct GNUNET_CREDENTIAL_Credential {
    * The attribute
    */
   const char *issuer_attribute;
-
 };
 
 
@@ -213,7 +205,7 @@ struct GNUNET_CREDENTIAL_Credential {
  * @return handle to the Credential service, or NULL on error
  */
 struct GNUNET_CREDENTIAL_Handle *
-GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CREDENTIAL_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -222,7 +214,7 @@ GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param handle connection to shut down
  */
 void
-GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle);
+GNUNET_CREDENTIAL_disconnect(struct GNUNET_CREDENTIAL_Handle *handle);
 
 
 /**
@@ -235,10 +227,10 @@ GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle);
  * @param credential the credentials
  */
 typedef void (*GNUNET_CREDENTIAL_CredentialResultProcessor) (void *cls,
-                                                         unsigned int d_count,
-                                                         struct GNUNET_CREDENTIAL_Delegation *delegation_chain,
-                                                         unsigned int c_count,
-                                                         struct GNUNET_CREDENTIAL_Credential *credential);
+                                                             unsigned int d_count,
+                                                             struct GNUNET_CREDENTIAL_Delegation *delegation_chain,
+                                                             unsigned int c_count,
+                                                             struct GNUNET_CREDENTIAL_Credential *credential);
 
 /**
  * Iterator called on obtained result for an attribute delegation.
@@ -280,23 +272,23 @@ typedef void (*GNUNET_CREDENTIAL_RemoveDelegateResultProcessor) (void *cls,
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Request*
-GNUNET_CREDENTIAL_verify (struct GNUNET_CREDENTIAL_Handle *handle,
+GNUNET_CREDENTIAL_verify(struct GNUNET_CREDENTIAL_Handle *handle,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
+                         const char *issuer_attribute,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key,
+                         uint32_t credential_count,
+                         const struct GNUNET_CREDENTIAL_Credential *credentials,
+                         GNUNET_CREDENTIAL_CredentialResultProcessor proc,
+                         void *proc_cls);
+
+struct GNUNET_CREDENTIAL_Request*
+GNUNET_CREDENTIAL_collect(struct GNUNET_CREDENTIAL_Handle *handle,
                           const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
                           const char *issuer_attribute,
-                          const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key,
-                          uint32_t credential_count,
-                          const struct GNUNET_CREDENTIAL_Credential *credentials,
+                          const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
                           GNUNET_CREDENTIAL_CredentialResultProcessor proc,
                           void *proc_cls);
 
-struct GNUNET_CREDENTIAL_Request*
-GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
-                           const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
-                           const char *issuer_attribute,
-                           const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
-                           GNUNET_CREDENTIAL_CredentialResultProcessor proc,
-                           void *proc_cls);
-
 /**
  * Delegate an attribute
  *
@@ -310,13 +302,13 @@ GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Request *
-GNUNET_CREDENTIAL_add_delegation (struct GNUNET_CREDENTIAL_Handle *handle,
-                                  struct GNUNET_IDENTITY_Ego *issuer,
-                                  const char *attribute,
-                                  struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
-                                  const char *delegated_attribute,
-                                  GNUNET_CREDENTIAL_DelegateResultProcessor proc,
-                                  void *proc_cls);
+GNUNET_CREDENTIAL_add_delegation(struct GNUNET_CREDENTIAL_Handle *handle,
+                                 struct GNUNET_IDENTITY_Ego *issuer,
+                                 const char *attribute,
+                                 struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
+                                 const char *delegated_attribute,
+                                 GNUNET_CREDENTIAL_DelegateResultProcessor proc,
+                                 void *proc_cls);
 
 /**
  * Remove a delegation
@@ -329,11 +321,11 @@ GNUNET_CREDENTIAL_add_delegation (struct GNUNET_CREDENTIAL_Handle *handle,
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Request *
-GNUNET_CREDENTIAL_remove_delegation (struct GNUNET_CREDENTIAL_Handle *handle,
-                                     struct GNUNET_IDENTITY_Ego *issuer,
-                                     const char *attribute,
-                                     GNUNET_CREDENTIAL_RemoveDelegateResultProcessor proc,
-                                     void *proc_cls);
+GNUNET_CREDENTIAL_remove_delegation(struct GNUNET_CREDENTIAL_Handle *handle,
+                                    struct GNUNET_IDENTITY_Ego *issuer,
+                                    const char *attribute,
+                                    GNUNET_CREDENTIAL_RemoveDelegateResultProcessor proc,
+                                    void *proc_cls);
 
 
 
@@ -347,10 +339,10 @@ GNUNET_CREDENTIAL_remove_delegation (struct GNUNET_CREDENTIAL_Handle *handle,
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Credential*
-GNUNET_CREDENTIAL_credential_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer,
-                                    struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
-                                    const char *attribute,
-                                    struct GNUNET_TIME_Absolute *expiration);
+GNUNET_CREDENTIAL_credential_issue(const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer,
+                                   struct GNUNET_CRYPTO_EcdsaPublicKey *subject,
+                                   const char *attribute,
+                                   struct GNUNET_TIME_Absolute *expiration);
 
 
 
@@ -360,7 +352,7 @@ GNUNET_CREDENTIAL_credential_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *
  * @param lr the lookup request to cancel
  */
 void
-GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr);
+GNUNET_CREDENTIAL_request_cancel(struct GNUNET_CREDENTIAL_Request *lr);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 140a1b48c..6e347c52b 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file include/gnunet_crypto_lib.h
@@ -71,8 +71,7 @@ struct GNUNET_PeerIdentity;
  * Desired quality level for random numbers.
  * @ingroup crypto
  */
-enum GNUNET_CRYPTO_Quality
-{
+enum GNUNET_CRYPTO_Quality {
   /**
    * No good quality of the operation is needed (i.e.,
    * random numbers can be pseudo-random).
@@ -113,8 +112,7 @@ enum GNUNET_CRYPTO_Quality
 /**
  * @brief 0-terminated ASCII encoding of a struct GNUNET_HashCode.
  */
-struct GNUNET_CRYPTO_HashAsciiEncoded
-{
+struct GNUNET_CRYPTO_HashAsciiEncoded {
   unsigned char encoding[104];
 };
 
@@ -127,8 +125,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  *        this must be followed by "size - 8" bytes of
  *        the actual signed data
  */
-struct GNUNET_CRYPTO_EccSignaturePurpose
-{
+struct GNUNET_CRYPTO_EccSignaturePurpose {
   /**
    * How many bytes does this signature sign?
    * (including this purpose header); in network
@@ -150,9 +147,7 @@ struct GNUNET_CRYPTO_EccSignaturePurpose
  * @brief an ECC signature using EdDSA.
  * See cr.yp.to/papers.html#ed25519
  */
-struct GNUNET_CRYPTO_EddsaSignature
-{
-
+struct GNUNET_CRYPTO_EddsaSignature {
   /**
    * R value.
    */
@@ -168,9 +163,7 @@ struct GNUNET_CRYPTO_EddsaSignature
 /**
  * @brief an ECC signature using ECDSA
  */
-struct GNUNET_CRYPTO_EcdsaSignature
-{
-
+struct GNUNET_CRYPTO_EcdsaSignature {
   /**
    * R value.
    */
@@ -187,8 +180,7 @@ struct GNUNET_CRYPTO_EcdsaSignature
  * Public ECC key (always for curve Ed25519) encoded in a format
  * suitable for network transmission and EdDSA signatures.
  */
-struct GNUNET_CRYPTO_EddsaPublicKey
-{
+struct GNUNET_CRYPTO_EddsaPublicKey {
   /**
    * Point Q consists of a y-value mod p (256 bits); the x-value is
    * always positive. The point is stored in Ed25519 standard
@@ -202,8 +194,7 @@ struct GNUNET_CRYPTO_EddsaPublicKey
  * Public ECC key (always for Curve25519) encoded in a format suitable
  * for network transmission and ECDSA signatures.
  */
-struct GNUNET_CRYPTO_EcdsaPublicKey
-{
+struct GNUNET_CRYPTO_EcdsaPublicKey {
   /**
    * Q consists of an x- and a y-value, each mod p (256 bits), given
    * here in affine coordinates and Ed25519 standard compact format.
@@ -215,8 +206,7 @@ struct GNUNET_CRYPTO_EcdsaPublicKey
 /**
  * The identity of the host (wraps the signing key of the peer).
  */
-struct GNUNET_PeerIdentity
-{
+struct GNUNET_PeerIdentity {
   struct GNUNET_CRYPTO_EddsaPublicKey public_key;
 };
 
@@ -226,8 +216,7 @@ struct GNUNET_PeerIdentity
  * for network transmission and encryption (ECDH),
  * See http://cr.yp.to/ecdh.html
  */
-struct GNUNET_CRYPTO_EcdhePublicKey
-{
+struct GNUNET_CRYPTO_EcdhePublicKey {
   /**
    * Q consists of an x- and a y-value, each mod p (256 bits), given
    * here in affine coordinates and Ed25519 standard compact format.
@@ -240,8 +229,7 @@ struct GNUNET_CRYPTO_EcdhePublicKey
  * Private ECC key encoded for transmission.  To be used only for ECDH
  * key exchange (ECDHE to be precise).
  */
-struct GNUNET_CRYPTO_EcdhePrivateKey
-{
+struct GNUNET_CRYPTO_EcdhePrivateKey {
   /**
    * d is a value mod n, where n has at most 256 bits.
    */
@@ -252,8 +240,7 @@ struct GNUNET_CRYPTO_EcdhePrivateKey
  * Private ECC key encoded for transmission.  To be used only for ECDSA
  * signatures.
  */
-struct GNUNET_CRYPTO_EcdsaPrivateKey
-{
+struct GNUNET_CRYPTO_EcdsaPrivateKey {
   /**
    * d is a value mod n, where n has at most 256 bits.
    */
@@ -264,8 +251,7 @@ struct GNUNET_CRYPTO_EcdsaPrivateKey
  * Private ECC key encoded for transmission.  To be used only for EdDSA
  * signatures.
  */
-struct GNUNET_CRYPTO_EddsaPrivateKey
-{
+struct GNUNET_CRYPTO_EddsaPrivateKey {
   /**
    * d is a value mod n, where n has at most 256 bits.
    */
@@ -276,8 +262,7 @@ struct GNUNET_CRYPTO_EddsaPrivateKey
 /**
  * @brief type for session keys
  */
-struct GNUNET_CRYPTO_SymmetricSessionKey
-{
+struct GNUNET_CRYPTO_SymmetricSessionKey {
   /**
    * Actual key for AES.
    */
@@ -297,8 +282,7 @@ GNUNET_NETWORK_STRUCT_END
  * NOTE: must be smaller (!) in size than the
  * `struct GNUNET_HashCode`.
  */
-struct GNUNET_CRYPTO_SymmetricInitializationVector
-{
+struct GNUNET_CRYPTO_SymmetricInitializationVector {
   unsigned char aes_iv[GNUNET_CRYPTO_AES_KEY_LENGTH / 2];
 
   unsigned char twofish_iv[GNUNET_CRYPTO_AES_KEY_LENGTH / 2];
@@ -308,8 +292,7 @@ struct GNUNET_CRYPTO_SymmetricInitializationVector
 /**
  * @brief type for (message) authentication keys
  */
-struct GNUNET_CRYPTO_AuthKey
-{
+struct GNUNET_CRYPTO_AuthKey {
   unsigned char key[GNUNET_CRYPTO_HASH_LENGTH];
 };
 
@@ -324,8 +307,7 @@ struct GNUNET_CRYPTO_AuthKey
 /**
  * Paillier public key.
  */
-struct GNUNET_CRYPTO_PaillierPublicKey
-{
+struct GNUNET_CRYPTO_PaillierPublicKey {
   /**
    * N value.
    */
@@ -336,8 +318,7 @@ struct GNUNET_CRYPTO_PaillierPublicKey
 /**
  * Paillier private key.
  */
-struct GNUNET_CRYPTO_PaillierPrivateKey
-{
+struct GNUNET_CRYPTO_PaillierPrivateKey {
   /**
    * Lambda-component of the private key.
    */
@@ -352,8 +333,7 @@ struct GNUNET_CRYPTO_PaillierPrivateKey
 /**
  * Paillier ciphertext.
  */
-struct GNUNET_CRYPTO_PaillierCiphertext
-{
+struct GNUNET_CRYPTO_PaillierCiphertext {
   /**
    * Guaranteed minimum number of homomorphic operations with this ciphertext,
    * in network byte order (NBO).
@@ -377,7 +357,7 @@ struct GNUNET_CRYPTO_PaillierCiphertext
  * @param seed the seed to use
  */
 void
-GNUNET_CRYPTO_seed_weak_random (int32_t seed);
+GNUNET_CRYPTO_seed_weak_random(int32_t seed);
 
 
 /**
@@ -389,7 +369,7 @@ GNUNET_CRYPTO_seed_weak_random (int32_t seed);
  * @return crc8 value
  */
 uint8_t
-GNUNET_CRYPTO_crc8_n (const void *buf, size_t len);
+GNUNET_CRYPTO_crc8_n(const void *buf, size_t len);
 
 
 /**
@@ -401,7 +381,7 @@ GNUNET_CRYPTO_crc8_n (const void *buf, size_t len);
  * @return updated crc sum (must be subjected to #GNUNET_CRYPTO_crc16_finish to get actual crc16)
  */
 uint32_t
-GNUNET_CRYPTO_crc16_step (uint32_t sum, const void *buf, size_t len);
+GNUNET_CRYPTO_crc16_step(uint32_t sum, const void *buf, size_t len);
 
 
 /**
@@ -411,7 +391,7 @@ GNUNET_CRYPTO_crc16_step (uint32_t sum, const void *buf, size_t len);
  * @return crc16 value
  */
 uint16_t
-GNUNET_CRYPTO_crc16_finish (uint32_t sum);
+GNUNET_CRYPTO_crc16_finish(uint32_t sum);
 
 
 /**
@@ -423,7 +403,7 @@ GNUNET_CRYPTO_crc16_finish (uint32_t sum);
  * @return crc16 value
  */
 uint16_t
-GNUNET_CRYPTO_crc16_n (const void *buf, size_t len);
+GNUNET_CRYPTO_crc16_n(const void *buf, size_t len);
 
 
 /**
@@ -436,7 +416,7 @@ GNUNET_CRYPTO_crc16_n (const void *buf, size_t len);
  * @return the resulting CRC32 checksum
  */
 int32_t
-GNUNET_CRYPTO_crc32_n (const void *buf, size_t len);
+GNUNET_CRYPTO_crc32_n(const void *buf, size_t len);
 
 /**
  * @ingroup crypto
@@ -447,7 +427,7 @@ GNUNET_CRYPTO_crc32_n (const void *buf, size_t len);
  * @param length buffer length
  */
 void
-GNUNET_CRYPTO_zero_keys (void *buffer, size_t length);
+GNUNET_CRYPTO_zero_keys(void *buffer, size_t length);
 
 
 /**
@@ -459,9 +439,9 @@ GNUNET_CRYPTO_zero_keys (void *buffer, size_t length);
  * @param length buffer length
  */
 void
-GNUNET_CRYPTO_random_block (enum GNUNET_CRYPTO_Quality mode,
-                            void *buffer,
-                            size_t length);
+GNUNET_CRYPTO_random_block(enum GNUNET_CRYPTO_Quality mode,
+                           void *buffer,
+                           size_t length);
 
 /**
  * @ingroup crypto
@@ -472,7 +452,7 @@ GNUNET_CRYPTO_random_block (enum GNUNET_CRYPTO_Quality mode,
  * @return a random value in the interval [0,@a i) (exclusive).
  */
 uint32_t
-GNUNET_CRYPTO_random_u32 (enum GNUNET_CRYPTO_Quality mode, uint32_t i);
+GNUNET_CRYPTO_random_u32(enum GNUNET_CRYPTO_Quality mode, uint32_t i);
 
 
 /**
@@ -484,7 +464,7 @@ GNUNET_CRYPTO_random_u32 (enum GNUNET_CRYPTO_Quality mode, uint32_t i);
  * @return random 64-bit number
  */
 uint64_t
-GNUNET_CRYPTO_random_u64 (enum GNUNET_CRYPTO_Quality mode, uint64_t max);
+GNUNET_CRYPTO_random_u64(enum GNUNET_CRYPTO_Quality mode, uint64_t max);
 
 
 /**
@@ -497,7 +477,7 @@ GNUNET_CRYPTO_random_u64 (enum GNUNET_CRYPTO_Quality mode, uint64_t max);
  * @return the permutation array (allocated from heap)
  */
 unsigned int *
-GNUNET_CRYPTO_random_permute (enum GNUNET_CRYPTO_Quality mode, unsigned int n);
+GNUNET_CRYPTO_random_permute(enum GNUNET_CRYPTO_Quality mode, unsigned int n);
 
 
 /**
@@ -507,7 +487,7 @@ GNUNET_CRYPTO_random_permute (enum GNUNET_CRYPTO_Quality mode, unsigned int n);
  * @param key key to initialize
  */
 void
-GNUNET_CRYPTO_symmetric_create_session_key (
+GNUNET_CRYPTO_symmetric_create_session_key(
   struct GNUNET_CRYPTO_SymmetricSessionKey *key);
 
 
@@ -523,7 +503,7 @@ GNUNET_CRYPTO_symmetric_create_session_key (
  * @return the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_CRYPTO_symmetric_encrypt (
+GNUNET_CRYPTO_symmetric_encrypt(
   const void *block,
   size_t size,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
@@ -543,7 +523,7 @@ GNUNET_CRYPTO_symmetric_encrypt (
  * @return -1 on failure, size of decrypted block on success
  */
 ssize_t
-GNUNET_CRYPTO_symmetric_decrypt (
+GNUNET_CRYPTO_symmetric_decrypt(
   const void *block,
   size_t size,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
@@ -561,7 +541,7 @@ GNUNET_CRYPTO_symmetric_decrypt (
  * @param ... pairs of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_symmetric_derive_iv (
+GNUNET_CRYPTO_symmetric_derive_iv(
   struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
   const void *salt,
@@ -578,7 +558,7 @@ GNUNET_CRYPTO_symmetric_derive_iv (
  * @param argp pairs of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_symmetric_derive_iv_v (
+GNUNET_CRYPTO_symmetric_derive_iv_v(
   struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
   const void *salt,
@@ -594,8 +574,8 @@ GNUNET_CRYPTO_symmetric_derive_iv_v (
  *  safely cast to char*, a '\\0' termination is set).
  */
 void
-GNUNET_CRYPTO_hash_to_enc (const struct GNUNET_HashCode *block,
-                           struct GNUNET_CRYPTO_HashAsciiEncoded *result);
+GNUNET_CRYPTO_hash_to_enc(const struct GNUNET_HashCode *block,
+                          struct GNUNET_CRYPTO_HashAsciiEncoded *result);
 
 
 /**
@@ -608,9 +588,9 @@ GNUNET_CRYPTO_hash_to_enc (const struct GNUNET_HashCode *block,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if result has the wrong encoding
  */
 int
-GNUNET_CRYPTO_hash_from_string2 (const char *enc,
-                                 size_t enclen,
-                                 struct GNUNET_HashCode *result);
+GNUNET_CRYPTO_hash_from_string2(const char *enc,
+                                size_t enclen,
+                                struct GNUNET_HashCode *result);
 
 
 /**
@@ -622,7 +602,7 @@ GNUNET_CRYPTO_hash_from_string2 (const char *enc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if result has the wrong encoding
  */
 #define GNUNET_CRYPTO_hash_from_string(enc, result) \
-  GNUNET_CRYPTO_hash_from_string2 (enc, strlen (enc), result)
+  GNUNET_CRYPTO_hash_from_string2(enc, strlen(enc), result)
 
 
 /**
@@ -638,8 +618,8 @@ GNUNET_CRYPTO_hash_from_string2 (const char *enc,
  * @return number between 0 and UINT32_MAX
  */
 uint32_t
-GNUNET_CRYPTO_hash_distance_u32 (const struct GNUNET_HashCode *a,
-                                 const struct GNUNET_HashCode *b);
+GNUNET_CRYPTO_hash_distance_u32(const struct GNUNET_HashCode *a,
+                                const struct GNUNET_HashCode *b);
 
 
 /**
@@ -651,9 +631,9 @@ GNUNET_CRYPTO_hash_distance_u32 (const struct GNUNET_HashCode *a,
  * @param ret pointer to where to write the hashcode
  */
 void
-GNUNET_CRYPTO_hash (const void *block,
-                    size_t size,
-                    struct GNUNET_HashCode *ret);
+GNUNET_CRYPTO_hash(const void *block,
+                   size_t size,
+                   struct GNUNET_HashCode *ret);
 
 
 /**
@@ -668,7 +648,7 @@ struct GNUNET_HashContext;
  * @return context for incremental hash computation
  */
 struct GNUNET_HashContext *
-GNUNET_CRYPTO_hash_context_start (void);
+GNUNET_CRYPTO_hash_context_start(void);
 
 
 /**
@@ -679,9 +659,9 @@ GNUNET_CRYPTO_hash_context_start (void);
  * @param size number of bytes in @a buf
  */
 void
-GNUNET_CRYPTO_hash_context_read (struct GNUNET_HashContext *hc,
-                                 const void *buf,
-                                 size_t size);
+GNUNET_CRYPTO_hash_context_read(struct GNUNET_HashContext *hc,
+                                const void *buf,
+                                size_t size);
 
 
 /**
@@ -691,8 +671,8 @@ GNUNET_CRYPTO_hash_context_read (struct GNUNET_HashContext *hc,
  * @param r_hash where to write the latest / final hash code
  */
 void
-GNUNET_CRYPTO_hash_context_finish (struct GNUNET_HashContext *hc,
-                                   struct GNUNET_HashCode *r_hash);
+GNUNET_CRYPTO_hash_context_finish(struct GNUNET_HashContext *hc,
+                                  struct GNUNET_HashCode *r_hash);
 
 
 /**
@@ -701,7 +681,7 @@ GNUNET_CRYPTO_hash_context_finish (struct GNUNET_HashContext *hc,
  * @param hc hash context to destroy
  */
 void
-GNUNET_CRYPTO_hash_context_abort (struct GNUNET_HashContext *hc);
+GNUNET_CRYPTO_hash_context_abort(struct GNUNET_HashContext *hc);
 
 
 /**
@@ -716,11 +696,11 @@ GNUNET_CRYPTO_hash_context_abort (struct GNUNET_HashContext *hc);
  * @param hmac where to store the hmac
  */
 void
-GNUNET_CRYPTO_hmac_raw (const void *key,
-                        size_t key_len,
-                        const void *plaintext,
-                        size_t plaintext_len,
-                        struct GNUNET_HashCode *hmac);
+GNUNET_CRYPTO_hmac_raw(const void *key,
+                       size_t key_len,
+                       const void *plaintext,
+                       size_t plaintext_len,
+                       struct GNUNET_HashCode *hmac);
 
 
 /**
@@ -733,10 +713,10 @@ GNUNET_CRYPTO_hmac_raw (const void *key,
  * @param hmac where to store the hmac
  */
 void
-GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
-                    const void *plaintext,
-                    size_t plaintext_len,
-                    struct GNUNET_HashCode *hmac);
+GNUNET_CRYPTO_hmac(const struct GNUNET_CRYPTO_AuthKey *key,
+                   const void *plaintext,
+                   size_t plaintext_len,
+                   struct GNUNET_HashCode *hmac);
 
 
 /**
@@ -769,11 +749,11 @@ struct GNUNET_CRYPTO_FileHashContext;
  * @return NULL on (immediate) errror
  */
 struct GNUNET_CRYPTO_FileHashContext *
-GNUNET_CRYPTO_hash_file (enum GNUNET_SCHEDULER_Priority priority,
-                         const char *filename,
-                         size_t blocksize,
-                         GNUNET_CRYPTO_HashCompletedCallback callback,
-                         void *callback_cls);
+GNUNET_CRYPTO_hash_file(enum GNUNET_SCHEDULER_Priority priority,
+                        const char *filename,
+                        size_t blocksize,
+                        GNUNET_CRYPTO_HashCompletedCallback callback,
+                        void *callback_cls);
 
 
 /**
@@ -782,7 +762,7 @@ GNUNET_CRYPTO_hash_file (enum GNUNET_SCHEDULER_Priority priority,
  * @param fhc operation to cancel (callback must not yet have been invoked)
  */
 void
-GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc);
+GNUNET_CRYPTO_hash_file_cancel(struct GNUNET_CRYPTO_FileHashContext *fhc);
 
 
 /**
@@ -793,8 +773,8 @@ GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc);
  * @param result hash code that is randomized
  */
 void
-GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
-                                  struct GNUNET_HashCode *result);
+GNUNET_CRYPTO_hash_create_random(enum GNUNET_CRYPTO_Quality mode,
+                                 struct GNUNET_HashCode *result);
 
 
 /**
@@ -806,9 +786,9 @@ GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
  * @param result set to @a b - @a a
  */
 void
-GNUNET_CRYPTO_hash_difference (const struct GNUNET_HashCode *a,
-                               const struct GNUNET_HashCode *b,
-                               struct GNUNET_HashCode *result);
+GNUNET_CRYPTO_hash_difference(const struct GNUNET_HashCode *a,
+                              const struct GNUNET_HashCode *b,
+                              struct GNUNET_HashCode *result);
 
 
 /**
@@ -820,9 +800,9 @@ GNUNET_CRYPTO_hash_difference (const struct GNUNET_HashCode *a,
  * @param result set to @a a + @a delta
  */
 void
-GNUNET_CRYPTO_hash_sum (const struct GNUNET_HashCode *a,
-                        const struct GNUNET_HashCode *delta,
-                        struct GNUNET_HashCode *result);
+GNUNET_CRYPTO_hash_sum(const struct GNUNET_HashCode *a,
+                       const struct GNUNET_HashCode *delta,
+                       struct GNUNET_HashCode *result);
 
 
 /**
@@ -834,9 +814,9 @@ GNUNET_CRYPTO_hash_sum (const struct GNUNET_HashCode *a,
  * @param result set to @a a ^ @a b
  */
 void
-GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode *a,
-                        const struct GNUNET_HashCode *b,
-                        struct GNUNET_HashCode *result);
+GNUNET_CRYPTO_hash_xor(const struct GNUNET_HashCode *a,
+                       const struct GNUNET_HashCode *b,
+                       struct GNUNET_HashCode *result);
 
 
 /**
@@ -848,7 +828,7 @@ GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode *a,
  * @param iv set to a valid initialization vector
  */
 void
-GNUNET_CRYPTO_hash_to_aes_key (
+GNUNET_CRYPTO_hash_to_aes_key(
   const struct GNUNET_HashCode *hc,
   struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
   struct GNUNET_CRYPTO_SymmetricInitializationVector *iv);
@@ -863,8 +843,8 @@ GNUNET_CRYPTO_hash_to_aes_key (
  * @return Bit \a bit from hashcode \a code, -1 for invalid index
  */
 int
-GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code,
-                            unsigned int bit);
+GNUNET_CRYPTO_hash_get_bit(const struct GNUNET_HashCode *code,
+                           unsigned int bit);
 
 
 /**
@@ -880,8 +860,8 @@ GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code,
  * @return the number of bits that match
  */
 unsigned int
-GNUNET_CRYPTO_hash_matching_bits (const struct GNUNET_HashCode *first,
-                                  const struct GNUNET_HashCode *second);
+GNUNET_CRYPTO_hash_matching_bits(const struct GNUNET_HashCode *first,
+                                 const struct GNUNET_HashCode *second);
 
 
 /**
@@ -894,8 +874,8 @@ GNUNET_CRYPTO_hash_matching_bits (const struct GNUNET_HashCode *first,
  * @return 1 if @a h1 > @a h2, -1 if @a h1 < @a h2 and 0 if @a h1 == @a h2.
  */
 int
-GNUNET_CRYPTO_hash_cmp (const struct GNUNET_HashCode *h1,
-                        const struct GNUNET_HashCode *h2);
+GNUNET_CRYPTO_hash_cmp(const struct GNUNET_HashCode *h1,
+                       const struct GNUNET_HashCode *h2);
 
 
 /**
@@ -909,9 +889,9 @@ GNUNET_CRYPTO_hash_cmp (const struct GNUNET_HashCode *h1,
  * @return -1 if @a h1 is closer, 1 if @a h2 is closer and 0 if @a h1== @a h2.
  */
 int
-GNUNET_CRYPTO_hash_xorcmp (const struct GNUNET_HashCode *h1,
-                           const struct GNUNET_HashCode *h2,
-                           const struct GNUNET_HashCode *target);
+GNUNET_CRYPTO_hash_xorcmp(const struct GNUNET_HashCode *h1,
+                          const struct GNUNET_HashCode *h2,
+                          const struct GNUNET_HashCode *target);
 
 
 /**
@@ -924,7 +904,7 @@ GNUNET_CRYPTO_hash_xorcmp (const struct GNUNET_HashCode *h1,
  * @param argp pair of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_hmac_derive_key_v (
+GNUNET_CRYPTO_hmac_derive_key_v(
   struct GNUNET_CRYPTO_AuthKey *key,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey,
   const void *salt,
@@ -942,7 +922,7 @@ GNUNET_CRYPTO_hmac_derive_key_v (
  * @param ... pair of void * & size_t for context chunks, terminated by NULL
  */
 void
-GNUNET_CRYPTO_hmac_derive_key (
+GNUNET_CRYPTO_hmac_derive_key(
   struct GNUNET_CRYPTO_AuthKey *key,
   const struct GNUNET_CRYPTO_SymmetricSessionKey *rkey,
   const void *salt,
@@ -965,15 +945,15 @@ GNUNET_CRYPTO_hmac_derive_key (
  * @return #GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf (void *result,
-                    size_t out_len,
-                    int xtr_algo,
-                    int prf_algo,
-                    const void *xts,
-                    size_t xts_len,
-                    const void *skm,
-                    size_t skm_len,
-                    ...);
+GNUNET_CRYPTO_hkdf(void *result,
+                   size_t out_len,
+                   int xtr_algo,
+                   int prf_algo,
+                   const void *xts,
+                   size_t xts_len,
+                   const void *skm,
+                   size_t skm_len,
+                   ...);
 
 
 /**
@@ -991,15 +971,15 @@ GNUNET_CRYPTO_hkdf (void *result,
  * @return #GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_hkdf_v (void *result,
-                      size_t out_len,
-                      int xtr_algo,
-                      int prf_algo,
-                      const void *xts,
-                      size_t xts_len,
-                      const void *skm,
-                      size_t skm_len,
-                      va_list argp);
+GNUNET_CRYPTO_hkdf_v(void *result,
+                     size_t out_len,
+                     int xtr_algo,
+                     int prf_algo,
+                     const void *xts,
+                     size_t xts_len,
+                     const void *skm,
+                     size_t skm_len,
+                     va_list argp);
 
 
 /**
@@ -1014,13 +994,13 @@ GNUNET_CRYPTO_hkdf_v (void *result,
  * @return #GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_kdf_v (void *result,
-                     size_t out_len,
-                     const void *xts,
-                     size_t xts_len,
-                     const void *skm,
-                     size_t skm_len,
-                     va_list argp);
+GNUNET_CRYPTO_kdf_v(void *result,
+                    size_t out_len,
+                    const void *xts,
+                    size_t xts_len,
+                    const void *skm,
+                    size_t skm_len,
+                    va_list argp);
 
 
 /**
@@ -1036,13 +1016,13 @@ GNUNET_CRYPTO_kdf_v (void *result,
  * @param ctx context string
  */
 void
-GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r,
-                           gcry_mpi_t n,
-                           const void *xts,
-                           size_t xts_len,
-                           const void *skm,
-                           size_t skm_len,
-                           const char *ctx);
+GNUNET_CRYPTO_kdf_mod_mpi(gcry_mpi_t *r,
+                          gcry_mpi_t n,
+                          const void *xts,
+                          size_t xts_len,
+                          const void *skm,
+                          size_t skm_len,
+                          const char *ctx);
 
 
 /**
@@ -1058,13 +1038,13 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r,
  * @return #GNUNET_YES on success
  */
 int
-GNUNET_CRYPTO_kdf (void *result,
-                   size_t out_len,
-                   const void *xts,
-                   size_t xts_len,
-                   const void *skm,
-                   size_t skm_len,
-                   ...);
+GNUNET_CRYPTO_kdf(void *result,
+                  size_t out_len,
+                  const void *xts,
+                  size_t xts_len,
+                  const void *skm,
+                  size_t skm_len,
+                  ...);
 
 
 /**
@@ -1075,7 +1055,7 @@ GNUNET_CRYPTO_kdf (void *result,
  * @param pub where to write the public key
  */
 void
-GNUNET_CRYPTO_ecdsa_key_get_public (
+GNUNET_CRYPTO_ecdsa_key_get_public(
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
   struct GNUNET_CRYPTO_EcdsaPublicKey *pub);
 
@@ -1087,7 +1067,7 @@ GNUNET_CRYPTO_ecdsa_key_get_public (
  * @param pub where to write the public key
  */
 void
-GNUNET_CRYPTO_eddsa_key_get_public (
+GNUNET_CRYPTO_eddsa_key_get_public(
   const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
   struct GNUNET_CRYPTO_EddsaPublicKey *pub);
 
@@ -1100,7 +1080,7 @@ GNUNET_CRYPTO_eddsa_key_get_public (
  * @param pub where to write the public key
  */
 void
-GNUNET_CRYPTO_ecdhe_key_get_public (
+GNUNET_CRYPTO_ecdhe_key_get_public(
   const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
   struct GNUNET_CRYPTO_EcdhePublicKey *pub);
 
@@ -1112,7 +1092,7 @@ GNUNET_CRYPTO_ecdhe_key_get_public (
  * @return string representing @a pub
  */
 char *
-GNUNET_CRYPTO_ecdsa_public_key_to_string (
+GNUNET_CRYPTO_ecdsa_public_key_to_string(
   const struct GNUNET_CRYPTO_EcdsaPublicKey *pub);
 
 /**
@@ -1122,7 +1102,7 @@ GNUNET_CRYPTO_ecdsa_public_key_to_string (
  * @return string representing @a priv
  */
 char *
-GNUNET_CRYPTO_ecdsa_private_key_to_string (
+GNUNET_CRYPTO_ecdsa_private_key_to_string(
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv);
 
 
@@ -1133,7 +1113,7 @@ GNUNET_CRYPTO_ecdsa_private_key_to_string (
  * @return string representing @a pub
  */
 char *
-GNUNET_CRYPTO_eddsa_private_key_to_string (
+GNUNET_CRYPTO_eddsa_private_key_to_string(
   const struct GNUNET_CRYPTO_EddsaPrivateKey *priv);
 
 
@@ -1144,7 +1124,7 @@ GNUNET_CRYPTO_eddsa_private_key_to_string (
  * @return string representing @a pub
  */
 char *
-GNUNET_CRYPTO_eddsa_public_key_to_string (
+GNUNET_CRYPTO_eddsa_public_key_to_string(
   const struct GNUNET_CRYPTO_EddsaPublicKey *pub);
 
 
@@ -1157,7 +1137,7 @@ GNUNET_CRYPTO_eddsa_public_key_to_string (
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecdsa_public_key_from_string (
+GNUNET_CRYPTO_ecdsa_public_key_from_string(
   const char *enc,
   size_t enclen,
   struct GNUNET_CRYPTO_EcdsaPublicKey *pub);
@@ -1172,7 +1152,7 @@ GNUNET_CRYPTO_ecdsa_public_key_from_string (
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_eddsa_private_key_from_string (
+GNUNET_CRYPTO_eddsa_private_key_from_string(
   const char *enc,
   size_t enclen,
   struct GNUNET_CRYPTO_EddsaPrivateKey *pub);
@@ -1187,7 +1167,7 @@ GNUNET_CRYPTO_eddsa_private_key_from_string (
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_eddsa_public_key_from_string (
+GNUNET_CRYPTO_eddsa_public_key_from_string(
   const char *enc,
   size_t enclen,
   struct GNUNET_CRYPTO_EddsaPublicKey *pub);
@@ -1209,7 +1189,7 @@ GNUNET_CRYPTO_eddsa_public_key_from_string (
  *   permission denied); free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EcdsaPrivateKey *
-GNUNET_CRYPTO_ecdsa_key_create_from_file (const char *filename);
+GNUNET_CRYPTO_ecdsa_key_create_from_file(const char *filename);
 
 
 /**
@@ -1228,7 +1208,7 @@ GNUNET_CRYPTO_ecdsa_key_create_from_file (const char *filename);
  *   permission denied); free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_CRYPTO_eddsa_key_create_from_file (const char *filename);
+GNUNET_CRYPTO_eddsa_key_create_from_file(const char *filename);
 
 
 /**
@@ -1247,7 +1227,7 @@ struct GNUNET_CONFIGURATION_Handle;
  *   permission denied); free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_CRYPTO_eddsa_key_create_from_configuration (
+GNUNET_CRYPTO_eddsa_key_create_from_configuration(
   const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
@@ -1258,7 +1238,7 @@ GNUNET_CRYPTO_eddsa_key_create_from_configuration (
  * @return fresh private key; free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EcdsaPrivateKey *
-GNUNET_CRYPTO_ecdsa_key_create (void);
+GNUNET_CRYPTO_ecdsa_key_create(void);
 
 
 /**
@@ -1268,7 +1248,7 @@ GNUNET_CRYPTO_ecdsa_key_create (void);
  * @return fresh private key; free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_CRYPTO_eddsa_key_create (void);
+GNUNET_CRYPTO_eddsa_key_create(void);
 
 
 /**
@@ -1279,7 +1259,7 @@ GNUNET_CRYPTO_eddsa_key_create (void);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_CRYPTO_ecdhe_key_create2 (struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
+GNUNET_CRYPTO_ecdhe_key_create2(struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
 
 
 /**
@@ -1289,7 +1269,7 @@ GNUNET_CRYPTO_ecdhe_key_create2 (struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
  * @return fresh private key; free using #GNUNET_free
  */
 struct GNUNET_CRYPTO_EcdhePrivateKey *
-GNUNET_CRYPTO_ecdhe_key_create (void);
+GNUNET_CRYPTO_ecdhe_key_create(void);
 
 
 /**
@@ -1299,7 +1279,7 @@ GNUNET_CRYPTO_ecdhe_key_create (void);
  * @param pk location of the key
  */
 void
-GNUNET_CRYPTO_eddsa_key_clear (struct GNUNET_CRYPTO_EddsaPrivateKey *pk);
+GNUNET_CRYPTO_eddsa_key_clear(struct GNUNET_CRYPTO_EddsaPrivateKey *pk);
 
 
 /**
@@ -1309,7 +1289,7 @@ GNUNET_CRYPTO_eddsa_key_clear (struct GNUNET_CRYPTO_EddsaPrivateKey *pk);
  * @param pk location of the key
  */
 void
-GNUNET_CRYPTO_ecdsa_key_clear (struct GNUNET_CRYPTO_EcdsaPrivateKey *pk);
+GNUNET_CRYPTO_ecdsa_key_clear(struct GNUNET_CRYPTO_EcdsaPrivateKey *pk);
 
 
 /**
@@ -1319,7 +1299,7 @@ GNUNET_CRYPTO_ecdsa_key_clear (struct GNUNET_CRYPTO_EcdsaPrivateKey *pk);
  * @param pk location of the key
  */
 void
-GNUNET_CRYPTO_ecdhe_key_clear (struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
+GNUNET_CRYPTO_ecdhe_key_clear(struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
 
 
 /**
@@ -1329,7 +1309,7 @@ GNUNET_CRYPTO_ecdhe_key_clear (struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
  * @return "anonymous" private key; do not free
  */
 const struct GNUNET_CRYPTO_EcdsaPrivateKey *
-GNUNET_CRYPTO_ecdsa_key_get_anonymous (void);
+GNUNET_CRYPTO_ecdsa_key_get_anonymous(void);
 
 
 /**
@@ -1338,11 +1318,11 @@ GNUNET_CRYPTO_ecdsa_key_get_anonymous (void);
  * configuration file (!).  This function is used so that
  * at a later point code can be certain that reading a
  * hostkey is fast (for example in time-dependent testcases).
-*
+ *
  * @param cfg_name name of the configuration file to use
  */
 void
-GNUNET_CRYPTO_eddsa_setup_hostkey (const char *cfg_name);
+GNUNET_CRYPTO_eddsa_setup_hostkey(const char *cfg_name);
 
 
 /**
@@ -1355,8 +1335,8 @@ GNUNET_CRYPTO_eddsa_setup_hostkey (const char *cfg_name);
  *         could not be retrieved
  */
 int
-GNUNET_CRYPTO_get_peer_identity (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                 struct GNUNET_PeerIdentity *dst);
+GNUNET_CRYPTO_get_peer_identity(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                struct GNUNET_PeerIdentity *dst);
 
 
 /**
@@ -1369,8 +1349,7 @@ struct GNUNET_CRYPTO_EccDlogContext;
  * Point on a curve (always for Curve25519) encoded in a format suitable
  * for network transmission (ECDH), see http://cr.yp.to/ecdh.html.
  */
-struct GNUNET_CRYPTO_EccPoint
-{
+struct GNUNET_CRYPTO_EccPoint {
   /**
    * Q consists of an x- and a y-value, each mod p (256 bits), given
    * here in affine coordinates and Ed25519 standard compact format.
@@ -1387,7 +1366,7 @@ struct GNUNET_CRYPTO_EccPoint
  * @return NULL on error
  */
 struct GNUNET_CRYPTO_EccDlogContext *
-GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max, unsigned int mem);
+GNUNET_CRYPTO_ecc_dlog_prepare(unsigned int max, unsigned int mem);
 
 
 /**
@@ -1399,8 +1378,8 @@ GNUNET_CRYPTO_ecc_dlog_prepare (unsigned int max, unsigned int mem);
  * @return INT_MAX if dlog failed, otherwise the factor
  */
 int
-GNUNET_CRYPTO_ecc_dlog (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                        gcry_mpi_point_t input);
+GNUNET_CRYPTO_ecc_dlog(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                       gcry_mpi_point_t input);
 
 
 /**
@@ -1417,7 +1396,7 @@ GNUNET_CRYPTO_ecc_dlog (struct GNUNET_CRYPTO_EccDlogContext *edc,
  *         must be freed using #GNUNET_CRYPTO_ecc_free()
  */
 gcry_mpi_point_t
-GNUNET_CRYPTO_ecc_dexp (struct GNUNET_CRYPTO_EccDlogContext *edc, int val);
+GNUNET_CRYPTO_ecc_dexp(struct GNUNET_CRYPTO_EccDlogContext *edc, int val);
 
 
 /**
@@ -1430,8 +1409,8 @@ GNUNET_CRYPTO_ecc_dexp (struct GNUNET_CRYPTO_EccDlogContext *edc, int val);
  *         must be freed using #GNUNET_CRYPTO_ecc_free()
  */
 gcry_mpi_point_t
-GNUNET_CRYPTO_ecc_dexp_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                            gcry_mpi_t val);
+GNUNET_CRYPTO_ecc_dexp_mpi(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                           gcry_mpi_t val);
 
 
 /**
@@ -1444,9 +1423,9 @@ GNUNET_CRYPTO_ecc_dexp_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
  *         must be freed using #GNUNET_CRYPTO_ecc_free()
  */
 gcry_mpi_point_t
-GNUNET_CRYPTO_ecc_pmul_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                            gcry_mpi_point_t p,
-                            gcry_mpi_t val);
+GNUNET_CRYPTO_ecc_pmul_mpi(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                           gcry_mpi_point_t p,
+                           gcry_mpi_t val);
 
 
 /**
@@ -1457,9 +1436,9 @@ GNUNET_CRYPTO_ecc_pmul_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @param[out] bin binary point representation
  */
 void
-GNUNET_CRYPTO_ecc_point_to_bin (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                                gcry_mpi_point_t point,
-                                struct GNUNET_CRYPTO_EccPoint *bin);
+GNUNET_CRYPTO_ecc_point_to_bin(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                               gcry_mpi_point_t point,
+                               struct GNUNET_CRYPTO_EccPoint *bin);
 
 
 /**
@@ -1470,8 +1449,8 @@ GNUNET_CRYPTO_ecc_point_to_bin (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @return computational representation
  */
 gcry_mpi_point_t
-GNUNET_CRYPTO_ecc_bin_to_point (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                                const struct GNUNET_CRYPTO_EccPoint *bin);
+GNUNET_CRYPTO_ecc_bin_to_point(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                               const struct GNUNET_CRYPTO_EccPoint *bin);
 
 
 /**
@@ -1483,9 +1462,9 @@ GNUNET_CRYPTO_ecc_bin_to_point (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @return @a a + @a b, must be freed using #GNUNET_CRYPTO_ecc_free()
  */
 gcry_mpi_point_t
-GNUNET_CRYPTO_ecc_add (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                       gcry_mpi_point_t a,
-                       gcry_mpi_point_t b);
+GNUNET_CRYPTO_ecc_add(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                      gcry_mpi_point_t a,
+                      gcry_mpi_point_t b);
 
 
 /**
@@ -1498,9 +1477,9 @@ GNUNET_CRYPTO_ecc_add (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @param[out] r_inv set to the additive inverse of @a r
  */
 void
-GNUNET_CRYPTO_ecc_rnd (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                       gcry_mpi_point_t *r,
-                       gcry_mpi_point_t *r_inv);
+GNUNET_CRYPTO_ecc_rnd(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                      gcry_mpi_point_t *r,
+                      gcry_mpi_point_t *r_inv);
 
 
 /**
@@ -1512,9 +1491,9 @@ GNUNET_CRYPTO_ecc_rnd (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @param[out] r_inv set to the multiplicative inverse of @a r
  */
 void
-GNUNET_CRYPTO_ecc_rnd_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
-                           gcry_mpi_t *r,
-                           gcry_mpi_t *r_inv);
+GNUNET_CRYPTO_ecc_rnd_mpi(struct GNUNET_CRYPTO_EccDlogContext *edc,
+                          gcry_mpi_t *r,
+                          gcry_mpi_t *r_inv);
 
 
 /**
@@ -1524,7 +1503,7 @@ GNUNET_CRYPTO_ecc_rnd_mpi (struct GNUNET_CRYPTO_EccDlogContext *edc,
  * @return random value mod n.
  */
 gcry_mpi_t
-GNUNET_CRYPTO_ecc_random_mod_n (struct GNUNET_CRYPTO_EccDlogContext *edc);
+GNUNET_CRYPTO_ecc_random_mod_n(struct GNUNET_CRYPTO_EccDlogContext *edc);
 
 
 /**
@@ -1533,7 +1512,7 @@ GNUNET_CRYPTO_ecc_random_mod_n (struct GNUNET_CRYPTO_EccDlogContext *edc);
  * @param p point to free
  */
 void
-GNUNET_CRYPTO_ecc_free (gcry_mpi_point_t p);
+GNUNET_CRYPTO_ecc_free(gcry_mpi_point_t p);
 
 
 /**
@@ -1542,7 +1521,7 @@ GNUNET_CRYPTO_ecc_free (gcry_mpi_point_t p);
  * @param dlc dlog context
  */
 void
-GNUNET_CRYPTO_ecc_dlog_release (struct GNUNET_CRYPTO_EccDlogContext *dlc);
+GNUNET_CRYPTO_ecc_dlog_release(struct GNUNET_CRYPTO_EccDlogContext *dlc);
 
 
 /**
@@ -1555,9 +1534,9 @@ GNUNET_CRYPTO_ecc_dlog_release (struct GNUNET_CRYPTO_EccDlogContext *dlc);
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecc_ecdh (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
-                        const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
-                        struct GNUNET_HashCode *key_material);
+GNUNET_CRYPTO_ecc_ecdh(const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
+                       const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
+                       struct GNUNET_HashCode *key_material);
 
 
 /**
@@ -1571,9 +1550,9 @@ GNUNET_CRYPTO_ecc_ecdh (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_eddsa_ecdh (const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
-                          const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
-                          struct GNUNET_HashCode *key_material);
+GNUNET_CRYPTO_eddsa_ecdh(const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
+                         const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
+                         struct GNUNET_HashCode *key_material);
 
 /**
  * @ingroup crypto
@@ -1586,9 +1565,9 @@ GNUNET_CRYPTO_eddsa_ecdh (const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecdsa_ecdh (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
-                          const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
-                          struct GNUNET_HashCode *key_material);
+GNUNET_CRYPTO_ecdsa_ecdh(const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
+                         const struct GNUNET_CRYPTO_EcdhePublicKey *pub,
+                         struct GNUNET_HashCode *key_material);
 
 
 /**
@@ -1602,9 +1581,9 @@ GNUNET_CRYPTO_ecdsa_ecdh (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecdh_eddsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
-                          const struct GNUNET_CRYPTO_EddsaPublicKey *pub,
-                          struct GNUNET_HashCode *key_material);
+GNUNET_CRYPTO_ecdh_eddsa(const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
+                         const struct GNUNET_CRYPTO_EddsaPublicKey *pub,
+                         struct GNUNET_HashCode *key_material);
 
 /**
  * @ingroup crypto
@@ -1617,9 +1596,9 @@ GNUNET_CRYPTO_ecdh_eddsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecdh_ecdsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
-                          const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
-                          struct GNUNET_HashCode *key_material);
+GNUNET_CRYPTO_ecdh_ecdsa(const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
+                         struct GNUNET_HashCode *key_material);
 
 
 /**
@@ -1632,7 +1611,7 @@ GNUNET_CRYPTO_ecdh_ecdsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_eddsa_sign (
+GNUNET_CRYPTO_eddsa_sign(
   const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
   const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
   struct GNUNET_CRYPTO_EddsaSignature *sig);
@@ -1648,7 +1627,7 @@ GNUNET_CRYPTO_eddsa_sign (
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_CRYPTO_ecdsa_sign (
+GNUNET_CRYPTO_ecdsa_sign(
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
   const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
   struct GNUNET_CRYPTO_EcdsaSignature *sig);
@@ -1664,7 +1643,7 @@ GNUNET_CRYPTO_ecdsa_sign (
  * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid
  */
 int
-GNUNET_CRYPTO_eddsa_verify (
+GNUNET_CRYPTO_eddsa_verify(
   uint32_t purpose,
   const struct GNUNET_CRYPTO_EccSignaturePurpose *validate,
   const struct GNUNET_CRYPTO_EddsaSignature *sig,
@@ -1682,7 +1661,7 @@ GNUNET_CRYPTO_eddsa_verify (
  * @returns #GNUNET_OK if ok, #GNUNET_SYSERR if invalid
  */
 int
-GNUNET_CRYPTO_ecdsa_verify (
+GNUNET_CRYPTO_ecdsa_verify(
   uint32_t purpose,
   const struct GNUNET_CRYPTO_EccSignaturePurpose *validate,
   const struct GNUNET_CRYPTO_EcdsaSignature *sig,
@@ -1703,7 +1682,7 @@ GNUNET_CRYPTO_ecdsa_verify (
  * @return derived private key
  */
 struct GNUNET_CRYPTO_EcdsaPrivateKey *
-GNUNET_CRYPTO_ecdsa_private_key_derive (
+GNUNET_CRYPTO_ecdsa_private_key_derive(
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv,
   const char *label,
   const char *context);
@@ -1721,7 +1700,7 @@ GNUNET_CRYPTO_ecdsa_private_key_derive (
  * @param result where to write the derived public key
  */
 void
-GNUNET_CRYPTO_ecdsa_public_key_derive (
+GNUNET_CRYPTO_ecdsa_public_key_derive(
   const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
   const char *label,
   const char *context,
@@ -1737,7 +1716,7 @@ GNUNET_CRYPTO_ecdsa_public_key_derive (
  * @param val value to write to @a buf
  */
 void
-GNUNET_CRYPTO_mpi_print_unsigned (void *buf, size_t size, gcry_mpi_t val);
+GNUNET_CRYPTO_mpi_print_unsigned(void *buf, size_t size, gcry_mpi_t val);
 
 
 /**
@@ -1750,9 +1729,9 @@ GNUNET_CRYPTO_mpi_print_unsigned (void *buf, size_t size, gcry_mpi_t val);
  * @param size number of bytes in @a data
  */
 void
-GNUNET_CRYPTO_mpi_scan_unsigned (gcry_mpi_t *result,
-                                 const void *data,
-                                 size_t size);
+GNUNET_CRYPTO_mpi_scan_unsigned(gcry_mpi_t *result,
+                                const void *data,
+                                size_t size);
 
 
 /**
@@ -1762,7 +1741,7 @@ GNUNET_CRYPTO_mpi_scan_unsigned (gcry_mpi_t *result,
  * @param[out] private_key Where to store the private key?
  */
 void
-GNUNET_CRYPTO_paillier_create (
+GNUNET_CRYPTO_paillier_create(
   struct GNUNET_CRYPTO_PaillierPublicKey *public_key,
   struct GNUNET_CRYPTO_PaillierPrivateKey *private_key);
 
@@ -1779,7 +1758,7 @@ GNUNET_CRYPTO_paillier_create (
  *         or -1 if less than one homomorphic operation is possible
  */
 int
-GNUNET_CRYPTO_paillier_encrypt (
+GNUNET_CRYPTO_paillier_encrypt(
   const struct GNUNET_CRYPTO_PaillierPublicKey *public_key,
   const gcry_mpi_t m,
   int desired_ops,
@@ -1795,7 +1774,7 @@ GNUNET_CRYPTO_paillier_encrypt (
  * @param[out] m Decryption of @a ciphertext with @private_key.
  */
 void
-GNUNET_CRYPTO_paillier_decrypt (
+GNUNET_CRYPTO_paillier_decrypt(
   const struct GNUNET_CRYPTO_PaillierPrivateKey *private_key,
   const struct GNUNET_CRYPTO_PaillierPublicKey *public_key,
   const struct GNUNET_CRYPTO_PaillierCiphertext *ciphertext,
@@ -1816,7 +1795,7 @@ GNUNET_CRYPTO_paillier_decrypt (
  *         #GNUNET_SYSERR if no more homomorphic operations are remaining.
  */
 int
-GNUNET_CRYPTO_paillier_hom_add (
+GNUNET_CRYPTO_paillier_hom_add(
   const struct GNUNET_CRYPTO_PaillierPublicKey *public_key,
   const struct GNUNET_CRYPTO_PaillierCiphertext *c1,
   const struct GNUNET_CRYPTO_PaillierCiphertext *c2,
@@ -1830,7 +1809,7 @@ GNUNET_CRYPTO_paillier_hom_add (
  * @return the number of remaining homomorphic operations
  */
 int
-GNUNET_CRYPTO_paillier_hom_get_remaining (
+GNUNET_CRYPTO_paillier_hom_get_remaining(
   const struct GNUNET_CRYPTO_PaillierCiphertext *c);
 
 
@@ -1850,8 +1829,7 @@ struct GNUNET_CRYPTO_RsaPublicKey;
 /**
  * Constant-size pre-secret for blinding key generation.
  */
-struct GNUNET_CRYPTO_RsaBlindingKeySecret
-{
+struct GNUNET_CRYPTO_RsaBlindingKeySecret {
   /**
    * Bits used to generate the blinding key.  256 bits
    * of entropy is enough.
@@ -1872,7 +1850,7 @@ struct GNUNET_CRYPTO_RsaSignature;
  * @return fresh private key
  */
 struct GNUNET_CRYPTO_RsaPrivateKey *
-GNUNET_CRYPTO_rsa_private_key_create (unsigned int len);
+GNUNET_CRYPTO_rsa_private_key_create(unsigned int len);
 
 
 /**
@@ -1881,7 +1859,7 @@ GNUNET_CRYPTO_rsa_private_key_create (unsigned int len);
  * @param key pointer to the memory to free
  */
 void
-GNUNET_CRYPTO_rsa_private_key_free (struct GNUNET_CRYPTO_RsaPrivateKey *key);
+GNUNET_CRYPTO_rsa_private_key_free(struct GNUNET_CRYPTO_RsaPrivateKey *key);
 
 
 /**
@@ -1893,7 +1871,7 @@ GNUNET_CRYPTO_rsa_private_key_free (struct GNUNET_CRYPTO_RsaPrivateKey *key);
  * @return size of memory allocatedin @a buffer
  */
 size_t
-GNUNET_CRYPTO_rsa_private_key_encode (
+GNUNET_CRYPTO_rsa_private_key_encode(
   const struct GNUNET_CRYPTO_RsaPrivateKey *key,
   char **buffer);
 
@@ -1907,7 +1885,7 @@ GNUNET_CRYPTO_rsa_private_key_encode (
  * @return NULL on error
  */
 struct GNUNET_CRYPTO_RsaPrivateKey *
-GNUNET_CRYPTO_rsa_private_key_decode (const char *buf, size_t len);
+GNUNET_CRYPTO_rsa_private_key_decode(const char *buf, size_t len);
 
 
 /**
@@ -1917,7 +1895,7 @@ GNUNET_CRYPTO_rsa_private_key_decode (const char *buf, size_t len);
  * @return the duplicate key; NULL upon error
  */
 struct GNUNET_CRYPTO_RsaPrivateKey *
-GNUNET_CRYPTO_rsa_private_key_dup (
+GNUNET_CRYPTO_rsa_private_key_dup(
   const struct GNUNET_CRYPTO_RsaPrivateKey *key);
 
 
@@ -1928,7 +1906,7 @@ GNUNET_CRYPTO_rsa_private_key_dup (
  * @retur NULL on error, otherwise the public key
  */
 struct GNUNET_CRYPTO_RsaPublicKey *
-GNUNET_CRYPTO_rsa_private_key_get_public (
+GNUNET_CRYPTO_rsa_private_key_get_public(
   const struct GNUNET_CRYPTO_RsaPrivateKey *priv);
 
 
@@ -1939,8 +1917,8 @@ GNUNET_CRYPTO_rsa_private_key_get_public (
  * @param hc where to store the hash code
  */
 void
-GNUNET_CRYPTO_rsa_public_key_hash (const struct GNUNET_CRYPTO_RsaPublicKey *key,
-                                   struct GNUNET_HashCode *hc);
+GNUNET_CRYPTO_rsa_public_key_hash(const struct GNUNET_CRYPTO_RsaPublicKey *key,
+                                  struct GNUNET_HashCode *hc);
 
 
 /**
@@ -1950,7 +1928,7 @@ GNUNET_CRYPTO_rsa_public_key_hash (const struct GNUNET_CRYPTO_RsaPublicKey *key,
  * @return length of the key in bits
  */
 unsigned int
-GNUNET_CRYPTO_rsa_public_key_len (const struct GNUNET_CRYPTO_RsaPublicKey *key);
+GNUNET_CRYPTO_rsa_public_key_len(const struct GNUNET_CRYPTO_RsaPublicKey *key);
 
 
 /**
@@ -1959,7 +1937,7 @@ GNUNET_CRYPTO_rsa_public_key_len (const struct GNUNET_CRYPTO_RsaPublicKey *key);
  * @param key pointer to the memory to free
  */
 void
-GNUNET_CRYPTO_rsa_public_key_free (struct GNUNET_CRYPTO_RsaPublicKey *key);
+GNUNET_CRYPTO_rsa_public_key_free(struct GNUNET_CRYPTO_RsaPublicKey *key);
 
 
 /**
@@ -1971,7 +1949,7 @@ GNUNET_CRYPTO_rsa_public_key_free (struct GNUNET_CRYPTO_RsaPublicKey *key);
  * @return size of memory allocated in @a buffer
  */
 size_t
-GNUNET_CRYPTO_rsa_public_key_encode (
+GNUNET_CRYPTO_rsa_public_key_encode(
   const struct GNUNET_CRYPTO_RsaPublicKey *key,
   char **buffer);
 
@@ -1985,7 +1963,7 @@ GNUNET_CRYPTO_rsa_public_key_encode (
  * @return NULL on error
  */
 struct GNUNET_CRYPTO_RsaPublicKey *
-GNUNET_CRYPTO_rsa_public_key_decode (const char *buf, size_t len);
+GNUNET_CRYPTO_rsa_public_key_decode(const char *buf, size_t len);
 
 
 /**
@@ -1995,7 +1973,7 @@ GNUNET_CRYPTO_rsa_public_key_decode (const char *buf, size_t len);
  * @return the duplicate key; NULL upon error
  */
 struct GNUNET_CRYPTO_RsaPublicKey *
-GNUNET_CRYPTO_rsa_public_key_dup (const struct GNUNET_CRYPTO_RsaPublicKey *key);
+GNUNET_CRYPTO_rsa_public_key_dup(const struct GNUNET_CRYPTO_RsaPublicKey *key);
 
 
 /**
@@ -2006,8 +1984,8 @@ GNUNET_CRYPTO_rsa_public_key_dup (const struct GNUNET_CRYPTO_RsaPublicKey *key);
  * @return 0 if the two are equal
  */
 int
-GNUNET_CRYPTO_rsa_signature_cmp (struct GNUNET_CRYPTO_RsaSignature *s1,
-                                 struct GNUNET_CRYPTO_RsaSignature *s2);
+GNUNET_CRYPTO_rsa_signature_cmp(struct GNUNET_CRYPTO_RsaSignature *s1,
+                                struct GNUNET_CRYPTO_RsaSignature *s2);
 
 /**
  * Compare the values of two private keys.
@@ -2017,8 +1995,8 @@ GNUNET_CRYPTO_rsa_signature_cmp (struct GNUNET_CRYPTO_RsaSignature *s1,
  * @return 0 if the two are equal
  */
 int
-GNUNET_CRYPTO_rsa_private_key_cmp (struct GNUNET_CRYPTO_RsaPrivateKey *p1,
-                                   struct GNUNET_CRYPTO_RsaPrivateKey *p2);
+GNUNET_CRYPTO_rsa_private_key_cmp(struct GNUNET_CRYPTO_RsaPrivateKey *p1,
+                                  struct GNUNET_CRYPTO_RsaPrivateKey *p2);
 
 
 /**
@@ -2029,8 +2007,8 @@ GNUNET_CRYPTO_rsa_private_key_cmp (struct GNUNET_CRYPTO_RsaPrivateKey *p1,
  * @return 0 if the two are equal
  */
 int
-GNUNET_CRYPTO_rsa_public_key_cmp (struct GNUNET_CRYPTO_RsaPublicKey *p1,
-                                  struct GNUNET_CRYPTO_RsaPublicKey *p2);
+GNUNET_CRYPTO_rsa_public_key_cmp(struct GNUNET_CRYPTO_RsaPublicKey *p1,
+                                 struct GNUNET_CRYPTO_RsaPublicKey *p2);
 
 
 /**
@@ -2044,11 +2022,11 @@ GNUNET_CRYPTO_rsa_public_key_cmp (struct GNUNET_CRYPTO_RsaPublicKey *p1,
  * @return #GNUNET_YES if successful, #GNUNET_NO if RSA key is malicious
  */
 int
-GNUNET_CRYPTO_rsa_blind (const struct GNUNET_HashCode *hash,
-                         const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks,
-                         struct GNUNET_CRYPTO_RsaPublicKey *pkey,
-                         char **buf,
-                         size_t *buf_size);
+GNUNET_CRYPTO_rsa_blind(const struct GNUNET_HashCode *hash,
+                        const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks,
+                        struct GNUNET_CRYPTO_RsaPublicKey *pkey,
+                        char **buf,
+                        size_t *buf_size);
 
 
 /**
@@ -2060,9 +2038,9 @@ GNUNET_CRYPTO_rsa_blind (const struct GNUNET_HashCode *hash,
  * @return NULL on error, signature on success
  */
 struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_CRYPTO_rsa_sign_blinded (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
-                                const void *msg,
-                                size_t msg_len);
+GNUNET_CRYPTO_rsa_sign_blinded(const struct GNUNET_CRYPTO_RsaPrivateKey *key,
+                               const void *msg,
+                               size_t msg_len);
 
 
 /**
@@ -2073,8 +2051,8 @@ GNUNET_CRYPTO_rsa_sign_blinded (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
  * @return NULL on error, including a malicious RSA key, signature on success
  */
 struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_CRYPTO_rsa_sign_fdh (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
-                            const struct GNUNET_HashCode *hash);
+GNUNET_CRYPTO_rsa_sign_fdh(const struct GNUNET_CRYPTO_RsaPrivateKey *key,
+                           const struct GNUNET_HashCode *hash);
 
 
 /**
@@ -2083,7 +2061,7 @@ GNUNET_CRYPTO_rsa_sign_fdh (const struct GNUNET_CRYPTO_RsaPrivateKey *key,
  * @param sig memory to free
  */
 void
-GNUNET_CRYPTO_rsa_signature_free (struct GNUNET_CRYPTO_RsaSignature *sig);
+GNUNET_CRYPTO_rsa_signature_free(struct GNUNET_CRYPTO_RsaSignature *sig);
 
 
 /**
@@ -2094,7 +2072,7 @@ GNUNET_CRYPTO_rsa_signature_free (struct GNUNET_CRYPTO_RsaSignature *sig);
  * @return size of memory allocated in @a buffer
  */
 size_t
-GNUNET_CRYPTO_rsa_signature_encode (
+GNUNET_CRYPTO_rsa_signature_encode(
   const struct GNUNET_CRYPTO_RsaSignature *sig,
   char **buffer);
 
@@ -2108,7 +2086,7 @@ GNUNET_CRYPTO_rsa_signature_encode (
  * @return NULL on error
  */
 struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_CRYPTO_rsa_signature_decode (const char *buf, size_t len);
+GNUNET_CRYPTO_rsa_signature_decode(const char *buf, size_t len);
 
 
 /**
@@ -2118,7 +2096,7 @@ GNUNET_CRYPTO_rsa_signature_decode (const char *buf, size_t len);
  * @return the duplicate key; NULL upon error
  */
 struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_CRYPTO_rsa_signature_dup (const struct GNUNET_CRYPTO_RsaSignature *sig);
+GNUNET_CRYPTO_rsa_signature_dup(const struct GNUNET_CRYPTO_RsaSignature *sig);
 
 
 /**
@@ -2132,9 +2110,9 @@ GNUNET_CRYPTO_rsa_signature_dup (const struct GNUNET_CRYPTO_RsaSignature *sig);
  * @return unblinded signature on success, NULL if RSA key is bad or malicious.
  */
 struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_CRYPTO_rsa_unblind (const struct GNUNET_CRYPTO_RsaSignature *sig,
-                           const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks,
-                           struct GNUNET_CRYPTO_RsaPublicKey *pkey);
+GNUNET_CRYPTO_rsa_unblind(const struct GNUNET_CRYPTO_RsaSignature *sig,
+                          const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks,
+                          struct GNUNET_CRYPTO_RsaPublicKey *pkey);
 
 
 /**
@@ -2147,9 +2125,9 @@ GNUNET_CRYPTO_rsa_unblind (const struct GNUNET_CRYPTO_RsaSignature *sig,
  * @returns #GNUNET_YES if ok, #GNUNET_NO if RSA key is malicious, #GNUNET_SYSERR if signature
  */
 int
-GNUNET_CRYPTO_rsa_verify (const struct GNUNET_HashCode *hash,
-                          const struct GNUNET_CRYPTO_RsaSignature *sig,
-                          const struct GNUNET_CRYPTO_RsaPublicKey *public_key);
+GNUNET_CRYPTO_rsa_verify(const struct GNUNET_HashCode *hash,
+                         const struct GNUNET_CRYPTO_RsaSignature *sig,
+                         const struct GNUNET_CRYPTO_RsaPublicKey *public_key);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index e9378794e..af0e929a5 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file src/include/gnunet_curl_lib.h
  * @brief library to make it easy to download JSON replies over HTTP
@@ -54,9 +54,7 @@ typedef void
  * @brief Buffer data structure we use to buffer the HTTP download
  * before giving it to the JSON parser.
  */
-struct GNUNET_CURL_DownloadBuffer
-{
-
+struct GNUNET_CURL_DownloadBuffer {
   /**
    * Download buffer
    */
@@ -72,7 +70,6 @@ struct GNUNET_CURL_DownloadBuffer
    * (i.e. response too large).
    */
   int eno;
-
 };
 
 
@@ -91,7 +88,7 @@ typedef void *
 
 /**
  * Deallocate the response.
- * 
+ *
  * @param response object to clean
  */
 typedef void
@@ -106,8 +103,8 @@ typedef void
  * @return library context
  */
 struct GNUNET_CURL_Context *
-GNUNET_CURL_init (GNUNET_CURL_RescheduleCallback cb,
-                  void *cb_cls);
+GNUNET_CURL_init(GNUNET_CURL_RescheduleCallback cb,
+                 void *cb_cls);
 
 
 /**
@@ -137,12 +134,12 @@ GNUNET_CURL_init (GNUNET_CURL_RescheduleCallback cb,
  *        proceed immediately with #GNUNET_CURL_perform().
  */
 void
-GNUNET_CURL_get_select_info (struct GNUNET_CURL_Context *ctx,
-                             fd_set *read_fd_set,
-                             fd_set *write_fd_set,
-                             fd_set *except_fd_set,
-                             int *max_fd,
-                             long *timeout);
+GNUNET_CURL_get_select_info(struct GNUNET_CURL_Context *ctx,
+                            fd_set *read_fd_set,
+                            fd_set *write_fd_set,
+                            fd_set *except_fd_set,
+                            int *max_fd,
+                            long *timeout);
 
 
 /**
@@ -153,8 +150,8 @@ GNUNET_CURL_get_select_info (struct GNUNET_CURL_Context *ctx,
  * @return #GNUNET_OK if no errors occurred, #GNUNET_SYSERR otherwise.
  */
 int
-GNUNET_CURL_append_header (struct GNUNET_CURL_Context *ctx,
-                           const char *header);
+GNUNET_CURL_append_header(struct GNUNET_CURL_Context *ctx,
+                          const char *header);
 
 /**
  * Run the main event loop for the CURL interaction.
@@ -162,7 +159,7 @@ GNUNET_CURL_append_header (struct GNUNET_CURL_Context *ctx,
  * @param ctx the library context
  */
 void
-GNUNET_CURL_perform (struct GNUNET_CURL_Context *ctx);
+GNUNET_CURL_perform(struct GNUNET_CURL_Context *ctx);
 
 
 /**
@@ -174,9 +171,9 @@ GNUNET_CURL_perform (struct GNUNET_CURL_Context *ctx);
  * @param rc cleans/frees the response
  */
 void
-GNUNET_CURL_perform2 (struct GNUNET_CURL_Context *ctx,
-                      GNUNET_CURL_RawParser rp,
-                      GNUNET_CURL_ResponseCleaner rc);
+GNUNET_CURL_perform2(struct GNUNET_CURL_Context *ctx,
+                     GNUNET_CURL_RawParser rp,
+                     GNUNET_CURL_ResponseCleaner rc);
 
 /**
  * Cleanup library initialisation resources.  This function should be called
@@ -186,7 +183,7 @@ GNUNET_CURL_perform2 (struct GNUNET_CURL_Context *ctx,
  * @param ctx the library context
  */
 void
-GNUNET_CURL_fini (struct GNUNET_CURL_Context *ctx);
+GNUNET_CURL_fini(struct GNUNET_CURL_Context *ctx);
 
 
 /**
@@ -224,11 +221,11 @@ typedef void
  * @return NULL on error (in this case, @eh is still released!)
  */
 struct GNUNET_CURL_Job *
-GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
-                     CURL *eh,
-                     int add_json,
-                     GNUNET_CURL_JobCompletionCallback jcc,
-                     void *jcc_cls);
+GNUNET_CURL_job_add(struct GNUNET_CURL_Context *ctx,
+                    CURL *eh,
+                    int add_json,
+                    GNUNET_CURL_JobCompletionCallback jcc,
+                    void *jcc_cls);
 
 
 /**
@@ -248,7 +245,7 @@ GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
  * @return NULL on error (in this case, @eh is still released!)
  */
 struct GNUNET_CURL_Job *
-GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
+GNUNET_CURL_job_add2(struct GNUNET_CURL_Context *ctx,
                      CURL *eh,
                      const struct curl_slist *job_headers,
                      GNUNET_CURL_JobCompletionCallback jcc,
@@ -262,7 +259,7 @@ GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
  * @param job job to cancel
  */
 void
-GNUNET_CURL_job_cancel (struct GNUNET_CURL_Job *job);
+GNUNET_CURL_job_cancel(struct GNUNET_CURL_Job *job);
 
 
 /* ******* GNUnet SCHEDULER integration ************ */
@@ -281,7 +278,7 @@ struct GNUNET_CURL_RescheduleContext;
  * @return closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
  */
 struct GNUNET_CURL_RescheduleContext *
-GNUNET_CURL_gnunet_rc_create (struct GNUNET_CURL_Context *ctx);
+GNUNET_CURL_gnunet_rc_create(struct GNUNET_CURL_Context *ctx);
 
 /**
  * Initialize reschedule context; with custom response parser
@@ -290,9 +287,9 @@ GNUNET_CURL_gnunet_rc_create (struct GNUNET_CURL_Context *ctx);
  * @return closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
  */
 struct GNUNET_CURL_RescheduleContext *
-GNUNET_CURL_gnunet_rc_create_with_parser (struct GNUNET_CURL_Context *ctx,
-                                          GNUNET_CURL_RawParser rp,
-                                          GNUNET_CURL_ResponseCleaner rc);
+GNUNET_CURL_gnunet_rc_create_with_parser(struct GNUNET_CURL_Context *ctx,
+                                         GNUNET_CURL_RawParser rp,
+                                         GNUNET_CURL_ResponseCleaner rc);
 
 
 /**
@@ -301,7 +298,7 @@ GNUNET_CURL_gnunet_rc_create_with_parser (struct GNUNET_CURL_Context *ctx,
  * @param rc context to destroy
  */
 void
-GNUNET_CURL_gnunet_rc_destroy (struct GNUNET_CURL_RescheduleContext *rc);
+GNUNET_CURL_gnunet_rc_destroy(struct GNUNET_CURL_RescheduleContext *rc);
 
 
 /**
@@ -314,7 +311,7 @@ GNUNET_CURL_gnunet_rc_destroy (struct GNUNET_CURL_RescheduleContext *rc);
  *           (pointer to a pointer!)
  */
 void
-GNUNET_CURL_gnunet_scheduler_reschedule (void *cls);
+GNUNET_CURL_gnunet_scheduler_reschedule(void *cls);
 
 
 /**
@@ -324,7 +321,7 @@ GNUNET_CURL_gnunet_scheduler_reschedule (void *cls);
  * @param header_name name of the header to send.
  */
 void
-GNUNET_CURL_enable_async_scope_header (struct GNUNET_CURL_Context *ctx, const char *header_name);
+GNUNET_CURL_enable_async_scope_header(struct GNUNET_CURL_Context *ctx, const char *header_name);
 
 
 #endif
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 568e60d42..19de3ceea 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -63,8 +63,8 @@ struct GNUNET_DATACACHE_Handle;
  * @return handle to use to access the service
  */
 struct GNUNET_DATACACHE_Handle *
-GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         const char *section);
+GNUNET_DATACACHE_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                        const char *section);
 
 
 /**
@@ -73,7 +73,7 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h handle to the datastore
  */
 void
-GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h);
+GNUNET_DATACACHE_destroy(struct GNUNET_DATACACHE_Handle *h);
 
 
 /**
@@ -115,15 +115,15 @@ typedef int
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error, #GNUNET_NO if duplicate
  */
 int
-GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
-                      const struct GNUNET_HashCode *key,
-                      uint32_t xor_distance,
-                      size_t data_size,
-                      const char *data,
-                      enum GNUNET_BLOCK_Type type,
-                      struct GNUNET_TIME_Absolute discard_time,
-                      unsigned int path_info_len,
-                      const struct GNUNET_PeerIdentity *path_info);
+GNUNET_DATACACHE_put(struct GNUNET_DATACACHE_Handle *h,
+                     const struct GNUNET_HashCode *key,
+                     uint32_t xor_distance,
+                     size_t data_size,
+                     const char *data,
+                     enum GNUNET_BLOCK_Type type,
+                     struct GNUNET_TIME_Absolute discard_time,
+                     unsigned int path_info_len,
+                     const struct GNUNET_PeerIdentity *path_info);
 
 
 /**
@@ -138,11 +138,11 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found
  */
 unsigned int
-GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
-                      const struct GNUNET_HashCode *key,
-                      enum GNUNET_BLOCK_Type type,
-                      GNUNET_DATACACHE_Iterator iter,
-                      void *iter_cls);
+GNUNET_DATACACHE_get(struct GNUNET_DATACACHE_Handle *h,
+                     const struct GNUNET_HashCode *key,
+                     enum GNUNET_BLOCK_Type type,
+                     GNUNET_DATACACHE_Iterator iter,
+                     void *iter_cls);
 
 
 /**
@@ -154,9 +154,9 @@ GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found (zero or 1)
  */
 unsigned int
-GNUNET_DATACACHE_get_random (struct GNUNET_DATACACHE_Handle *h,
-                             GNUNET_DATACACHE_Iterator iter,
-                             void *iter_cls);
+GNUNET_DATACACHE_get_random(struct GNUNET_DATACACHE_Handle *h,
+                            GNUNET_DATACACHE_Iterator iter,
+                            void *iter_cls);
 
 
 /**
@@ -173,11 +173,11 @@ GNUNET_DATACACHE_get_random (struct GNUNET_DATACACHE_Handle *h,
  * @return the number of results found
  */
 unsigned int
-GNUNET_DATACACHE_get_closest (struct GNUNET_DATACACHE_Handle *h,
-                              const struct GNUNET_HashCode *key,
-                              unsigned int num_results,
-                              GNUNET_DATACACHE_Iterator iter,
-                              void *iter_cls);
+GNUNET_DATACACHE_get_closest(struct GNUNET_DATACACHE_Handle *h,
+                             const struct GNUNET_HashCode *key,
+                             unsigned int num_results,
+                             GNUNET_DATACACHE_Iterator iter,
+                             void *iter_cls);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 5a4e6dc0d..b4e6dbe8e 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -61,9 +61,7 @@ typedef void
  * of this type as the first and only argument to the
  * entry point of each datastore plugin.
  */
-struct GNUNET_DATACACHE_PluginEnvironment
-{
-
+struct GNUNET_DATACACHE_PluginEnvironment {
   /**
    * Configuration to use.
    */
@@ -89,16 +87,13 @@ struct GNUNET_DATACACHE_PluginEnvironment
    * How much space are we allowed to use?
    */
   unsigned long long quota;
-
 };
 
 
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct GNUNET_DATACACHE_PluginFunctions
-{
-
+struct GNUNET_DATACACHE_PluginFunctions {
   /**
    * Closure to pass to all plugin functions.
    */
@@ -122,11 +117,11 @@ struct GNUNET_DATACACHE_PluginFunctions
                   const struct GNUNET_HashCode *key,
                   uint32_t xor_distance,
                   size_t size,
-                  const char *data,
+                  const char *data,
                   enum GNUNET_BLOCK_Type type,
-                  struct GNUNET_TIME_Absolute discard_time,
-                  unsigned int path_info_len,
-                  const struct GNUNET_PeerIdentity *path_info);
+                  struct GNUNET_TIME_Absolute discard_time,
+                  unsigned int path_info_len,
+                  const struct GNUNET_PeerIdentity *path_info);
 
   /**
    * Iterate over the results for a particular key
@@ -185,7 +180,6 @@ struct GNUNET_DATACACHE_PluginFunctions
                                unsigned int num_results,
                                GNUNET_DATACACHE_Iterator iter,
                                void *iter_cls);
-
 };
 
 
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index ccd604845..95b12f7ad 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -55,7 +55,7 @@
  */
 typedef void
 (*GNUNET_DATASTORE_DiskUtilizationChange) (void *cls,
-                                           int delta);
+                                           int delta);
 
 
 /**
@@ -63,8 +63,7 @@ typedef void
  * of this type as the first and only argument to the
  * entry point of each datastore plugin.
  */
-struct GNUNET_DATASTORE_PluginEnvironment
-{
+struct GNUNET_DATASTORE_PluginEnvironment {
   /**
    * Configuration to use.
    */
@@ -79,7 +78,6 @@ struct GNUNET_DATASTORE_PluginEnvironment
    * Closure.
    */
   void *cls;
-
 };
 
 
@@ -125,7 +123,7 @@ typedef int
  */
 typedef void
 (*PluginEstimateSize) (void *cls,
-                       unsigned long long *estimate);
+                       unsigned long long *estimate);
 
 
 /**
@@ -140,10 +138,10 @@ typedef void
  */
 typedef void
 (*PluginPutCont) (void *cls,
-                  const struct GNUNET_HashCode *key,
-                  uint32_t size,
-                  int status,
-                  const char *msg);
+                  const struct GNUNET_HashCode *key,
+                  uint32_t size,
+                  int status,
+                  const char *msg);
 
 
 /**
@@ -188,8 +186,8 @@ typedef void
  */
 typedef void
 (*PluginKeyProcessor) (void *cls,
-                       const struct GNUNET_HashCode *key,
-                       unsigned int count);
+                       const struct GNUNET_HashCode *key,
+                       unsigned int count);
 
 
 /**
@@ -201,7 +199,7 @@ typedef void
  */
 typedef void
 (*PluginGetKeys) (void *cls,
-                  PluginKeyProcessor proc,
+                  PluginKeyProcessor proc,
                   void *proc_cls);
 
 
@@ -277,8 +275,8 @@ typedef void
  */
 typedef void
 (*PluginGetRandom) (void *cls,
-                    PluginDatumProcessor proc,
-                    void *proc_cls);
+                    PluginDatumProcessor proc,
+                    void *proc_cls);
 
 
 /**
@@ -313,9 +311,7 @@ typedef void
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_DATASTORE_PluginFunctions
-{
-
+struct GNUNET_DATASTORE_PluginFunctions {
   /**
    * Closure to use for all of the following callbacks
    * (except "next_request").
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index b5b9d4306..e4cd4a915 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -72,7 +72,7 @@ struct GNUNET_DATASTORE_Handle;
  * @return handle to use to access the service
  */
 struct GNUNET_DATASTORE_Handle *
-GNUNET_DATASTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_DATASTORE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -83,8 +83,8 @@ GNUNET_DATASTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param drop set to #GNUNET_YES to delete all data in datastore (!)
  */
 void
-GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
-                             int drop);
+GNUNET_DATASTORE_disconnect(struct GNUNET_DATASTORE_Handle *h,
+                            int drop);
 
 
 /**
@@ -123,11 +123,11 @@ typedef void
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
-                          uint64_t amount,
-                          uint32_t entries,
-                          GNUNET_DATASTORE_ContinuationWithStatus cont,
-                          void *cont_cls);
+GNUNET_DATASTORE_reserve(struct GNUNET_DATASTORE_Handle *h,
+                         uint64_t amount,
+                         uint32_t entries,
+                         GNUNET_DATASTORE_ContinuationWithStatus cont,
+                         void *cont_cls);
 
 
 /**
@@ -156,20 +156,20 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h,
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
-                      uint32_t rid,
-                      const struct GNUNET_HashCode *key,
-                      size_t size,
-                      const void *data,
-                      enum GNUNET_BLOCK_Type type,
-                      uint32_t priority,
-                      uint32_t anonymity,
-                      uint32_t replication,
-                      struct GNUNET_TIME_Absolute expiration,
-                      unsigned int queue_priority,
-                      unsigned int max_queue_size,
-                      GNUNET_DATASTORE_ContinuationWithStatus cont,
-                      void *cont_cls);
+GNUNET_DATASTORE_put(struct GNUNET_DATASTORE_Handle *h,
+                     uint32_t rid,
+                     const struct GNUNET_HashCode *key,
+                     size_t size,
+                     const void *data,
+                     enum GNUNET_BLOCK_Type type,
+                     uint32_t priority,
+                     uint32_t anonymity,
+                     uint32_t replication,
+                     struct GNUNET_TIME_Absolute expiration,
+                     unsigned int queue_priority,
+                     unsigned int max_queue_size,
+                     GNUNET_DATASTORE_ContinuationWithStatus cont,
+                     void *cont_cls);
 
 
 /**
@@ -193,11 +193,11 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
-                                  uint32_t rid, unsigned int queue_priority,
-                                  unsigned int max_queue_size,
-                                  GNUNET_DATASTORE_ContinuationWithStatus cont,
-                                  void *cont_cls);
+GNUNET_DATASTORE_release_reserve(struct GNUNET_DATASTORE_Handle *h,
+                                 uint32_t rid, unsigned int queue_priority,
+                                 unsigned int max_queue_size,
+                                 GNUNET_DATASTORE_ContinuationWithStatus cont,
+                                 void *cont_cls);
 
 
 /**
@@ -220,14 +220,14 @@ GNUNET_DATASTORE_release_reserve (struct GNUNET_DATASTORE_Handle *h,
  *         (or rather, will already have been invoked)
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
-                         const struct GNUNET_HashCode *key,
-                         size_t size,
-                         const void *data,
-                         unsigned int queue_priority,
-                         unsigned int max_queue_size,
-                         GNUNET_DATASTORE_ContinuationWithStatus cont,
-                         void *cont_cls);
+GNUNET_DATASTORE_remove(struct GNUNET_DATASTORE_Handle *h,
+                        const struct GNUNET_HashCode *key,
+                        size_t size,
+                        const void *data,
+                        unsigned int queue_priority,
+                        unsigned int max_queue_size,
+                        GNUNET_DATASTORE_ContinuationWithStatus cont,
+                        void *cont_cls);
 
 
 /**
@@ -277,15 +277,15 @@ typedef void
  *         cancel
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
-                          uint64_t next_uid,
-                          bool random,
-                          const struct GNUNET_HashCode *key,
-                          enum GNUNET_BLOCK_Type type,
-                          unsigned int queue_priority,
-                          unsigned int max_queue_size,
-                          GNUNET_DATASTORE_DatumProcessor proc,
-                          void *proc_cls);
+GNUNET_DATASTORE_get_key(struct GNUNET_DATASTORE_Handle *h,
+                         uint64_t next_uid,
+                         bool random,
+                         const struct GNUNET_HashCode *key,
+                         enum GNUNET_BLOCK_Type type,
+                         unsigned int queue_priority,
+                         unsigned int max_queue_size,
+                         GNUNET_DATASTORE_DatumProcessor proc,
+                         void *proc_cls);
 
 
 /**
@@ -305,13 +305,13 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h,
  *         cancel
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
-                                     uint64_t next_uid,
-                                     unsigned int queue_priority,
-                                     unsigned int max_queue_size,
-                                     enum GNUNET_BLOCK_Type type,
-                                     GNUNET_DATASTORE_DatumProcessor proc,
-                                     void *proc_cls);
+GNUNET_DATASTORE_get_zero_anonymity(struct GNUNET_DATASTORE_Handle *h,
+                                    uint64_t next_uid,
+                                    unsigned int queue_priority,
+                                    unsigned int max_queue_size,
+                                    enum GNUNET_BLOCK_Type type,
+                                    GNUNET_DATASTORE_DatumProcessor proc,
+                                    void *proc_cls);
 
 
 /**
@@ -333,11 +333,11 @@ GNUNET_DATASTORE_get_zero_anonymity (struct GNUNET_DATASTORE_Handle *h,
  *         cancel
  */
 struct GNUNET_DATASTORE_QueueEntry *
-GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
-                                      unsigned int queue_priority,
-                                      unsigned int max_queue_size,
-                                      GNUNET_DATASTORE_DatumProcessor proc,
-                                      void *proc_cls);
+GNUNET_DATASTORE_get_for_replication(struct GNUNET_DATASTORE_Handle *h,
+                                     unsigned int queue_priority,
+                                     unsigned int max_queue_size,
+                                     GNUNET_DATASTORE_DatumProcessor proc,
+                                     void *proc_cls);
 
 
 
@@ -348,7 +348,7 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
  * @param qe operation to cancel
  */
 void
-GNUNET_DATASTORE_cancel (struct GNUNET_DATASTORE_QueueEntry *qe);
+GNUNET_DATASTORE_cancel(struct GNUNET_DATASTORE_QueueEntry *qe);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index ea3b8d519..c7568c934 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2017 GNUnet e.V.
+   This file is part of GNUnet
+   Copyright (C) 2017 GNUnet e.V.
 
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file include/gnunet_db_lib.h
  * @brief shared defintions for transactional databases
@@ -31,8 +31,7 @@
  * Can be combined with a function that returns the number
  * of results, so all non-negative values indicate success.
  */
-enum GNUNET_DB_QueryStatus
-{
+enum GNUNET_DB_QueryStatus {
   /**
    * A hard error occurred, retrying will not help.
    */
@@ -57,9 +56,8 @@ enum GNUNET_DB_QueryStatus
    */
   GNUNET_DB_STATUS_SUCCESS_ONE_RESULT = 1
 
-  /* Larger values may be returned for SELECT statements
-     that returned more than one result. */
-
+                                        /* Larger values may be returned for SELECT statements
+                                           that returned more than one result. */
 };
 
 #endif
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index d9bbccbdf..e22d2b5df 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -74,8 +74,7 @@ struct GNUNET_DHT_FindPeerHandle;
 /**
  * Options for routing.
  */
-enum GNUNET_DHT_RouteOption
-{
+enum GNUNET_DHT_RouteOption {
   /**
    * Default.  Do nothing special.
    */
@@ -119,8 +118,8 @@ enum GNUNET_DHT_RouteOption
  * @return NULL on error
  */
 struct GNUNET_DHT_Handle *
-GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    unsigned int ht_len);
+GNUNET_DHT_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                   unsigned int ht_len);
 
 
 /**
@@ -129,7 +128,7 @@ GNUNET_DHT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle connection to shut down
  */
 void
-GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle);
+GNUNET_DHT_disconnect(struct GNUNET_DHT_Handle *handle);
 
 
 /* *************** Standard API: get and put ******************* */
@@ -160,16 +159,16 @@ struct GNUNET_DHT_PutHandle;
  *        (size too big)
  */
 struct GNUNET_DHT_PutHandle *
-GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
-                const struct GNUNET_HashCode *key,
-                uint32_t desired_replication_level,
-                enum GNUNET_DHT_RouteOption options,
-                enum GNUNET_BLOCK_Type type,
-                size_t size,
-                const void *data,
-                struct GNUNET_TIME_Absolute exp,
-                GNUNET_SCHEDULER_TaskCallback cont,
-                void *cont_cls);
+GNUNET_DHT_put(struct GNUNET_DHT_Handle *handle,
+               const struct GNUNET_HashCode *key,
+               uint32_t desired_replication_level,
+               enum GNUNET_DHT_RouteOption options,
+               enum GNUNET_BLOCK_Type type,
+               size_t size,
+               const void *data,
+               struct GNUNET_TIME_Absolute exp,
+               GNUNET_SCHEDULER_TaskCallback cont,
+               void *cont_cls);
 
 
 /**
@@ -184,7 +183,7 @@ GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
  * @param ph put operation to cancel ('cont' will no longer be called)
  */
 void
-GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph);
+GNUNET_DHT_put_cancel(struct GNUNET_DHT_PutHandle *ph);
 
 
 /**
@@ -234,15 +233,15 @@ typedef void
  * @return handle to stop the async get
  */
 struct GNUNET_DHT_GetHandle *
-GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle,
-                      enum GNUNET_BLOCK_Type type,
-                      const struct GNUNET_HashCode *key,
-                      uint32_t desired_replication_level,
-                      enum GNUNET_DHT_RouteOption options,
-                      const void *xquery,
-                      size_t xquery_size,
-                      GNUNET_DHT_GetIterator iter,
-                      void *iter_cls);
+GNUNET_DHT_get_start(struct GNUNET_DHT_Handle *handle,
+                     enum GNUNET_BLOCK_Type type,
+                     const struct GNUNET_HashCode *key,
+                     uint32_t desired_replication_level,
+                     enum GNUNET_DHT_RouteOption options,
+                     const void *xquery,
+                     size_t xquery_size,
+                     GNUNET_DHT_GetIterator iter,
+                     void *iter_cls);
 
 
 /**
@@ -256,9 +255,9 @@ GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle,
  *        to be blocked
  */
 void
-GNUNET_DHT_get_filter_known_results (struct GNUNET_DHT_GetHandle *get_handle,
-                                     unsigned int num_results,
-                                     const struct GNUNET_HashCode *results);
+GNUNET_DHT_get_filter_known_results(struct GNUNET_DHT_GetHandle *get_handle,
+                                    unsigned int num_results,
+                                    const struct GNUNET_HashCode *results);
 
 /**
  * Stop async DHT-get.  Frees associated resources.
@@ -266,7 +265,7 @@ GNUNET_DHT_get_filter_known_results (struct GNUNET_DHT_GetHandle *get_handle,
  * @param get_handle GET operation to stop.
  */
 void
-GNUNET_DHT_get_stop (struct GNUNET_DHT_GetHandle *get_handle);
+GNUNET_DHT_get_stop(struct GNUNET_DHT_GetHandle *get_handle);
 
 
 /* *************** Extended API: monitor ******************* */
@@ -369,13 +368,13 @@ typedef void
  * @return Handle to stop monitoring.
  */
 struct GNUNET_DHT_MonitorHandle *
-GNUNET_DHT_monitor_start (struct GNUNET_DHT_Handle *handle,
-                          enum GNUNET_BLOCK_Type type,
-                          const struct GNUNET_HashCode *key,
-                          GNUNET_DHT_MonitorGetCB get_cb,
-                          GNUNET_DHT_MonitorGetRespCB get_resp_cb,
-                          GNUNET_DHT_MonitorPutCB put_cb,
-                          void *cb_cls);
+GNUNET_DHT_monitor_start(struct GNUNET_DHT_Handle *handle,
+                         enum GNUNET_BLOCK_Type type,
+                         const struct GNUNET_HashCode *key,
+                         GNUNET_DHT_MonitorGetCB get_cb,
+                         GNUNET_DHT_MonitorGetRespCB get_resp_cb,
+                         GNUNET_DHT_MonitorPutCB put_cb,
+                         void *cb_cls);
 
 
 /**
@@ -386,7 +385,7 @@ GNUNET_DHT_monitor_start (struct GNUNET_DHT_Handle *handle,
  *         #GNUNET_DHT_monitor_start().
  */
 void
-GNUNET_DHT_monitor_stop (struct GNUNET_DHT_MonitorHandle *handle);
+GNUNET_DHT_monitor_stop(struct GNUNET_DHT_MonitorHandle *handle);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 367789722..f693615f1 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -38,8 +38,7 @@ struct GNUNET_DISK_PipeHandle;
 /**
  * Type of a handle.
  */
-enum GNUNET_FILE_Type
-{
+enum GNUNET_FILE_Type {
   /**
    * Handle represents an event.
    */
@@ -59,9 +58,7 @@ enum GNUNET_FILE_Type
 /**
  * Handle used to access files (and pipes).
  */
-struct GNUNET_DISK_FileHandle
-{
-
+struct GNUNET_DISK_FileHandle {
 #if WINDOWS
   /**
    * File handle under W32.
@@ -83,12 +80,10 @@ struct GNUNET_DISK_FileHandle
    */
   OVERLAPPED *oOverlapWrite;
 #else
-
   /**
    * File handle on other OSes.
    */
   int fd;
-
 #endif
 };
 
@@ -113,9 +108,7 @@ extern "C"
 /**
  * Specifies how a file should be opened.
  */
-enum GNUNET_DISK_OpenFlags
-{
-
+enum GNUNET_DISK_OpenFlags {
   /**
    * Open the file for reading
    */
@@ -155,8 +148,7 @@ enum GNUNET_DISK_OpenFlags
 /**
  * Specifies what type of memory map is desired.
  */
-enum GNUNET_DISK_MapType
-{
+enum GNUNET_DISK_MapType {
   /**
    * Read-only memory map.
    */
@@ -177,8 +169,7 @@ enum GNUNET_DISK_MapType
 /**
  * File access permissions, UNIX-style.
  */
-enum GNUNET_DISK_AccessPermissions
-{
+enum GNUNET_DISK_AccessPermissions {
   /**
    * Nobody is allowed to do anything to the file.
    */
@@ -235,8 +226,7 @@ enum GNUNET_DISK_AccessPermissions
  * Constants for specifying how to seek.  Do not change values or order,
  * some of the code depends on the specific numeric values!
  */
-enum GNUNET_DISK_Seek
-{
+enum GNUNET_DISK_Seek {
   /**
    * Seek an absolute position (from the start of the file).
    */
@@ -257,8 +247,7 @@ enum GNUNET_DISK_Seek
 /**
  * Enumeration identifying the two ends of a pipe.
  */
-enum GNUNET_DISK_PipeEnd
-{
+enum GNUNET_DISK_PipeEnd {
   /**
    * The reading-end of a pipe.
    */
@@ -278,7 +267,7 @@ enum GNUNET_DISK_PipeEnd
  * @return #GNUNET_YES if invalid, #GNUNET_NO if valid
  */
 int
-GNUNET_DISK_handle_invalid (const struct GNUNET_DISK_FileHandle *h);
+GNUNET_DISK_handle_invalid(const struct GNUNET_DISK_FileHandle *h);
 
 
 /**
@@ -290,7 +279,7 @@ GNUNET_DISK_handle_invalid (const struct GNUNET_DISK_FileHandle *h);
  * else (will print an error message in that case, too).
  */
 int
-GNUNET_DISK_file_test (const char *fil);
+GNUNET_DISK_file_test(const char *fil);
 
 
 /**
@@ -301,7 +290,7 @@ GNUNET_DISK_file_test (const char *fil);
  * @param fil name of the file to back up
  */
 void
-GNUNET_DISK_file_backup (const char *fil);
+GNUNET_DISK_file_backup(const char *fil);
 
 
 /**
@@ -312,8 +301,8 @@ GNUNET_DISK_file_backup (const char *fil);
  * @return the new position on success, GNUNET_SYSERR otherwise
  */
 off_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, off_t offset,
-                       enum GNUNET_DISK_Seek whence);
+GNUNET_DISK_file_seek(const struct GNUNET_DISK_FileHandle *h, off_t offset,
+                      enum GNUNET_DISK_Seek whence);
 
 
 /**
@@ -331,10 +320,10 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, off_t offset,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_DISK_file_size (const char *filename,
-                       uint64_t *size,
-                       int include_symbolic_links,
-                       int single_file_mode);
+GNUNET_DISK_file_size(const char *filename,
+                      uint64_t *size,
+                      int include_symbolic_links,
+                      int single_file_mode);
 
 
 /**
@@ -353,9 +342,9 @@ GNUNET_DISK_file_size (const char *filename,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_DISK_file_get_identifiers (const char *filename,
-                                  uint64_t *dev,
-                                  uint64_t *ino);
+GNUNET_DISK_file_get_identifiers(const char *filename,
+                                 uint64_t *dev,
+                                 uint64_t *ino);
 
 
 /**
@@ -370,7 +359,7 @@ GNUNET_DISK_file_get_identifiers (const char *filename,
  *         file on disk in directory for temporary files
  */
 char *
-GNUNET_DISK_mktemp (const char *t);
+GNUNET_DISK_mktemp(const char *t);
 
 
 /**
@@ -383,7 +372,7 @@ GNUNET_DISK_mktemp (const char *t);
  * @return NULL on error, otherwise name of freshly created directory
  */
 char *
-GNUNET_DISK_mkdtemp (const char *t);
+GNUNET_DISK_mkdtemp(const char *t);
 
 
 /**
@@ -399,9 +388,9 @@ GNUNET_DISK_mkdtemp (const char *t);
  * @return IO handle on success, NULL on error
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_file_open (const char *fn,
-                       enum GNUNET_DISK_OpenFlags flags,
-                       enum GNUNET_DISK_AccessPermissions perm);
+GNUNET_DISK_file_open(const char *fn,
+                      enum GNUNET_DISK_OpenFlags flags,
+                      enum GNUNET_DISK_AccessPermissions perm);
 
 
 /**
@@ -412,8 +401,8 @@ GNUNET_DISK_file_open (const char *fn,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
-                              off_t *size);
+GNUNET_DISK_file_handle_size(struct GNUNET_DISK_FileHandle *fh,
+                             off_t *size);
 
 
 /**
@@ -426,10 +415,10 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking_read,
-                  int blocking_write,
-                  int inherit_read,
-                  int inherit_write);
+GNUNET_DISK_pipe(int blocking_read,
+                 int blocking_write,
+                 int inherit_read,
+                 int inherit_write);
 
 
 /**
@@ -443,9 +432,9 @@ GNUNET_DISK_pipe (int blocking_read,
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe_from_fd (int blocking_read,
-                          int blocking_write,
-                          int fd[2]);
+GNUNET_DISK_pipe_from_fd(int blocking_read,
+                         int blocking_write,
+                         int fd[2]);
 
 
 /**
@@ -454,7 +443,7 @@ GNUNET_DISK_pipe_from_fd (int blocking_read,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p);
+GNUNET_DISK_pipe_close(struct GNUNET_DISK_PipeHandle *p);
 
 
 /**
@@ -465,8 +454,8 @@ GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
-                            enum GNUNET_DISK_PipeEnd end);
+GNUNET_DISK_pipe_close_end(struct GNUNET_DISK_PipeHandle *p,
+                           enum GNUNET_DISK_PipeEnd end);
 
 
 /**
@@ -482,8 +471,8 @@ GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
  * (or if that end is not present or is closed).
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p,
-                             enum GNUNET_DISK_PipeEnd end);
+GNUNET_DISK_pipe_detach_end(struct GNUNET_DISK_PipeHandle *p,
+                            enum GNUNET_DISK_PipeEnd end);
 
 /**
  * Close an open file.
@@ -492,7 +481,7 @@ GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h);
+GNUNET_DISK_file_close(struct GNUNET_DISK_FileHandle *h);
 
 
 /**
@@ -503,8 +492,8 @@ GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h);
  * @return handle for the respective end
  */
 const struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
-                         enum GNUNET_DISK_PipeEnd n);
+GNUNET_DISK_pipe_handle(const struct GNUNET_DISK_PipeHandle *p,
+                        enum GNUNET_DISK_PipeEnd n);
 
 
 #if WINDOWS
@@ -516,7 +505,7 @@ GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
  * @return GNUnet file handle corresponding to the W32 handle
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh);
+GNUNET_DISK_get_handle_from_w32_handle(HANDLE osfh);
 #endif
 
 /**
@@ -529,9 +518,9 @@ GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh);
  * @param require_gid_match #GNUNET_YES means 770 unless @a require_uid_match is set
  */
 void
-GNUNET_DISK_fix_permissions (const char *fn,
-                             int require_uid_match,
-                             int require_gid_match);
+GNUNET_DISK_fix_permissions(const char *fn,
+                            int require_uid_match,
+                            int require_gid_match);
 
 
 /**
@@ -541,7 +530,7 @@ GNUNET_DISK_fix_permissions (const char *fn,
  * @return file handle corresponding to the descriptor
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_get_handle_from_int_fd (int fno);
+GNUNET_DISK_get_handle_from_int_fd(int fno);
 
 
 /**
@@ -551,7 +540,7 @@ GNUNET_DISK_get_handle_from_int_fd (int fno);
  * @return file handle corresponding to the descriptor
  */
 struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_get_handle_from_native (FILE *fd);
+GNUNET_DISK_get_handle_from_native(FILE *fd);
 
 
 /**
@@ -563,9 +552,9 @@ GNUNET_DISK_get_handle_from_native (FILE *fd);
  * @return the number of bytes read on success, #GNUNET_SYSERR on failure
  */
 ssize_t
-GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h,
-                       void *result,
-                       size_t len);
+GNUNET_DISK_file_read(const struct GNUNET_DISK_FileHandle *h,
+                      void *result,
+                      size_t len);
 
 
 /**
@@ -579,9 +568,9 @@ GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h,
  * @return the number of bytes read on success, #GNUNET_SYSERR on failure
  */
 ssize_t
-GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
-                                    void *result,
-                                    size_t len);
+GNUNET_DISK_file_read_non_blocking(const struct GNUNET_DISK_FileHandle * h,
+                                   void *result,
+                                   size_t len);
 
 
 /**
@@ -593,9 +582,9 @@ GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
  * @return number of bytes read, #GNUNET_SYSERR on failure
  */
 ssize_t
-GNUNET_DISK_fn_read (const char *fn,
-                     void *result,
-                     size_t len);
+GNUNET_DISK_fn_read(const char *fn,
+                    void *result,
+                    size_t len);
 
 
 /**
@@ -607,9 +596,9 @@ GNUNET_DISK_fn_read (const char *fn,
  * @return number of bytes written on success, #GNUNET_SYSERR on error
  */
 ssize_t
-GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h,
-                        const void *buffer,
-                        size_t n);
+GNUNET_DISK_file_write(const struct GNUNET_DISK_FileHandle *h,
+                       const void *buffer,
+                       size_t n);
 
 
 /**
@@ -621,9 +610,9 @@ GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h,
  * @return number of bytes written on success, #GNUNET_SYSERR on error
  */
 ssize_t
-GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h,
-                                 const void *buffer,
-                                 size_t n);
+GNUNET_DISK_file_write_blocking(const struct GNUNET_DISK_FileHandle *h,
+                                const void *buffer,
+                                size_t n);
 
 
 /**
@@ -637,10 +626,10 @@ GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h,
  * @return number of bytes written on success, #GNUNET_SYSERR on error
  */
 ssize_t
-GNUNET_DISK_fn_write (const char *fn,
-                      const void *buffer,
-                      size_t n,
-                      enum GNUNET_DISK_AccessPermissions mode);
+GNUNET_DISK_fn_write(const char *fn,
+                     const void *buffer,
+                     size_t n,
+                     enum GNUNET_DISK_AccessPermissions mode);
 
 
 /**
@@ -651,8 +640,8 @@ GNUNET_DISK_fn_write (const char *fn,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_copy (const char *src,
-                       const char *dst);
+GNUNET_DISK_file_copy(const char *src,
+                      const char *dst);
 
 
 /**
@@ -664,9 +653,9 @@ GNUNET_DISK_file_copy (const char *src,
  * @return the number of files found, -1 on error
  */
 int
-GNUNET_DISK_directory_scan (const char *dir_name,
-                            GNUNET_FileNameCallback callback,
-                            void *callback_cls);
+GNUNET_DISK_directory_scan(const char *dir_name,
+                           GNUNET_FileNameCallback callback,
+                           void *callback_cls);
 
 
 /**
@@ -678,7 +667,7 @@ GNUNET_DISK_directory_scan (const char *dir_name,
  *          #GNUNET_NO if directory exists but is not writeable
  */
 int
-GNUNET_DISK_directory_create_for_file (const char *filename);
+GNUNET_DISK_directory_create_for_file(const char *filename);
 
 
 /**
@@ -694,7 +683,7 @@ GNUNET_DISK_directory_create_for_file (const char *filename);
  *           does not exist or `stat`ed
  */
 int
-GNUNET_DISK_directory_test (const char *fil, int is_readable);
+GNUNET_DISK_directory_test(const char *fil, int is_readable);
 
 
 /**
@@ -705,7 +694,7 @@ GNUNET_DISK_directory_test (const char *fil, int is_readable);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_directory_remove (const char *filename);
+GNUNET_DISK_directory_remove(const char *filename);
 
 
 /**
@@ -716,8 +705,8 @@ GNUNET_DISK_directory_remove (const char *filename);
  * @param option option with the dir name to purge
  */
 void
-GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
-                           const char *option);
+GNUNET_DISK_purge_cfg_dir(const char *cfg_filename,
+                          const char *option);
 
 
 /**
@@ -727,7 +716,7 @@ GNUNET_DISK_purge_cfg_dir (const char *cfg_filename,
  * @returns #GNUNET_SYSERR on failure, #GNUNET_OK otherwise
  */
 int
-GNUNET_DISK_directory_create (const char *dir);
+GNUNET_DISK_directory_create(const char *dir);
 
 
 /**
@@ -740,9 +729,9 @@ GNUNET_DISK_directory_create (const char *dir);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh,
-                       off_t lock_start,
-                       off_t lock_end, int excl);
+GNUNET_DISK_file_lock(struct GNUNET_DISK_FileHandle *fh,
+                      off_t lock_start,
+                      off_t lock_end, int excl);
 
 
 /**
@@ -754,9 +743,9 @@ GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh,
-                         off_t unlock_start,
-                         off_t unlock_end);
+GNUNET_DISK_file_unlock(struct GNUNET_DISK_FileHandle *fh,
+                        off_t unlock_start,
+                        off_t unlock_end);
 
 
 /**
@@ -764,7 +753,7 @@ GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh,
  * @param fn the filename to canonicalize
  */
 void
-GNUNET_DISK_filename_canonicalize (char *fn);
+GNUNET_DISK_filename_canonicalize(char *fn);
 
 
 /**
@@ -774,8 +763,8 @@ GNUNET_DISK_filename_canonicalize (char *fn);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_DISK_file_change_owner (const char *filename,
-                               const char *user);
+GNUNET_DISK_file_change_owner(const char *filename,
+                              const char *user);
 
 
 /**
@@ -793,10 +782,10 @@ struct GNUNET_DISK_MapHandle;
  * @return pointer to the mapped memory region, NULL on failure
  */
 void *
-GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
-                      struct GNUNET_DISK_MapHandle **m,
-                      enum GNUNET_DISK_MapType access,
-                      size_t len);
+GNUNET_DISK_file_map(const struct GNUNET_DISK_FileHandle *h,
+                     struct GNUNET_DISK_MapHandle **m,
+                     enum GNUNET_DISK_MapType access,
+                     size_t len);
 
 
 /**
@@ -806,7 +795,7 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h);
+GNUNET_DISK_file_unmap(struct GNUNET_DISK_MapHandle *h);
 
 
 /**
@@ -816,7 +805,7 @@ GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h);
+GNUNET_DISK_file_sync(const struct GNUNET_DISK_FileHandle *h);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index d31476d87..e97429d1d 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -49,9 +49,7 @@ struct GNUNET_DNS_RequestHandle;
 /**
  * Flags that specify when to call the client's handler.
  */
-enum GNUNET_DNS_Flags
-{
-
+enum GNUNET_DNS_Flags {
   /**
    * Useless option: never call the client.
    */
@@ -94,7 +92,6 @@ enum GNUNET_DNS_Flags
    * not allowed for MONITOR peers.
    */
   GNUNET_DNS_FLAG_RESPONSE_MONITOR = 8
-
 };
 
 
@@ -137,7 +134,7 @@ typedef void
  * @param rh request that should now be forwarded
  */
 void
-GNUNET_DNS_request_forward (struct GNUNET_DNS_RequestHandle *rh);
+GNUNET_DNS_request_forward(struct GNUNET_DNS_RequestHandle *rh);
 
 
 /**
@@ -147,7 +144,7 @@ GNUNET_DNS_request_forward (struct GNUNET_DNS_RequestHandle *rh);
  * @param rh request that should now be dropped
  */
 void
-GNUNET_DNS_request_drop (struct GNUNET_DNS_RequestHandle *rh);
+GNUNET_DNS_request_drop(struct GNUNET_DNS_RequestHandle *rh);
 
 
 /**
@@ -161,9 +158,9 @@ GNUNET_DNS_request_drop (struct GNUNET_DNS_RequestHandle *rh);
  * @param reply reply data
  */
 void
-GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh,
-                           uint16_t reply_length,
-                           const char *reply);
+GNUNET_DNS_request_answer(struct GNUNET_DNS_RequestHandle *rh,
+                          uint16_t reply_length,
+                          const char *reply);
 
 
 /**
@@ -176,10 +173,10 @@ GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh,
  * @return DNS handle
  */
 struct GNUNET_DNS_Handle *
-GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    enum GNUNET_DNS_Flags flags,
-                    GNUNET_DNS_RequestHandler rh,
-                    void *rh_cls);
+GNUNET_DNS_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                   enum GNUNET_DNS_Flags flags,
+                   GNUNET_DNS_RequestHandler rh,
+                   void *rh_cls);
 
 
 /**
@@ -188,7 +185,7 @@ GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param dh DNS handle
  */
 void
-GNUNET_DNS_disconnect (struct GNUNET_DNS_Handle *dh);
+GNUNET_DNS_disconnect(struct GNUNET_DNS_Handle *dh);
 
 
 #endif
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 6f81c8e04..bf1869b91 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -92,9 +92,7 @@
 /**
  * A DNS query.
  */
-struct GNUNET_DNSPARSER_Query
-{
-
+struct GNUNET_DNSPARSER_Query {
   /**
    * Name of the record that the query is for (0-terminated).
    * In UTF-8 format.  The library will convert from and to DNS-IDNA
@@ -113,16 +111,13 @@ struct GNUNET_DNSPARSER_Query
    * See GNUNET_TUN_DNS_CLASS_*.
    */
   uint16_t dns_traffic_class;
-
 };
 
 
 /**
  * Information from MX records (RFC 1035).
  */
-struct GNUNET_DNSPARSER_MxRecord
-{
-
+struct GNUNET_DNSPARSER_MxRecord {
   /**
    * Preference for this entry (lower value is higher preference).
    */
@@ -136,16 +131,13 @@ struct GNUNET_DNSPARSER_MxRecord
    * creating the DNS packet will fail.
    */
   char *mxhost;
-
 };
 
 
 /**
  * Information from SRV records (RFC 2782).
  */
-struct GNUNET_DNSPARSER_SrvRecord
-{
-
+struct GNUNET_DNSPARSER_SrvRecord {
   /**
    * Hostname offering the service.
    * In UTF-8 format.  The library will convert from and to DNS-IDNA
@@ -173,15 +165,13 @@ struct GNUNET_DNSPARSER_SrvRecord
    * TCP or UDP port of the service.
    */
   uint16_t port;
-
 };
 
 
 /**
  * DNS CERT types as defined in RFC 4398.
  */
-enum GNUNET_DNSPARSER_CertType
-{
+enum GNUNET_DNSPARSER_CertType {
   /**
    *  Reserved value
    */
@@ -233,8 +223,7 @@ enum GNUNET_DNSPARSER_CertType
  * DNSCERT algorithms as defined in http://www.iana.org/assignments/
  *  dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml, under dns-sec-alg-numbers-1
  */
-enum GNUNET_DNSPARSER_CertAlgorithm
-{
+enum GNUNET_DNSPARSER_CertAlgorithm {
   /**
    * No defined
    */
@@ -304,16 +293,13 @@ enum GNUNET_DNSPARSER_CertAlgorithm
    * ECDSA Curve P-384/SHA384
    */
   GNUNET_DNSPARSER_CERTALGO_ECDSA_P384SHA384 = 14
-
 };
 
 
 /**
  * Information from CERT records (RFC 4034).
  */
-struct GNUNET_DNSPARSER_CertRecord
-{
-
+struct GNUNET_DNSPARSER_CertRecord {
   /**
    * Certificate type
    */
@@ -338,16 +324,13 @@ struct GNUNET_DNSPARSER_CertRecord
    * Data of the certificate.
    */
   char *certificate_data;
-
 };
 
 
 /**
  * Information from SOA records (RFC 1035).
  */
-struct GNUNET_DNSPARSER_SoaRecord
-{
-
+struct GNUNET_DNSPARSER_SoaRecord {
   /**
    * The domainname of the name server that was the
    * original or primary source of data for this zone.
@@ -395,7 +378,6 @@ struct GNUNET_DNSPARSER_SoaRecord
    * from this zone.
    */
   uint32_t minimum_ttl;
-
 };
 
 
@@ -404,8 +386,7 @@ struct GNUNET_DNSPARSER_SoaRecord
  * The tag is followed by the tag_len.
  * The value is followed by the tag for (d - tag_len - 2) bytes
  */
-struct GNUNET_DNSPARSER_CaaRecord
-{
+struct GNUNET_DNSPARSER_CaaRecord {
   /**
    * The flags of the CAA record.
    */
@@ -422,9 +403,7 @@ struct GNUNET_DNSPARSER_CaaRecord
 /**
  * Binary record information (unparsed).
  */
-struct GNUNET_DNSPARSER_RawRecord
-{
-
+struct GNUNET_DNSPARSER_RawRecord {
   /**
    * Binary record data.
    */
@@ -440,9 +419,7 @@ struct GNUNET_DNSPARSER_RawRecord
 /**
  * A DNS response record.
  */
-struct GNUNET_DNSPARSER_Record
-{
-
+struct GNUNET_DNSPARSER_Record {
   /**
    * Name of the record that the query is for (0-terminated).
    * In UTF-8 format.  The library will convert from and to DNS-IDNA
@@ -455,9 +432,7 @@ struct GNUNET_DNSPARSER_Record
   /**
    * Payload of the record (which one of these is valid depends on the 'type').
    */
-  union
-  {
-
+  union {
     /**
      * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname.
      * In UTF-8 format.  The library will convert from and to DNS-IDNA
@@ -491,7 +466,6 @@ struct GNUNET_DNSPARSER_Record
      * Raw data for all other types.
      */
     struct GNUNET_DNSPARSER_RawRecord raw;
-
   } data;
 
 
@@ -509,15 +483,13 @@ struct GNUNET_DNSPARSER_Record
    * See GNUNET_TUN_DNS_CLASS_*.
    */
   uint16_t dns_traffic_class;
-
 };
 
 
 /**
  * Easy-to-process, parsed version of a DNS packet.
  */
-struct GNUNET_DNSPARSER_Packet
-{
+struct GNUNET_DNSPARSER_Packet {
   /**
    * Array of all queries in the packet, must contain "num_queries" entries.
    */
@@ -567,7 +539,6 @@ struct GNUNET_DNSPARSER_Packet
    * DNS ID (to match replies to requests).
    */
   uint16_t id;
-
 };
 
 
@@ -580,7 +551,7 @@ struct GNUNET_DNSPARSER_Packet
  *         #GNUNET_SYSERR if the label is not valid for DNS names
  */
 int
-GNUNET_DNSPARSER_check_label (const char *label);
+GNUNET_DNSPARSER_check_label(const char *label);
 
 
 /**
@@ -593,7 +564,7 @@ GNUNET_DNSPARSER_check_label (const char *label);
  *         #GNUNET_SYSERR if the label is not valid for DNS names
  */
 int
-GNUNET_DNSPARSER_check_name (const char *name);
+GNUNET_DNSPARSER_check_name(const char *name);
 
 
 /**
@@ -605,8 +576,8 @@ GNUNET_DNSPARSER_check_name (const char *name);
  * @return NULL on error, otherwise the parsed packet
  */
 struct GNUNET_DNSPARSER_Packet *
-GNUNET_DNSPARSER_parse (const char *udp_payload,
-                        size_t udp_payload_length);
+GNUNET_DNSPARSER_parse(const char *udp_payload,
+                       size_t udp_payload_length);
 
 
 /**
@@ -615,7 +586,7 @@ GNUNET_DNSPARSER_parse (const char *udp_payload,
  * @param p packet to free
  */
 void
-GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p);
+GNUNET_DNSPARSER_free_packet(struct GNUNET_DNSPARSER_Packet *p);
 
 
 /**
@@ -633,10 +604,10 @@ GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p);
  *         #GNUNET_OK if @a p was packed completely into @a buf
  */
 int
-GNUNET_DNSPARSER_pack (const struct GNUNET_DNSPARSER_Packet *p,
-                       uint16_t max,
-                       char **buf,
-                       size_t *buf_length);
+GNUNET_DNSPARSER_pack(const struct GNUNET_DNSPARSER_Packet *p,
+                      uint16_t max,
+                      char **buf,
+                      size_t *buf_length);
 
 /* ***************** low-level packing API ******************** */
 
@@ -654,10 +625,10 @@ GNUNET_DNSPARSER_pack (const struct GNUNET_DNSPARSER_Packet *p,
  *         #GNUNET_OK if @a name was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_name (char *dst,
-                                   size_t dst_len,
-                                   size_t *off,
-                                   const char *name);
+GNUNET_DNSPARSER_builder_add_name(char *dst,
+                                  size_t dst_len,
+                                  size_t *off,
+                                  const char *name);
 
 
 /**
@@ -673,10 +644,10 @@ GNUNET_DNSPARSER_builder_add_name (char *dst,
  *         #GNUNET_OK if @a query was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_query (char *dst,
-                                    size_t dst_len,
-                                    size_t *off,
-                                    const struct GNUNET_DNSPARSER_Query *query);
+GNUNET_DNSPARSER_builder_add_query(char *dst,
+                                   size_t dst_len,
+                                   size_t *off,
+                                   const struct GNUNET_DNSPARSER_Query *query);
 
 
 /**
@@ -692,10 +663,10 @@ GNUNET_DNSPARSER_builder_add_query (char *dst,
  *         #GNUNET_OK if @a mx was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_mx (char *dst,
-                                 size_t dst_len,
-                                 size_t *off,
-                                 const struct GNUNET_DNSPARSER_MxRecord *mx);
+GNUNET_DNSPARSER_builder_add_mx(char *dst,
+                                size_t dst_len,
+                                size_t *off,
+                                const struct GNUNET_DNSPARSER_MxRecord *mx);
 
 
 /**
@@ -711,10 +682,10 @@ GNUNET_DNSPARSER_builder_add_mx (char *dst,
  *         #GNUNET_OK if @a soa was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_soa (char *dst,
-                                  size_t dst_len,
-                                  size_t *off,
-                                  const struct GNUNET_DNSPARSER_SoaRecord *soa);
+GNUNET_DNSPARSER_builder_add_soa(char *dst,
+                                 size_t dst_len,
+                                 size_t *off,
+                                 const struct GNUNET_DNSPARSER_SoaRecord *soa);
 
 
 /**
@@ -730,10 +701,10 @@ GNUNET_DNSPARSER_builder_add_soa (char *dst,
  *         #GNUNET_OK if @a soa was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_cert (char *dst,
-                                   size_t dst_len,
-                                   size_t *off,
-                                   const struct GNUNET_DNSPARSER_CertRecord *cert);
+GNUNET_DNSPARSER_builder_add_cert(char *dst,
+                                  size_t dst_len,
+                                  size_t *off,
+                                  const struct GNUNET_DNSPARSER_CertRecord *cert);
 
 
 /**
@@ -749,10 +720,10 @@ GNUNET_DNSPARSER_builder_add_cert (char *dst,
  *         #GNUNET_OK if @a srv was added to @a dst
  */
 int
-GNUNET_DNSPARSER_builder_add_srv (char *dst,
-                                  size_t dst_len,
-                                  size_t *off,
-                                  const struct GNUNET_DNSPARSER_SrvRecord *srv);
+GNUNET_DNSPARSER_builder_add_srv(char *dst,
+                                 size_t dst_len,
+                                 size_t *off,
+                                 const struct GNUNET_DNSPARSER_SrvRecord *srv);
 
 /* ***************** low-level parsing API ******************** */
 
@@ -767,10 +738,10 @@ GNUNET_DNSPARSER_builder_add_srv (char *dst,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if the record is malformed
  */
 int
-GNUNET_DNSPARSER_parse_record (const char *udp_payload,
-                               size_t udp_payload_length,
-                               size_t *off,
-                               struct GNUNET_DNSPARSER_Record *r);
+GNUNET_DNSPARSER_parse_record(const char *udp_payload,
+                              size_t udp_payload_length,
+                              size_t *off,
+                              struct GNUNET_DNSPARSER_Record *r);
 
 
 /**
@@ -783,9 +754,9 @@ GNUNET_DNSPARSER_parse_record (const char *udp_payload,
  * @return name as 0-terminated C string on success, NULL if the payload is malformed
  */
 char *
-GNUNET_DNSPARSER_parse_name (const char *udp_payload,
-                             size_t udp_payload_length,
-                             size_t *off);
+GNUNET_DNSPARSER_parse_name(const char *udp_payload,
+                            size_t udp_payload_length,
+                            size_t *off);
 
 
 /**
@@ -799,10 +770,10 @@ GNUNET_DNSPARSER_parse_name (const char *udp_payload,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if the query is malformed
  */
 int
-GNUNET_DNSPARSER_parse_query (const char *udp_payload,
-                              size_t udp_payload_length,
-                              size_t *off,
-                              struct GNUNET_DNSPARSER_Query *q);
+GNUNET_DNSPARSER_parse_query(const char *udp_payload,
+                             size_t udp_payload_length,
+                             size_t *off,
+                             struct GNUNET_DNSPARSER_Query *q);
 
 
 /**
@@ -815,9 +786,9 @@ GNUNET_DNSPARSER_parse_query (const char *udp_payload,
  * @return the parsed SOA record, NULL on error
  */
 struct GNUNET_DNSPARSER_SoaRecord *
-GNUNET_DNSPARSER_parse_soa (const char *udp_payload,
-                            size_t udp_payload_length,
-                            size_t *off);
+GNUNET_DNSPARSER_parse_soa(const char *udp_payload,
+                           size_t udp_payload_length,
+                           size_t *off);
 
 
 /**
@@ -830,9 +801,9 @@ GNUNET_DNSPARSER_parse_soa (const char *udp_payload,
  * @return the parsed CERT record, NULL on error
  */
 struct GNUNET_DNSPARSER_CertRecord *
-GNUNET_DNSPARSER_parse_cert (const char *udp_payload,
-                             size_t udp_payload_length,
-                             size_t *off);
+GNUNET_DNSPARSER_parse_cert(const char *udp_payload,
+                            size_t udp_payload_length,
+                            size_t *off);
 
 
 /**
@@ -845,9 +816,9 @@ GNUNET_DNSPARSER_parse_cert (const char *udp_payload,
  * @return the parsed MX record, NULL on error
  */
 struct GNUNET_DNSPARSER_MxRecord *
-GNUNET_DNSPARSER_parse_mx (const char *udp_payload,
-                           size_t udp_payload_length,
-                           size_t *off);
+GNUNET_DNSPARSER_parse_mx(const char *udp_payload,
+                          size_t udp_payload_length,
+                          size_t *off);
 
 
 /**
@@ -860,9 +831,9 @@ GNUNET_DNSPARSER_parse_mx (const char *udp_payload,
  * @return the parsed SRV record, NULL on error
  */
 struct GNUNET_DNSPARSER_SrvRecord *
-GNUNET_DNSPARSER_parse_srv (const char *udp_payload,
-                            size_t udp_payload_length,
-                            size_t *off);
+GNUNET_DNSPARSER_parse_srv(const char *udp_payload,
+                           size_t udp_payload_length,
+                           size_t *off);
 
 /* ***************** low-level duplication API ******************** */
 
@@ -873,7 +844,7 @@ GNUNET_DNSPARSER_parse_srv (const char *udp_payload,
  * @return the newly allocated record
  */
 struct GNUNET_DNSPARSER_Record *
-GNUNET_DNSPARSER_duplicate_record (const struct GNUNET_DNSPARSER_Record *r);
+GNUNET_DNSPARSER_duplicate_record(const struct GNUNET_DNSPARSER_Record *r);
 
 
 /**
@@ -883,7 +854,7 @@ GNUNET_DNSPARSER_duplicate_record (const struct GNUNET_DNSPARSER_Record *r);
  * @return the newly allocated record
  */
 struct GNUNET_DNSPARSER_SoaRecord *
-GNUNET_DNSPARSER_duplicate_soa_record (const struct GNUNET_DNSPARSER_SoaRecord *r);
+GNUNET_DNSPARSER_duplicate_soa_record(const struct GNUNET_DNSPARSER_SoaRecord *r);
 
 
 /**
@@ -893,7 +864,7 @@ GNUNET_DNSPARSER_duplicate_soa_record (const struct GNUNET_DNSPARSER_SoaRecord *
  * @return the newly allocated record
  */
 struct GNUNET_DNSPARSER_CertRecord *
-GNUNET_DNSPARSER_duplicate_cert_record (const struct GNUNET_DNSPARSER_CertRecord *r);
+GNUNET_DNSPARSER_duplicate_cert_record(const struct GNUNET_DNSPARSER_CertRecord *r);
 
 
 /**
@@ -903,7 +874,7 @@ GNUNET_DNSPARSER_duplicate_cert_record (const struct GNUNET_DNSPARSER_CertRecord
  * @return the newly allocated record
  */
 struct GNUNET_DNSPARSER_MxRecord *
-GNUNET_DNSPARSER_duplicate_mx_record (const struct GNUNET_DNSPARSER_MxRecord *r);
+GNUNET_DNSPARSER_duplicate_mx_record(const struct GNUNET_DNSPARSER_MxRecord *r);
 
 
 /**
@@ -913,7 +884,7 @@ GNUNET_DNSPARSER_duplicate_mx_record (const struct GNUNET_DNSPARSER_MxRecord *r)
  * @return the newly allocated record
  */
 struct GNUNET_DNSPARSER_SrvRecord *
-GNUNET_DNSPARSER_duplicate_srv_record (const struct GNUNET_DNSPARSER_SrvRecord *r);
+GNUNET_DNSPARSER_duplicate_srv_record(const struct GNUNET_DNSPARSER_SrvRecord *r);
 
 
 /* ***************** low-level deallocation API ******************** */
@@ -924,7 +895,7 @@ GNUNET_DNSPARSER_duplicate_srv_record (const struct GNUNET_DNSPARSER_SrvRecord *
  * @param r record to free
  */
 void
-GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r);
+GNUNET_DNSPARSER_free_record(struct GNUNET_DNSPARSER_Record *r);
 
 
 /**
@@ -933,7 +904,7 @@ GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r);
  * @param mx record to free
  */
 void
-GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx);
+GNUNET_DNSPARSER_free_mx(struct GNUNET_DNSPARSER_MxRecord *mx);
 
 
 /**
@@ -942,7 +913,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx);
  * @param srv record to free
  */
 void
-GNUNET_DNSPARSER_free_srv (struct GNUNET_DNSPARSER_SrvRecord *srv);
+GNUNET_DNSPARSER_free_srv(struct GNUNET_DNSPARSER_SrvRecord *srv);
 
 
 /**
@@ -951,7 +922,7 @@ GNUNET_DNSPARSER_free_srv (struct GNUNET_DNSPARSER_SrvRecord *srv);
  * @param soa record to free
  */
 void
-GNUNET_DNSPARSER_free_soa (struct GNUNET_DNSPARSER_SoaRecord *soa);
+GNUNET_DNSPARSER_free_soa(struct GNUNET_DNSPARSER_SoaRecord *soa);
 
 
 /**
@@ -960,7 +931,7 @@ GNUNET_DNSPARSER_free_soa (struct GNUNET_DNSPARSER_SoaRecord *soa);
  * @param cert record to free
  */
 void
-GNUNET_DNSPARSER_free_cert (struct GNUNET_DNSPARSER_CertRecord *cert);
+GNUNET_DNSPARSER_free_cert(struct GNUNET_DNSPARSER_CertRecord *cert);
 
 
 /**
@@ -971,8 +942,8 @@ GNUNET_DNSPARSER_free_cert (struct GNUNET_DNSPARSER_CertRecord *cert);
  * @return HEX string (lower case)
  */
 char *
-GNUNET_DNSPARSER_bin_to_hex (const void *data,
-                             size_t data_size);
+GNUNET_DNSPARSER_bin_to_hex(const void *data,
+                            size_t data_size);
 
 
 /**
@@ -984,8 +955,8 @@ GNUNET_DNSPARSER_bin_to_hex (const void *data,
  * @return number of bytes written to data
  */
 size_t
-GNUNET_DNSPARSER_hex_to_bin (const char *hex,
-                             void *data);
+GNUNET_DNSPARSER_hex_to_bin(const char *hex,
+                            void *data);
 
 
 #endif
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 5d134e44a..ff59e1292 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -52,7 +52,7 @@ struct GNUNET_DNSSTUB_RequestSocket;
  * @return NULL on error
  */
 struct GNUNET_DNSSTUB_Context *
-GNUNET_DNSSTUB_start (unsigned int num_sockets);
+GNUNET_DNSSTUB_start(unsigned int num_sockets);
 
 
 /**
@@ -64,8 +64,8 @@ GNUNET_DNSSTUB_start (unsigned int num_sockets);
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_DNSSTUB_add_dns_ip (struct GNUNET_DNSSTUB_Context *ctx,
-                           const char *dns_ip);
+GNUNET_DNSSTUB_add_dns_ip(struct GNUNET_DNSSTUB_Context *ctx,
+                          const char *dns_ip);
 
 
 /**
@@ -77,8 +77,8 @@ GNUNET_DNSSTUB_add_dns_ip (struct GNUNET_DNSSTUB_Context *ctx,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_DNSSTUB_add_dns_sa (struct GNUNET_DNSSTUB_Context *ctx,
-                           const struct sockaddr *sa);
+GNUNET_DNSSTUB_add_dns_sa(struct GNUNET_DNSSTUB_Context *ctx,
+                          const struct sockaddr *sa);
 
 
 /**
@@ -89,8 +89,8 @@ GNUNET_DNSSTUB_add_dns_sa (struct GNUNET_DNSSTUB_Context *ctx,
  * @param retry_frequ how long to wait between retries
  */
 void
-GNUNET_DNSSTUB_set_retry (struct GNUNET_DNSSTUB_Context *ctx,
-                          struct GNUNET_TIME_Relative retry_freq);
+GNUNET_DNSSTUB_set_retry(struct GNUNET_DNSSTUB_Context *ctx,
+                         struct GNUNET_TIME_Relative retry_freq);
 
 /**
  * Cleanup DNSSTUB resolver.
@@ -98,7 +98,7 @@ GNUNET_DNSSTUB_set_retry (struct GNUNET_DNSSTUB_Context *ctx,
  * @param ctx stub resolver to clean up
  */
 void
-GNUNET_DNSSTUB_stop (struct GNUNET_DNSSTUB_Context *ctx);
+GNUNET_DNSSTUB_stop(struct GNUNET_DNSSTUB_Context *ctx);
 
 
 /**
@@ -128,11 +128,11 @@ typedef void
  * @return socket used for the request, NULL on error
  */
 struct GNUNET_DNSSTUB_RequestSocket *
-GNUNET_DNSSTUB_resolve (struct GNUNET_DNSSTUB_Context *ctx,
-                        const void *request,
-                        size_t request_len,
-                        GNUNET_DNSSTUB_ResultCallback rc,
-                        void *rc_cls);
+GNUNET_DNSSTUB_resolve(struct GNUNET_DNSSTUB_Context *ctx,
+                       const void *request,
+                       size_t request_len,
+                       GNUNET_DNSSTUB_ResultCallback rc,
+                       void *rc_cls);
 
 
 /**
@@ -141,7 +141,7 @@ GNUNET_DNSSTUB_resolve (struct GNUNET_DNSSTUB_Context *ctx,
  * @param rs resolution to cancel
  */
 void
-GNUNET_DNSSTUB_resolve_cancel (struct GNUNET_DNSSTUB_RequestSocket *rs);
+GNUNET_DNSSTUB_resolve_cancel(struct GNUNET_DNSSTUB_RequestSocket *rs);
 
 
 #endif
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index f76bfc23f..3004c7a44 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -88,14 +88,14 @@ typedef void
  * @return the fragmentation context
  */
 struct GNUNET_FRAGMENT_Context *
-GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
-                                uint16_t mtu,
-                                struct GNUNET_BANDWIDTH_Tracker *tracker,
-                                struct GNUNET_TIME_Relative msg_delay,
-                                struct GNUNET_TIME_Relative ack_delay,
-                                const struct GNUNET_MessageHeader *msg,
-                                GNUNET_FRAGMENT_MessageProcessor proc,
-                                void *proc_cls);
+GNUNET_FRAGMENT_context_create(struct GNUNET_STATISTICS_Handle *stats,
+                               uint16_t mtu,
+                               struct GNUNET_BANDWIDTH_Tracker *tracker,
+                               struct GNUNET_TIME_Relative msg_delay,
+                               struct GNUNET_TIME_Relative ack_delay,
+                               const struct GNUNET_MessageHeader *msg,
+                               GNUNET_FRAGMENT_MessageProcessor proc,
+                               void *proc_cls);
 
 
 /**
@@ -106,7 +106,7 @@ GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
  * @param fc fragmentation context
  */
 void
-GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc);
+GNUNET_FRAGMENT_context_transmission_done(struct GNUNET_FRAGMENT_Context *fc);
 
 
 /**
@@ -121,8 +121,8 @@ GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc);
  *         #GNUNET_SYSERR if this ack is not valid for this fc
  */
 int
-GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
-                             const struct GNUNET_MessageHeader *msg);
+GNUNET_FRAGMENT_process_ack(struct GNUNET_FRAGMENT_Context *fc,
+                            const struct GNUNET_MessageHeader *msg);
 
 
 /**
@@ -136,9 +136,9 @@ GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
  *         last message, set to FOREVER if the message was not fully transmitted (OUT only)
  */
 void
-GNUNET_FRAGMENT_context_destroy (struct GNUNET_FRAGMENT_Context *fc,
-                                 struct GNUNET_TIME_Relative *msg_delay,
-                                 struct GNUNET_TIME_Relative *ack_delay);
+GNUNET_FRAGMENT_context_destroy(struct GNUNET_FRAGMENT_Context *fc,
+                                struct GNUNET_TIME_Relative *msg_delay,
+                                struct GNUNET_TIME_Relative *ack_delay);
 
 
 /**
@@ -148,7 +148,7 @@ GNUNET_FRAGMENT_context_destroy (struct GNUNET_FRAGMENT_Context *fc,
  * @return ack in human-readable format
  */
 const char *
-GNUNET_FRAGMENT_print_ack (const struct GNUNET_MessageHeader *ack);
+GNUNET_FRAGMENT_print_ack(const struct GNUNET_MessageHeader *ack);
 
 
 /**
@@ -187,12 +187,12 @@ typedef void
  * @return the defragmentation context
  */
 struct GNUNET_DEFRAGMENT_Context *
-GNUNET_DEFRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
-                                  uint16_t mtu,
-                                  unsigned int num_msgs,
-                                  void *cls,
-                                  GNUNET_FRAGMENT_MessageProcessor proc,
-                                  GNUNET_DEFRAGMENT_AckProcessor ackp);
+GNUNET_DEFRAGMENT_context_create(struct GNUNET_STATISTICS_Handle *stats,
+                                 uint16_t mtu,
+                                 unsigned int num_msgs,
+                                 void *cls,
+                                 GNUNET_FRAGMENT_MessageProcessor proc,
+                                 GNUNET_DEFRAGMENT_AckProcessor ackp);
 
 
 /**
@@ -201,7 +201,7 @@ GNUNET_DEFRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
  * @param dc defragmentation context
  */
 void
-GNUNET_DEFRAGMENT_context_destroy (struct GNUNET_DEFRAGMENT_Context *dc);
+GNUNET_DEFRAGMENT_context_destroy(struct GNUNET_DEFRAGMENT_Context *dc);
 
 
 /**
@@ -214,8 +214,8 @@ GNUNET_DEFRAGMENT_context_destroy (struct GNUNET_DEFRAGMENT_Context *dc);
  *         #GNUNET_SYSERR on error
  */
 int
-GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
-                                    const struct GNUNET_MessageHeader *msg);
+GNUNET_DEFRAGMENT_process_fragment(struct GNUNET_DEFRAGMENT_Context *dc,
+                                   const struct GNUNET_MessageHeader *msg);
 
 
 
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index 8a25be07c..64e7f39d8 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -61,9 +61,9 @@ typedef void (*GNUNET_FRIENDS_Callback)(void *cls,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on parsing errors
  */
 int
-GNUNET_FRIENDS_parse (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      GNUNET_FRIENDS_Callback cb,
-                      void *cb_cls);
+GNUNET_FRIENDS_parse(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                     GNUNET_FRIENDS_Callback cb,
+                     void *cb_cls);
 
 
 /**
@@ -80,7 +80,7 @@ struct GNUNET_FRIENDS_Writer;
  * @return NULL on error
  */
 struct GNUNET_FRIENDS_Writer *
-GNUNET_FRIENDS_write_start (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_FRIENDS_write_start(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -90,7 +90,7 @@ GNUNET_FRIENDS_write_start (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_FRIENDS_write_stop (struct GNUNET_FRIENDS_Writer *w);
+GNUNET_FRIENDS_write_stop(struct GNUNET_FRIENDS_Writer *w);
 
 
 /**
@@ -101,8 +101,8 @@ GNUNET_FRIENDS_write_stop (struct GNUNET_FRIENDS_Writer *w);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_FRIENDS_write (struct GNUNET_FRIENDS_Writer *w,
-                      const struct GNUNET_PeerIdentity *friend_id);
+GNUNET_FRIENDS_write(struct GNUNET_FRIENDS_Writer *w,
+                     const struct GNUNET_PeerIdentity *friend_id);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 5ee863d12..688c6d489 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -80,7 +80,7 @@ extern "C"
  * How often do we signal applications that a probe for a particular
  * search result is running? (used to visualize probes).
  */
-#define GNUNET_FS_PROBE_UPDATE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
+#define GNUNET_FS_PROBE_UPDATE_FREQUENCY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 250)
 
 /**
  * A Universal Resource Identifier (URI), opaque.
@@ -112,8 +112,8 @@ typedef int
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
-                      struct GNUNET_HashCode *key);
+GNUNET_FS_uri_to_key(const struct GNUNET_FS_Uri *uri,
+                     struct GNUNET_HashCode *key);
 
 
 /**
@@ -123,7 +123,7 @@ GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
  * @return the UTF-8 string
  */
 char *
-GNUNET_FS_uri_to_string (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_to_string(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -134,7 +134,7 @@ GNUNET_FS_uri_to_string (const struct GNUNET_FS_Uri *uri);
  * @return string with the keywords
  */
 char *
-GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_ksk_to_string_fancy(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -146,9 +146,9 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
  * @param is_mandatory is this keyword mandatory?
  */
 void
-GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri,
-                               const char *keyword,
-                               int is_mandatory);
+GNUNET_FS_uri_ksk_add_keyword(struct GNUNET_FS_Uri *uri,
+                              const char *keyword,
+                              int is_mandatory);
 
 
 /**
@@ -159,8 +159,8 @@ GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri,
  * @param keyword keyword to add
  */
 void
-GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
-                                  const char *keyword);
+GNUNET_FS_uri_ksk_remove_keyword(struct GNUNET_FS_Uri *uri,
+                                 const char *keyword);
 
 
 /**
@@ -171,8 +171,8 @@ GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
  * @return NULL on error
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_parse (const char *uri,
-                     char **emsg);
+GNUNET_FS_uri_parse(const char *uri,
+                    char **emsg);
 
 
 /**
@@ -181,7 +181,7 @@ GNUNET_FS_uri_parse (const char *uri,
  * @param uri uri to free
  */
 void
-GNUNET_FS_uri_destroy (struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_destroy(struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -191,7 +191,7 @@ GNUNET_FS_uri_destroy (struct GNUNET_FS_Uri *uri);
  * @return 0 if this is not a keyword URI
  */
 unsigned int
-GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_ksk_get_keyword_count(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -204,9 +204,9 @@ GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri *uri);
  *   keywords iterated over until iterator aborted
  */
 int
-GNUNET_FS_uri_ksk_get_keywords (const struct GNUNET_FS_Uri *uri,
-                                GNUNET_FS_KeywordIterator iterator,
-                                void *iterator_cls);
+GNUNET_FS_uri_ksk_get_keywords(const struct GNUNET_FS_Uri *uri,
+                               GNUNET_FS_KeywordIterator iterator,
+                               void *iterator_cls);
 
 
 /**
@@ -217,8 +217,8 @@ GNUNET_FS_uri_ksk_get_keywords (const struct GNUNET_FS_Uri *uri,
  * @return #GNUNET_SYSERR if this is not a location URI, otherwise #GNUNET_OK
  */
 int
-GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
-                                     struct GNUNET_PeerIdentity *peer);
+GNUNET_FS_uri_loc_get_peer_identity(const struct GNUNET_FS_Uri *uri,
+                                    struct GNUNET_PeerIdentity *peer);
 
 
 /**
@@ -228,7 +228,7 @@ GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
  * @return NULL if argument is not a location URI
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_loc_get_uri (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_loc_get_uri(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -238,7 +238,7 @@ GNUNET_FS_uri_loc_get_uri (const struct GNUNET_FS_Uri *uri);
  * @return expiration time of the URI
  */
 struct GNUNET_TIME_Absolute
-GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_loc_get_expiration(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -254,9 +254,9 @@ GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri);
  * @return the location URI, NULL on error
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *base_uri,
-                          const struct GNUNET_CRYPTO_EddsaPrivateKey *sign_key,
-                          struct GNUNET_TIME_Absolute expiration_time);
+GNUNET_FS_uri_loc_create(const struct GNUNET_FS_Uri *base_uri,
+                         const struct GNUNET_CRYPTO_EddsaPrivateKey *sign_key,
+                         struct GNUNET_TIME_Absolute expiration_time);
 
 
 /**
@@ -267,8 +267,8 @@ GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *base_uri,
  * @return merged URI, NULL on error
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
-                         const struct GNUNET_FS_Uri *u2);
+GNUNET_FS_uri_ksk_merge(const struct GNUNET_FS_Uri *u1,
+                        const struct GNUNET_FS_Uri *u2);
 
 
 /**
@@ -278,7 +278,7 @@ GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
  * @return copy of the URI
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_dup(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -299,8 +299,8 @@ GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri);
  *  if keywords is not legal (i.e. empty).
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create (const char *keywords,
-                          char **emsg);
+GNUNET_FS_uri_ksk_create(const char *keywords,
+                         char **emsg);
 
 
 /**
@@ -321,8 +321,8 @@ GNUNET_FS_uri_ksk_create (const char *keywords,
  *  if keywords is not legal (i.e. empty).
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
-                                    const char **argv);
+GNUNET_FS_uri_ksk_create_from_args(unsigned int argc,
+                                   const char **argv);
 
 
 /**
@@ -333,8 +333,8 @@ GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
  * @return #GNUNET_YES if the URIs are equal
  */
 int
-GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1,
-                          const struct GNUNET_FS_Uri *u2);
+GNUNET_FS_uri_test_equal(const struct GNUNET_FS_Uri *u1,
+                         const struct GNUNET_FS_Uri *u2);
 
 
 /**
@@ -344,7 +344,7 @@ GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1,
  * @return #GNUNET_YES if this is an SKS uri
  */
 int
-GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_test_sks(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -355,8 +355,8 @@ GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri);
  * @return an FS URI for the given namespace and identifier
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EcdsaPublicKey *ns,
-                          const char *id);
+GNUNET_FS_uri_sks_create(const struct GNUNET_CRYPTO_EcdsaPublicKey *ns,
+                         const char *id);
 
 
 /**
@@ -368,8 +368,8 @@ GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EcdsaPublicKey *ns,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
-                                 struct GNUNET_CRYPTO_EcdsaPublicKey *pseudonym);
+GNUNET_FS_uri_sks_get_namespace(const struct GNUNET_FS_Uri *uri,
+                                struct GNUNET_CRYPTO_EcdsaPublicKey *pseudonym);
 
 
 /**
@@ -379,7 +379,7 @@ GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
  * @return NULL on error (not a valid SKS URI)
  */
 char *
-GNUNET_FS_uri_sks_get_content_id (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_sks_get_content_id(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -389,7 +389,7 @@ GNUNET_FS_uri_sks_get_content_id (const struct GNUNET_FS_Uri *uri);
  * @return #GNUNET_YES if this is a KSK uri
  */
 int
-GNUNET_FS_uri_test_ksk (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_test_ksk(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -399,7 +399,7 @@ GNUNET_FS_uri_test_ksk (const struct GNUNET_FS_Uri *uri);
  * @return #GNUNET_YES if this is a CHK uri
  */
 int
-GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_test_chk(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -410,7 +410,7 @@ GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri);
  * @return size of the file as specified in the CHK URI
  */
 uint64_t
-GNUNET_FS_uri_chk_get_file_size (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_chk_get_file_size(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -420,7 +420,7 @@ GNUNET_FS_uri_chk_get_file_size (const struct GNUNET_FS_Uri *uri);
  * @return #GNUNET_YES if this is a LOC uri
  */
 int
-GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri);
+GNUNET_FS_uri_test_loc(const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -432,8 +432,8 @@ GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri);
  * @return NULL on error, otherwise a KSK URI
  */
 struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData
-                                         *md);
+GNUNET_FS_uri_ksk_create_from_meta_data(const struct GNUNET_CONTAINER_MetaData
+                                        *md);
 
 
 /* ******************** command-line option parsing API *********************** */
@@ -448,11 +448,11 @@ GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData
  * @param[out] topKeywords set to the desired value
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_FS_GETOPT_KEYWORDS (char shortName,
-                           const char *name,
-                           const char *argumentHelp,
-                           const char *description,
-                           struct GNUNET_FS_Uri **topKeywords);
+GNUNET_FS_GETOPT_KEYWORDS(char shortName,
+                          const char *name,
+                          const char *argumentHelp,
+                          const char *description,
+                          struct GNUNET_FS_Uri **topKeywords);
 
 /**
  * Allow user to specify metadata.
@@ -464,11 +464,11 @@ GNUNET_FS_GETOPT_KEYWORDS (char shortName,
  * @param[out] metadata set to the desired value
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_FS_GETOPT_METADATA (char shortName,
-                           const char *name,
-                           const char *argumentHelp,
-                           const char *description,
-                           struct GNUNET_CONTAINER_MetaData **meta);
+GNUNET_FS_GETOPT_METADATA(char shortName,
+                          const char *name,
+                          const char *argumentHelp,
+                          const char *description,
+                          struct GNUNET_CONTAINER_MetaData **meta);
 
 /**
  * Command-line option parser function that allows the user to specify
@@ -483,10 +483,10 @@ GNUNET_FS_GETOPT_METADATA (char shortName,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
-                               void *scls,
-                               const char *option,
-                               const char *value);
+GNUNET_FS_getopt_set_metadata(struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
+                              void *scls,
+                              const char *option,
+                              const char *value);
 
 
 
@@ -504,8 +504,7 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
  * are typically generated either due to explicit client requests
  * or because of suspend/resume operations.
  */
-enum GNUNET_FS_Status
-{
+enum GNUNET_FS_Status {
   /**
    * Notification that we have started to publish a file structure.
    */
@@ -724,7 +723,6 @@ enum GNUNET_FS_Status
    * Notification that we are making progress sharing a directory.
    */
   GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY = 37
-
 };
 
 
@@ -772,21 +770,15 @@ struct GNUNET_FS_FileInformation;
  * Argument given to the progress callback with
  * information about what is going on.
  */
-struct GNUNET_FS_ProgressInfo
-{
-
+struct GNUNET_FS_ProgressInfo {
   /**
    * Values that depend on the event type.
    */
-  union
-  {
-
+  union {
     /**
      * Values for all "GNUNET_FS_STATUS_PUBLISH_*" events.
      */
-    struct
-    {
-
+    struct {
       /**
        * Context for controlling the upload.
        */
@@ -848,54 +840,47 @@ struct GNUNET_FS_ProgressInfo
       /**
        * Additional values for specific events.
        */
-      union
-      {
-
+      union {
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_PUBLISH_PROGRESS events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_PUBLISH_PROGRESS events.
+         */
+        struct {
           /**
-           * Data block we just published.
-           */
+           * Data block we just published.
+           */
           const void *data;
 
           /**
-           * At what offset in the file is "data"?
-           */
+           * At what offset in the file is "data"?
+           */
           uint64_t offset;
 
           /**
-           * Length of the data block.
-           */
+           * Length of the data block.
+           */
           uint64_t data_len;
 
           /**
-           * Depth of the given block in the tree;
-           * 0 would be the lowest level (DBLOCKs).
-           */
+           * Depth of the given block in the tree;
+           * 0 would be the lowest level (DBLOCKs).
+           */
           unsigned int depth;
-
         } progress;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY events.
+         */
+        struct {
           /**
-           * How far are we along in the overall directory?
-           */
+           * How far are we along in the overall directory?
+           */
           uint64_t completed;
 
           /**
-           * How big do we estimate the entire directory to be?
-           */
+           * How big do we estimate the entire directory to be?
+           */
           uint64_t total;
 
           /**
@@ -905,77 +890,63 @@ struct GNUNET_FS_ProgressInfo
            * "publish"-level of this struct.)
            */
           struct GNUNET_TIME_Relative eta;
-
         } progress_directory;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_PUBLISH_RESUME events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_PUBLISH_RESUME events.
+         */
+        struct {
           /**
-           * Error message, NULL if no error was encountered so far.
-           */
+           * Error message, NULL if no error was encountered so far.
+           */
           const char *message;
 
           /**
-           * URI of the file (if the download had been completed)
-           */
+           * URI of the file (if the download had been completed)
+           */
           const struct GNUNET_FS_Uri *chk_uri;
 
           /**
-           * SKS URI of the file (if the download had been completed)
-           */
+           * SKS URI of the file (if the download had been completed)
+           */
           const struct GNUNET_FS_Uri *sks_uri;
-
         } resume;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_PUBLISH_COMPLETED events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_PUBLISH_COMPLETED events.
+         */
+        struct {
           /**
-           * CHK URI of the file.
-           */
+           * CHK URI of the file.
+           */
           const struct GNUNET_FS_Uri *chk_uri;
 
           /**
-           * SKS URI of the file (if the download had been completed)
-           */
+           * SKS URI of the file (if the download had been completed)
+           */
           const struct GNUNET_FS_Uri *sks_uri;
-
         } completed;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_PUBLISH_ERROR events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_PUBLISH_ERROR events.
+         */
+        struct {
           /**
-           * Error message, never NULL.
-           */
+           * Error message, never NULL.
+           */
           const char *message;
-
         } error;
-
       } specifics;
-
     } publish;
 
 
     /**
      * Values for all "GNUNET_FS_STATUS_DOWNLOAD_*" events.
      */
-    struct
-    {
-
+    struct {
       /**
        * Context for controlling the download.
        */
@@ -1049,121 +1020,103 @@ struct GNUNET_FS_ProgressInfo
       /**
        * Additional values for specific events.
        */
-      union
-      {
-
+      union {
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_DOWNLOAD_PROGRESS events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_DOWNLOAD_PROGRESS events.
+         */
+        struct {
           /**
-           * Data block we just obtained, can be NULL (even if
-           * data_len > 0) if we found the entire block 'intact' on
-           * disk.  In this case, it is also possible for 'data_len'
-           * to be larger than an individual (32k) block.
-           */
+           * Data block we just obtained, can be NULL (even if
+           * data_len > 0) if we found the entire block 'intact' on
+           * disk.  In this case, it is also possible for 'data_len'
+           * to be larger than an individual (32k) block.
+           */
           const void *data;
 
           /**
-           * At what offset in the file is "data"?
-           */
+           * At what offset in the file is "data"?
+           */
           uint64_t offset;
 
           /**
-           * Length of the data block.
-           */
+           * Length of the data block.
+           */
           uint64_t data_len;
 
           /**
-           * How much time passed between us asking for this block and
+           * How much time passed between us asking for this block and
            * actually getting it? #GNUNET_TIME_UNIT_FOREVER_REL if unknown.
-           */
+           */
           struct GNUNET_TIME_Relative block_download_duration;
 
           /**
-           * Depth of the given block in the tree;
-           * 0 would be the lowest level (DBLOCKS).
-           */
+           * Depth of the given block in the tree;
+           * 0 would be the lowest level (DBLOCKS).
+           */
           unsigned int depth;
 
           /**
-           * How much respect did we offer for downloading this block? (estimate,
-           * because we might have the same request pending for multiple clients,
-           * and of course because a transmission may have failed at a lower
-           * layer).
-           */
+           * How much respect did we offer for downloading this block? (estimate,
+           * because we might have the same request pending for multiple clients,
+           * and of course because a transmission may have failed at a lower
+           * layer).
+           */
           uint32_t respect_offered;
 
           /**
-           * How often did we transmit the request? (estimate,
-           * because we might have the same request pending for multiple clients,
-           * and of course because a transmission may have failed at a lower
-           * layer).
-           */
+           * How often did we transmit the request? (estimate,
+           * because we might have the same request pending for multiple clients,
+           * and of course because a transmission may have failed at a lower
+           * layer).
+           */
           uint32_t num_transmissions;
-
         } progress;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_DOWNLOAD_START events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_DOWNLOAD_START events.
+         */
+        struct {
           /**
-           * Known metadata for the download.
-           */
+           * Known metadata for the download.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
-
         } start;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_DOWNLOAD_RESUME events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_DOWNLOAD_RESUME events.
+         */
+        struct {
           /**
-           * Known metadata for the download.
-           */
+           * Known metadata for the download.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * Error message, NULL if we have not encountered any error yet.
-           */
+           * Error message, NULL if we have not encountered any error yet.
+           */
           const char *message;
-
         } resume;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_DOWNLOAD_ERROR events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_DOWNLOAD_ERROR events.
+         */
+        struct {
           /**
-           * Error message.
-           */
+           * Error message.
+           */
           const char *message;
-
         } error;
-
       } specifics;
-
     } download;
 
     /**
      * Values for all "GNUNET_FS_STATUS_SEARCH_*" events.
      */
-    struct
-    {
-
+    struct {
       /**
        * Context for controlling the search, NULL for
        * searches that were not explicitly triggered
@@ -1211,262 +1164,232 @@ struct GNUNET_FS_ProgressInfo
       /**
        * Additional values for specific events.
        */
-      union
-      {
-
+      union {
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_RESULT events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_RESULT events.
+         */
+        struct {
           /**
-           * Metadata for the search result.
-           */
+           * Metadata for the search result.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * URI for the search result.
-           */
+           * URI for the search result.
+           */
           const struct GNUNET_FS_Uri *uri;
 
           /**
-           * Handle to the result (for starting downloads).
-           */
+           * Handle to the result (for starting downloads).
+           */
           struct GNUNET_FS_SearchResult *result;
 
           /**
-           * Applicability rank (the larger, the better the result
-           * fits the search criteria).
-           */
+           * Applicability rank (the larger, the better the result
+           * fits the search criteria).
+           */
           uint32_t applicability_rank;
-
         } result;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_RESUME_RESULT events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_RESUME_RESULT events.
+         */
+        struct {
           /**
-           * Metadata for the search result.
-           */
+           * Metadata for the search result.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * URI for the search result.
-           */
+           * URI for the search result.
+           */
           const struct GNUNET_FS_Uri *uri;
 
           /**
-           * Handle to the result (for starting downloads).
-           */
+           * Handle to the result (for starting downloads).
+           */
           struct GNUNET_FS_SearchResult *result;
 
           /**
-           * Current availability rank (negative:
-           * unavailable, positive: available)
-           */
+           * Current availability rank (negative:
+           * unavailable, positive: available)
+           */
           int32_t availability_rank;
 
           /**
-           * On how many total queries is the given
-           * availability_rank based?
-           */
+           * On how many total queries is the given
+           * availability_rank based?
+           */
           uint32_t availability_certainty;
 
           /**
-           * Updated applicability rank (the larger,
-           * the better the result fits the search
-           * criteria).
-           */
+           * Updated applicability rank (the larger,
+           * the better the result fits the search
+           * criteria).
+           */
           uint32_t applicability_rank;
-
         } resume_result;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_UPDATE events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_UPDATE events.
+         */
+        struct {
           /**
-           * Private context set for for this result
-           * during the "RESULT" event.
-           */
+           * Private context set for for this result
+           * during the "RESULT" event.
+           */
           void *cctx;
 
           /**
-           * Metadata for the search result.
-           */
+           * Metadata for the search result.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * URI for the search result.
-           */
+           * URI for the search result.
+           */
           const struct GNUNET_FS_Uri *uri;
 
           /**
-           * Current availability rank (negative:
-           * unavailable, positive: available)
-           */
+           * Current availability rank (negative:
+           * unavailable, positive: available)
+           */
           int32_t availability_rank;
 
           /**
-           * On how many total queries is the given
-           * availability_rank based?
-           */
+           * On how many total queries is the given
+           * availability_rank based?
+           */
           uint32_t availability_certainty;
 
           /**
-           * Updated applicability rank (the larger,
-           * the better the result fits the search
-           * criteria).
-           */
+           * Updated applicability rank (the larger,
+           * the better the result fits the search
+           * criteria).
+           */
           uint32_t applicability_rank;
 
-          /**
-           * How long has the current probe been active?
-           */
-          struct GNUNET_TIME_Relative current_probe_time;
-
+          /**
+           * How long has the current probe been active?
+           */
+          struct GNUNET_TIME_Relative current_probe_time;
         } update;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND events.
-         * These events are automatically triggered for
-         * each search result before the
-         * #GNUNET_FS_STATUS_SEARCH_SUSPEND event.  This
-         * happens primarily to give the client a chance
-         * to clean up the "cctx" (if needed).
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND events.
+         * These events are automatically triggered for
+         * each search result before the
+         * #GNUNET_FS_STATUS_SEARCH_SUSPEND event.  This
+         * happens primarily to give the client a chance
+         * to clean up the "cctx" (if needed).
+         */
+        struct {
           /**
-           * Private context set for for this result
-           * during the "RESULT" event.
-           */
+           * Private context set for for this result
+           * during the "RESULT" event.
+           */
           void *cctx;
 
           /**
-           * Metadata for the search result.
-           */
+           * Metadata for the search result.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * URI for the search result.
-           */
+           * URI for the search result.
+           */
           const struct GNUNET_FS_Uri *uri;
-
         } result_suspend;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED events.
-         * These events are automatically triggered for
-         * each search result before the
-         * #GNUNET_FS_STATUS_SEARCH_STOPPED event.  This
-         * happens primarily to give the client a chance
-         * to clean up the "cctx" (if needed).
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED events.
+         * These events are automatically triggered for
+         * each search result before the
+         * #GNUNET_FS_STATUS_SEARCH_STOPPED event.  This
+         * happens primarily to give the client a chance
+         * to clean up the "cctx" (if needed).
+         */
+        struct {
           /**
-           * Private context set for for this result
-           * during the "RESULT" event.
-           */
+           * Private context set for for this result
+           * during the "RESULT" event.
+           */
           void *cctx;
 
           /**
-           * Metadata for the search result.
-           */
+           * Metadata for the search result.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * URI for the search result.
-           */
+           * URI for the search result.
+           */
           const struct GNUNET_FS_Uri *uri;
-
         } result_stopped;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_RESUME events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_RESUME events.
+         */
+        struct {
           /**
-           * Error message, NULL if we have not encountered any error yet.
-           */
+           * Error message, NULL if we have not encountered any error yet.
+           */
           const char *message;
 
           /**
-           * Is this search currently paused?
-           */
+           * Is this search currently paused?
+           */
           int is_paused;
-
         } resume;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_SEARCH_ERROR events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_SEARCH_ERROR events.
+         */
+        struct {
           /**
-           * Error message.
-           */
+           * Error message.
+           */
           const char *message;
-
         } error;
 
         /**
-         * Values for #GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE events.
-         */
-        struct
-        {
-
+         * Values for #GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE events.
+         */
+        struct {
           /**
-           * Short, human-readable name of the namespace.
-           */
+           * Short, human-readable name of the namespace.
+           */
           const char *name;
 
           /**
-           * Root identifier for the namespace, can be NULL.
-           */
+           * Root identifier for the namespace, can be NULL.
+           */
           const char *root;
 
           /**
-           * Metadata for the namespace.
-           */
+           * Metadata for the namespace.
+           */
           const struct GNUNET_CONTAINER_MetaData *meta;
 
           /**
-           * Public key of the namespace.
-           */
+           * Public key of the namespace.
+           */
           struct GNUNET_CRYPTO_EcdsaPublicKey pseudonym;
-
         } ns;
-
       } specifics;
-
     } search;
 
     /**
      * Values for all "GNUNET_FS_STATUS_UNINDEX_*" events.
      */
-    struct
-    {
-
+    struct {
       /**
        * Context for controlling the unindexing.
        */
@@ -1510,71 +1433,57 @@ struct GNUNET_FS_ProgressInfo
       /**
        * Additional values for specific events.
        */
-      union
-      {
-
+      union {
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_UNINDEX_PROGRESS events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_UNINDEX_PROGRESS events.
+         */
+        struct {
           /**
-           * Data block we just unindexed.
-           */
+           * Data block we just unindexed.
+           */
           const void *data;
 
           /**
-           * At what offset in the file is "data"?
-           */
+           * At what offset in the file is "data"?
+           */
           uint64_t offset;
 
           /**
-           * Length of the data block.
-           */
+           * Length of the data block.
+           */
           uint64_t data_len;
 
           /**
-           * Depth of the given block in the tree;
-           * 0 would be the lowest level (DBLOCKS).
-           */
+           * Depth of the given block in the tree;
+           * 0 would be the lowest level (DBLOCKS).
+           */
           unsigned int depth;
-
         } progress;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_UNINDEX_RESUME events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_UNINDEX_RESUME events.
+         */
+        struct {
           /**
-           * Error message, NULL if we have not encountered any error yet.
-           */
+           * Error message, NULL if we have not encountered any error yet.
+           */
           const char *message;
-
         } resume;
 
         /**
-         * These values are only valid for
-         * #GNUNET_FS_STATUS_UNINDEX_ERROR events.
-         */
-        struct
-        {
-
+         * These values are only valid for
+         * #GNUNET_FS_STATUS_UNINDEX_ERROR events.
+         */
+        struct {
           /**
-           * Error message.
-           */
+           * Error message.
+           */
           const char *message;
-
         } error;
-
       } specifics;
-
     } unindex;
-
   } value;
 
   /**
@@ -1612,8 +1521,7 @@ typedef void *
 /**
  * General (global) option flags for file-sharing.
  */
-enum GNUNET_FS_Flags
-{
+enum GNUNET_FS_Flags {
   /**
    * No special flags set.
    */
@@ -1637,9 +1545,7 @@ enum GNUNET_FS_Flags
 /**
  * Options specified in the VARARGs portion of GNUNET_FS_start.
  */
-enum GNUNET_FS_OPTIONS
-{
-
+enum GNUNET_FS_OPTIONS {
   /**
    * Last option in the VARARG list.
    */
@@ -1666,9 +1572,7 @@ enum GNUNET_FS_OPTIONS
  * Settings for publishing a block (which may of course also
  * apply to an entire directory or file).
  */
-struct GNUNET_FS_BlockOptions
-{
-
+struct GNUNET_FS_BlockOptions {
   /**
    * At what time should the block expire?  Data blocks (DBLOCKS and
    * IBLOCKS) may still be used even if they are expired (however,
@@ -1703,7 +1607,6 @@ struct GNUNET_FS_BlockOptions
    * first place).
    */
   uint32_t replication_level;
-
 };
 
 
@@ -1725,12 +1628,12 @@ struct GNUNET_FS_Handle;
  * @return NULL on error
  */
 struct GNUNET_FS_Handle *
-GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                 const char *client_name,
-                 GNUNET_FS_ProgressCallback upcb,
-                 void *upcb_cls,
-                 enum GNUNET_FS_Flags flags,
-                 ...);
+GNUNET_FS_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                const char *client_name,
+                GNUNET_FS_ProgressCallback upcb,
+                void *upcb_cls,
+                enum GNUNET_FS_Flags flags,
+                ...);
 
 
 /**
@@ -1743,7 +1646,7 @@ GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h handle that was returned from #GNUNET_FS_start()
  */
 void
-GNUNET_FS_stop (struct GNUNET_FS_Handle *h);
+GNUNET_FS_stop(struct GNUNET_FS_Handle *h);
 
 
 /**
@@ -1782,7 +1685,7 @@ typedef int
  *         to read this fi-struct from disk.
  */
 const char *
-GNUNET_FS_file_information_get_id (struct GNUNET_FS_FileInformation *s);
+GNUNET_FS_file_information_get_id(struct GNUNET_FS_FileInformation *s);
 
 
 /**
@@ -1792,7 +1695,7 @@ GNUNET_FS_file_information_get_id (struct GNUNET_FS_FileInformation *s);
  * @return "filename" field of the structure (can be NULL)
  */
 const char *
-GNUNET_FS_file_information_get_filename (struct GNUNET_FS_FileInformation *s);
+GNUNET_FS_file_information_get_filename(struct GNUNET_FS_FileInformation *s);
 
 
 /**
@@ -1804,8 +1707,8 @@ GNUNET_FS_file_information_get_filename (struct GNUNET_FS_FileInformation *s);
  * @param filename filename to set
  */
 void
-GNUNET_FS_file_information_set_filename (struct GNUNET_FS_FileInformation *s,
-                                         const char *filename);
+GNUNET_FS_file_information_set_filename(struct GNUNET_FS_FileInformation *s,
+                                        const char *filename);
 
 
 /**
@@ -1823,13 +1726,13 @@ GNUNET_FS_file_information_set_filename (struct GNUNET_FS_FileInformation *s,
  * @return publish structure entry for the file
  */
 struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
-                                             void *client_info,
-                                             const char *filename,
-                                             const struct GNUNET_FS_Uri *keywords,
-                                             const struct GNUNET_CONTAINER_MetaData *meta,
-                                             int do_index,
-                                             const struct GNUNET_FS_BlockOptions *bo);
+GNUNET_FS_file_information_create_from_file(struct GNUNET_FS_Handle *h,
+                                            void *client_info,
+                                            const char *filename,
+                                            const struct GNUNET_FS_Uri *keywords,
+                                            const struct GNUNET_CONTAINER_MetaData *meta,
+                                            int do_index,
+                                            const struct GNUNET_FS_BlockOptions *bo);
 
 
 /**
@@ -1849,14 +1752,14 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
  * @return publish structure entry for the file
  */
 struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
-                                             void *client_info,
-                                             uint64_t length,
-                                             void *data,
-                                             const struct GNUNET_FS_Uri *keywords,
-                                             const struct GNUNET_CONTAINER_MetaData *meta,
-                                             int do_index,
-                                             const struct GNUNET_FS_BlockOptions *bo);
+GNUNET_FS_file_information_create_from_data(struct GNUNET_FS_Handle *h,
+                                            void *client_info,
+                                            uint64_t length,
+                                            void *data,
+                                            const struct GNUNET_FS_Uri *keywords,
+                                            const struct GNUNET_CONTAINER_MetaData *meta,
+                                            int do_index,
+                                            const struct GNUNET_FS_BlockOptions *bo);
 
 
 /**
@@ -1904,18 +1807,18 @@ typedef size_t
  * @return publish structure entry for the file
  */
 struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
-                                               void *client_info,
-                                               uint64_t length,
-                                               GNUNET_FS_DataReader reader,
-                                               void *reader_cls,
-                                               const struct GNUNET_FS_Uri
-                                               *keywords,
-                                               const struct
-                                               GNUNET_CONTAINER_MetaData *meta,
-                                               int do_index,
-                                               const struct
-                                               GNUNET_FS_BlockOptions *bo);
+GNUNET_FS_file_information_create_from_reader(struct GNUNET_FS_Handle *h,
+                                              void *client_info,
+                                              uint64_t length,
+                                              GNUNET_FS_DataReader reader,
+                                              void *reader_cls,
+                                              const struct GNUNET_FS_Uri
+                                              *keywords,
+                                              const struct
+                                              GNUNET_CONTAINER_MetaData *meta,
+                                              int do_index,
+                                              const struct
+                                              GNUNET_FS_BlockOptions *bo);
 
 
 /**
@@ -1931,16 +1834,16 @@ GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
  * @return publish structure entry for the directory , NULL on error
  */
 struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h,
-                                                   void *client_info,
-                                                   const struct GNUNET_FS_Uri
-                                                   *keywords,
-                                                   const struct
-                                                   GNUNET_CONTAINER_MetaData
-                                                   *meta,
-                                                   const struct
-                                                   GNUNET_FS_BlockOptions *bo,
-                                                   const char *filename);
+GNUNET_FS_file_information_create_empty_directory(struct GNUNET_FS_Handle *h,
+                                                  void *client_info,
+                                                  const struct GNUNET_FS_Uri
+                                                  *keywords,
+                                                  const struct
+                                                  GNUNET_CONTAINER_MetaData
+                                                  *meta,
+                                                  const struct
+                                                  GNUNET_FS_BlockOptions *bo,
+                                                  const char *filename);
 
 
 /**
@@ -1950,8 +1853,8 @@ GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h,
  * @return #GNUNET_YES if so, #GNUNET_NO if not
  */
 int
-GNUNET_FS_file_information_is_directory (const struct GNUNET_FS_FileInformation
-                                         *ent);
+GNUNET_FS_file_information_is_directory(const struct GNUNET_FS_FileInformation
+                                        *ent);
 
 
 /**
@@ -1966,8 +1869,8 @@ GNUNET_FS_file_information_is_directory (const struct GNUNET_FS_FileInformation
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
-                                struct GNUNET_FS_FileInformation *ent);
+GNUNET_FS_file_information_add(struct GNUNET_FS_FileInformation *dir,
+                               struct GNUNET_FS_FileInformation *ent);
 
 
 /**
@@ -1985,9 +1888,9 @@ GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
  * @param proc_cls closure for @a proc
  */
 void
-GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
-                                    GNUNET_FS_FileInformationProcessor proc,
-                                    void *proc_cls);
+GNUNET_FS_file_information_inspect(struct GNUNET_FS_FileInformation *dir,
+                                   GNUNET_FS_FileInformationProcessor proc,
+                                   void *proc_cls);
 
 
 /**
@@ -2001,17 +1904,16 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
  * @param cleaner_cls closure for @a cleaner
  */
 void
-GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
-                                    GNUNET_FS_FileInformationProcessor cleaner,
-                                    void *cleaner_cls);
+GNUNET_FS_file_information_destroy(struct GNUNET_FS_FileInformation *fi,
+                                   GNUNET_FS_FileInformationProcessor cleaner,
+                                   void *cleaner_cls);
 
 
 /**
  * Options for publishing.  Compatible options
  * can be OR'ed together.
  */
-enum GNUNET_FS_PublishOptions
-{
+enum GNUNET_FS_PublishOptions {
   /**
    * No options (use defaults for everything).
    */
@@ -2039,12 +1941,12 @@ enum GNUNET_FS_PublishOptions
  * @return context that can be used to control the publish operation
  */
 struct GNUNET_FS_PublishContext *
-GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
-                         struct GNUNET_FS_FileInformation *fi,
-                         const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
-                         const char *nid,
-                         const char *nuid,
-                         enum GNUNET_FS_PublishOptions options);
+GNUNET_FS_publish_start(struct GNUNET_FS_Handle *h,
+                        struct GNUNET_FS_FileInformation *fi,
+                        const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
+                        const char *nid,
+                        const char *nuid,
+                        enum GNUNET_FS_PublishOptions options);
 
 
 /**
@@ -2056,7 +1958,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
  * @param pc context for the publication to stop
  */
 void
-GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc);
+GNUNET_FS_publish_stop(struct GNUNET_FS_PublishContext *pc);
 
 
 /**
@@ -2093,13 +1995,13 @@ struct GNUNET_FS_PublishKskContext;
  * @return NULL on error (@a cont will still be called)
  */
 struct GNUNET_FS_PublishKskContext *
-GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
-                       const struct GNUNET_FS_Uri *ksk_uri,
-                       const struct GNUNET_CONTAINER_MetaData *meta,
-                       const struct GNUNET_FS_Uri *uri,
-                       const struct GNUNET_FS_BlockOptions *bo,
-                       enum GNUNET_FS_PublishOptions options,
-                       GNUNET_FS_PublishContinuation cont, void *cont_cls);
+GNUNET_FS_publish_ksk(struct GNUNET_FS_Handle *h,
+                      const struct GNUNET_FS_Uri *ksk_uri,
+                      const struct GNUNET_CONTAINER_MetaData *meta,
+                      const struct GNUNET_FS_Uri *uri,
+                      const struct GNUNET_FS_BlockOptions *bo,
+                      enum GNUNET_FS_PublishOptions options,
+                      GNUNET_FS_PublishContinuation cont, void *cont_cls);
 
 
 /**
@@ -2108,7 +2010,7 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
  * @param pkc context of the operation to abort.
  */
 void
-GNUNET_FS_publish_ksk_cancel (struct GNUNET_FS_PublishKskContext *pkc);
+GNUNET_FS_publish_ksk_cancel(struct GNUNET_FS_PublishKskContext *pkc);
 
 
 /**
@@ -2133,15 +2035,15 @@ struct GNUNET_FS_PublishSksContext;
  * @return NULL on error (@a cont will still be called)
  */
 struct GNUNET_FS_PublishSksContext *
-GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
-                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
-                       const char *identifier,
-                       const char *update,
-                       const struct GNUNET_CONTAINER_MetaData *meta,
-                       const struct GNUNET_FS_Uri *uri,
-                       const struct GNUNET_FS_BlockOptions *bo,
-                       enum GNUNET_FS_PublishOptions options,
-                       GNUNET_FS_PublishContinuation cont, void *cont_cls);
+GNUNET_FS_publish_sks(struct GNUNET_FS_Handle *h,
+                      const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
+                      const char *identifier,
+                      const char *update,
+                      const struct GNUNET_CONTAINER_MetaData *meta,
+                      const struct GNUNET_FS_Uri *uri,
+                      const struct GNUNET_FS_BlockOptions *bo,
+                      enum GNUNET_FS_PublishOptions options,
+                      GNUNET_FS_PublishContinuation cont, void *cont_cls);
 
 
 /**
@@ -2150,7 +2052,7 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
  * @param psc context of the operation to abort.
  */
 void
-GNUNET_FS_publish_sks_cancel (struct GNUNET_FS_PublishSksContext *psc);
+GNUNET_FS_publish_sks_cancel(struct GNUNET_FS_PublishSksContext *psc);
 
 
 /**
@@ -2182,9 +2084,9 @@ struct GNUNET_FS_GetIndexedContext;
  * @return NULL on error (@a iterator is not called)
  */
 struct GNUNET_FS_GetIndexedContext *
-GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
-                             GNUNET_FS_IndexedFileProcessor iterator,
-                             void *iterator_cls);
+GNUNET_FS_get_indexed_files(struct GNUNET_FS_Handle *h,
+                            GNUNET_FS_IndexedFileProcessor iterator,
+                            void *iterator_cls);
 
 
 /**
@@ -2193,7 +2095,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
  * @param gic operation to cancel
  */
 void
-GNUNET_FS_get_indexed_files_cancel (struct GNUNET_FS_GetIndexedContext *gic);
+GNUNET_FS_get_indexed_files_cancel(struct GNUNET_FS_GetIndexedContext *gic);
 
 
 /**
@@ -2205,9 +2107,9 @@ GNUNET_FS_get_indexed_files_cancel (struct GNUNET_FS_GetIndexedContext *gic);
  * @return NULL on error, otherwise handle
  */
 struct GNUNET_FS_UnindexContext *
-GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
-                         const char *filename,
-                         void *cctx);
+GNUNET_FS_unindex_start(struct GNUNET_FS_Handle *h,
+                        const char *filename,
+                        void *cctx);
 
 
 /**
@@ -2216,7 +2118,7 @@ GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
  * @param uc handle
  */
 void
-GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
+GNUNET_FS_unindex_stop(struct GNUNET_FS_UnindexContext *uc);
 
 
 /**
@@ -2229,10 +2131,10 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
  * @param next_id identifier that should be used for updates
  */
 typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls,
-                                               const char *last_id,
+                                               const char *last_id,
                                                const struct GNUNET_FS_Uri *last_uri,
                                                const struct GNUNET_CONTAINER_MetaData *last_meta,
-                                               const char *next_id);
+                                               const char *next_id);
 
 
 /**
@@ -2257,27 +2159,26 @@ typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls,
  * @param ip_cls closure for @a ip
  */
 void
-GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Handle *h,
-                                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
-                                     const char *next_id,
-                                     GNUNET_FS_IdentifierProcessor ip,
-                                     void *ip_cls);
+GNUNET_FS_namespace_list_updateable(struct GNUNET_FS_Handle *h,
+                                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
+                                    const char *next_id,
+                                    GNUNET_FS_IdentifierProcessor ip,
+                                    void *ip_cls);
 
 
 /**
  * Options for searching.  Compatible options
  * can be OR'ed together.
  */
-enum GNUNET_FS_SearchOptions
-{
-    /**
-     * No options (use defaults for everything).
-     */
+enum GNUNET_FS_SearchOptions {
+  /**
+   * No options (use defaults for everything).
+   */
   GNUNET_FS_SEARCH_OPTION_NONE = 0,
 
-    /**
-     * Only search the local host, do not search remote systems (no P2P)
-     */
+  /**
+   * Only search the local host, do not search remote systems (no P2P)
+   */
   GNUNET_FS_SEARCH_OPTION_LOOPBACK_ONLY = 1
 };
 
@@ -2294,9 +2195,9 @@ enum GNUNET_FS_SearchOptions
  * @return context that can be used to control the search
  */
 struct GNUNET_FS_SearchContext *
-GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
-                        const struct GNUNET_FS_Uri *uri, uint32_t anonymity,
-                        enum GNUNET_FS_SearchOptions options, void *cctx);
+GNUNET_FS_search_start(struct GNUNET_FS_Handle *h,
+                       const struct GNUNET_FS_Uri *uri, uint32_t anonymity,
+                       enum GNUNET_FS_SearchOptions options, void *cctx);
 
 
 /**
@@ -2305,7 +2206,7 @@ GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
  * @param sc context for the search that should be paused
  */
 void
-GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_pause(struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -2314,7 +2215,7 @@ GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc);
  * @param sc context for the search that should be resumed
  */
 void
-GNUNET_FS_search_continue (struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_continue(struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -2323,7 +2224,7 @@ GNUNET_FS_search_continue (struct GNUNET_FS_SearchContext *sc);
  * @param sc context for the search that should be stopped
  */
 void
-GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_stop(struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -2337,11 +2238,11 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc);
  * @return the search result handle to access the probe activity
  */
 struct GNUNET_FS_SearchResult *
-GNUNET_FS_probe (struct GNUNET_FS_Handle *h,
-                 const struct GNUNET_FS_Uri *uri,
-                 const struct GNUNET_CONTAINER_MetaData *meta,
-                 void *client_info,
-                 uint32_t anonymity);
+GNUNET_FS_probe(struct GNUNET_FS_Handle *h,
+                const struct GNUNET_FS_Uri *uri,
+                const struct GNUNET_CONTAINER_MetaData *meta,
+                void *client_info,
+                uint32_t anonymity);
 
 
 /**
@@ -2352,15 +2253,14 @@ GNUNET_FS_probe (struct GNUNET_FS_Handle *h,
  * @return the value of the 'client_info' pointer
  */
 void *
-GNUNET_FS_probe_stop (struct GNUNET_FS_SearchResult *sr);
+GNUNET_FS_probe_stop(struct GNUNET_FS_SearchResult *sr);
 
 
 /**
  * Options for downloading.  Compatible options
  * can be OR'ed together.
  */
-enum GNUNET_FS_DownloadOptions
-{
+enum GNUNET_FS_DownloadOptions {
   /**
    * No options (use defaults for everything).
    */
@@ -2426,13 +2326,13 @@ enum GNUNET_FS_DownloadOptions
  * @return context that can be used to control this download
  */
 struct GNUNET_FS_DownloadContext *
-GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
-                          const struct GNUNET_FS_Uri *uri,
-                          const struct GNUNET_CONTAINER_MetaData *meta,
-                          const char *filename, const char *tempname,
-                          uint64_t offset, uint64_t length, uint32_t anonymity,
-                          enum GNUNET_FS_DownloadOptions options, void *cctx,
-                          struct GNUNET_FS_DownloadContext *parent);
+GNUNET_FS_download_start(struct GNUNET_FS_Handle *h,
+                         const struct GNUNET_FS_Uri *uri,
+                         const struct GNUNET_CONTAINER_MetaData *meta,
+                         const char *filename, const char *tempname,
+                         uint64_t offset, uint64_t length, uint32_t anonymity,
+                         enum GNUNET_FS_DownloadOptions options, void *cctx,
+                         struct GNUNET_FS_DownloadContext *parent);
 
 
 /**
@@ -2470,13 +2370,13 @@ GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
  * @return context that can be used to control this download
  */
 struct GNUNET_FS_DownloadContext *
-GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
-                                      struct GNUNET_FS_SearchResult *sr,
-                                      const char *filename,
-                                      const char *tempname, uint64_t offset,
-                                      uint64_t length, uint32_t anonymity,
-                                      enum GNUNET_FS_DownloadOptions options,
-                                      void *cctx);
+GNUNET_FS_download_start_from_search(struct GNUNET_FS_Handle *h,
+                                     struct GNUNET_FS_SearchResult *sr,
+                                     const char *filename,
+                                     const char *tempname, uint64_t offset,
+                                     uint64_t length, uint32_t anonymity,
+                                     enum GNUNET_FS_DownloadOptions options,
+                                     void *cctx);
 
 
 /**
@@ -2486,7 +2386,7 @@ GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
  * @param do_delete delete files of incomplete downloads
  */
 void
-GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete);
+GNUNET_FS_download_stop(struct GNUNET_FS_DownloadContext *dc, int do_delete);
 
 
 /**
@@ -2495,7 +2395,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete);
  * @param dc handle for the download
  */
 void
-GNUNET_FS_download_suspend (struct GNUNET_FS_DownloadContext *dc);
+GNUNET_FS_download_suspend(struct GNUNET_FS_DownloadContext *dc);
 
 
 /**
@@ -2504,7 +2404,7 @@ GNUNET_FS_download_suspend (struct GNUNET_FS_DownloadContext *dc);
  * @param dc handle for the download
  */
 void
-GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc);
+GNUNET_FS_download_resume(struct GNUNET_FS_DownloadContext *dc);
 
 
 
@@ -2523,8 +2423,8 @@ GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc);
  *  we have no mime-type information (treat as #GNUNET_NO)
  */
 int
-GNUNET_FS_meta_data_test_for_directory (const struct GNUNET_CONTAINER_MetaData
-                                        *md);
+GNUNET_FS_meta_data_test_for_directory(const struct GNUNET_CONTAINER_MetaData
+                                       *md);
 
 
 /**
@@ -2534,7 +2434,7 @@ GNUNET_FS_meta_data_test_for_directory (const struct GNUNET_CONTAINER_MetaData
  * @param md metadata to add mimetype to
  */
 void
-GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md);
+GNUNET_FS_meta_data_make_directory(struct GNUNET_CONTAINER_MetaData *md);
 
 
 /**
@@ -2544,7 +2444,7 @@ GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md);
  * @return NULL if meta data is useless for suggesting a filename
  */
 char *
-GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md);
+GNUNET_FS_meta_data_suggest_filename(const struct GNUNET_CONTAINER_MetaData *md);
 
 
 /**
@@ -2592,10 +2492,10 @@ typedef void (*GNUNET_FS_DirectoryEntryProcessor) (void *cls,
  *         #GNUNET_SYSERR if 'data' does not represent a directory
  */
 int
-GNUNET_FS_directory_list_contents (size_t size, const void *data,
-                                   uint64_t offset,
-                                   GNUNET_FS_DirectoryEntryProcessor dep,
-                                   void *dep_cls);
+GNUNET_FS_directory_list_contents(size_t size, const void *data,
+                                  uint64_t offset,
+                                  GNUNET_FS_DirectoryEntryProcessor dep,
+                                  void *dep_cls);
 
 
 /**
@@ -2610,8 +2510,8 @@ struct GNUNET_FS_DirectoryBuilder;
  * @param mdir metadata for the directory
  */
 struct GNUNET_FS_DirectoryBuilder *
-GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData
-                                    *mdir);
+GNUNET_FS_directory_builder_create(const struct GNUNET_CONTAINER_MetaData
+                                   *mdir);
 
 
 /**
@@ -2625,10 +2525,10 @@ GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData
  *        by the uri
  */
 void
-GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
-                                 const struct GNUNET_FS_Uri *uri,
-                                 const struct GNUNET_CONTAINER_MetaData *md,
-                                 const void *data);
+GNUNET_FS_directory_builder_add(struct GNUNET_FS_DirectoryBuilder *bld,
+                                const struct GNUNET_FS_Uri *uri,
+                                const struct GNUNET_CONTAINER_MetaData *md,
+                                const void *data);
 
 
 /**
@@ -2642,8 +2542,8 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
-                                    size_t * rsize, void **rdata);
+GNUNET_FS_directory_builder_finish(struct GNUNET_FS_DirectoryBuilder *bld,
+                                   size_t * rsize, void **rdata);
 
 
 /* ******************** DirScanner API *********************** */
@@ -2651,9 +2551,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
 /**
  * Progress reasons of the directory scanner.
  */
-enum GNUNET_FS_DirScannerProgressUpdateReason
-{
-
+enum GNUNET_FS_DirScannerProgressUpdateReason {
   /**
    * We've started processing a file or directory.
    */
@@ -2685,7 +2583,6 @@ enum GNUNET_FS_DirScannerProgressUpdateReason
    * There was an internal error.  Application should abort the scan.
    */
   GNUNET_FS_DIRSCANNER_INTERNAL_ERROR
-
 };
 
 
@@ -2701,16 +2598,15 @@ enum GNUNET_FS_DirScannerProgressUpdateReason
  * @param reason kind of progress we are making
  */
 typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls,
-                                                      const char *filename,
-                                                      int is_directory,
-                                                      enum GNUNET_FS_DirScannerProgressUpdateReason reason);
+                                                      const char *filename,
+                                                      int is_directory,
+                                                      enum GNUNET_FS_DirScannerProgressUpdateReason reason);
 
 
 /**
  * A node of a directory tree (produced by dirscanner)
  */
-struct GNUNET_FS_ShareTreeItem
-{
+struct GNUNET_FS_ShareTreeItem {
   /**
    * This is a doubly-linked list
    */
@@ -2763,7 +2659,6 @@ struct GNUNET_FS_ShareTreeItem
    * #GNUNET_YES if this is a directory
    */
   int is_directory;
-
 };
 
 
@@ -2785,11 +2680,11 @@ struct GNUNET_FS_DirScanner;
  * @return directory scanner object to be used for controlling the scanner
  */
 struct GNUNET_FS_DirScanner *
-GNUNET_FS_directory_scan_start (const char *filename,
-                                int disable_extractor,
-                                const char *ex,
-                                GNUNET_FS_DirScannerProgressCallback cb,
-                                void *cb_cls);
+GNUNET_FS_directory_scan_start(const char *filename,
+                               int disable_extractor,
+                               const char *ex,
+                               GNUNET_FS_DirScannerProgressCallback cb,
+                               void *cb_cls);
 
 
 /**
@@ -2799,7 +2694,7 @@ GNUNET_FS_directory_scan_start (const char *filename,
  * @param ds directory scanner structure
  */
 void
-GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds);
+GNUNET_FS_directory_scan_abort(struct GNUNET_FS_DirScanner *ds);
 
 
 /**
@@ -2811,7 +2706,7 @@ GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds);
  * @return the results of the scan (a directory tree)
  */
 struct GNUNET_FS_ShareTreeItem *
-GNUNET_FS_directory_scan_get_result (struct GNUNET_FS_DirScanner *ds);
+GNUNET_FS_directory_scan_get_result(struct GNUNET_FS_DirScanner *ds);
 
 
 /**
@@ -2821,7 +2716,7 @@ GNUNET_FS_directory_scan_get_result (struct GNUNET_FS_DirScanner *ds);
  * @param toplevel toplevel directory in the tree, returned by the scanner
  */
 void
-GNUNET_FS_share_tree_trim (struct GNUNET_FS_ShareTreeItem *toplevel);
+GNUNET_FS_share_tree_trim(struct GNUNET_FS_ShareTreeItem *toplevel);
 
 
 /**
@@ -2830,7 +2725,7 @@ GNUNET_FS_share_tree_trim (struct GNUNET_FS_ShareTreeItem *toplevel);
  * @param toplevel toplevel of the tree to be freed
  */
 void
-GNUNET_FS_share_tree_free (struct GNUNET_FS_ShareTreeItem *toplevel);
+GNUNET_FS_share_tree_free(struct GNUNET_FS_ShareTreeItem *toplevel);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 1e99c63d0..ef744fbc9 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -44,9 +44,7 @@ extern "C" {
 /**
  * @brief General context for command line processors.
  */
-struct GNUNET_GETOPT_CommandLineProcessorContext
-{
-
+struct GNUNET_GETOPT_CommandLineProcessorContext {
   /**
    * Name of the application
    */
@@ -98,9 +96,7 @@ typedef int (*GNUNET_GETOPT_CommandLineOptionProcessor) (
 /**
  * @brief Definition of a command line option.
  */
-struct GNUNET_GETOPT_CommandLineOption
-{
-
+struct GNUNET_GETOPT_CommandLineOption {
   /**
    * Short name of the option.
    */
@@ -162,7 +158,7 @@ struct GNUNET_GETOPT_CommandLineOption
  * @param about string with brief description of the application
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_help (const char *about);
+GNUNET_GETOPT_option_help(const char *about);
 
 
 /**
@@ -172,7 +168,7 @@ GNUNET_GETOPT_option_help (const char *about);
  * @param version string with the version number
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_version (const char *version);
+GNUNET_GETOPT_option_version(const char *version);
 
 
 /**
@@ -181,7 +177,7 @@ GNUNET_GETOPT_option_version (const char *version);
  * @param[out] logfn set to the name of the logfile
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_logfile (char **logfn);
+GNUNET_GETOPT_option_logfile(char **logfn);
 
 
 /**
@@ -194,11 +190,11 @@ GNUNET_GETOPT_option_logfile (char **logfn);
  * @param[out] str set to the string
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_string (char shortName,
-                             const char *name,
-                             const char *argumentHelp,
-                             const char *description,
-                             char **str);
+GNUNET_GETOPT_option_string(char shortName,
+                            const char *name,
+                            const char *argumentHelp,
+                            const char *description,
+                            char **str);
 
 /**
  * Allow user to specify a filename (automatically path expanded).
@@ -210,11 +206,11 @@ GNUNET_GETOPT_option_string (char shortName,
  * @param[out] str set to the string
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_filename (char shortName,
-                               const char *name,
-                               const char *argumentHelp,
-                               const char *description,
-                               char **str);
+GNUNET_GETOPT_option_filename(char shortName,
+                              const char *name,
+                              const char *argumentHelp,
+                              const char *description,
+                              char **str);
 
 
 /**
@@ -229,12 +225,12 @@ GNUNET_GETOPT_option_filename (char shortName,
  * @param val_size size of @a val in bytes
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_base32_fixed_size (char shortName,
-                                        const char *name,
-                                        const char *argumentHelp,
-                                        const char *description,
-                                        void *val,
-                                        size_t val_size);
+GNUNET_GETOPT_option_base32_fixed_size(char shortName,
+                                       const char *name,
+                                       const char *argumentHelp,
+                                       const char *description,
+                                       void *val,
+                                       size_t val_size);
 
 
 /**
@@ -254,12 +250,12 @@ GNUNET_GETOPT_option_base32_fixed_size (char shortName,
                                          argumentHelp,  \
                                          description,   \
                                          val)           \
-  GNUNET_GETOPT_option_base32_fixed_size (shortName,    \
-                                          name,         \
-                                          argumentHelp, \
-                                          description,  \
-                                          val,          \
-                                          sizeof (*val))
+  GNUNET_GETOPT_option_base32_fixed_size(shortName,    \
+                                         name,         \
+                                         argumentHelp, \
+                                         description,  \
+                                         val,          \
+                                         sizeof(*val))
 
 
 /**
@@ -272,10 +268,10 @@ GNUNET_GETOPT_option_base32_fixed_size (char shortName,
  * @param[out] val set to 1 if the option is present
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_flag (char shortName,
-                           const char *name,
-                           const char *description,
-                           int *val);
+GNUNET_GETOPT_option_flag(char shortName,
+                          const char *name,
+                          const char *description,
+                          int *val);
 
 
 /**
@@ -288,11 +284,11 @@ GNUNET_GETOPT_option_flag (char shortName,
  * @param[out] val set to the value specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_uint (char shortName,
-                           const char *name,
-                           const char *argumentHelp,
-                           const char *description,
-                           unsigned int *val);
+GNUNET_GETOPT_option_uint(char shortName,
+                          const char *name,
+                          const char *argumentHelp,
+                          const char *description,
+                          unsigned int *val);
 
 
 /**
@@ -305,11 +301,11 @@ GNUNET_GETOPT_option_uint (char shortName,
  * @param[out] val set to the value specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_uint16 (char shortName,
-                             const char *name,
-                             const char *argumentHelp,
-                             const char *description,
-                             uint16_t *val);
+GNUNET_GETOPT_option_uint16(char shortName,
+                            const char *name,
+                            const char *argumentHelp,
+                            const char *description,
+                            uint16_t *val);
 
 
 /**
@@ -322,11 +318,11 @@ GNUNET_GETOPT_option_uint16 (char shortName,
  * @param[out] val set to the value specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_ulong (char shortName,
-                            const char *name,
-                            const char *argumentHelp,
-                            const char *description,
-                            unsigned long long *val);
+GNUNET_GETOPT_option_ulong(char shortName,
+                           const char *name,
+                           const char *argumentHelp,
+                           const char *description,
+                           unsigned long long *val);
 
 
 /**
@@ -340,11 +336,11 @@ GNUNET_GETOPT_option_ulong (char shortName,
  * @param[out] val set to the time specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_relative_time (char shortName,
-                                    const char *name,
-                                    const char *argumentHelp,
-                                    const char *description,
-                                    struct GNUNET_TIME_Relative *val);
+GNUNET_GETOPT_option_relative_time(char shortName,
+                                   const char *name,
+                                   const char *argumentHelp,
+                                   const char *description,
+                                   struct GNUNET_TIME_Relative *val);
 
 
 /**
@@ -358,11 +354,11 @@ GNUNET_GETOPT_option_relative_time (char shortName,
  * @param[out] val set to the time specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_absolute_time (char shortName,
-                                    const char *name,
-                                    const char *argumentHelp,
-                                    const char *description,
-                                    struct GNUNET_TIME_Absolute *val);
+GNUNET_GETOPT_option_absolute_time(char shortName,
+                                   const char *name,
+                                   const char *argumentHelp,
+                                   const char *description,
+                                   struct GNUNET_TIME_Absolute *val);
 
 
 /**
@@ -375,10 +371,10 @@ GNUNET_GETOPT_option_absolute_time (char shortName,
  * @param[out] val set to 1 if the option is present
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_increment_uint (char shortName,
-                                     const char *name,
-                                     const char *description,
-                                     unsigned int *val);
+GNUNET_GETOPT_option_increment_uint(char shortName,
+                                    const char *name,
+                                    const char *description,
+                                    unsigned int *val);
 
 
 /**
@@ -388,7 +384,7 @@ GNUNET_GETOPT_option_increment_uint (char shortName,
  * @param[out] level set to the log level
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_loglevel (char **level);
+GNUNET_GETOPT_option_loglevel(char **level);
 
 
 /**
@@ -398,7 +394,7 @@ GNUNET_GETOPT_option_loglevel (char **level);
  * @param[out] level set to the verbosity level
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_verbose (unsigned int *level);
+GNUNET_GETOPT_option_verbose(unsigned int *level);
 
 
 /**
@@ -407,7 +403,7 @@ GNUNET_GETOPT_option_verbose (unsigned int *level);
  * @param[out] logfn set to the name of the logfile
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_logfile (char **logfn);
+GNUNET_GETOPT_option_logfile(char **logfn);
 
 
 /**
@@ -416,7 +412,7 @@ GNUNET_GETOPT_option_logfile (char **logfn);
  * @param[out] fn set to the name of the configuration file
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_cfgfile (char **fn);
+GNUNET_GETOPT_option_cfgfile(char **fn);
 
 
 /**
@@ -426,7 +422,7 @@ GNUNET_GETOPT_option_cfgfile (char **fn);
  * @return @a opt with the mandatory flag set.
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_mandatory (struct GNUNET_GETOPT_CommandLineOption opt);
+GNUNET_GETOPT_option_mandatory(struct GNUNET_GETOPT_CommandLineOption opt);
 
 
 /**
@@ -436,7 +432,7 @@ GNUNET_GETOPT_option_mandatory (struct GNUNET_GETOPT_CommandLineOption opt);
  * @return @a opt with the exclusive flag set.
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_exclusive (struct GNUNET_GETOPT_CommandLineOption opt);
+GNUNET_GETOPT_option_exclusive(struct GNUNET_GETOPT_CommandLineOption opt);
 
 
 /**
@@ -459,10 +455,10 @@ GNUNET_GETOPT_option_exclusive (struct GNUNET_GETOPT_CommandLineOption opt);
  *   argument, or #GNUNET_SYSERR on error
  */
 int
-GNUNET_GETOPT_run (const char *binaryOptions,
-                   const struct GNUNET_GETOPT_CommandLineOption *allOptions,
-                   unsigned int argc,
-                   char *const *argv);
+GNUNET_GETOPT_run(const char *binaryOptions,
+                  const struct GNUNET_GETOPT_CommandLineOption *allOptions,
+                  unsigned int argc,
+                  char *const *argv);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index ca92e8221..f66bec61e 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -76,7 +76,7 @@ struct GNUNET_GNS_LookupWithTldRequest;
  * @return handle to the GNS service, or NULL on error
  */
 struct GNUNET_GNS_Handle *
-GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_GNS_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -85,7 +85,7 @@ GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param handle connection to shut down
  */
 void
-GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle);
+GNUNET_GNS_disconnect(struct GNUNET_GNS_Handle *handle);
 
 
 /**
@@ -104,8 +104,7 @@ typedef void (*GNUNET_GNS_LookupResultProcessor) (
 /**
  * Options for the GNS lookup.
  */
-enum GNUNET_GNS_LocalOptions
-{
+enum GNUNET_GNS_LocalOptions {
   /**
    * Defaults, look in cache, then in DHT.
    */
@@ -121,7 +120,6 @@ enum GNUNET_GNS_LocalOptions
    * is our local namestore), for the others, the DHT is OK.
    */
   GNUNET_GNS_LO_LOCAL_MASTER = 2
-
 };
 
 
@@ -138,13 +136,13 @@ enum GNUNET_GNS_LocalOptions
  * @return handle to the queued request
  */
 struct GNUNET_GNS_LookupRequest *
-GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
-                   const char *name,
-                   const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
-                   uint32_t type,
-                   enum GNUNET_GNS_LocalOptions options,
-                   GNUNET_GNS_LookupResultProcessor proc,
-                   void *proc_cls);
+GNUNET_GNS_lookup(struct GNUNET_GNS_Handle *handle,
+                  const char *name,
+                  const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
+                  uint32_t type,
+                  enum GNUNET_GNS_LocalOptions options,
+                  GNUNET_GNS_LookupResultProcessor proc,
+                  void *proc_cls);
 
 
 /**
@@ -154,7 +152,7 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
  * @return closure from the lookup result processor
  */
 void *
-GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr);
+GNUNET_GNS_lookup_cancel(struct GNUNET_GNS_LookupRequest *lr);
 
 
 /**
@@ -188,12 +186,12 @@ typedef void (*GNUNET_GNS_LookupResultProcessor2) (
  * @return handle to the get request
  */
 struct GNUNET_GNS_LookupWithTldRequest *
-GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
-                            const char *name,
-                            uint32_t type,
-                            enum GNUNET_GNS_LocalOptions options,
-                            GNUNET_GNS_LookupResultProcessor2 proc,
-                            void *proc_cls);
+GNUNET_GNS_lookup_with_tld(struct GNUNET_GNS_Handle *handle,
+                           const char *name,
+                           uint32_t type,
+                           enum GNUNET_GNS_LocalOptions options,
+                           GNUNET_GNS_LookupResultProcessor2 proc,
+                           void *proc_cls);
 
 
 /**
@@ -203,7 +201,7 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
  * @return closure from the lookup result processor
  */
 void *
-GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr);
+GNUNET_GNS_lookup_with_tld_cancel(struct GNUNET_GNS_LookupWithTldRequest *ltr);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index a92cdc2e7..5effa855f 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -145,7 +145,6 @@ extern "C" {
  * Flags that can be set for a record.
  */
 enum GNUNET_GNSRECORD_Flags {
-
   /**
    * No special options.
    */
@@ -194,7 +193,6 @@ enum GNUNET_GNSRECORD_Flags {
  * A GNS record.
  */
 struct GNUNET_GNSRECORD_Data {
-
   /**
    * Binary value stored in the DNS record.  Note: "data" must never
    * be individually 'malloc'ed, but instead always points into some
@@ -255,7 +253,6 @@ struct GNUNET_GNSRECORD_PlaceData {
  * Information we have in an encrypted block with record data (i.e. in the DHT).
  */
 struct GNUNET_GNSRECORD_Block {
-
   /**
    * Signature of the block.
    */
@@ -292,7 +289,6 @@ struct GNUNET_GNSRECORD_Block {
  * records inseparable from the "main" A/AAAA/VPN/etc. records.
  */
 struct GNUNET_GNSRECORD_BoxRecord {
-
   /**
    * Protocol of the boxed record (6 = TCP, 17 = UDP, etc.).
    * Yes, in IP protocols are usually limited to 8 bits. In NBO.
@@ -344,7 +340,7 @@ GNUNET_NETWORK_STRUCT_END
  * @param rd array of records with data to store
  */
 typedef void (*GNUNET_GNSRECORD_RecordCallback) (
-    void *cls, unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
+  void *cls, unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /* ***************** API related to GNSRECORD plugins ************** */
@@ -359,8 +355,8 @@ typedef void (*GNUNET_GNSRECORD_RecordCallback) (
  * @return NULL on error, otherwise human-readable representation of the value
  */
 char *
-GNUNET_GNSRECORD_value_to_string (uint32_t type, const void *data,
-                                  size_t data_size);
+GNUNET_GNSRECORD_value_to_string(uint32_t type, const void *data,
+                                 size_t data_size);
 
 
 /**
@@ -374,8 +370,8 @@ GNUNET_GNSRECORD_value_to_string (uint32_t type, const void *data,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_GNSRECORD_string_to_value (uint32_t type, const char *s, void **data,
-                                  size_t *data_size);
+GNUNET_GNSRECORD_string_to_value(uint32_t type, const char *s, void **data,
+                                 size_t *data_size);
 
 
 /**
@@ -385,7 +381,7 @@ GNUNET_GNSRECORD_string_to_value (uint32_t type, const char *s, void **data,
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
+GNUNET_GNSRECORD_typename_to_number(const char *dns_typename);
 
 
 /**
@@ -395,7 +391,7 @@ GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
  * @return corresponding typestring, NULL on error
  */
 const char *
-GNUNET_GNSRECORD_number_to_typename (uint32_t type);
+GNUNET_GNSRECORD_number_to_typename(uint32_t type);
 
 
 /* convenience APIs for serializing / deserializing GNS records */
@@ -409,8 +405,8 @@ GNUNET_GNSRECORD_number_to_typename (uint32_t type);
  * @return the required size to serialize, -1 on error
  */
 ssize_t
-GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
-                                   const struct GNUNET_GNSRECORD_Data *rd);
+GNUNET_GNSRECORD_records_get_size(unsigned int rd_count,
+                                  const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -423,9 +419,9 @@ GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
  * @return the size of serialized records, -1 if records do not fit
  */
 ssize_t
-GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
-                                    const struct GNUNET_GNSRECORD_Data *rd,
-                                    size_t dest_size, char *dest);
+GNUNET_GNSRECORD_records_serialize(unsigned int rd_count,
+                                   const struct GNUNET_GNSRECORD_Data *rd,
+                                   size_t dest_size, char *dest);
 
 
 /**
@@ -438,9 +434,9 @@ GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_GNSRECORD_records_deserialize (size_t len, const char *src,
-                                      unsigned int rd_count,
-                                      struct GNUNET_GNSRECORD_Data *dest);
+GNUNET_GNSRECORD_records_deserialize(size_t len, const char *src,
+                                     unsigned int rd_count,
+                                     struct GNUNET_GNSRECORD_Data *dest);
 
 
 /* ******* general APIs relating to blocks, records and labels ******** */
@@ -454,7 +450,7 @@ GNUNET_GNSRECORD_records_deserialize (size_t len, const char *src,
  *         #GNUNET_NO if not
  */
 int
-GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd);
+GNUNET_GNSRECORD_is_expired(const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -463,7 +459,7 @@ GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd);
  * @return converted result
  */
 char *
-GNUNET_GNSRECORD_string_to_lowercase (const char *src);
+GNUNET_GNSRECORD_string_to_lowercase(const char *src);
 
 
 /**
@@ -476,7 +472,7 @@ GNUNET_GNSRECORD_string_to_lowercase (const char *src);
  * #GNUNET_GNSRECORD_z2s.
  */
 const char *
-GNUNET_GNSRECORD_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
+GNUNET_GNSRECORD_z2s(const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
 
 
 /**
@@ -490,7 +486,7 @@ GNUNET_GNSRECORD_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
  *         key in an encoding suitable for DNS labels.
  */
 const char *
-GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
+GNUNET_GNSRECORD_pkey_to_zkey(const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
 
 
 /**
@@ -503,8 +499,8 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
  * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
  */
 int
-GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey,
-                               struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
+GNUNET_GNSRECORD_zkey_to_pkey(const char *zkey,
+                              struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
 
 
 /**
@@ -515,9 +511,9 @@ GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey,
  * @param query hash to use for the query
  */
 void
-GNUNET_GNSRECORD_query_from_private_key (
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, const char *label,
-    struct GNUNET_HashCode *query);
+GNUNET_GNSRECORD_query_from_private_key(
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, const char *label,
+  struct GNUNET_HashCode *query);
 
 
 /**
@@ -528,9 +524,9 @@ GNUNET_GNSRECORD_query_from_private_key (
  * @param query hash to use for the query
  */
 void
-GNUNET_GNSRECORD_query_from_public_key (
-    const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, const char *label,
-    struct GNUNET_HashCode *query);
+GNUNET_GNSRECORD_query_from_public_key(
+  const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, const char *label,
+  struct GNUNET_HashCode *query);
 
 
 /**
@@ -543,11 +539,11 @@ GNUNET_GNSRECORD_query_from_public_key (
  * @param rd_count number of records in @a rd
  */
 struct GNUNET_GNSRECORD_Block *
-GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                               struct GNUNET_TIME_Absolute expire,
-                               const char *label,
-                               const struct GNUNET_GNSRECORD_Data *rd,
-                               unsigned int rd_count);
+GNUNET_GNSRECORD_block_create(const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+                              struct GNUNET_TIME_Absolute expire,
+                              const char *label,
+                              const struct GNUNET_GNSRECORD_Data *rd,
+                              unsigned int rd_count);
 
 
 /**
@@ -562,11 +558,11 @@ GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
  * @param rd_count number of records in @a rd
  */
 struct GNUNET_GNSRECORD_Block *
-GNUNET_GNSRECORD_block_create2 (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                                struct GNUNET_TIME_Absolute expire,
-                                const char *label,
-                                const struct GNUNET_GNSRECORD_Data *rd,
-                                unsigned int rd_count);
+GNUNET_GNSRECORD_block_create2(const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+                               struct GNUNET_TIME_Absolute expire,
+                               const char *label,
+                               const struct GNUNET_GNSRECORD_Data *rd,
+                               unsigned int rd_count);
 
 
 /**
@@ -577,7 +573,7 @@ GNUNET_GNSRECORD_block_create2 (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
  * @return #GNUNET_OK if the signature is valid
  */
 int
-GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block);
+GNUNET_GNSRECORD_block_verify(const struct GNUNET_GNSRECORD_Block *block);
 
 
 /**
@@ -592,10 +588,10 @@ GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block);
  *        not well-formed
  */
 int
-GNUNET_GNSRECORD_block_decrypt (
-    const struct GNUNET_GNSRECORD_Block *block,
-    const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, const char *label,
-    GNUNET_GNSRECORD_RecordCallback proc, void *proc_cls);
+GNUNET_GNSRECORD_block_decrypt(
+  const struct GNUNET_GNSRECORD_Block *block,
+  const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, const char *label,
+  GNUNET_GNSRECORD_RecordCallback proc, void *proc_cls);
 
 
 /**
@@ -606,8 +602,8 @@ GNUNET_GNSRECORD_block_decrypt (
  * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not.
  */
 int
-GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a,
-                              const struct GNUNET_GNSRECORD_Data *b);
+GNUNET_GNSRECORD_records_cmp(const struct GNUNET_GNSRECORD_Data *a,
+                             const struct GNUNET_GNSRECORD_Data *b);
 
 
 /**
@@ -620,8 +616,8 @@ GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a,
  * @return absolute expiration time
  */
 struct GNUNET_TIME_Absolute
-GNUNET_GNSRECORD_record_get_expiration_time (
-    unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
+GNUNET_GNSRECORD_record_get_expiration_time(
+  unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h
index cc10e3e7f..7ce1b22e6 100644
--- a/src/include/gnunet_gnsrecord_plugin.h
+++ b/src/include/gnunet_gnsrecord_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -55,9 +55,9 @@ extern "C"
  */
 typedef char *
 (*GNUNET_GNSRECORD_ValueToStringFunction) (void *cls,
-                                           uint32_t type,
-                                           const void *data,
-                                           size_t data_size);
+                                           uint32_t type,
+                                           const void *data,
+                                           size_t data_size);
 
 
 /**
@@ -74,10 +74,10 @@ typedef char *
  */
 typedef int
 (*GNUNET_GNSRECORD_StringToValueFunction) (void *cls,
-                                           uint32_t type,
-                                           const char *s,
-                                           void **data,
-                                           size_t *data_size);
+                                           uint32_t type,
+                                           const char *s,
+                                           void **data,
+                                           size_t *data_size);
 
 
 /**
@@ -90,7 +90,7 @@ typedef int
  */
 typedef uint32_t
 (*GNUNET_GNSRECORD_TypenameToNumberFunction) (void *cls,
-                                              const char *dns_typename);
+                                              const char *dns_typename);
 
 
 /**
@@ -103,16 +103,14 @@ typedef uint32_t
  */
 typedef const char *
 (*GNUNET_GNSRECORD_NumberToTypenameFunction) (void *cls,
-                                              uint32_t type);
+                                              uint32_t type);
 
 
 /**
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_GNSRECORD_PluginFunctions
-{
-
+struct GNUNET_GNSRECORD_PluginFunctions {
   /**
    * Closure for all of the callbacks.
    */
@@ -137,7 +135,6 @@ struct GNUNET_GNSRECORD_PluginFunctions
    * Number to typename.
    */
   GNUNET_GNSRECORD_NumberToTypenameFunction number_to_typename;
-
 };
 
 /** @} */  /* end of group */
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 3b494f0a2..9fe158852 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -65,8 +65,7 @@ extern "C" {
  * These information are only valid for the local peer and are not serialized
  * when a #GNUNET_HELLO_Message is created
  */
-enum GNUNET_HELLO_AddressInfo
-{
+enum GNUNET_HELLO_AddressInfo {
   /**
    * No additional information
    */
@@ -86,9 +85,7 @@ enum GNUNET_HELLO_AddressInfo
  * separated.  This is NOT the format that would be used
  * on the wire.
  */
-struct GNUNET_HELLO_Address
-{
-
+struct GNUNET_HELLO_Address {
   /**
    * For which peer is this an address?
    */
@@ -135,11 +132,11 @@ struct GNUNET_HELLO_Address
  * @return the address struct
  */
 struct GNUNET_HELLO_Address *
-GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
-                               const char *transport_name,
-                               const void *address,
-                               size_t address_length,
-                               enum GNUNET_HELLO_AddressInfo local_info);
+GNUNET_HELLO_address_allocate(const struct GNUNET_PeerIdentity *peer,
+                              const char *transport_name,
+                              const void *address,
+                              size_t address_length,
+                              enum GNUNET_HELLO_AddressInfo local_info);
 
 
 /**
@@ -149,7 +146,7 @@ GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
  * @return a copy of the address struct
  */
 struct GNUNET_HELLO_Address *
-GNUNET_HELLO_address_copy (const struct GNUNET_HELLO_Address *address);
+GNUNET_HELLO_address_copy(const struct GNUNET_HELLO_Address *address);
 
 
 /**
@@ -161,8 +158,8 @@ GNUNET_HELLO_address_copy (const struct GNUNET_HELLO_Address *address);
  * @return 0 if the addresses are equal, -1 if @a a1< @a a2, 1 if @a a1> @a a2.
  */
 int
-GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1,
-                          const struct GNUNET_HELLO_Address *a2);
+GNUNET_HELLO_address_cmp(const struct GNUNET_HELLO_Address *a1,
+                         const struct GNUNET_HELLO_Address *a2);
 
 
 /**
@@ -172,7 +169,7 @@ GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1,
  * @return the size
  */
 size_t
-GNUNET_HELLO_address_get_size (const struct GNUNET_HELLO_Address *address);
+GNUNET_HELLO_address_get_size(const struct GNUNET_HELLO_Address *address);
 
 
 /**
@@ -183,8 +180,8 @@ GNUNET_HELLO_address_get_size (const struct GNUNET_HELLO_Address *address);
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-GNUNET_HELLO_address_check_option (const struct GNUNET_HELLO_Address *address,
-                                   enum GNUNET_HELLO_AddressInfo option);
+GNUNET_HELLO_address_check_option(const struct GNUNET_HELLO_Address *address,
+                                  enum GNUNET_HELLO_AddressInfo option);
 
 
 /**
@@ -192,7 +189,7 @@ GNUNET_HELLO_address_check_option (const struct GNUNET_HELLO_Address *address,
  *
  * @param addr address to free
  */
-#define GNUNET_HELLO_address_free(addr) GNUNET_free (addr)
+#define GNUNET_HELLO_address_free(addr) GNUNET_free(addr)
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
@@ -210,8 +207,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  *    unaligned!)
  * 4) address (address-length bytes; possibly unaligned!)
  */
-struct GNUNET_HELLO_Message
-{
+struct GNUNET_HELLO_Message {
   /**
    * Type will be #GNUNET_MESSAGE_TYPE_HELLO.
    */
@@ -237,7 +233,7 @@ GNUNET_NETWORK_STRUCT_END
  * @return #GNUNET_YES for friend-only or #GNUNET_NO otherwise
  */
 int
-GNUNET_HELLO_is_friend_only (const struct GNUNET_HELLO_Message *h);
+GNUNET_HELLO_is_friend_only(const struct GNUNET_HELLO_Message *h);
 
 
 /**
@@ -252,10 +248,10 @@ GNUNET_HELLO_is_friend_only (const struct GNUNET_HELLO_Message *h);
  *         the target buffer was not big enough.
  */
 size_t
-GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address,
-                          struct GNUNET_TIME_Absolute expiration,
-                          char *target,
-                          size_t max);
+GNUNET_HELLO_add_address(const struct GNUNET_HELLO_Address *address,
+                         struct GNUNET_TIME_Absolute expiration,
+                         char *target,
+                         size_t max);
 
 
 /**
@@ -289,10 +285,10 @@ typedef ssize_t (*GNUNET_HELLO_GenerateAddressListCallback) (void *cls,
  * @return the hello message
  */
 struct GNUNET_HELLO_Message *
-GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EddsaPublicKey *public_key,
-                     GNUNET_HELLO_GenerateAddressListCallback addrgen,
-                     void *addrgen_cls,
-                     int friend_only);
+GNUNET_HELLO_create(const struct GNUNET_CRYPTO_EddsaPublicKey *public_key,
+                    GNUNET_HELLO_GenerateAddressListCallback addrgen,
+                    void *addrgen_cls,
+                    int friend_only);
 
 
 /**
@@ -302,7 +298,7 @@ GNUNET_HELLO_create (const struct GNUNET_CRYPTO_EddsaPublicKey *public_key,
  * @return the size, 0 if HELLO is invalid
  */
 uint16_t
-GNUNET_HELLO_size (const struct GNUNET_HELLO_Message *hello);
+GNUNET_HELLO_size(const struct GNUNET_HELLO_Message *hello);
 
 
 /**
@@ -315,8 +311,8 @@ GNUNET_HELLO_size (const struct GNUNET_HELLO_Message *hello);
  * @return the combined hello message
  */
 struct GNUNET_HELLO_Message *
-GNUNET_HELLO_merge (const struct GNUNET_HELLO_Message *h1,
-                    const struct GNUNET_HELLO_Message *h2);
+GNUNET_HELLO_merge(const struct GNUNET_HELLO_Message *h1,
+                   const struct GNUNET_HELLO_Message *h2);
 
 
 /**
@@ -336,9 +332,9 @@ GNUNET_HELLO_merge (const struct GNUNET_HELLO_Message *h1,
  *         do not match at all
  */
 struct GNUNET_TIME_Absolute
-GNUNET_HELLO_equals (const struct GNUNET_HELLO_Message *h1,
-                     const struct GNUNET_HELLO_Message *h2,
-                     struct GNUNET_TIME_Absolute now);
+GNUNET_HELLO_equals(const struct GNUNET_HELLO_Message *h1,
+                    const struct GNUNET_HELLO_Message *h2,
+                    struct GNUNET_TIME_Absolute now);
 
 
 /**
@@ -364,7 +360,7 @@ typedef int (*GNUNET_HELLO_AddressIterator) (
  * @return time the last address expires, 0 if there are no addresses in the HELLO
  */
 struct GNUNET_TIME_Absolute
-GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg);
+GNUNET_HELLO_get_last_expiration(const struct GNUNET_HELLO_Message *msg);
 
 
 /**
@@ -380,10 +376,10 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg);
  * @return the modified HELLO or NULL
  */
 struct GNUNET_HELLO_Message *
-GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg,
-                                int return_modified,
-                                GNUNET_HELLO_AddressIterator it,
-                                void *it_cls);
+GNUNET_HELLO_iterate_addresses(const struct GNUNET_HELLO_Message *msg,
+                               int return_modified,
+                               GNUNET_HELLO_AddressIterator it,
+                               void *it_cls);
 
 
 /**
@@ -400,7 +396,7 @@ GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg,
  * @param it_cls closure for @a it
  */
 void
-GNUNET_HELLO_iterate_new_addresses (
+GNUNET_HELLO_iterate_new_addresses(
   const struct GNUNET_HELLO_Message *new_hello,
   const struct GNUNET_HELLO_Message *old_hello,
   struct GNUNET_TIME_Absolute expiration_limit,
@@ -416,8 +412,8 @@ GNUNET_HELLO_iterate_new_addresses (
  * @return #GNUNET_SYSERR if the HELLO was malformed
  */
 int
-GNUNET_HELLO_get_id (const struct GNUNET_HELLO_Message *hello,
-                     struct GNUNET_PeerIdentity *peer);
+GNUNET_HELLO_get_id(const struct GNUNET_HELLO_Message *hello,
+                    struct GNUNET_PeerIdentity *peer);
 
 
 /**
@@ -429,7 +425,7 @@ GNUNET_HELLO_get_id (const struct GNUNET_HELLO_Message *hello,
  * @return header or NULL if the HELLO was malformed
  */
 struct GNUNET_MessageHeader *
-GNUNET_HELLO_get_header (struct GNUNET_HELLO_Message *hello);
+GNUNET_HELLO_get_header(struct GNUNET_HELLO_Message *hello);
 
 
 /**
@@ -440,7 +436,7 @@ GNUNET_HELLO_get_header (struct GNUNET_HELLO_Message *hello);
  * @return NULL if a plugin with name @a name is not known/loadable
  */
 typedef struct GNUNET_TRANSPORT_PluginFunctions *(
-  *GNUNET_HELLO_TransportPluginsFind) (const char *name);
+*GNUNET_HELLO_TransportPluginsFind) (const char *name);
 
 
 /**
@@ -451,8 +447,8 @@ typedef struct GNUNET_TRANSPORT_PluginFunctions *(
  * @return Hello URI string
  */
 char *
-GNUNET_HELLO_compose_uri (const struct GNUNET_HELLO_Message *hello,
-                          GNUNET_HELLO_TransportPluginsFind plugins_find);
+GNUNET_HELLO_compose_uri(const struct GNUNET_HELLO_Message *hello,
+                         GNUNET_HELLO_TransportPluginsFind plugins_find);
 
 
 /**
@@ -465,10 +461,10 @@ GNUNET_HELLO_compose_uri (const struct GNUNET_HELLO_Message *hello,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if the URI was invalid, #GNUNET_NO on other errors
  */
 int
-GNUNET_HELLO_parse_uri (const char *uri,
-                        struct GNUNET_CRYPTO_EddsaPublicKey *pubkey,
-                        struct GNUNET_HELLO_Message **hello,
-                        GNUNET_HELLO_TransportPluginsFind plugins_find);
+GNUNET_HELLO_parse_uri(const char *uri,
+                       struct GNUNET_CRYPTO_EddsaPublicKey *pubkey,
+                       struct GNUNET_HELLO_Message **hello,
+                       GNUNET_HELLO_TransportPluginsFind plugins_find);
 
 
 /* NG API */
@@ -486,7 +482,7 @@ GNUNET_HELLO_parse_uri (const char *uri,
  * @param result_size[out] set to size of @a result
  */
 void
-GNUNET_HELLO_sign_address (
+GNUNET_HELLO_sign_address(
   const char *address,
   enum GNUNET_NetworkType nt,
   struct GNUNET_TIME_Absolute mono_time,
@@ -506,11 +502,11 @@ GNUNET_HELLO_sign_address (
  * @return NULL on error, otherwise the address
  */
 char *
-GNUNET_HELLO_extract_address (const void *raw,
-                              size_t raw_size,
-                              const struct GNUNET_PeerIdentity *pid,
-                              enum GNUNET_NetworkType *nt,
-                              struct GNUNET_TIME_Absolute *mono_time);
+GNUNET_HELLO_extract_address(const void *raw,
+                             size_t raw_size,
+                             const struct GNUNET_PeerIdentity *pid,
+                             enum GNUNET_NetworkType *nt,
+                             struct GNUNET_TIME_Absolute *mono_time);
 
 
 /**
@@ -521,7 +517,7 @@ GNUNET_HELLO_extract_address (const void *raw,
  * @return NULL if the address is mal-formed, otherwise the prefix
  */
 char *
-GNUNET_HELLO_address_to_prefix (const char *address);
+GNUNET_HELLO_address_to_prefix(const char *address);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index 5a34daf78..e6b3ae535 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Philipp Toelke
@@ -74,12 +74,12 @@ typedef void
  * @return the new Handle, NULL on error
  */
 struct GNUNET_HELPER_Handle *
-GNUNET_HELPER_start (int with_control_pipe,
-                     const char *binary_name,
-                     char *const binary_argv[],
-                     GNUNET_MessageTokenizerCallback cb,
-                     GNUNET_HELPER_ExceptionCallback exp_cb,
-                     void *cb_cls);
+GNUNET_HELPER_start(int with_control_pipe,
+                    const char *binary_name,
+                    char *const binary_argv[],
+                    GNUNET_MessageTokenizerCallback cb,
+                    GNUNET_HELPER_ExceptionCallback exp_cb,
+                    void *cb_cls);
 
 
 /**
@@ -92,7 +92,7 @@ GNUNET_HELPER_start (int with_control_pipe,
  * @return #GNUNET_OK on success; #GNUNET_SYSERR on error
  */
 int
-GNUNET_HELPER_kill (struct GNUNET_HELPER_Handle *h, int soft_kill);
+GNUNET_HELPER_kill(struct GNUNET_HELPER_Handle *h, int soft_kill);
 
 
 /**
@@ -104,7 +104,7 @@ GNUNET_HELPER_kill (struct GNUNET_HELPER_Handle *h, int soft_kill);
  * @return #GNUNET_OK on success; #GNUNET_SYSERR on error
  */
 int
-GNUNET_HELPER_wait (struct GNUNET_HELPER_Handle *h);
+GNUNET_HELPER_wait(struct GNUNET_HELPER_Handle *h);
 
 
 /**
@@ -113,7 +113,7 @@ GNUNET_HELPER_wait (struct GNUNET_HELPER_Handle *h);
  * @param h the helper handle to free
  */
 void
-GNUNET_HELPER_destroy (struct GNUNET_HELPER_Handle *h);
+GNUNET_HELPER_destroy(struct GNUNET_HELPER_Handle *h);
 
 
 /**
@@ -125,7 +125,7 @@ GNUNET_HELPER_destroy (struct GNUNET_HELPER_Handle *h);
  *          stdin; #GNUNET_NO to signal termination by sending SIGTERM to helper
  */
 void
-GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h, int soft_kill);
+GNUNET_HELPER_stop(struct GNUNET_HELPER_Handle *h, int soft_kill);
 
 
 /**
@@ -137,7 +137,7 @@ GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h, int soft_kill);
  *               #GNUNET_SYSERR during GNUNET_HELPER_destroy
  */
 typedef void (*GNUNET_HELPER_Continuation)(void *cls,
-                                           int result);
+                                           int result);
 
 
 /**
@@ -160,11 +160,11 @@ struct GNUNET_HELPER_SendHandle;
  *         not be abortable)
  */
 struct GNUNET_HELPER_SendHandle *
-GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
-                    const struct GNUNET_MessageHeader *msg,
-                    int can_drop,
-                    GNUNET_HELPER_Continuation cont,
-                    void *cont_cls);
+GNUNET_HELPER_send(struct GNUNET_HELPER_Handle *h,
+                   const struct GNUNET_MessageHeader *msg,
+                   int can_drop,
+                   GNUNET_HELPER_Continuation cont,
+                   void *cont_cls);
 
 
 /**
@@ -174,7 +174,7 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
  * @param sh operation to cancel
  */
 void
-GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh);
+GNUNET_HELPER_send_cancel(struct GNUNET_HELPER_SendHandle *sh);
 
 
 #endif
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index 52ed1e908..8a77e76e0 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -80,7 +80,7 @@ struct GNUNET_IDENTITY_Operation;
  * @return associated ECC key, valid as long as the ego is valid
  */
 const struct GNUNET_CRYPTO_EcdsaPrivateKey *
-GNUNET_IDENTITY_ego_get_private_key (const struct GNUNET_IDENTITY_Ego *ego);
+GNUNET_IDENTITY_ego_get_private_key(const struct GNUNET_IDENTITY_Ego *ego);
 
 
 /**
@@ -89,7 +89,7 @@ GNUNET_IDENTITY_ego_get_private_key (const struct GNUNET_IDENTITY_Ego *ego);
  * @return handle for the anonymous user, must not be freed
  */
 const struct GNUNET_IDENTITY_Ego *
-GNUNET_IDENTITY_ego_get_anonymous (void);
+GNUNET_IDENTITY_ego_get_anonymous(void);
 
 
 /**
@@ -99,8 +99,8 @@ GNUNET_IDENTITY_ego_get_anonymous (void);
  * @param pk set to ego's public key
  */
 void
-GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego,
-                                    struct GNUNET_CRYPTO_EcdsaPublicKey *pk);
+GNUNET_IDENTITY_ego_get_public_key(const struct GNUNET_IDENTITY_Ego *ego,
+                                   struct GNUNET_CRYPTO_EcdsaPublicKey *pk);
 
 
 /**
@@ -152,9 +152,9 @@ typedef void (*GNUNET_IDENTITY_Callback) (void *cls,
  * @return handle to communicate with identity service
  */
 struct GNUNET_IDENTITY_Handle *
-GNUNET_IDENTITY_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         GNUNET_IDENTITY_Callback cb,
-                         void *cb_cls);
+GNUNET_IDENTITY_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                        GNUNET_IDENTITY_Callback cb,
+                        void *cb_cls);
 
 
 /**
@@ -167,10 +167,10 @@ GNUNET_IDENTITY_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_get (struct GNUNET_IDENTITY_Handle *id,
-                     const char *service_name,
-                     GNUNET_IDENTITY_Callback cb,
-                     void *cb_cls);
+GNUNET_IDENTITY_get(struct GNUNET_IDENTITY_Handle *id,
+                    const char *service_name,
+                    GNUNET_IDENTITY_Callback cb,
+                    void *cb_cls);
 
 
 /**
@@ -194,11 +194,11 @@ typedef void (*GNUNET_IDENTITY_Continuation) (void *cls, const char *emsg);
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
-                     const char *service_name,
-                     struct GNUNET_IDENTITY_Ego *ego,
-                     GNUNET_IDENTITY_Continuation cont,
-                     void *cont_cls);
+GNUNET_IDENTITY_set(struct GNUNET_IDENTITY_Handle *id,
+                    const char *service_name,
+                    struct GNUNET_IDENTITY_Ego *ego,
+                    GNUNET_IDENTITY_Continuation cont,
+                    void *cont_cls);
 
 
 /**
@@ -207,7 +207,7 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id,
  * @param h identity service to disconnect
  */
 void
-GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h);
+GNUNET_IDENTITY_disconnect(struct GNUNET_IDENTITY_Handle *h);
 
 
 /**
@@ -234,10 +234,10 @@ typedef void (*GNUNET_IDENTITY_CreateContinuation) (
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
-                        const char *name,
-                        GNUNET_IDENTITY_CreateContinuation cont,
-                        void *cont_cls);
+GNUNET_IDENTITY_create(struct GNUNET_IDENTITY_Handle *id,
+                       const char *name,
+                       GNUNET_IDENTITY_CreateContinuation cont,
+                       void *cont_cls);
 
 
 /**
@@ -251,11 +251,11 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id,
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id,
-                        const char *old_name,
-                        const char *new_name,
-                        GNUNET_IDENTITY_Continuation cb,
-                        void *cb_cls);
+GNUNET_IDENTITY_rename(struct GNUNET_IDENTITY_Handle *id,
+                       const char *old_name,
+                       const char *new_name,
+                       GNUNET_IDENTITY_Continuation cb,
+                       void *cb_cls);
 
 
 /**
@@ -268,10 +268,10 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id,
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_Operation *
-GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id,
-                        const char *name,
-                        GNUNET_IDENTITY_Continuation cb,
-                        void *cb_cls);
+GNUNET_IDENTITY_delete(struct GNUNET_IDENTITY_Handle *id,
+                       const char *name,
+                       GNUNET_IDENTITY_Continuation cb,
+                       void *cb_cls);
 
 
 /**
@@ -283,7 +283,7 @@ GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id,
  * @param op operation to cancel
  */
 void
-GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op);
+GNUNET_IDENTITY_cancel(struct GNUNET_IDENTITY_Operation *op);
 
 
 /* ************* convenience API to lookup an ego ***************** */
@@ -314,10 +314,10 @@ struct GNUNET_IDENTITY_EgoLookup;
  * @return NULL on error
  */
 struct GNUNET_IDENTITY_EgoLookup *
-GNUNET_IDENTITY_ego_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *name,
-                            GNUNET_IDENTITY_EgoCallback cb,
-                            void *cb_cls);
+GNUNET_IDENTITY_ego_lookup(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           const char *name,
+                           GNUNET_IDENTITY_EgoCallback cb,
+                           void *cb_cls);
 
 
 /**
@@ -326,7 +326,7 @@ GNUNET_IDENTITY_ego_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param el handle for lookup to abort
  */
 void
-GNUNET_IDENTITY_ego_lookup_cancel (struct GNUNET_IDENTITY_EgoLookup *el);
+GNUNET_IDENTITY_ego_lookup_cancel(struct GNUNET_IDENTITY_EgoLookup *el);
 
 /**
  * Function called with the result.
@@ -360,10 +360,10 @@ struct GNUNET_IDENTITY_EgoSuffixLookup;
  * @return handle to abort the operation
  */
 struct GNUNET_IDENTITY_EgoSuffixLookup *
-GNUNET_IDENTITY_ego_lookup_by_suffix (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                      const char *suffix,
-                                      GNUNET_IDENTITY_EgoSuffixCallback cb,
-                                      void *cb_cls);
+GNUNET_IDENTITY_ego_lookup_by_suffix(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                     const char *suffix,
+                                     GNUNET_IDENTITY_EgoSuffixCallback cb,
+                                     void *cb_cls);
 
 
 /**
@@ -372,7 +372,7 @@ GNUNET_IDENTITY_ego_lookup_by_suffix (const struct GNUNET_CONFIGURATION_Handle *
  * @param el handle for lookup to abort
  */
 void
-GNUNET_IDENTITY_ego_lookup_by_suffix_cancel (struct GNUNET_IDENTITY_EgoSuffixLookup *el);
+GNUNET_IDENTITY_ego_lookup_by_suffix_cancel(struct GNUNET_IDENTITY_EgoSuffixLookup *el);
 
 #if 0 /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index bba994d03..3ca4bf729 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+   This file is part of GNUnet
+   Copyright (C) 2014, 2015, 2016 GNUnet e.V.
 
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file gnunet_json_lib.h
  * @brief functions to parse JSON objects into GNUnet objects
@@ -67,8 +67,7 @@ typedef void (*GNUNET_JSON_Cleaner) (void *cls,
 /**
  * @brief Entry in parser specification for #GNUNET_JSON_parse().
  */
-struct GNUNET_JSON_Specification
-{
+struct GNUNET_JSON_Specification {
   /**
    * Function for how to parse this type of entry.
    */
@@ -126,10 +125,10 @@ struct GNUNET_JSON_Specification
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_JSON_parse (const json_t *root,
-                   struct GNUNET_JSON_Specification *spec,
-                   const char **error_json_name,
-                   unsigned int *error_line);
+GNUNET_JSON_parse(const json_t *root,
+                  struct GNUNET_JSON_Specification *spec,
+                  const char **error_json_name,
+                  unsigned int *error_line);
 
 
 /**
@@ -139,7 +138,7 @@ GNUNET_JSON_parse (const json_t *root,
  * @param spec specification of the parse operation
  */
 void
-GNUNET_JSON_parse_free (struct GNUNET_JSON_Specification *spec);
+GNUNET_JSON_parse_free(struct GNUNET_JSON_Specification *spec);
 
 
 /* ****************** Canonical parser specifications ******************* */
@@ -149,7 +148,7 @@ GNUNET_JSON_parse_free (struct GNUNET_JSON_Specification *spec);
  * End of a parser specification.
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_end (void);
+GNUNET_JSON_spec_end(void);
 
 
 /**
@@ -159,7 +158,7 @@ GNUNET_JSON_spec_end (void);
  * @return spec copy of @a spec with optional bit set
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_mark_optional (struct GNUNET_JSON_Specification spec);
+GNUNET_JSON_spec_mark_optional(struct GNUNET_JSON_Specification spec);
 
 
 /**
@@ -171,7 +170,7 @@ GNUNET_JSON_spec_mark_optional (struct GNUNET_JSON_Specification spec);
  * @param size number of bytes expected in @a obj
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size);
+GNUNET_JSON_spec_fixed(const char *name, void *obj, size_t size);
 
 
 /**
@@ -182,7 +181,7 @@ GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size);
  * @param obj pointer where to write the data (type of `*obj` will determine size)
  */
 #define GNUNET_JSON_spec_fixed_auto(name, obj) \
-  GNUNET_JSON_spec_fixed (name, obj, sizeof (*obj))
+  GNUNET_JSON_spec_fixed(name, obj, sizeof(*obj))
 
 
 /**
@@ -194,7 +193,7 @@ GNUNET_JSON_spec_fixed (const char *name, void *obj, size_t size);
  * @param[out] size where to store the number of bytes allocated for @a obj
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_varsize (const char *name, void **obj, size_t *size);
+GNUNET_JSON_spec_varsize(const char *name, void **obj, size_t *size);
 
 
 /**
@@ -204,7 +203,7 @@ GNUNET_JSON_spec_varsize (const char *name, void **obj, size_t *size);
  * @param strptr where to store a pointer to the field
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_string (const char *name, const char **strptr);
+GNUNET_JSON_spec_string(const char *name, const char **strptr);
 
 /**
  * JSON object.
@@ -213,7 +212,7 @@ GNUNET_JSON_spec_string (const char *name, const char **strptr);
  * @param[out] jsonp where to store the JSON found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_json (const char *name, json_t **jsonp);
+GNUNET_JSON_spec_json(const char *name, json_t **jsonp);
 
 
 /**
@@ -223,7 +222,7 @@ GNUNET_JSON_spec_json (const char *name, json_t **jsonp);
  * @param[out] u8 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint8 (const char *name, uint8_t *u8);
+GNUNET_JSON_spec_uint8(const char *name, uint8_t *u8);
 
 
 /**
@@ -233,7 +232,7 @@ GNUNET_JSON_spec_uint8 (const char *name, uint8_t *u8);
  * @param[out] u16 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint16 (const char *name, uint16_t *u16);
+GNUNET_JSON_spec_uint16(const char *name, uint16_t *u16);
 
 
 /**
@@ -243,7 +242,7 @@ GNUNET_JSON_spec_uint16 (const char *name, uint16_t *u16);
  * @param[out] u32 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint32 (const char *name, uint32_t *u32);
+GNUNET_JSON_spec_uint32(const char *name, uint32_t *u32);
 
 
 /**
@@ -253,7 +252,7 @@ GNUNET_JSON_spec_uint32 (const char *name, uint32_t *u32);
  * @param[out] u64 where to store the integer found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_uint64 (const char *name, uint64_t *u64);
+GNUNET_JSON_spec_uint64(const char *name, uint64_t *u64);
 
 
 /**
@@ -263,7 +262,7 @@ GNUNET_JSON_spec_uint64 (const char *name, uint64_t *u64);
  * @param[out] boolean where to store the boolean found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_boolean (const char *name, int *boolean);
+GNUNET_JSON_spec_boolean(const char *name, int *boolean);
 
 
 /* ************ GNUnet-specific parser specifications ******************* */
@@ -275,8 +274,8 @@ GNUNET_JSON_spec_boolean (const char *name, int *boolean);
  * @param[out] at where to store the absolute time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_absolute_time (const char *name,
-                                struct GNUNET_TIME_Absolute *at);
+GNUNET_JSON_spec_absolute_time(const char *name,
+                               struct GNUNET_TIME_Absolute *at);
 
 
 /**
@@ -286,8 +285,8 @@ GNUNET_JSON_spec_absolute_time (const char *name,
  * @param[out] at where to store the absolute time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_absolute_time_nbo (const char *name,
-                                    struct GNUNET_TIME_AbsoluteNBO *at);
+GNUNET_JSON_spec_absolute_time_nbo(const char *name,
+                                   struct GNUNET_TIME_AbsoluteNBO *at);
 
 
 /**
@@ -297,8 +296,8 @@ GNUNET_JSON_spec_absolute_time_nbo (const char *name,
  * @param[out] rt where to store the relative time found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_relative_time (const char *name,
-                                struct GNUNET_TIME_Relative *rt);
+GNUNET_JSON_spec_relative_time(const char *name,
+                               struct GNUNET_TIME_Relative *rt);
 
 
 /**
@@ -308,8 +307,8 @@ GNUNET_JSON_spec_relative_time (const char *name,
  * @param pk where to store the RSA key found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_rsa_public_key (const char *name,
-                                 struct GNUNET_CRYPTO_RsaPublicKey **pk);
+GNUNET_JSON_spec_rsa_public_key(const char *name,
+                                struct GNUNET_CRYPTO_RsaPublicKey **pk);
 
 
 /**
@@ -319,8 +318,8 @@ GNUNET_JSON_spec_rsa_public_key (const char *name,
  * @param sig where to store the RSA signature found under @a name
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_rsa_signature (const char *name,
-                                struct GNUNET_CRYPTO_RsaSignature **sig);
+GNUNET_JSON_spec_rsa_signature(const char *name,
+                               struct GNUNET_CRYPTO_RsaSignature **sig);
 
 
 /**
@@ -330,9 +329,9 @@ GNUNET_JSON_spec_rsa_signature (const char *name,
  * @return JSON Specification
  */
 struct GNUNET_JSON_Specification
-GNUNET_JSON_spec_gnsrecord (struct GNUNET_GNSRECORD_Data **rd,
-                            unsigned int *rd_count,
-                            char **name);
+GNUNET_JSON_spec_gnsrecord(struct GNUNET_GNSRECORD_Data **rd,
+                           unsigned int *rd_count,
+                           char **name);
 
 
 /* ****************** Generic generator interface ******************* */
@@ -347,7 +346,7 @@ GNUNET_JSON_spec_gnsrecord (struct GNUNET_GNSRECORD_Data **rd,
  * @return json string that encodes @a data
  */
 json_t *
-GNUNET_JSON_from_data (const void *data, size_t size);
+GNUNET_JSON_from_data(const void *data, size_t size);
 
 
 /**
@@ -358,7 +357,7 @@ GNUNET_JSON_from_data (const void *data, size_t size);
  * @return json string that encodes @a data
  */
 #define GNUNET_JSON_from_data_auto(ptr) \
-  GNUNET_JSON_from_data (ptr, sizeof (*ptr))
+  GNUNET_JSON_from_data(ptr, sizeof(*ptr))
 
 
 /**
@@ -368,7 +367,7 @@ GNUNET_JSON_from_data (const void *data, size_t size);
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_abs (struct GNUNET_TIME_Absolute stamp);
+GNUNET_JSON_from_time_abs(struct GNUNET_TIME_Absolute stamp);
 
 
 /**
@@ -378,7 +377,7 @@ GNUNET_JSON_from_time_abs (struct GNUNET_TIME_Absolute stamp);
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_abs_nbo (struct GNUNET_TIME_AbsoluteNBO stamp);
+GNUNET_JSON_from_time_abs_nbo(struct GNUNET_TIME_AbsoluteNBO stamp);
 
 
 /**
@@ -388,7 +387,7 @@ GNUNET_JSON_from_time_abs_nbo (struct GNUNET_TIME_AbsoluteNBO stamp);
  * @return a json string with the timestamp in @a stamp
  */
 json_t *
-GNUNET_JSON_from_time_rel (struct GNUNET_TIME_Relative stamp);
+GNUNET_JSON_from_time_rel(struct GNUNET_TIME_Relative stamp);
 
 
 /**
@@ -398,7 +397,7 @@ GNUNET_JSON_from_time_rel (struct GNUNET_TIME_Relative stamp);
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *pk);
+GNUNET_JSON_from_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *pk);
 
 
 /**
@@ -408,7 +407,7 @@ GNUNET_JSON_from_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *pk);
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig);
+GNUNET_JSON_from_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *sig);
 
 /**
  * Convert Gns record to JSON.
@@ -418,17 +417,16 @@ GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *sig);
  * @return corresponding JSON encoding
  */
 json_t *
-GNUNET_JSON_from_gnsrecord (const char *rname,
-                            const struct GNUNET_GNSRECORD_Data *rd,
-                            unsigned int rd_count);
+GNUNET_JSON_from_gnsrecord(const char *rname,
+                           const struct GNUNET_GNSRECORD_Data *rd,
+                           unsigned int rd_count);
 
 /* ******************* Helpers for MHD upload handling ******************* */
 
 /**
  * Return codes from #GNUNET_JSON_post_parser().
  */
-enum GNUNET_JSON_PostResult
-{
+enum GNUNET_JSON_PostResult {
   /**
    * Parsing successful, JSON result is in `*json`.
    */
@@ -472,12 +470,12 @@ enum GNUNET_JSON_PostResult
  * @return result code indicating the status of the operation
  */
 enum GNUNET_JSON_PostResult
-GNUNET_JSON_post_parser (size_t buffer_max,
-                         struct MHD_Connection *connection,
-                         void **con_cls,
-                         const char *upload_data,
-                         size_t *upload_data_size,
-                         json_t **json);
+GNUNET_JSON_post_parser(size_t buffer_max,
+                        struct MHD_Connection *connection,
+                        void **con_cls,
+                        const char *upload_data,
+                        size_t *upload_data_size,
+                        json_t **json);
 
 
 /**
@@ -488,7 +486,7 @@ GNUNET_JSON_post_parser (size_t buffer_max,
  *        #GNUNET_JSON_post_parser(), to be cleaned up
  */
 void
-GNUNET_JSON_post_parser_cleanup (void *con_cls);
+GNUNET_JSON_post_parser_cleanup(void *con_cls);
 
 
 /* ****************** GETOPT JSON helper ******************* */
@@ -504,11 +502,11 @@ GNUNET_JSON_post_parser_cleanup (void *con_cls);
  * @param[out] val set to the JSON specified at the command line
  */
 struct GNUNET_GETOPT_CommandLineOption
-GNUNET_JSON_getopt (char shortName,
-                    const char *name,
-                    const char *argumentHelp,
-                    const char *description,
-                    json_t **json);
+GNUNET_JSON_getopt(char shortName,
+                   const char *name,
+                   const char *argumentHelp,
+                   const char *description,
+                   json_t **json);
 
 #endif
 
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index f38b66b88..1e786181f 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -57,7 +57,7 @@ struct GNUNET_LOAD_Value;
  * @return the new load value
  */
 struct GNUNET_LOAD_Value *
-GNUNET_LOAD_value_init (struct GNUNET_TIME_Relative autodecline);
+GNUNET_LOAD_value_init(struct GNUNET_TIME_Relative autodecline);
 
 
 /**
@@ -67,8 +67,8 @@ GNUNET_LOAD_value_init (struct GNUNET_TIME_Relative autodecline);
  * @param autodecline frequency of load decline
  */
 void
-GNUNET_LOAD_value_set_decline (struct GNUNET_LOAD_Value *load,
-                               struct GNUNET_TIME_Relative autodecline);
+GNUNET_LOAD_value_set_decline(struct GNUNET_LOAD_Value *load,
+                              struct GNUNET_TIME_Relative autodecline);
 
 
 /**
@@ -76,7 +76,7 @@ GNUNET_LOAD_value_set_decline (struct GNUNET_LOAD_Value *load,
  *
  * @param lv value to free
  */
-#define GNUNET_LOAD_value_free(lv) GNUNET_free (lv)
+#define GNUNET_LOAD_value_free(lv) GNUNET_free(lv)
 
 
 /**
@@ -89,7 +89,7 @@ GNUNET_LOAD_value_set_decline (struct GNUNET_LOAD_Value *load,
  *         that we could not do proper calculations
  */
 double
-GNUNET_LOAD_get_load (struct GNUNET_LOAD_Value *load);
+GNUNET_LOAD_get_load(struct GNUNET_LOAD_Value *load);
 
 
 /**
@@ -99,7 +99,7 @@ GNUNET_LOAD_get_load (struct GNUNET_LOAD_Value *load);
  * @return zero if update was never called
  */
 double
-GNUNET_LOAD_get_average (struct GNUNET_LOAD_Value *load);
+GNUNET_LOAD_get_average(struct GNUNET_LOAD_Value *load);
 
 
 /**
@@ -109,7 +109,7 @@ GNUNET_LOAD_get_average (struct GNUNET_LOAD_Value *load);
  * @param data latest measurement value (for example, delay)
  */
 void
-GNUNET_LOAD_update (struct GNUNET_LOAD_Value *load, uint64_t data);
+GNUNET_LOAD_update(struct GNUNET_LOAD_Value *load, uint64_t data);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index 46e5bfa25..f5cf4abc6 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -1,19 +1,19 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2013 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2013 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -36,7 +36,7 @@
 #ifdef __cplusplus
 extern "C"
 {
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -51,8 +51,8 @@ extern "C"
  * @param data audio data to play
  */
 typedef void (*GNUNET_MICROPHONE_RecordedDataCallback)(void *cls,
-                                                       size_t data_size,
-                                                       const void *data);
+                                                       size_t data_size,
+                                                       const void *data);
 
 /**
  * Enable a microphone.
@@ -63,8 +63,8 @@ typedef void (*GNUNET_MICROPHONE_RecordedDataCallback)(void *cls,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 typedef int (*GNUNET_MICROPHONE_EnableCallback)(void *cls,
-                                                GNUNET_MICROPHONE_RecordedDataCallback rdc,
-                                                void *rdc_cls);
+                                                GNUNET_MICROPHONE_RecordedDataCallback rdc,
+                                                void *rdc_cls);
 
 /**
  * Function that disables a microphone.
@@ -84,9 +84,7 @@ typedef void (*GNUNET_MICROPHONE_DestroyCallback)(void *cls);
 /**
  * A microphone is a device that can capture or otherwise produce audio data.
  */
-struct GNUNET_MICROPHONE_Handle
-{
-
+struct GNUNET_MICROPHONE_Handle {
   /**
    * Turn on the microphone.
    */
@@ -106,7 +104,6 @@ struct GNUNET_MICROPHONE_Handle
    * Closure for the callbacks.
    */
   void *cls;
-
 };
 
 
@@ -118,7 +115,7 @@ struct GNUNET_MICROPHONE_Handle
  * @return NULL on error
  */
 struct GNUNET_MICROPHONE_Handle *
-GNUNET_MICROPHONE_create_from_hardware (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_MICROPHONE_create_from_hardware(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -127,10 +124,10 @@ GNUNET_MICROPHONE_create_from_hardware (const struct GNUNET_CONFIGURATION_Handle
  * @param microphone microphone to destroy
  */
 void
-GNUNET_MICROPHONE_destroy (struct GNUNET_MICROPHONE_Handle *microphone);
+GNUNET_MICROPHONE_destroy(struct GNUNET_MICROPHONE_Handle *microphone);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index f3073d54b..1839a68bd 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Florian Dold
@@ -50,9 +50,9 @@
  * @return the MQ message
  */
 #define GNUNET_MQ_msg_extra(mvar, esize, type)                \
-  GNUNET_MQ_msg_ (((struct GNUNET_MessageHeader **) &(mvar)), \
-                  (esize) + sizeof *(mvar),                   \
-                  (type))
+  GNUNET_MQ_msg_(((struct GNUNET_MessageHeader **)&(mvar)), \
+                 (esize) + sizeof *(mvar),                   \
+                 (type))
 
 /**
  * Allocate a GNUNET_MQ_Envelope.
@@ -64,7 +64,7 @@
  * @param type type of the message
  * @return the allocated envelope
  */
-#define GNUNET_MQ_msg(mvar, type) GNUNET_MQ_msg_extra (mvar, 0, type)
+#define GNUNET_MQ_msg(mvar, type) GNUNET_MQ_msg_extra(mvar, 0, type)
 
 
 /**
@@ -74,7 +74,7 @@
  * @param type type of the message
  */
 #define GNUNET_MQ_msg_header(type) \
-  GNUNET_MQ_msg_ (NULL, sizeof (struct GNUNET_MessageHeader), type)
+  GNUNET_MQ_msg_(NULL, sizeof(struct GNUNET_MessageHeader), type)
 
 
 /**
@@ -86,7 +86,7 @@
  * @param type type of the message
  */
 #define GNUNET_MQ_msg_header_extra(mh, esize, type) \
-  GNUNET_MQ_msg_ (&mh, (esize) + sizeof (struct GNUNET_MessageHeader), type)
+  GNUNET_MQ_msg_(&mh, (esize) + sizeof(struct GNUNET_MessageHeader), type)
 
 
 /**
@@ -102,11 +102,11 @@
 #define GNUNET_MQ_msg_nested_mh(mvar, type, mh)                               \
   ({                                                                          \
     struct GNUNET_MQ_Envelope *_ev;                                           \
-    _ev = GNUNET_MQ_msg_nested_mh_ ((struct GNUNET_MessageHeader **) &(mvar), \
-                                    sizeof (*(mvar)),                         \
-                                    (type),                                   \
-                                    (mh));                                    \
-    (void) (mvar)->header; /* type check */                                   \
+    _ev = GNUNET_MQ_msg_nested_mh_((struct GNUNET_MessageHeader **)&(mvar), \
+                                   sizeof(*(mvar)),                         \
+                                   (type),                                   \
+                                   (mh));                                    \
+    (void)(mvar)->header;  /* type check */                                   \
     _ev;                                                                      \
   })
 
@@ -120,8 +120,8 @@
  *         or NULL if the given message in @a var does not have any space after the message struct
  */
 #define GNUNET_MQ_extract_nested_mh(var)                               \
-  GNUNET_MQ_extract_nested_mh_ ((struct GNUNET_MessageHeader *) (var), \
-                                sizeof (*(var)))
+  GNUNET_MQ_extract_nested_mh_((struct GNUNET_MessageHeader *)(var), \
+                               sizeof(*(var)))
 
 
 /**
@@ -133,8 +133,8 @@
  *         OR NULL in case of a malformed message.
  */
 const struct GNUNET_MessageHeader *
-GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh,
-                              uint16_t base_size);
+GNUNET_MQ_extract_nested_mh_(const struct GNUNET_MessageHeader *mh,
+                             uint16_t base_size);
 
 
 /**
@@ -150,7 +150,7 @@ struct GNUNET_MQ_Envelope;
  * @return message contained in the envelope
  */
 const struct GNUNET_MessageHeader *
-GNUNET_MQ_env_get_msg (const struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_env_get_msg(const struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -160,7 +160,7 @@ GNUNET_MQ_env_get_msg (const struct GNUNET_MQ_Envelope *env);
  * @return next one, or NULL
  */
 const struct GNUNET_MQ_Envelope *
-GNUNET_MQ_env_next (const struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_env_next(const struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -173,10 +173,10 @@ GNUNET_MQ_env_next (const struct GNUNET_MQ_Envelope *env);
  * @param nested_mh the message to append to the message after base_size
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_msg_nested_mh_ (struct GNUNET_MessageHeader **mhp,
-                          uint16_t base_size,
-                          uint16_t type,
-                          const struct GNUNET_MessageHeader *nested_mh);
+GNUNET_MQ_msg_nested_mh_(struct GNUNET_MessageHeader **mhp,
+                         uint16_t base_size,
+                         uint16_t type,
+                         const struct GNUNET_MessageHeader *nested_mh);
 
 
 /**
@@ -188,8 +188,7 @@ struct GNUNET_MQ_Handle;
 /**
  * Error codes for the queue.
  */
-enum GNUNET_MQ_Error
-{
+enum GNUNET_MQ_Error {
   /**
    * Failed to read message from the network.
    * FIXME: Likely not properly distinguished
@@ -224,9 +223,7 @@ enum GNUNET_MQ_Error
 /**
  * Per envelope preferences and priorities.
  */
-enum GNUNET_MQ_PriorityPreferences
-{
-
+enum GNUNET_MQ_PriorityPreferences {
   /**
    * Lowest priority, i.e. background traffic (i.e. NSE, FS).
    * This is the default!
@@ -297,7 +294,6 @@ enum GNUNET_MQ_PriorityPreferences
    * Flag to indicate that out-of-order delivery is OK.
    */
   GNUNET_MQ_PREF_OUT_OF_ORDER = 256,
-
 };
 
 
@@ -386,9 +382,9 @@ typedef void (*GNUNET_MQ_ErrorHandler) (void *cls, enum GNUNET_MQ_Error error);
  * @param[in|out] env element to insert at the tail
  */
 void
-GNUNET_MQ_dll_insert_head (struct GNUNET_MQ_Envelope **env_head,
-                           struct GNUNET_MQ_Envelope **env_tail,
-                           struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_dll_insert_head(struct GNUNET_MQ_Envelope **env_head,
+                          struct GNUNET_MQ_Envelope **env_tail,
+                          struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -404,9 +400,9 @@ GNUNET_MQ_dll_insert_head (struct GNUNET_MQ_Envelope **env_head,
  * @param[in|out] env element to insert at the tail
  */
 void
-GNUNET_MQ_dll_insert_tail (struct GNUNET_MQ_Envelope **env_head,
-                           struct GNUNET_MQ_Envelope **env_tail,
-                           struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_dll_insert_tail(struct GNUNET_MQ_Envelope **env_head,
+                          struct GNUNET_MQ_Envelope **env_tail,
+                          struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -422,9 +418,9 @@ GNUNET_MQ_dll_insert_tail (struct GNUNET_MQ_Envelope **env_head,
  * @param[in|out] env element to remove from the DLL
  */
 void
-GNUNET_MQ_dll_remove (struct GNUNET_MQ_Envelope **env_head,
-                      struct GNUNET_MQ_Envelope **env_tail,
-                      struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_dll_remove(struct GNUNET_MQ_Envelope **env_head,
+                     struct GNUNET_MQ_Envelope **env_tail,
+                     struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -438,7 +434,7 @@ GNUNET_MQ_dll_remove (struct GNUNET_MQ_Envelope **env_head,
  *         Needs to be freed with #GNUNET_free.
  */
 struct GNUNET_MQ_MessageHandler *
-GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_MQ_copy_handlers(const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -454,9 +450,9 @@ GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers);
  *         Needs to be freed with #GNUNET_free.
  */
 struct GNUNET_MQ_MessageHandler *
-GNUNET_MQ_copy_handlers2 (const struct GNUNET_MQ_MessageHandler *handlers,
-                          GNUNET_MQ_MessageCallback agpl_handler,
-                          void *agpl_cls);
+GNUNET_MQ_copy_handlers2(const struct GNUNET_MQ_MessageHandler *handlers,
+                         GNUNET_MQ_MessageCallback agpl_handler,
+                         void *agpl_cls);
 
 
 /**
@@ -466,14 +462,13 @@ GNUNET_MQ_copy_handlers2 (const struct GNUNET_MQ_MessageHandler *handlers,
  * @return The number of handlers in the array.
  */
 unsigned int
-GNUNET_MQ_count_handlers (const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_MQ_count_handlers(const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
  * Message handler for a specific message type.
  */
-struct GNUNET_MQ_MessageHandler
-{
+struct GNUNET_MQ_MessageHandler {
   /**
    * Callback to validate a message of the specified @e type.
    * The closure given to @e mv will be this struct (not @e ctx).
@@ -549,12 +544,12 @@ struct GNUNET_MQ_MessageHandler
  */
 #define GNUNET_MQ_hd_fixed_size(name, code, str, ctx)                   \
   ({                                                                    \
-    void (*_cb) (void *cls, const str *msg) = &handle_##name;           \
-    ((struct GNUNET_MQ_MessageHandler){NULL,                            \
-                                       (GNUNET_MQ_MessageCallback) _cb, \
-                                       (ctx),                           \
-                                       (code),                          \
-                                       sizeof (str)});                  \
+    void (*_cb)(void *cls, const str *msg) = &handle_ ## name;           \
+    ((struct GNUNET_MQ_MessageHandler){ NULL,                            \
+                                        (GNUNET_MQ_MessageCallback)_cb, \
+                                        (ctx),                           \
+                                        (code),                          \
+                                        sizeof(str) });                  \
   })
 
 
@@ -600,14 +595,14 @@ struct GNUNET_MQ_MessageHandler
  */
 #define GNUNET_MQ_hd_var_size(name, code, str, ctx)                          \
   __extension__({                                                            \
-    int (*_mv) (void *cls, const str *msg) = &check_##name;                  \
-    void (*_cb) (void *cls, const str *msg) = &handle_##name;                \
-    ((struct GNUNET_MQ_MessageHandler){(GNUNET_MQ_MessageValidationCallback) \
-                                         _mv,                                \
-                                       (GNUNET_MQ_MessageCallback) _cb,      \
-                                       (ctx),                                \
-                                       (code),                               \
-                                       sizeof (str)});                       \
+    int (*_mv)(void *cls, const str *msg) = &check_ ## name;                  \
+    void (*_cb)(void *cls, const str *msg) = &handle_ ## name;                \
+    ((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \
+                                        _mv,                                \
+                                        (GNUNET_MQ_MessageCallback)_cb,      \
+                                        (ctx),                                \
+                                        (code),                               \
+                                        sizeof(str) });                       \
   })
 
 
@@ -623,15 +618,15 @@ struct GNUNET_MQ_MessageHandler
  */
 #define GNUNET_MQ_check_zero_termination(m)                       \
   {                                                               \
-    const char *str = (const char *) &m[1];                       \
+    const char *str = (const char *)&m[1];                       \
     const struct GNUNET_MessageHeader *hdr =                      \
-      (const struct GNUNET_MessageHeader *) m;                    \
-    uint16_t slen = ntohs (hdr->size) - sizeof (*m);              \
-    if ((0 == slen) || (memchr (str, 0, slen) != &str[slen - 1])) \
-    {                                                             \
-      GNUNET_break (0);                                           \
-      return GNUNET_NO;                                           \
-    }                                                             \
+      (const struct GNUNET_MessageHeader *)m;                    \
+    uint16_t slen = ntohs(hdr->size) - sizeof(*m);              \
+    if ((0 == slen) || (memchr(str, 0, slen) != &str[slen - 1])) \
+      {                                                             \
+        GNUNET_break(0);                                           \
+        return GNUNET_NO;                                           \
+      }                                                             \
   }
 
 
@@ -650,16 +645,16 @@ struct GNUNET_MQ_MessageHandler
 #define GNUNET_MQ_check_boxed_message(m)                 \
   {                                                      \
     const struct GNUNET_MessageHeader *inbox =           \
-      (const struct GNUNET_MessageHeader *) &m[1];       \
+      (const struct GNUNET_MessageHeader *)&m[1];       \
     const struct GNUNET_MessageHeader *hdr =             \
-      (const struct GNUNET_MessageHeader *) m;           \
-    uint16_t slen = ntohs (hdr->size) - sizeof (*m);     \
-    if ((slen < sizeof (struct GNUNET_MessageHeader)) || \
-        (slen != ntohs (inbox->size)))                   \
-    {                                                    \
-      GNUNET_break (0);                                  \
-      return GNUNET_NO;                                  \
-    }                                                    \
+      (const struct GNUNET_MessageHeader *)m;           \
+    uint16_t slen = ntohs(hdr->size) - sizeof(*m);     \
+    if ((slen < sizeof(struct GNUNET_MessageHeader)) || \
+        (slen != ntohs(inbox->size)))                   \
+      {                                                    \
+        GNUNET_break(0);                                  \
+        return GNUNET_NO;                                  \
+      }                                                    \
   }
 
 
@@ -676,8 +671,8 @@ struct GNUNET_MQ_MessageHandler
  *         #GNUNET_SYSERR if message was rejected by check function
  */
 int
-GNUNET_MQ_handle_message (const struct GNUNET_MQ_MessageHandler *handlers,
-                          const struct GNUNET_MessageHeader *mh);
+GNUNET_MQ_handle_message(const struct GNUNET_MQ_MessageHandler *handlers,
+                         const struct GNUNET_MessageHeader *mh);
 
 
 /**
@@ -689,9 +684,9 @@ GNUNET_MQ_handle_message (const struct GNUNET_MQ_MessageHandler *handlers,
  * @return the allocated MQ message
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_msg_ (struct GNUNET_MessageHeader **mhp,
-                uint16_t size,
-                uint16_t type);
+GNUNET_MQ_msg_(struct GNUNET_MessageHeader **mhp,
+               uint16_t size,
+               uint16_t type);
 
 
 /**
@@ -701,7 +696,7 @@ GNUNET_MQ_msg_ (struct GNUNET_MessageHeader **mhp,
  * @return envelope containing @a hdr
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_msg_copy (const struct GNUNET_MessageHeader *hdr);
+GNUNET_MQ_msg_copy(const struct GNUNET_MessageHeader *hdr);
 
 
 /**
@@ -712,7 +707,7 @@ GNUNET_MQ_msg_copy (const struct GNUNET_MessageHeader *hdr);
  * @param mqm the message to discard
  */
 void
-GNUNET_MQ_discard (struct GNUNET_MQ_Envelope *mqm);
+GNUNET_MQ_discard(struct GNUNET_MQ_Envelope *mqm);
 
 
 /**
@@ -723,7 +718,7 @@ GNUNET_MQ_discard (struct GNUNET_MQ_Envelope *mqm);
  * @return the current envelope
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_get_current_envelope (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_get_current_envelope(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -734,7 +729,7 @@ GNUNET_MQ_get_current_envelope (struct GNUNET_MQ_Handle *mq);
  * @return copy of @a env
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_env_copy (struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_env_copy(struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -744,7 +739,7 @@ GNUNET_MQ_env_copy (struct GNUNET_MQ_Envelope *env);
  * @return the last envelope in the queue
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_get_last_envelope (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_get_last_envelope(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -756,8 +751,8 @@ GNUNET_MQ_get_last_envelope (struct GNUNET_MQ_Handle *mq);
  * @param pp priority and preferences to set for @a env
  */
 void
-GNUNET_MQ_env_set_options (struct GNUNET_MQ_Envelope *env,
-                           enum GNUNET_MQ_PriorityPreferences pp);
+GNUNET_MQ_env_set_options(struct GNUNET_MQ_Envelope *env,
+                          enum GNUNET_MQ_PriorityPreferences pp);
 
 
 /**
@@ -767,7 +762,7 @@ GNUNET_MQ_env_set_options (struct GNUNET_MQ_Envelope *env,
  * @return priority and preferences to use
  */
 enum GNUNET_MQ_PriorityPreferences
-GNUNET_MQ_env_get_options (struct GNUNET_MQ_Envelope *env);
+GNUNET_MQ_env_get_options(struct GNUNET_MQ_Envelope *env);
 
 
 /**
@@ -779,8 +774,8 @@ GNUNET_MQ_env_get_options (struct GNUNET_MQ_Envelope *env);
  * @return combined priority and preferences to use
  */
 enum GNUNET_MQ_PriorityPreferences
-GNUNET_MQ_env_combine_options (enum GNUNET_MQ_PriorityPreferences p1,
-                               enum GNUNET_MQ_PriorityPreferences p2);
+GNUNET_MQ_env_combine_options(enum GNUNET_MQ_PriorityPreferences p1,
+                              enum GNUNET_MQ_PriorityPreferences p2);
 
 
 /**
@@ -791,7 +786,7 @@ GNUNET_MQ_env_combine_options (enum GNUNET_MQ_PriorityPreferences p1,
  * @return NULL if queue is empty (or has no envelope that is not under transmission)
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_MQ_unsent_head (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_unsent_head(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -801,8 +796,8 @@ GNUNET_MQ_unsent_head (struct GNUNET_MQ_Handle *mq);
  * @param pp priority and preferences to use by default
  */
 void
-GNUNET_MQ_set_options (struct GNUNET_MQ_Handle *mq,
-                       enum GNUNET_MQ_PriorityPreferences pp);
+GNUNET_MQ_set_options(struct GNUNET_MQ_Handle *mq,
+                      enum GNUNET_MQ_PriorityPreferences pp);
 
 
 /**
@@ -812,7 +807,7 @@ GNUNET_MQ_set_options (struct GNUNET_MQ_Handle *mq,
  * @return number of queued, non-transmitted messages
  */
 unsigned int
-GNUNET_MQ_get_length (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_get_length(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -823,7 +818,7 @@ GNUNET_MQ_get_length (struct GNUNET_MQ_Handle *mq);
  * @param ev the envelope with the message to send.
  */
 void
-GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, struct GNUNET_MQ_Envelope *ev);
+GNUNET_MQ_send(struct GNUNET_MQ_Handle *mq, struct GNUNET_MQ_Envelope *ev);
 
 
 /**
@@ -834,8 +829,8 @@ GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, struct GNUNET_MQ_Envelope *ev);
  * @param ev the envelope with the message to send.
  */
 void
-GNUNET_MQ_send_copy (struct GNUNET_MQ_Handle *mq,
-                     const struct GNUNET_MQ_Envelope *ev);
+GNUNET_MQ_send_copy(struct GNUNET_MQ_Handle *mq,
+                    const struct GNUNET_MQ_Envelope *ev);
 
 
 /**
@@ -846,7 +841,7 @@ GNUNET_MQ_send_copy (struct GNUNET_MQ_Handle *mq,
  * @param ev queued envelope to cancel
  */
 void
-GNUNET_MQ_send_cancel (struct GNUNET_MQ_Envelope *ev);
+GNUNET_MQ_send_cancel(struct GNUNET_MQ_Envelope *ev);
 
 
 /**
@@ -856,7 +851,7 @@ GNUNET_MQ_send_cancel (struct GNUNET_MQ_Envelope *ev);
  * @param assoc_data to associate
  */
 uint32_t
-GNUNET_MQ_assoc_add (struct GNUNET_MQ_Handle *mq, void *assoc_data);
+GNUNET_MQ_assoc_add(struct GNUNET_MQ_Handle *mq, void *assoc_data);
 
 
 /**
@@ -867,7 +862,7 @@ GNUNET_MQ_assoc_add (struct GNUNET_MQ_Handle *mq, void *assoc_data);
  * @return the associated data
  */
 void *
-GNUNET_MQ_assoc_get (struct GNUNET_MQ_Handle *mq, uint32_t request_id);
+GNUNET_MQ_assoc_get(struct GNUNET_MQ_Handle *mq, uint32_t request_id);
 
 
 /**
@@ -878,7 +873,7 @@ GNUNET_MQ_assoc_get (struct GNUNET_MQ_Handle *mq, uint32_t request_id);
  * @return the associated data
  */
 void *
-GNUNET_MQ_assoc_remove (struct GNUNET_MQ_Handle *mq, uint32_t request_id);
+GNUNET_MQ_assoc_remove(struct GNUNET_MQ_Handle *mq, uint32_t request_id);
 
 
 /**
@@ -894,13 +889,13 @@ GNUNET_MQ_assoc_remove (struct GNUNET_MQ_Handle *mq, uint32_t request_id);
  * @return a new message queue
  */
 struct GNUNET_MQ_Handle *
-GNUNET_MQ_queue_for_callbacks (GNUNET_MQ_SendImpl send,
-                               GNUNET_MQ_DestroyImpl destroy,
-                               GNUNET_MQ_CancelImpl cancel,
-                               void *impl_state,
-                               const struct GNUNET_MQ_MessageHandler *handlers,
-                               GNUNET_MQ_ErrorHandler error_handler,
-                               void *cls);
+GNUNET_MQ_queue_for_callbacks(GNUNET_MQ_SendImpl send,
+                              GNUNET_MQ_DestroyImpl destroy,
+                              GNUNET_MQ_CancelImpl cancel,
+                              void *impl_state,
+                              const struct GNUNET_MQ_MessageHandler *handlers,
+                              GNUNET_MQ_ErrorHandler error_handler,
+                              void *cls);
 
 
 /**
@@ -911,8 +906,8 @@ GNUNET_MQ_queue_for_callbacks (GNUNET_MQ_SendImpl send,
  * @param handlers_cls new closure to use
  */
 void
-GNUNET_MQ_set_handlers_closure (struct GNUNET_MQ_Handle *mq,
-                                void *handlers_cls);
+GNUNET_MQ_set_handlers_closure(struct GNUNET_MQ_Handle *mq,
+                               void *handlers_cls);
 
 
 /**
@@ -925,9 +920,9 @@ GNUNET_MQ_set_handlers_closure (struct GNUNET_MQ_Handle *mq,
  * @param cb_cls closure for the callback
  */
 void
-GNUNET_MQ_notify_sent (struct GNUNET_MQ_Envelope *ev,
-                       GNUNET_SCHEDULER_TaskCallback cb,
-                       void *cb_cls);
+GNUNET_MQ_notify_sent(struct GNUNET_MQ_Envelope *ev,
+                      GNUNET_SCHEDULER_TaskCallback cb,
+                      void *cb_cls);
 
 
 /**
@@ -936,7 +931,7 @@ GNUNET_MQ_notify_sent (struct GNUNET_MQ_Envelope *ev,
  * @param mq message queue to destroy
  */
 void
-GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_destroy(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -956,9 +951,9 @@ struct GNUNET_MQ_DestroyNotificationHandle;
  * @return handle for #GNUNET_MQ_destroy_notify_cancel().
  */
 struct GNUNET_MQ_DestroyNotificationHandle *
-GNUNET_MQ_destroy_notify (struct GNUNET_MQ_Handle *mq,
-                          GNUNET_SCHEDULER_TaskCallback cb,
-                          void *cb_cls);
+GNUNET_MQ_destroy_notify(struct GNUNET_MQ_Handle *mq,
+                         GNUNET_SCHEDULER_TaskCallback cb,
+                         void *cb_cls);
 
 /**
  * Cancel registration from #GNUNET_MQ_destroy_notify().
@@ -966,7 +961,7 @@ GNUNET_MQ_destroy_notify (struct GNUNET_MQ_Handle *mq,
  * @param dnh handle for registration to cancel
  */
 void
-GNUNET_MQ_destroy_notify_cancel (
+GNUNET_MQ_destroy_notify_cancel(
   struct GNUNET_MQ_DestroyNotificationHandle *dnh);
 
 
@@ -981,8 +976,8 @@ GNUNET_MQ_destroy_notify_cancel (
  * @param mh message to dispatch
  */
 void
-GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq,
-                          const struct GNUNET_MessageHeader *mh);
+GNUNET_MQ_inject_message(struct GNUNET_MQ_Handle *mq,
+                         const struct GNUNET_MessageHeader *mh);
 
 
 /**
@@ -996,8 +991,8 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq,
  * @param error the error type
  */
 void
-GNUNET_MQ_inject_error (struct GNUNET_MQ_Handle *mq,
-                        enum GNUNET_MQ_Error error);
+GNUNET_MQ_inject_error(struct GNUNET_MQ_Handle *mq,
+                       enum GNUNET_MQ_Error error);
 
 
 /**
@@ -1011,7 +1006,7 @@ GNUNET_MQ_inject_error (struct GNUNET_MQ_Handle *mq,
  * @param mq message queue to send the next message with
  */
 void
-GNUNET_MQ_impl_send_continue (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_impl_send_continue(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -1025,7 +1020,7 @@ GNUNET_MQ_impl_send_continue (struct GNUNET_MQ_Handle *mq);
  * @param mq message queue to send the next message with
  */
 void
-GNUNET_MQ_impl_send_in_flight (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_impl_send_in_flight(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -1043,7 +1038,7 @@ GNUNET_MQ_impl_send_in_flight (struct GNUNET_MQ_Handle *mq);
  * @return message to send, never NULL
  */
 void *
-GNUNET_MQ_impl_state (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_impl_state(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -1056,7 +1051,7 @@ GNUNET_MQ_impl_state (struct GNUNET_MQ_Handle *mq);
  * @return message to send, never NULL
  */
 const struct GNUNET_MessageHeader *
-GNUNET_MQ_impl_current (struct GNUNET_MQ_Handle *mq);
+GNUNET_MQ_impl_current(struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -1064,9 +1059,7 @@ GNUNET_MQ_impl_current (struct GNUNET_MQ_Handle *mq);
  *
  * @deprecated will be replaced by `enum GNUNET_MQ_PriorityPreference`
  */
-enum GNUNET_MQ_PreferenceKind
-{
-
+enum GNUNET_MQ_PreferenceKind {
   /**
    * No preference was expressed.
    */
@@ -1091,10 +1084,9 @@ enum GNUNET_MQ_PreferenceKind
   GNUNET_MQ_PREFERENCE_RELIABILITY = 3
 
 /**
-   * Number of preference values allowed.
-   */
+ * Number of preference values allowed.
+ */
 #define GNUNET_MQ_PREFERENCE_COUNT 4
-
 };
 
 
@@ -1107,7 +1099,7 @@ enum GNUNET_MQ_PreferenceKind
  * @deprecated will be replaced by `enum GNUNET_MQ_PriorityPreference`
  */
 const char *
-GNUNET_MQ_preference_to_string (enum GNUNET_MQ_PreferenceKind type);
+GNUNET_MQ_preference_to_string(enum GNUNET_MQ_PreferenceKind type);
 
 
 #endif
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index b048f94bc..2956ac24f 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -78,8 +78,8 @@ typedef int
  * @return handle to tokenizer
  */
 struct GNUNET_MessageStreamTokenizer *
-GNUNET_MST_create (GNUNET_MessageTokenizerCallback cb,
-                   void *cb_cls);
+GNUNET_MST_create(GNUNET_MessageTokenizerCallback cb,
+                  void *cb_cls);
 
 
 /**
@@ -97,11 +97,11 @@ GNUNET_MST_create (GNUNET_MessageTokenizerCallback cb,
  *         #GNUNET_SYSERR if the data stream is corrupt
  */
 int
-GNUNET_MST_from_buffer (struct GNUNET_MessageStreamTokenizer *mst,
-                        const char *buf,
-                        size_t size,
-                        int purge,
-                        int one_shot);
+GNUNET_MST_from_buffer(struct GNUNET_MessageStreamTokenizer *mst,
+                       const char *buf,
+                       size_t size,
+                       int purge,
+                       int one_shot);
 
 
 /**
@@ -119,10 +119,10 @@ GNUNET_MST_from_buffer (struct GNUNET_MessageStreamTokenizer *mst,
  *         #GNUNET_SYSERR if the data stream is corrupt
  */
 int
-GNUNET_MST_read (struct GNUNET_MessageStreamTokenizer *mst,
-                 struct GNUNET_NETWORK_Handle *sock,
-                 int purge,
-                 int one_shot);
+GNUNET_MST_read(struct GNUNET_MessageStreamTokenizer *mst,
+                struct GNUNET_NETWORK_Handle *sock,
+                int purge,
+                int one_shot);
 
 
 /**
@@ -137,8 +137,8 @@ GNUNET_MST_read (struct GNUNET_MessageStreamTokenizer *mst,
  *         #GNUNET_SYSERR if the data stream is corrupt
  */
 int
-GNUNET_MST_next (struct GNUNET_MessageStreamTokenizer *mst,
-                 int one_shot);
+GNUNET_MST_next(struct GNUNET_MessageStreamTokenizer *mst,
+                int one_shot);
 
 
 /**
@@ -147,7 +147,7 @@ GNUNET_MST_next (struct GNUNET_MessageStreamTokenizer *mst,
  * @param mst tokenizer to destroy
  */
 void
-GNUNET_MST_destroy (struct GNUNET_MessageStreamTokenizer *mst);
+GNUNET_MST_destroy(struct GNUNET_MessageStreamTokenizer *mst);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index 744a646f0..1805c2795 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  * @author Christophe Genevey
@@ -62,7 +62,7 @@ struct GNUNET_MY_QueryParam;
  */
 typedef int
 (*GNUNET_MY_QueryConverter)(void *cls,
-                            const struct GNUNET_MY_QueryParam *qp,
+                            const struct GNUNET_MY_QueryParam *qp,
                             MYSQL_BIND *qbind);
 
 
@@ -74,22 +74,20 @@ typedef int
  */
 typedef void
 (*GNUNET_MY_QueryCleanup)(void *cls,
-                           MYSQL_BIND *qbind);
+                          MYSQL_BIND *qbind);
 /**
  * Information we pass to #GNUNET_MY_exec_prepared() to
  * initialize the arguments of the prepared statement.
  */
 
 
-struct GNUNET_MY_QueryParam
-{
-
+struct GNUNET_MY_QueryParam {
   /**
    * Function to call for the type conversion.
    */
   GNUNET_MY_QueryConverter conv;
 
-   /**
+  /**
    * Function to call for cleaning up the query. Can be NULL.
    */
   GNUNET_MY_QueryCleanup cleaner;
@@ -113,7 +111,6 @@ struct GNUNET_MY_QueryParam
    * Information to pass to @e conv.  Size of @a data.
    */
   unsigned long data_len;
-
 };
 
 /**
@@ -132,8 +129,8 @@ struct GNUNET_MY_QueryParam
  * @oaran ptr_size number of bytes in @a ptr
  */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_fixed_size (const void *ptr,
-                                  size_t ptr_size);
+GNUNET_MY_query_param_fixed_size(const void *ptr,
+                                 size_t ptr_size);
 
 
 /**
@@ -145,9 +142,9 @@ GNUNET_MY_query_param_fixed_size (const void *ptr,
  * @return TBD
  */
 int
-GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
-                         struct GNUNET_MYSQL_StatementHandle *sh,
-                         struct GNUNET_MY_QueryParam *params);
+GNUNET_MY_exec_prepared(struct GNUNET_MYSQL_Context *mc,
+                        struct GNUNET_MYSQL_StatementHandle *sh,
+                        struct GNUNET_MY_QueryParam *params);
 
 
 /**
@@ -194,9 +191,7 @@ typedef void
  * Information we pass to #GNUNET_MY_extract_result() to
  * initialize the arguments of the prepared statement.
  */
-struct GNUNET_MY_ResultSpec
-{
-
+struct GNUNET_MY_ResultSpec {
   /**
    * Function to call to initialize the MYSQL_BIND array.
    */
@@ -207,7 +202,7 @@ struct GNUNET_MY_ResultSpec
    */
   GNUNET_MY_ResultConverter post_conv;
 
-    /**
+  /**
    * Function to call for cleaning up the result. Can be NULL.
    */
   GNUNET_MY_ResultCleanup cleaner;
@@ -250,7 +245,6 @@ struct GNUNET_MY_ResultSpec
    * Memory for MySQL to notify us about NULL values.
    */
   my_bool is_null;
-
 };
 
 
@@ -271,88 +265,88 @@ struct GNUNET_MY_ResultSpec
  * @oaran ptr_size number of bytes available at @a ptr
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_fixed_size (void *ptr,
-                                  size_t ptr_size);
+GNUNET_MY_result_spec_fixed_size(void *ptr,
+                                 size_t ptr_size);
 
 /**
-  * Generate query parameter for a string
-  *
-  *@param ptr pointer to the string query parameter to pass
-  */
+ * Generate query parameter for a string
+ *
+ *@param ptr pointer to the string query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_string (const char *ptr);
+GNUNET_MY_query_param_string(const char *ptr);
 
 /**
-  * Generate fixed-size query parameter with size determined
-  * by variable type.
-  *
-  * @param x pointer to the query parameter to pass
-  */
-#define GNUNET_MY_query_param_auto_from_type(x) GNUNET_MY_query_param_fixed_size ((x), sizeof (*(x)))
+ * Generate fixed-size query parameter with size determined
+ * by variable type.
+ *
+ * @param x pointer to the query parameter to pass
+ */
+#define GNUNET_MY_query_param_auto_from_type(x) GNUNET_MY_query_param_fixed_size((x), sizeof(*(x)))
 
 /**
-  * Generate query parameter for an RSA public key. The
-  * database must contain a BLOB type in the respective position.
-  *
-  * @param x the query parameter to pass
-  * @return array entry for the query parameters to use
-  */
+ * Generate query parameter for an RSA public key. The
+ * database must contain a BLOB type in the respective position.
+ *
+ * @param x the query parameter to pass
+ * @return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *x);
+GNUNET_MY_query_param_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *x);
 
 /**
-  * Generate query parameter for an RSA signature. The
-  * database must contain a BLOB type in the respective position
-  *
-  *@param x the query parameter to pass
-  *@return array entry for the query parameters to use
-  */
+ * Generate query parameter for an RSA signature. The
+ * database must contain a BLOB type in the respective position
+ *
+ *@param x the query parameter to pass
+ *@return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x);
+GNUNET_MY_query_param_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *x);
 
 /**
-  * Generate query parameter for an absolute time value.
-  * The database must store a 64-bit integer.
-  *
-  *@param x pointer to the query parameter to pass
-  *@return array entry for the query parameters to use
-  */
+ * Generate query parameter for an absolute time value.
+ * The database must store a 64-bit integer.
+ *
+ *@param x pointer to the query parameter to pass
+ *@return array entry for the query parameters to use
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
+GNUNET_MY_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
 
 
 /**
-  * Generate query parameter for an absolute time value.
-  * The database must store a 64-bit integer.
-  *
-  *@param x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an absolute time value.
+ * The database must store a 64-bit integer.
+ *
+ *@param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO *x);
+GNUNET_MY_query_param_absolute_time_nbo(const struct GNUNET_TIME_AbsoluteNBO *x);
 
 /**
-  * Generate query parameter for an uint16_t in host byte order.
-  *
-  * @param x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint16_t in host byte order.
+ *
+ * @param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_uint16 (const uint16_t *x);
+GNUNET_MY_query_param_uint16(const uint16_t *x);
 
 /**
-  * Generate query parameter for an uint32_t in host byte order
-  *
-  *@param x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint32_t in host byte order
+ *
+ *@param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_uint32 (const uint32_t *x);
+GNUNET_MY_query_param_uint32(const uint32_t *x);
 
 /**
-  * Generate query parameter for an uint64_t in host byte order
-  *
-  *@param x pointer to the query parameter to pass
-  */
+ * Generate query parameter for an uint64_t in host byte order
+ *
+ *@param x pointer to the query parameter to pass
+ */
 struct GNUNET_MY_QueryParam
-GNUNET_MY_query_param_uint64 (const uint64_t *x);
+GNUNET_MY_query_param_uint64(const uint64_t *x);
 
 /**
  * We expect a fixed-size result, with size determined by the type of `* dst`
@@ -361,7 +355,7 @@ GNUNET_MY_query_param_uint64 (const uint64_t *x);
  * @spec dst point to where to store the result, type fits expected result size
  * @return array entry for the result specification to use
  */
-#define GNUNET_MY_result_spec_auto_from_type(dst) GNUNET_MY_result_spec_fixed_size ((dst), sizeof (*(dst)))
+#define GNUNET_MY_result_spec_auto_from_type(dst) GNUNET_MY_result_spec_fixed_size((dst), sizeof(*(dst)))
 
 
 /**
@@ -372,8 +366,8 @@ GNUNET_MY_query_param_uint64 (const uint64_t *x);
  * @return array entru for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_variable_size (void **dst,
-                                     size_t *ptr_size);
+GNUNET_MY_result_spec_variable_size(void **dst,
+                                    size_t *ptr_size);
 
 /**
  * RSA public key expected
@@ -383,7 +377,7 @@ GNUNET_MY_result_spec_variable_size (void **dst,
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa);
+GNUNET_MY_result_spec_rsa_public_key(struct GNUNET_CRYPTO_RsaPublicKey **rsa);
 
 
 /**
@@ -393,62 +387,62 @@ GNUNET_MY_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa);
  * @return array entry for the result specification to use
  */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig);
+GNUNET_MY_result_spec_rsa_signature(struct GNUNET_CRYPTO_RsaSignature **sig);
 
 /**
-  * 0- terminated string exprected.
-  *
-  * @param[out] dst where to store the result, allocated
-  * @return array entry for the result specification to use
-  */
+ * 0- terminated string exprected.
+ *
+ * @param[out] dst where to store the result, allocated
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_string (char **dst);
+GNUNET_MY_result_spec_string(char **dst);
 
 /**
-  * Absolute time expected
-  *
-  * @param name name of the field in the table
-  * @param[out] at where to store the result
-  * @return array entry for the result specification to use
-  */
+ * Absolute time expected
+ *
+ * @param name name of the field in the table
+ * @param[out] at where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_absolute_time (struct GNUNET_TIME_Absolute *at);
+GNUNET_MY_result_spec_absolute_time(struct GNUNET_TIME_Absolute *at);
 
 /**
-  * Absolute time in network byte order expected
-  *
-  * @param[out] at where to store the result
-  * @return array entry for the result specification to use
-  */
+ * Absolute time in network byte order expected
+ *
+ * @param[out] at where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_absolute_time_nbo (struct GNUNET_TIME_AbsoluteNBO *at);
+GNUNET_MY_result_spec_absolute_time_nbo(struct GNUNET_TIME_AbsoluteNBO *at);
 
 /**
-  * uint16_t expected
-  *
-  * @param[out] u16 where to store the result
-  * @return array entry for the result specification to use
-  */
+ * uint16_t expected
+ *
+ * @param[out] u16 where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint16 (uint16_t *u16);
+GNUNET_MY_result_spec_uint16(uint16_t *u16);
 
 /**
-  * uint32_t expected
-  *
-  * @param[out] u32 where to store the result
-  * @return array entry for the result specification to use
-  */
+ * uint32_t expected
+ *
+ * @param[out] u32 where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint32 (uint32_t *u32);
+GNUNET_MY_result_spec_uint32(uint32_t *u32);
 
 /**
-  * uint64_t expected.
-  *
-  * @param[out] u64 where to store the result
-  * @return array entry for the result specification to use
-  */
+ * uint64_t expected.
+ *
+ * @param[out] u64 where to store the result
+ * @return array entry for the result specification to use
+ */
 struct GNUNET_MY_ResultSpec
-GNUNET_MY_result_spec_uint64 (uint64_t *u64);
+GNUNET_MY_result_spec_uint64(uint64_t *u64);
 
 
 /**
@@ -463,8 +457,8 @@ GNUNET_MY_result_spec_uint64 (uint64_t *u64);
  *  #GNUNET_SYSERR if a result was invalid
  */
 int
-GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
-                          struct GNUNET_MY_ResultSpec *specs);
+GNUNET_MY_extract_result(struct GNUNET_MYSQL_StatementHandle *sh,
+                         struct GNUNET_MY_ResultSpec *specs);
 
 
 /**
@@ -475,8 +469,8 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh,
  * @param qbind mysql query
  */
 void
-GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp,
-                         MYSQL_BIND *qbind);
+GNUNET_MY_cleanup_query(struct GNUNET_MY_QueryParam *qp,
+                        MYSQL_BIND *qbind);
 
 
 /**
@@ -486,7 +480,7 @@ GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp,
  * @param rs reult specification to clean up
  */
 void
-GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs);
+GNUNET_MY_cleanup_result(struct GNUNET_MY_ResultSpec *rs);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index dbbcd2b19..0fef43a5a 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -77,8 +77,8 @@ typedef int
  * @return the mysql context
  */
 struct GNUNET_MYSQL_Context *
-GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                             const char *section);
+GNUNET_MYSQL_context_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                            const char *section);
 
 
 /**
@@ -87,7 +87,7 @@ GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param mc context to destroy
  */
 void
-GNUNET_MYSQL_context_destroy (struct GNUNET_MYSQL_Context *mc);
+GNUNET_MYSQL_context_destroy(struct GNUNET_MYSQL_Context *mc);
 
 
 /**
@@ -98,7 +98,7 @@ GNUNET_MYSQL_context_destroy (struct GNUNET_MYSQL_Context *mc);
  * @param mc mysql context
  */
 void
-GNUNET_MYSQL_statements_invalidate (struct GNUNET_MYSQL_Context *mc);
+GNUNET_MYSQL_statements_invalidate(struct GNUNET_MYSQL_Context *mc);
 
 
 /**
@@ -110,7 +110,7 @@ GNUNET_MYSQL_statements_invalidate (struct GNUNET_MYSQL_Context *mc);
  * @return MySQL statement handle, NULL on error
  */
 MYSQL_STMT *
-GNUNET_MYSQL_statement_get_stmt (struct GNUNET_MYSQL_StatementHandle *sh);
+GNUNET_MYSQL_statement_get_stmt(struct GNUNET_MYSQL_StatementHandle *sh);
 
 
 /**
@@ -122,8 +122,8 @@ GNUNET_MYSQL_statement_get_stmt (struct GNUNET_MYSQL_StatementHandle *sh);
  * @return prepared statement, NULL on error
  */
 struct GNUNET_MYSQL_StatementHandle *
-GNUNET_MYSQL_statement_prepare (struct GNUNET_MYSQL_Context *mc,
-                                const char *query);
+GNUNET_MYSQL_statement_prepare(struct GNUNET_MYSQL_Context *mc,
+                               const char *query);
 
 
 /**
@@ -135,8 +135,8 @@ GNUNET_MYSQL_statement_prepare (struct GNUNET_MYSQL_Context *mc,
  *         #GNUNET_SYSERR if there was a problem
  */
 int
-GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc,
-                            const char *sql);
+GNUNET_MYSQL_statement_run(struct GNUNET_MYSQL_Context *mc,
+                           const char *sql);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h
index 5281fd3dc..8d3c4fb61 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -54,15 +54,13 @@ extern "C"
  * @param block lookup result
  */
 typedef void (*GNUNET_NAMECACHE_BlockCallback) (void *cls,
-                                                const struct GNUNET_GNSRECORD_Block *block);
+                                                const struct GNUNET_GNSRECORD_Block *block);
 
 
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct GNUNET_NAMECACHE_PluginFunctions
-{
-
+struct GNUNET_NAMECACHE_PluginFunctions {
   /**
    * Closure to pass to all plugin functions.
    */
@@ -77,7 +75,7 @@ struct GNUNET_NAMECACHE_PluginFunctions
    * @return #GNUNET_OK on success, else #GNUNET_SYSERR
    */
   int (*cache_block) (void *cls,
-                      const struct GNUNET_GNSRECORD_Block *block);
+                      const struct GNUNET_GNSRECORD_Block *block);
 
 
   /**
@@ -91,10 +89,8 @@ struct GNUNET_NAMECACHE_PluginFunctions
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
   int (*lookup_block) (void *cls,
-                       const struct GNUNET_HashCode *query,
-                       GNUNET_NAMECACHE_BlockCallback iter, void *iter_cls);
-
-
+                       const struct GNUNET_HashCode *query,
+                       GNUNET_NAMECACHE_BlockCallback iter, void *iter_cls);
 };
 
 
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h
index da0235fc1..271d16d19 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -74,7 +74,7 @@ struct GNUNET_NAMECACHE_Handle;
  * @return handle to use to access the service
  */
 struct GNUNET_NAMECACHE_Handle *
-GNUNET_NAMECACHE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_NAMECACHE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -85,7 +85,7 @@ GNUNET_NAMECACHE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param h handle to the namecache
  */
 void
-GNUNET_NAMECACHE_disconnect (struct GNUNET_NAMECACHE_Handle *h);
+GNUNET_NAMECACHE_disconnect(struct GNUNET_NAMECACHE_Handle *h);
 
 
 /**
@@ -116,10 +116,10 @@ typedef void
  * @return handle to abort the request, NULL on error
  */
 struct GNUNET_NAMECACHE_QueueEntry *
-GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
-                              const struct GNUNET_GNSRECORD_Block *block,
-                              GNUNET_NAMECACHE_ContinuationWithStatus cont,
-                              void *cont_cls);
+GNUNET_NAMECACHE_block_cache(struct GNUNET_NAMECACHE_Handle *h,
+                             const struct GNUNET_GNSRECORD_Block *block,
+                             GNUNET_NAMECACHE_ContinuationWithStatus cont,
+                             void *cont_cls);
 
 
 /**
@@ -146,10 +146,10 @@ typedef void
  * @return a handle that can be used to cancel, NULL on error
  */
 struct GNUNET_NAMECACHE_QueueEntry *
-GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
-                               const struct GNUNET_HashCode *derived_hash,
-                               GNUNET_NAMECACHE_BlockProcessor proc,
-                               void *proc_cls);
+GNUNET_NAMECACHE_lookup_block(struct GNUNET_NAMECACHE_Handle *h,
+                              const struct GNUNET_HashCode *derived_hash,
+                              GNUNET_NAMECACHE_BlockProcessor proc,
+                              void *proc_cls);
 
 
 /**
@@ -161,7 +161,7 @@ GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
  * @param qe operation to cancel
  */
 void
-GNUNET_NAMECACHE_cancel (struct GNUNET_NAMECACHE_QueueEntry *qe);
+GNUNET_NAMECACHE_cancel(struct GNUNET_NAMECACHE_QueueEntry *qe);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 3b603b4c0..b942bb592 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -56,19 +56,17 @@ extern "C"
  */
 typedef void
 (*GNUNET_NAMESTORE_RecordIterator) (void *cls,
-                                    uint64_t serial,
-                                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
-                                    const char *label,
-                                    unsigned int rd_count,
-                                    const struct GNUNET_GNSRECORD_Data *rd);
+                                    uint64_t serial,
+                                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
+                                    const char *label,
+                                    unsigned int rd_count,
+                                    const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct GNUNET_NAMESTORE_PluginFunctions
-{
-
+struct GNUNET_NAMESTORE_PluginFunctions {
   /**
    * Closure to pass to all plugin functions.
    */
@@ -87,10 +85,10 @@ struct GNUNET_NAMESTORE_PluginFunctions
    */
   int
   (*store_records) (void *cls,
-                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                    const char *label,
-                    unsigned int rd_count,
-                    const struct GNUNET_GNSRECORD_Data *rd);
+                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                    const char *label,
+                    unsigned int rd_count,
+                    const struct GNUNET_GNSRECORD_Data *rd);
 
   /**
    * Lookup records in the datastore for which we are the authority.
@@ -104,10 +102,10 @@ struct GNUNET_NAMESTORE_PluginFunctions
    */
   int
   (*lookup_records) (void *cls,
-                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                     const char *label,
-                     GNUNET_NAMESTORE_RecordIterator iter,
-                     void *iter_cls);
+                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                     const char *label,
+                     GNUNET_NAMESTORE_RecordIterator iter,
+                     void *iter_cls);
 
 
   /**
@@ -126,11 +124,11 @@ struct GNUNET_NAMESTORE_PluginFunctions
    */
   int
   (*iterate_records) (void *cls,
-                      const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                      uint64_t serial,
-                      uint64_t limit,
-                      GNUNET_NAMESTORE_RecordIterator iter,
-                      void *iter_cls);
+                      const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                      uint64_t serial,
+                      uint64_t limit,
+                      GNUNET_NAMESTORE_RecordIterator iter,
+                      void *iter_cls);
 
 
   /**
@@ -146,12 +144,10 @@ struct GNUNET_NAMESTORE_PluginFunctions
    */
   int
   (*zone_to_name) (void *cls,
-                   const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                   const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
-                   GNUNET_NAMESTORE_RecordIterator iter,
-                   void *iter_cls);
-
-
+                   const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                   const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
+                   GNUNET_NAMESTORE_RecordIterator iter,
+                   void *iter_cls);
 };
 
 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 9b6beef28..36221f195 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -74,7 +74,7 @@ struct GNUNET_NAMESTORE_ZoneIterator;
  * @return handle to use to access the service
  */
 struct GNUNET_NAMESTORE_Handle *
-GNUNET_NAMESTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_NAMESTORE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -85,7 +85,7 @@ GNUNET_NAMESTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param h handle to the namestore
  */
 void
-GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h);
+GNUNET_NAMESTORE_disconnect(struct GNUNET_NAMESTORE_Handle *h);
 
 
 /**
@@ -125,13 +125,13 @@ typedef void
  * @return handle to abort the request
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
-                                const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-                                const char *label,
-                                unsigned int rd_count,
-                                const struct GNUNET_GNSRECORD_Data *rd,
-                                GNUNET_NAMESTORE_ContinuationWithStatus cont,
-                                void *cont_cls);
+GNUNET_NAMESTORE_records_store(struct GNUNET_NAMESTORE_Handle *h,
+                               const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+                               const char *label,
+                               unsigned int rd_count,
+                               const struct GNUNET_GNSRECORD_Data *rd,
+                               GNUNET_NAMESTORE_ContinuationWithStatus cont,
+                               void *cont_cls);
 
 
 /**
@@ -162,11 +162,11 @@ typedef void
  * @return handle to abort the request
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_set_nick (struct GNUNET_NAMESTORE_Handle *h,
-                           const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-                           const char *nick,
-                           GNUNET_NAMESTORE_ContinuationWithStatus cont,
-                           void *cont_cls);
+GNUNET_NAMESTORE_set_nick(struct GNUNET_NAMESTORE_Handle *h,
+                          const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+                          const char *nick,
+                          GNUNET_NAMESTORE_ContinuationWithStatus cont,
+                          void *cont_cls);
 
 
 /**
@@ -184,13 +184,13 @@ GNUNET_NAMESTORE_set_nick (struct GNUNET_NAMESTORE_Handle *h,
  * @return handle to abort the request
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h,
-                                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-                                 const char *label,
-                                 GNUNET_SCHEDULER_TaskCallback error_cb,
-                                 void *error_cb_cls,
-                                 GNUNET_NAMESTORE_RecordMonitor rm,
-                                 void *rm_cls);
+GNUNET_NAMESTORE_records_lookup(struct GNUNET_NAMESTORE_Handle *h,
+                                const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+                                const char *label,
+                                GNUNET_SCHEDULER_TaskCallback error_cb,
+                                void *error_cb_cls,
+                                GNUNET_NAMESTORE_RecordMonitor rm,
+                                void *rm_cls);
 
 
 /**
@@ -211,13 +211,13 @@ GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h,
  *         cancel
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
-                               const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                               const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
-                               GNUNET_SCHEDULER_TaskCallback error_cb,
-                               void *error_cb_cls,
-                               GNUNET_NAMESTORE_RecordMonitor proc,
-                               void *proc_cls);
+GNUNET_NAMESTORE_zone_to_name(struct GNUNET_NAMESTORE_Handle *h,
+                              const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                              const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
+                              GNUNET_SCHEDULER_TaskCallback error_cb,
+                              void *error_cb_cls,
+                              GNUNET_NAMESTORE_RecordMonitor proc,
+                              void *proc_cls);
 
 
 /**
@@ -229,7 +229,7 @@ GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
  * @param qe operation to cancel
  */
 void
-GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe);
+GNUNET_NAMESTORE_cancel(struct GNUNET_NAMESTORE_QueueEntry *qe);
 
 
 /**
@@ -258,14 +258,14 @@ GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe);
  * @return an iterator handle to use for iteration
  */
 struct GNUNET_NAMESTORE_ZoneIterator *
-GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
-                                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                                       GNUNET_SCHEDULER_TaskCallback error_cb,
-                                       void *error_cb_cls,
-                                       GNUNET_NAMESTORE_RecordMonitor proc,
-                                       void *proc_cls,
-                                       GNUNET_SCHEDULER_TaskCallback finish_cb,
-                                       void *finish_cb_cls);
+GNUNET_NAMESTORE_zone_iteration_start(struct GNUNET_NAMESTORE_Handle *h,
+                                      const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                                      GNUNET_SCHEDULER_TaskCallback error_cb,
+                                      void *error_cb_cls,
+                                      GNUNET_NAMESTORE_RecordMonitor proc,
+                                      void *proc_cls,
+                                      GNUNET_SCHEDULER_TaskCallback finish_cb,
+                                      void *finish_cb_cls);
 
 
 /**
@@ -277,8 +277,8 @@ GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
  *         (before #GNUNET_NAMESTORE_zone_iterator_next is to be called again)
  */
 void
-GNUNET_NAMESTORE_zone_iterator_next (struct GNUNET_NAMESTORE_ZoneIterator *it,
-                                     uint64_t limit);
+GNUNET_NAMESTORE_zone_iterator_next(struct GNUNET_NAMESTORE_ZoneIterator *it,
+                                    uint64_t limit);
 
 
 /**
@@ -289,7 +289,7 @@ GNUNET_NAMESTORE_zone_iterator_next (struct GNUNET_NAMESTORE_ZoneIterator *it,
  * @param it the iterator
  */
 void
-GNUNET_NAMESTORE_zone_iteration_stop (struct GNUNET_NAMESTORE_ZoneIterator *it);
+GNUNET_NAMESTORE_zone_iteration_stop(struct GNUNET_NAMESTORE_ZoneIterator *it);
 
 
 /**
@@ -326,15 +326,15 @@ struct GNUNET_NAMESTORE_ZoneMonitor;
  * @return handle to stop monitoring
  */
 struct GNUNET_NAMESTORE_ZoneMonitor *
-GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                                     int iterate_first,
-                                     GNUNET_SCHEDULER_TaskCallback error_cb,
-                                     void *error_cb_cls,
-                                     GNUNET_NAMESTORE_RecordMonitor monitor,
-                                     void *monitor_cls,
-                                     GNUNET_SCHEDULER_TaskCallback sync_cb,
-                                     void *sync_cb_cls);
+GNUNET_NAMESTORE_zone_monitor_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                                    int iterate_first,
+                                    GNUNET_SCHEDULER_TaskCallback error_cb,
+                                    void *error_cb_cls,
+                                    GNUNET_NAMESTORE_RecordMonitor monitor,
+                                    void *monitor_cls,
+                                    GNUNET_SCHEDULER_TaskCallback sync_cb,
+                                    void *sync_cb_cls);
 
 
 /**
@@ -359,8 +359,8 @@ GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *c
  *        (before #GNUNET_NAMESTORE_zone_monitor_next is to be called again)
  */
 void
-GNUNET_NAMESTORE_zone_monitor_next (struct GNUNET_NAMESTORE_ZoneMonitor *zm,
-                                    uint64_t limit);
+GNUNET_NAMESTORE_zone_monitor_next(struct GNUNET_NAMESTORE_ZoneMonitor *zm,
+                                   uint64_t limit);
 
 
 /**
@@ -369,7 +369,7 @@ GNUNET_NAMESTORE_zone_monitor_next (struct GNUNET_NAMESTORE_ZoneMonitor *zm,
  * @param zm handle to the monitor activity to stop
  */
 void
-GNUNET_NAMESTORE_zone_monitor_stop (struct GNUNET_NAMESTORE_ZoneMonitor *zm);
+GNUNET_NAMESTORE_zone_monitor_stop(struct GNUNET_NAMESTORE_ZoneMonitor *zm);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h
index dd74d1eeb..b40c515a5 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -56,11 +56,11 @@ struct GNUNET_NAT_AUTO_Test;
  * @return handle to cancel NAT test
  */
 struct GNUNET_NAT_AUTO_Test *
-GNUNET_NAT_AUTO_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            uint8_t proto,
-                            const char *section_name,
-                            GNUNET_NAT_TestCallback report,
-                            void *report_cls);
+GNUNET_NAT_AUTO_test_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           uint8_t proto,
+                           const char *section_name,
+                           GNUNET_NAT_TestCallback report,
+                           void *report_cls);
 
 
 /**
@@ -69,7 +69,7 @@ GNUNET_NAT_AUTO_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param tst test to stop.
  */
 void
-GNUNET_NAT_AUTO_test_stop (struct GNUNET_NAT_AUTO_Test *tst);
+GNUNET_NAT_AUTO_test_stop(struct GNUNET_NAT_AUTO_Test *tst);
 
 
 /**
@@ -85,7 +85,7 @@ struct GNUNET_NAT_AUTO_AutoHandle;
  * @return point to a static string containing the error code
  */
 const char *
-GNUNET_NAT_AUTO_status2string (enum GNUNET_NAT_StatusCode err);
+GNUNET_NAT_AUTO_status2string(enum GNUNET_NAT_StatusCode err);
 
 
 /**
@@ -99,9 +99,9 @@ GNUNET_NAT_AUTO_status2string (enum GNUNET_NAT_StatusCode err);
  */
 typedef void
 (*GNUNET_NAT_AUTO_AutoResultCallback)(void *cls,
-                                      const struct GNUNET_CONFIGURATION_Handle *diff,
-                                      enum GNUNET_NAT_StatusCode result,
-                                      enum GNUNET_NAT_Type type);
+                                      const struct GNUNET_CONFIGURATION_Handle *diff,
+                                      enum GNUNET_NAT_StatusCode result,
+                                      enum GNUNET_NAT_Type type);
 
 
 /**
@@ -114,9 +114,9 @@ typedef void
  * @return handle to cancel operation
  */
 struct GNUNET_NAT_AUTO_AutoHandle *
-GNUNET_NAT_AUTO_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  GNUNET_NAT_AUTO_AutoResultCallback cb,
-                                  void *cb_cls);
+GNUNET_NAT_AUTO_autoconfig_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 GNUNET_NAT_AUTO_AutoResultCallback cb,
+                                 void *cb_cls);
 
 
 /**
@@ -125,7 +125,7 @@ GNUNET_NAT_AUTO_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param ah handle for operation to abort
  */
 void
-GNUNET_NAT_AUTO_autoconfig_cancel (struct GNUNET_NAT_AUTO_AutoHandle *ah);
+GNUNET_NAT_AUTO_autoconfig_cancel(struct GNUNET_NAT_AUTO_AutoHandle *ah);
 
 
 #endif
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index b96b2386e..7f0e9764b 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -49,9 +49,7 @@
  * an equivalent enum in gnunet_transport_hello_service.h;
  * might ultimately belong with the new HELLO definition.
  */
-enum GNUNET_NAT_AddressClass
-{
-
+enum GNUNET_NAT_AddressClass {
   /**
    * No address.
    */
@@ -87,7 +85,7 @@ enum GNUNET_NAT_AddressClass
    * Useful for broadcasts.
    */
   GNUNET_NAT_AC_LAN = 8,
-  
+
   /**
    * Addresses useful in the local wired network,
    * i.e. a MAC.  Sensitive, but obvious to people nearby.
@@ -112,12 +110,12 @@ enum GNUNET_NAT_AddressClass
    * Loopback addresses, only useful under special cirumstances.
    */
   GNUNET_NAT_AC_LOOPBACK = 64,
-  
+
   /**
    * Addresses that should be our external IP address
    * on the outside of a NAT.  Might be incorrectly determined.
    * Used as a bit in combination with #GNUNET_NAT_AC_GLOBAL,
-   * or in case of double-NAT with 
+   * or in case of double-NAT with
    * #GNUNET_NAT_AC_LAN.
    */
   GNUNET_NAT_AC_EXTERN = 128,
@@ -132,15 +130,13 @@ enum GNUNET_NAT_AddressClass
    * Bitmask for "any" address.
    */
   GNUNET_NAT_AC_ANY = 65535
-  
 };
 
 
 /**
  * Error Types for the NAT subsystem (which can then later be converted/resolved to a string)
  */
-enum GNUNET_NAT_StatusCode
-{
+enum GNUNET_NAT_StatusCode {
   /**
    * Just the default
    */
@@ -235,7 +231,6 @@ enum GNUNET_NAT_StatusCode
    *
    */
   GNUNET_NAT_ERROR_HELPER_NAT_CLIENT_NOT_FOUND
-  
 };
 
 
@@ -243,8 +238,7 @@ enum GNUNET_NAT_StatusCode
 /**
  * What the situation of the NAT connectivity
  */
-enum GNUNET_NAT_Type
-{
+enum GNUNET_NAT_Type {
   /**
    * We have a direct connection
    */
@@ -269,7 +263,6 @@ enum GNUNET_NAT_Type
    * We know nothing about the NAT.
    */
   GNUNET_NAT_TYPE_UNKNOWN
-
 };
 
 
@@ -281,7 +274,7 @@ enum GNUNET_NAT_Type
  * @param cls closure
  * @param app_ctx[in,out] location where the app can store stuff
  *                  on add and retrieve it on remove
- * @param add_remove #GNUNET_YES to add a new public IP address, 
+ * @param add_remove #GNUNET_YES to add a new public IP address,
  *                   #GNUNET_NO to remove a previous (now invalid) one
  * @param ac address class the address belongs to
  * @param addr either the previous or the new public IP address
@@ -289,9 +282,9 @@ enum GNUNET_NAT_Type
  */
 typedef void
 (*GNUNET_NAT_AddressCallback) (void *cls,
-                               void **app_ctx,
+                               void **app_ctx,
                                int add_remove,
-                               enum GNUNET_NAT_AddressClass ac,
+                               enum GNUNET_NAT_AddressClass ac,
                                const struct sockaddr *addr,
                                socklen_t addrlen);
 
@@ -307,7 +300,7 @@ typedef void
  */
 typedef void
 (*GNUNET_NAT_ReversalCallback) (void *cls,
-                                const struct sockaddr *remote_addr,
+                                const struct sockaddr *remote_addr,
                                 socklen_t remote_addrlen);
 
 
@@ -338,15 +331,15 @@ struct GNUNET_NAT_Handle;
  * @return NULL on error, otherwise handle that can be used to unregister
  */
 struct GNUNET_NAT_Handle *
-GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     const char *config_section,
-                     uint8_t proto,
-                     unsigned int num_addrs,
-                     const struct sockaddr **addrs,
-                     const socklen_t *addrlens,
-                     GNUNET_NAT_AddressCallback address_callback,
-                     GNUNET_NAT_ReversalCallback reversal_callback,
-                     void *callback_cls);
+GNUNET_NAT_register(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                    const char *config_section,
+                    uint8_t proto,
+                    unsigned int num_addrs,
+                    const struct sockaddr **addrs,
+                    const socklen_t *addrlens,
+                    GNUNET_NAT_AddressCallback address_callback,
+                    GNUNET_NAT_ReversalCallback reversal_callback,
+                    void *callback_cls);
 
 
 /**
@@ -363,9 +356,9 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *         #GNUNET_SYSERR if the address is malformed
  */
 int
-GNUNET_NAT_test_address (struct GNUNET_NAT_Handle *nh,
-                         const void *addr,
-                         socklen_t addrlen);
+GNUNET_NAT_test_address(struct GNUNET_NAT_Handle *nh,
+                        const void *addr,
+                        socklen_t addrlen);
 
 
 /**
@@ -376,14 +369,14 @@ GNUNET_NAT_test_address (struct GNUNET_NAT_Handle *nh,
  * @param nh handle (used for configuration)
  * @param local_sa our local address of the peer (IPv4-only)
  * @param remote_sa the remote address of the peer (IPv4-only)
- * @return #GNUNET_SYSERR on error, 
+ * @return #GNUNET_SYSERR on error,
  *         #GNUNET_NO if connection reversal is unavailable,
  *         #GNUNET_OK otherwise (presumably in progress)
  */
 int
-GNUNET_NAT_request_reversal (struct GNUNET_NAT_Handle *nh,
-                             const struct sockaddr_in *local_sa,
-                             const struct sockaddr_in *remote_sa);
+GNUNET_NAT_request_reversal(struct GNUNET_NAT_Handle *nh,
+                            const struct sockaddr_in *local_sa,
+                            const struct sockaddr_in *remote_sa);
 
 
 /**
@@ -394,7 +387,7 @@ GNUNET_NAT_request_reversal (struct GNUNET_NAT_Handle *nh,
  * @param nh the handle to unregister
  */
 void
-GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh);
+GNUNET_NAT_unregister(struct GNUNET_NAT_Handle *nh);
 
 
 /**
@@ -406,7 +399,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh);
  *
  * The function does some basic sanity checks on packet size and
  * content, try to extract a bit of information.
- * 
+ *
  * At the moment this only processes BIND requests, and returns the
  * externally visible address of the request to the rest of the
  * NAT logic.
@@ -421,11 +414,11 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh);
  *         #GNUNET_SYSERR on internal error handling the packet
  */
 int
-GNUNET_NAT_stun_handle_packet (struct GNUNET_NAT_Handle *nh,
-                               const struct sockaddr *sender_addr,
-                               size_t sender_addr_len,
-                               const void *data,
-                               size_t data_size);
+GNUNET_NAT_stun_handle_packet(struct GNUNET_NAT_Handle *nh,
+                              const struct sockaddr *sender_addr,
+                              size_t sender_addr_len,
+                              const void *data,
+                              size_t data_size);
 
 
 /**
@@ -445,7 +438,7 @@ struct GNUNET_NAT_STUN_Handle;
  */
 typedef void
 (*GNUNET_NAT_TestCallback) (void *cls,
-                            enum GNUNET_NAT_StatusCode result);
+                            enum GNUNET_NAT_StatusCode result);
 
 
 /**
@@ -463,11 +456,11 @@ typedef void
  * @return NULL on error
  */
 struct GNUNET_NAT_STUN_Handle *
-GNUNET_NAT_stun_make_request (const char *server,
-                              uint16_t port,
-                              struct GNUNET_NETWORK_Handle *sock,
-                              GNUNET_NAT_TestCallback cb,
-                              void *cb_cls);
+GNUNET_NAT_stun_make_request(const char *server,
+                             uint16_t port,
+                             struct GNUNET_NETWORK_Handle *sock,
+                             GNUNET_NAT_TestCallback cb,
+                             void *cb_cls);
 
 
 /**
@@ -477,7 +470,7 @@ GNUNET_NAT_stun_make_request (const char *server,
  * @param rh request to cancel
  */
 void
-GNUNET_NAT_stun_make_request_cancel (struct GNUNET_NAT_STUN_Handle *rh);
+GNUNET_NAT_stun_make_request_cancel(struct GNUNET_NAT_STUN_Handle *rh);
 
 
 #endif
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index 2bfa7040c..1bdb474ea 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -54,7 +54,7 @@ struct GNUNET_NotificationContext;
  * @return handle to the notification context
  */
 struct GNUNET_NotificationContext *
-GNUNET_notification_context_create (unsigned int queue_length);
+GNUNET_notification_context_create(unsigned int queue_length);
 
 
 /**
@@ -63,7 +63,7 @@ GNUNET_notification_context_create (unsigned int queue_length);
  * @param nc context to destroy.
  */
 void
-GNUNET_notification_context_destroy (struct GNUNET_NotificationContext *nc);
+GNUNET_notification_context_destroy(struct GNUNET_NotificationContext *nc);
 
 
 /**
@@ -73,8 +73,8 @@ GNUNET_notification_context_destroy (struct GNUNET_NotificationContext *nc);
  * @param mq message queue add
  */
 void
-GNUNET_notification_context_add (struct GNUNET_NotificationContext *nc,
-                                 struct GNUNET_MQ_Handle *mq);
+GNUNET_notification_context_add(struct GNUNET_NotificationContext *nc,
+                                struct GNUNET_MQ_Handle *mq);
 
 
 /**
@@ -85,9 +85,9 @@ GNUNET_notification_context_add (struct GNUNET_NotificationContext *nc,
  * @param can_drop can this message be dropped due to queue length limitations
  */
 void
-GNUNET_notification_context_broadcast (struct GNUNET_NotificationContext *nc,
-                                       const struct GNUNET_MessageHeader *msg,
-                                       int can_drop);
+GNUNET_notification_context_broadcast(struct GNUNET_NotificationContext *nc,
+                                      const struct GNUNET_MessageHeader *msg,
+                                      int can_drop);
 
 /**
  * Return active number of subscribers in this context.
@@ -96,6 +96,6 @@ GNUNET_notification_context_broadcast (struct GNUNET_NotificationContext *nc,
  * @return number of current subscribers
  */
 unsigned int
-GNUNET_notification_context_get_size (struct GNUNET_NotificationContext *nc);
+GNUNET_notification_context_get_size(struct GNUNET_NotificationContext *nc);
 
 #endif
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 6c02f3577..2a91621a3 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Nils Durner
@@ -49,9 +49,7 @@ struct GNUNET_NETWORK_Handle;
 /**
  * @brief collection of IO descriptors
  */
-struct GNUNET_NETWORK_FDSet
-{
-
+struct GNUNET_NETWORK_FDSet {
   /**
    * Maximum number of any socket descriptor in the set (plus one)
    */
@@ -80,9 +78,7 @@ struct GNUNET_NETWORK_FDSet
    * smaller than @e handles_size.
    */
   unsigned int handles_pos;
-
 #endif
-
 };
 
 #include "gnunet_disk_lib.h"
@@ -95,7 +91,7 @@ struct GNUNET_NETWORK_FDSet
  * @return #GNUNET_OK if the PF is supported
  */
 int
-GNUNET_NETWORK_test_pf (int pf);
+GNUNET_NETWORK_test_pf(int pf);
 
 
 /**
@@ -108,7 +104,7 @@ GNUNET_NETWORK_test_pf (int pf);
  * @return shortened unixpath, NULL on error
  */
 char *
-GNUNET_NETWORK_shorten_unixpath (char *unixpath);
+GNUNET_NETWORK_shorten_unixpath(char *unixpath);
 
 
 #ifndef WINDOWS
@@ -122,7 +118,7 @@ GNUNET_NETWORK_shorten_unixpath (char *unixpath);
  * @param un unix domain socket address to check
  */
 void
-GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un);
+GNUNET_NETWORK_unix_precheck(const struct sockaddr_un *un);
 #endif
 
 
@@ -137,9 +133,9 @@ GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un);
  * @return client socket
  */
 struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
-                              struct sockaddr *address,
-                              socklen_t *address_len);
+GNUNET_NETWORK_socket_accept(const struct GNUNET_NETWORK_Handle *desc,
+                             struct sockaddr *address,
+                             socklen_t *address_len);
 
 
 /**
@@ -149,7 +145,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
  * @return NULL on error (including not supported on target platform)
  */
 struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_box_native (SOCKTYPE fd);
+GNUNET_NETWORK_socket_box_native(SOCKTYPE fd);
 
 
 /**
@@ -160,8 +156,8 @@ GNUNET_NETWORK_socket_box_native (SOCKTYPE fd);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
-                                    int doBlock);
+GNUNET_NETWORK_socket_set_blocking(struct GNUNET_NETWORK_Handle *fd,
+                                   int doBlock);
 
 
 /**
@@ -173,9 +169,9 @@ GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
-                            const struct sockaddr *address,
-                            socklen_t address_len);
+GNUNET_NETWORK_socket_bind(struct GNUNET_NETWORK_Handle *desc,
+                           const struct sockaddr *address,
+                           socklen_t address_len);
 
 /**
  * Close a socket.
@@ -184,7 +180,7 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_socket_close(struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -193,7 +189,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc);
  * @param desc socket
  */
 void
-GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_socket_free_memory_only_(struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -205,9 +201,9 @@ GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
-                               const struct sockaddr *address,
-                               socklen_t address_len);
+GNUNET_NETWORK_socket_connect(const struct GNUNET_NETWORK_Handle *desc,
+                              const struct sockaddr *address,
+                              socklen_t address_len);
 
 
 /**
@@ -221,11 +217,11 @@ GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
-                                  int level,
-                                  int optname,
-                                  void *optval,
-                                  socklen_t *optlen);
+GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Handle *desc,
+                                 int level,
+                                 int optname,
+                                 void *optval,
+                                 socklen_t *optlen);
 
 
 /**
@@ -236,8 +232,8 @@ GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
-                              int backlog);
+GNUNET_NETWORK_socket_listen(const struct GNUNET_NETWORK_Handle *desc,
+                             int backlog);
 
 
 /**
@@ -247,7 +243,7 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
  * @returns #GNUNET_SYSERR if no data is available, or on error!
  */
 ssize_t
-GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_socket_recvfrom_amount(const struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -261,11 +257,11 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc)
  * @param addrlen length of the addr
  */
 ssize_t
-GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
-                                void *buffer,
-                                size_t length,
-                                struct sockaddr *src_addr,
-                                socklen_t *addrlen);
+GNUNET_NETWORK_socket_recvfrom(const struct GNUNET_NETWORK_Handle *desc,
+                               void *buffer,
+                               size_t length,
+                               struct sockaddr *src_addr,
+                               socklen_t *addrlen);
 
 
 /**
@@ -277,9 +273,9 @@ GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
  * @return number of bytes read
  */
 ssize_t
-GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc,
-                            void *buffer,
-                            size_t length);
+GNUNET_NETWORK_socket_recv(const struct GNUNET_NETWORK_Handle *desc,
+                           void *buffer,
+                           size_t length);
 
 
 /**
@@ -292,10 +288,10 @@ GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc,
  * @return number of selected sockets, #GNUNET_SYSERR on error
  */
 int
-GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
-                              struct GNUNET_NETWORK_FDSet *wfds,
-                              struct GNUNET_NETWORK_FDSet *efds,
-                              struct GNUNET_TIME_Relative timeout);
+GNUNET_NETWORK_socket_select(struct GNUNET_NETWORK_FDSet *rfds,
+                             struct GNUNET_NETWORK_FDSet *wfds,
+                             struct GNUNET_NETWORK_FDSet *efds,
+                             struct GNUNET_TIME_Relative timeout);
 
 
 /**
@@ -307,9 +303,9 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
  * @return number of bytes sent, #GNUNET_SYSERR on error
  */
 ssize_t
-GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
-                            const void *buffer,
-                            size_t length);
+GNUNET_NETWORK_socket_send(const struct GNUNET_NETWORK_Handle *desc,
+                           const void *buffer,
+                           size_t length);
 
 
 /**
@@ -324,11 +320,11 @@ GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
  * @return number of bytes sent, #GNUNET_SYSERR on error
  */
 ssize_t
-GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc,
-                              const void *message,
-                              size_t length,
-                              const struct sockaddr *dest_addr,
-                              socklen_t dest_len);
+GNUNET_NETWORK_socket_sendto(const struct GNUNET_NETWORK_Handle *desc,
+                             const void *message,
+                             size_t length,
+                             const struct sockaddr *dest_addr,
+                             socklen_t dest_len);
 
 
 /**
@@ -342,11 +338,11 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
-                                  int level,
-                                  int option_name,
-                                  const void *option_value,
-                                  socklen_t option_len);
+GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Handle *fd,
+                                 int level,
+                                 int option_name,
+                                 const void *option_value,
+                                 socklen_t option_len);
 
 
 /**
@@ -357,8 +353,8 @@ GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
-                                int how);
+GNUNET_NETWORK_socket_shutdown(struct GNUNET_NETWORK_Handle *desc,
+                               int how);
 
 
 /**
@@ -371,7 +367,7 @@ GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_socket_disable_corking(struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -385,9 +381,9 @@ GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc);
  * @return new socket, NULL on error
  */
 struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_create (int domain,
-                              int type,
-                              int protocol);
+GNUNET_NETWORK_socket_create(int domain,
+                             int type,
+                             int protocol);
 
 
 /**
@@ -396,7 +392,7 @@ GNUNET_NETWORK_socket_create (int domain,
  * @param fds fd set to clear
  */
 void
-GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds);
+GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds);
 
 
 /**
@@ -406,8 +402,8 @@ GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds);
  * @param desc socket to add
  */
 void
-GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
-                          const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds,
+                         const struct GNUNET_NETWORK_Handle *desc);
 
 
 #if WINDOWS
@@ -418,8 +414,8 @@ GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
  * @param h the file handle to add
  */
 void
-GNUNET_NETWORK_fdset_handle_set_native_w32_handle (struct GNUNET_NETWORK_FDSet *fds,
-                                                   HANDLE h);
+GNUNET_NETWORK_fdset_handle_set_native_w32_handle(struct GNUNET_NETWORK_FDSet *fds,
+                                                  HANDLE h);
 #endif
 
 
@@ -431,8 +427,8 @@ GNUNET_NETWORK_fdset_handle_set_native_w32_handle (struct GNUNET_NETWORK_FDSet *
  * @return #GNUNET_YES if the socket is in the set
  */
 int
-GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
-                            const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds,
+                           const struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -442,8 +438,8 @@ GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
  * @param src the fd set to add from
  */
 void
-GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
-                          const struct GNUNET_NETWORK_FDSet *src);
+GNUNET_NETWORK_fdset_add(struct GNUNET_NETWORK_FDSet *dst,
+                         const struct GNUNET_NETWORK_FDSet *src);
 
 
 /**
@@ -453,8 +449,8 @@ GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
  * @param from source
  */
 void
-GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,
-                           const struct GNUNET_NETWORK_FDSet *from);
+GNUNET_NETWORK_fdset_copy(struct GNUNET_NETWORK_FDSet *to,
+                          const struct GNUNET_NETWORK_FDSet *from);
 
 
 /**
@@ -464,7 +460,7 @@ GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,
  * @return POSIX file descriptor
  */
 int
-GNUNET_NETWORK_get_fd (const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_get_fd(const struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -474,7 +470,7 @@ GNUNET_NETWORK_get_fd (const struct GNUNET_NETWORK_Handle *desc);
  * @return POSIX file descriptor
  */
 struct sockaddr*
-GNUNET_NETWORK_get_addr (const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_get_addr(const struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -484,7 +480,7 @@ GNUNET_NETWORK_get_addr (const struct GNUNET_NETWORK_Handle *desc);
  * @return socklen_t for sockaddr
  */
 socklen_t
-GNUNET_NETWORK_get_addrlen (const struct GNUNET_NETWORK_Handle *desc);
+GNUNET_NETWORK_get_addrlen(const struct GNUNET_NETWORK_Handle *desc);
 
 
 /**
@@ -495,9 +491,9 @@ GNUNET_NETWORK_get_addrlen (const struct GNUNET_NETWORK_Handle *desc);
  * @param nfds the biggest socket number in from + 1
  */
 void
-GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,
-                                  const fd_set *from,
-                                  int nfds);
+GNUNET_NETWORK_fdset_copy_native(struct GNUNET_NETWORK_FDSet *to,
+                                 const fd_set *from,
+                                 int nfds);
 
 
 /**
@@ -507,8 +503,8 @@ GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,
  * @param nfd native FD to set
  */
 void
-GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
-                                 int nfd);
+GNUNET_NETWORK_fdset_set_native(struct GNUNET_NETWORK_FDSet *to,
+                                int nfd);
 
 
 /**
@@ -519,8 +515,8 @@ GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
  * @return #GNUNET_YES if to contains nfd
  */
 int
-GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
-                                  int nfd);
+GNUNET_NETWORK_fdset_test_native(const struct GNUNET_NETWORK_FDSet *to,
+                                 int nfd);
 
 
 /**
@@ -530,8 +526,8 @@ GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
  * @param h the file handle to add
  */
 void
-GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,
-                                 const struct GNUNET_DISK_FileHandle *h);
+GNUNET_NETWORK_fdset_handle_set(struct GNUNET_NETWORK_FDSet *fds,
+                                const struct GNUNET_DISK_FileHandle *h);
 
 
 /**
@@ -542,8 +538,8 @@ GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,
  * @param h the file handle to add
  */
 void
-GNUNET_NETWORK_fdset_handle_set_first (struct GNUNET_NETWORK_FDSet *fds,
-                                       const struct GNUNET_DISK_FileHandle *h);
+GNUNET_NETWORK_fdset_handle_set_first(struct GNUNET_NETWORK_FDSet *fds,
+                                      const struct GNUNET_DISK_FileHandle *h);
 
 
 /**
@@ -554,8 +550,8 @@ GNUNET_NETWORK_fdset_handle_set_first (struct GNUNET_NETWORK_FDSet *fds,
  * @return #GNUNET_YES if the file handle is part of the set
  */
 int
-GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,
-                                   const struct GNUNET_DISK_FileHandle *h);
+GNUNET_NETWORK_fdset_handle_isset(const struct GNUNET_NETWORK_FDSet *fds,
+                                  const struct GNUNET_DISK_FileHandle *h);
 
 
 /**
@@ -566,8 +562,8 @@ GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,
  * @return #GNUNET_YES if they do overlap, #GNUNET_NO otherwise
  */
 int
-GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,
-                              const struct GNUNET_NETWORK_FDSet *fds2);
+GNUNET_NETWORK_fdset_overlap(const struct GNUNET_NETWORK_FDSet *fds1,
+                             const struct GNUNET_NETWORK_FDSet *fds2);
 
 
 /**
@@ -576,7 +572,7 @@ GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,
  * @return a new fd set
  */
 struct GNUNET_NETWORK_FDSet *
-GNUNET_NETWORK_fdset_create (void);
+GNUNET_NETWORK_fdset_create(void);
 
 
 /**
@@ -585,7 +581,7 @@ GNUNET_NETWORK_fdset_create (void);
  * @param fds fd set
  */
 void
-GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds);
+GNUNET_NETWORK_fdset_destroy(struct GNUNET_NETWORK_FDSet *fds);
 
 
 /**
@@ -596,8 +592,8 @@ GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds);
  * @return #GNUNET_OK if the port is available, #GNUNET_NO if not
  */
 int
-GNUNET_NETWORK_test_port_free (int ipproto,
-                               uint16_t port);
+GNUNET_NETWORK_test_port_free(int ipproto,
+                              uint16_t port);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 08282058a..31b128533 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -92,8 +92,8 @@ typedef void (*GNUNET_NSE_Callback) (void *cls,
  * @return handle to use in #GNUNET_NSE_disconnect to stop NSE from invoking the callbacks
  */
 struct GNUNET_NSE_Handle *
-GNUNET_NSE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_NSE_Callback func, void *func_cls);
+GNUNET_NSE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                   GNUNET_NSE_Callback func, void *func_cls);
 
 
 /**
@@ -102,7 +102,7 @@ GNUNET_NSE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h handle to destroy
  */
 void
-GNUNET_NSE_disconnect (struct GNUNET_NSE_Handle *h);
+GNUNET_NSE_disconnect(struct GNUNET_NSE_Handle *h);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_nt_lib.h b/src/include/gnunet_nt_lib.h
index 1da92a79a..48f3d7352 100644
--- a/src/include/gnunet_nt_lib.h
+++ b/src/include/gnunet_nt_lib.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet.
- Copyright (C) 2010-2015, 2018 GNUnet e.V.
+   This file is part of GNUnet.
+   Copyright (C) 2010-2015, 2018 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -32,8 +32,7 @@
 /**
  * Types of networks (with separate quotas) we support.
  */
-enum GNUNET_NetworkType
-{
+enum GNUNET_NetworkType {
   /**
    * Category of last resort.
    */
@@ -68,7 +67,6 @@ enum GNUNET_NetworkType
  * Number of network types supported by ATS
  */
 #define GNUNET_NT_COUNT 6
-
 };
 
 
@@ -79,7 +77,7 @@ enum GNUNET_NetworkType
  * @return a string or NULL if invalid
  */
 const char *
-GNUNET_NT_to_string (enum GNUNET_NetworkType net);
+GNUNET_NT_to_string(enum GNUNET_NetworkType net);
 
 
 /**
@@ -97,9 +95,9 @@ struct GNUNET_NT_InterfaceScanner;
  * @return type of the network the address belongs to
  */
 enum GNUNET_NetworkType
-GNUNET_NT_scanner_get_type (struct GNUNET_NT_InterfaceScanner *is,
-                            const struct sockaddr *addr,
-                            socklen_t addrlen);
+GNUNET_NT_scanner_get_type(struct GNUNET_NT_InterfaceScanner *is,
+                           const struct sockaddr *addr,
+                           socklen_t addrlen);
 
 
 /**
@@ -108,7 +106,7 @@ GNUNET_NT_scanner_get_type (struct GNUNET_NT_InterfaceScanner *is,
  * @return scanner handle, NULL on error
  */
 struct GNUNET_NT_InterfaceScanner *
-GNUNET_NT_scanner_init (void);
+GNUNET_NT_scanner_init(void);
 
 
 /**
@@ -117,7 +115,7 @@ GNUNET_NT_scanner_init (void);
  * @param is scanner we are done with
  */
 void
-GNUNET_NT_scanner_done (struct GNUNET_NT_InterfaceScanner *is);
+GNUNET_NT_scanner_done(struct GNUNET_NT_InterfaceScanner *is);
 
 
 #endif
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index d04577e2d..c96db354d 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file
@@ -40,14 +40,14 @@ struct GNUNET_OP_Handle;
  * Create new operations handle.
  */
 struct GNUNET_OP_Handle *
-GNUNET_OP_create ();
+GNUNET_OP_create();
 
 
 /**
  * Destroy operations handle.
  */
 void
-GNUNET_OP_destroy (struct GNUNET_OP_Handle *h);
+GNUNET_OP_destroy(struct GNUNET_OP_Handle *h);
 
 
 /**
@@ -59,7 +59,7 @@ GNUNET_OP_destroy (struct GNUNET_OP_Handle *h);
  * @return Operation ID to use.
  */
 uint64_t
-GNUNET_OP_get_next_id (struct GNUNET_OP_Handle *h);
+GNUNET_OP_get_next_id(struct GNUNET_OP_Handle *h);
 
 
 /**
@@ -80,11 +80,11 @@ GNUNET_OP_get_next_id (struct GNUNET_OP_Handle *h);
  *         #GNUNET_NO  if not found.
  */
 int
-GNUNET_OP_get (struct GNUNET_OP_Handle *h,
-               uint64_t op_id,
-               GNUNET_ResultCallback *result_cb,
-               void **cls,
-               void **ctx);
+GNUNET_OP_get(struct GNUNET_OP_Handle *h,
+              uint64_t op_id,
+              GNUNET_ResultCallback *result_cb,
+              void **cls,
+              void **ctx);
 
 
 /**
@@ -102,10 +102,10 @@ GNUNET_OP_get (struct GNUNET_OP_Handle *h,
  * @return ID of the new operation.
  */
 uint64_t
-GNUNET_OP_add (struct GNUNET_OP_Handle *h,
-               GNUNET_ResultCallback result_cb,
-               void *cls,
-               void *ctx);
+GNUNET_OP_add(struct GNUNET_OP_Handle *h,
+              GNUNET_ResultCallback result_cb,
+              void *cls,
+              void *ctx);
 
 
 /**
@@ -128,12 +128,12 @@ GNUNET_OP_add (struct GNUNET_OP_Handle *h,
  *         #GNUNET_NO  if the operation was not found.
  */
 int
-GNUNET_OP_result (struct GNUNET_OP_Handle *h,
-                  uint64_t op_id,
-                  int64_t result_code,
-                  const void *data,
-                  uint16_t data_size,
-                  void **ctx);
+GNUNET_OP_result(struct GNUNET_OP_Handle *h,
+                 uint64_t op_id,
+                 int64_t result_code,
+                 const void *data,
+                 uint16_t data_size,
+                 void **ctx);
 
 
 /**
@@ -148,8 +148,8 @@ GNUNET_OP_result (struct GNUNET_OP_Handle *h,
  *         #GNUNET_NO  if the operation was not found.
  */
 int
-GNUNET_OP_remove (struct GNUNET_OP_Handle *h,
-                  uint64_t op_id);
+GNUNET_OP_remove(struct GNUNET_OP_Handle *h,
+                 uint64_t op_id);
 
 
 #endif // GNUNET_OP_H
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index b632ab262..e5bc7146b 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -65,9 +65,7 @@ extern "C"
  * Flags that determine which of the standard streams
  * should be inherited by the child process.
  */
-enum GNUNET_OS_InheritStdioFlags
-{
-
+enum GNUNET_OS_InheritStdioFlags {
   /**
    * No standard streams should be inherited.
    */
@@ -114,8 +112,7 @@ struct GNUNET_OS_Process;
 /**
  * Possible installation paths to request
  */
-enum GNUNET_OS_InstallationPathKind
-{
+enum GNUNET_OS_InstallationPathKind {
   /**
    * Return the "PREFIX" directory given to configure.
    */
@@ -169,8 +166,7 @@ enum GNUNET_OS_InstallationPathKind
 /**
  * Process status types
  */
-enum GNUNET_OS_ProcessStatusType
-{
+enum GNUNET_OS_ProcessStatusType {
   /**
    * The process is not known to the OS (or at
    * least not one of our children).
@@ -203,8 +199,7 @@ enum GNUNET_OS_ProcessStatusType
  * Project-specific data used to help the OS subsystem
  * find installation paths.
  */
-struct GNUNET_OS_ProjectData
-{
+struct GNUNET_OS_ProjectData {
   /**
    * Name of a library that is installed in the "lib/" directory of
    * the project, such as "libgnunetutil".  Used to locate the
@@ -295,14 +290,14 @@ struct GNUNET_OS_ProjectData
  * Return default project data used by 'libgnunetutil' for GNUnet.
  */
 const struct GNUNET_OS_ProjectData *
-GNUNET_OS_project_data_default (void);
+GNUNET_OS_project_data_default(void);
 
 
 /**
  * @return current (actual) project data.
  */
 const struct GNUNET_OS_ProjectData *
-GNUNET_OS_project_data_get (void);
+GNUNET_OS_project_data_get(void);
 
 
 /**
@@ -311,7 +306,7 @@ GNUNET_OS_project_data_get (void);
  * @param pd project data used to determine paths.
  */
 void
-GNUNET_OS_init (const struct GNUNET_OS_ProjectData *pd);
+GNUNET_OS_init(const struct GNUNET_OS_ProjectData *pd);
 
 
 /**
@@ -323,7 +318,7 @@ GNUNET_OS_init (const struct GNUNET_OS_ProjectData *pd);
  * @return a pointer to the dir path (to be freed by the caller)
  */
 char *
-GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
+GNUNET_OS_installation_get_path(enum GNUNET_OS_InstallationPathKind dirkind);
 
 
 /**
@@ -335,7 +330,7 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
  * @return full path to the binary, if possible, otherwise copy of 'progname'
  */
 char *
-GNUNET_OS_get_libexec_binary_path (const char *progname);
+GNUNET_OS_get_libexec_binary_path(const char *progname);
 
 
 /**
@@ -351,8 +346,8 @@ GNUNET_OS_get_libexec_binary_path (const char *progname);
  *         otherwise
  */
 char *
-GNUNET_OS_get_suid_binary_path (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                const char *progname);
+GNUNET_OS_get_suid_binary_path(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               const char *progname);
 
 
 /**
@@ -384,8 +379,8 @@ typedef int
  * @param proc_cls closure for @a proc
  */
 void
-GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
-                                   void *proc_cls);
+GNUNET_OS_network_interfaces_list(GNUNET_OS_NetworkInterfaceProcessor proc,
+                                  void *proc_cls);
 
 /**
  * @brief Get maximum string length returned by gethostname()
@@ -408,7 +403,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
  * @return pointer to the process sturcutre for this process
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_process_current (void);
+GNUNET_OS_process_current(void);
 
 
 /**
@@ -419,8 +414,8 @@ GNUNET_OS_process_current (void);
  * @return 0 on success, -1 on error
  */
 int
-GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc,
-                        int sig);
+GNUNET_OS_process_kill(struct GNUNET_OS_Process *proc,
+                       int sig);
 
 
 /**
@@ -429,7 +424,7 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc,
  * @param proc pointer to process structure
  */
 void
-GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc);
+GNUNET_OS_process_destroy(struct GNUNET_OS_Process *proc);
 
 
 /**
@@ -440,7 +435,7 @@ GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc);
  * @return the current process id
  */
 pid_t
-GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc);
+GNUNET_OS_process_get_pid(struct GNUNET_OS_Process *proc);
 
 
 /**
@@ -456,13 +451,13 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc);
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_vap (int pipe_control,
-                             enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                             const char *filename,
-                             char *const argv[]);
+GNUNET_OS_start_process_vap(int pipe_control,
+                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                            struct GNUNET_DISK_PipeHandle *pipe_stdin,
+                            struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                            struct GNUNET_DISK_PipeHandle *pipe_stderr,
+                            const char *filename,
+                            char *const argv[]);
 
 
 /**
@@ -478,12 +473,12 @@ GNUNET_OS_start_process_vap (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process (int pipe_control,
-                         enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                         struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                         struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                         struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                         const char *filename, ...);
+GNUNET_OS_start_process(int pipe_control,
+                        enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                        struct GNUNET_DISK_PipeHandle *pipe_stdin,
+                        struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                        struct GNUNET_DISK_PipeHandle *pipe_stderr,
+                        const char *filename, ...);
 
 
 /**
@@ -499,12 +494,12 @@ GNUNET_OS_start_process (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_va (int pipe_control,
-                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                            struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                            struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                            struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                            const char *filename, va_list va);
+GNUNET_OS_start_process_va(int pipe_control,
+                           enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                           struct GNUNET_DISK_PipeHandle *pipe_stdin,
+                           struct GNUNET_DISK_PipeHandle *pipe_stdout,
+                           struct GNUNET_DISK_PipeHandle *pipe_stderr,
+                           const char *filename, va_list va);
 
 /**
  * Start a process.
@@ -519,11 +514,11 @@ GNUNET_OS_start_process_va (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_v (int pipe_control,
-                           enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           const SOCKTYPE *lsocks,
-                           const char *filename,
-                           char *const argv[]);
+GNUNET_OS_start_process_v(int pipe_control,
+                          enum GNUNET_OS_InheritStdioFlags std_inheritance,
+                          const SOCKTYPE *lsocks,
+                          const char *filename,
+                          char *const argv[]);
 
 
 /**
@@ -545,10 +540,10 @@ GNUNET_OS_start_process_v (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_s (int pipe_control,
-                           unsigned int std_inheritance,
-                           const SOCKTYPE * lsocks,
-                           const char *filename, ...);
+GNUNET_OS_start_process_s(int pipe_control,
+                          unsigned int std_inheritance,
+                          const SOCKTYPE * lsocks,
+                          const char *filename, ...);
 
 
 /**
@@ -573,7 +568,7 @@ typedef void
  * @param cmd handle to the process
  */
 void
-GNUNET_OS_command_stop (struct GNUNET_OS_CommandHandle *cmd);
+GNUNET_OS_command_stop(struct GNUNET_OS_CommandHandle *cmd);
 
 
 /**
@@ -588,11 +583,11 @@ GNUNET_OS_command_stop (struct GNUNET_OS_CommandHandle *cmd);
  * @return NULL on error
  */
 struct GNUNET_OS_CommandHandle *
-GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
-                       void *proc_cls,
-                       struct GNUNET_TIME_Relative timeout,
-                       const char *binary,
-                       ...);
+GNUNET_OS_command_run(GNUNET_OS_LineProcessor proc,
+                      void *proc_cls,
+                      struct GNUNET_TIME_Relative timeout,
+                      const char *binary,
+                      ...);
 
 
 /**
@@ -605,9 +600,9 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
  * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
-                          enum GNUNET_OS_ProcessStatusType *type,
-                          unsigned long *code);
+GNUNET_OS_process_status(struct GNUNET_OS_Process *proc,
+                         enum GNUNET_OS_ProcessStatusType *type,
+                         unsigned long *code);
 
 
 /**
@@ -621,7 +616,7 @@ GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc);
+GNUNET_OS_process_wait(struct GNUNET_OS_Process *proc);
 
 
 
@@ -635,9 +630,9 @@ GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc);
  * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_OS_process_wait_status (struct GNUNET_OS_Process *proc,
-                               enum GNUNET_OS_ProcessStatusType *type,
-                               unsigned long *code);
+GNUNET_OS_process_wait_status(struct GNUNET_OS_Process *proc,
+                              enum GNUNET_OS_ProcessStatusType *type,
+                              unsigned long *code);
 
 
 /**
@@ -649,7 +644,7 @@ GNUNET_OS_process_wait_status (struct GNUNET_OS_Process *proc,
  * @param cls closure (unused)
  */
 void
-GNUNET_OS_install_parent_control_handler (void *cls);
+GNUNET_OS_install_parent_control_handler(void *cls);
 
 
 /**
@@ -670,9 +665,9 @@ GNUNET_OS_install_parent_control_handler (void *cls);
  *         #GNUNET_SYSERR on error (no such binary or not executable)
  */
 int
-GNUNET_OS_check_helper_binary (const char *binary,
-                               int check_suid,
-                               const char *params);
+GNUNET_OS_check_helper_binary(const char *binary,
+                              int check_suid,
+                              const char *params);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index b1c7220e2..e7caa1062 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -58,7 +58,7 @@ typedef unsigned int GNUNET_PEER_Id;
  * @return the interned identity or 0.
  */
 GNUNET_PEER_Id
-GNUNET_PEER_search (const struct GNUNET_PeerIdentity *pid);
+GNUNET_PEER_search(const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -69,7 +69,7 @@ GNUNET_PEER_search (const struct GNUNET_PeerIdentity *pid);
  * @return the interned identity.
  */
 GNUNET_PEER_Id
-GNUNET_PEER_intern (const struct GNUNET_PeerIdentity *pid);
+GNUNET_PEER_intern(const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -79,7 +79,7 @@ GNUNET_PEER_intern (const struct GNUNET_PeerIdentity *pid);
  * @param delta how much to change the RC
  */
 void
-GNUNET_PEER_change_rc (GNUNET_PEER_Id id, int delta);
+GNUNET_PEER_change_rc(GNUNET_PEER_Id id, int delta);
 
 
 /**
@@ -89,8 +89,8 @@ GNUNET_PEER_change_rc (GNUNET_PEER_Id id, int delta);
  * @param count size of the @a ids array
  */
 void
-GNUNET_PEER_decrement_rcs (const GNUNET_PEER_Id *ids,
-                           unsigned int count);
+GNUNET_PEER_decrement_rcs(const GNUNET_PEER_Id *ids,
+                          unsigned int count);
 
 
 /**
@@ -100,8 +100,8 @@ GNUNET_PEER_decrement_rcs (const GNUNET_PEER_Id *ids,
  * @param pid where to write the normal peer identity
  */
 void
-GNUNET_PEER_resolve (GNUNET_PEER_Id id,
-                     struct GNUNET_PeerIdentity *pid);
+GNUNET_PEER_resolve(GNUNET_PEER_Id id,
+                    struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -111,7 +111,7 @@ GNUNET_PEER_resolve (GNUNET_PEER_Id id,
  * @return pointer to peer identity, valid as long @a id is valid
  */
 const struct GNUNET_PeerIdentity *
-GNUNET_PEER_resolve2 (GNUNET_PEER_Id id);
+GNUNET_PEER_resolve2(GNUNET_PEER_Id id);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 6fc48f806..f7663c43e 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -64,7 +64,7 @@ struct GNUNET_PEERINFO_Handle;
  *         etablishment may happen asynchronously).
  */
 struct GNUNET_PEERINFO_Handle *
-GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_PEERINFO_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -77,7 +77,7 @@ GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param h handle to disconnect
  */
 void
-GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
+GNUNET_PEERINFO_disconnect(struct GNUNET_PEERINFO_Handle *h);
 
 
 /**
@@ -99,10 +99,10 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
  *        calling @a cont must be prevented)
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
-                          const struct GNUNET_HELLO_Message *hello,
-                          GNUNET_SCHEDULER_TaskCallback cont,
-                          void *cont_cls);
+GNUNET_PEERINFO_add_peer(struct GNUNET_PEERINFO_Handle *h,
+                         const struct GNUNET_HELLO_Message *hello,
+                         GNUNET_SCHEDULER_TaskCallback cont,
+                         void *cont_cls);
 
 
 /**
@@ -145,11 +145,11 @@ struct GNUNET_PEERINFO_IteratorContext;
  * @return iterator context
  */
 struct GNUNET_PEERINFO_IteratorContext *
-GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
-                         int include_friend_only,
-                         const struct GNUNET_PeerIdentity *peer,
-                         GNUNET_PEERINFO_Processor callback,
-                         void *callback_cls);
+GNUNET_PEERINFO_iterate(struct GNUNET_PEERINFO_Handle *h,
+                        int include_friend_only,
+                        const struct GNUNET_PeerIdentity *peer,
+                        GNUNET_PEERINFO_Processor callback,
+                        void *callback_cls);
 
 
 /**
@@ -158,7 +158,7 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
  * @param ic context of the iterator to cancel
  */
 void
-GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic);
+GNUNET_PEERINFO_iterate_cancel(struct GNUNET_PEERINFO_IteratorContext *ic);
 
 
 /**
@@ -183,10 +183,10 @@ struct GNUNET_PEERINFO_NotifyContext;
  * @return NULL on error
  */
 struct GNUNET_PEERINFO_NotifyContext *
-GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                        int include_friend_only,
-                        GNUNET_PEERINFO_Processor callback,
-                        void *callback_cls);
+GNUNET_PEERINFO_notify(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                       int include_friend_only,
+                       GNUNET_PEERINFO_Processor callback,
+                       void *callback_cls);
 
 
 /**
@@ -195,7 +195,7 @@ GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param nc context to stop notifying
  */
 void
-GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc);
+GNUNET_PEERINFO_notify_cancel(struct GNUNET_PEERINFO_NotifyContext *nc);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h
index bd5d18068..20130dec2 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Omar Tarabai
@@ -46,9 +46,7 @@ extern "C"
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct GNUNET_PEERSTORE_PluginFunctions
-{
-
+struct GNUNET_PEERSTORE_PluginFunctions {
   /**
    * Closure to pass to all plugin functions.
    */
@@ -119,7 +117,6 @@ struct GNUNET_PEERSTORE_PluginFunctions
                      struct GNUNET_TIME_Absolute now,
                      GNUNET_PEERSTORE_Continuation cont,
                      void *cont_cls);
-
 };
 
 
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index ad80a3fa3..ac390ada2 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -71,9 +71,7 @@ extern "C" {
 /**
  * Options for storing values in PEERSTORE
  */
-enum GNUNET_PEERSTORE_StoreOption
-{
-
+enum GNUNET_PEERSTORE_StoreOption {
   /**
    * Possibly store multiple values under given key.
    */
@@ -84,7 +82,6 @@ enum GNUNET_PEERSTORE_StoreOption
    * storing the given value.
    */
   GNUNET_PEERSTORE_STOREOPTION_REPLACE = 1
-
 };
 
 /**
@@ -100,9 +97,7 @@ struct GNUNET_PEERSTORE_StoreContext;
 /**
  * Single PEERSTORE record
  */
-struct GNUNET_PEERSTORE_Record
-{
-
+struct GNUNET_PEERSTORE_Record {
   /**
    * Responsible sub system string
    */
@@ -169,7 +164,7 @@ typedef void (*GNUNET_PEERSTORE_Processor) (
  * @return NULL on error
  */
 struct GNUNET_PEERSTORE_Handle *
-GNUNET_PEERSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_PEERSTORE_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -181,7 +176,7 @@ GNUNET_PEERSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param sync_first send any pending STORE requests before disconnecting
  */
 void
-GNUNET_PEERSTORE_disconnect (struct GNUNET_PEERSTORE_Handle *h, int sync_first);
+GNUNET_PEERSTORE_disconnect(struct GNUNET_PEERSTORE_Handle *h, int sync_first);
 
 
 /**
@@ -201,16 +196,16 @@ GNUNET_PEERSTORE_disconnect (struct GNUNET_PEERSTORE_Handle *h, int sync_first);
  * @param cont_cls Closure for @a cont
  */
 struct GNUNET_PEERSTORE_StoreContext *
-GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
-                        const char *sub_system,
-                        const struct GNUNET_PeerIdentity *peer,
-                        const char *key,
-                        const void *value,
-                        size_t size,
-                        struct GNUNET_TIME_Absolute expiry,
-                        enum GNUNET_PEERSTORE_StoreOption options,
-                        GNUNET_PEERSTORE_Continuation cont,
-                        void *cont_cls);
+GNUNET_PEERSTORE_store(struct GNUNET_PEERSTORE_Handle *h,
+                       const char *sub_system,
+                       const struct GNUNET_PeerIdentity *peer,
+                       const char *key,
+                       const void *value,
+                       size_t size,
+                       struct GNUNET_TIME_Absolute expiry,
+                       enum GNUNET_PEERSTORE_StoreOption options,
+                       GNUNET_PEERSTORE_Continuation cont,
+                       void *cont_cls);
 
 
 /**
@@ -219,7 +214,7 @@ GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
  * @param sc Store request context
  */
 void
-GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc);
+GNUNET_PEERSTORE_store_cancel(struct GNUNET_PEERSTORE_StoreContext *sc);
 
 
 /**
@@ -233,12 +228,12 @@ GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc);
  * @param callback_cls closure for @a callback
  */
 struct GNUNET_PEERSTORE_IterateContext *
-GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
-                          const char *sub_system,
-                          const struct GNUNET_PeerIdentity *peer,
-                          const char *key,
-                          GNUNET_PEERSTORE_Processor callback,
-                          void *callback_cls);
+GNUNET_PEERSTORE_iterate(struct GNUNET_PEERSTORE_Handle *h,
+                         const char *sub_system,
+                         const struct GNUNET_PeerIdentity *peer,
+                         const char *key,
+                         GNUNET_PEERSTORE_Processor callback,
+                         void *callback_cls);
 
 
 /**
@@ -248,7 +243,7 @@ GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
  * @param ic Iterate request context as returned by GNUNET_PEERSTORE_iterate()
  */
 void
-GNUNET_PEERSTORE_iterate_cancel (struct GNUNET_PEERSTORE_IterateContext *ic);
+GNUNET_PEERSTORE_iterate_cancel(struct GNUNET_PEERSTORE_IterateContext *ic);
 
 
 /**
@@ -264,12 +259,12 @@ GNUNET_PEERSTORE_iterate_cancel (struct GNUNET_PEERSTORE_IterateContext *ic);
  * @return Handle to watch request
  */
 struct GNUNET_PEERSTORE_WatchContext *
-GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
-                        const char *sub_system,
-                        const struct GNUNET_PeerIdentity *peer,
-                        const char *key,
-                        GNUNET_PEERSTORE_Processor callback,
-                        void *callback_cls);
+GNUNET_PEERSTORE_watch(struct GNUNET_PEERSTORE_Handle *h,
+                       const char *sub_system,
+                       const struct GNUNET_PeerIdentity *peer,
+                       const char *key,
+                       GNUNET_PEERSTORE_Processor callback,
+                       void *callback_cls);
 
 
 /**
@@ -278,7 +273,7 @@ GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
  * @param wc handle to the watch request
  */
 void
-GNUNET_PEERSTORE_watch_cancel (struct GNUNET_PEERSTORE_WatchContext *wc);
+GNUNET_PEERSTORE_watch_cancel(struct GNUNET_PEERSTORE_WatchContext *wc);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index bfcf1924f..67e6b5131 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -66,7 +66,7 @@ typedef void *
  * @return #GNUNET_YES if the plugin exists, #GNUNET_NO if not
  */
 int
-GNUNET_PLUGIN_test (const char *library_name);
+GNUNET_PLUGIN_test(const char *library_name);
 
 
 /**
@@ -82,8 +82,8 @@ GNUNET_PLUGIN_test (const char *library_name);
  * @return whatever the initialization function returned, NULL on error
  */
 void *
-GNUNET_PLUGIN_load (const char *library_name,
-                    void *arg);
+GNUNET_PLUGIN_load(const char *library_name,
+                   void *arg);
 
 
 /**
@@ -115,10 +115,10 @@ typedef void
  * @param cb_cls closure for @a cb
  */
 void
-GNUNET_PLUGIN_load_all (const char *basename,
-                        void *arg,
-                        GNUNET_PLUGIN_LoaderCallback cb,
-                        void *cb_cls);
+GNUNET_PLUGIN_load_all(const char *basename,
+                       void *arg,
+                       GNUNET_PLUGIN_LoaderCallback cb,
+                       void *cb_cls);
 
 
 /**
@@ -131,8 +131,8 @@ GNUNET_PLUGIN_load_all (const char *basename,
  *         or a "char *" representing the error message
  */
 void *
-GNUNET_PLUGIN_unload (const char *library_name,
-                      void *arg);
+GNUNET_PLUGIN_unload(const char *library_name,
+                     void *arg);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 1734fb94d..fcd886521 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2016, 2017 GNUnet e.V.
+   This file is part of GNUnet
+   Copyright (C) 2016, 2017 GNUnet e.V.
 
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file include/gnunet_pq_lib.h
  * @brief helper functions for Postgres DB interactions
@@ -60,9 +60,7 @@ typedef int (*GNUNET_PQ_QueryConverter) (void *cls,
 /**
  * @brief Description of a DB query parameter.
  */
-struct GNUNET_PQ_QueryParam
-{
-
+struct GNUNET_PQ_QueryParam {
   /**
    * Function for how to handle this type of entry.
    */
@@ -107,7 +105,7 @@ struct GNUNET_PQ_QueryParam
  * @oaran ptr_size number of bytes in @a ptr
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_fixed_size (const void *ptr, size_t ptr_size);
+GNUNET_PQ_query_param_fixed_size(const void *ptr, size_t ptr_size);
 
 
 /**
@@ -116,7 +114,7 @@ GNUNET_PQ_query_param_fixed_size (const void *ptr, size_t ptr_size);
  * @param ptr pointer to the string query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_string (const char *ptr);
+GNUNET_PQ_query_param_string(const char *ptr);
 
 
 /**
@@ -126,7 +124,7 @@ GNUNET_PQ_query_param_string (const char *ptr);
  * @param x pointer to the query parameter to pass.
  */
 #define GNUNET_PQ_query_param_auto_from_type(x) \
-  GNUNET_PQ_query_param_fixed_size ((x), sizeof (*(x)))
+  GNUNET_PQ_query_param_fixed_size((x), sizeof(*(x)))
 
 
 /**
@@ -136,7 +134,7 @@ GNUNET_PQ_query_param_string (const char *ptr);
  * @param x the query parameter to pass.
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_rsa_public_key (
+GNUNET_PQ_query_param_rsa_public_key(
   const struct GNUNET_CRYPTO_RsaPublicKey *x);
 
 
@@ -147,7 +145,7 @@ GNUNET_PQ_query_param_rsa_public_key (
  * @param x the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_rsa_signature (
+GNUNET_PQ_query_param_rsa_signature(
   const struct GNUNET_CRYPTO_RsaSignature *x);
 
 
@@ -158,7 +156,7 @@ GNUNET_PQ_query_param_rsa_signature (
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
+GNUNET_PQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
 
 
 /**
@@ -168,7 +166,7 @@ GNUNET_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_absolute_time_nbo (
+GNUNET_PQ_query_param_absolute_time_nbo(
   const struct GNUNET_TIME_AbsoluteNBO *x);
 
 
@@ -178,7 +176,7 @@ GNUNET_PQ_query_param_absolute_time_nbo (
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_uint16 (const uint16_t *x);
+GNUNET_PQ_query_param_uint16(const uint16_t *x);
 
 
 /**
@@ -187,7 +185,7 @@ GNUNET_PQ_query_param_uint16 (const uint16_t *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_uint32 (const uint32_t *x);
+GNUNET_PQ_query_param_uint32(const uint32_t *x);
 
 
 /**
@@ -196,7 +194,7 @@ GNUNET_PQ_query_param_uint32 (const uint32_t *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-GNUNET_PQ_query_param_uint64 (const uint64_t *x);
+GNUNET_PQ_query_param_uint64(const uint64_t *x);
 
 
 /* ************************* pq_result_helper.c functions ************************ */
@@ -236,9 +234,7 @@ typedef void (*GNUNET_PQ_ResultCleanup) (void *cls, void *rd);
 /**
  * @brief Description of a DB result cell.
  */
-struct GNUNET_PQ_ResultSpec
-{
-
+struct GNUNET_PQ_ResultSpec {
   /**
    * What is the format of the result?
    */
@@ -299,9 +295,9 @@ struct GNUNET_PQ_ResultSpec
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_variable_size (const char *name,
-                                     void **dst,
-                                     size_t *sptr);
+GNUNET_PQ_result_spec_variable_size(const char *name,
+                                    void **dst,
+                                    size_t *sptr);
 
 
 /**
@@ -313,7 +309,7 @@ GNUNET_PQ_result_spec_variable_size (const char *name,
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size);
+GNUNET_PQ_result_spec_fixed_size(const char *name, void *dst, size_t dst_size);
 
 
 /**
@@ -324,7 +320,7 @@ GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size);
  * @return array entry for the result specification to use
  */
 #define GNUNET_PQ_result_spec_auto_from_type(name, dst) \
-  GNUNET_PQ_result_spec_fixed_size (name, (dst), sizeof (*(dst)))
+  GNUNET_PQ_result_spec_fixed_size(name, (dst), sizeof(*(dst)))
 
 
 /**
@@ -335,7 +331,7 @@ GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size);
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_string (const char *name, char **dst);
+GNUNET_PQ_result_spec_string(const char *name, char **dst);
 
 
 /**
@@ -346,8 +342,8 @@ GNUNET_PQ_result_spec_string (const char *name, char **dst);
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_rsa_public_key (const char *name,
-                                      struct GNUNET_CRYPTO_RsaPublicKey **rsa);
+GNUNET_PQ_result_spec_rsa_public_key(const char *name,
+                                     struct GNUNET_CRYPTO_RsaPublicKey **rsa);
 
 
 /**
@@ -358,8 +354,8 @@ GNUNET_PQ_result_spec_rsa_public_key (const char *name,
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_rsa_signature (const char *name,
-                                     struct GNUNET_CRYPTO_RsaSignature **sig);
+GNUNET_PQ_result_spec_rsa_signature(const char *name,
+                                    struct GNUNET_CRYPTO_RsaSignature **sig);
 
 
 /**
@@ -370,8 +366,8 @@ GNUNET_PQ_result_spec_rsa_signature (const char *name,
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_absolute_time (const char *name,
-                                     struct GNUNET_TIME_Absolute *at);
+GNUNET_PQ_result_spec_absolute_time(const char *name,
+                                    struct GNUNET_TIME_Absolute *at);
 
 
 /**
@@ -382,8 +378,8 @@ GNUNET_PQ_result_spec_absolute_time (const char *name,
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_absolute_time_nbo (const char *name,
-                                         struct GNUNET_TIME_AbsoluteNBO *at);
+GNUNET_PQ_result_spec_absolute_time_nbo(const char *name,
+                                        struct GNUNET_TIME_AbsoluteNBO *at);
 
 
 /**
@@ -394,7 +390,7 @@ GNUNET_PQ_result_spec_absolute_time_nbo (const char *name,
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_uint16 (const char *name, uint16_t *u16);
+GNUNET_PQ_result_spec_uint16(const char *name, uint16_t *u16);
 
 
 /**
@@ -405,7 +401,7 @@ GNUNET_PQ_result_spec_uint16 (const char *name, uint16_t *u16);
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_uint32 (const char *name, uint32_t *u32);
+GNUNET_PQ_result_spec_uint32(const char *name, uint32_t *u32);
 
 
 /**
@@ -416,7 +412,7 @@ GNUNET_PQ_result_spec_uint32 (const char *name, uint32_t *u32);
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-GNUNET_PQ_result_spec_uint64 (const char *name, uint64_t *u64);
+GNUNET_PQ_result_spec_uint64(const char *name, uint64_t *u64);
 
 
 /* ************************* pq.c functions ************************ */
@@ -431,9 +427,9 @@ GNUNET_PQ_result_spec_uint64 (const char *name, uint64_t *u64);
  * @deprecated (should become an internal API)
  */
 PGresult *
-GNUNET_PQ_exec_prepared (PGconn *db_conn,
-                         const char *name,
-                         const struct GNUNET_PQ_QueryParam *params);
+GNUNET_PQ_exec_prepared(PGconn *db_conn,
+                        const char *name,
+                        const struct GNUNET_PQ_QueryParam *params);
 
 
 /**
@@ -448,9 +444,9 @@ GNUNET_PQ_exec_prepared (PGconn *db_conn,
  * @deprecated (should become an internal API)
  */
 int
-GNUNET_PQ_extract_result (PGresult *result,
-                          struct GNUNET_PQ_ResultSpec *rs,
-                          int row);
+GNUNET_PQ_extract_result(PGresult *result,
+                         struct GNUNET_PQ_ResultSpec *rs,
+                         int row);
 
 
 /**
@@ -460,7 +456,7 @@ GNUNET_PQ_extract_result (PGresult *result,
  * @param rs reult specification to clean up
  */
 void
-GNUNET_PQ_cleanup_result (struct GNUNET_PQ_ResultSpec *rs);
+GNUNET_PQ_cleanup_result(struct GNUNET_PQ_ResultSpec *rs);
 
 
 /* ******************** pq_eval.c functions ************** */
@@ -480,9 +476,9 @@ GNUNET_PQ_cleanup_result (struct GNUNET_PQ_ResultSpec *rs);
  * @deprecated (low level, let's see if we can do with just the high-level functions)
  */
 enum GNUNET_DB_QueryStatus
-GNUNET_PQ_eval_result (PGconn *connection,
-                       const char *statement_name,
-                       PGresult *result);
+GNUNET_PQ_eval_result(PGconn *connection,
+                      const char *statement_name,
+                      PGresult *result);
 
 
 /**
@@ -502,9 +498,9 @@ GNUNET_PQ_eval_result (PGconn *connection,
  *         zero; if INSERT was successful, we return one.
  */
 enum GNUNET_DB_QueryStatus
-GNUNET_PQ_eval_prepared_non_select (PGconn *connection,
-                                    const char *statement_name,
-                                    const struct GNUNET_PQ_QueryParam *params);
+GNUNET_PQ_eval_prepared_non_select(PGconn *connection,
+                                   const char *statement_name,
+                                   const struct GNUNET_PQ_QueryParam *params);
 
 
 /**
@@ -536,11 +532,11 @@ typedef void (*GNUNET_PQ_PostgresResultHandler) (void *cls,
  *         codes to `enum GNUNET_DB_QueryStatus`.
  */
 enum GNUNET_DB_QueryStatus
-GNUNET_PQ_eval_prepared_multi_select (PGconn *connection,
-                                      const char *statement_name,
-                                      const struct GNUNET_PQ_QueryParam *params,
-                                      GNUNET_PQ_PostgresResultHandler rh,
-                                      void *rh_cls);
+GNUNET_PQ_eval_prepared_multi_select(PGconn *connection,
+                                     const char *statement_name,
+                                     const struct GNUNET_PQ_QueryParam *params,
+                                     GNUNET_PQ_PostgresResultHandler rh,
+                                     void *rh_cls);
 
 
 /**
@@ -559,7 +555,7 @@ GNUNET_PQ_eval_prepared_multi_select (PGconn *connection,
  *         codes to `enum GNUNET_DB_QueryStatus`.
  */
 enum GNUNET_DB_QueryStatus
-GNUNET_PQ_eval_prepared_singleton_select (
+GNUNET_PQ_eval_prepared_singleton_select(
   PGconn *connection,
   const char *statement_name,
   const struct GNUNET_PQ_QueryParam *params,
@@ -573,9 +569,7 @@ GNUNET_PQ_eval_prepared_singleton_select (
  * Information needed to prepare a list of SQL statements using
  * #GNUNET_PQ_prepare_statements().
  */
-struct GNUNET_PQ_PreparedStatement
-{
-
+struct GNUNET_PQ_PreparedStatement {
   /**
    * Name of the statement.
    */
@@ -611,9 +605,9 @@ struct GNUNET_PQ_PreparedStatement
  * @return initialized struct
  */
 struct GNUNET_PQ_PreparedStatement
-GNUNET_PQ_make_prepare (const char *name,
-                        const char *sql,
-                        unsigned int num_args);
+GNUNET_PQ_make_prepare(const char *name,
+                       const char *sql,
+                       unsigned int num_args);
 
 
 /**
@@ -626,8 +620,8 @@ GNUNET_PQ_make_prepare (const char *name,
  *         #GNUNET_SYSERR on error
  */
 int
-GNUNET_PQ_prepare_statements (PGconn *connection,
-                              const struct GNUNET_PQ_PreparedStatement *ps);
+GNUNET_PQ_prepare_statements(PGconn *connection,
+                             const struct GNUNET_PQ_PreparedStatement *ps);
 
 
 /* ******************** pq_exec.c functions ************** */
@@ -637,9 +631,7 @@ GNUNET_PQ_prepare_statements (PGconn *connection,
  * Information needed to run a list of SQL statements using
  * #GNUNET_PQ_exec_statements().
  */
-struct GNUNET_PQ_ExecuteStatement
-{
-
+struct GNUNET_PQ_ExecuteStatement {
   /**
    * Actual SQL statement.
    */
@@ -668,7 +660,7 @@ struct GNUNET_PQ_ExecuteStatement
  * @return initialized struct
  */
 struct GNUNET_PQ_ExecuteStatement
-GNUNET_PQ_make_execute (const char *sql);
+GNUNET_PQ_make_execute(const char *sql);
 
 
 /**
@@ -679,7 +671,7 @@ GNUNET_PQ_make_execute (const char *sql);
  * @return initialized struct
  */
 struct GNUNET_PQ_ExecuteStatement
-GNUNET_PQ_make_try_execute (const char *sql);
+GNUNET_PQ_make_try_execute(const char *sql);
 
 
 /**
@@ -692,8 +684,8 @@ GNUNET_PQ_make_try_execute (const char *sql);
  *         #GNUNET_SYSERR on error
  */
 int
-GNUNET_PQ_exec_statements (PGconn *connection,
-                           const struct GNUNET_PQ_ExecuteStatement *es);
+GNUNET_PQ_exec_statements(PGconn *connection,
+                          const struct GNUNET_PQ_ExecuteStatement *es);
 
 
 /* ******************** pq_connect.c functions ************** */
@@ -708,7 +700,7 @@ GNUNET_PQ_exec_statements (PGconn *connection,
  * @return NULL on error
  */
 PGconn *
-GNUNET_PQ_connect (const char *config_str);
+GNUNET_PQ_connect(const char *config_str);
 
 
 /**
@@ -720,8 +712,8 @@ GNUNET_PQ_connect (const char *config_str);
  * @return the postgres handle, NULL on error
  */
 PGconn *
-GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *section);
+GNUNET_PQ_connect_with_cfg(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           const char *section);
 
 
 #endif /* GNUNET_PQ_LIB_H_ */
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index c434c9170..a65a7510d 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -75,14 +75,14 @@ typedef void
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_PROGRAM_run2 (int argc,
-                     char *const *argv,
-                     const char *binaryName,
-                     const char *binaryHelp,
-                     const struct GNUNET_GETOPT_CommandLineOption *options,
-                     GNUNET_PROGRAM_Main task,
-                     void *task_cls,
-                     int run_without_scheduler);
+GNUNET_PROGRAM_run2(int argc,
+                    char *const *argv,
+                    const char *binaryName,
+                    const char *binaryHelp,
+                    const struct GNUNET_GETOPT_CommandLineOption *options,
+                    GNUNET_PROGRAM_Main task,
+                    void *task_cls,
+                    int run_without_scheduler);
 
 
 /**
@@ -99,13 +99,13 @@ GNUNET_PROGRAM_run2 (int argc,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_PROGRAM_run (int argc,
-                    char *const *argv,
-                    const char *binaryName,
-                    const char *binaryHelp,
-                    const struct GNUNET_GETOPT_CommandLineOption *options,
-                    GNUNET_PROGRAM_Main task,
-                    void *task_cls);
+GNUNET_PROGRAM_run(int argc,
+                   char *const *argv,
+                   const char *binaryName,
+                   const char *binaryHelp,
+                   const struct GNUNET_GETOPT_CommandLineOption *options,
+                   GNUNET_PROGRAM_Main task,
+                   void *task_cls);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 45bfa4f1b..c932c44d0 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -85,8 +85,8 @@ extern "C" {
 #define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 5
 
 /*******************************************************************************
- * AGPL source code download
- * *****************************************************************************/
+* AGPL source code download
+* *****************************************************************************/
 
 /**
  * Message to request source code link.
@@ -3048,8 +3048,8 @@ extern "C" {
 
 
 /*******************************************************
-  NEW (TNG) Transport service
-  ******************************************************* */
+   NEW (TNG) Transport service
+ ******************************************************* */
 
 /**
  * @brief inform transport to add an address of this peer
diff --git a/src/include/gnunet_reclaim_attribute_lib.h b/src/include/gnunet_reclaim_attribute_lib.h
index e96937ea8..527a3977e 100644
--- a/src/include/gnunet_reclaim_attribute_lib.h
+++ b/src/include/gnunet_reclaim_attribute_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Martin Schanzenbach
@@ -54,8 +54,7 @@ extern "C" {
 /**
  * An attribute.
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_Claim
-{
+struct GNUNET_RECLAIM_ATTRIBUTE_Claim {
   /**
    * ID
    */
@@ -93,8 +92,7 @@ struct GNUNET_RECLAIM_ATTRIBUTE_Claim
 /**
  * A list of GNUNET_RECLAIM_ATTRIBUTE_Claim structures.
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList
-{
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList {
   /**
    * List head
    */
@@ -107,8 +105,7 @@ struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList
 };
 
 
-struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry
-{
+struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry {
   /**
    * DLL
    */
@@ -136,10 +133,10 @@ struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry
  * @return the new attribute
  */
 struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char *attr_name,
-                                    uint32_t type,
-                                    const void *data,
-                                    size_t data_size);
+GNUNET_RECLAIM_ATTRIBUTE_claim_new(const char *attr_name,
+                                   uint32_t type,
+                                   const void *data,
+                                   size_t data_size);
 
 
 /**
@@ -149,7 +146,7 @@ GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char *attr_name,
  * @return the required buffer size
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (
+GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size(
   const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 
 
@@ -159,7 +156,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (
  * @param attrs list to destroy
  */
 void
-GNUNET_RECLAIM_ATTRIBUTE_list_destroy (
+GNUNET_RECLAIM_ATTRIBUTE_list_destroy(
   struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 
 
@@ -172,7 +169,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_destroy (
  * @param data_size claim payload size
  */
 void
-GNUNET_RECLAIM_ATTRIBUTE_list_add (
+GNUNET_RECLAIM_ATTRIBUTE_list_add(
   struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
   const char *attr_name,
   uint32_t type,
@@ -188,7 +185,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_add (
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_list_serialize (
+GNUNET_RECLAIM_ATTRIBUTE_list_serialize(
   const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
   char *result);
 
@@ -201,7 +198,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_serialize (
  * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
  */
 struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *
-GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char *data, size_t data_size);
+GNUNET_RECLAIM_ATTRIBUTE_list_deserialize(const char *data, size_t data_size);
 
 
 /**
@@ -211,7 +208,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char *data, size_t data_size);
  * @return the required buffer size
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (
+GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size(
   const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr);
 
 
@@ -223,7 +220,7 @@ GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_ATTRIBUTE_serialize (
+GNUNET_RECLAIM_ATTRIBUTE_serialize(
   const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
   char *result);
 
@@ -237,7 +234,7 @@ GNUNET_RECLAIM_ATTRIBUTE_serialize (
  * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
  */
 struct GNUNET_RECLAIM_ATTRIBUTE_Claim *
-GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char *data, size_t data_size);
+GNUNET_RECLAIM_ATTRIBUTE_deserialize(const char *data, size_t data_size);
 
 
 /**
@@ -246,7 +243,7 @@ GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char *data, size_t data_size);
  * @return copied claim list
  */
 struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *
-GNUNET_RECLAIM_ATTRIBUTE_list_dup (
+GNUNET_RECLAIM_ATTRIBUTE_list_dup(
   const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs);
 
 
@@ -257,7 +254,7 @@ GNUNET_RECLAIM_ATTRIBUTE_list_dup (
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename);
+GNUNET_RECLAIM_ATTRIBUTE_typename_to_number(const char *typename);
 
 /**
  * Convert human-readable version of a 'claim' of an attribute to the binary
@@ -270,10 +267,10 @@ GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename);
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type,
-                                          const char *s,
-                                          void **data,
-                                          size_t *data_size);
+GNUNET_RECLAIM_ATTRIBUTE_string_to_value(uint32_t type,
+                                         const char *s,
+                                         void **data,
+                                         size_t *data_size);
 
 
 /**
@@ -285,9 +282,9 @@ GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type,
  * @return NULL on error, otherwise human-readable representation of the claim
  */
 char *
-GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type,
-                                          const void *data,
-                                          size_t data_size);
+GNUNET_RECLAIM_ATTRIBUTE_value_to_string(uint32_t type,
+                                         const void *data,
+                                         size_t data_size);
 
 
 /**
@@ -297,7 +294,7 @@ GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type,
  * @return corresponding typestring, NULL on error
  */
 const char *
-GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type);
+GNUNET_RECLAIM_ATTRIBUTE_number_to_typename(uint32_t type);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_reclaim_attribute_plugin.h b/src/include/gnunet_reclaim_attribute_plugin.h
index c05c80b07..d35916379 100644
--- a/src/include/gnunet_reclaim_attribute_plugin.h
+++ b/src/include/gnunet_reclaim_attribute_plugin.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Martin Schanzenbach
@@ -108,9 +108,7 @@ typedef const char *(*GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction) (
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions
-{
-
+struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions {
   /**
    * Closure for all of the callbacks.
    */
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 8d7babd7c..9f0a141c9 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Martin Schanzenbach
@@ -64,8 +64,7 @@ struct GNUNET_RECLAIM_Operation;
  * The contents of a ticket must be protected and should be treated as a
  * shared secret between user and relying party.
  */
-struct GNUNET_RECLAIM_Ticket
-{
+struct GNUNET_RECLAIM_Ticket {
   /**
    * The ticket issuer (= the user)
    */
@@ -92,7 +91,7 @@ struct GNUNET_RECLAIM_Ticket
  * @param ticket the ticket
  */
 typedef void (*GNUNET_RECLAIM_TicketCallback) (
-    void *cls, const struct GNUNET_RECLAIM_Ticket *ticket);
+  void *cls, const struct GNUNET_RECLAIM_Ticket *ticket);
 
 
 /**
@@ -116,8 +115,8 @@ typedef void (*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls,
  * @param attr The attribute
  */
 typedef void (*GNUNET_RECLAIM_AttributeResult) (
-    void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-    const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr);
+  void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
+  const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr);
 
 
 /**
@@ -127,7 +126,7 @@ typedef void (*GNUNET_RECLAIM_AttributeResult) (
  * @return handle to communicate with the service
  */
 struct GNUNET_RECLAIM_Handle *
-GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_RECLAIM_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -143,12 +142,12 @@ GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @return handle Used to to abort the request
  */
 struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_attribute_store (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-    const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
-    const struct GNUNET_TIME_Relative *exp_interval,
-    GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls);
+GNUNET_RECLAIM_attribute_store(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+  const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
+  const struct GNUNET_TIME_Relative *exp_interval,
+  GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls);
 
 
 /**
@@ -163,11 +162,11 @@ GNUNET_RECLAIM_attribute_store (
  * @return handle Used to to abort the request
  */
 struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_attribute_delete (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
-    const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
-    GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls);
+GNUNET_RECLAIM_attribute_delete(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
+  const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr,
+  GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls);
 
 
 /**
@@ -195,12 +194,12 @@ GNUNET_RECLAIM_attribute_delete (
  * @return an iterator Handle to use for iteration
  */
 struct GNUNET_RECLAIM_AttributeIterator *
-GNUNET_RECLAIM_get_attributes_start (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-    GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls,
-    GNUNET_RECLAIM_AttributeResult proc, void *proc_cls,
-    GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls);
+GNUNET_RECLAIM_get_attributes_start(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+  GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls,
+  GNUNET_RECLAIM_AttributeResult proc, void *proc_cls,
+  GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls);
 
 
 /**
@@ -210,8 +209,8 @@ GNUNET_RECLAIM_get_attributes_start (
  * @param it The iterator
  */
 void
-GNUNET_RECLAIM_get_attributes_next (
-    struct GNUNET_RECLAIM_AttributeIterator *it);
+GNUNET_RECLAIM_get_attributes_next(
+  struct GNUNET_RECLAIM_AttributeIterator *it);
 
 
 /**
@@ -222,8 +221,8 @@ GNUNET_RECLAIM_get_attributes_next (
  * @param it the iterator
  */
 void
-GNUNET_RECLAIM_get_attributes_stop (
-    struct GNUNET_RECLAIM_AttributeIterator *it);
+GNUNET_RECLAIM_get_attributes_stop(
+  struct GNUNET_RECLAIM_AttributeIterator *it);
 
 
 /**
@@ -240,12 +239,12 @@ GNUNET_RECLAIM_get_attributes_stop (
  * @return handle to abort the operation
  */
 struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_issue (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss,
-    const struct GNUNET_CRYPTO_EcdsaPublicKey *rp,
-    const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
-    GNUNET_RECLAIM_TicketCallback cb, void *cb_cls);
+GNUNET_RECLAIM_ticket_issue(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss,
+  const struct GNUNET_CRYPTO_EcdsaPublicKey *rp,
+  const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs,
+  GNUNET_RECLAIM_TicketCallback cb, void *cb_cls);
 
 
 /**
@@ -262,11 +261,11 @@ GNUNET_RECLAIM_ticket_issue (
  * @return handle to abort the operation
  */
 struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_revoke (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-    const struct GNUNET_RECLAIM_Ticket *ticket,
-    GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls);
+GNUNET_RECLAIM_ticket_revoke(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+  const struct GNUNET_RECLAIM_Ticket *ticket,
+  GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls);
 
 
 /**
@@ -282,11 +281,11 @@ GNUNET_RECLAIM_ticket_revoke (
  * @return handle to abort the operation
  */
 struct GNUNET_RECLAIM_Operation *
-GNUNET_RECLAIM_ticket_consume (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-    const struct GNUNET_RECLAIM_Ticket *ticket,
-    GNUNET_RECLAIM_AttributeResult cb, void *cb_cls);
+GNUNET_RECLAIM_ticket_consume(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+  const struct GNUNET_RECLAIM_Ticket *ticket,
+  GNUNET_RECLAIM_AttributeResult cb, void *cb_cls);
 
 
 /**
@@ -307,12 +306,12 @@ GNUNET_RECLAIM_ticket_consume (
  * @return an iterator handle to use for iteration
  */
 struct GNUNET_RECLAIM_TicketIterator *
-GNUNET_RECLAIM_ticket_iteration_start (
-    struct GNUNET_RECLAIM_Handle *h,
-    const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-    GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls,
-    GNUNET_RECLAIM_TicketCallback proc, void *proc_cls,
-    GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls);
+GNUNET_RECLAIM_ticket_iteration_start(
+  struct GNUNET_RECLAIM_Handle *h,
+  const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+  GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls,
+  GNUNET_RECLAIM_TicketCallback proc, void *proc_cls,
+  GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls);
 
 
 /**
@@ -322,7 +321,7 @@ GNUNET_RECLAIM_ticket_iteration_start (
  * @param it the iterator
  */
 void
-GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it);
+GNUNET_RECLAIM_ticket_iteration_next(struct GNUNET_RECLAIM_TicketIterator *it);
 
 
 /**
@@ -333,7 +332,7 @@ GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it);
  * @param it the iterator
  */
 void
-GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it);
+GNUNET_RECLAIM_ticket_iteration_stop(struct GNUNET_RECLAIM_TicketIterator *it);
 
 
 /**
@@ -342,7 +341,7 @@ GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it);
  * @param h identity provider service to disconnect
  */
 void
-GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h);
+GNUNET_RECLAIM_disconnect(struct GNUNET_RECLAIM_Handle *h);
 
 
 /**
@@ -354,7 +353,7 @@ GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h);
  * @param op operation to cancel
  */
 void
-GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op);
+GNUNET_RECLAIM_cancel(struct GNUNET_RECLAIM_Operation *op);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index 4976adc6a..19cead5d4 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Maximilian Szengel
  * @author Christian Grothoff
@@ -77,10 +77,10 @@ struct GNUNET_REGEX_Search;
  *         Must be freed by calling #GNUNET_REGEX_announce_cancel.
  */
 struct GNUNET_REGEX_Announcement *
-GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                       const char *regex,
-                       struct GNUNET_TIME_Relative refresh_delay,
-                       uint16_t compression);
+GNUNET_REGEX_announce(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                      const char *regex,
+                      struct GNUNET_TIME_Relative refresh_delay,
+                      uint16_t compression);
 
 
 /**
@@ -89,7 +89,7 @@ GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param a handle returned by a previous #GNUNET_REGEX_announce call.
  */
 void
-GNUNET_REGEX_announce_cancel (struct GNUNET_REGEX_Announcement *a);
+GNUNET_REGEX_announce_cancel(struct GNUNET_REGEX_Announcement *a);
 
 
 /**
@@ -124,10 +124,10 @@ typedef void
  *         Must be freed by calling #GNUNET_REGEX_search_cancel.
  */
 struct GNUNET_REGEX_Search *
-GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     const char *string,
-                     GNUNET_REGEX_Found callback,
-                     void *callback_cls);
+GNUNET_REGEX_search(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                    const char *string,
+                    GNUNET_REGEX_Found callback,
+                    void *callback_cls);
 
 
 /**
@@ -136,7 +136,7 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param s Handle returned by a previous #GNUNET_REGEX_search call.
  */
 void
-GNUNET_REGEX_search_cancel (struct GNUNET_REGEX_Search *s);
+GNUNET_REGEX_search_cancel(struct GNUNET_REGEX_Search *s);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index 1929feec6..1536a93ca 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -70,14 +70,14 @@ struct GNUNET_RESOLVER_RequestHandle;
  * @param cfg configuration to use
  */
 void
-GNUNET_RESOLVER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_RESOLVER_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
  * Destroy the connection to the resolver service.
  */
 void
-GNUNET_RESOLVER_disconnect (void);
+GNUNET_RESOLVER_disconnect(void);
 
 
 /**
@@ -91,11 +91,11 @@ GNUNET_RESOLVER_disconnect (void);
  * @return handle that can be used to cancel the request, NULL on error
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_ip_get (const char *hostname,
-                        int af,
-                        struct GNUNET_TIME_Relative timeout,
-                        GNUNET_RESOLVER_AddressCallback callback,
-                        void *callback_cls);
+GNUNET_RESOLVER_ip_get(const char *hostname,
+                       int af,
+                       struct GNUNET_TIME_Relative timeout,
+                       GNUNET_RESOLVER_AddressCallback callback,
+                       void *callback_cls);
 
 
 /**
@@ -108,10 +108,10 @@ GNUNET_RESOLVER_ip_get (const char *hostname,
  * @return handle that can be used to cancel the request, NULL on error
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_hostname_resolve (int af,
-                                  struct GNUNET_TIME_Relative timeout,
-                                  GNUNET_RESOLVER_AddressCallback callback,
-                                  void *cls);
+GNUNET_RESOLVER_hostname_resolve(int af,
+                                 struct GNUNET_TIME_Relative timeout,
+                                 GNUNET_RESOLVER_AddressCallback callback,
+                                 void *cls);
 
 
 /**
@@ -131,7 +131,7 @@ typedef void
  * @return local hostname, caller must free
  */
 char *
-GNUNET_RESOLVER_local_fqdn_get (void);
+GNUNET_RESOLVER_local_fqdn_get(void);
 
 
 /**
@@ -146,12 +146,12 @@ GNUNET_RESOLVER_local_fqdn_get (void);
  * @return handle that can be used to cancel the request, NULL on error
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa,
-                              socklen_t salen,
-                              int do_resolve,
-                              struct GNUNET_TIME_Relative timeout,
-                              GNUNET_RESOLVER_HostnameCallback callback,
-                              void *cls);
+GNUNET_RESOLVER_hostname_get(const struct sockaddr *sa,
+                             socklen_t salen,
+                             int do_resolve,
+                             struct GNUNET_TIME_Relative timeout,
+                             GNUNET_RESOLVER_HostnameCallback callback,
+                             void *cls);
 
 
 /**
@@ -163,7 +163,7 @@ GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa,
  * @param rh handle of request to cancel
  */
 void
-GNUNET_RESOLVER_request_cancel (struct GNUNET_RESOLVER_RequestHandle *rh);
+GNUNET_RESOLVER_request_cancel(struct GNUNET_RESOLVER_RequestHandle *rh);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index 83741ab95..e70759590 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -34,10 +34,9 @@
 #include "gnunet_util_lib.h"
 #include <microhttpd.h>
 
-#define GNUNET_REST_HANDLER_END {NULL, NULL, NULL}
+#define GNUNET_REST_HANDLER_END { NULL, NULL, NULL }
 
-struct GNUNET_REST_RequestHandle
-{
+struct GNUNET_REST_RequestHandle {
   /**
    * Map of url parameters
    */
@@ -69,14 +68,12 @@ struct GNUNET_REST_RequestHandle
   size_t data_size;
 };
 
-struct GNUNET_REST_RequestHandlerError
-{
+struct GNUNET_REST_RequestHandlerError {
   int error_code;
   char* error_text;
 };
 
-struct GNUNET_REST_RequestHandler
-{
+struct GNUNET_REST_RequestHandler {
   /**
    * Http method to handle
    */
@@ -93,7 +90,6 @@ struct GNUNET_REST_RequestHandler
   void (*proc) (struct GNUNET_REST_RequestHandle *handle,
                 const char *url,
                 void *cls);
-
 };
 
 
@@ -116,7 +112,7 @@ typedef void (*GNUNET_REST_ResultProcessor) (void *cls,
  * @return GNUNET_YES if namespace matches
  */
 int
-GNUNET_REST_namespace_match (const char *url, const char *namespace);
+GNUNET_REST_namespace_match(const char *url, const char *namespace);
 
 /**
  * Create REST MHD response
@@ -124,15 +120,15 @@ GNUNET_REST_namespace_match (const char *url, const char *namespace);
  * @param data result
  * @return MHD response
  */
- struct MHD_Response*
-GNUNET_REST_create_response (const char *data);
+struct MHD_Response*
+GNUNET_REST_create_response(const char *data);
 
 
 int
-GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle *conn,
-                            const struct GNUNET_REST_RequestHandler *handlers,
-                            struct GNUNET_REST_RequestHandlerError *err,
-                            void *cls);
+GNUNET_REST_handle_request(struct GNUNET_REST_RequestHandle *conn,
+                           const struct GNUNET_REST_RequestHandler *handlers,
+                           struct GNUNET_REST_RequestHandlerError *err,
+                           void *cls);
 
 
 #endif
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 54eeb902d..596f9937a 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -11,12 +11,12 @@
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Affero General Public License for more details.
-  
+
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-   */
+ */
 /**
  * @author Martin Schanzenbach
  *
@@ -45,9 +45,7 @@ extern "C"
 /**
  * @brief struct returned by the initialization function of the plugin
  */
-struct GNUNET_REST_Plugin
-{
-
+struct GNUNET_REST_Plugin {
   /**
    *
    * The closure of the plugin
@@ -74,7 +72,6 @@ struct GNUNET_REST_Plugin
   void (*process_request) (struct GNUNET_REST_RequestHandle *handle,
                            GNUNET_REST_ResultProcessor proc,
                            void *proc_cls);
-
 };
 
 
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index 5fb2ed7c5..2acbe89d8 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -65,7 +65,7 @@ struct GNUNET_REVOCATION_Query;
  *
  */
 typedef void (*GNUNET_REVOCATION_Callback) (void *cls,
-                                            int is_valid);
+                                            int is_valid);
 
 
 /**
@@ -78,9 +78,9 @@ typedef void (*GNUNET_REVOCATION_Callback) (void *cls,
  * @return handle to use in #GNUNET_REVOCATION_query_cancel to stop REVOCATION from invoking the callback
  */
 struct GNUNET_REVOCATION_Query *
-GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
-                         GNUNET_REVOCATION_Callback func, void *func_cls);
+GNUNET_REVOCATION_query(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                        const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
+                        GNUNET_REVOCATION_Callback func, void *func_cls);
 
 
 /**
@@ -89,7 +89,7 @@ GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param q query to cancel
  */
 void
-GNUNET_REVOCATION_query_cancel (struct GNUNET_REVOCATION_Query *q);
+GNUNET_REVOCATION_query_cancel(struct GNUNET_REVOCATION_Query *q);
 
 
 /**
@@ -114,11 +114,11 @@ struct GNUNET_REVOCATION_Handle;
  * @return handle to use in #GNUNET_REVOCATION_revoke_cancel to stop REVOCATION from invoking the callback
  */
 struct GNUNET_REVOCATION_Handle *
-GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
-                          const struct GNUNET_CRYPTO_EcdsaSignature *sig,
-                          uint64_t pow,
-                          GNUNET_REVOCATION_Callback func, void *func_cls);
+GNUNET_REVOCATION_revoke(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
+                         const struct GNUNET_CRYPTO_EcdsaSignature *sig,
+                         uint64_t pow,
+                         GNUNET_REVOCATION_Callback func, void *func_cls);
 
 
 /**
@@ -127,7 +127,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h operation to cancel
  */
 void
-GNUNET_REVOCATION_revoke_cancel (struct GNUNET_REVOCATION_Handle *h);
+GNUNET_REVOCATION_revoke_cancel(struct GNUNET_REVOCATION_Handle *h);
 
 
 /**
@@ -140,9 +140,9 @@ GNUNET_REVOCATION_revoke_cancel (struct GNUNET_REVOCATION_Handle *h);
  * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
  */
 int
-GNUNET_REVOCATION_check_pow (const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
-                             uint64_t pow,
-                             unsigned int matching_bits);
+GNUNET_REVOCATION_check_pow(const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
+                            uint64_t pow,
+                            unsigned int matching_bits);
 
 
 /**
@@ -152,8 +152,8 @@ GNUNET_REVOCATION_check_pow (const struct GNUNET_CRYPTO_EcdsaPublicKey *key,
  * @param sig where to write the revocation signature
  */
 void
-GNUNET_REVOCATION_sign_revocation (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                                   struct GNUNET_CRYPTO_EcdsaSignature *sig);
+GNUNET_REVOCATION_sign_revocation(const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+                                  struct GNUNET_CRYPTO_EcdsaSignature *sig);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h
index b669c55ef..a580d1cc2 100644
--- a/src/include/gnunet_rps_service.h
+++ b/src/include/gnunet_rps_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -62,8 +62,8 @@ struct GNUNET_RPS_Request_Handle;
  * @param peers array with num_peers PeerIDs
  */
 typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls,
-    uint64_t num_peers,
-    const struct GNUNET_PeerIdentity *peers);
+                                           uint64_t num_peers,
+                                           const struct GNUNET_PeerIdentity *peers);
 
 
 /**
@@ -76,9 +76,9 @@ typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls,
  * @param num_observed Number of IDs this sampler has observed
  */
 typedef void (* GNUNET_RPS_NotifyReadySingleInfoCB) (void *cls,
-    const struct GNUNET_PeerIdentity *peer,
-    double probability,
-    uint32_t num_observed);
+                                                     const struct GNUNET_PeerIdentity *peer,
+                                                     double probability,
+                                                     uint32_t num_observed);
 
 
 /**
@@ -88,7 +88,7 @@ typedef void (* GNUNET_RPS_NotifyReadySingleInfoCB) (void *cls,
  * @return handle to the rps service
  */
 struct GNUNET_RPS_Handle *
-GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_RPS_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -98,8 +98,8 @@ GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param shared_value The shared value that defines the members of the sub (-group)
  */
 void
-GNUNET_RPS_sub_start (struct GNUNET_RPS_Handle *h,
-                      const char *shared_value);
+GNUNET_RPS_sub_start(struct GNUNET_RPS_Handle *h,
+                     const char *shared_value);
 
 
 /**
@@ -109,8 +109,8 @@ GNUNET_RPS_sub_start (struct GNUNET_RPS_Handle *h,
  * @param shared_value The shared value that defines the members of the sub (-group)
  */
 void
-GNUNET_RPS_sub_stop (struct GNUNET_RPS_Handle *h,
-                     const char *shared_value);
+GNUNET_RPS_sub_stop(struct GNUNET_RPS_Handle *h,
+                    const char *shared_value);
 
 
 /**
@@ -128,9 +128,9 @@ GNUNET_RPS_sub_stop (struct GNUNET_RPS_Handle *h,
  * @return handle to this request
  */
 struct GNUNET_RPS_Request_Handle *
-GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *h, uint32_t n,
-                          GNUNET_RPS_NotifyReadyCB ready_cb,
-                          void *cls);
+GNUNET_RPS_request_peers(struct GNUNET_RPS_Handle *h, uint32_t n,
+                         GNUNET_RPS_NotifyReadyCB ready_cb,
+                         void *cls);
 
 
 /**
@@ -142,9 +142,9 @@ GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *h, uint32_t n,
  * @return a handle to cancel this request
  */
 struct GNUNET_RPS_Request_Handle_Single_Info *
-GNUNET_RPS_request_peer_info (struct GNUNET_RPS_Handle *rps_handle,
-                              GNUNET_RPS_NotifyReadySingleInfoCB ready_cb,
-                              void *cls);
+GNUNET_RPS_request_peer_info(struct GNUNET_RPS_Handle *rps_handle,
+                             GNUNET_RPS_NotifyReadySingleInfoCB ready_cb,
+                             void *cls);
 
 
 /**
@@ -155,8 +155,8 @@ GNUNET_RPS_request_peer_info (struct GNUNET_RPS_Handle *rps_handle,
  * @param ids the ids of the peers seeded
  */
 void
-GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h, uint32_t n,
-                     const struct GNUNET_PeerIdentity * ids);
+GNUNET_RPS_seed_ids(struct GNUNET_RPS_Handle *h, uint32_t n,
+                    const struct GNUNET_PeerIdentity * ids);
 
 /**
  * Cancle an issued request.
@@ -164,7 +164,7 @@ GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h, uint32_t n,
  * @param rh handle of the pending request to be canceled
  */
 void
-GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh);
+GNUNET_RPS_request_cancel(struct GNUNET_RPS_Request_Handle *rh);
 
 
 /**
@@ -173,8 +173,8 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh);
  * @param rhs request handle of request to cancle
  */
 void
-GNUNET_RPS_request_single_info_cancel (
-    struct GNUNET_RPS_Request_Handle_Single_Info *rhs);
+GNUNET_RPS_request_single_info_cancel(
+  struct GNUNET_RPS_Request_Handle_Single_Info *rhs);
 
 
 #if ENABLE_MALICIOUS
@@ -192,12 +192,12 @@ GNUNET_RPS_request_single_info_cancel (
  *            if @type is 2 the last id is the id of the
  *            peer to be isolated from the rest
  */
-  void
-GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
-                          uint32_t type,
-                          uint32_t num_peers,
-                          const struct GNUNET_PeerIdentity *ids,
-                          const struct GNUNET_PeerIdentity *target_peer);
+void
+GNUNET_RPS_act_malicious(struct GNUNET_RPS_Handle *h,
+                         uint32_t type,
+                         uint32_t num_peers,
+                         const struct GNUNET_PeerIdentity *ids,
+                         const struct GNUNET_PeerIdentity *target_peer);
 #endif /* ENABLE_MALICIOUS */
 
 /* Get internals for debugging/profiling purposes */
@@ -212,10 +212,10 @@ GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
  * @param ready_cb the callback called when the peers are available
  */
 void
-GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
-                         uint32_t num_updates,
-                         GNUNET_RPS_NotifyReadyCB view_update_cb,
-                         void *cls);
+GNUNET_RPS_view_request(struct GNUNET_RPS_Handle *rps_handle,
+                        uint32_t num_updates,
+                        GNUNET_RPS_NotifyReadyCB view_update_cb,
+                        void *cls);
 
 
 /**
@@ -226,9 +226,9 @@ GNUNET_RPS_view_request (struct GNUNET_RPS_Handle *rps_handle,
  * @param ready_cb the callback called when the peers are available
  */
 struct GNUNET_RPS_StreamRequestHandle *
-GNUNET_RPS_stream_request (struct GNUNET_RPS_Handle *rps_handle,
-                           GNUNET_RPS_NotifyReadyCB stream_input_cb,
-                           void *cls);
+GNUNET_RPS_stream_request(struct GNUNET_RPS_Handle *rps_handle,
+                          GNUNET_RPS_NotifyReadyCB stream_input_cb,
+                          void *cls);
 
 
 /**
@@ -237,7 +237,7 @@ GNUNET_RPS_stream_request (struct GNUNET_RPS_Handle *rps_handle,
  * @param srh The request handle to cancel
  */
 void
-GNUNET_RPS_stream_cancel (struct GNUNET_RPS_StreamRequestHandle *srh);
+GNUNET_RPS_stream_cancel(struct GNUNET_RPS_StreamRequestHandle *srh);
 
 
 /**
@@ -245,8 +245,8 @@ GNUNET_RPS_stream_cancel (struct GNUNET_RPS_StreamRequestHandle *srh);
  *
  * @param h the handle to the rps service
  */
-  void
-GNUNET_RPS_disconnect (struct GNUNET_RPS_Handle *h);
+void
+GNUNET_RPS_disconnect(struct GNUNET_RPS_Handle *h);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 5d61946bb..512d72260 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -49,9 +49,7 @@ extern "C" {
 /**
  * Result status values for the computation.
  */
-enum GNUNET_SCALARPRODUCT_ResponseStatus
-{
-
+enum GNUNET_SCALARPRODUCT_ResponseStatus {
   /**
    * Operation is still active (never returned, used internally).
    */
@@ -95,8 +93,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * An element key-value pair for scalarproduct
  */
-struct GNUNET_SCALARPRODUCT_Element
-{
+struct GNUNET_SCALARPRODUCT_Element {
   /**
    * Key used to identify matching pairs of values to multiply.
    */
@@ -155,13 +152,13 @@ struct GNUNET_SCALARPRODUCT_ComputationHandle;
  * @return a new handle for this computation
  */
 struct GNUNET_SCALARPRODUCT_ComputationHandle *
-GNUNET_SCALARPRODUCT_start_computation (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_HashCode *session_key,
-                              const struct GNUNET_PeerIdentity *peer,
-                              const struct GNUNET_SCALARPRODUCT_Element *elements,
-                              uint32_t element_count,
-                              GNUNET_SCALARPRODUCT_DatumProcessor cont,
-                              void *cont_cls);
+GNUNET_SCALARPRODUCT_start_computation(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                       const struct GNUNET_HashCode *session_key,
+                                       const struct GNUNET_PeerIdentity *peer,
+                                       const struct GNUNET_SCALARPRODUCT_Element *elements,
+                                       uint32_t element_count,
+                                       GNUNET_SCALARPRODUCT_DatumProcessor cont,
+                                       void *cont_cls);
 
 
 /**
@@ -176,12 +173,12 @@ GNUNET_SCALARPRODUCT_start_computation (const struct GNUNET_CONFIGURATION_Handle
  * @return a new handle for this computation
  */
 struct GNUNET_SCALARPRODUCT_ComputationHandle *
-GNUNET_SCALARPRODUCT_accept_computation (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                         const struct GNUNET_HashCode *key,
-                                         const struct GNUNET_SCALARPRODUCT_Element *elements,
-                                         uint32_t element_count,
-                                         GNUNET_SCALARPRODUCT_ContinuationWithStatus cont,
-                                         void *cont_cls);
+GNUNET_SCALARPRODUCT_accept_computation(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                        const struct GNUNET_HashCode *key,
+                                        const struct GNUNET_SCALARPRODUCT_Element *elements,
+                                        uint32_t element_count,
+                                        GNUNET_SCALARPRODUCT_ContinuationWithStatus cont,
+                                        void *cont_cls);
 
 
 /**
@@ -191,7 +188,7 @@ GNUNET_SCALARPRODUCT_accept_computation (const struct GNUNET_CONFIGURATION_Handl
  * @param h computation handle to terminate
  */
 void
-GNUNET_SCALARPRODUCT_cancel (struct GNUNET_SCALARPRODUCT_ComputationHandle *h);
+GNUNET_SCALARPRODUCT_cancel(struct GNUNET_SCALARPRODUCT_ComputationHandle *h);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 3f0350f54..39b16a1b4 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -52,8 +52,7 @@ struct GNUNET_SCHEDULER_Task;
  * Reasons why the schedule may have triggered
  * the task now.
  */
-enum GNUNET_SCHEDULER_Reason
-{
+enum GNUNET_SCHEDULER_Reason {
   /**
    * This task is not ready.
    */
@@ -100,9 +99,7 @@ enum GNUNET_SCHEDULER_Reason
  * Possible events on FDs, used as a bitmask.
  * Modelled after GPollFD.
  */
-enum GNUNET_SCHEDULER_EventType
-{
-
+enum GNUNET_SCHEDULER_EventType {
   /**
    * No event (useful for timeout).
    */
@@ -137,16 +134,13 @@ enum GNUNET_SCHEDULER_EventType
    *
    */
   GNUNET_SCHEDULER_ET_NVAL = 32
-
 };
 
 
 /**
  * Information about an event relating to a file descriptor/socket.
  */
-struct GNUNET_SCHEDULER_FdInfo
-{
-
+struct GNUNET_SCHEDULER_FdInfo {
   /**
    * GNUnet network socket the event is about, matches @a sock,
    * NULL if this is about a file handle or if no network
@@ -170,15 +164,13 @@ struct GNUNET_SCHEDULER_FdInfo
    * Underlying OS handle the event was about.
    */
   int sock;
-
 };
 
 
 /**
  * Context information passed to each scheduler task.
  */
-struct GNUNET_SCHEDULER_TaskContext
-{
+struct GNUNET_SCHEDULER_TaskContext {
   /**
    * Reason why the task is run now
    */
@@ -210,7 +202,6 @@ struct GNUNET_SCHEDULER_TaskContext
    * @deprecated
    */
   const struct GNUNET_NETWORK_FDSet *write_ready;
-
 };
 
 
@@ -228,8 +219,8 @@ struct GNUNET_SCHEDULER_TaskContext
  * @param fdi information about the related FD
  */
 void
-GNUNET_SCHEDULER_task_ready (struct GNUNET_SCHEDULER_Task *task,
-                             struct GNUNET_SCHEDULER_FdInfo *fdi);
+GNUNET_SCHEDULER_task_ready(struct GNUNET_SCHEDULER_Task *task,
+                            struct GNUNET_SCHEDULER_FdInfo *fdi);
 
 
 /**
@@ -241,7 +232,7 @@ struct GNUNET_SCHEDULER_Handle;
 /**
  * Function called by external event loop implementations to tell the
  * scheduler to run some of the tasks that are ready. Must be called
- * only after #GNUNET_SCHEDULER_driver_init has been called and before 
+ * only after #GNUNET_SCHEDULER_driver_init has been called and before
  * #GNUNET_SCHEDULER_driver_done is called.
  * This function may return even though there are tasks left to run
  * just to give other tasks a chance as well.  If we return #GNUNET_YES,
@@ -259,23 +250,21 @@ struct GNUNET_SCHEDULER_Handle;
  *         if we are done running tasks (yield to block)
  */
 int
-GNUNET_SCHEDULER_do_work (struct GNUNET_SCHEDULER_Handle *sh);
+GNUNET_SCHEDULER_do_work(struct GNUNET_SCHEDULER_Handle *sh);
 
 
 /**
  * API an external event loop has to implement for
  * #GNUNET_SCHEDULER_driver_init.
  */
-struct GNUNET_SCHEDULER_Driver
-{
-
+struct GNUNET_SCHEDULER_Driver {
   /**
    * Closure to pass to the functions in this struct.
    */
   void *cls;
 
   /**
-   * Add a @a task to be run if the conditions specified in the 
+   * Add a @a task to be run if the conditions specified in the
    * et field of the given @a fdi are satisfied. The et field will
    * be cleared after this call and the driver is expected to set
    * the type of the actual event before passing @a fdi to
@@ -289,7 +278,7 @@ struct GNUNET_SCHEDULER_Driver
    */
   int
   (*add)(void *cls,
-         struct GNUNET_SCHEDULER_Task *task,
+         struct GNUNET_SCHEDULER_Task *task,
          struct GNUNET_SCHEDULER_FdInfo *fdi);
 
   /**
@@ -304,7 +293,7 @@ struct GNUNET_SCHEDULER_Driver
    */
   int
   (*del)(void *cls,
-         struct GNUNET_SCHEDULER_Task *task);
+         struct GNUNET_SCHEDULER_Task *task);
 
   /**
    * Set time at which we definitively want to get a wakeup call.
@@ -314,8 +303,7 @@ struct GNUNET_SCHEDULER_Driver
    */
   void
   (*set_wakeup)(void *cls,
-                struct GNUNET_TIME_Absolute dt);
-
+                struct GNUNET_TIME_Absolute dt);
 };
 
 
@@ -332,7 +320,7 @@ typedef void
  * Function called by external event loop implementations to initialize
  * the scheduler. An external implementation has to provide @a driver
  * which contains callbacks for the scheduler (see definition of struct
- * #GNUNET_SCHEDULER_Driver). The callbacks are used to instruct the 
+ * #GNUNET_SCHEDULER_Driver). The callbacks are used to instruct the
  * external implementation to watch for events. If it detects any of
  * those events it is expected to call #GNUNET_SCHEDULER_do_work to let
  * the scheduler handle it. If an event is related to a specific task
@@ -341,11 +329,11 @@ typedef void
  * before by calling #GNUNET_SCHEDULER_task_ready.
  *
  * This function has to be called before any tasks are scheduled and
- * before GNUNET_SCHEDULER_do_work is called for the first time. It 
+ * before GNUNET_SCHEDULER_do_work is called for the first time. It
  * allocates resources that have to be freed again by calling
  * #GNUNET_SCHEDULER_driver_done.
  *
- * This function installs the same signal handlers as 
+ * This function installs the same signal handlers as
  * #GNUNET_SCHEDULER_run. This means SIGTERM (and other similar signals)
  * will induce a call to #GNUNET_SCHEDULER_shutdown during the next
  * call to #GNUNET_SCHEDULER_do_work. As a result, SIGTERM causes all
@@ -360,7 +348,7 @@ typedef void
  *         #GNUNET_SCHEDULER_driver_done
  */
 struct GNUNET_SCHEDULER_Handle *
-GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver);
+GNUNET_SCHEDULER_driver_init(const struct GNUNET_SCHEDULER_Driver *driver);
 
 
 /**
@@ -368,7 +356,7 @@ GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver);
  * by external event loop implementations after the scheduler has
  * shut down. This is the case if both of the following conditions
  * are met:
- * 
+ *
  * - all tasks the scheduler has added through the driver's add
  *   callback have been removed again through the driver's del
  *   callback
@@ -378,7 +366,7 @@ GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver);
  * @param sh the handle returned by #GNUNET_SCHEDULER_driver_init
  */
 void
-GNUNET_SCHEDULER_driver_done (struct GNUNET_SCHEDULER_Handle *sh);
+GNUNET_SCHEDULER_driver_done(struct GNUNET_SCHEDULER_Handle *sh);
 
 
 /**
@@ -387,7 +375,7 @@ GNUNET_SCHEDULER_driver_done (struct GNUNET_SCHEDULER_Handle *sh);
  * @return NULL on error
  */
 struct GNUNET_SCHEDULER_Driver *
-GNUNET_SCHEDULER_driver_select (void);
+GNUNET_SCHEDULER_driver_select(void);
 
 
 /**
@@ -424,8 +412,8 @@ typedef int
  * @param task_cls closure of @a task
  */
 void
-GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_TaskCallback task,
-                      void *task_cls);
+GNUNET_SCHEDULER_run(GNUNET_SCHEDULER_TaskCallback task,
+                     void *task_cls);
 
 /**
  * Initialize and run scheduler.  This function will return when all
@@ -439,9 +427,9 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_TaskCallback task,
  * @param task_cls closure of @a task
  */
 void
-GNUNET_SCHEDULER_run_with_optional_signals (int install_signals,
-                                            GNUNET_SCHEDULER_TaskCallback task,
-                                            void *task_cls);
+GNUNET_SCHEDULER_run_with_optional_signals(int install_signals,
+                                           GNUNET_SCHEDULER_TaskCallback task,
+                                           void *task_cls);
 
 
 /**
@@ -451,7 +439,7 @@ GNUNET_SCHEDULER_run_with_optional_signals (int install_signals,
  * will be delayed until the next shutdown signal.
  */
 void
-GNUNET_SCHEDULER_shutdown (void);
+GNUNET_SCHEDULER_shutdown(void);
 
 
 /**
@@ -466,7 +454,7 @@ GNUNET_SCHEDULER_shutdown (void);
  * @return number of tasks pending right now
  */
 unsigned int
-GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p);
+GNUNET_SCHEDULER_get_load(enum GNUNET_SCHEDULER_Priority p);
 
 
 /**
@@ -476,7 +464,7 @@ GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p);
  * @return task context with information why the current task is run
  */
 const struct GNUNET_SCHEDULER_TaskContext *
-GNUNET_SCHEDULER_get_task_context (void);
+GNUNET_SCHEDULER_get_task_context(void);
 
 
 /**
@@ -492,7 +480,7 @@ GNUNET_SCHEDULER_get_task_context (void);
  * @return original closure of the task
  */
 void *
-GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Task *task);
+GNUNET_SCHEDULER_cancel(struct GNUNET_SCHEDULER_Task *task);
 
 
 /**
@@ -506,10 +494,10 @@ GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Task *task);
  * @param priority priority to use for the task
  */
 void
-GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback task,
-                                               void *task_cls,
-                                               enum GNUNET_SCHEDULER_Reason reason,
-                                               enum GNUNET_SCHEDULER_Priority priority);
+GNUNET_SCHEDULER_add_with_reason_and_priority(GNUNET_SCHEDULER_TaskCallback task,
+                                              void *task_cls,
+                                              enum GNUNET_SCHEDULER_Reason reason,
+                                              enum GNUNET_SCHEDULER_Priority priority);
 
 
 /**
@@ -522,9 +510,9 @@ GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback tas
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio,
-                                    GNUNET_SCHEDULER_TaskCallback task,
-                                    void *task_cls);
+GNUNET_SCHEDULER_add_with_priority(enum GNUNET_SCHEDULER_Priority prio,
+                                   GNUNET_SCHEDULER_TaskCallback task,
+                                   void *task_cls);
 
 
 /**
@@ -543,8 +531,8 @@ GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_TaskCallback task,
-                          void *task_cls);
+GNUNET_SCHEDULER_add_now(GNUNET_SCHEDULER_TaskCallback task,
+                         void *task_cls);
 
 
 /**
@@ -558,8 +546,8 @@ GNUNET_SCHEDULER_add_now (GNUNET_SCHEDULER_TaskCallback task,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_shutdown (GNUNET_SCHEDULER_TaskCallback task,
-                               void *task_cls);
+GNUNET_SCHEDULER_add_shutdown(GNUNET_SCHEDULER_TaskCallback task,
+                              void *task_cls);
 
 
 /**
@@ -577,9 +565,9 @@ GNUNET_SCHEDULER_add_shutdown (GNUNET_SCHEDULER_TaskCallback task,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness,
-                                        GNUNET_SCHEDULER_TaskCallback task,
-                                        void *task_cls);
+GNUNET_SCHEDULER_add_now_with_lifeness(int lifeness,
+                                       GNUNET_SCHEDULER_TaskCallback task,
+                                       void *task_cls);
 
 
 /**
@@ -594,9 +582,9 @@ GNUNET_SCHEDULER_add_now_with_lifeness (int lifeness,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay,
-                              GNUNET_SCHEDULER_TaskCallback task,
-                              void *task_cls);
+GNUNET_SCHEDULER_add_delayed(struct GNUNET_TIME_Relative delay,
+                             GNUNET_SCHEDULER_TaskCallback task,
+                             void *task_cls);
 
 
 /**
@@ -611,9 +599,9 @@ GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_at (struct GNUNET_TIME_Absolute at,
-                         GNUNET_SCHEDULER_TaskCallback task,
-                         void *task_cls);
+GNUNET_SCHEDULER_add_at(struct GNUNET_TIME_Absolute at,
+                        GNUNET_SCHEDULER_TaskCallback task,
+                        void *task_cls);
 
 
 /**
@@ -628,10 +616,10 @@ GNUNET_SCHEDULER_add_at (struct GNUNET_TIME_Absolute at,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay,
-                                            enum GNUNET_SCHEDULER_Priority priority,
-                                            GNUNET_SCHEDULER_TaskCallback task,
-                                            void *task_cls);
+GNUNET_SCHEDULER_add_delayed_with_priority(struct GNUNET_TIME_Relative delay,
+                                           enum GNUNET_SCHEDULER_Priority priority,
+                                           GNUNET_SCHEDULER_TaskCallback task,
+                                           void *task_cls);
 
 
 /**
@@ -646,10 +634,10 @@ GNUNET_SCHEDULER_add_delayed_with_priority (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_at_with_priority (struct GNUNET_TIME_Absolute at,
-                                       enum GNUNET_SCHEDULER_Priority priority,
-                                       GNUNET_SCHEDULER_TaskCallback task,
-                                       void *task_cls);
+GNUNET_SCHEDULER_add_at_with_priority(struct GNUNET_TIME_Absolute at,
+                                      enum GNUNET_SCHEDULER_Priority priority,
+                                      GNUNET_SCHEDULER_TaskCallback task,
+                                      void *task_cls);
 
 
 /**
@@ -673,10 +661,10 @@ GNUNET_SCHEDULER_add_at_with_priority (struct GNUNET_TIME_Absolute at,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay,
-                               struct GNUNET_NETWORK_Handle *rfd,
-                               GNUNET_SCHEDULER_TaskCallback task,
-                               void *task_cls);
+GNUNET_SCHEDULER_add_read_net(struct GNUNET_TIME_Relative delay,
+                              struct GNUNET_NETWORK_Handle *rfd,
+                              GNUNET_SCHEDULER_TaskCallback task,
+                              void *task_cls);
 
 
 /**
@@ -702,11 +690,11 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay,
-                                             enum GNUNET_SCHEDULER_Priority priority,
-                                             struct GNUNET_NETWORK_Handle *rfd,
-                                             GNUNET_SCHEDULER_TaskCallback task,
-                                             void *task_cls);
+GNUNET_SCHEDULER_add_read_net_with_priority(struct GNUNET_TIME_Relative delay,
+                                            enum GNUNET_SCHEDULER_Priority priority,
+                                            struct GNUNET_NETWORK_Handle *rfd,
+                                            GNUNET_SCHEDULER_TaskCallback task,
+                                            void *task_cls);
 
 
 /**
@@ -731,10 +719,10 @@ GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
-                                struct GNUNET_NETWORK_Handle *wfd,
-                                GNUNET_SCHEDULER_TaskCallback task,
-                                void *task_cls);
+GNUNET_SCHEDULER_add_write_net(struct GNUNET_TIME_Relative delay,
+                               struct GNUNET_NETWORK_Handle *wfd,
+                               GNUNET_SCHEDULER_TaskCallback task,
+                               void *task_cls);
 
 
 /**
@@ -761,13 +749,13 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
  *         only valid until "task" is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_net_with_priority  (struct GNUNET_TIME_Relative delay,
-                                         enum GNUNET_SCHEDULER_Priority priority,
-                                         struct GNUNET_NETWORK_Handle *fd,
-                                         int on_read,
-                                         int on_write,
-                                         GNUNET_SCHEDULER_TaskCallback task,
-                                         void *task_cls);
+GNUNET_SCHEDULER_add_net_with_priority(struct GNUNET_TIME_Relative delay,
+                                       enum GNUNET_SCHEDULER_Priority priority,
+                                       struct GNUNET_NETWORK_Handle *fd,
+                                       int on_read,
+                                       int on_write,
+                                       GNUNET_SCHEDULER_TaskCallback task,
+                                       void *task_cls);
 
 
 /**
@@ -791,10 +779,10 @@ GNUNET_SCHEDULER_add_net_with_priority  (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
-                                const struct GNUNET_DISK_FileHandle *rfd,
-                                GNUNET_SCHEDULER_TaskCallback task,
-                                void *task_cls);
+GNUNET_SCHEDULER_add_read_file(struct GNUNET_TIME_Relative delay,
+                               const struct GNUNET_DISK_FileHandle *rfd,
+                               GNUNET_SCHEDULER_TaskCallback task,
+                               void *task_cls);
 
 
 /**
@@ -818,10 +806,10 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
-                                 const struct GNUNET_DISK_FileHandle *wfd,
-                                 GNUNET_SCHEDULER_TaskCallback task,
-                                 void *task_cls);
+GNUNET_SCHEDULER_add_write_file(struct GNUNET_TIME_Relative delay,
+                                const struct GNUNET_DISK_FileHandle *wfd,
+                                GNUNET_SCHEDULER_TaskCallback task,
+                                void *task_cls);
 
 
 /**
@@ -848,12 +836,12 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay,
-                                         enum GNUNET_SCHEDULER_Priority priority,
-                                         const struct GNUNET_DISK_FileHandle *fd,
-                                         int on_read, int on_write,
-                                         GNUNET_SCHEDULER_TaskCallback task,
-                                         void *task_cls);
+GNUNET_SCHEDULER_add_file_with_priority(struct GNUNET_TIME_Relative delay,
+                                        enum GNUNET_SCHEDULER_Priority priority,
+                                        const struct GNUNET_DISK_FileHandle *fd,
+                                        int on_read, int on_write,
+                                        GNUNET_SCHEDULER_TaskCallback task,
+                                        void *task_cls);
 
 
 /**
@@ -888,12 +876,12 @@ GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay,
  *         only valid until @a task is started!
  */
 struct GNUNET_SCHEDULER_Task *
-GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
-                             struct GNUNET_TIME_Relative delay,
-                             const struct GNUNET_NETWORK_FDSet *rs,
-                             const struct GNUNET_NETWORK_FDSet *ws,
-                             GNUNET_SCHEDULER_TaskCallback task,
-                             void *task_cls);
+GNUNET_SCHEDULER_add_select(enum GNUNET_SCHEDULER_Priority prio,
+                            struct GNUNET_TIME_Relative delay,
+                            const struct GNUNET_NETWORK_FDSet *rs,
+                            const struct GNUNET_NETWORK_FDSet *ws,
+                            GNUNET_SCHEDULER_TaskCallback task,
+                            void *task_cls);
 
 /**
  * Sets the select function to use in the scheduler (scheduler_select).
@@ -902,8 +890,8 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
  * @param new_select_cls closure for @a new_select
  */
 void
-GNUNET_SCHEDULER_set_select (GNUNET_SCHEDULER_select new_select,
-                             void *new_select_cls);
+GNUNET_SCHEDULER_set_select(GNUNET_SCHEDULER_select new_select,
+                            void *new_select_cls);
 
 
 
@@ -920,7 +908,7 @@ GNUNET_SCHEDULER_set_select (GNUNET_SCHEDULER_select new_select,
  * @param aid the asynchronous scope id to enter
  */
 void
-GNUNET_SCHEDULER_begin_async_scope (struct GNUNET_AsyncScopeId *aid);
+GNUNET_SCHEDULER_begin_async_scope(struct GNUNET_AsyncScopeId *aid);
 
 
 
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h
index 69cfa4514..40c98b857 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -60,39 +60,39 @@ extern "C"
  * The q-parameter for ElGamal encryption, a 1024-bit safe prime.
  */
 #define GNUNET_SECRETSHARING_ELGAMAL_P_HEX  \
-      "0x08a347d3d69e8b2dd7d1b12a08dfbccbebf4ca" \
-      "6f4269a0814e158a34312964d946b3ef22882317" \
-      "2bcf30fc08f772774cb404f9bc002a6f66b09a79" \
-      "d810d67c4f8cb3bedc6060e3c8ef874b1b64df71" \
-      "6c7d2b002da880e269438d5a776e6b5f253c8df5" \
-      "6a16b1c7ce58def07c03db48238aadfc52a354a2" \
-      "7ed285b0c1675cad3f3"
+  "0x08a347d3d69e8b2dd7d1b12a08dfbccbebf4ca" \
+  "6f4269a0814e158a34312964d946b3ef22882317" \
+  "2bcf30fc08f772774cb404f9bc002a6f66b09a79" \
+  "d810d67c4f8cb3bedc6060e3c8ef874b1b64df71" \
+  "6c7d2b002da880e269438d5a776e6b5f253c8df5" \
+  "6a16b1c7ce58def07c03db48238aadfc52a354a2" \
+  "7ed285b0c1675cad3f3"
 
 /**
  * The q-parameter for ElGamal encryption,
  * a 1023-bit Sophie Germain prime, q = (p-1)/2
  */
 #define GNUNET_SECRETSHARING_ELGAMAL_Q_HEX  \
-      "0x0451a3e9eb4f4596ebe8d895046fde65f5fa65" \
-      "37a134d040a70ac51a1894b26ca359f79144118b" \
-      "95e7987e047bb93ba65a027cde001537b3584d3c" \
-      "ec086b3e27c659df6e303071e477c3a58db26fb8" \
-      "b63e958016d4407134a1c6ad3bb735af929e46fa" \
-      "b50b58e3e72c6f783e01eda411c556fe2951aa51" \
-      "3f6942d860b3ae569f9"
+  "0x0451a3e9eb4f4596ebe8d895046fde65f5fa65" \
+  "37a134d040a70ac51a1894b26ca359f79144118b" \
+  "95e7987e047bb93ba65a027cde001537b3584d3c" \
+  "ec086b3e27c659df6e303071e477c3a58db26fb8" \
+  "b63e958016d4407134a1c6ad3bb735af929e46fa" \
+  "b50b58e3e72c6f783e01eda411c556fe2951aa51" \
+  "3f6942d860b3ae569f9"
 
 /**
  * The g-parameter for ElGamal encryption,
  * a generator of the unique size q subgroup of Z_p^*
  */
 #define GNUNET_SECRETSHARING_ELGAMAL_G_HEX  \
-      "0x05c00c36d2e822950087ef09d8252994adc4e4" \
-      "8fe3ec70269f035b46063aff0c99b633fd64df43" \
-      "02442e1914c829a41505a275438871f365e91c12" \
-      "3d5303ef9e90f4b8cb89bf86cc9b513e74a72634" \
-      "9cfd9f953674fab5d511e1c078fc72d72b34086f" \
-      "c82b4b951989eb85325cb203ff98df76bc366bba" \
-      "1d7024c3650f60d0da"
+  "0x05c00c36d2e822950087ef09d8252994adc4e4" \
+  "8fe3ec70269f035b46063aff0c99b633fd64df43" \
+  "02442e1914c829a41505a275438871f365e91c12" \
+  "3d5303ef9e90f4b8cb89bf86cc9b513e74a72634" \
+  "9cfd9f953674fab5d511e1c078fc72d72b34086f" \
+  "c82b4b951989eb85325cb203ff98df76bc366bba" \
+  "1d7024c3650f60d0da"
 
 
 
@@ -119,19 +119,17 @@ struct GNUNET_SECRETSHARING_DecryptionHandle;
 /**
  * Public key of a group sharing a secret.
  */
-struct GNUNET_SECRETSHARING_PublicKey
-{
-  uint32_t bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof (uint32_t)];
+struct GNUNET_SECRETSHARING_PublicKey {
+  uint32_t bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof(uint32_t)];
 };
 
 
 /**
  * Encrypted field element.
  */
-struct GNUNET_SECRETSHARING_Ciphertext
-{
-  uint32_t c1_bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof (uint32_t)];
-  uint32_t c2_bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof (uint32_t)];
+struct GNUNET_SECRETSHARING_Ciphertext {
+  uint32_t c1_bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof(uint32_t)];
+  uint32_t c2_bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof(uint32_t)];
 };
 
 
@@ -141,12 +139,11 @@ struct GNUNET_SECRETSHARING_Ciphertext
  * Note that we are not operating in GF(2^n), thus not every
  * bit pattern is a valid plain text.
  */
-struct GNUNET_SECRETSHARING_Plaintext
-{
+struct GNUNET_SECRETSHARING_Plaintext {
   /**
    * Value of the message.
    */
-  uint32_t bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof (uint32_t)];
+  uint32_t bits[GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 / sizeof(uint32_t)];
 };
 
 
@@ -205,15 +202,15 @@ typedef void
  * @param cls closure for @a cb
  */
 struct GNUNET_SECRETSHARING_Session *
-GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     unsigned int num_peers,
-                                     const struct GNUNET_PeerIdentity *peers,
-                                     const struct GNUNET_HashCode *session_id,
-                                     struct GNUNET_TIME_Absolute start,
-                                     struct GNUNET_TIME_Absolute deadline,
-                                     unsigned int threshold,
-                                     GNUNET_SECRETSHARING_SecretReadyCallback cb,
-                                     void *cls);
+GNUNET_SECRETSHARING_create_session(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    unsigned int num_peers,
+                                    const struct GNUNET_PeerIdentity *peers,
+                                    const struct GNUNET_HashCode *session_id,
+                                    struct GNUNET_TIME_Absolute start,
+                                    struct GNUNET_TIME_Absolute deadline,
+                                    unsigned int threshold,
+                                    GNUNET_SECRETSHARING_SecretReadyCallback cb,
+                                    void *cls);
 
 
 /**
@@ -223,7 +220,7 @@ GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *c
  * @param s session to destroy
  */
 void
-GNUNET_SECRETSHARING_session_destroy (struct GNUNET_SECRETSHARING_Session *s);
+GNUNET_SECRETSHARING_session_destroy(struct GNUNET_SECRETSHARING_Session *s);
 
 
 /**
@@ -240,9 +237,9 @@ GNUNET_SECRETSHARING_session_destroy (struct GNUNET_SECRETSHARING_Session *s);
  * @return #GNUNET_YES on succes, #GNUNET_SYSERR if the message is invalid (invalid range)
  */
 int
-GNUNET_SECRETSHARING_encrypt (const struct GNUNET_SECRETSHARING_PublicKey *public_key,
-                              const struct GNUNET_SECRETSHARING_Plaintext *plaintext,
-                              struct GNUNET_SECRETSHARING_Ciphertext *result_ciphertext);
+GNUNET_SECRETSHARING_encrypt(const struct GNUNET_SECRETSHARING_PublicKey *public_key,
+                             const struct GNUNET_SECRETSHARING_Plaintext *plaintext,
+                             struct GNUNET_SECRETSHARING_Ciphertext *result_ciphertext);
 
 
 /**
@@ -262,13 +259,13 @@ GNUNET_SECRETSHARING_encrypt (const struct GNUNET_SECRETSHARING_PublicKey *publi
  * @return handle to cancel the operation
  */
 struct GNUNET_SECRETSHARING_DecryptionHandle *
-GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              struct GNUNET_SECRETSHARING_Share *share,
-                              const struct GNUNET_SECRETSHARING_Ciphertext *ciphertext,
-                              struct GNUNET_TIME_Absolute start,
-                              struct GNUNET_TIME_Absolute deadline,
-                              GNUNET_SECRETSHARING_DecryptCallback decrypt_cb,
-                              void *decrypt_cb_cls);
+GNUNET_SECRETSHARING_decrypt(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                             struct GNUNET_SECRETSHARING_Share *share,
+                             const struct GNUNET_SECRETSHARING_Ciphertext *ciphertext,
+                             struct GNUNET_TIME_Absolute start,
+                             struct GNUNET_TIME_Absolute deadline,
+                             GNUNET_SECRETSHARING_DecryptCallback decrypt_cb,
+                             void *decrypt_cb_cls);
 
 
 /**
@@ -280,7 +277,7 @@ GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param dh to cancel
  */
 void
-GNUNET_SECRETSHARING_decrypt_cancel (struct GNUNET_SECRETSHARING_DecryptionHandle *dh);
+GNUNET_SECRETSHARING_decrypt_cancel(struct GNUNET_SECRETSHARING_DecryptionHandle *dh);
 
 
 /**
@@ -293,7 +290,7 @@ GNUNET_SECRETSHARING_decrypt_cancel (struct GNUNET_SECRETSHARING_DecryptionHandl
  * @return The share, or NULL on error.
  */
 struct GNUNET_SECRETSHARING_Share *
-GNUNET_SECRETSHARING_share_read (const void *data, size_t len, size_t *readlen);
+GNUNET_SECRETSHARING_share_read(const void *data, size_t len, size_t *readlen);
 
 
 /**
@@ -308,21 +305,21 @@ GNUNET_SECRETSHARING_share_read (const void *data, size_t len, size_t *readlen);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure.
  */
 int
-GNUNET_SECRETSHARING_share_write (const struct GNUNET_SECRETSHARING_Share *share,
-                                  void *buf, size_t buflen, size_t *writelen);
+GNUNET_SECRETSHARING_share_write(const struct GNUNET_SECRETSHARING_Share *share,
+                                 void *buf, size_t buflen, size_t *writelen);
 
 
 void
-GNUNET_SECRETSHARING_share_destroy (struct GNUNET_SECRETSHARING_Share *share);
+GNUNET_SECRETSHARING_share_destroy(struct GNUNET_SECRETSHARING_Share *share);
 
 
 int
-GNUNET_SECRETSHARING_plaintext_generate (struct GNUNET_SECRETSHARING_Plaintext *plaintext,
-                                         gcry_mpi_t exponent);
+GNUNET_SECRETSHARING_plaintext_generate(struct GNUNET_SECRETSHARING_Plaintext *plaintext,
+                                        gcry_mpi_t exponent);
 
 int
-GNUNET_SECRETSHARING_plaintext_generate_i (struct GNUNET_SECRETSHARING_Plaintext *plaintext,
-                                           int64_t exponent);
+GNUNET_SECRETSHARING_plaintext_generate_i(struct GNUNET_SECRETSHARING_Plaintext *plaintext,
+                                          int64_t exponent);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index fce912277..9cdf4d459 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -50,8 +50,7 @@ extern "C"
 /**
  * Options for the service (bitmask).
  */
-enum GNUNET_SERVICE_Options
-{
+enum GNUNET_SERVICE_Options {
   /**
    * Use defaults.  Terminates all client connections and the listen
    * sockets immediately upon receiving the shutdown signal.
@@ -165,12 +164,12 @@ typedef void
  * @return NULL on error
  */
 struct GNUNET_SERVICE_Handle *
-GNUNET_SERVICE_start (const char *service_name,
-                      const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      GNUNET_SERVICE_ConnectHandler connect_cb,
-                      GNUNET_SERVICE_DisconnectHandler disconnect_cb,
-                      void *cls,
-                      const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_SERVICE_start(const char *service_name,
+                     const struct GNUNET_CONFIGURATION_Handle *cfg,
+                     GNUNET_SERVICE_ConnectHandler connect_cb,
+                     GNUNET_SERVICE_DisconnectHandler disconnect_cb,
+                     void *cls,
+                     const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -179,7 +178,7 @@ GNUNET_SERVICE_start (const char *service_name,
  * @param srv service to stop
  */
 void
-GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv);
+GNUNET_SERVICE_stop(struct GNUNET_SERVICE_Handle *srv);
 
 
 /**
@@ -224,15 +223,15 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv);
  * @return 0 on success, non-zero on error
  */
 int
-GNUNET_SERVICE_run_ (int argc,
-                     char *const *argv,
-                     const char *service_name,
-                     enum GNUNET_SERVICE_Options options,
-                     GNUNET_SERVICE_InitCallback service_init_cb,
-                     GNUNET_SERVICE_ConnectHandler connect_cb,
-                     GNUNET_SERVICE_DisconnectHandler disconnect_cb,
-                     void *cls,
-                     const struct GNUNET_MQ_MessageHandler *handlers);
+GNUNET_SERVICE_run_(int argc,
+                    char *const *argv,
+                    const char *service_name,
+                    enum GNUNET_SERVICE_Options options,
+                    GNUNET_SERVICE_InitCallback service_init_cb,
+                    GNUNET_SERVICE_ConnectHandler connect_cb,
+                    GNUNET_SERVICE_DisconnectHandler disconnect_cb,
+                    void *cls,
+                    const struct GNUNET_MQ_MessageHandler *handlers);
 
 
 /**
@@ -286,29 +285,29 @@ GNUNET_SERVICE_run_ (int argc,
  *  &disconnect_cb,
  *  closure_for_cb,
  *  GNUNET_MQ_hd_var_size (get,
- *                         GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST,
- *                         struct GNUNET_RESOLVER_GetMessage,
+ *                         GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST,
+ *                         struct GNUNET_RESOLVER_GetMessage,
  *                         NULL),
  *  GNUNET_MQ_handler_end ());
  * </code>
  */
-#define GNUNET_SERVICE_MAIN(service_name,service_options,init_cb,connect_cb,disconnect_cb,cls,...) \
+#define GNUNET_SERVICE_MAIN(service_name, service_options, init_cb, connect_cb, disconnect_cb, cls, ...) \
   int \
-  main (int argc,\
-        char *const *argv)\
+  main(int argc, \
+       char *const *argv) \
   { \
     struct GNUNET_MQ_MessageHandler mh[] = { \
       __VA_ARGS__ \
-    };                        \
-    return GNUNET_SERVICE_run_ (argc, \
-                                argv, \
-                                service_name, \
-                                service_options, \
-                                init_cb, \
-                                connect_cb, \
-                                disconnect_cb, \
-                                cls, \
-                                mh); \
+    };                        \
+    return GNUNET_SERVICE_run_(argc, \
+                               argv, \
+                               service_name, \
+                               service_options, \
+                               init_cb, \
+                               connect_cb, \
+                               disconnect_cb, \
+                               cls, \
+                               mh); \
   }
 
 
@@ -319,7 +318,7 @@ GNUNET_SERVICE_run_ (int argc,
  * @param sh service to stop accepting connections.
  */
 void
-GNUNET_SERVICE_suspend (struct GNUNET_SERVICE_Handle *sh);
+GNUNET_SERVICE_suspend(struct GNUNET_SERVICE_Handle *sh);
 
 
 /**
@@ -328,7 +327,7 @@ GNUNET_SERVICE_suspend (struct GNUNET_SERVICE_Handle *sh);
  * @param sh service to resume accepting connections.
  */
 void
-GNUNET_SERVICE_resume (struct GNUNET_SERVICE_Handle *sh);
+GNUNET_SERVICE_resume(struct GNUNET_SERVICE_Handle *sh);
 
 
 /**
@@ -338,7 +337,7 @@ GNUNET_SERVICE_resume (struct GNUNET_SERVICE_Handle *sh);
  * @param c the client to continue receiving from
  */
 void
-GNUNET_SERVICE_client_continue (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_continue(struct GNUNET_SERVICE_Client *c);
 
 
 /**
@@ -348,7 +347,7 @@ GNUNET_SERVICE_client_continue (struct GNUNET_SERVICE_Client *c);
  * @return the message queue of @a c
  */
 struct GNUNET_MQ_Handle *
-GNUNET_SERVICE_client_get_mq (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_get_mq(struct GNUNET_SERVICE_Client *c);
 
 
 /**
@@ -360,7 +359,7 @@ GNUNET_SERVICE_client_get_mq (struct GNUNET_SERVICE_Client *c);
  * @param c client for which to disable the warning
  */
 void
-GNUNET_SERVICE_client_disable_continue_warning (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_disable_continue_warning(struct GNUNET_SERVICE_Client *c);
 
 
 /**
@@ -379,7 +378,7 @@ GNUNET_SERVICE_client_disable_continue_warning (struct GNUNET_SERVICE_Client *c)
  * @param c client to disconnect now
  */
 void
-GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_drop(struct GNUNET_SERVICE_Client *c);
 
 
 /**
@@ -388,7 +387,7 @@ GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c);
  * @param sh server to shutdown
  */
 void
-GNUNET_SERVICE_shutdown (struct GNUNET_SERVICE_Handle *sh);
+GNUNET_SERVICE_shutdown(struct GNUNET_SERVICE_Handle *sh);
 
 
 /**
@@ -404,7 +403,7 @@ GNUNET_SERVICE_shutdown (struct GNUNET_SERVICE_Handle *sh);
  * @param c client to mark as a monitor
  */
 void
-GNUNET_SERVICE_client_mark_monitor (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_mark_monitor(struct GNUNET_SERVICE_Client *c);
 
 
 /**
@@ -415,7 +414,7 @@ GNUNET_SERVICE_client_mark_monitor (struct GNUNET_SERVICE_Client *c);
  * @param c client to persist the socket (never to be closed)
  */
 void
-GNUNET_SERVICE_client_persist (struct GNUNET_SERVICE_Client *c);
+GNUNET_SERVICE_client_persist(struct GNUNET_SERVICE_Client *c);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index ac54153e1..4016fc362 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -52,7 +52,7 @@ extern "C"
 /**
  * Maximum size of a context message for set operation requests.
  */
-#define GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE ((1<<16) - 1024)
+#define GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE ((1 << 16) - 1024)
 
 
 /**
@@ -79,8 +79,7 @@ struct GNUNET_SET_OperationHandle;
 /**
  * The operation that a set set supports.
  */
-enum GNUNET_SET_OperationType
-{
+enum GNUNET_SET_OperationType {
   /**
    * A purely local set that does not support any operation.
    */
@@ -101,8 +100,7 @@ enum GNUNET_SET_OperationType
 /**
  * Status for the result callback
  */
-enum GNUNET_SET_Status
-{
+enum GNUNET_SET_Status {
   /**
    * Everything went ok, we are transmitting an element of the
    * result (in set, or to be removed from set, depending on
@@ -157,8 +155,7 @@ enum GNUNET_SET_Status
 /**
  * The way results are given to the client.
  */
-enum GNUNET_SET_ResultMode
-{
+enum GNUNET_SET_ResultMode {
   /**
    * Client gets every element in the resulting set.
    *
@@ -193,8 +190,7 @@ enum GNUNET_SET_ResultMode
 /**
  * Element stored in a set.
  */
-struct GNUNET_SET_Element
-{
+struct GNUNET_SET_Element {
   /**
    * Number of bytes in the buffer pointed to by data.
    */
@@ -217,8 +213,7 @@ struct GNUNET_SET_Element
  *
  * Used as tag for struct #GNUNET_SET_Option.
  */
-enum GNUNET_SET_OptionType
-{
+enum GNUNET_SET_OptionType {
   /**
    * List terminator.
    */
@@ -248,8 +243,7 @@ enum GNUNET_SET_OptionType
 /**
  * Option for set operations.
  */
-struct GNUNET_SET_Option
-{
+struct GNUNET_SET_Option {
   /**
    * Type of the option.
    */
@@ -341,8 +335,8 @@ typedef void
  * @return a handle to the set
  */
 struct GNUNET_SET_Handle *
-GNUNET_SET_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                   enum GNUNET_SET_OperationType op);
+GNUNET_SET_create(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                  enum GNUNET_SET_OperationType op);
 
 
 /**
@@ -359,10 +353,10 @@ GNUNET_SET_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *         set is invalid (e.g. the set service crashed)
  */
 int
-GNUNET_SET_add_element (struct GNUNET_SET_Handle *set,
-                        const struct GNUNET_SET_Element *element,
-                        GNUNET_SET_Continuation cont,
-                        void *cont_cls);
+GNUNET_SET_add_element(struct GNUNET_SET_Handle *set,
+                       const struct GNUNET_SET_Element *element,
+                       GNUNET_SET_Continuation cont,
+                       void *cont_cls);
 
 
 /**
@@ -379,16 +373,16 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set,
  *         set is invalid (e.g. the set service crashed)
  */
 int
-GNUNET_SET_remove_element (struct GNUNET_SET_Handle *set,
-                           const struct GNUNET_SET_Element *element,
-                           GNUNET_SET_Continuation cont,
-                           void *cont_cls);
+GNUNET_SET_remove_element(struct GNUNET_SET_Handle *set,
+                          const struct GNUNET_SET_Element *element,
+                          GNUNET_SET_Continuation cont,
+                          void *cont_cls);
 
 
 void
-GNUNET_SET_copy_lazy (struct GNUNET_SET_Handle *set,
-                      GNUNET_SET_CopyReadyCallback cb,
-                      void *cls);
+GNUNET_SET_copy_lazy(struct GNUNET_SET_Handle *set,
+                     GNUNET_SET_CopyReadyCallback cb,
+                     void *cls);
 
 
 /**
@@ -400,7 +394,7 @@ GNUNET_SET_copy_lazy (struct GNUNET_SET_Handle *set,
  * @param set set to destroy
  */
 void
-GNUNET_SET_destroy (struct GNUNET_SET_Handle *set);
+GNUNET_SET_destroy(struct GNUNET_SET_Handle *set);
 
 
 /**
@@ -418,13 +412,13 @@ GNUNET_SET_destroy (struct GNUNET_SET_Handle *set);
  * @return a handle to cancel the operation
  */
 struct GNUNET_SET_OperationHandle *
-GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer,
-                    const struct GNUNET_HashCode *app_id,
-                    const struct GNUNET_MessageHeader *context_msg,
-                    enum GNUNET_SET_ResultMode result_mode,
-                    struct GNUNET_SET_Option options[],
-                    GNUNET_SET_ResultIterator result_cb,
-                    void *result_cls);
+GNUNET_SET_prepare(const struct GNUNET_PeerIdentity *other_peer,
+                   const struct GNUNET_HashCode *app_id,
+                   const struct GNUNET_MessageHeader *context_msg,
+                   enum GNUNET_SET_ResultMode result_mode,
+                   struct GNUNET_SET_Option options[],
+                   GNUNET_SET_ResultIterator result_cb,
+                   void *result_cls);
 
 
 /**
@@ -442,11 +436,11 @@ GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer,
  * @return a handle that can be used to cancel the listen operation
  */
 struct GNUNET_SET_ListenHandle *
-GNUNET_SET_listen (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                   enum GNUNET_SET_OperationType op_type,
-                   const struct GNUNET_HashCode *app_id,
-                   GNUNET_SET_ListenCallback listen_cb,
-                   void *listen_cls);
+GNUNET_SET_listen(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                  enum GNUNET_SET_OperationType op_type,
+                  const struct GNUNET_HashCode *app_id,
+                  GNUNET_SET_ListenCallback listen_cb,
+                  void *listen_cls);
 
 
 /**
@@ -458,7 +452,7 @@ GNUNET_SET_listen (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param lh handle for the listen operation
  */
 void
-GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh);
+GNUNET_SET_listen_cancel(struct GNUNET_SET_ListenHandle *lh);
 
 
 /**
@@ -476,11 +470,11 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh);
  * @return a handle to cancel the operation
  */
 struct GNUNET_SET_OperationHandle *
-GNUNET_SET_accept (struct GNUNET_SET_Request *request,
-                   enum GNUNET_SET_ResultMode result_mode,
-                   struct GNUNET_SET_Option options[],
-                   GNUNET_SET_ResultIterator result_cb,
-                   void *result_cls);
+GNUNET_SET_accept(struct GNUNET_SET_Request *request,
+                  enum GNUNET_SET_ResultMode result_mode,
+                  struct GNUNET_SET_Option options[],
+                  GNUNET_SET_ResultIterator result_cb,
+                  void *result_cls);
 
 
 /**
@@ -497,8 +491,8 @@ GNUNET_SET_accept (struct GNUNET_SET_Request *request,
  *         set is invalid (e.g. the set service crashed)
  */
 int
-GNUNET_SET_commit (struct GNUNET_SET_OperationHandle *oh,
-                   struct GNUNET_SET_Handle *set);
+GNUNET_SET_commit(struct GNUNET_SET_OperationHandle *oh,
+                  struct GNUNET_SET_Handle *set);
 
 
 /**
@@ -509,7 +503,7 @@ GNUNET_SET_commit (struct GNUNET_SET_OperationHandle *oh,
  * @param oh set operation to cancel
  */
 void
-GNUNET_SET_operation_cancel (struct GNUNET_SET_OperationHandle *oh);
+GNUNET_SET_operation_cancel(struct GNUNET_SET_OperationHandle *oh);
 
 
 /**
@@ -526,9 +520,9 @@ GNUNET_SET_operation_cancel (struct GNUNET_SET_OperationHandle *oh);
  *         #GNUNET_SYSERR if the set is invalid (e.g. the server crashed, disconnected)
  */
 int
-GNUNET_SET_iterate (struct GNUNET_SET_Handle *set,
-                    GNUNET_SET_ElementIterator iter,
-                    void *iter_cls);
+GNUNET_SET_iterate(struct GNUNET_SET_Handle *set,
+                   GNUNET_SET_ElementIterator iter,
+                   void *iter_cls);
 
 
 /**
@@ -539,7 +533,7 @@ GNUNET_SET_iterate (struct GNUNET_SET_Handle *set,
  * @param set the set to stop iterating over
  */
 void
-GNUNET_SET_iterate_cancel (struct GNUNET_SET_Handle *set);
+GNUNET_SET_iterate_cancel(struct GNUNET_SET_Handle *set);
 
 
 /**
@@ -550,7 +544,7 @@ GNUNET_SET_iterate_cancel (struct GNUNET_SET_Handle *set);
  * @return the copied element
  */
 struct GNUNET_SET_Element *
-GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element);
+GNUNET_SET_element_dup(const struct GNUNET_SET_Element *element);
 
 
 /**
@@ -561,8 +555,8 @@ GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element);
  *        should be stored
  */
 void
-GNUNET_SET_element_hash (const struct GNUNET_SET_Element *element,
-                         struct GNUNET_HashCode *ret_hash);
+GNUNET_SET_element_hash(const struct GNUNET_SET_Element *element,
+                        struct GNUNET_HashCode *ret_hash);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index 167da160a..5d6e861a9 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -68,8 +68,8 @@ typedef void
  * @return context that can be used to restore, NULL on error
  */
 struct GNUNET_SIGNAL_Context *
-GNUNET_SIGNAL_handler_install (int signal,
-                               GNUNET_SIGNAL_Handler handler);
+GNUNET_SIGNAL_handler_install(int signal,
+                              GNUNET_SIGNAL_Handler handler);
 
 
 /**
@@ -79,7 +79,7 @@ GNUNET_SIGNAL_handler_install (int signal,
  *            signal handler was installed
  */
 void
-GNUNET_SIGNAL_handler_uninstall (struct GNUNET_SIGNAL_Context *ctx);
+GNUNET_SIGNAL_handler_uninstall(struct GNUNET_SIGNAL_Context *ctx);
 
 
 /**
@@ -90,7 +90,7 @@ GNUNET_SIGNAL_handler_uninstall (struct GNUNET_SIGNAL_Context *ctx);
  * @param sig the signal to raise
  */
 void
-GNUNET_SIGNAL_raise (const int sig);
+GNUNET_SIGNAL_raise(const int sig);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 30a4bb761..6801c641e 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index b82fc2afb..68a4677dd 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Jeffrey Burdges
@@ -52,8 +52,8 @@ extern "C"
  * @return GNUNET_YES if so, GNUNET_NO if not
  */
 int
-GNUNET_SOCKS_check_service (const char *service_name,
-                            const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_SOCKS_check_service(const char *service_name,
+                           const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -65,8 +65,8 @@ GNUNET_SOCKS_check_service (const char *service_name,
  *         NULL if SOCKS not configured or not configured properly
  */
 struct GNUNET_CONNECTION_Handle *
-GNUNET_SOCKS_do_connect (const char *service_name,
-                          const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_SOCKS_do_connect(const char *service_name,
+                        const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index 71f643791..261ea5981 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -1,19 +1,19 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2013 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2013 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -36,7 +36,7 @@
 #ifdef __cplusplus
 extern "C"
 {
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -74,16 +74,14 @@ typedef void (*GNUNET_SPEAKER_DestroyCallback)(void *cls);
  *        opaque to the API but should be OPUS.
  */
 typedef void (*GNUNET_SPEAKER_PlayCallback)(void *cls,
-                                            size_t data_size,
-                                            const void *data);
+                                            size_t data_size,
+                                            const void *data);
 
 
 /**
  * A speaker is a device that can play or record audio data.
  */
-struct GNUNET_SPEAKER_Handle
-{
-
+struct GNUNET_SPEAKER_Handle {
   /**
    * Turn on the speaker.
    */
@@ -108,7 +106,6 @@ struct GNUNET_SPEAKER_Handle
    * Closure for the callbacks.
    */
   void *cls;
-
 };
 
 
@@ -120,7 +117,7 @@ struct GNUNET_SPEAKER_Handle
  * @return NULL on error
  */
 struct GNUNET_SPEAKER_Handle *
-GNUNET_SPEAKER_create_from_hardware (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_SPEAKER_create_from_hardware(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -129,10 +126,10 @@ GNUNET_SPEAKER_create_from_hardware (const struct GNUNET_CONFIGURATION_Handle *c
  * @param speaker speaker to destroy
  */
 void
-GNUNET_SPEAKER_destroy (struct GNUNET_SPEAKER_Handle *speaker);
+GNUNET_SPEAKER_destroy(struct GNUNET_SPEAKER_Handle *speaker);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index ebc79d098..31ac0675c 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -1,22 +1,22 @@
 /*
-  This file is part of GNUnet
-  Copyright (C) 2017 GNUnet e.V.
-
-  GNUnet is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License,
-  or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Affero General Public License for more details.
- 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   This file is part of GNUnet
+   Copyright (C) 2017 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file include/gnunet_sq_lib.h
  * @brief helper functions for Sqlite3 DB interactions
@@ -42,18 +42,16 @@
  */
 typedef int
 (*GNUNET_SQ_QueryConverter)(void *cls,
-                            const void *data,
-                            size_t data_len,
-                            sqlite3_stmt *stmt,
+                            const void *data,
+                            size_t data_len,
+                            sqlite3_stmt *stmt,
                             unsigned int off);
 
 
 /**
  * @brief Description of a DB query parameter.
  */
-struct GNUNET_SQ_QueryParam
-{
-
+struct GNUNET_SQ_QueryParam {
   /**
    * Function for how to handle this type of entry.
    */
@@ -95,8 +93,8 @@ struct GNUNET_SQ_QueryParam
  * @oaran ptr_size number of bytes in @a ptr
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_fixed_size (const void *ptr,
-                                  size_t ptr_size);
+GNUNET_SQ_query_param_fixed_size(const void *ptr,
+                                 size_t ptr_size);
 
 
 
@@ -106,7 +104,7 @@ GNUNET_SQ_query_param_fixed_size (const void *ptr,
  * @param ptr pointer to the string query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_string (const char *ptr);
+GNUNET_SQ_query_param_string(const char *ptr);
 
 
 /**
@@ -115,7 +113,7 @@ GNUNET_SQ_query_param_string (const char *ptr);
  *
  * @param x pointer to the query parameter to pass.
  */
-#define GNUNET_SQ_query_param_auto_from_type(x) GNUNET_SQ_query_param_fixed_size ((x), sizeof (*(x)))
+#define GNUNET_SQ_query_param_auto_from_type(x) GNUNET_SQ_query_param_fixed_size((x), sizeof(*(x)))
 
 
 /**
@@ -125,7 +123,7 @@ GNUNET_SQ_query_param_string (const char *ptr);
  * @param x the query parameter to pass.
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *x);
+GNUNET_SQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_RsaPublicKey *x);
 
 
 /**
@@ -135,7 +133,7 @@ GNUNET_SQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *x
  * @param x the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x);
+GNUNET_SQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_RsaSignature *x);
 
 
 /**
@@ -145,7 +143,7 @@ GNUNET_SQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x)
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
+GNUNET_SQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
 
 
 /**
@@ -155,7 +153,7 @@ GNUNET_SQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO *x);
+GNUNET_SQ_query_param_absolute_time_nbo(const struct GNUNET_TIME_AbsoluteNBO *x);
 
 
 /**
@@ -164,7 +162,7 @@ GNUNET_SQ_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO *x
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint16 (const uint16_t *x);
+GNUNET_SQ_query_param_uint16(const uint16_t *x);
 
 
 /**
@@ -173,7 +171,7 @@ GNUNET_SQ_query_param_uint16 (const uint16_t *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint32 (const uint32_t *x);
+GNUNET_SQ_query_param_uint32(const uint32_t *x);
 
 
 /**
@@ -182,7 +180,7 @@ GNUNET_SQ_query_param_uint32 (const uint32_t *x);
  * @param x pointer to the query parameter to pass
  */
 struct GNUNET_SQ_QueryParam
-GNUNET_SQ_query_param_uint64 (const uint64_t *x);
+GNUNET_SQ_query_param_uint64(const uint64_t *x);
 
 
 /**
@@ -193,8 +191,8 @@ GNUNET_SQ_query_param_uint64 (const uint64_t *x);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_SQ_bind (sqlite3_stmt *stmt,
-                const struct GNUNET_SQ_QueryParam *params);
+GNUNET_SQ_bind(sqlite3_stmt *stmt,
+               const struct GNUNET_SQ_QueryParam *params);
 
 
 /**
@@ -204,8 +202,8 @@ GNUNET_SQ_bind (sqlite3_stmt *stmt,
  * @param stmt statement to reset
  */
 void
-GNUNET_SQ_reset (sqlite3 *dbh,
-                 sqlite3_stmt *stmt);
+GNUNET_SQ_reset(sqlite3 *dbh,
+                sqlite3_stmt *stmt);
 
 
 /**
@@ -222,10 +220,10 @@ GNUNET_SQ_reset (sqlite3 *dbh,
  */
 typedef int
 (*GNUNET_SQ_ResultConverter)(void *cls,
-                             sqlite3_stmt *result,
+                             sqlite3_stmt *result,
                              unsigned int column,
-                             size_t *dst_size,
-                             void *dst);
+                             size_t *dst_size,
+                             void *dst);
 
 
 /**
@@ -247,9 +245,7 @@ typedef void
 /**
  * @brief Description of a DB result cell.
  */
-struct GNUNET_SQ_ResultSpec
-{
-
+struct GNUNET_SQ_ResultSpec {
   /**
    * What is the format of the result?
    */
@@ -289,7 +285,6 @@ struct GNUNET_SQ_ResultSpec
    * Number of parameters (columns) eaten by this operation.
    */
   unsigned int num_params;
-
 };
 
 
@@ -309,8 +304,8 @@ struct GNUNET_SQ_ResultSpec
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_variable_size (void **dst,
-                                     size_t *sptr);
+GNUNET_SQ_result_spec_variable_size(void **dst,
+                                    size_t *sptr);
 
 
 /**
@@ -321,8 +316,8 @@ GNUNET_SQ_result_spec_variable_size (void **dst,
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_fixed_size (void *dst,
-                                  size_t dst_size);
+GNUNET_SQ_result_spec_fixed_size(void *dst,
+                                 size_t dst_size);
 
 
 /**
@@ -331,7 +326,7 @@ GNUNET_SQ_result_spec_fixed_size (void *dst,
  * @param dst point to where to store the result, type fits expected result size
  * @return array entry for the result specification to use
  */
-#define GNUNET_SQ_result_spec_auto_from_type(dst) GNUNET_SQ_result_spec_fixed_size ((dst), sizeof (*(dst)))
+#define GNUNET_SQ_result_spec_auto_from_type(dst) GNUNET_SQ_result_spec_fixed_size((dst), sizeof(*(dst)))
 
 
 /**
@@ -342,8 +337,8 @@ GNUNET_SQ_result_spec_fixed_size (void *dst,
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_variable_size (void **dst,
-                                     size_t *sptr);
+GNUNET_SQ_result_spec_variable_size(void **dst,
+                                    size_t *sptr);
 
 
 /**
@@ -353,7 +348,7 @@ GNUNET_SQ_result_spec_variable_size (void **dst,
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_string (char **dst);
+GNUNET_SQ_result_spec_string(char **dst);
 
 
 /**
@@ -363,7 +358,7 @@ GNUNET_SQ_result_spec_string (char **dst);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa);
+GNUNET_SQ_result_spec_rsa_public_key(struct GNUNET_CRYPTO_RsaPublicKey **rsa);
 
 
 /**
@@ -373,7 +368,7 @@ GNUNET_SQ_result_spec_rsa_public_key (struct GNUNET_CRYPTO_RsaPublicKey **rsa);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig);
+GNUNET_SQ_result_spec_rsa_signature(struct GNUNET_CRYPTO_RsaSignature **sig);
 
 
 /**
@@ -383,7 +378,7 @@ GNUNET_SQ_result_spec_rsa_signature (struct GNUNET_CRYPTO_RsaSignature **sig);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_absolute_time (struct GNUNET_TIME_Absolute *at);
+GNUNET_SQ_result_spec_absolute_time(struct GNUNET_TIME_Absolute *at);
 
 
 /**
@@ -393,7 +388,7 @@ GNUNET_SQ_result_spec_absolute_time (struct GNUNET_TIME_Absolute *at);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_absolute_time_nbo (struct GNUNET_TIME_AbsoluteNBO *at);
+GNUNET_SQ_result_spec_absolute_time_nbo(struct GNUNET_TIME_AbsoluteNBO *at);
 
 
 /**
@@ -403,7 +398,7 @@ GNUNET_SQ_result_spec_absolute_time_nbo (struct GNUNET_TIME_AbsoluteNBO *at);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_uint16 (uint16_t *u16);
+GNUNET_SQ_result_spec_uint16(uint16_t *u16);
 
 
 /**
@@ -413,7 +408,7 @@ GNUNET_SQ_result_spec_uint16 (uint16_t *u16);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_uint32 (uint32_t *u32);
+GNUNET_SQ_result_spec_uint32(uint32_t *u32);
 
 
 /**
@@ -423,7 +418,7 @@ GNUNET_SQ_result_spec_uint32 (uint32_t *u32);
  * @return array entry for the result specification to use
  */
 struct GNUNET_SQ_ResultSpec
-GNUNET_SQ_result_spec_uint64 (uint64_t *u64);
+GNUNET_SQ_result_spec_uint64(uint64_t *u64);
 
 
 /**
@@ -436,8 +431,8 @@ GNUNET_SQ_result_spec_uint64 (uint64_t *u64);
  *   #GNUNET_SYSERR if a result was invalid (non-existing field)
  */
 int
-GNUNET_SQ_extract_result (sqlite3_stmt *result,
-                          struct GNUNET_SQ_ResultSpec *rs);
+GNUNET_SQ_extract_result(sqlite3_stmt *result,
+                         struct GNUNET_SQ_ResultSpec *rs);
 
 
 /**
@@ -447,7 +442,7 @@ GNUNET_SQ_extract_result (sqlite3_stmt *result,
  * @param rs reult specification to clean up
  */
 void
-GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs);
+GNUNET_SQ_cleanup_result(struct GNUNET_SQ_ResultSpec *rs);
 
 
 
@@ -459,7 +454,6 @@ GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs);
  * #GNUNET_SQ_exec_statements().
  */
 struct GNUNET_SQ_PrepareStatement {
-
   /**
    * Actual SQL statement.
    */
@@ -469,7 +463,6 @@ struct GNUNET_SQ_PrepareStatement {
    * Where to store handle?
    */
   sqlite3_stmt **pstmt;
-
 };
 
 
@@ -487,8 +480,8 @@ struct GNUNET_SQ_PrepareStatement {
  * @return initialized struct
  */
 struct GNUNET_SQ_PrepareStatement
-GNUNET_SQ_make_prepare (const char *sql,
-                        sqlite3_stmt **pstmt);
+GNUNET_SQ_make_prepare(const char *sql,
+                       sqlite3_stmt **pstmt);
 
 
 
@@ -501,8 +494,8 @@ GNUNET_SQ_make_prepare (const char *sql,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_SQ_prepare (sqlite3 *dbh,
-                   const struct GNUNET_SQ_PrepareStatement *ps);
+GNUNET_SQ_prepare(sqlite3 *dbh,
+                  const struct GNUNET_SQ_PrepareStatement *ps);
 
 
 /* ******************** sq_exec.c functions ************** */
@@ -513,7 +506,6 @@ GNUNET_SQ_prepare (sqlite3 *dbh,
  * #GNUNET_SQ_exec_statements().
  */
 struct GNUNET_SQ_ExecuteStatement {
-
   /**
    * Actual SQL statement.
    */
@@ -523,7 +515,6 @@ struct GNUNET_SQ_ExecuteStatement {
    * Should we ignore errors?
    */
   int ignore_errors;
-
 };
 
 
@@ -540,7 +531,7 @@ struct GNUNET_SQ_ExecuteStatement {
  * @return initialized struct
  */
 struct GNUNET_SQ_ExecuteStatement
-GNUNET_SQ_make_execute (const char *sql);
+GNUNET_SQ_make_execute(const char *sql);
 
 
 /**
@@ -551,7 +542,7 @@ GNUNET_SQ_make_execute (const char *sql);
  * @return initialized struct
  */
 struct GNUNET_SQ_ExecuteStatement
-GNUNET_SQ_make_try_execute (const char *sql);
+GNUNET_SQ_make_try_execute(const char *sql);
 
 
 /**
@@ -564,8 +555,8 @@ GNUNET_SQ_make_try_execute (const char *sql);
  *         #GNUNET_SYSERR on error
  */
 int
-GNUNET_SQ_exec_statements (sqlite3 *dbh,
-                           const struct GNUNET_SQ_ExecuteStatement *es);
+GNUNET_SQ_exec_statements(sqlite3 *dbh,
+                          const struct GNUNET_SQ_ExecuteStatement *es);
 
 
 
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index 94fa49358..3dd6e9ce1 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -85,8 +85,8 @@ typedef int
  * @return handle to use
  */
 struct GNUNET_STATISTICS_Handle *
-GNUNET_STATISTICS_create (const char *subsystem,
-                          const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_STATISTICS_create(const char *subsystem,
+                         const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -97,8 +97,8 @@ GNUNET_STATISTICS_create (const char *subsystem,
  *        be completed
  */
 void
-GNUNET_STATISTICS_destroy (struct GNUNET_STATISTICS_Handle *h,
-                           int sync_first);
+GNUNET_STATISTICS_destroy(struct GNUNET_STATISTICS_Handle *h,
+                          int sync_first);
 
 
 /**
@@ -112,11 +112,11 @@ GNUNET_STATISTICS_destroy (struct GNUNET_STATISTICS_Handle *h,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_STATISTICS_watch (struct GNUNET_STATISTICS_Handle *handle,
-                         const char *subsystem,
-                         const char *name,
-                         GNUNET_STATISTICS_Iterator proc,
-                         void *proc_cls);
+GNUNET_STATISTICS_watch(struct GNUNET_STATISTICS_Handle *handle,
+                        const char *subsystem,
+                        const char *name,
+                        GNUNET_STATISTICS_Iterator proc,
+                        void *proc_cls);
 
 
 /**
@@ -130,11 +130,11 @@ GNUNET_STATISTICS_watch (struct GNUNET_STATISTICS_Handle *handle,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error (no such watch)
  */
 int
-GNUNET_STATISTICS_watch_cancel (struct GNUNET_STATISTICS_Handle *handle,
-                                const char *subsystem,
-                                const char *name,
-                                GNUNET_STATISTICS_Iterator proc,
-                                void *proc_cls);
+GNUNET_STATISTICS_watch_cancel(struct GNUNET_STATISTICS_Handle *handle,
+                               const char *subsystem,
+                               const char *name,
+                               GNUNET_STATISTICS_Iterator proc,
+                               void *proc_cls);
 
 
 /**
@@ -168,12 +168,12 @@ struct GNUNET_STATISTICS_GetHandle;
  * @return NULL on error
  */
 struct GNUNET_STATISTICS_GetHandle *
-GNUNET_STATISTICS_get (struct GNUNET_STATISTICS_Handle *handle,
-                       const char *subsystem,
-                       const char *name,
-                       GNUNET_STATISTICS_Callback cont,
-                       GNUNET_STATISTICS_Iterator proc,
-                       void *cls);
+GNUNET_STATISTICS_get(struct GNUNET_STATISTICS_Handle *handle,
+                      const char *subsystem,
+                      const char *name,
+                      GNUNET_STATISTICS_Callback cont,
+                      GNUNET_STATISTICS_Iterator proc,
+                      void *cls);
 
 
 /**
@@ -183,7 +183,7 @@ GNUNET_STATISTICS_get (struct GNUNET_STATISTICS_Handle *handle,
  * @param gh handle of the request to cancel
  */
 void
-GNUNET_STATISTICS_get_cancel (struct GNUNET_STATISTICS_GetHandle *gh);
+GNUNET_STATISTICS_get_cancel(struct GNUNET_STATISTICS_GetHandle *gh);
 
 
 /**
@@ -196,10 +196,10 @@ GNUNET_STATISTICS_get_cancel (struct GNUNET_STATISTICS_GetHandle *gh);
  * @param make_persistent should the value be kept across restarts?
  */
 void
-GNUNET_STATISTICS_set (struct GNUNET_STATISTICS_Handle *handle,
-                       const char *name,
-                       uint64_t value,
-                       int make_persistent);
+GNUNET_STATISTICS_set(struct GNUNET_STATISTICS_Handle *handle,
+                      const char *name,
+                      uint64_t value,
+                      int make_persistent);
 
 
 /**
@@ -212,10 +212,10 @@ GNUNET_STATISTICS_set (struct GNUNET_STATISTICS_Handle *handle,
  * @param make_persistent should the value be kept across restarts?
  */
 void
-GNUNET_STATISTICS_update (struct GNUNET_STATISTICS_Handle *handle,
-                          const char *name,
-                          int64_t delta,
-                          int make_persistent);
+GNUNET_STATISTICS_update(struct GNUNET_STATISTICS_Handle *handle,
+                         const char *name,
+                         int64_t delta,
+                         int make_persistent);
 
 
 
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index db657f54e..25dfada42 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -61,8 +61,8 @@ extern "C"
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_STRINGS_fancy_size_to_bytes (const char *fancy_size,
-                                    unsigned long long *size);
+GNUNET_STRINGS_fancy_size_to_bytes(const char *fancy_size,
+                                   unsigned long long *size);
 
 
 /**
@@ -74,8 +74,8 @@ GNUNET_STRINGS_fancy_size_to_bytes (const char *fancy_size,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_STRINGS_fancy_time_to_relative (const char *fancy_time,
-                                       struct GNUNET_TIME_Relative *rtime);
+GNUNET_STRINGS_fancy_time_to_relative(const char *fancy_time,
+                                      struct GNUNET_TIME_Relative *rtime);
 
 
 /**
@@ -89,8 +89,8 @@ GNUNET_STRINGS_fancy_time_to_relative (const char *fancy_time,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GNUNET_STRINGS_fancy_time_to_absolute (const char *fancy_time,
-                                       struct GNUNET_TIME_Absolute *atime);
+GNUNET_STRINGS_fancy_time_to_absolute(const char *fancy_time,
+                                      struct GNUNET_TIME_Absolute *atime);
 
 
 /**
@@ -100,7 +100,7 @@ GNUNET_STRINGS_fancy_time_to_absolute (const char *fancy_time,
  * @return fancy representation of the size (possibly rounded) for humans
  */
 char *
-GNUNET_STRINGS_byte_size_fancy (unsigned long long size);
+GNUNET_STRINGS_byte_size_fancy(unsigned long long size);
 
 
 /**
@@ -117,9 +117,9 @@ GNUNET_STRINGS_byte_size_fancy (unsigned long long size);
  *  string is returned.
  */
 char *
-GNUNET_STRINGS_conv (const char *input, size_t len,
-                     const char *input_charset,
-                     const char *output_charset);
+GNUNET_STRINGS_conv(const char *input, size_t len,
+                    const char *input_charset,
+                    const char *output_charset);
 
 
 /**
@@ -133,9 +133,9 @@ GNUNET_STRINGS_conv (const char *input, size_t len,
  * @return the converted string (0-terminated)
  */
 char *
-GNUNET_STRINGS_to_utf8 (const char *input,
-                        size_t len,
-                        const char *charset);
+GNUNET_STRINGS_to_utf8(const char *input,
+                       size_t len,
+                       const char *charset);
 
 
 /**
@@ -150,9 +150,9 @@ GNUNET_STRINGS_to_utf8 (const char *input,
  *  string is returned.
  */
 char *
-GNUNET_STRINGS_from_utf8 (const char *input,
-                          size_t len,
-                          const char *charset);
+GNUNET_STRINGS_from_utf8(const char *input,
+                         size_t len,
+                         const char *charset);
 
 
 /**
@@ -163,8 +163,8 @@ GNUNET_STRINGS_from_utf8 (const char *input,
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_tolower (const char *input,
-                             char *output);
+GNUNET_STRINGS_utf8_tolower(const char *input,
+                            char *output);
 
 
 /**
@@ -175,8 +175,8 @@ GNUNET_STRINGS_utf8_tolower (const char *input,
  * @param output output buffer
  */
 void
-GNUNET_STRINGS_utf8_toupper (const char *input,
-                             char *output);
+GNUNET_STRINGS_utf8_toupper(const char *input,
+                            char *output);
 
 
 /**
@@ -188,7 +188,7 @@ GNUNET_STRINGS_utf8_toupper (const char *input,
  *          NULL is returned on error
  */
 char *
-GNUNET_STRINGS_filename_expand (const char *fil);
+GNUNET_STRINGS_filename_expand(const char *fil);
 
 
 /**
@@ -211,10 +211,10 @@ GNUNET_STRINGS_filename_expand (const char *fil);
  *         (or number of bytes that would have been written)
  */
 size_t
-GNUNET_STRINGS_buffer_fill (char *buffer,
-                            size_t size,
-                            unsigned int count,
-                            ...);
+GNUNET_STRINGS_buffer_fill(char *buffer,
+                           size_t size,
+                           unsigned int count,
+                           ...);
 
 
 /**
@@ -230,9 +230,9 @@ GNUNET_STRINGS_buffer_fill (char *buffer,
  *         in the buffer, or 0 on error.
  */
 unsigned int
-GNUNET_STRINGS_buffer_tokenize (const char *buffer,
-                                size_t size,
-                                unsigned int count, ...);
+GNUNET_STRINGS_buffer_tokenize(const char *buffer,
+                               size_t size,
+                               unsigned int count, ...);
 
 
 
@@ -247,7 +247,7 @@ GNUNET_STRINGS_buffer_tokenize (const char *buffer,
  * @return timestamp in human-readable form in local time
  */
 const char *
-GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t);
+GNUNET_STRINGS_absolute_time_to_string(struct GNUNET_TIME_Absolute t);
 
 
 /**
@@ -261,8 +261,8 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t);
  * @return string in human-readable form
  */
 const char *
-GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative delta,
-                                        int do_round);
+GNUNET_STRINGS_relative_time_to_string(struct GNUNET_TIME_Relative delta,
+                                       int do_round);
 
 
 /**
@@ -277,7 +277,7 @@ GNUNET_STRINGS_relative_time_to_string (struct GNUNET_TIME_Relative delta,
  *         itself.
  */
 const char *
-GNUNET_STRINGS_get_short_name (const char *filename);
+GNUNET_STRINGS_get_short_name(const char *filename);
 
 
 /**
@@ -293,10 +293,10 @@ GNUNET_STRINGS_get_short_name (const char *filename);
  * @return pointer to the next byte in 'out' or NULL on error.
  */
 char *
-GNUNET_STRINGS_data_to_string (const void *data,
-                               size_t size,
-                               char *out,
-                               size_t out_size);
+GNUNET_STRINGS_data_to_string(const void *data,
+                              size_t size,
+                              char *out,
+                              size_t out_size);
 
 
 /**
@@ -310,8 +310,8 @@ GNUNET_STRINGS_data_to_string (const void *data,
  * @return freshly allocated, null-terminated string
  */
 char *
-GNUNET_STRINGS_data_to_string_alloc (const void *buf,
-                                     size_t size);
+GNUNET_STRINGS_data_to_string_alloc(const void *buf,
+                                    size_t size);
 
 
 /**
@@ -325,10 +325,10 @@ GNUNET_STRINGS_data_to_string_alloc (const void *buf,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if result has the wrong encoding
  */
 int
-GNUNET_STRINGS_string_to_data (const char *enc,
-                               size_t enclen,
-                               void *out,
-                               size_t out_size);
+GNUNET_STRINGS_string_to_data(const char *enc,
+                              size_t enclen,
+                              void *out,
+                              size_t out_size);
 
 
 /**
@@ -341,9 +341,9 @@ GNUNET_STRINGS_string_to_data (const char *enc,
  * @return the size of the output
  */
 size_t
-GNUNET_STRINGS_base64_encode (const void *in,
-                              size_t len,
-                              char **output);
+GNUNET_STRINGS_base64_encode(const void *in,
+                             size_t len,
+                             char **output);
 
 
 /**
@@ -356,9 +356,9 @@ GNUNET_STRINGS_base64_encode (const void *in,
  * @return the size of the output
  */
 size_t
-GNUNET_STRINGS_base64_decode (const char *data,
-                              size_t len,
-                              void **output);
+GNUNET_STRINGS_base64_decode(const char *data,
+                             size_t len,
+                             void **output);
 
 
 /**
@@ -369,8 +369,8 @@ GNUNET_STRINGS_base64_decode (const char *data,
  * @return string representing the array of @a pids
  */
 char *
-GNUNET_STRINGS_pp2s (const struct GNUNET_PeerIdentity *pids,
-                     unsigned int num_pids);
+GNUNET_STRINGS_pp2s(const struct GNUNET_PeerIdentity *pids,
+                    unsigned int num_pids);
 
 
 /**
@@ -390,9 +390,9 @@ GNUNET_STRINGS_pp2s (const struct GNUNET_PeerIdentity *pids,
  *         (if they weren't NULL).
  */
 int
-GNUNET_STRINGS_parse_uri (const char *path,
-                          char **scheme_part,
-                          const char **path_part);
+GNUNET_STRINGS_parse_uri(const char *path,
+                         char **scheme_part,
+                         const char **path_part);
 
 
 /**
@@ -410,17 +410,16 @@ GNUNET_STRINGS_parse_uri (const char *path,
  * @return #GNUNET_YES if 'filename' is absolute, #GNUNET_NO otherwise.
  */
 int
-GNUNET_STRINGS_path_is_absolute (const char *filename,
-                                 int can_be_uri,
-                                 int *r_is_uri,
-                                 char **r_uri_scheme);
+GNUNET_STRINGS_path_is_absolute(const char *filename,
+                                int can_be_uri,
+                                int *r_is_uri,
+                                char **r_uri_scheme);
 
 
 /**
  * Flags for what we should check a file for.
  */
-enum GNUNET_STRINGS_FilenameCheck
-{
+enum GNUNET_STRINGS_FilenameCheck {
   /**
    * Check that it exists.
    */
@@ -453,8 +452,8 @@ enum GNUNET_STRINGS_FilenameCheck
  *         fails, #GNUNET_SYSERR when a check can't be performed
  */
 int
-GNUNET_STRINGS_check_filename (const char *filename,
-                               enum GNUNET_STRINGS_FilenameCheck checks);
+GNUNET_STRINGS_check_filename(const char *filename,
+                              enum GNUNET_STRINGS_FilenameCheck checks);
 
 
 /**
@@ -469,9 +468,9 @@ GNUNET_STRINGS_check_filename (const char *filename,
  *         case the contents of r_buf are undefined.
  */
 int
-GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr,
-                                uint16_t addrlen,
-                                struct sockaddr_in6 *r_buf);
+GNUNET_STRINGS_to_address_ipv6(const char *zt_addr,
+                               uint16_t addrlen,
+                               struct sockaddr_in6 *r_buf);
 
 
 /**
@@ -485,9 +484,9 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr,
  *         the contents of r_buf are undefined.
  */
 int
-GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr,
-                                uint16_t addrlen,
-                                struct sockaddr_in *r_buf);
+GNUNET_STRINGS_to_address_ipv4(const char *zt_addr,
+                               uint16_t addrlen,
+                               struct sockaddr_in *r_buf);
 
 
 /**
@@ -500,9 +499,9 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr,
  * @return 0 on error, otherwise number of bytes in @a sa
  */
 size_t
-GNUNET_STRINGS_parse_socket_addr (const char *addr,
-                                  uint8_t *af,
-                                  struct sockaddr **sa);
+GNUNET_STRINGS_parse_socket_addr(const char *addr,
+                                 uint8_t *af,
+                                 struct sockaddr **sa);
 
 
 /**
@@ -517,9 +516,9 @@ GNUNET_STRINGS_parse_socket_addr (const char *addr,
  *         case the contents of r_buf are undefined.
  */
 int
-GNUNET_STRINGS_to_address_ip (const char *addr,
-                              uint16_t addrlen,
-                              struct sockaddr_storage *r_buf);
+GNUNET_STRINGS_to_address_ip(const char *addr,
+                             uint16_t addrlen,
+                             struct sockaddr_storage *r_buf);
 
 
 /**
@@ -535,10 +534,10 @@ GNUNET_STRINGS_to_address_ip (const char *addr,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
-GNUNET_STRINGS_get_utf8_args (int argc,
-                              char *const *argv,
-                              int *u8argc,
-                              char *const **u8argv);
+GNUNET_STRINGS_get_utf8_args(int argc,
+                             char *const *argv,
+                             int *u8argc,
+                             char *const **u8argv);
 
 
 /**
@@ -554,7 +553,7 @@ GNUNET_STRINGS_get_utf8_args (int argc,
  * @param n the length of the string to copy, including its terminating null
  *          byte
  * @return the length of the string that was copied, excluding the terminating
- *         null byte
+ *         null byte
  */
 size_t
 GNUNET_strlcpy(char *dst, const char *src, size_t n);
@@ -562,9 +561,7 @@ GNUNET_strlcpy(char *dst, const char *src, size_t n);
 
 /* ***************** IPv4/IPv6 parsing ****************** */
 
-struct GNUNET_STRINGS_PortPolicy
-{
-
+struct GNUNET_STRINGS_PortPolicy {
   /**
    * Starting port range (0 if none given).
    */
@@ -580,15 +577,13 @@ struct GNUNET_STRINGS_PortPolicy
    * ("!" in policy).
    */
   int negate_portrange;
-
 };
 
 
 /**
  * @brief IPV4 network in CIDR notation.
  */
-struct GNUNET_STRINGS_IPv4NetworkPolicy
-{
+struct GNUNET_STRINGS_IPv4NetworkPolicy {
   /**
    * IPv4 address.
    */
@@ -603,15 +598,13 @@ struct GNUNET_STRINGS_IPv4NetworkPolicy
    * Policy for port access.
    */
   struct GNUNET_STRINGS_PortPolicy pp;
-
 };
 
 
 /**
  * @brief network in CIDR notation for IPV6.
  */
-struct GNUNET_STRINGS_IPv6NetworkPolicy
-{
+struct GNUNET_STRINGS_IPv6NetworkPolicy {
   /**
    * IPv6 address.
    */
@@ -626,7 +619,6 @@ struct GNUNET_STRINGS_IPv6NetworkPolicy
    * Policy for port access.
    */
   struct GNUNET_STRINGS_PortPolicy pp;
-
 };
 
 
@@ -642,7 +634,7 @@ struct GNUNET_STRINGS_IPv6NetworkPolicy
  *         NULL if the synatx is flawed
  */
 struct GNUNET_STRINGS_IPv4NetworkPolicy *
-GNUNET_STRINGS_parse_ipv4_policy (const char *routeListX);
+GNUNET_STRINGS_parse_ipv4_policy(const char *routeListX);
 
 
 /**
@@ -657,7 +649,7 @@ GNUNET_STRINGS_parse_ipv4_policy (const char *routeListX);
  * @return the converted list, 0-terminated, NULL if the synatx is flawed
  */
 struct GNUNET_STRINGS_IPv6NetworkPolicy *
-GNUNET_STRINGS_parse_ipv6_policy (const char *routeListX);
+GNUNET_STRINGS_parse_ipv6_policy(const char *routeListX);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 6dece2915..5d820e20b 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -56,7 +56,7 @@ struct GNUNET_TESTBED_LOGGER_Handle;
  *           upon any error
  */
 struct GNUNET_TESTBED_LOGGER_Handle *
-GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TESTBED_LOGGER_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -65,7 +65,7 @@ GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param h the logger handle
  */
 void
-GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h);
+GNUNET_TESTBED_LOGGER_disconnect(struct GNUNET_TESTBED_LOGGER_Handle *h);
 
 
 /**
@@ -90,9 +90,9 @@ typedef void
  * @param size how many bytes of @a data to send
  */
 void
-GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h,
-                             const void *data,
-                             size_t size);
+GNUNET_TESTBED_LOGGER_write(struct GNUNET_TESTBED_LOGGER_Handle *h,
+                            const void *data,
+                            size_t size);
 
 
 /**
@@ -103,9 +103,9 @@ GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h,
  * @param cb_cls the closure for @a cb
  */
 void
-GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
-                             GNUNET_TESTBED_LOGGER_FlushCompletion cb,
-                             void *cb_cls);
+GNUNET_TESTBED_LOGGER_flush(struct GNUNET_TESTBED_LOGGER_Handle *h,
+                            GNUNET_TESTBED_LOGGER_FlushCompletion cb,
+                            void *cb_cls);
 
 
 /**
@@ -116,7 +116,7 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
  * @param h the logger handle
  */
 void
-GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h);
+GNUNET_TESTBED_LOGGER_flush_cancel(struct GNUNET_TESTBED_LOGGER_Handle *h);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index db626df0e..5acf885dc 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -89,10 +89,10 @@ struct GNUNET_TESTBED_Controller;
  * @return handle to the host, NULL on error
  */
 struct GNUNET_TESTBED_Host *
-GNUNET_TESTBED_host_create (const char *hostname,
-                            const char *username,
-                            const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            uint16_t port);
+GNUNET_TESTBED_host_create(const char *hostname,
+                           const char *username,
+                           const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           uint16_t port);
 
 
 
@@ -112,12 +112,12 @@ GNUNET_TESTBED_host_create (const char *hostname,
  * @return handle to the host, NULL on error
  */
 struct GNUNET_TESTBED_Host *
-GNUNET_TESTBED_host_create_with_id (uint32_t id,
-                                    const char *hostname,
-                                    const char *username,
-                                    const struct GNUNET_CONFIGURATION_Handle
-                                    *cfg,
-                                    uint16_t port);
+GNUNET_TESTBED_host_create_with_id(uint32_t id,
+                                   const char *hostname,
+                                   const char *username,
+                                   const struct GNUNET_CONFIGURATION_Handle
+                                   *cfg,
+                                   uint16_t port);
 
 
 /**
@@ -133,10 +133,10 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id,
  * @return number of hosts returned in 'hosts', 0 on error
  */
 unsigned int
-GNUNET_TESTBED_hosts_load_from_file (const char *filename,
-                                     const struct GNUNET_CONFIGURATION_Handle
-                                     *cfg,
-                                     struct GNUNET_TESTBED_Host ***hosts);
+GNUNET_TESTBED_hosts_load_from_file(const char *filename,
+                                    const struct GNUNET_CONFIGURATION_Handle
+                                    *cfg,
+                                    struct GNUNET_TESTBED_Host ***hosts);
 
 
 /**
@@ -152,10 +152,10 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
  * @return number of hosts returned in 'hosts', 0 on error
  */
 unsigned int
-GNUNET_TESTBED_hosts_load_from_loadleveler (const struct
-                                            GNUNET_CONFIGURATION_Handle *cfg,
-                                            struct GNUNET_TESTBED_Host
-                                            ***hosts);
+GNUNET_TESTBED_hosts_load_from_loadleveler(const struct
+                                           GNUNET_CONFIGURATION_Handle *cfg,
+                                           struct GNUNET_TESTBED_Host
+                                           ***hosts);
 
 /**
  * Destroy a host handle.  Must only be called once everything
@@ -164,7 +164,7 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (const struct
  * @param host handle to destroy
  */
 void
-GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host);
+GNUNET_TESTBED_host_destroy(struct GNUNET_TESTBED_Host *host);
 
 
 /**
@@ -201,11 +201,11 @@ typedef void
  *           GNUNET_TESTBED_is_host_habitable_cancel()
  */
 struct GNUNET_TESTBED_HostHabitableCheckHandle *
-GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
-                                  const struct GNUNET_CONFIGURATION_Handle
-                                  *config,
-                                  GNUNET_TESTBED_HostHabitableCallback cb,
-                                  void *cb_cls);
+GNUNET_TESTBED_is_host_habitable(const struct GNUNET_TESTBED_Host *host,
+                                 const struct GNUNET_CONFIGURATION_Handle
+                                 *config,
+                                 GNUNET_TESTBED_HostHabitableCallback cb,
+                                 void *cb_cls);
 
 
 /**
@@ -214,9 +214,9 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
  * @param handle the habitability check handle
  */
 void
-GNUNET_TESTBED_is_host_habitable_cancel (struct
-                                         GNUNET_TESTBED_HostHabitableCheckHandle
-                                         *handle);
+GNUNET_TESTBED_is_host_habitable_cancel(struct
+                                        GNUNET_TESTBED_HostHabitableCheckHandle
+                                        *handle);
 
 /**
  * Obtain the host's hostname.
@@ -225,15 +225,14 @@ GNUNET_TESTBED_is_host_habitable_cancel (struct
  * @return hostname of the host
  */
 const char *
-GNUNET_TESTBED_host_get_hostname (const struct GNUNET_TESTBED_Host *host);
+GNUNET_TESTBED_host_get_hostname(const struct GNUNET_TESTBED_Host *host);
 
 
 /**
  * Enumeration with (at most 64) possible event types that
  * can be monitored using the testbed framework.
  */
-enum GNUNET_TESTBED_EventType
-{
+enum GNUNET_TESTBED_EventType {
   /**
    * A peer has been started.
    */
@@ -258,16 +257,13 @@ enum GNUNET_TESTBED_EventType
    * A requested testbed operation has been completed.
    */
   GNUNET_TESTBED_ET_OPERATION_FINISHED = 4,
-
 };
 
 
 /**
  * Types of information that can be requested about a peer.
  */
-enum GNUNET_TESTBED_PeerInformationType
-{
-
+enum GNUNET_TESTBED_PeerInformationType {
   /**
    * Special value (not valid for requesting information)
    * that is used in the event struct if a 'generic' pointer
@@ -291,7 +287,6 @@ enum GNUNET_TESTBED_PeerInformationType
    * 'GNUNET_TESTNIG_operation_done' is called.
    */
   GNUNET_TESTBED_PIT_IDENTITY
-
 };
 
 
@@ -299,9 +294,7 @@ enum GNUNET_TESTBED_PeerInformationType
  * Argument to GNUNET_TESTBED_ControllerCallback with details about
  * the event.
  */
-struct GNUNET_TESTBED_EventInformation
-{
-
+struct GNUNET_TESTBED_EventInformation {
   /**
    * Type of the event.
    */
@@ -320,14 +313,11 @@ struct GNUNET_TESTBED_EventInformation
   /**
    * Details about the event.
    */
-  union
-  {
-
+  union {
     /**
      * Details about peer start event.
      */
-    struct
-    {
+    struct {
       /**
        * Handle for the host where the peer
        * was started.
@@ -338,27 +328,22 @@ struct GNUNET_TESTBED_EventInformation
        * Handle for the peer that was started.
        */
       struct GNUNET_TESTBED_Peer *peer;
-
     } peer_start;
 
     /**
      * Details about peer stop event.
      */
-    struct
-    {
-
+    struct {
       /**
        * Handle for the peer that was started.
        */
       struct GNUNET_TESTBED_Peer *peer;
-
     } peer_stop;
 
     /**
      * Details about connect event.
      */
-    struct
-    {
+    struct {
       /**
        * Handle for one of the connected peers.
        */
@@ -368,14 +353,12 @@ struct GNUNET_TESTBED_EventInformation
        * Handle for one of the connected peers.
        */
       struct GNUNET_TESTBED_Peer *peer2;
-
     } peer_connect;
 
     /**
      * Details about disconnect event.
      */
-    struct
-    {
+    struct {
       /**
        * Handle for one of the disconnected peers.
        */
@@ -385,14 +368,12 @@ struct GNUNET_TESTBED_EventInformation
        * Handle for one of the disconnected peers.
        */
       struct GNUNET_TESTBED_Peer *peer2;
-
     } peer_disconnect;
 
     /**
      * Details about an operation finished event.
      */
-    struct
-    {
+    struct {
       /**
        * Error message for the operation, NULL on success.
        */
@@ -403,11 +384,8 @@ struct GNUNET_TESTBED_EventInformation
        * (whatever the GNUNET_TESTBED_ConnectAdapter returned).
        */
       void *generic;
-
     } operation_finished;
-
   } details;
-
 };
 
 
@@ -468,10 +446,10 @@ typedef void
  * @return the controller process handle, NULL on errors
  */
 struct GNUNET_TESTBED_ControllerProc *
-GNUNET_TESTBED_controller_start (const char *trusted_ip,
-                                 struct GNUNET_TESTBED_Host *host,
-                                 GNUNET_TESTBED_ControllerStatusCallback cb,
-                                 void *cls);
+GNUNET_TESTBED_controller_start(const char *trusted_ip,
+                                struct GNUNET_TESTBED_Host *host,
+                                GNUNET_TESTBED_ControllerStatusCallback cb,
+                                void *cls);
 
 
 /**
@@ -483,7 +461,7 @@ GNUNET_TESTBED_controller_start (const char *trusted_ip,
  * @param cproc the controller process handle
  */
 void
-GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
+GNUNET_TESTBED_controller_stop(struct GNUNET_TESTBED_ControllerProc *cproc);
 
 
 /**
@@ -503,10 +481,10 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
  * @return handle to the controller
  */
 struct GNUNET_TESTBED_Controller *
-GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host,
-                                   uint64_t event_mask,
-                                   GNUNET_TESTBED_ControllerCallback cc,
-                                   void *cc_cls);
+GNUNET_TESTBED_controller_connect(struct GNUNET_TESTBED_Host *host,
+                                  uint64_t event_mask,
+                                  GNUNET_TESTBED_ControllerCallback cc,
+                                  void *cc_cls);
 
 
 /**
@@ -517,7 +495,7 @@ GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host,
  * @param c handle to controller to stop
  */
 void
-GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *c);
+GNUNET_TESTBED_controller_disconnect(struct GNUNET_TESTBED_Controller *c);
 
 
 /**
@@ -553,10 +531,10 @@ typedef void
  *           is not cancelled
  */
 struct GNUNET_TESTBED_HostRegistrationHandle *
-GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller,
-                              struct GNUNET_TESTBED_Host *host,
-                              GNUNET_TESTBED_HostRegistrationCompletion cc,
-                              void *cc_cls);
+GNUNET_TESTBED_register_host(struct GNUNET_TESTBED_Controller *controller,
+                             struct GNUNET_TESTBED_Host *host,
+                             GNUNET_TESTBED_HostRegistrationCompletion cc,
+                             void *cc_cls);
 
 
 /**
@@ -569,8 +547,8 @@ GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller,
  * @param handle the registration handle to cancel
  */
 void
-GNUNET_TESTBED_cancel_registration (struct GNUNET_TESTBED_HostRegistrationHandle
-                                    *handle);
+GNUNET_TESTBED_cancel_registration(struct GNUNET_TESTBED_HostRegistrationHandle
+                                   *handle);
 
 
 /**
@@ -616,11 +594,11 @@ typedef void
  * @return the operation handle
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_controller_link (void *op_cls,
-                                struct GNUNET_TESTBED_Controller *master,
-                                struct GNUNET_TESTBED_Host *delegated_host,
-                                struct GNUNET_TESTBED_Host *slave_host,
-                                int is_subordinate);
+GNUNET_TESTBED_controller_link(void *op_cls,
+                               struct GNUNET_TESTBED_Controller *master,
+                               struct GNUNET_TESTBED_Host *delegated_host,
+                               struct GNUNET_TESTBED_Host *slave_host,
+                               int is_subordinate);
 
 
 /**
@@ -639,9 +617,9 @@ GNUNET_TESTBED_controller_link (void *op_cls,
  *           master
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_get_slave_config (void *op_cls,
-                                 struct GNUNET_TESTBED_Controller *master,
-                                 struct GNUNET_TESTBED_Host *slave_host);
+GNUNET_TESTBED_get_slave_config(void *op_cls,
+                                struct GNUNET_TESTBED_Controller *master,
+                                struct GNUNET_TESTBED_Host *slave_host);
 
 
 /**
@@ -689,11 +667,11 @@ typedef void
  * @return the operation handle
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
-                            struct GNUNET_TESTBED_Host *host,
-                            const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            GNUNET_TESTBED_PeerCreateCallback cb,
-                            void *cls);
+GNUNET_TESTBED_peer_create(struct GNUNET_TESTBED_Controller *controller,
+                           struct GNUNET_TESTBED_Host *host,
+                           const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           GNUNET_TESTBED_PeerCreateCallback cb,
+                           void *cls);
 
 
 /**
@@ -719,10 +697,10 @@ typedef void
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (void *op_cls,
-                           struct GNUNET_TESTBED_Peer *peer,
-                           GNUNET_TESTBED_PeerChurnCallback pcc,
-                           void *pcc_cls);
+GNUNET_TESTBED_peer_start(void *op_cls,
+                          struct GNUNET_TESTBED_Peer *peer,
+                          GNUNET_TESTBED_PeerChurnCallback pcc,
+                          void *pcc_cls);
 
 
 /**
@@ -738,17 +716,16 @@ GNUNET_TESTBED_peer_start (void *op_cls,
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_stop (void *op_cls,
-                          struct GNUNET_TESTBED_Peer *peer,
-                          GNUNET_TESTBED_PeerChurnCallback pcc,
-                          void *pcc_cls);
+GNUNET_TESTBED_peer_stop(void *op_cls,
+                         struct GNUNET_TESTBED_Peer *peer,
+                         GNUNET_TESTBED_PeerChurnCallback pcc,
+                         void *pcc_cls);
 
 
 /**
  * Data returned from GNUNET_TESTBED_peer_get_information
  */
-struct GNUNET_TESTBED_PeerInformation
-{
+struct GNUNET_TESTBED_PeerInformation {
   /**
    * Peer information type; captures which of the types
    * in the 'op_result' is actually in use.
@@ -758,8 +735,7 @@ struct GNUNET_TESTBED_PeerInformation
   /**
    * The result of the get information operation; Choose according to the pit
    */
-  union
-  {
+  union {
     /**
      * The configuration of the peer
      */
@@ -805,11 +781,11 @@ typedef void
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
-                                     enum GNUNET_TESTBED_PeerInformationType
-                                     pit,
-                                     GNUNET_TESTBED_PeerInfoCallback cb,
-                                     void *cb_cls);
+GNUNET_TESTBED_peer_get_information(struct GNUNET_TESTBED_Peer *peer,
+                                    enum GNUNET_TESTBED_PeerInformationType
+                                    pit,
+                                    GNUNET_TESTBED_PeerInfoCallback cb,
+                                    void *cb_cls);
 
 
 /**
@@ -821,8 +797,8 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
-                                          const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TESTBED_peer_update_configuration(struct GNUNET_TESTBED_Peer *peer,
+                                         const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -833,7 +809,7 @@ GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer);
+GNUNET_TESTBED_peer_destroy(struct GNUNET_TESTBED_Peer *peer);
 
 
 /**
@@ -852,12 +828,12 @@ GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer);
  * @return an operation handle; NULL upon error (peer not running)
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_manage_service (void *op_cls,
-                                    struct GNUNET_TESTBED_Peer *peer,
-                                    const char *service_name,
-                                    GNUNET_TESTBED_OperationCompletionCallback cb,
-                                    void *cb_cls,
-                                    unsigned int start);
+GNUNET_TESTBED_peer_manage_service(void *op_cls,
+                                   struct GNUNET_TESTBED_Peer *peer,
+                                   const char *service_name,
+                                   GNUNET_TESTBED_OperationCompletionCallback cb,
+                                   void *cb_cls,
+                                   unsigned int start);
 
 
 /**
@@ -876,18 +852,17 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls,
  *           present
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c,
-                               void *op_cls,
-                               GNUNET_TESTBED_OperationCompletionCallback cb,
-                               void *cb_cls);
+GNUNET_TESTBED_shutdown_peers(struct GNUNET_TESTBED_Controller *c,
+                              void *op_cls,
+                              GNUNET_TESTBED_OperationCompletionCallback cb,
+                              void *cb_cls);
 
 
 
 /**
  * Options for peer connections.
  */
-enum GNUNET_TESTBED_ConnectOption
-{
+enum GNUNET_TESTBED_ConnectOption {
   /**
    * No option (not valid as an argument).
    */
@@ -907,7 +882,6 @@ enum GNUNET_TESTBED_ConnectOption
    * particular transports, force simulation of particular latencies
    * or message loss rates, or set bandwidth limitations.
    */
-
 };
 
 
@@ -924,11 +898,11 @@ enum GNUNET_TESTBED_ConnectOption
  *         time is not allowed
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_link_va (void *op_cls,
-                                           struct GNUNET_TESTBED_Peer *p1,
-                                           struct GNUNET_TESTBED_Peer *p2,
-                                           enum GNUNET_TESTBED_ConnectOption co,
-                                           va_list ap);
+GNUNET_TESTBED_underlay_configure_link_va(void *op_cls,
+                                          struct GNUNET_TESTBED_Peer *p1,
+                                          struct GNUNET_TESTBED_Peer *p2,
+                                          enum GNUNET_TESTBED_ConnectOption co,
+                                          va_list ap);
 
 
 /**
@@ -944,10 +918,10 @@ GNUNET_TESTBED_underlay_configure_link_va (void *op_cls,
  *         time is not allowed
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_link (void *op_cls,
-                                        struct GNUNET_TESTBED_Peer *p1,
-                                        struct GNUNET_TESTBED_Peer *p2,
-                                        enum GNUNET_TESTBED_ConnectOption co, ...);
+GNUNET_TESTBED_underlay_configure_link(void *op_cls,
+                                       struct GNUNET_TESTBED_Peer *p1,
+                                       struct GNUNET_TESTBED_Peer *p2,
+                                       enum GNUNET_TESTBED_ConnectOption co, ...);
 
 
 
@@ -955,8 +929,7 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
  * Topologies and topology options supported for testbeds. Options should always
  * end with #GNUNET_TESTBED_TOPOLOGY_OPTION_END
  */
-enum GNUNET_TESTBED_TopologyOption
-{
+enum GNUNET_TESTBED_TopologyOption {
   /**
    * A clique (everyone connected to everyone else).  No options. If there are N
    * peers this topology results in (N * (N -1)) connections.
@@ -1063,11 +1036,11 @@ enum GNUNET_TESTBED_TopologyOption
  *         is not allowed at this time
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_topology_va (void *op_cls,
-                                               unsigned int num_peers,
-                                               struct GNUNET_TESTBED_Peer **peers,
-                                               enum GNUNET_TESTBED_TopologyOption topo,
-                                               va_list ap);
+GNUNET_TESTBED_underlay_configure_topology_va(void *op_cls,
+                                              unsigned int num_peers,
+                                              struct GNUNET_TESTBED_Peer **peers,
+                                              enum GNUNET_TESTBED_TopologyOption topo,
+                                              va_list ap);
 
 
 /**
@@ -1082,11 +1055,11 @@ GNUNET_TESTBED_underlay_configure_topology_va (void *op_cls,
  *         is not allowed at this time
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_topology (void *op_cls,
-                                            unsigned int num_peers,
-                                            struct GNUNET_TESTBED_Peer **peers,
-                                            enum GNUNET_TESTBED_TopologyOption topo,
-                                            ...);
+GNUNET_TESTBED_underlay_configure_topology(void *op_cls,
+                                           unsigned int num_peers,
+                                           struct GNUNET_TESTBED_Peer **peers,
+                                           enum GNUNET_TESTBED_TopologyOption topo,
+                                           ...);
 
 
 /**
@@ -1104,11 +1077,11 @@ GNUNET_TESTBED_underlay_configure_topology (void *op_cls,
  *         not running or underlay disallows)
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_connect (void *op_cls,
-                                GNUNET_TESTBED_OperationCompletionCallback cb,
-                                void *cb_cls,
-                                struct GNUNET_TESTBED_Peer *p1,
-                                struct GNUNET_TESTBED_Peer *p2);
+GNUNET_TESTBED_overlay_connect(void *op_cls,
+                               GNUNET_TESTBED_OperationCompletionCallback cb,
+                               void *cb_cls,
+                               struct GNUNET_TESTBED_Peer *p1,
+                               struct GNUNET_TESTBED_Peer *p2);
 
 
 /**
@@ -1121,8 +1094,8 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
  * @param nfailures the number of overlay connects which failed
  */
 typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls,
-                                                          unsigned int nsuccess,
-                                                          unsigned int nfailures);
+                                                           unsigned int nsuccess,
+                                                           unsigned int nfailures);
 
 
 /**
@@ -1146,15 +1119,15 @@ typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls,
  *         not running or underlay disallows) or if num_peers is less than 2
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
-                                              unsigned int num_peers,
-                                              struct GNUNET_TESTBED_Peer **peers,
-                                              unsigned int *max_connections,
-                                              GNUNET_TESTBED_TopologyCompletionCallback
-                                              comp_cb,
-                                              void *comp_cb_cls,
-                                              enum GNUNET_TESTBED_TopologyOption topo,
-                                              va_list va);
+GNUNET_TESTBED_overlay_configure_topology_va(void *op_cls,
+                                             unsigned int num_peers,
+                                             struct GNUNET_TESTBED_Peer **peers,
+                                             unsigned int *max_connections,
+                                             GNUNET_TESTBED_TopologyCompletionCallback
+                                             comp_cb,
+                                             void *comp_cb_cls,
+                                             enum GNUNET_TESTBED_TopologyOption topo,
+                                             va_list va);
 
 
 /**
@@ -1178,15 +1151,15 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
  *         not running or underlay disallows) or if num_peers is less than 2
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
-                                           unsigned int num_peers,
-                                           struct GNUNET_TESTBED_Peer **peers,
-                                           unsigned int *max_connections,
-                                           GNUNET_TESTBED_TopologyCompletionCallback
-                                           comp_cb,
-                                           void *comp_cb_cls,
-                                           enum GNUNET_TESTBED_TopologyOption topo,
-                                           ...);
+GNUNET_TESTBED_overlay_configure_topology(void *op_cls,
+                                          unsigned int num_peers,
+                                          struct GNUNET_TESTBED_Peer **peers,
+                                          unsigned int *max_connections,
+                                          GNUNET_TESTBED_TopologyCompletionCallback
+                                          comp_cb,
+                                          void *comp_cb_cls,
+                                          enum GNUNET_TESTBED_TopologyOption topo,
+                                          ...);
 
 
 /**
@@ -1200,8 +1173,8 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
  *        be written to.
  */
 void
-GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller *controller,
-                                               const char *filename);
+GNUNET_TESTBED_overlay_write_topology_to_file(struct GNUNET_TESTBED_Controller *controller,
+                                              const char *filename);
 
 
 /**
@@ -1244,7 +1217,7 @@ typedef void
 (*GNUNET_TESTBED_ServiceConnectCompletionCallback) (void *cls,
                                                     struct GNUNET_TESTBED_Operation *op,
                                                     void *ca_result,
-                                                    const char *emsg );
+                                                    const char *emsg);
 
 
 /**
@@ -1270,14 +1243,14 @@ typedef void
  * @return handle for the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_service_connect (void *op_cls,
-                                struct GNUNET_TESTBED_Peer *peer,
-                                const char *service_name,
-                                GNUNET_TESTBED_ServiceConnectCompletionCallback cb,
-                                void *cb_cls,
-                                GNUNET_TESTBED_ConnectAdapter ca,
-                                GNUNET_TESTBED_DisconnectAdapter da,
-                                void *cada_cls);
+GNUNET_TESTBED_service_connect(void *op_cls,
+                               struct GNUNET_TESTBED_Peer *peer,
+                               const char *service_name,
+                               GNUNET_TESTBED_ServiceConnectCompletionCallback cb,
+                               void *cb_cls,
+                               GNUNET_TESTBED_ConnectAdapter ca,
+                               GNUNET_TESTBED_DisconnectAdapter da,
+                               void *cada_cls);
 
 
 /**
@@ -1302,7 +1275,7 @@ GNUNET_TESTBED_service_connect (void *op_cls,
  * @param operation operation to signal completion or cancellation
  */
 void
-GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation);
+GNUNET_TESTBED_operation_done(struct GNUNET_TESTBED_Operation *operation);
 
 
 /**
@@ -1341,12 +1314,12 @@ typedef int
  * @return operation handle to cancel the operation
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_get_statistics (unsigned int num_peers,
-                               struct GNUNET_TESTBED_Peer **peers,
-                               const char *subsystem, const char *name,
-                               GNUNET_TESTBED_StatisticsIterator proc,
-                               GNUNET_TESTBED_OperationCompletionCallback cont,
-                               void *cls);
+GNUNET_TESTBED_get_statistics(unsigned int num_peers,
+                              struct GNUNET_TESTBED_Peer **peers,
+                              const char *subsystem, const char *name,
+                              GNUNET_TESTBED_StatisticsIterator proc,
+                              GNUNET_TESTBED_OperationCompletionCallback cont,
+                              void *cls);
 
 
 /**
@@ -1358,7 +1331,7 @@ GNUNET_TESTBED_get_statistics (unsigned int num_peers,
  * @return The peer's unique ID.
  */
 uint32_t
-GNUNET_TESTBED_get_index (const struct GNUNET_TESTBED_Peer *peer);
+GNUNET_TESTBED_get_index(const struct GNUNET_TESTBED_Peer *peer);
 
 
 /**
@@ -1424,14 +1397,14 @@ typedef void
  * @param test_master_cls closure for 'test_master'.
  */
 void
-GNUNET_TESTBED_run (const char *host_filename,
-                    const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    unsigned int num_peers,
-                    uint64_t event_mask,
-                    GNUNET_TESTBED_ControllerCallback cc,
-                    void *cc_cls,
-                    GNUNET_TESTBED_TestMaster test_master,
-                    void *test_master_cls);
+GNUNET_TESTBED_run(const char *host_filename,
+                   const struct GNUNET_CONFIGURATION_Handle *cfg,
+                   unsigned int num_peers,
+                   uint64_t event_mask,
+                   GNUNET_TESTBED_ControllerCallback cc,
+                   void *cc_cls,
+                   GNUNET_TESTBED_TestMaster test_master,
+                   void *test_master_cls);
 
 
 /**
@@ -1473,14 +1446,14 @@ GNUNET_TESTBED_run (const char *host_filename,
  * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_TESTBED_test_run (const char *testname,
-                         const char *cfg_filename,
-                         unsigned int num_peers,
-                         uint64_t event_mask,
-                         GNUNET_TESTBED_ControllerCallback cc,
-                         void *cc_cls,
-                         GNUNET_TESTBED_TestMaster test_master,
-                         void *test_master_cls);
+GNUNET_TESTBED_test_run(const char *testname,
+                        const char *cfg_filename,
+                        unsigned int num_peers,
+                        uint64_t event_mask,
+                        GNUNET_TESTBED_ControllerCallback cc,
+                        void *cc_cls,
+                        GNUNET_TESTBED_TestMaster test_master,
+                        void *test_master_cls);
 
 
 /**
@@ -1491,7 +1464,7 @@ GNUNET_TESTBED_test_run (const char *testname,
  * @return handle to the master controller
  */
 struct GNUNET_TESTBED_Controller *
-GNUNET_TESTBED_run_get_controller_handle (struct GNUNET_TESTBED_RunHandle *h);
+GNUNET_TESTBED_run_get_controller_handle(struct GNUNET_TESTBED_RunHandle *h);
 
 
 /**
@@ -1503,8 +1476,7 @@ struct GNUNET_TESTBED_Barrier;
 /**
  * Status of a barrier
  */
-enum GNUNET_TESTBED_BarrierStatus
-{
+enum GNUNET_TESTBED_BarrierStatus {
   /**
    * Barrier initialised successfully
    */
@@ -1519,7 +1491,6 @@ enum GNUNET_TESTBED_BarrierStatus
    * Error status
    */
   GNUNET_TESTBED_BARRIERSTATUS_ERROR,
-
 };
 
 
@@ -1561,11 +1532,11 @@ typedef void
  * @return barrier handle
  */
 struct GNUNET_TESTBED_Barrier *
-GNUNET_TESTBED_barrier_init (struct GNUNET_TESTBED_Controller *controller,
-                             const char *name,
-                             unsigned int quorum,
-                             GNUNET_TESTBED_barrier_status_cb cb,
-                             void *cb_cls);
+GNUNET_TESTBED_barrier_init(struct GNUNET_TESTBED_Controller *controller,
+                            const char *name,
+                            unsigned int quorum,
+                            GNUNET_TESTBED_barrier_status_cb cb,
+                            void *cb_cls);
 
 
 /**
@@ -1574,7 +1545,7 @@ GNUNET_TESTBED_barrier_init (struct GNUNET_TESTBED_Controller *controller,
  * @param barrier the barrier handle
  */
 void
-GNUNET_TESTBED_barrier_cancel (struct GNUNET_TESTBED_Barrier *barrier);
+GNUNET_TESTBED_barrier_cancel(struct GNUNET_TESTBED_Barrier *barrier);
 
 
 /**
@@ -1611,9 +1582,9 @@ typedef void
  *   anytime before the callback is called.  NULL upon error.
  */
 struct GNUNET_TESTBED_BarrierWaitHandle *
-GNUNET_TESTBED_barrier_wait (const char *name,
-                             GNUNET_TESTBED_barrier_wait_cb cb,
-                             void *cls);
+GNUNET_TESTBED_barrier_wait(const char *name,
+                            GNUNET_TESTBED_barrier_wait_cb cb,
+                            void *cls);
 
 
 /**
@@ -1623,7 +1594,7 @@ GNUNET_TESTBED_barrier_wait (const char *name,
  * @param h the barrier wait handle
  */
 void
-GNUNET_TESTBED_barrier_wait_cancel (struct GNUNET_TESTBED_BarrierWaitHandle *h);
+GNUNET_TESTBED_barrier_wait_cancel(struct GNUNET_TESTBED_BarrierWaitHandle *h);
 
 
 /**
@@ -1637,8 +1608,7 @@ struct GNUNET_TESTBED_UnderlayLinkModel;
  * The type of GNUNET_TESTBED_UnderlayLinkModel
  * @ingroup underlay
  */
-enum GNUNET_TESTBED_UnderlayLinkModelType
-{
+enum GNUNET_TESTBED_UnderlayLinkModelType {
   /**
    * The model is based on white listing of peers to which underlay connections
    * are permitted.  Underlay connections to all other peers will not be
@@ -1665,8 +1635,8 @@ enum GNUNET_TESTBED_UnderlayLinkModelType
  * @return the model
  */
 struct GNUNET_TESTBED_UnderlayLinkModel *
-GNUNET_TESTBED_underlaylinkmodel_create (struct GNUNET_TESTBED_Peer *peer,
-                                         enum GNUNET_TESTBED_UnderlayLinkModelType type);
+GNUNET_TESTBED_underlaylinkmodel_create(struct GNUNET_TESTBED_Peer *peer,
+                                        enum GNUNET_TESTBED_UnderlayLinkModelType type);
 
 
 /**
@@ -1679,8 +1649,8 @@ GNUNET_TESTBED_underlaylinkmodel_create (struct GNUNET_TESTBED_Peer *peer,
  * @param peer the peer to add
  */
 void
-GNUNET_TESTBED_underlaylinkmodel_add_peer (struct GNUNET_TESTBED_UnderlayLinkModel *model,
-                                           struct GNUNET_TESTBED_Peer *peer);
+GNUNET_TESTBED_underlaylinkmodel_add_peer(struct GNUNET_TESTBED_UnderlayLinkModel *model,
+                                          struct GNUNET_TESTBED_Peer *peer);
 
 
 /**
@@ -1695,11 +1665,11 @@ GNUNET_TESTBED_underlaylinkmodel_add_peer (struct GNUNET_TESTBED_UnderlayLinkMod
  * @param bandwidth bandwidth of the link in kilobytes per second [kB/s]
  */
 void
-GNUNET_TESTBED_underlaylinkmodel_set_link (struct GNUNET_TESTBED_UnderlayLinkModel *model,
-                                           struct GNUNET_TESTBED_Peer *peer,
-                                           uint32_t latency,
-                                           uint32_t loss,
-                                           uint32_t bandwidth);
+GNUNET_TESTBED_underlaylinkmodel_set_link(struct GNUNET_TESTBED_UnderlayLinkModel *model,
+                                          struct GNUNET_TESTBED_Peer *peer,
+                                          uint32_t latency,
+                                          uint32_t loss,
+                                          uint32_t bandwidth);
 
 
 /**
@@ -1709,7 +1679,7 @@ GNUNET_TESTBED_underlaylinkmodel_set_link (struct GNUNET_TESTBED_UnderlayLinkMod
  * @param model the model to commit
  */
 void
-GNUNET_TESTBED_underlaylinkmodel_commit (struct GNUNET_TESTBED_UnderlayLinkModel *model);
+GNUNET_TESTBED_underlaylinkmodel_commit(struct GNUNET_TESTBED_UnderlayLinkModel *model);
 
 
 /**
@@ -1721,7 +1691,7 @@ GNUNET_TESTBED_underlaylinkmodel_commit (struct GNUNET_TESTBED_UnderlayLinkModel
  * @param model the model to unallocate
  */
 void
-GNUNET_TESTBED_underlaylinkmodel_free (struct GNUNET_TESTBED_UnderlayLinkModel *model);
+GNUNET_TESTBED_underlaylinkmodel_free(struct GNUNET_TESTBED_UnderlayLinkModel *model);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 0317b2007..370360eb1 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -56,7 +56,7 @@ extern "C"
 /**
  * Size of each hostkey in the hostkey file (in BYTES).
  */
-#define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EddsaPrivateKey)
+#define GNUNET_TESTING_HOSTKEYFILESIZE sizeof(struct GNUNET_CRYPTO_EddsaPrivateKey)
 
 /**
  * The environmental variable, if set, that dictates where testing should place
@@ -81,8 +81,7 @@ struct GNUNET_TESTING_Peer;
 /**
  * Specification of a service that is to be shared among peers
  */
-struct GNUNET_TESTING_SharedService
-{
+struct GNUNET_TESTING_SharedService {
   /**
    * The name of the service.
    */
@@ -122,11 +121,11 @@ struct GNUNET_TESTING_SharedService
  * @return handle to this system, NULL on error
  */
 struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (const char *testdir,
-                              const char *trusted_ip,
-                              const char *hostname,
-                              const struct GNUNET_TESTING_SharedService *
-                              shared_services);
+GNUNET_TESTING_system_create(const char *testdir,
+                             const char *trusted_ip,
+                             const char *hostname,
+                             const struct GNUNET_TESTING_SharedService *
+                             shared_services);
 
 
 /**
@@ -154,12 +153,12 @@ GNUNET_TESTING_system_create (const char *testdir,
  * @return handle to this system, NULL on error
  */
 struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create_with_portrange (const char *testdir,
-                                             const char *trusted_ip,
-                                             const char *hostname,
-                                             const struct GNUNET_TESTING_SharedService *shared_services,
-                                             uint16_t lowport,
-                                             uint16_t highport);
+GNUNET_TESTING_system_create_with_portrange(const char *testdir,
+                                            const char *trusted_ip,
+                                            const char *hostname,
+                                            const struct GNUNET_TESTING_SharedService *shared_services,
+                                            uint16_t lowport,
+                                            uint16_t highport);
 
 
 /**
@@ -170,8 +169,8 @@ GNUNET_TESTING_system_create_with_portrange (const char *testdir,
  *        be removed (clean up on shutdown)?
  */
 void
-GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
-                               int remove_paths);
+GNUNET_TESTING_system_destroy(struct GNUNET_TESTING_System *system,
+                              int remove_paths);
 
 
 /**
@@ -192,9 +191,9 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
  * @return NULL on error (not enough keys)
  */
 struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
-                            uint32_t key_number,
-                            struct GNUNET_PeerIdentity *id);
+GNUNET_TESTING_hostkey_get(const struct GNUNET_TESTING_System *system,
+                           uint32_t key_number,
+                           struct GNUNET_PeerIdentity *id);
 
 
 /**
@@ -204,7 +203,7 @@ GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
  * @return 0 if no free port was available
  */
 uint16_t
-GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system);
+GNUNET_TESTING_reserve_port(struct GNUNET_TESTING_System *system);
 
 
 /**
@@ -215,8 +214,8 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system);
  * @param port reserved port to release
  */
 void
-GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
-                             uint16_t port);
+GNUNET_TESTING_release_port(struct GNUNET_TESTING_System *system,
+                            uint16_t port);
 
 
 /**
@@ -237,8 +236,8 @@ GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
  *           be incomplete and should not be used there upon
  */
 int
-GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
-                                     struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TESTING_configuration_create(struct GNUNET_TESTING_System *system,
+                                    struct GNUNET_CONFIGURATION_Handle *cfg);
 // FIXME: add dual to 'release' ports again...
 
 
@@ -256,11 +255,11 @@ GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
  * @return handle to the peer, NULL on error
  */
 struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
-                               struct GNUNET_CONFIGURATION_Handle *cfg,
-                               uint32_t key_number,
-                               struct GNUNET_PeerIdentity *id,
-                               char **emsg);
+GNUNET_TESTING_peer_configure(struct GNUNET_TESTING_System *system,
+                              struct GNUNET_CONFIGURATION_Handle *cfg,
+                              uint32_t key_number,
+                              struct GNUNET_PeerIdentity *id,
+                              char **emsg);
 
 
 /**
@@ -270,8 +269,8 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
  * @param id identifier for the daemon, will be set
  */
 void
-GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
-                                  struct GNUNET_PeerIdentity *id);
+GNUNET_TESTING_peer_get_identity(struct GNUNET_TESTING_Peer *peer,
+                                 struct GNUNET_PeerIdentity *id);
 
 
 /**
@@ -282,7 +281,7 @@ GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
  *         #GNUNET_SYSERR on error (i.e. peer already running)
  */
 int
-GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_start(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -295,7 +294,7 @@ GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer);
  *         #GNUNET_SYSERR on error (i.e. peer not running)
  */
 int
-GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_stop(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -306,7 +305,7 @@ GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer);
  * @param peer peer to destroy
  */
 void
-GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_destroy(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -317,7 +316,7 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer);
  *           or upon any error while sending SIGTERM
  */
 int
-GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_kill(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -328,7 +327,7 @@ GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer);
  *           or upon any error while waiting
  */
 int
-GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_wait(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -357,9 +356,9 @@ typedef void
  *           upon any error.
  */
 int
-GNUNET_TESTING_peer_stop_async (struct GNUNET_TESTING_Peer *peer,
-                                GNUNET_TESTING_PeerStopCallback cb,
-                                void *cb_cls);
+GNUNET_TESTING_peer_stop_async(struct GNUNET_TESTING_Peer *peer,
+                               GNUNET_TESTING_PeerStopCallback cb,
+                               void *cb_cls);
 
 
 /**
@@ -372,7 +371,7 @@ GNUNET_TESTING_peer_stop_async (struct GNUNET_TESTING_Peer *peer,
  *          before.
  */
 void
-GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer);
+GNUNET_TESTING_peer_stop_async_cancel(struct GNUNET_TESTING_Peer *peer);
 
 
 /**
@@ -406,10 +405,10 @@ typedef void
  * @return 0 on success, 1 on error
  */
 int
-GNUNET_TESTING_peer_run (const char *testdir,
-                         const char *cfgfilename,
-                         GNUNET_TESTING_TestMain tm,
-                         void *tm_cls);
+GNUNET_TESTING_peer_run(const char *testdir,
+                        const char *cfgfilename,
+                        GNUNET_TESTING_TestMain tm,
+                        void *tm_cls);
 
 
 /**
@@ -434,11 +433,11 @@ GNUNET_TESTING_peer_run (const char *testdir,
  * @return 0 on success, 1 on error
  */
 int
-GNUNET_TESTING_service_run (const char *testdir,
-                            const char *service_name,
-                            const char *cfgfilename,
-                            GNUNET_TESTING_TestMain tm,
-                            void *tm_cls);
+GNUNET_TESTING_service_run(const char *testdir,
+                           const char *service_name,
+                           const char *cfgfilename,
+                           GNUNET_TESTING_TestMain tm,
+                           void *tm_cls);
 
 
 /**
@@ -455,7 +454,7 @@ GNUNET_TESTING_service_run (const char *testdir,
  *         NULL if argv0 has no '_'
  */
 char *
-GNUNET_TESTING_get_testname_from_underscore (const char *argv0);
+GNUNET_TESTING_get_testname_from_underscore(const char *argv0);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index d0da267a9..28a76e3ef 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -45,8 +45,7 @@ extern "C"
 /**
  * Time for absolute times used by GNUnet, in microseconds.
  */
-struct GNUNET_TIME_Absolute
-{
+struct GNUNET_TIME_Absolute {
   /**
    * The actual value.
    */
@@ -57,8 +56,7 @@ struct GNUNET_TIME_Absolute
  * Time for relative time used by GNUnet, in microseconds.
  * Always positive, so we can only refer to future time.
  */
-struct GNUNET_TIME_Relative
-{
+struct GNUNET_TIME_Relative {
   /**
    * The actual value.
    */
@@ -70,8 +68,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Time for relative time used by GNUnet, in microseconds and in network byte order.
  */
-struct GNUNET_TIME_RelativeNBO
-{
+struct GNUNET_TIME_RelativeNBO {
   /**
    * The actual value (in network byte order).
    */
@@ -82,8 +79,7 @@ struct GNUNET_TIME_RelativeNBO
 /**
  * Time for absolute time used by GNUnet, in microseconds and in network byte order.
  */
-struct GNUNET_TIME_AbsoluteNBO
-{
+struct GNUNET_TIME_AbsoluteNBO {
   /**
    * The actual value (in network byte order).
    */
@@ -129,41 +125,41 @@ GNUNET_NETWORK_STRUCT_END
 /**
  * One day.
  */
-#define GNUNET_TIME_UNIT_DAYS    GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_HOURS,   24)
+#define GNUNET_TIME_UNIT_DAYS    GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_HOURS, 24)
 
 /**
  * One week.
  */
-#define GNUNET_TIME_UNIT_WEEKS   GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS,     7)
+#define GNUNET_TIME_UNIT_WEEKS   GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS, 7)
 
 /**
  * One month (30 days).
  */
-#define GNUNET_TIME_UNIT_MONTHS  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS,    30)
+#define GNUNET_TIME_UNIT_MONTHS  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS, 30)
 
 /**
  * One year (365 days).
  */
-#define GNUNET_TIME_UNIT_YEARS   GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS,   365)
+#define GNUNET_TIME_UNIT_YEARS   GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_DAYS, 365)
 
 /**
  * Constant used to specify "forever".  This constant
  * will be treated specially in all time operations.
  */
-#define GNUNET_TIME_UNIT_FOREVER_REL GNUNET_TIME_relative_get_forever_ ()
+#define GNUNET_TIME_UNIT_FOREVER_REL GNUNET_TIME_relative_get_forever_()
 
 /**
  * Constant used to specify "forever".  This constant
  * will be treated specially in all time operations.
  */
-#define GNUNET_TIME_UNIT_FOREVER_ABS GNUNET_TIME_absolute_get_forever_ ()
+#define GNUNET_TIME_UNIT_FOREVER_ABS GNUNET_TIME_absolute_get_forever_()
 
 
 
 /**
  * Threshold after which exponential backoff should not increase (15 m).
  */
-#define GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+#define GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 15)
 
 
 /**
@@ -172,8 +168,8 @@ GNUNET_NETWORK_STRUCT_END
  *
  * @param r current backoff time, initially zero
  */
-#define GNUNET_TIME_STD_BACKOFF(r) GNUNET_TIME_relative_min (GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD, \
-   GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS, (r)), 2));
+#define GNUNET_TIME_STD_BACKOFF(r) GNUNET_TIME_relative_min(GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD, \
+                                                            GNUNET_TIME_relative_multiply(GNUNET_TIME_relative_max(GNUNET_TIME_UNIT_MILLISECONDS, (r)), 2));
 
 
 /**
@@ -191,10 +187,10 @@ GNUNET_TIME_randomized_backoff(struct GNUNET_TIME_Relative rt, struct GNUNET_TIM
 
 /**
  * Return a random time value between 0.5*r and 1.5*r.
- * 
+ *
  * @param r input time for scaling
  * @return randomized time
- */ 
+ */
 struct GNUNET_TIME_Relative
 GNUNET_TIME_randomize(struct GNUNET_TIME_Relative r);
 
@@ -203,63 +199,63 @@ GNUNET_TIME_randomize(struct GNUNET_TIME_Relative r);
  * Return relative time of 0ms.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_zero_ (void);
+GNUNET_TIME_relative_get_zero_(void);
 
 
 /**
  * Return absolute time of 0ms.
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get_zero_ (void);
+GNUNET_TIME_absolute_get_zero_(void);
 
 
 /**
  * Return relative time of 1 microsecond.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_unit_ (void);
+GNUNET_TIME_relative_get_unit_(void);
 
 
 /**
  * Return relative time of 1ms.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_millisecond_ (void);
+GNUNET_TIME_relative_get_millisecond_(void);
 
 
 /**
  * Return relative time of 1s.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_second_ (void);
+GNUNET_TIME_relative_get_second_(void);
 
 
 /**
  * Return relative time of 1 minute.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_minute_ (void);
+GNUNET_TIME_relative_get_minute_(void);
 
 
 /**
  * Return relative time of 1 hour.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_hour_ (void);
+GNUNET_TIME_relative_get_hour_(void);
 
 
 /**
  * Return "forever".
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_forever_ (void);
+GNUNET_TIME_relative_get_forever_(void);
 
 
 /**
  * Return "forever".
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get_forever_ (void);
+GNUNET_TIME_absolute_get_forever_(void);
 
 
 /**
@@ -268,7 +264,7 @@ GNUNET_TIME_absolute_get_forever_ (void);
  * @return the current time
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get (void);
+GNUNET_TIME_absolute_get(void);
 
 
 /**
@@ -279,7 +275,7 @@ GNUNET_TIME_absolute_get (void);
  * @return timestamp that is "rel" in the future, or FOREVER if rel==FOREVER (or if we would overflow)
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_relative_to_absolute (struct GNUNET_TIME_Relative rel);
+GNUNET_TIME_relative_to_absolute(struct GNUNET_TIME_Relative rel);
 
 
 /**
@@ -291,7 +287,7 @@ GNUNET_TIME_relative_to_absolute (struct GNUNET_TIME_Relative rel);
  *         it was just now rounded
  */
 int
-GNUNET_TIME_round_abs (struct GNUNET_TIME_Absolute *at);
+GNUNET_TIME_round_abs(struct GNUNET_TIME_Absolute *at);
 
 
 /**
@@ -303,7 +299,7 @@ GNUNET_TIME_round_abs (struct GNUNET_TIME_Absolute *at);
  *         it was just now rounded
  */
 int
-GNUNET_TIME_round_rel (struct GNUNET_TIME_Relative *rt);
+GNUNET_TIME_round_rel(struct GNUNET_TIME_Relative *rt);
 
 
 /**
@@ -314,8 +310,8 @@ GNUNET_TIME_round_rel (struct GNUNET_TIME_Relative *rt);
  * @return timestamp that is smaller
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_min (struct GNUNET_TIME_Relative t1,
-                          struct GNUNET_TIME_Relative t2);
+GNUNET_TIME_relative_min(struct GNUNET_TIME_Relative t1,
+                         struct GNUNET_TIME_Relative t2);
 
 
 
@@ -327,8 +323,8 @@ GNUNET_TIME_relative_min (struct GNUNET_TIME_Relative t1,
  * @return timestamp that is larger
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_max (struct GNUNET_TIME_Relative t1,
-                          struct GNUNET_TIME_Relative t2);
+GNUNET_TIME_relative_max(struct GNUNET_TIME_Relative t1,
+                         struct GNUNET_TIME_Relative t2);
 
 
 /**
@@ -339,8 +335,8 @@ GNUNET_TIME_relative_max (struct GNUNET_TIME_Relative t1,
  * @return timestamp that is smaller
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_min (struct GNUNET_TIME_Absolute t1,
-                          struct GNUNET_TIME_Absolute t2);
+GNUNET_TIME_absolute_min(struct GNUNET_TIME_Absolute t1,
+                         struct GNUNET_TIME_Absolute t2);
 
 
 /**
@@ -351,8 +347,8 @@ GNUNET_TIME_absolute_min (struct GNUNET_TIME_Absolute t1,
  * @return timestamp that is smaller
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_max (struct GNUNET_TIME_Absolute t1,
-                          struct GNUNET_TIME_Absolute t2);
+GNUNET_TIME_absolute_max(struct GNUNET_TIME_Absolute t1,
+                         struct GNUNET_TIME_Absolute t2);
 
 
 /**
@@ -363,7 +359,7 @@ GNUNET_TIME_absolute_max (struct GNUNET_TIME_Absolute t1,
  * @return future - now, or 0 if now >= future, or FOREVER if future==FOREVER.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future);
+GNUNET_TIME_absolute_get_remaining(struct GNUNET_TIME_Absolute future);
 
 
 /**
@@ -377,9 +373,9 @@ GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future);
  *        assuming it continues at the same speed
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start,
-                           uint64_t finished,
-                           uint64_t total);
+GNUNET_TIME_calculate_eta(struct GNUNET_TIME_Absolute start,
+                          uint64_t finished,
+                          uint64_t total);
 
 
 /**
@@ -392,8 +388,8 @@ GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start,
  * @return 0 if start >= end; FOREVER if end==FOREVER; otherwise end - start
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_absolute_get_difference (struct GNUNET_TIME_Absolute start,
-                                     struct GNUNET_TIME_Absolute end);
+GNUNET_TIME_absolute_get_difference(struct GNUNET_TIME_Absolute start,
+                                    struct GNUNET_TIME_Absolute end);
 
 
 /**
@@ -404,7 +400,7 @@ GNUNET_TIME_absolute_get_difference (struct GNUNET_TIME_Absolute start,
  * @return 0 if hence > now, otherwise now-hence.
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_absolute_get_duration (struct GNUNET_TIME_Absolute whence);
+GNUNET_TIME_absolute_get_duration(struct GNUNET_TIME_Absolute whence);
 
 
 /**
@@ -416,8 +412,8 @@ GNUNET_TIME_absolute_get_duration (struct GNUNET_TIME_Absolute whence);
  * @return FOREVER if either argument is FOREVER or on overflow; start+duration otherwise
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_add (struct GNUNET_TIME_Absolute start,
-                          struct GNUNET_TIME_Relative duration);
+GNUNET_TIME_absolute_add(struct GNUNET_TIME_Absolute start,
+                         struct GNUNET_TIME_Relative duration);
 
 
 /**
@@ -429,8 +425,8 @@ GNUNET_TIME_absolute_add (struct GNUNET_TIME_Absolute start,
  * @return ZERO if start <= duration, or FOREVER if start time is FOREVER; start-duration otherwise
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_subtract (struct GNUNET_TIME_Absolute start,
-                               struct GNUNET_TIME_Relative duration);
+GNUNET_TIME_absolute_subtract(struct GNUNET_TIME_Absolute start,
+                              struct GNUNET_TIME_Relative duration);
 
 
 /**
@@ -441,8 +437,8 @@ GNUNET_TIME_absolute_subtract (struct GNUNET_TIME_Absolute start,
  * @return FOREVER if rel=FOREVER or on overflow; otherwise rel*factor
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_multiply (struct GNUNET_TIME_Relative rel,
-                               unsigned long long factor);
+GNUNET_TIME_relative_multiply(struct GNUNET_TIME_Relative rel,
+                              unsigned long long factor);
 
 
 /**
@@ -453,8 +449,8 @@ GNUNET_TIME_relative_multiply (struct GNUNET_TIME_Relative rel,
  * @return FOREVER if rel=FOREVER or on overflow; otherwise rel*factor
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_saturating_multiply (struct GNUNET_TIME_Relative rel,
-                                          unsigned long long factor);
+GNUNET_TIME_relative_saturating_multiply(struct GNUNET_TIME_Relative rel,
+                                         unsigned long long factor);
 
 
 /**
@@ -465,8 +461,8 @@ GNUNET_TIME_relative_saturating_multiply (struct GNUNET_TIME_Relative rel,
  * @return FOREVER if rel=FOREVER or factor==0; otherwise rel/factor
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_divide (struct GNUNET_TIME_Relative rel,
-                             unsigned long long factor);
+GNUNET_TIME_relative_divide(struct GNUNET_TIME_Relative rel,
+                            unsigned long long factor);
 
 
 /**
@@ -477,8 +473,8 @@ GNUNET_TIME_relative_divide (struct GNUNET_TIME_Relative rel,
  * @return FOREVER if either argument is FOREVER or on overflow; a1+a2 otherwise
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_add (struct GNUNET_TIME_Relative a1,
-                          struct GNUNET_TIME_Relative a2);
+GNUNET_TIME_relative_add(struct GNUNET_TIME_Relative a1,
+                         struct GNUNET_TIME_Relative a2);
 
 
 /**
@@ -489,8 +485,8 @@ GNUNET_TIME_relative_add (struct GNUNET_TIME_Relative a1,
  * @return ZERO if a2>=a1 (including both FOREVER), FOREVER if a1 is FOREVER, a1-a2 otherwise
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_subtract (struct GNUNET_TIME_Relative a1,
-                               struct GNUNET_TIME_Relative a2);
+GNUNET_TIME_relative_subtract(struct GNUNET_TIME_Relative a1,
+                              struct GNUNET_TIME_Relative a2);
 
 
 /**
@@ -500,7 +496,7 @@ GNUNET_TIME_relative_subtract (struct GNUNET_TIME_Relative a1,
  * @return converted time value
  */
 struct GNUNET_TIME_RelativeNBO
-GNUNET_TIME_relative_hton (struct GNUNET_TIME_Relative a);
+GNUNET_TIME_relative_hton(struct GNUNET_TIME_Relative a);
 
 
 /**
@@ -510,7 +506,7 @@ GNUNET_TIME_relative_hton (struct GNUNET_TIME_Relative a);
  * @return converted time value
  */
 struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_ntoh (struct GNUNET_TIME_RelativeNBO a);
+GNUNET_TIME_relative_ntoh(struct GNUNET_TIME_RelativeNBO a);
 
 
 /**
@@ -520,7 +516,7 @@ GNUNET_TIME_relative_ntoh (struct GNUNET_TIME_RelativeNBO a);
  * @return converted time value
  */
 struct GNUNET_TIME_AbsoluteNBO
-GNUNET_TIME_absolute_hton (struct GNUNET_TIME_Absolute a);
+GNUNET_TIME_absolute_hton(struct GNUNET_TIME_Absolute a);
 
 
 /**
@@ -530,7 +526,7 @@ GNUNET_TIME_absolute_hton (struct GNUNET_TIME_Absolute a);
  * @return converted time value
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_ntoh (struct GNUNET_TIME_AbsoluteNBO a);
+GNUNET_TIME_absolute_ntoh(struct GNUNET_TIME_AbsoluteNBO a);
 
 
 /**
@@ -539,7 +535,7 @@ GNUNET_TIME_absolute_ntoh (struct GNUNET_TIME_AbsoluteNBO a);
  * @param offset the offset to skew the locale time by
  */
 void
-GNUNET_TIME_set_offset (long long offset);
+GNUNET_TIME_set_offset(long long offset);
 
 
 /**
@@ -548,14 +544,14 @@ GNUNET_TIME_set_offset (long long offset);
  * @return the offset we currently skew the locale time by
  */
 long long
-GNUNET_TIME_get_offset (void);
+GNUNET_TIME_get_offset(void);
 
 
 /**
  * Return the current year (i.e. '2011').
  */
 unsigned int
-GNUNET_TIME_get_current_year (void);
+GNUNET_TIME_get_current_year(void);
 
 
 /**
@@ -565,7 +561,7 @@ GNUNET_TIME_get_current_year (void);
  * @return absolute time for January 1st of that year.
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_year_to_time (unsigned int year);
+GNUNET_TIME_year_to_time(unsigned int year);
 
 
 /**
@@ -575,7 +571,7 @@ GNUNET_TIME_year_to_time (unsigned int year);
  * @return year a year (after 1970), 0 on error
  */
 unsigned int
-GNUNET_TIME_time_to_year (struct GNUNET_TIME_Absolute at);
+GNUNET_TIME_time_to_year(struct GNUNET_TIME_Absolute at);
 
 
 /**
@@ -603,7 +599,7 @@ struct GNUNET_CONFIGURATION_Handle;
  * @return monotonically increasing time
  */
 struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get_monotonic (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TIME_absolute_get_monotonic(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index c12bd7441..2219cf7a7 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -1,19 +1,19 @@
 /*
- This file is part of GNUnet.
- Copyright (C) 2010-2015, 2018, 2019 GNUnet e.V.
+   This file is part of GNUnet.
+   Copyright (C) 2010-2015, 2018, 2019 GNUnet e.V.
 
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
 
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Affero General Public License for more details.
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
 
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -50,7 +50,7 @@ struct GNUNET_TRANSPORT_ApplicationHandle;
  * @return ats application handle, NULL on error
  */
 struct GNUNET_TRANSPORT_ApplicationHandle *
-GNUNET_TRANSPORT_application_init (
+GNUNET_TRANSPORT_application_init(
   const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
@@ -60,7 +60,7 @@ GNUNET_TRANSPORT_application_init (
  * @param ch handle to destroy
  */
 void
-GNUNET_TRANSPORT_application_done (
+GNUNET_TRANSPORT_application_done(
   struct GNUNET_TRANSPORT_ApplicationHandle *ch);
 
 
@@ -75,7 +75,7 @@ GNUNET_TRANSPORT_application_done (
  * @return suggest handle, NULL if a request is already pending
  */
 struct GNUNET_TRANSPORT_ApplicationSuggestHandle *
-GNUNET_TRANSPORT_application_suggest (
+GNUNET_TRANSPORT_application_suggest(
   struct GNUNET_TRANSPORT_ApplicationHandle *ch,
   const struct GNUNET_PeerIdentity *peer,
   enum GNUNET_MQ_PriorityPreferences pk,
@@ -88,7 +88,7 @@ GNUNET_TRANSPORT_application_suggest (
  * @param sh handle to stop
  */
 void
-GNUNET_TRANSPORT_application_suggest_cancel (
+GNUNET_TRANSPORT_application_suggest_cancel(
   struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh);
 
 
@@ -108,7 +108,7 @@ GNUNET_TRANSPORT_application_suggest_cancel (
  * @param addr address to validate
  */
 void
-GNUNET_TRANSPORT_application_validate (
+GNUNET_TRANSPORT_application_validate(
   struct GNUNET_TRANSPORT_ApplicationHandle *ch,
   const struct GNUNET_PeerIdentity *peer,
   enum GNUNET_NetworkType nt,
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index ea1ff732e..e7c8be0c6 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -87,9 +87,7 @@ struct GNUNET_TRANSPORT_CommunicatorHandle;
  * FIXME: may want to distinguish bi-directional as well,
  * should we define a bit for that? Needed in DV logic (handle_dv_learn)!
  */
-enum GNUNET_TRANSPORT_CommunicatorCharacteristics
-{
-
+enum GNUNET_TRANSPORT_CommunicatorCharacteristics {
   /**
    * Characteristics are unknown (i.e. DV).
    */
@@ -104,7 +102,6 @@ enum GNUNET_TRANSPORT_CommunicatorCharacteristics
    * Transmission is unreliable (i.e. UDP)
    */
   GNUNET_TRANSPORT_CC_UNRELIABLE = 2
-
 };
 
 
@@ -146,7 +143,7 @@ typedef void (*GNUNET_TRANSPORT_CommunicatorNotify) (
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_CommunicatorHandle *
-GNUNET_TRANSPORT_communicator_connect (
+GNUNET_TRANSPORT_communicator_connect(
   const struct GNUNET_CONFIGURATION_Handle *cfg,
   const char *config_section_name,
   const char *addr_prefix,
@@ -163,7 +160,7 @@ GNUNET_TRANSPORT_communicator_connect (
  * @param ch handle returned from connect
  */
 void
-GNUNET_TRANSPORT_communicator_disconnect (
+GNUNET_TRANSPORT_communicator_disconnect(
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch);
 
 
@@ -203,7 +200,7 @@ typedef void (*GNUNET_TRANSPORT_MessageCompletedCallback) (void *cls,
  *         the tranport service is not yet up
  */
 int
-GNUNET_TRANSPORT_communicator_receive (
+GNUNET_TRANSPORT_communicator_receive(
   struct GNUNET_TRANSPORT_CommunicatorHandle *handle,
   const struct GNUNET_PeerIdentity *sender,
   const struct GNUNET_MessageHeader *msg,
@@ -224,9 +221,7 @@ struct GNUNET_TRANSPORT_QueueHandle;
 /**
  * Possible states of a connection.
  */
-enum GNUNET_TRANSPORT_ConnectionStatus
-{
-
+enum GNUNET_TRANSPORT_ConnectionStatus {
   /**
    * Connection is down.
    */
@@ -260,7 +255,7 @@ enum GNUNET_TRANSPORT_ConnectionStatus
  * @return API handle identifying the new MQ
  */
 struct GNUNET_TRANSPORT_QueueHandle *
-GNUNET_TRANSPORT_communicator_mq_add (
+GNUNET_TRANSPORT_communicator_mq_add(
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
   const struct GNUNET_PeerIdentity *peer,
   const char *address,
@@ -277,7 +272,7 @@ GNUNET_TRANSPORT_communicator_mq_add (
  * @param qh handle for the queue that must be invalidated
  */
 void
-GNUNET_TRANSPORT_communicator_mq_del (struct GNUNET_TRANSPORT_QueueHandle *qh);
+GNUNET_TRANSPORT_communicator_mq_del(struct GNUNET_TRANSPORT_QueueHandle *qh);
 
 
 /**
@@ -297,7 +292,7 @@ struct GNUNET_TRANSPORT_AddressIdentifier;
  * @param expiration when does the communicator forsee this address expiring?
  */
 struct GNUNET_TRANSPORT_AddressIdentifier *
-GNUNET_TRANSPORT_communicator_address_add (
+GNUNET_TRANSPORT_communicator_address_add(
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
   const char *address,
   enum GNUNET_NetworkType nt,
@@ -311,7 +306,7 @@ GNUNET_TRANSPORT_communicator_address_add (
  * @param ai address that is no longer provided
  */
 void
-GNUNET_TRANSPORT_communicator_address_remove (
+GNUNET_TRANSPORT_communicator_address_remove(
   struct GNUNET_TRANSPORT_AddressIdentifier *ai);
 
 
@@ -334,7 +329,7 @@ GNUNET_TRANSPORT_communicator_address_remove (
  *        notify-API to @a pid's communicator @a comm
  */
 void
-GNUNET_TRANSPORT_communicator_notify (
+GNUNET_TRANSPORT_communicator_notify(
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
   const struct GNUNET_PeerIdentity *pid,
   const char *comm,
diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h
index 076514779..e9ae4a2b4 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @author Christian Grothoff
  *
@@ -107,12 +107,12 @@ typedef void (*GNUNET_TRANSPORT_NotifyDisconnect) (
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_CoreHandle *
-GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_PeerIdentity *self,
-                               const struct GNUNET_MQ_MessageHandler *handlers,
-                               void *cls,
-                               GNUNET_TRANSPORT_NotifyConnect nc,
-                               GNUNET_TRANSPORT_NotifyDisconnect nd);
+GNUNET_TRANSPORT_core_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                              const struct GNUNET_PeerIdentity *self,
+                              const struct GNUNET_MQ_MessageHandler *handlers,
+                              void *cls,
+                              GNUNET_TRANSPORT_NotifyConnect nc,
+                              GNUNET_TRANSPORT_NotifyDisconnect nd);
 
 
 /**
@@ -121,7 +121,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle handle returned from connect
  */
 void
-GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle);
+GNUNET_TRANSPORT_core_disconnect(struct GNUNET_TRANSPORT_CoreHandle *handle);
 
 
 /**
@@ -145,8 +145,8 @@ GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle);
  * @param pid which peer was the message from that was fully processed by CORE
  */
 void
-GNUNET_TRANSPORT_core_receive_continue (struct GNUNET_TRANSPORT_CoreHandle *ch,
-                                        const struct GNUNET_PeerIdentity *pid);
+GNUNET_TRANSPORT_core_receive_continue(struct GNUNET_TRANSPORT_CoreHandle *ch,
+                                       const struct GNUNET_PeerIdentity *pid);
 
 
 /**
@@ -158,8 +158,8 @@ GNUNET_TRANSPORT_core_receive_continue (struct GNUNET_TRANSPORT_CoreHandle *ch,
  * @return NULL if disconnected, otherwise message queue for @a peer
  */
 struct GNUNET_MQ_Handle *
-GNUNET_TRANSPORT_core_get_mq (struct GNUNET_TRANSPORT_CoreHandle *handle,
-                              const struct GNUNET_PeerIdentity *peer);
+GNUNET_TRANSPORT_core_get_mq(struct GNUNET_TRANSPORT_CoreHandle *handle,
+                             const struct GNUNET_PeerIdentity *peer);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h
index fe863c058..512103c54 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -58,9 +58,7 @@ extern "C" {
  * classes to filter addresses by which domain they make
  * sense to be used in.  These are used in a bitmask.
  */
-enum GNUNET_TRANSPORT_AddressClass
-{
-
+enum GNUNET_TRANSPORT_AddressClass {
   /**
    * No address.
    */
@@ -108,7 +106,6 @@ enum GNUNET_TRANSPORT_AddressClass
    * Bitmask for "any" address.
    */
   GNUNET_TRANSPORT_AC_ANY = 65535
-
 };
 
 
@@ -141,10 +138,10 @@ struct GNUNET_TRANSPORT_HelloGetHandle;
  * @return handle to cancel the operation
  */
 struct GNUNET_TRANSPORT_HelloGetHandle *
-GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            enum GNUNET_TRANSPORT_AddressClass ac,
-                            GNUNET_TRANSPORT_HelloUpdateCallback rec,
-                            void *rec_cls);
+GNUNET_TRANSPORT_hello_get(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           enum GNUNET_TRANSPORT_AddressClass ac,
+                           GNUNET_TRANSPORT_HelloUpdateCallback rec,
+                           void *rec_cls);
 
 
 /**
@@ -153,7 +150,7 @@ GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param ghh handle to cancel
  */
 void
-GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh);
+GNUNET_TRANSPORT_hello_get_cancel(struct GNUNET_TRANSPORT_HelloGetHandle *ghh);
 
 
 /**
@@ -183,9 +180,9 @@ typedef void (*GNUNET_TRANSPORT_AddressCallback) (
  * @return #GNUNET_OK if hello was well-formed, #GNUNET_SYSERR if not
  */
 int
-GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello,
-                              GNUNET_TRANSPORT_AddressCallback cb,
-                              void *cb_cls);
+GNUNET_TRANSPORT_hello_parse(const struct GNUNET_MessageHeader *hello,
+                             GNUNET_TRANSPORT_AddressCallback cb,
+                             void *cb_cls);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h
index 5b37345b0..3149d1dd5 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -66,7 +66,7 @@ struct GNUNET_TRANSPORT_ManipulationHandle;
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_ManipulationHandle *
-GNUNET_TRANSPORT_manipulation_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TRANSPORT_manipulation_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -75,7 +75,7 @@ GNUNET_TRANSPORT_manipulation_connect (const struct GNUNET_CONFIGURATION_Handle
  * @param handle handle returned from connect
  */
 void
-GNUNET_TRANSPORT_manipulation_disconnect (struct GNUNET_TRANSPORT_ManipulationHandle *handle);
+GNUNET_TRANSPORT_manipulation_disconnect(struct GNUNET_TRANSPORT_ManipulationHandle *handle);
 
 
 /**
@@ -91,11 +91,11 @@ GNUNET_TRANSPORT_manipulation_disconnect (struct GNUNET_TRANSPORT_ManipulationHa
  * with one message delay.
  */
 void
-GNUNET_TRANSPORT_manipulation_set (struct GNUNET_TRANSPORT_ManipulationHandle *handle,
-                                   const struct GNUNET_PeerIdentity *peer,
-                                   const struct GNUNET_ATS_Properties *prop,
-                                   struct GNUNET_TIME_Relative delay_in,
-                                   struct GNUNET_TIME_Relative delay_out);
+GNUNET_TRANSPORT_manipulation_set(struct GNUNET_TRANSPORT_ManipulationHandle *handle,
+                                  const struct GNUNET_PeerIdentity *peer,
+                                  const struct GNUNET_ATS_Properties *prop,
+                                  struct GNUNET_TIME_Relative delay_in,
+                                  struct GNUNET_TIME_Relative delay_out);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h
index f83fa7e9f..a67fca778 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -56,9 +56,7 @@ extern "C"
 /**
  * Information about another peer's address.
  */
-struct GNUNET_TRANSPORT_MonitorInformation
-{
-
+struct GNUNET_TRANSPORT_MonitorInformation {
   /**
    * Address we have for the peer, human-readable, 0-terminated, in UTF-8.
    */
@@ -103,7 +101,6 @@ struct GNUNET_TRANSPORT_MonitorInformation
    * Current estimate of the RTT.
    */
   struct GNUNET_TIME_Relative rtt;
-
 };
 
 
@@ -162,11 +159,11 @@ struct GNUNET_TRANSPORT_MonitorContext;
  * @param cb_cls closure for @a mc
  */
 struct GNUNET_TRANSPORT_MonitorContext *
-GNUNET_TRANSPORT_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_PeerIdentity *peer,
-                          int one_shot,
-                          GNUNET_TRANSPORT_MonitorCallback cb,
-                          void *cb_cls);
+GNUNET_TRANSPORT_monitor(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                         const struct GNUNET_PeerIdentity *peer,
+                         int one_shot,
+                         GNUNET_TRANSPORT_MonitorCallback cb,
+                         void *cb_cls);
 
 
 /**
@@ -175,7 +172,7 @@ GNUNET_TRANSPORT_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param mc handle for the request to cancel
  */
 void
-GNUNET_TRANSPORT_monitor_cancel (struct GNUNET_TRANSPORT_MonitorContext *mc);
+GNUNET_TRANSPORT_monitor_cancel(struct GNUNET_TRANSPORT_MonitorContext *mc);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index ed5244987..12ecb88f2 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -134,9 +134,9 @@ typedef struct GNUNET_TIME_Relative
  * @return type of the network the address belongs to
  */
 typedef enum GNUNET_NetworkType
-(*GNUNET_TRANSPORT_AddressToType) (void *cls,
-                                   const struct sockaddr *addr,
-                                   size_t addrlen);
+(*GNUNET_TRANSPORT_AddressToType)(void *cls,
+                                  const struct sockaddr *addr,
+                                  size_t addrlen);
 
 
 /**
@@ -203,8 +203,7 @@ typedef const struct GNUNET_MessageHeader *
  * of this type as the first and only argument to the
  * entry point of each transport plugin.
  */
-struct GNUNET_TRANSPORT_PluginEnvironment
-{
+struct GNUNET_TRANSPORT_PluginEnvironment {
   /**
    * Configuration to use.
    */
@@ -277,7 +276,6 @@ struct GNUNET_TRANSPORT_PluginEnvironment
    * UDP) can ignore this value.
    */
   uint32_t max_connections;
-
 };
 
 
@@ -550,8 +548,8 @@ typedef int
  * @return the network type
  */
 typedef enum GNUNET_NetworkType
-(*GNUNET_TRANSPORT_GetNetworkType) (void *cls,
-                                    struct GNUNET_ATS_Session *session);
+(*GNUNET_TRANSPORT_GetNetworkType)(void *cls,
+                                   struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -562,8 +560,8 @@ typedef enum GNUNET_NetworkType
  * @return the network type
  */
 typedef enum GNUNET_NetworkType
-(*GNUNET_TRANSPORT_GetNetworkTypeForAddress) (void *cls,
-                                              const struct GNUNET_HELLO_Address *address);
+(*GNUNET_TRANSPORT_GetNetworkTypeForAddress)(void *cls,
+                                             const struct GNUNET_HELLO_Address *address);
 
 
 /**
@@ -606,9 +604,7 @@ typedef void
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_TRANSPORT_PluginFunctions
-{
-
+struct GNUNET_TRANSPORT_PluginFunctions {
   /**
    * Closure for all of the callbacks.
    */
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 80949b417..735e216e8 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Christian Grothoff
@@ -75,10 +75,10 @@ struct GNUNET_TRANSPORT_OfferHelloHandle;
  *
  */
 struct GNUNET_TRANSPORT_OfferHelloHandle *
-GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_MessageHeader *hello,
-                              GNUNET_SCHEDULER_TaskCallback cont,
-                              void *cont_cls);
+GNUNET_TRANSPORT_offer_hello(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                             const struct GNUNET_MessageHeader *hello,
+                             GNUNET_SCHEDULER_TaskCallback cont,
+                             void *cont_cls);
 
 
 /**
@@ -87,7 +87,7 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param ohh the `struct GNUNET_TRANSPORT_OfferHelloHandle` to cancel
  */
 void
-GNUNET_TRANSPORT_offer_hello_cancel (
+GNUNET_TRANSPORT_offer_hello_cancel(
   struct GNUNET_TRANSPORT_OfferHelloHandle *ohh);
 
 
@@ -133,7 +133,7 @@ typedef void (*GNUNET_TRANSPORT_AddressToStringCallback) (void *cls,
  * @return handle to cancel the operation, NULL on error
  */
 struct GNUNET_TRANSPORT_AddressToStringContext *
-GNUNET_TRANSPORT_address_to_string (
+GNUNET_TRANSPORT_address_to_string(
   const struct GNUNET_CONFIGURATION_Handle *cfg,
   const struct GNUNET_HELLO_Address *address,
   int numeric,
@@ -148,7 +148,7 @@ GNUNET_TRANSPORT_address_to_string (
  * @param alc the context handle
  */
 void
-GNUNET_TRANSPORT_address_to_string_cancel (
+GNUNET_TRANSPORT_address_to_string_cancel(
   struct GNUNET_TRANSPORT_AddressToStringContext *alc);
 
 
@@ -211,8 +211,7 @@ GNUNET_TRANSPORT_address_to_string_cancel (
  * to 0).
  *
  */
-enum GNUNET_TRANSPORT_PeerState
-{
+enum GNUNET_TRANSPORT_PeerState {
   /**
    * Fresh peer or completely disconnected
    */
@@ -289,7 +288,7 @@ enum GNUNET_TRANSPORT_PeerState
  * @param state the state
  */
 const char *
-GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state);
+GNUNET_TRANSPORT_ps2s(enum GNUNET_TRANSPORT_PeerState state);
 
 
 /**
@@ -299,7 +298,7 @@ GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state);
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state);
+GNUNET_TRANSPORT_is_connected(enum GNUNET_TRANSPORT_PeerState state);
 
 
 /**
@@ -361,7 +360,7 @@ typedef void (*GNUNET_TRANSPORT_PeerIterateCallback) (
  * @param peer_callback_cls closure for @a peer_callback
  */
 struct GNUNET_TRANSPORT_PeerMonitoringContext *
-GNUNET_TRANSPORT_monitor_peers (
+GNUNET_TRANSPORT_monitor_peers(
   const struct GNUNET_CONFIGURATION_Handle *cfg,
   const struct GNUNET_PeerIdentity *peer,
   int one_shot,
@@ -375,7 +374,7 @@ GNUNET_TRANSPORT_monitor_peers (
  * @param pic handle for the request to cancel
  */
 void
-GNUNET_TRANSPORT_monitor_peers_cancel (
+GNUNET_TRANSPORT_monitor_peers_cancel(
   struct GNUNET_TRANSPORT_PeerMonitoringContext *pic);
 
 
@@ -414,9 +413,9 @@ typedef int (*GNUNET_TRANSPORT_BlacklistCallback) (
  * @return NULL on error, otherwise handle for cancellation
  */
 struct GNUNET_TRANSPORT_Blacklist *
-GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            GNUNET_TRANSPORT_BlacklistCallback cb,
-                            void *cb_cls);
+GNUNET_TRANSPORT_blacklist(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                           GNUNET_TRANSPORT_BlacklistCallback cb,
+                           void *cb_cls);
 
 
 /**
@@ -426,7 +425,7 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param br handle of the request that is to be cancelled
  */
 void
-GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br);
+GNUNET_TRANSPORT_blacklist_cancel(struct GNUNET_TRANSPORT_Blacklist *br);
 
 
 /**
@@ -444,9 +443,7 @@ struct GNUNET_TRANSPORT_PluginSession;
 /**
  * Possible states of a session in a plugin.
  */
-enum GNUNET_TRANSPORT_SessionState
-{
-
+enum GNUNET_TRANSPORT_SessionState {
   /**
    * The session was created (first call for each session object).
    */
@@ -473,16 +470,13 @@ enum GNUNET_TRANSPORT_SessionState
    * Last call for each session object.
    */
   GNUNET_TRANSPORT_SS_DONE
-
 };
 
 
 /**
  * Information about a plugin's session.
  */
-struct GNUNET_TRANSPORT_SessionInfo
-{
-
+struct GNUNET_TRANSPORT_SessionInfo {
   /**
    * New state of the session.
    */
@@ -561,9 +555,9 @@ typedef void (*GNUNET_TRANSPORT_SessionMonitorCallback) (
  * @return NULL on error, otherwise handle for cancellation
  */
 struct GNUNET_TRANSPORT_PluginMonitor *
-GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  GNUNET_TRANSPORT_SessionMonitorCallback cb,
-                                  void *cb_cls);
+GNUNET_TRANSPORT_monitor_plugins(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                 GNUNET_TRANSPORT_SessionMonitorCallback cb,
+                                 void *cb_cls);
 
 
 /**
@@ -574,7 +568,7 @@ GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param pm handle of the request that is to be cancelled
  */
 void
-GNUNET_TRANSPORT_monitor_plugins_cancel (
+GNUNET_TRANSPORT_monitor_plugins_cancel(
   struct GNUNET_TRANSPORT_PluginMonitor *pm);
 
 
@@ -659,13 +653,13 @@ typedef void (*GNUNET_TRANSPORT_NotifyExcessBandwidth) (
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_CoreHandle *
-GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_PeerIdentity *self,
-                               const struct GNUNET_MQ_MessageHandler *handlers,
-                               void *cls,
-                               GNUNET_TRANSPORT_NotifyConnect nc,
-                               GNUNET_TRANSPORT_NotifyDisconnect nd,
-                               GNUNET_TRANSPORT_NotifyExcessBandwidth neb);
+GNUNET_TRANSPORT_core_connect(const struct GNUNET_CONFIGURATION_Handle *cfg,
+                              const struct GNUNET_PeerIdentity *self,
+                              const struct GNUNET_MQ_MessageHandler *handlers,
+                              void *cls,
+                              GNUNET_TRANSPORT_NotifyConnect nc,
+                              GNUNET_TRANSPORT_NotifyDisconnect nd,
+                              GNUNET_TRANSPORT_NotifyExcessBandwidth neb);
 
 
 /**
@@ -674,7 +668,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param handle handle returned from connect
  */
 void
-GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle);
+GNUNET_TRANSPORT_core_disconnect(struct GNUNET_TRANSPORT_CoreHandle *handle);
 
 
 /**
@@ -685,8 +679,8 @@ GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle);
  * @return NULL if disconnected, otherwise message queue for @a peer
  */
 struct GNUNET_MQ_Handle *
-GNUNET_TRANSPORT_core_get_mq (struct GNUNET_TRANSPORT_CoreHandle *handle,
-                              const struct GNUNET_PeerIdentity *peer);
+GNUNET_TRANSPORT_core_get_mq(struct GNUNET_TRANSPORT_CoreHandle *handle,
+                             const struct GNUNET_PeerIdentity *peer);
 
 
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index c01e641c1..941f394aa 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Philipp Toelke
@@ -78,8 +78,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Header from Linux TUN interface.
  */
-struct GNUNET_TUN_Layer2PacketHeader
-{
+struct GNUNET_TUN_Layer2PacketHeader {
   /**
    * Some flags (unused).
    */
@@ -95,8 +94,7 @@ struct GNUNET_TUN_Layer2PacketHeader
 /**
  * Standard IPv4 header.
  */
-struct GNUNET_TUN_IPv4Header
-{
+struct GNUNET_TUN_IPv4Header {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   unsigned int header_length : 4 GNUNET_PACKED;
   unsigned int version : 4 GNUNET_PACKED;
@@ -152,8 +150,7 @@ struct GNUNET_TUN_IPv4Header
 /**
  * Standard IPv6 header.
  */
-struct GNUNET_TUN_IPv6Header
-{
+struct GNUNET_TUN_IPv6Header {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   unsigned int traffic_class_h : 4 GNUNET_PACKED;
   unsigned int version : 4 GNUNET_PACKED;
@@ -208,8 +205,7 @@ struct GNUNET_TUN_IPv6Header
 /**
  * TCP packet header.
  */
-struct GNUNET_TUN_TcpHeader
-{
+struct GNUNET_TUN_TcpHeader {
   /**
    * Source port (in NBO).
    */
@@ -276,8 +272,7 @@ struct GNUNET_TUN_TcpHeader
 /**
  * UDP packet header.
  */
-struct GNUNET_TUN_UdpHeader
-{
+struct GNUNET_TUN_UdpHeader {
   /**
    * Source port (in NBO).
    */
@@ -336,8 +331,7 @@ struct GNUNET_TUN_UdpHeader
 /**
  * DNS flags (largely RFC 1035 / RFC 2136).
  */
-struct GNUNET_TUN_DnsFlags
-{
+struct GNUNET_TUN_DnsFlags {
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   /**
    * Set to 1 if recursion is desired (client -> server)
@@ -389,7 +383,6 @@ struct GNUNET_TUN_DnsFlags
    */
   unsigned int recursion_available : 1 GNUNET_PACKED;
 #elif __BYTE_ORDER == __BIG_ENDIAN
-
   /**
    * query:0, response:1
    */
@@ -443,15 +436,13 @@ struct GNUNET_TUN_DnsFlags
 #else
 #error byteorder undefined
 #endif
-
 } GNUNET_GCC_STRUCT_LAYOUT;
 
 
 /**
  * DNS header.
  */
-struct GNUNET_TUN_DnsHeader
-{
+struct GNUNET_TUN_DnsHeader {
   /**
    * Unique identifier for the request/response.
    */
@@ -487,8 +478,7 @@ struct GNUNET_TUN_DnsHeader
 /**
  * Payload of DNS SOA record (header).
  */
-struct GNUNET_TUN_DnsSoaRecord
-{
+struct GNUNET_TUN_DnsSoaRecord {
   /**
    * The version number of the original copy of the zone.   (NBO)
    */
@@ -522,9 +512,7 @@ struct GNUNET_TUN_DnsSoaRecord
 /**
  * Payload of DNS SRV record (header).
  */
-struct GNUNET_TUN_DnsSrvRecord
-{
-
+struct GNUNET_TUN_DnsSrvRecord {
   /**
    * Preference for this entry (lower value is higher preference).  Clients
    * will contact hosts from the lowest-priority group first and fall back
@@ -551,9 +539,7 @@ struct GNUNET_TUN_DnsSrvRecord
 /**
  * Payload of DNS CERT record.
  */
-struct GNUNET_TUN_DnsCertRecord
-{
-
+struct GNUNET_TUN_DnsCertRecord {
   /**
    * Certificate type
    */
@@ -577,9 +563,7 @@ struct GNUNET_TUN_DnsCertRecord
  * Payload of DNSSEC TLSA record.
  * http://datatracker.ietf.org/doc/draft-ietf-dane-protocol/
  */
-struct GNUNET_TUN_DnsTlsaRecord
-{
-
+struct GNUNET_TUN_DnsTlsaRecord {
   /**
    * Certificate usage
    * 0: CA cert
@@ -623,8 +607,7 @@ struct GNUNET_TUN_DnsTlsaRecord
 /**
  * Payload of GNS VPN record
  */
-struct GNUNET_TUN_GnsVpnRecord
-{
+struct GNUNET_TUN_GnsVpnRecord {
   /**
    * The peer to contact
    */
@@ -642,8 +625,7 @@ struct GNUNET_TUN_GnsVpnRecord
 /**
  * DNS query prefix.
  */
-struct GNUNET_TUN_DnsQueryLine
-{
+struct GNUNET_TUN_DnsQueryLine {
   /**
    * Desired type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
    */
@@ -659,8 +641,7 @@ struct GNUNET_TUN_DnsQueryLine
 /**
  * General DNS record prefix.
  */
-struct GNUNET_TUN_DnsRecordLine
-{
+struct GNUNET_TUN_DnsRecordLine {
   /**
    * Record type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
    */
@@ -703,19 +684,16 @@ struct GNUNET_TUN_DnsRecordLine
 /**
  * ICMP header.
  */
-struct GNUNET_TUN_IcmpHeader
-{
+struct GNUNET_TUN_IcmpHeader {
   uint8_t type;
   uint8_t code;
   uint16_t crc GNUNET_PACKED;
 
-  union
-  {
+  union {
     /**
      * ICMP Echo (request/reply)
      */
-    struct
-    {
+    struct {
       uint16_t identifier GNUNET_PACKED;
       uint16_t sequence_number GNUNET_PACKED;
     } echo;
@@ -723,8 +701,7 @@ struct GNUNET_TUN_IcmpHeader
     /**
      * ICMP Destination Unreachable (RFC 1191)
      */
-    struct ih_pmtu
-    {
+    struct ih_pmtu {
       uint16_t empty GNUNET_PACKED;
       uint16_t next_hop_mtu GNUNET_PACKED;
       /* followed by original IP header + first 8 bytes of original IP datagram
@@ -740,7 +717,6 @@ struct GNUNET_TUN_IcmpHeader
      * MTU for packets that are too big (IPv6).
      */
     uint32_t packet_too_big_mtu GNUNET_PACKED;
-
   } quench;
 };
 
@@ -759,11 +735,11 @@ GNUNET_NETWORK_STRUCT_END
  * @param dst destination IP address to use
  */
 void
-GNUNET_TUN_initialize_ipv4_header (struct GNUNET_TUN_IPv4Header *ip,
-                                   uint8_t protocol,
-                                   uint16_t payload_length,
-                                   const struct in_addr *src,
-                                   const struct in_addr *dst);
+GNUNET_TUN_initialize_ipv4_header(struct GNUNET_TUN_IPv4Header *ip,
+                                  uint8_t protocol,
+                                  uint16_t payload_length,
+                                  const struct in_addr *src,
+                                  const struct in_addr *dst);
 
 
 /**
@@ -777,11 +753,11 @@ GNUNET_TUN_initialize_ipv4_header (struct GNUNET_TUN_IPv4Header *ip,
  * @param dst destination IP address to use
  */
 void
-GNUNET_TUN_initialize_ipv6_header (struct GNUNET_TUN_IPv6Header *ip,
-                                   uint8_t protocol,
-                                   uint16_t payload_length,
-                                   const struct in6_addr *src,
-                                   const struct in6_addr *dst);
+GNUNET_TUN_initialize_ipv6_header(struct GNUNET_TUN_IPv6Header *ip,
+                                  uint8_t protocol,
+                                  uint16_t payload_length,
+                                  const struct in6_addr *src,
+                                  const struct in6_addr *dst);
 
 /**
  * Calculate IPv4 TCP checksum.
@@ -792,10 +768,10 @@ GNUNET_TUN_initialize_ipv6_header (struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of TCP @a payload
  */
 void
-GNUNET_TUN_calculate_tcp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
-                                    struct GNUNET_TUN_TcpHeader *tcp,
-                                    const void *payload,
-                                    uint16_t payload_length);
+GNUNET_TUN_calculate_tcp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
+                                   struct GNUNET_TUN_TcpHeader *tcp,
+                                   const void *payload,
+                                   uint16_t payload_length);
 
 /**
  * Calculate IPv6 TCP checksum.
@@ -806,10 +782,10 @@ GNUNET_TUN_calculate_tcp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
  * @param payload_length number of bytes of TCP payload
  */
 void
-GNUNET_TUN_calculate_tcp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
-                                    struct GNUNET_TUN_TcpHeader *tcp,
-                                    const void *payload,
-                                    uint16_t payload_length);
+GNUNET_TUN_calculate_tcp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
+                                   struct GNUNET_TUN_TcpHeader *tcp,
+                                   const void *payload,
+                                   uint16_t payload_length);
 
 /**
  * Calculate IPv4 UDP checksum.
@@ -820,10 +796,10 @@ GNUNET_TUN_calculate_tcp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of UDP @a payload
  */
 void
-GNUNET_TUN_calculate_udp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
-                                    struct GNUNET_TUN_UdpHeader *udp,
-                                    const void *payload,
-                                    uint16_t payload_length);
+GNUNET_TUN_calculate_udp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
+                                   struct GNUNET_TUN_UdpHeader *udp,
+                                   const void *payload,
+                                   uint16_t payload_length);
 
 
 /**
@@ -835,10 +811,10 @@ GNUNET_TUN_calculate_udp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
  * @param payload_length number of bytes of @a payload
  */
 void
-GNUNET_TUN_calculate_udp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
-                                    struct GNUNET_TUN_UdpHeader *udp,
-                                    const void *payload,
-                                    uint16_t payload_length);
+GNUNET_TUN_calculate_udp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
+                                   struct GNUNET_TUN_UdpHeader *udp,
+                                   const void *payload,
+                                   uint16_t payload_length);
 
 
 /**
@@ -849,9 +825,9 @@ GNUNET_TUN_calculate_udp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of @a payload
  */
 void
-GNUNET_TUN_calculate_icmp_checksum (struct GNUNET_TUN_IcmpHeader *icmp,
-                                    const void *payload,
-                                    uint16_t payload_length);
+GNUNET_TUN_calculate_icmp_checksum(struct GNUNET_TUN_IcmpHeader *icmp,
+                                   const void *payload,
+                                   uint16_t payload_length);
 
 
 /**
@@ -863,9 +839,9 @@ GNUNET_TUN_calculate_icmp_checksum (struct GNUNET_TUN_IcmpHeader *icmp,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv4toregexsearch (const struct in_addr *ip,
-                              uint16_t port,
-                              char *rxstr);
+GNUNET_TUN_ipv4toregexsearch(const struct in_addr *ip,
+                             uint16_t port,
+                             char *rxstr);
 
 
 /**
@@ -877,9 +853,9 @@ GNUNET_TUN_ipv4toregexsearch (const struct in_addr *ip,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv6toregexsearch (const struct in6_addr *ipv6,
-                              uint16_t port,
-                              char *rxstr);
+GNUNET_TUN_ipv6toregexsearch(const struct in6_addr *ipv6,
+                             uint16_t port,
+                             char *rxstr);
 
 
 /**
@@ -892,7 +868,7 @@ GNUNET_TUN_ipv6toregexsearch (const struct in6_addr *ipv6,
  * @return regular expression, NULL on error
  */
 char *
-GNUNET_TUN_ipv6policy2regex (const char *policy);
+GNUNET_TUN_ipv6policy2regex(const char *policy);
 
 
 /**
@@ -905,7 +881,7 @@ GNUNET_TUN_ipv6policy2regex (const char *policy);
  * @return regular expression, NULL on error
  */
 char *
-GNUNET_TUN_ipv4policy2regex (const char *policy);
+GNUNET_TUN_ipv4policy2regex(const char *policy);
 
 
 /**
@@ -917,8 +893,8 @@ GNUNET_TUN_ipv4policy2regex (const char *policy);
  * @param[out] hc corresponding hash
  */
 void
-GNUNET_TUN_service_name_to_hash (const char *service_name,
-                                 struct GNUNET_HashCode *hc);
+GNUNET_TUN_service_name_to_hash(const char *service_name,
+                                struct GNUNET_HashCode *hc);
 
 
 /**
@@ -930,9 +906,9 @@ GNUNET_TUN_service_name_to_hash (const char *service_name,
  * @return #GNUNET_YES if they are equal
  */
 int
-GNUNET_TUN_sockaddr_cmp (const struct sockaddr *sa,
-                         const struct sockaddr *sb,
-                         int include_port);
+GNUNET_TUN_sockaddr_cmp(const struct sockaddr *sa,
+                        const struct sockaddr *sb,
+                        int include_port);
 
 
 /**
@@ -945,9 +921,9 @@ GNUNET_TUN_sockaddr_cmp (const struct sockaddr *sa,
  * @param[out] cadet_port CADET port to use
  */
 void
-GNUNET_TUN_compute_service_cadet_port (const struct GNUNET_HashCode *desc,
-                                       uint16_t ip_port,
-                                       struct GNUNET_HashCode *cadet_port);
+GNUNET_TUN_compute_service_cadet_port(const struct GNUNET_HashCode *desc,
+                                      uint16_t ip_port,
+                                      struct GNUNET_HashCode *cadet_port);
 
 #endif
 
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index a7bd7ce4b..24ad4e4e5 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -50,7 +50,7 @@ extern "C"
 /**
  * Smallest supported message.
  */
-#define GNUNET_MIN_MESSAGE_SIZE sizeof (struct GNUNET_MessageHeader)
+#define GNUNET_MIN_MESSAGE_SIZE sizeof(struct GNUNET_MessageHeader)
 
 /**
  * NOTE: You MUST adjust this URL to point to the location of a
diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h
index d986c29a4..a036824f6 100644
--- a/src/include/gnunet_util_taler_wallet_lib.h
+++ b/src/include/gnunet_util_taler_wallet_lib.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index 2096bf539..7e066b14f 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -11,7 +11,7 @@
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
       Affero General Public License for more details.
-     
+
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -59,8 +59,8 @@ struct GNUNET_VPN_RedirectionRequest;
  *                specified target peer; NULL on error
  */
 typedef void (*GNUNET_VPN_AllocationCallback)(void *cls,
-                                              int af,
-                                              const void *address);
+                                              int af,
+                                              const void *address);
 
 
 /**
@@ -69,7 +69,7 @@ typedef void (*GNUNET_VPN_AllocationCallback)(void *cls,
  * @param rr request to cancel
  */
 void
-GNUNET_VPN_cancel_request (struct GNUNET_VPN_RedirectionRequest *rr);
+GNUNET_VPN_cancel_request(struct GNUNET_VPN_RedirectionRequest *rr);
 
 
 /**
@@ -95,14 +95,14 @@ GNUNET_VPN_cancel_request (struct GNUNET_VPN_RedirectionRequest *rr);
  *         anyway)
  */
 struct GNUNET_VPN_RedirectionRequest *
-GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
-                             int result_af,
-                             uint8_t protocol,
-                             const struct GNUNET_PeerIdentity *peer,
-                             const struct GNUNET_HashCode *serv,
-                             struct GNUNET_TIME_Absolute expiration_time,
-                             GNUNET_VPN_AllocationCallback cb,
-                             void *cb_cls);
+GNUNET_VPN_redirect_to_peer(struct GNUNET_VPN_Handle *vh,
+                            int result_af,
+                            uint8_t protocol,
+                            const struct GNUNET_PeerIdentity *peer,
+                            const struct GNUNET_HashCode *serv,
+                            struct GNUNET_TIME_Absolute expiration_time,
+                            GNUNET_VPN_AllocationCallback cb,
+                            void *cb_cls);
 
 
 /**
@@ -129,13 +129,13 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
  *         anyway)
  */
 struct GNUNET_VPN_RedirectionRequest *
-GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
-                           int result_af,
-                           int addr_af,
-                           const void *addr,
-                           struct GNUNET_TIME_Absolute expiration_time,
-                           GNUNET_VPN_AllocationCallback cb,
-                           void *cb_cls);
+GNUNET_VPN_redirect_to_ip(struct GNUNET_VPN_Handle *vh,
+                          int result_af,
+                          int addr_af,
+                          const void *addr,
+                          struct GNUNET_TIME_Absolute expiration_time,
+                          GNUNET_VPN_AllocationCallback cb,
+                          void *cb_cls);
 
 
 /**
@@ -145,7 +145,7 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
  * @return VPN handle
  */
 struct GNUNET_VPN_Handle *
-GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_VPN_connect(const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -154,7 +154,7 @@ GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param vh VPN handle
  */
 void
-GNUNET_VPN_disconnect (struct GNUNET_VPN_Handle *vh);
+GNUNET_VPN_disconnect(struct GNUNET_VPN_Handle *vh);
 
 #endif
 
diff --git a/src/include/platform.h b/src/include/platform.h
index 6a3e8e4b8..e12d08e44 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Nils Durner
@@ -39,7 +39,7 @@
 #endif
 
 #ifdef WINDOWS
-#define BREAKPOINT asm("int $3;");
+#define BREAKPOINT asm ("int $3;");
 #define GNUNET_SIGCHLD 17
 #else
 #define BREAKPOINT
@@ -223,11 +223,11 @@
 /**
  * GNU gettext support macro.
  */
-#define _(String) dgettext(PACKAGE,String)
+#define _(String) dgettext(PACKAGE, String)
 #define LIBEXTRACTOR_GETTEXT_DOMAIN "libextractor"
 #else
 #include "libintlemu.h"
-#define _(String) dgettext("org.gnunet.gnunet",String)
+#define _(String) dgettext("org.gnunet.gnunet", String)
 #define LIBEXTRACTOR_GETTEXT_DOMAIN "org.gnunet.libextractor"
 #endif
 
@@ -249,7 +249,7 @@
 #ifdef DARWIN
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
- /* not available on darwin, override configure */
+/* not available on darwin, override configure */
 #undef HAVE_STAT64
 #undef HAVE_MREMAP
 #endif
@@ -257,7 +257,7 @@
 
 #if !HAVE_ATOLL
 long long
-atoll (const char *nptr);
+atoll(const char *nptr);
 #endif
 
 #if ENABLE_NLS
diff --git a/src/include/tap-windows.h b/src/include/tap-windows.h
index c9eb38eba..37f4129c0 100644
--- a/src/include/tap-windows.h
+++ b/src/include/tap-windows.h
@@ -37,25 +37,25 @@
  * =============
  */
 
-#define TAP_WIN_CONTROL_CODE(request,method) \
-  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
+#define TAP_WIN_CONTROL_CODE(request, method) \
+  CTL_CODE(FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
 
 /* Present in 8.1 */
 
-#define TAP_WIN_IOCTL_GET_MAC               TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_GET_VERSION           TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_GET_MTU               TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_GET_INFO              TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_SET_MEDIA_STATUS      TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ      TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED)
-#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT   TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_MAC               TAP_WIN_CONTROL_CODE(1, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_VERSION           TAP_WIN_CONTROL_CODE(2, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_MTU               TAP_WIN_CONTROL_CODE(3, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_INFO              TAP_WIN_CONTROL_CODE(4, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE(5, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_SET_MEDIA_STATUS      TAP_WIN_CONTROL_CODE(6, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ      TAP_WIN_CONTROL_CODE(7, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE(8, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT   TAP_WIN_CONTROL_CODE(9, METHOD_BUFFERED)
 
 /* Added in 8.2 */
 
 /* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */
-#define TAP_WIN_IOCTL_CONFIG_TUN            TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED)
+#define TAP_WIN_IOCTL_CONFIG_TUN            TAP_WIN_CONTROL_CODE(10, METHOD_BUFFERED)
 
 /*
  * =================
diff --git a/src/include/winproc.h b/src/include/winproc.h
index 3910321d7..139f07e61 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @author Nils Durner
@@ -60,175 +60,174 @@ extern "C"
 #define MAX_NAME_LENGTH 25
 #endif
 
-  typedef DWORD WINAPI (*TNtQuerySystemInformation) (int, PVOID, ULONG, PULONG);
-  typedef DWORD WINAPI (*TGetIfEntry) (PMIB_IFROW pIfRow);
-  typedef DWORD WINAPI (*TGetIpAddrTable) (PMIB_IPADDRTABLE pIpAddrTable,
-                                           PULONG pdwSize, BOOL bOrder);
-  typedef DWORD WINAPI (*TGetIfTable) (PMIB_IFTABLE pIfTable, PULONG pdwSize,
-                                       BOOL bOrder);
-  typedef DWORD WINAPI (*TGetBestInterfaceEx) (struct sockaddr *, PDWORD);
-  /* TODO: Explicitly import -A variants (i.e. TCreateHardLinkA) or -W
-   * variants (TCreateHardLinkW), etc.
-   */
-  typedef DWORD WINAPI (*TCreateHardLink) (LPCTSTR lpFileName,
-                                           LPCTSTR lpExistingFileName,
-                                           LPSECURITY_ATTRIBUTES
-                                           lpSecurityAttributes);
-  typedef SC_HANDLE WINAPI (*TOpenSCManager) (LPCTSTR lpMachineName,
-                                              LPCTSTR lpDatabaseName,
-                                              DWORD dwDesiredAccess);
-  typedef SC_HANDLE WINAPI (*TCreateService) (SC_HANDLE hSCManager,
-                                              LPCTSTR lpServiceName,
-                                              LPCTSTR lpDisplayName,
-                                              DWORD dwDesiredAccess,
-                                              DWORD dwServiceType,
-                                              DWORD dwStartType,
-                                              DWORD dwErrorControl,
-                                              LPCTSTR lpBinaryPathName,
-                                              LPCTSTR lpLoadOrderGroup,
-                                              LPDWORD lpdwTagId,
-                                              LPCTSTR lpDependencies,
-                                              LPCTSTR lpServiceStartName,
-                                              LPCTSTR lpPassword);
-  typedef BOOL WINAPI (*TCloseServiceHandle) (SC_HANDLE hSCObject);
-  typedef BOOL WINAPI (*TDeleteService) (SC_HANDLE hService);
-  typedef SERVICE_STATUS_HANDLE WINAPI (*TRegisterServiceCtrlHandler) (LPCTSTR
-                                                                       lpServiceName,
-                                                                       LPHANDLER_FUNCTION
-                                                                       lpHandlerProc);
-  typedef BOOL WINAPI (*TSetServiceStatus) (SERVICE_STATUS_HANDLE
-                                            hServiceStatus,
-                                            LPSERVICE_STATUS lpServiceStatus);
-  typedef BOOL WINAPI (*TStartServiceCtrlDispatcher) (const
-                                                      LPSERVICE_TABLE_ENTRY
-                                                      lpServiceTable);
-  typedef BOOL WINAPI (*TControlService) (SC_HANDLE hService, DWORD dwControl,
-                                          LPSERVICE_STATUS lpServiceStatus);
-  typedef SC_HANDLE WINAPI (*TOpenService) (SC_HANDLE hSCManager,
-                                            LPCTSTR lpServiceName,
+typedef DWORD WINAPI (*TNtQuerySystemInformation) (int, PVOID, ULONG, PULONG);
+typedef DWORD WINAPI (*TGetIfEntry) (PMIB_IFROW pIfRow);
+typedef DWORD WINAPI (*TGetIpAddrTable) (PMIB_IPADDRTABLE pIpAddrTable,
+                                         PULONG pdwSize, BOOL bOrder);
+typedef DWORD WINAPI (*TGetIfTable) (PMIB_IFTABLE pIfTable, PULONG pdwSize,
+                                     BOOL bOrder);
+typedef DWORD WINAPI (*TGetBestInterfaceEx) (struct sockaddr *, PDWORD);
+/* TODO: Explicitly import -A variants (i.e. TCreateHardLinkA) or -W
+ * variants (TCreateHardLinkW), etc.
+ */
+typedef DWORD WINAPI (*TCreateHardLink) (LPCTSTR lpFileName,
+                                         LPCTSTR lpExistingFileName,
+                                         LPSECURITY_ATTRIBUTES
+                                         lpSecurityAttributes);
+typedef SC_HANDLE WINAPI (*TOpenSCManager) (LPCTSTR lpMachineName,
+                                            LPCTSTR lpDatabaseName,
                                             DWORD dwDesiredAccess);
-  typedef DWORD WINAPI (*TGetAdaptersInfo) (PIP_ADAPTER_INFO pAdapterInfo,
-                                            PULONG pOutBufLen);
-  typedef NET_API_STATUS WINAPI (*TNetUserAdd) (LPCWSTR, DWORD, PBYTE, PDWORD);
-  typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername,
-                                                    LPCWSTR username,
-                                                    DWORD level, LPBYTE buf,
-                                                    LPDWORD param_err);
-  typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING,
-                                            PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,
-                                            PLSA_HANDLE);
-  typedef NTSTATUS NTAPI (*TLsaAddAccountRights) (LSA_HANDLE, PSID,
-                                                  PLSA_UNICODE_STRING, ULONG);
-  typedef NTSTATUS NTAPI (*TLsaRemoveAccountRights) (LSA_HANDLE, PSID, BOOLEAN,
-                                                     PLSA_UNICODE_STRING,
-                                                     ULONG);
-  typedef NTSTATUS NTAPI (*TLsaClose) (LSA_HANDLE);
-  typedef BOOL WINAPI (*TLookupAccountName) (LPCTSTR lpSystemName,
-                                             LPCTSTR lpAccountName, PSID Sid,
-                                             LPDWORD cbSid,
-                                             LPTSTR ReferencedDomainName,
-                                             LPDWORD cchReferencedDomainName,
-                                             PSID_NAME_USE peUse);
-
-  typedef BOOL WINAPI (*TGetFileSecurity) (LPCTSTR lpFileName,
-                                           SECURITY_INFORMATION
-                                           RequestedInformation,
-                                           PSECURITY_DESCRIPTOR
-                                           pSecurityDescriptor, DWORD nLength,
-                                           LPDWORD lpnLengthNeeded);
-  typedef BOOL WINAPI (*TInitializeSecurityDescriptor) (PSECURITY_DESCRIPTOR
-                                                        pSecurityDescriptor,
-                                                        DWORD dwRevision);
-  typedef BOOL WINAPI (*TGetSecurityDescriptorDacl) (PSECURITY_DESCRIPTOR
-                                                     pSecurityDescriptor,
-                                                     LPBOOL lpbDaclPresent,
-                                                     PACL * pDacl,
-                                                     LPBOOL lpbDaclDefaulted);
-  typedef BOOL WINAPI (*TGetAclInformation) (PACL pAcl, LPVOID pAclInformation,
-                                             DWORD nAclInformationLength,
-                                             ACL_INFORMATION_CLASS
-                                             dwAclInformationClass);
-  typedef BOOL WINAPI (*TInitializeAcl) (PACL pAcl, DWORD nAclLength,
-                                         DWORD dwAclRevision);
-  typedef BOOL WINAPI (*TGetAce) (PACL pAcl, DWORD dwAceIndex, LPVOID * pAce);
-  typedef BOOL WINAPI (*TEqualSid) (PSID pSid1, PSID pSid2);
-  typedef BOOL WINAPI (*TAddAce) (PACL pAcl, DWORD dwAceRevision,
-                                  DWORD dwStartingAceIndex, LPVOID pAceList,
-                                  DWORD nAceListLength);
-  typedef BOOL WINAPI (*TAddAccessAllowedAce) (PACL pAcl, DWORD dwAceRevision,
-                                               DWORD AccessMask, PSID pSid);
-  typedef BOOL WINAPI (*TSetNamedSecurityInfo) (LPTSTR pObjectName,
-                                                SE_OBJECT_TYPE ObjectType,
-                                                SECURITY_INFORMATION
-                                                SecurityInfo, PSID psidOwner,
-                                                PSID psidGroup, PACL pDacl,
-                                                PACL pSacl);
-
-  extern TGetBestInterfaceEx GNGetBestInterfaceEx;
-  extern TNtQuerySystemInformation GNNtQuerySystemInformation;
-  extern TGetIfEntry GNGetIfEntry;
-  extern TGetIpAddrTable GNGetIpAddrTable;
-  extern TGetIfTable GNGetIfTable;
-  extern TCreateHardLink GNCreateHardLink;
-  extern TOpenSCManager GNOpenSCManager;
-  extern TCreateService GNCreateService;
-  extern TCloseServiceHandle GNCloseServiceHandle;
-  extern TDeleteService GNDeleteService;
-  extern TRegisterServiceCtrlHandler GNRegisterServiceCtrlHandler;
-  extern TSetServiceStatus GNSetServiceStatus;
-  extern TStartServiceCtrlDispatcher GNStartServiceCtrlDispatcher;
-  extern TControlService GNControlService;
-  extern TOpenService GNOpenService;
-  extern TGetAdaptersInfo GNGetAdaptersInfo;
-  extern TNetUserAdd GNNetUserAdd;
-  extern TNetUserSetInfo GNNetUserSetInfo;
-  extern TLsaOpenPolicy GNLsaOpenPolicy;
-  extern TLsaAddAccountRights GNLsaAddAccountRights;
-  extern TLsaRemoveAccountRights GNLsaRemoveAccountRights;
-  extern TLsaClose GNLsaClose;
-  extern TLookupAccountName GNLookupAccountName;
-  extern TGetFileSecurity GNGetFileSecurity;
-  extern TInitializeSecurityDescriptor GNInitializeSecurityDescriptor;
-  extern TGetSecurityDescriptorDacl GNGetSecurityDescriptorDacl;
-  extern TGetAclInformation GNGetAclInformation;
-  extern TInitializeAcl GNInitializeAcl;
-  extern TGetAce GNGetAce;
-  extern TEqualSid GNEqualSid;
-  extern TAddAce GNAddAce;
-  extern TAddAccessAllowedAce GNAddAccessAllowedAce;
-  extern TSetNamedSecurityInfo GNSetNamedSecurityInfo;
-
-
-  BOOL CreateShortcut (const char *pszSrc, const char *pszDest);
-  BOOL DereferenceShortcut (char *pszShortcut);
-  long QueryRegistry (HKEY hMainKey, const char *pszKey, const char *pszSubKey,
-                      char *pszBuffer, long *pdLength);
-  int ListNICs (void (*callback) (void *, const char *, int), void *cls);
-  BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,
-                            DWORD dwAccessMask);
-  char *winErrorStr (const char *prefix, int dwErr);
-  void EnumNICs (PMIB_IFTABLE * pIfTable, PMIB_IPADDRTABLE * pAddrTable);
+typedef SC_HANDLE WINAPI (*TCreateService) (SC_HANDLE hSCManager,
+                                            LPCTSTR lpServiceName,
+                                            LPCTSTR lpDisplayName,
+                                            DWORD dwDesiredAccess,
+                                            DWORD dwServiceType,
+                                            DWORD dwStartType,
+                                            DWORD dwErrorControl,
+                                            LPCTSTR lpBinaryPathName,
+                                            LPCTSTR lpLoadOrderGroup,
+                                            LPDWORD lpdwTagId,
+                                            LPCTSTR lpDependencies,
+                                            LPCTSTR lpServiceStartName,
+                                            LPCTSTR lpPassword);
+typedef BOOL WINAPI (*TCloseServiceHandle) (SC_HANDLE hSCObject);
+typedef BOOL WINAPI (*TDeleteService) (SC_HANDLE hService);
+typedef SERVICE_STATUS_HANDLE WINAPI (*TRegisterServiceCtrlHandler) (LPCTSTR
+                                                                     lpServiceName,
+                                                                     LPHANDLER_FUNCTION
+                                                                     lpHandlerProc);
+typedef BOOL WINAPI (*TSetServiceStatus) (SERVICE_STATUS_HANDLE
+                                          hServiceStatus,
+                                          LPSERVICE_STATUS lpServiceStatus);
+typedef BOOL WINAPI (*TStartServiceCtrlDispatcher) (const
+                                                    LPSERVICE_TABLE_ENTRY
+                                                    lpServiceTable);
+typedef BOOL WINAPI (*TControlService) (SC_HANDLE hService, DWORD dwControl,
+                                        LPSERVICE_STATUS lpServiceStatus);
+typedef SC_HANDLE WINAPI (*TOpenService) (SC_HANDLE hSCManager,
+                                          LPCTSTR lpServiceName,
+                                          DWORD dwDesiredAccess);
+typedef DWORD WINAPI (*TGetAdaptersInfo) (PIP_ADAPTER_INFO pAdapterInfo,
+                                          PULONG pOutBufLen);
+typedef NET_API_STATUS WINAPI (*TNetUserAdd) (LPCWSTR, DWORD, PBYTE, PDWORD);
+typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername,
+                                                  LPCWSTR username,
+                                                  DWORD level, LPBYTE buf,
+                                                  LPDWORD param_err);
+typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING,
+                                          PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,
+                                          PLSA_HANDLE);
+typedef NTSTATUS NTAPI (*TLsaAddAccountRights) (LSA_HANDLE, PSID,
+                                                PLSA_UNICODE_STRING, ULONG);
+typedef NTSTATUS NTAPI (*TLsaRemoveAccountRights) (LSA_HANDLE, PSID, BOOLEAN,
+                                                   PLSA_UNICODE_STRING,
+                                                   ULONG);
+typedef NTSTATUS NTAPI (*TLsaClose) (LSA_HANDLE);
+typedef BOOL WINAPI (*TLookupAccountName) (LPCTSTR lpSystemName,
+                                           LPCTSTR lpAccountName, PSID Sid,
+                                           LPDWORD cbSid,
+                                           LPTSTR ReferencedDomainName,
+                                           LPDWORD cchReferencedDomainName,
+                                           PSID_NAME_USE peUse);
+
+typedef BOOL WINAPI (*TGetFileSecurity) (LPCTSTR lpFileName,
+                                         SECURITY_INFORMATION
+                                         RequestedInformation,
+                                         PSECURITY_DESCRIPTOR
+                                         pSecurityDescriptor, DWORD nLength,
+                                         LPDWORD lpnLengthNeeded);
+typedef BOOL WINAPI (*TInitializeSecurityDescriptor) (PSECURITY_DESCRIPTOR
+                                                      pSecurityDescriptor,
+                                                      DWORD dwRevision);
+typedef BOOL WINAPI (*TGetSecurityDescriptorDacl) (PSECURITY_DESCRIPTOR
+                                                   pSecurityDescriptor,
+                                                   LPBOOL lpbDaclPresent,
+                                                   PACL * pDacl,
+                                                   LPBOOL lpbDaclDefaulted);
+typedef BOOL WINAPI (*TGetAclInformation) (PACL pAcl, LPVOID pAclInformation,
+                                           DWORD nAclInformationLength,
+                                           ACL_INFORMATION_CLASS
+                                           dwAclInformationClass);
+typedef BOOL WINAPI (*TInitializeAcl) (PACL pAcl, DWORD nAclLength,
+                                       DWORD dwAclRevision);
+typedef BOOL WINAPI (*TGetAce) (PACL pAcl, DWORD dwAceIndex, LPVOID * pAce);
+typedef BOOL WINAPI (*TEqualSid) (PSID pSid1, PSID pSid2);
+typedef BOOL WINAPI (*TAddAce) (PACL pAcl, DWORD dwAceRevision,
+                                DWORD dwStartingAceIndex, LPVOID pAceList,
+                                DWORD nAceListLength);
+typedef BOOL WINAPI (*TAddAccessAllowedAce) (PACL pAcl, DWORD dwAceRevision,
+                                             DWORD AccessMask, PSID pSid);
+typedef BOOL WINAPI (*TSetNamedSecurityInfo) (LPTSTR pObjectName,
+                                              SE_OBJECT_TYPE ObjectType,
+                                              SECURITY_INFORMATION
+                                              SecurityInfo, PSID psidOwner,
+                                              PSID psidGroup, PACL pDacl,
+                                              PACL pSacl);
+
+extern TGetBestInterfaceEx GNGetBestInterfaceEx;
+extern TNtQuerySystemInformation GNNtQuerySystemInformation;
+extern TGetIfEntry GNGetIfEntry;
+extern TGetIpAddrTable GNGetIpAddrTable;
+extern TGetIfTable GNGetIfTable;
+extern TCreateHardLink GNCreateHardLink;
+extern TOpenSCManager GNOpenSCManager;
+extern TCreateService GNCreateService;
+extern TCloseServiceHandle GNCloseServiceHandle;
+extern TDeleteService GNDeleteService;
+extern TRegisterServiceCtrlHandler GNRegisterServiceCtrlHandler;
+extern TSetServiceStatus GNSetServiceStatus;
+extern TStartServiceCtrlDispatcher GNStartServiceCtrlDispatcher;
+extern TControlService GNControlService;
+extern TOpenService GNOpenService;
+extern TGetAdaptersInfo GNGetAdaptersInfo;
+extern TNetUserAdd GNNetUserAdd;
+extern TNetUserSetInfo GNNetUserSetInfo;
+extern TLsaOpenPolicy GNLsaOpenPolicy;
+extern TLsaAddAccountRights GNLsaAddAccountRights;
+extern TLsaRemoveAccountRights GNLsaRemoveAccountRights;
+extern TLsaClose GNLsaClose;
+extern TLookupAccountName GNLookupAccountName;
+extern TGetFileSecurity GNGetFileSecurity;
+extern TInitializeSecurityDescriptor GNInitializeSecurityDescriptor;
+extern TGetSecurityDescriptorDacl GNGetSecurityDescriptorDacl;
+extern TGetAclInformation GNGetAclInformation;
+extern TInitializeAcl GNInitializeAcl;
+extern TGetAce GNGetAce;
+extern TEqualSid GNEqualSid;
+extern TAddAce GNAddAce;
+extern TAddAccessAllowedAce GNAddAccessAllowedAce;
+extern TSetNamedSecurityInfo GNSetNamedSecurityInfo;
+
+
+BOOL CreateShortcut(const char *pszSrc, const char *pszDest);
+BOOL DereferenceShortcut(char *pszShortcut);
+long QueryRegistry(HKEY hMainKey, const char *pszKey, const char *pszSubKey,
+                   char *pszBuffer, long *pdLength);
+int ListNICs(void (*callback)(void *, const char *, int), void *cls);
+BOOL AddPathAccessRights(char *lpszFileName, char *lpszAccountName,
+                         DWORD dwAccessMask);
+char *winErrorStr(const char *prefix, int dwErr);
+void EnumNICs(PMIB_IFTABLE * pIfTable, PMIB_IPADDRTABLE * pAddrTable);
 
 #define ENUMNICS3_MASK_OK 0x01
 #define ENUMNICS3_BCAST_OK 0x02
 
-  struct EnumNICs3_results
-  {
-    unsigned char flags;
-    int is_default;
-    char pretty_name[1001];
-    size_t addr_size;
-    SOCKADDR_STORAGE address;
-    SOCKADDR_STORAGE mask;
-    SOCKADDR_STORAGE broadcast;
-  };
-
-  int EnumNICs3 (struct EnumNICs3_results **, int *EnumNICs3_results_count);
-  void EnumNICs3_free (struct EnumNICs3_results *);
-  int GNInitWinEnv ();
-  void GNShutdownWinEnv ();
-
-  BOOL SafeTerminateProcess (HANDLE hProcess, UINT uExitCode, DWORD dwTimeout);
+struct EnumNICs3_results {
+  unsigned char flags;
+  int is_default;
+  char pretty_name[1001];
+  size_t addr_size;
+  SOCKADDR_STORAGE address;
+  SOCKADDR_STORAGE mask;
+  SOCKADDR_STORAGE broadcast;
+};
+
+int EnumNICs3(struct EnumNICs3_results **, int *EnumNICs3_results_count);
+void EnumNICs3_free(struct EnumNICs3_results *);
+int GNInitWinEnv();
+void GNShutdownWinEnv();
+
+BOOL SafeTerminateProcess(HANDLE hProcess, UINT uExitCode, DWORD dwTimeout);
 #ifdef __cplusplus
 }
 #endif