diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index f56c8e732..8c9df2c43 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -49,8 +49,12 @@ nl_assign_brace=remove
 
 # No extra newlines that cause noisy diffs
 nl_start_of_file=remove
+nl_after_func_proto = 2
+nl_after_func_body = 3
 # If there's no new line, it's not a text file!
 nl_end_of_file=add
+nl_max_blank_in_func = 3
+nl_max = 3
 
 sp_inside_paren = remove
 
@@ -69,6 +73,7 @@ sp_between_ptr_star = remove
 sp_before_sparen = add
 
 sp_inside_fparen = remove
+sp_inside_sparen = remove
 
 # add space before function call and decl: "foo (x)"
 sp_func_call_paren = add
@@ -76,3 +81,15 @@ sp_func_proto_paren = add
 sp_func_proto_paren_empty = add
 sp_func_def_paren = add
 sp_func_def_paren_empty = add
+
+# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
+# so as uncrustify doesn't give exactly what we want => ignore
+sp_paren_paren = ignore
+sp_inside_paren = remove
+sp_bool = force
+
+nl_func_type_name = force
+#nl_branch_else = add
+nl_else_brace = add
+nl_elseif_brace = add
+nl_for_brace = add
diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c
index 0020a5b07..e97fd64df 100644
--- a/src/auditor/taler-auditor-exchange.c
+++ b/src/auditor/taler-auditor-exchange.c
@@ -132,7 +132,7 @@ main (int argc,
                               strlen ("http://"))) &&
            (0 != strncasecmp ("https://",
                               exchange_url,
-                              strlen ("https://"))) )  ||
+                              strlen ("https://"))) ) ||
          ('/' != exchange_url[strlen (exchange_url) - 1]) )
     {
       fprintf (stderr,
@@ -211,4 +211,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of taler-auditor-exchange.c */
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
index 967a084ef..e37b4a0e8 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -269,7 +269,6 @@ signal_loop (void)
 }
 
 
-
 /**
  * Function called whenever MHD is done with a request.  If the
  * request was a POST, we may have stored a `struct Buffer *` in the
@@ -980,4 +979,5 @@ main (int argc,
   return (GNUNET_SYSERR == ret) ? 1 : 0;
 }
 
+
 /* end of taler-auditor-httpd.c */
diff --git a/src/auditor/taler-auditor-httpd_parsing.c b/src/auditor/taler-auditor-httpd_parsing.c
index bac338cc0..fb707c88f 100644
--- a/src/auditor/taler-auditor-httpd_parsing.c
+++ b/src/auditor/taler-auditor-httpd_parsing.c
@@ -36,7 +36,6 @@
 #define REQUEST_BUFFER_MAX (1024 * 1024)
 
 
-
 /**
  * Process a POST request containing a JSON object.  This function
  * realizes an MHD POST processor that will (incrementally) process
diff --git a/src/auditor/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c
index 2c7fe8293..f35b5de5b 100644
--- a/src/auditor/taler-auditor-sign.c
+++ b/src/auditor/taler-auditor-sign.c
@@ -439,4 +439,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of taler-auditor-sign.c */
diff --git a/src/auditor/taler-auditor.c b/src/auditor/taler-auditor.c
index dbbc6c235..fc9bc870e 100644
--- a/src/auditor/taler-auditor.c
+++ b/src/auditor/taler-auditor.c
@@ -4041,8 +4041,7 @@ refresh_session_cb (void *cls,
        accepted a forged coin (i.e. emergency situation after
        private key compromise). In that case, we cannot even
        subtract the profit we make from the fee from the escrow
-       balance. Tested as part of test-auditor.sh, case #18 */
-    report_amount_arithmetic_inconsistency (
+       balance. Tested as part of test-auditor.sh, case #18 */report_amount_arithmetic_inconsistency (
       "subtracting refresh fee from escrow balance",
       rowid,
       &total_escrow_balance,
@@ -4225,8 +4224,7 @@ deposit_cb (void *cls,
        accepted a forged coin (i.e. emergency situation after
        private key compromise). In that case, we cannot even
        subtract the profit we make from the fee from the escrow
-       balance. Tested as part of test-auditor.sh, case #18 */
-    report_amount_arithmetic_inconsistency (
+       balance. Tested as part of test-auditor.sh, case #18 */report_amount_arithmetic_inconsistency (
       "subtracting deposit fee from escrow balance",
       rowid,
       &total_escrow_balance,
@@ -5010,7 +5008,6 @@ analyze_deposit_confirmations (void *cls)
 }
 
 
-
 /* *************************** General transaction logic ****************** */
 
 /**
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index a945f9df2..276f3554e 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -624,7 +624,6 @@ report (json_t *array,
 }
 
 
-
 /**
  * Detect any entries in #reserve_closures that were not yet
  * observed on the wire transfer side and update the progress
diff --git a/src/auditordb/auditordb_plugin.c b/src/auditordb/auditordb_plugin.c
index 51ae77c16..ffd96b495 100644
--- a/src/auditordb/auditordb_plugin.c
+++ b/src/auditordb/auditordb_plugin.c
@@ -84,5 +84,4 @@ TALER_AUDITORDB_plugin_unload (struct TALER_AUDITORDB_Plugin *plugin)
 }
 
 
-
 /* end of auditordb_plugin.c */
diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c
index e5445f2ad..c5559131f 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -206,8 +206,7 @@ postgres_create_tables (void *cls)
        serial ID from the respective tables that we have
        processed. Thus, we need to select those table entries that are
        strictly larger (and process in monotonically increasing
-       order). */
-    GNUNET_PQ_make_execute (
+       order). */GNUNET_PQ_make_execute (
       "CREATE TABLE IF NOT EXISTS auditor_progress_reserve"
       "(master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE"
       ",last_reserve_in_serial_id INT8 NOT NULL DEFAULT 0"
@@ -253,8 +252,7 @@ postgres_create_tables (void *cls)
        "last_reserve_out_serial_id" marks the last withdrawal from
        "reserves_out" about this reserve that the auditor is aware of,
        and "last_reserve_in_serial_id" is the last "reserve_in"
-       operation about this reserve that the auditor is aware of. */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_reserves"
+       operation about this reserve that the auditor is aware of. */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_reserves"
                             "(reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)"
                             ",master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE"
                             ",reserve_balance_val INT8 NOT NULL"
@@ -289,8 +287,7 @@ postgres_create_tables (void *cls)
        (outstanding as well as issued overall which implies the
        maximum value at risk).  We also count the number of coins
        issued (withdraw, refresh-reveal) and the number of coins seen
-       at the exchange (refresh-commit, deposit), not just the amounts. */
-    GNUNET_PQ_make_execute (
+       at the exchange (refresh-commit, deposit), not just the amounts. */GNUNET_PQ_make_execute (
       "CREATE TABLE IF NOT EXISTS auditor_denomination_pending"
       "(denom_pub_hash BYTEA PRIMARY KEY"
       " REFERENCES auditor_denominations (denom_pub_hash) ON DELETE CASCADE"
@@ -309,8 +306,7 @@ postgres_create_tables (void *cls)
        respective's exchange's master public key); it represents the
        auditor_balance_summary of the exchange at this point (modulo
        unexpected historic_loss-style events where denomination keys are
-       compromised) */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_balance_summary"
+       compromised) */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_balance_summary"
                             "(master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE"
                             ",denom_balance_val INT8 NOT NULL"
                             ",denom_balance_frac INT4 NOT NULL"
@@ -333,8 +329,7 @@ postgres_create_tables (void *cls)
        coin except for withdraw fees (which are in
        historic_reserve_revenue); the deposit, melt and refund fees are given
        individually; the delta to the revenue_balance is from coins that
-       were withdrawn but never deposited prior to expiration. */
-    GNUNET_PQ_make_execute (
+       were withdrawn but never deposited prior to expiration. */GNUNET_PQ_make_execute (
       "CREATE TABLE IF NOT EXISTS auditor_historic_denomination_revenue"
       "(master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE"
       ",denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)"
@@ -389,8 +384,7 @@ postgres_create_tables (void *cls)
        the tables overall, we'll need a command-line tool to insert rows
        into this table and update "auditor_predicted_result" accordingly.
        (So this table for now just exists as a reminder of what we'll
-       need in the long term.) */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_historic_ledger"
+       need in the long term.) */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS auditor_historic_ledger"
                             "(master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE"
                             ",purpose VARCHAR NOT NULL"
                             ",timestamp INT8 NOT NULL"
@@ -1502,7 +1496,6 @@ postgres_get_deposit_confirmations (void *cls,
 }
 
 
-
 /**
  * Insert information about a denomination key and in particular
  * the properties (value, fees, expiration times) the coins signed
@@ -3586,4 +3579,5 @@ libtaler_plugin_auditordb_postgres_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_auditordb_postgres.c */
diff --git a/src/auditordb/test_auditordb.c b/src/auditordb/test_auditordb.c
index 3968f0218..9b97d47bd 100644
--- a/src/auditordb/test_auditordb.c
+++ b/src/auditordb/test_auditordb.c
@@ -581,6 +581,7 @@ run (void *cls)
     return GNUNET_OK;
   }
 
+
   FAILIF (0 >=
           plugin->select_historic_denom_revenue (plugin->cls,
                                                  session,
@@ -644,6 +645,7 @@ run (void *cls)
     return GNUNET_OK;
   }
 
+
   FAILIF (0 >=
           plugin->select_historic_reserve_revenue (plugin->cls,
                                                    session,
diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c
index a29598a30..fcb68009f 100644
--- a/src/bank-lib/bank_api_history.c
+++ b/src/bank-lib/bank_api_history.c
@@ -251,7 +251,6 @@ handle_history_finished (void *cls,
 }
 
 
-
 /**
  * Backend of both the /history[-range] requests.
  *
@@ -407,7 +406,6 @@ TALER_BANK_history_range (struct GNUNET_CURL_Context *ctx,
 }
 
 
-
 /**
  * Request the wire transfer history of a bank account.
  *
diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c
index 94e2e8d78..e1a5c9bbb 100644
--- a/src/bank-lib/fakebank.c
+++ b/src/bank-lib/fakebank.c
@@ -713,6 +713,7 @@ handle_history (struct TALER_FAKEBANK_Handle *h,
                                      &TFH_handle_history_advance);
 }
 
+
 /**
  * Handle incoming HTTP request for /history-range.
  *
@@ -897,6 +898,8 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h)
                                    &run_mhd,
                                    h);
 }
+
+
 #else
 /**
  * Schedule MHD.  This function should be called initially when an
@@ -957,6 +960,8 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h)
   if (NULL != wws)
     GNUNET_NETWORK_fdset_destroy (wws);
 }
+
+
 #endif
 
 
diff --git a/src/bank-lib/fakebank.h b/src/bank-lib/fakebank.h
index 321bc1336..cc2359014 100644
--- a/src/bank-lib/fakebank.h
+++ b/src/bank-lib/fakebank.h
@@ -188,7 +188,6 @@ struct HistoryArgs
 };
 
 
-
 /**
  * Type for a function that decides whether or not
  * the history-building loop should iterate once again.
diff --git a/src/bank-lib/fakebank_history.c b/src/bank-lib/fakebank_history.c
index 2ad363b49..170574522 100644
--- a/src/bank-lib/fakebank_history.c
+++ b/src/bank-lib/fakebank_history.c
@@ -299,6 +299,7 @@ TFH_build_history_response (struct MHD_Connection *connection,
   return ret;
 }
 
+
 /**
  * Parse URL history arguments, of _both_ APIs:
  * /history and /history-range.
diff --git a/src/bank-lib/taler-bank-transfer.c b/src/bank-lib/taler-bank-transfer.c
index 1d6e2e9e6..625545b6b 100644
--- a/src/bank-lib/taler-bank-transfer.c
+++ b/src/bank-lib/taler-bank-transfer.c
@@ -270,4 +270,5 @@ main (int argc, char *const *argv)
   return global_ret;
 }
 
+
 /* end taler-bank-transfer.c */
diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c
index 6ad47c825..0a34e4b48 100644
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@ -226,4 +226,5 @@ main (int argc,
   return (GNUNET_OK == result) ? 0 : 1;
 }
 
+
 /* end of test_bank_api.c */
diff --git a/src/bank-lib/test_bank_api_new.c b/src/bank-lib/test_bank_api_new.c
index 31602a1ee..ce99904f3 100644
--- a/src/bank-lib/test_bank_api_new.c
+++ b/src/bank-lib/test_bank_api_new.c
@@ -178,6 +178,7 @@ run (void *cls,
                        commands);
 }
 
+
 int
 main (int argc,
       char *const *argv)
diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c
index 49ce94164..293bef30f 100644
--- a/src/bank-lib/test_bank_api_twisted.c
+++ b/src/bank-lib/test_bank_api_twisted.c
@@ -215,4 +215,5 @@ main (int argc,
   return 1;
 }
 
+
 /* end of test_bank_api_twisted.c */
diff --git a/src/bank-lib/test_bank_api_with_fakebank.c b/src/bank-lib/test_bank_api_with_fakebank.c
index 331968120..c69a0e243 100644
--- a/src/bank-lib/test_bank_api_with_fakebank.c
+++ b/src/bank-lib/test_bank_api_with_fakebank.c
@@ -171,4 +171,5 @@ main (int argc,
   return (GNUNET_OK == result) ? 0 : 1;
 }
 
+
 /* end of test_bank_api_with_fakebank.c */
diff --git a/src/bank-lib/test_bank_interpreter.c b/src/bank-lib/test_bank_interpreter.c
index 7f30f5050..2512dff52 100644
--- a/src/bank-lib/test_bank_interpreter.c
+++ b/src/bank-lib/test_bank_interpreter.c
@@ -1047,4 +1047,5 @@ TBI_run_interpreter (int *resultp,
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown, is);
 }
 
+
 /* end of test_bank_interpeter.c */
diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c
index ca8613141..0b5184ad8 100644
--- a/src/bank-lib/testing_api_cmd_history.c
+++ b/src/bank-lib/testing_api_cmd_history.c
@@ -34,7 +34,6 @@
 #include "taler_fakebank_lib.h"
 
 
-
 /**
  * State for a "history" CMD.
  */
@@ -267,7 +266,6 @@ print_expected (struct History *h,
 }
 
 
-
 /**
  * Tell if the current item is beyond the allowed limit.
  *
@@ -338,8 +336,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
    * @var turns GNUNET_YES whenever either no 'start' value was
    *      given for the history query, or the given value is found
    *      in the list of all the CMDs.
-   */
-  int ok;
+   */int ok;
   const uint64_t *row_id_start = NULL;
 
   if (NULL != hs->start_row_reference)
@@ -399,8 +396,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
      * The following command allows us to skip over those CMDs
      * that do not offer a "row_id" trait.  Such skipped CMDs are
      * not interesting for building a history.
-     */
-    if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (pos,
+     */if (GNUNET_OK != TALER_TESTING_get_trait_uint64 (pos,
                                                      0,
                                                      &row_id))
       continue;
@@ -533,8 +529,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
          * Warning: this zeroing is superfluous, as
          * total doesn't get incremented if 'start'
          * was given and couldn't be found.
-         */
-        total = 0;
+         */total = 0;
         ok = GNUNET_YES;
         continue;
       }
@@ -598,8 +593,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
      * _both_ the credit and the debit roles, but _only if_
      * the audit goes on both directions..  This needs more
      * explaination!
-     */
-    if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) &&
+     */if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) &&
            (hs->account_no == *credit_account_no)) &&
          ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) &&
            (hs->account_no == *debit_account_no)) )
@@ -775,6 +769,7 @@ check_result (struct TALER_TESTING_Interpreter *is,
   return GNUNET_OK;
 }
 
+
 /**
  * This callback will (1) check that the HTTP response code
  * is acceptable and (2) that the history is consistent.  The
@@ -1191,4 +1186,5 @@ TALER_TESTING_cmd_bank_history_range_with_dates
   }
 }
 
+
 /* end of testing_api_cmd_history.c */
diff --git a/src/bank-lib/testing_api_cmd_reject.c b/src/bank-lib/testing_api_cmd_reject.c
index 8d37266d1..01c189f16 100644
--- a/src/bank-lib/testing_api_cmd_reject.c
+++ b/src/bank-lib/testing_api_cmd_reject.c
@@ -183,6 +183,7 @@ reject_traits (void *cls,
                                   index);
 }
 
+
 /**
  * Create a "reject" CMD.
  *
diff --git a/src/bank-lib/testing_api_helpers.c b/src/bank-lib/testing_api_helpers.c
index 5d371a1a5..2f5ea36f5 100644
--- a/src/bank-lib/testing_api_helpers.c
+++ b/src/bank-lib/testing_api_helpers.c
@@ -120,6 +120,7 @@ TALER_TESTING_has_in_name (const char *prog_name,
   return strstr (prog_name + name_pos, marker) != NULL;
 }
 
+
 /**
  * Start the (Python) bank process.  Assume the port
  * is available and the database is clean.  Use the "prepare
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index 87b5167b2..da10762cf 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -645,8 +645,8 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
   if (MODE_EXCHANGE == mode)
     (void) getchar ();
 
-  if ( (GNUNET_YES == linger) && ( ((mode == MODE_BOTH)|| (mode ==
-                                                           MODE_CLIENT) ) ) )
+  if ( (GNUNET_YES == linger) && ( ((mode == MODE_BOTH) || (mode ==
+                                                            MODE_CLIENT) ) ) )
   {
     printf ("press ENTER to stop\n");
     (void) getchar ();
diff --git a/src/exchange-tools/taler-exchange-keycheck.c b/src/exchange-tools/taler-exchange-keycheck.c
index ac452a058..e91ab34ff 100644
--- a/src/exchange-tools/taler-exchange-keycheck.c
+++ b/src/exchange-tools/taler-exchange-keycheck.c
@@ -286,4 +286,5 @@ main (int argc, char *const *argv)
 
 }
 
+
 /* end of taler-exchange-keycheck.c */
diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index 40dabf14b..8e982d17e 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -1483,4 +1483,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of taler-exchange-keyup.c */
diff --git a/src/exchange-tools/taler-wire.c b/src/exchange-tools/taler-wire.c
index f9c4a3579..4d6e0fcd7 100644
--- a/src/exchange-tools/taler-wire.c
+++ b/src/exchange-tools/taler-wire.c
@@ -446,4 +446,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of taler-wire.c */
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index fffb652c7..95f56d0df 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -291,7 +291,6 @@ static unsigned int aggregation_limit =
   TALER_EXCHANGEDB_MATCHING_DEPOSITS_LIMIT;
 
 
-
 /**
  * Advance the "af" pointer in @a wp to point to the
  * currently valid record.
@@ -1968,4 +1967,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of taler-exchange-aggregator.c */
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index bdb213a87..af38a605a 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -839,6 +839,7 @@ connection_done (void *cls,
                          "kill");
 }
 
+
 /* end of HAVE_DEVELOPER */
 #endif
 
@@ -1026,7 +1027,6 @@ write_stats ()
 }
 
 
-
 /**
  * The main function of the taler-exchange-httpd server ("the exchange").
  *
@@ -1261,4 +1261,5 @@ main (int argc,
   return (GNUNET_SYSERR == ret) ? 1 : 0;
 }
 
+
 /* end of taler-exchange-httpd.c */
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index f9cda8a5f..ce6a856d9 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -262,7 +262,6 @@ struct ResponseFactoryContext
 };
 
 
-
 /**
  * Snapshot of the (coin and signing) keys (including private keys) of
  * the exchange.  There can be multiple instances of this struct, as it is
@@ -327,7 +326,6 @@ struct TEH_KS_StateHandle
 };
 
 
-
 /**
  * Exchange key state.  This is the long-term, read-only internal global state,
  * which the various threads "lock" to use in read-only ways.  We eventually
@@ -346,7 +344,6 @@ static struct TEH_KS_StateHandle *internal_key_state;
 static pthread_mutex_t internal_key_state_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 
-
 /* ************************** Clean up logic *********************** */
 
 
diff --git a/src/exchange/taler-exchange-httpd_parsing.c b/src/exchange/taler-exchange-httpd_parsing.c
index dc77d1822..fb8932b9a 100644
--- a/src/exchange/taler-exchange-httpd_parsing.c
+++ b/src/exchange/taler-exchange-httpd_parsing.c
@@ -36,7 +36,6 @@
 #define REQUEST_BUFFER_MAX (1024 * 1024)
 
 
-
 /**
  * Process a POST request containing a JSON object.  This function
  * realizes an MHD POST processor that will (incrementally) process
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c
index 1c2f92f0e..2e1835845 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -698,8 +698,7 @@ TEH_RESPONSE_compile_transaction_history (const struct
            the denomination key's RSA signature over coin_pub, but as the
            wallet should really already have this information (and cannot
            check or do anything with it anyway if it doesn't), it seems
-           strictly unnecessary. */
-        if (0 !=
+           strictly unnecessary. */if (0 !=
             json_array_append_new (history,
                                    json_pack ("{s:s, s:o, s:o, s:o, s:o, s:o}",
                                               "type", "OLD-COIN-PAYBACK",
@@ -801,8 +800,7 @@ TEH_RESPONSE_compile_transaction_history (const struct
            hash and the denomination key's RSA signature over coin_pub, but as
            the wallet should really already have this information (and cannot
            check or do anything with it anyway if it doesn't), it seems
-           strictly unnecessary. */
-        if (0 !=
+           strictly unnecessary. */if (0 !=
             json_array_append_new (history,
                                    json_pack ("{s:s, s:o, s:o, s:o, s:o, s:o}",
                                               "type", "PAYBACK-REFRESH",
@@ -1172,4 +1170,5 @@ TEH_RESPONSE_reply_transaction_unknown (struct MHD_Connection *connection,
                                        "code", (json_int_t) ec);
 }
 
+
 /* end of taler-exchange-httpd_responses.c */
diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c
index 797ed8bed..1bc4a8279 100644
--- a/src/exchange/taler-exchange-httpd_wire.c
+++ b/src/exchange/taler-exchange-httpd_wire.c
@@ -176,5 +176,4 @@ TEH_wire_cleanup ()
 }
 
 
-
 /* end of taler-exchange-httpd_wire.c */
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index ea737b7b5..83d90c6e2 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -735,4 +735,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of taler-exchange-wirewatch.c */
diff --git a/src/exchange/test_taler_exchange_aggregator.c b/src/exchange/test_taler_exchange_aggregator.c
index 274a28ac7..9a187add5 100644
--- a/src/exchange/test_taler_exchange_aggregator.c
+++ b/src/exchange/test_taler_exchange_aggregator.c
@@ -28,7 +28,6 @@
 #include "taler_fakebank_lib.h"
 
 
-
 /**
  * Commands for the interpreter.
  */
@@ -351,6 +350,7 @@ maint_child_death (void *cls)
   interpreter (state);
 }
 
+
 /**
  * Setup (fake) information about a coin used in deposit.
  *
@@ -1333,4 +1333,5 @@ main (int argc,
   return result;
 }
 
+
 /* end of test_taler_exchange_aggregator.c */
diff --git a/src/exchange/test_taler_exchange_wirewatch.c b/src/exchange/test_taler_exchange_wirewatch.c
index 27b98bb06..da2da615a 100644
--- a/src/exchange/test_taler_exchange_wirewatch.c
+++ b/src/exchange/test_taler_exchange_wirewatch.c
@@ -857,4 +857,5 @@ main (int argc,
   return result;
 }
 
+
 /* end of test_taler_exchange_wirewatch.c */
diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c
index f336b53a4..e31509021 100644
--- a/src/exchangedb/exchangedb_accounts.c
+++ b/src/exchangedb/exchangedb_accounts.c
@@ -139,4 +139,5 @@ TALER_EXCHANGEDB_find_accounts (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                          &ctx);
 }
 
+
 /* end of exchangedb_accounts.c */
diff --git a/src/exchangedb/exchangedb_plugin.c b/src/exchangedb/exchangedb_plugin.c
index 50394c6e3..8e61f860b 100644
--- a/src/exchangedb/exchangedb_plugin.c
+++ b/src/exchangedb/exchangedb_plugin.c
@@ -83,5 +83,4 @@ TALER_EXCHANGEDB_plugin_unload (struct TALER_EXCHANGEDB_Plugin *plugin)
 }
 
 
-
 /* end of exchangedb_plugin.c */
diff --git a/src/exchangedb/exchangedb_signkeys.c b/src/exchangedb/exchangedb_signkeys.c
index 0c46c1ff1..c58423c52 100644
--- a/src/exchangedb/exchangedb_signkeys.c
+++ b/src/exchangedb/exchangedb_signkeys.c
@@ -194,4 +194,5 @@ TALER_EXCHANGEDB_signing_key_write (const char *exchange_base_dir,
   return GNUNET_OK;
 }
 
+
 /* end of exchangedb_signkeys.c */
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 1dd408752..6ddbead9e 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -230,8 +230,7 @@ postgres_create_tables (void *cls)
        funds are added and existing funds are withdrawn.  The 'expiration_date'
        can be used to eventually get rid of reserves that have not been used
        for a very long time (either by refunding the owner or by greedily
-       grabbing the money, depending on the Exchange's terms of service) */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS reserves"
+       grabbing the money, depending on the Exchange's terms of service) */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS reserves"
                             "(reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)"
                             ",account_details TEXT NOT NULL "
                             ",current_balance_val INT8 NOT NULL"
@@ -292,8 +291,7 @@ postgres_create_tables (void *cls)
        The 'h_blind_ev' is the hash of the blinded coin. It serves as a primary
        key, as (broken) clients that use a non-random coin and blinding factor
        should fail to even withdraw, as otherwise the coins will fail to deposit
-       (as they really must be unique). */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS reserves_out"
+       (as they really must be unique). */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS reserves_out"
                             "(reserve_out_serial_id BIGSERIAL UNIQUE"
                             ",h_blind_ev BYTEA PRIMARY KEY CHECK (LENGTH(h_blind_ev)=64)"
                             ",denom_pub_hash BYTEA NOT NULL REFERENCES denominations (denom_pub_hash)"                                         /* do NOT CASCADE on DELETE, we may keep the denomination key alive! */
@@ -341,8 +339,7 @@ postgres_create_tables (void *cls)
        index and the index of the new coin, and the envelope of the new
        coin to be signed, as well as the encrypted information about the
        private key and the blinding factor for the coin (for verification
-       in case this newcoin_index is chosen to be revealed) */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS refresh_revealed_coins "
+       in case this newcoin_index is chosen to be revealed) */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS refresh_revealed_coins "
                             "(rc BYTEA NOT NULL REFERENCES refresh_commitments (rc) ON DELETE CASCADE"
                             ",newcoin_index INT4 NOT NULL"
                             ",link_sig BYTEA NOT NULL CHECK(LENGTH(link_sig)=64)"
@@ -797,8 +794,7 @@ postgres_get_session (void *cls)
          the coin's denomination information (public key, signature)
          and the blinded message as well as the reserve that the coin
          is being withdrawn from and the signature of the message
-         authorizing the withdrawal. */
-      GNUNET_PQ_make_prepare ("insert_withdraw_info",
+         authorizing the withdrawal. */GNUNET_PQ_make_prepare ("insert_withdraw_info",
                               "INSERT INTO reserves_out "
                               "(h_blind_ev"
                               ",denom_pub_hash"
@@ -2207,8 +2203,7 @@ postgres_reserves_in_insert (void *cls,
        Note that for a non-drained reserve we should not switch,
        as that opens an attack vector for an adversary who can see
        the wire transfer subjects (i.e. when using Bitcoin).
-    */
-  }
+    */}
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Creating reserve %s with expiration in %s\n",
@@ -2225,8 +2220,7 @@ postgres_reserves_in_insert (void *cls,
        before adding the actual transaction to "reserves_in", as
        for a new reserve it can't be a duplicate 'add' operation,
        and as the 'add' operation may need the reserve entry
-       as a foreign key. */
-    struct GNUNET_PQ_QueryParam params[] = {
+       as a foreign key. */struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_auto_from_type (reserve_pub),
       GNUNET_PQ_query_param_string (sender_account_details),
       TALER_PQ_query_param_amount (balance),
@@ -2283,8 +2277,7 @@ postgres_reserves_in_insert (void *cls,
        balance; we do this after checking for duplication, as
        otherwise we might have to actually pay the cost to roll this
        back for duplicate transactions; like this, we should virtually
-       never actually have to rollback anything. */
-    struct TALER_EXCHANGEDB_Reserve updated_reserve;
+       never actually have to rollback anything. */struct TALER_EXCHANGEDB_Reserve updated_reserve;
 
     updated_reserve.pub = reserve.pub;
     if (GNUNET_OK !=
@@ -5711,8 +5704,7 @@ postgres_gc (void *cls)
      payback and reserves_out tables to known_coins; these
      are NOT using 'ON DROP CASCADE' and might keep denomination
      keys alive for a bit longer, thus causing this statement
-     to fail. */
-  (void) GNUNET_PQ_eval_prepared_non_select (conn,
+     to fail. */(void) GNUNET_PQ_eval_prepared_non_select (conn,
                                              "gc_denominations",
                                              params_time);
   GNUNET_PQ_disconnect (conn);
@@ -7717,4 +7709,5 @@ libtaler_plugin_exchangedb_postgres_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_exchangedb_postgres.c */
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
index b093df4be..a1e20e83a 100644
--- a/src/exchangedb/test_exchangedb.c
+++ b/src/exchangedb/test_exchangedb.c
@@ -292,6 +292,7 @@ create_denom_key_pair (unsigned int size,
   return dkp;
 }
 
+
 static struct TALER_Amount value;
 static struct TALER_Amount fee_withdraw;
 static struct TALER_Amount fee_deposit;
@@ -2257,4 +2258,5 @@ main (int argc,
   return result;
 }
 
+
 /* end of test_exchangedb.c */
diff --git a/src/exchangedb/test_exchangedb_auditors.c b/src/exchangedb/test_exchangedb_auditors.c
index e0af3f157..9f1b2d679 100644
--- a/src/exchangedb/test_exchangedb_auditors.c
+++ b/src/exchangedb/test_exchangedb_auditors.c
@@ -42,7 +42,6 @@ static struct TALER_MasterPublicKeyP want_mpub;
 static struct TALER_DenominationKeyValidityPS want_dki;
 
 
-
 /**
  * @brief Function called with auditor information.
  *
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index 6241d8196..03a1c6d47 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -1462,7 +1462,6 @@ struct TALER_AUDITORDB_Plugin
                                      void *cb_cls);
 
 
-
   /**
    * Insert information about the predicted exchange's bank
    * account balance.
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 5eb4fbf45..81ea0bb95 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -237,7 +237,6 @@ struct TALER_MasterSignatureP
 };
 
 
-
 /**
  * @brief Type of public keys for Taler coins.  The same key material is used
  * for EdDSA and ECDHE operations.
diff --git a/src/include/taler_curl_lib.h b/src/include/taler_curl_lib.h
index 6629704fb..52aa3d803 100644
--- a/src/include/taler_curl_lib.h
+++ b/src/include/taler_curl_lib.h
@@ -74,5 +74,4 @@ void
 TALER_curl_easy_post_finished (struct TEAH_PostContext *ctx);
 
 
-
 #endif
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 0aeffd324..eb1452561 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1681,7 +1681,6 @@ TALER_EXCHANGE_track_transaction_cancel (struct
                                          dwh);
 
 
-
 /**
  * Convenience function.  Verifies a coin's transaction history as
  * returned by the exchange.
@@ -1777,5 +1776,4 @@ void
 TALER_EXCHANGE_payback_cancel (struct TALER_EXCHANGE_PaybackHandle *ph);
 
 
-
 #endif  /* _TALER_EXCHANGE_SERVICE_H */
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 90643d62e..0dcf4b841 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -2173,7 +2173,6 @@ struct TALER_EXCHANGEDB_Plugin
                               struct TALER_EXCHANGEDB_Session *session);
 
 
-
   /**
    * Store information about an outgoing wire transfer that was executed.
    *
diff --git a/src/include/taler_fakebank_lib.h b/src/include/taler_fakebank_lib.h
index 5e0d7d1d1..f3f92534d 100644
--- a/src/include/taler_fakebank_lib.h
+++ b/src/include/taler_fakebank_lib.h
@@ -81,7 +81,6 @@ TALER_FAKEBANK_make_transfer (struct TALER_FAKEBANK_Handle *h,
                               const char *exchange_base_url);
 
 
-
 /**
  * Check that the @a want_amount was transferred from the @a
  * want_debit to the @a want_credit account.  If so, set the @a subject
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index bc0ae214e..9fa98d8c0 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -956,7 +956,6 @@ struct TALER_MasterWireDetailsPS
 };
 
 
-
 /**
  * @brief Information signed by the exchange's master
  * key stating the wire fee to be paid per wire transfer.
diff --git a/src/include/taler_testing_bank_lib.h b/src/include/taler_testing_bank_lib.h
index 57a7c0f9b..27db9d599 100644
--- a/src/include/taler_testing_bank_lib.h
+++ b/src/include/taler_testing_bank_lib.h
@@ -199,4 +199,5 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_bank_reject (const char *label,
                                const char *bank_url,
                                const char *deposit_reference);
+
 #endif
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 4f69a0d01..fc00dcc1e 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -388,8 +388,6 @@ struct TALER_TESTING_Interpreter
 };
 
 
-
-
 /**
  * A command to be run by the interpreter.
  */
@@ -486,7 +484,6 @@ TALER_TESTING_interpreter_get_current_label (struct
                                              TALER_TESTING_Interpreter *is);
 
 
-
 /**
  * Get connection handle to the fakebank.
  *
@@ -1275,7 +1272,6 @@ TALER_TESTING_cmd_check_bank_transfer (const char *label,
                                        uint64_t credit_account);
 
 
-
 /**
  * Define a "bank check" CMD that takes the input
  * data from another CMD that offers it.
@@ -1585,7 +1581,6 @@ struct TALER_TESTING_Trait
 };
 
 
-
 /**
  * "end" trait.  Because traits are offered into arrays,
  * this type of trait is used to mark the end of such arrays;
@@ -2077,6 +2072,7 @@ TALER_TESTING_get_trait_peer_key (const struct TALER_TESTING_Command *cmd,
                                   unsigned int index,
                                   const struct
                                   GNUNET_CRYPTO_EddsaPrivateKey **priv);
+
 // FIXME: private get_trait_merchant_priv instead, rather have
 // more traits with precise types than this!
 
@@ -2094,6 +2090,7 @@ struct TALER_TESTING_Trait
 TALER_TESTING_make_trait_peer_key (unsigned int index,
                                    const struct
                                    GNUNET_CRYPTO_EddsaPrivateKey *priv);
+
 // FIXME: private get_trait_merchant_priv instead, rather have
 // more traits with precise types than this!
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index c767a32e3..e1b42f134 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -193,7 +193,8 @@ TALER_buffer_write_fstr (struct TALER_Buffer *buf, const char *fmt, ...);
  * @param args format argument list
  */
 void
-TALER_buffer_write_vfstr (struct TALER_Buffer *buf, const char *fmt, va_list args);
+TALER_buffer_write_vfstr (struct TALER_Buffer *buf, const char *fmt, va_list
+                          args);
 
 
 /**
@@ -360,10 +361,10 @@ TALER_url_absolute_raw (const char *proto,
  */
 char *
 TALER_url_absolute_raw_va (const char *proto,
-                     const char *host,
-                     const char *prefix,
-                     const char *path,
-                     va_list args);
+                           const char *host,
+                           const char *prefix,
+                           const char *path,
+                           va_list args);
 
 
 /**
diff --git a/src/json/json.c b/src/json/json.c
index 700b58a5a..90fe3dd4f 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -53,7 +53,6 @@ TALER_JSON_hash (const json_t *json,
 }
 
 
-
 /**
  * Extract the Taler error code from the given @a json object.
  * Note that #TALER_EC_NONE is returned if no "code" is present.
@@ -80,4 +79,5 @@ TALER_JSON_get_error_code (const json_t *json)
   return TALER_EC_INVALID;
 }
 
+
 /* End of json/json.c */
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 9e601ccd9..0f67e9d80 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -47,7 +47,6 @@ TALER_JSON_from_amount (const struct TALER_Amount *amount)
 }
 
 
-
 /**
  * Convert a TALER amount to a JSON object.
  *
diff --git a/src/json/test_json.c b/src/json/test_json.c
index 5d751bf47..401d07b80 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -68,4 +68,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_json.c */
diff --git a/src/json/test_json_wire.c b/src/json/test_json_wire.c
index ad6b2342f..594c4b834 100644
--- a/src/json/test_json_wire.c
+++ b/src/json/test_json_wire.c
@@ -56,4 +56,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_json_wire.c */
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index dfccedaa9..a3264c020 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -258,6 +258,7 @@ decode_version_json (const json_t *resp_obj,
   return GNUNET_OK;
 }
 
+
 /**
  * Initiate download of /version from the auditor.
  *
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 2e13b678e..2c7923cef 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -224,10 +224,8 @@ TALER_EXCHANGE_verify_coin_history (const char *currency,
          for the exchange to lie here, so not checking is probably OK
          (an auditor ought to check, though). Then again, we similarly
          had no reason to check the merchant's signature (other than a
-         well-formendess check). */
-      /* TODO: check that deposit fee and coin value match
-   our expectations from /keys! */
-      add = GNUNET_NO;
+         well-formendess check). *//* TODO: check that deposit fee and coin value match
+   our expectations from /keys! */add = GNUNET_NO;
     }
     else if (0 == strcasecmp (type,
                               "PAYBACK"))
@@ -297,8 +295,7 @@ TALER_EXCHANGE_verify_coin_history (const char *currency,
          However, for the implementation, we first *add* up all of
          these negative amounts, as we might get refunds before
          deposits from a semi-evil exchange.  Then, at the end, we do
-         the subtraction by calculating "total = total - rtotal" */
-      GNUNET_assert (GNUNET_NO == add);
+         the subtraction by calculating "total = total - rtotal" */GNUNET_assert (GNUNET_NO == add);
       if (GNUNET_OK !=
           TALER_amount_add (&rtotal,
                             &rtotal,
@@ -353,4 +350,5 @@ TALER_EXCHANGE_get_exchange_signing_key_info (const struct
   return NULL;
 }
 
+
 /* end of exchange_api_common.c */
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index f4a193d30..efac70777 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1138,6 +1138,7 @@ TALER_EXCHANGE_set_now (struct TALER_EXCHANGE_Handle *exchange,
   exchange->now = now;
 }
 
+
 /**
  * Unset the fake now to be used when requesting "/keys".
  *
@@ -1389,6 +1390,7 @@ TEAH_handle_reset (struct TALER_EXCHANGE_Handle *h)
   h->state = MHS_INIT;
 }
 
+
 /**
  * Check if the handle is ready to process requests.
  *
@@ -1926,7 +1928,6 @@ TALER_EXCHANGE_connect
 }
 
 
-
 /**
  * Initiate download of /keys from the exchange.
  *
diff --git a/src/lib/exchange_api_refresh.c b/src/lib/exchange_api_refresh.c
index f99f3ab02..db3692bcd 100644
--- a/src/lib/exchange_api_refresh.c
+++ b/src/lib/exchange_api_refresh.c
@@ -617,14 +617,14 @@ deserialize_melt_data (const char *buf,
                                   &buf[off],
                                   buf_size - off,
                                   &ok);
-  for (unsigned int i = 0; (i<md->num_fresh_coins)&&(GNUNET_YES == ok); i++)
+  for (unsigned int i = 0; (i<md->num_fresh_coins) && (GNUNET_YES == ok); i++)
     off += deserialize_denomination_key (&md->fresh_pks[i],
                                          &buf[off],
                                          buf_size - off,
                                          &ok);
 
   for (unsigned int i = 0; i<TALER_CNC_KAPPA; i++)
-    for (unsigned int j = 0; (j<md->num_fresh_coins)&&(GNUNET_YES == ok); j++)
+    for (unsigned int j = 0; (j<md->num_fresh_coins) && (GNUNET_YES == ok); j++)
       off += deserialize_fresh_coin (&md->fresh_coins[i][j],
                                      &buf[off],
                                      buf_size - off,
diff --git a/src/lib/exchange_api_refresh_link.c b/src/lib/exchange_api_refresh_link.c
index 2369b90b3..234043120 100644
--- a/src/lib/exchange_api_refresh_link.c
+++ b/src/lib/exchange_api_refresh_link.c
@@ -203,8 +203,7 @@ parse_refresh_link_ok (struct TALER_EXCHANGE_RefreshLinkHandle *rlh,
      loop once for 'session=0' in most cases.
 
      num_coins tracks the size of the 1d array we return,
-     whilst 'i' and 'session' track the 2d array. */
-  for (session = 0; session<json_array_size (json); session++)
+     whilst 'i' and 'session' track the 2d array. */for (session = 0; session<json_array_size (json); session++)
   {
     json_t *jsona;
     struct GNUNET_JSON_Specification spec[] = {
diff --git a/src/lib/exchange_api_reserve.c b/src/lib/exchange_api_reserve.c
index f90bdbb8c..a57d4e9dc 100644
--- a/src/lib/exchange_api_reserve.c
+++ b/src/lib/exchange_api_reserve.c
@@ -233,8 +233,7 @@ parse_reserve_history (struct TALER_EXCHANGE_Handle *exchange,
          isn't listed twice by the exchange. We use the
          "uuid" array to remember the hashes of all
          purposes, and compare the hashes to find
-         duplicates. */
-      GNUNET_CRYPTO_hash (&withdraw_purpose,
+         duplicates. */GNUNET_CRYPTO_hash (&withdraw_purpose,
                           ntohl (withdraw_purpose.purpose.size),
                           &uuid[uuid_off]);
       for (i = 0; i<uuid_off; i++)
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index 656819aa3..85983277e 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -203,8 +203,7 @@ run (void *cls,
      * test-suite gave a account number of _424_ to the user at
      * this step; to type less, here the _42_ number is reused.
      * Does this change the tests semantics?
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve-1",
+     */CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve-1",
                               "EUR:5.01"),
     /**
      * Make previous command effective.
@@ -265,8 +264,7 @@ run (void *cls,
      * fresh merchant public key! NOTE: this comment comes
      * "verbatim" from the old test-suite, and IMO does not explain
      * a lot!
-     */
-    CMD_EXEC_AGGREGATOR ("run-aggregator"),
+     */CMD_EXEC_AGGREGATOR ("run-aggregator"),
 
     /**
      * Check all the transfers took place.
@@ -490,8 +488,7 @@ run (void *cls,
      * These commands should close the reserve because the aggregator
      * is given a config file that ovverrides the reserve expiration
      * time (making it now-ish)
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("short-lived-reserve",
+     */CMD_TRANSFER_TO_EXCHANGE ("short-lived-reserve",
                               "EUR:5.01"),
     TALER_TESTING_cmd_exec_wirewatch ("short-lived-aggregation",
                                       CONFIG_FILE_EXPIRE_RESERVE_NOW),
@@ -503,8 +500,7 @@ run (void *cls,
      * then have the rest paid back.  Check deposit of other coin
      * fails.  (Do not use EUR:5 here as the EUR:5 coin was
      * revoked and we did not bother to create a new one...)
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2",
+     */CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2",
                               "EUR:2.02"),
     /**
      * Make previous command effective.
@@ -795,4 +791,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_auditor_api.c */
diff --git a/src/lib/test_auditor_api_version.c b/src/lib/test_auditor_api_version.c
index 696e3db27..7444786b8 100644
--- a/src/lib/test_auditor_api_version.c
+++ b/src/lib/test_auditor_api_version.c
@@ -160,4 +160,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of test_auditor_api_version.c */
diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c
index eeccd3bc2..23a52be1f 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -248,8 +248,7 @@ run (void *cls,
      * contract terms' hashes.  So since the contract terms are
      * exactly the same as the previous command,
      * how can a different id be generated?
-     */
-    TALER_TESTING_cmd_deposit
+     */TALER_TESTING_cmd_deposit
       ("deposit-double-1", "withdraw-coin-1", 0,
       TALER_TESTING_make_wire_details (43,
                                        fakebank_url),
@@ -277,8 +276,7 @@ run (void *cls,
      * test-suite gave a account number of _424_ to the user at
      * this step; to type less, here the _42_ number is reused.
      * Does this change the tests semantics?
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve-1",
+     */CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve-1",
                               "EUR:5.01"),
 
     /**
@@ -298,8 +296,7 @@ run (void *cls,
      * Try to partially spend (deposit) 1 EUR of the 5 EUR coin
      * (in full) (merchant would receive EUR:0.99 due to 1 ct
      * deposit fee)
-     */
-    TALER_TESTING_cmd_deposit
+     */TALER_TESTING_cmd_deposit
       ("refresh-deposit-partial",
       "refresh-withdraw-coin-1", 0,
       TALER_TESTING_make_wire_details (42,
@@ -381,8 +378,7 @@ run (void *cls,
      * Try resolving a deposit's WTID, as we never triggered
      * execution of transactions, the answer should be that
      * the exchange knows about the deposit, but has no WTID yet.
-     */
-    TALER_TESTING_cmd_track_transaction
+     */TALER_TESTING_cmd_track_transaction
       ("deposit-wtid-found",
       "deposit-simple", 0, MHD_HTTP_ACCEPTED, NULL),
 
@@ -390,8 +386,7 @@ run (void *cls,
      * Try resolving a deposit's WTID for a failed deposit.
      * As the deposit failed, the answer should be that the
      * exchange does NOT know about the deposit.
-     */
-    TALER_TESTING_cmd_track_transaction
+     */TALER_TESTING_cmd_track_transaction
       ("deposit-wtid-failing",
       "deposit-double-2", 0, MHD_HTTP_NOT_FOUND, NULL),
 
@@ -399,8 +394,7 @@ run (void *cls,
      * Try resolving an undefined (all zeros) WTID; this
      * should fail as obviously the exchange didn't use that
      * WTID value for any transaction.
-     */
-    TALER_TESTING_cmd_track_transfer_empty
+     */TALER_TESTING_cmd_track_transfer_empty
       ("wire-deposit-failing",
       NULL, 0, MHD_HTTP_NOT_FOUND),
 
@@ -410,8 +404,7 @@ run (void *cls,
      * fresh merchant public key! NOTE: this comment comes
      * "verbatim" from the old test-suite, and IMO does not explain
      * a lot!
-     */
-    CMD_EXEC_AGGREGATOR ("run-aggregator"),
+     */CMD_EXEC_AGGREGATOR ("run-aggregator"),
 
     /**
      * Check all the transfers took place.
@@ -560,9 +553,7 @@ run (void *cls,
      * the preliminary transfer (used to withdraw) from the
      * fakebank and the second to actually check there are not
      * other transfers around.
-     */
-
-    TALER_TESTING_cmd_check_bank_transfer
+     */TALER_TESTING_cmd_check_bank_transfer
       ("check_bank_transfer-pre-refund", exchange_url,
       "EUR:5.01", 42, 2),
 
@@ -657,8 +648,7 @@ run (void *cls,
      * Run transfers. This will do the transfer as refund deadline
      * was 0, except of course because the refund succeeded, the
      * transfer should no longer be done.
-     */
-    CMD_EXEC_AGGREGATOR ("run-aggregator-3b"),
+     */CMD_EXEC_AGGREGATOR ("run-aggregator-3b"),
 
     /* check that aggregator didn't do anything, as expected */
     TALER_TESTING_cmd_check_bank_empty
@@ -729,8 +719,7 @@ run (void *cls,
      * These commands should close the reserve because
      * the aggregator is given a config file that ovverrides
      * the reserve expiration time (making it now-ish)
-     */
-    CMD_TRANSFER_TO_EXCHANGE
+     */CMD_TRANSFER_TO_EXCHANGE
       ("short-lived-reserve",
       "EUR:5.01"),
 
@@ -773,8 +762,7 @@ run (void *cls,
      * then have the rest paid back.  Check deposit of other coin
      * fails.  (Do not use EUR:5 here as the EUR:5 coin was
      * revoked and we did not bother to create a new one...)
-     */
-    CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2",
+     */CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2",
                               "EUR:2.02"),
 
     /* Make previous command effective. */
@@ -1008,4 +996,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api.c */
diff --git a/src/lib/test_exchange_api_interpreter_on-off.c b/src/lib/test_exchange_api_interpreter_on-off.c
index 40094ad4b..d30dee952 100644
--- a/src/lib/test_exchange_api_interpreter_on-off.c
+++ b/src/lib/test_exchange_api_interpreter_on-off.c
@@ -124,4 +124,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api_keys_cherry_picking_new.c */
diff --git a/src/lib/test_exchange_api_keys_cherry_picking.c b/src/lib/test_exchange_api_keys_cherry_picking.c
index 3acc27536..8805e7c56 100644
--- a/src/lib/test_exchange_api_keys_cherry_picking.c
+++ b/src/lib/test_exchange_api_keys_cherry_picking.c
@@ -166,8 +166,7 @@ run (void *cls,
      * key set.  The new KS will have only one key, because the
      * current lookahead_sign == 60 seconds and the key's withdraw
      * duration is 80 seconds.
-     */
-    TALER_TESTING_cmd_exec_keyup_with_now
+     */TALER_TESTING_cmd_exec_keyup_with_now
       ("keyup-1",
       CONFIG_FILE,
       TTH_parse_time (JAN2030)),
@@ -175,8 +174,7 @@ run (void *cls,
     * Should return 1 new key, + the original one.  NOTE: the
     * original DK will never be 'cancelled' as for the current
     * libtalerexchange logic, so it must always be counted.
-    */
-    TALER_TESTING_cmd_check_keys_with_now
+    */TALER_TESTING_cmd_check_keys_with_now
       ("check-keys-2",
       2,  /* generation */
       2,
@@ -204,9 +202,7 @@ run (void *cls,
      *       very initial setup, and 1 from the 'keyup-1' CMD)
      * ----
      *   46
-     */
-
-    TALER_TESTING_cmd_check_keys_with_now
+     */TALER_TESTING_cmd_check_keys_with_now
       ("check-keys-3",
       3,
       NDKS_RIGHT_BEFORE_SERIALIZATION,
@@ -269,4 +265,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api_keys_cherry_picking.c */
diff --git a/src/lib/test_exchange_api_overlapping_keys_bug.c b/src/lib/test_exchange_api_overlapping_keys_bug.c
index 6680fbbc9..a5ddac516 100644
--- a/src/lib/test_exchange_api_overlapping_keys_bug.c
+++ b/src/lib/test_exchange_api_overlapping_keys_bug.c
@@ -132,4 +132,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api_overlapping_keys_bug.c */
diff --git a/src/lib/test_exchange_api_revocation.c b/src/lib/test_exchange_api_revocation.c
index c0c96766c..dfe185450 100644
--- a/src/lib/test_exchange_api_revocation.c
+++ b/src/lib/test_exchange_api_revocation.c
@@ -134,8 +134,7 @@ run (void *cls,
      * Try to partially spend (deposit) 1 EUR of the 5 EUR coin
      * (in full) (merchant would receive EUR:0.99 due to 1 ct
      * deposit fee)
-     */
-    TALER_TESTING_cmd_deposit
+     */TALER_TESTING_cmd_deposit
       ("deposit-partial",
       "withdraw-coin-1", 0,
       TALER_TESTING_make_wire_details (42,
@@ -278,4 +277,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api_revocation.c */
diff --git a/src/lib/test_exchange_api_twisted.c b/src/lib/test_exchange_api_twisted.c
index 52c928341..739669b97 100644
--- a/src/lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
@@ -213,8 +213,7 @@ run (void *cls,
    * NOTE: not all CMDs actually need the twister,
    * so it may be better to move those into the "main"
    * lib test suite.
-   */
-  struct TALER_TESTING_Command refund[] = {
+   */struct TALER_TESTING_Command refund[] = {
 
     CMD_TRANSFER_TO_EXCHANGE
       ("create-reserve-r1",
@@ -328,6 +327,7 @@ run (void *cls,
                                    fakebank_url);
 }
 
+
 /**
  * Kill, wait, and destroy convenience function.
  *
@@ -341,6 +341,7 @@ purge_process (struct GNUNET_OS_Process *process)
   GNUNET_OS_process_destroy (process);
 }
 
+
 int
 main (int argc,
       char *const *argv)
@@ -395,4 +396,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_exchange_api_twisted.c */
diff --git a/src/lib/testing_api_cmd_bank_check.c b/src/lib/testing_api_cmd_bank_check.c
index 0006b6e5e..f51c535a1 100644
--- a/src/lib/testing_api_cmd_bank_check.c
+++ b/src/lib/testing_api_cmd_bank_check.c
@@ -172,6 +172,7 @@ check_bank_transfer_run (void *cls,
   TALER_TESTING_interpreter_next (is);
 }
 
+
 /**
  * Free the state of a "bank check" CMD.
  *
@@ -189,6 +190,7 @@ check_bank_transfer_cleanup
   GNUNET_free (bcs);
 }
 
+
 /**
  * Offer internal data from a "bank check" CMD state.
  *
@@ -230,7 +232,6 @@ check_bank_transfer_traits (void *cls,
 }
 
 
-
 /**
  * Make a "bank check" CMD.  It checks whether a
  * particular wire transfer has been made or not.
@@ -273,6 +274,7 @@ TALER_TESTING_cmd_check_bank_transfer
   return cmd;
 }
 
+
 /**
  * Cleanup the state, only defined to respect the API.
  *
@@ -287,6 +289,7 @@ check_bank_empty_cleanup
   return;
 }
 
+
 /**
  * Run the command.
  *
diff --git a/src/lib/testing_api_cmd_batch.c b/src/lib/testing_api_cmd_batch.c
index f5fbc8117..84bd51b69 100644
--- a/src/lib/testing_api_cmd_batch.c
+++ b/src/lib/testing_api_cmd_batch.c
@@ -136,6 +136,7 @@ batch_traits (void *cls,
                                   index);
 }
 
+
 /**
  * Create a "batch" command.  Such command takes a
  * end_CMD-terminated array of CMDs and executed them.
@@ -179,6 +180,7 @@ TALER_TESTING_cmd_batch (const char *label,
   return cmd;
 }
 
+
 /**
  * Advance internal pointer to next command.
  *
@@ -200,7 +202,6 @@ TALER_TESTING_cmd_batch_next
 }
 
 
-
 /**
  * Test if this command is a batch command.
  *
diff --git a/src/lib/testing_api_cmd_check_keys.c b/src/lib/testing_api_cmd_check_keys.c
index a0b61c1b0..b4db78697 100644
--- a/src/lib/testing_api_cmd_check_keys.c
+++ b/src/lib/testing_api_cmd_check_keys.c
@@ -141,8 +141,7 @@ check_keys_run (void *cls,
    * a "maybe" basis, so it can get quite hard to track /keys
    * request.  Rather, this CMD should just check if /keys was
    * requested AT LEAST n times before going ahead with checks.
-   */
-  if (is->key_generation > cks->generation)
+   */if (is->key_generation > cks->generation)
   {
     /* We got /keys too often, strange. Fatal. May theoretically
        happen if somehow we were really unlucky and /keys expired
@@ -237,6 +236,7 @@ TALER_TESTING_cmd_check_keys_with_last_denom
   return cmd;
 }
 
+
 /**
  * Make a "check keys" command.  This type of command
  * checks whether the number of denomination keys from
@@ -321,7 +321,6 @@ TALER_TESTING_cmd_check_keys_with_now
 }
 
 
-
 /**
  * Make a "check keys" command that forcedly does NOT cherry pick;
  * just redownload the whole /keys.  Then checks whether the number
diff --git a/src/lib/testing_api_cmd_deposit.c b/src/lib/testing_api_cmd_deposit.c
index 84fba8f31..fcc9a6375 100644
--- a/src/lib/testing_api_cmd_deposit.c
+++ b/src/lib/testing_api_cmd_deposit.c
@@ -485,6 +485,7 @@ deposit_traits (void *cls,
                                   index);
 }
 
+
 /**
  * Create a "deposit" command.
  *
diff --git a/src/lib/testing_api_cmd_exec_aggregator.c b/src/lib/testing_api_cmd_exec_aggregator.c
index c51d44989..7046f162a 100644
--- a/src/lib/testing_api_cmd_exec_aggregator.c
+++ b/src/lib/testing_api_cmd_exec_aggregator.c
@@ -163,4 +163,5 @@ TALER_TESTING_cmd_exec_aggregator (const char *label,
   return cmd;
 }
 
+
 /* end of testing_api_cmd_exec_aggregator.c */
diff --git a/src/lib/testing_api_cmd_exec_auditor-sign.c b/src/lib/testing_api_cmd_exec_auditor-sign.c
index 1a722ad2f..a37638821 100644
--- a/src/lib/testing_api_cmd_exec_auditor-sign.c
+++ b/src/lib/testing_api_cmd_exec_auditor-sign.c
@@ -229,4 +229,5 @@ TALER_TESTING_cmd_exec_auditor_sign (const char *label,
   }
 }
 
+
 /* end of testing_api_cmd_exec_auditor-sign.c */
diff --git a/src/lib/testing_api_cmd_exec_keyup.c b/src/lib/testing_api_cmd_exec_keyup.c
index 65f23693e..89b9d597e 100644
--- a/src/lib/testing_api_cmd_exec_keyup.c
+++ b/src/lib/testing_api_cmd_exec_keyup.c
@@ -201,6 +201,7 @@ TALER_TESTING_cmd_exec_keyup_with_now
   return cmd;
 }
 
+
 /**
  * Make the "keyup" CMD.
  *
@@ -229,4 +230,5 @@ TALER_TESTING_cmd_exec_keyup (const char *label,
   return cmd;
 }
 
+
 /* end of testing_api_cmd_exec_keyup.c */
diff --git a/src/lib/testing_api_cmd_exec_wirewatch.c b/src/lib/testing_api_cmd_exec_wirewatch.c
index c9ca42549..c5a5c2f36 100644
--- a/src/lib/testing_api_cmd_exec_wirewatch.c
+++ b/src/lib/testing_api_cmd_exec_wirewatch.c
@@ -31,7 +31,6 @@
 #include "taler_testing_lib.h"
 
 
-
 /**
  * State for a "wirewatch" CMD.
  */
@@ -165,4 +164,5 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label,
   return cmd;
 }
 
+
 /* end of testing_api_cmd_exec_wirewatch.c */
diff --git a/src/lib/testing_api_cmd_fakebank_transfer.c b/src/lib/testing_api_cmd_fakebank_transfer.c
index 729536b56..81378238c 100644
--- a/src/lib/testing_api_cmd_fakebank_transfer.c
+++ b/src/lib/testing_api_cmd_fakebank_transfer.c
@@ -417,6 +417,7 @@ fakebank_transfer_cleanup (void *cls,
   GNUNET_free (fts);
 }
 
+
 /**
  * Offer internal data from a "fakebank transfer" CMD to other
  * commands.
@@ -766,4 +767,5 @@ TALER_TESTING_cmd_fakebank_transfer_retry (struct TALER_TESTING_Command cmd)
   return cmd;
 }
 
+
 /* end of testing_api_cmd_fakebank_transfer.c */
diff --git a/src/lib/testing_api_cmd_payback.c b/src/lib/testing_api_cmd_payback.c
index c69d1d089..1591b64ab 100644
--- a/src/lib/testing_api_cmd_payback.c
+++ b/src/lib/testing_api_cmd_payback.c
@@ -485,6 +485,7 @@ revoke_traits (void *cls,
                                   index);
 }
 
+
 /**
  * Run the "revoke" command.  The core of the function
  * is to call the "keyup" utility passing it the base32
diff --git a/src/lib/testing_api_cmd_refresh.c b/src/lib/testing_api_cmd_refresh.c
index 5d1472a01..bf0f4ea19 100644
--- a/src/lib/testing_api_cmd_refresh.c
+++ b/src/lib/testing_api_cmd_refresh.c
@@ -884,7 +884,8 @@ refresh_melt_run (void *cls,
   rms->noreveal_index = UINT16_MAX;
   for (num_fresh_coins = 0;
        NULL != melt_fresh_amounts[num_fresh_coins];
-       num_fresh_coins++);
+       num_fresh_coins++)
+    ;
   rms->num_fresh_coins = num_fresh_coins;
   rms->fresh_pks = GNUNET_new_array
                      (num_fresh_coins,
diff --git a/src/lib/testing_api_cmd_sleep.c b/src/lib/testing_api_cmd_sleep.c
index 4d270331e..f3235b8e8 100644
--- a/src/lib/testing_api_cmd_sleep.c
+++ b/src/lib/testing_api_cmd_sleep.c
@@ -224,4 +224,5 @@ TALER_TESTING_cmd_wait_service (const char *label,
   return cmd;
 }
 
+
 /* end of testing_api_cmd_sleep.c  */
diff --git a/src/lib/testing_api_cmd_status.c b/src/lib/testing_api_cmd_status.c
index 0dcea1233..398221a10 100644
--- a/src/lib/testing_api_cmd_status.c
+++ b/src/lib/testing_api_cmd_status.c
@@ -126,9 +126,7 @@ reserve_status_cb
  * "reserve history update trait" which returns information about
  * how the command changes the history (provided only by commands
  * that change reserve balances)?
- */
-
-  TALER_TESTING_interpreter_next (ss->is);
+ */TALER_TESTING_interpreter_next (ss->is);
 }
 
 
diff --git a/src/lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c
index e32d24ce2..41c6be171 100644
--- a/src/lib/testing_api_cmd_track.c
+++ b/src/lib/testing_api_cmd_track.c
@@ -589,9 +589,7 @@ track_transfer_cb
      * or any operation that could provide wire-details.  (2)
      * Total amount for this transfer matches the one from any
      * referenced command that could provide one.
-     */
-
-    if (NULL != tts->wire_details_reference)
+     */if (NULL != tts->wire_details_reference)
     {
       const struct TALER_TESTING_Command *wire_details_cmd;
       const json_t *wire_details;
@@ -674,6 +672,7 @@ track_transfer_cb
   TALER_TESTING_interpreter_next (is);
 }
 
+
 /**
  * Run the command.
  *
@@ -727,6 +726,7 @@ track_transfer_run (void *cls,
   GNUNET_assert (NULL != tts->tth);
 }
 
+
 /**
  * Make a "track transfer" CMD where no "expected"-arguments,
  * except the HTTP response code, are given.  The best use case
@@ -769,6 +769,7 @@ TALER_TESTING_cmd_track_transfer_empty
   return cmd;
 }
 
+
 /**
  * Make a "track transfer" command, specifying which amount and
  * wire fee are expected.
@@ -814,4 +815,5 @@ TALER_TESTING_cmd_track_transfer
   return cmd;
 }
 
+
 /* end of testing_api_cmd_track.c */
diff --git a/src/lib/testing_api_cmd_wire.c b/src/lib/testing_api_cmd_wire.c
index e2a8d7f1f..950ed62f7 100644
--- a/src/lib/testing_api_cmd_wire.c
+++ b/src/lib/testing_api_cmd_wire.c
@@ -201,6 +201,7 @@ wire_cleanup (void *cls,
   GNUNET_free (ws);
 }
 
+
 /**
  * Create a "wire" command.
  *
diff --git a/src/lib/testing_api_cmd_withdraw.c b/src/lib/testing_api_cmd_withdraw.c
index 92b587b5a..550ea9577 100644
--- a/src/lib/testing_api_cmd_withdraw.c
+++ b/src/lib/testing_api_cmd_withdraw.c
@@ -32,7 +32,6 @@
 #include "backoff.h"
 
 
-
 /**
  * State for a "withdraw" CMD.
  */
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index a7b45e600..2e1fb2d06 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
@@ -1077,4 +1077,5 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
   return fakebank_url;
 }
 
+
 /* end of testing_api_helpers.c */
diff --git a/src/lib/testing_api_loop.c b/src/lib/testing_api_loop.c
index 38139de25..fa723eb6e 100644
--- a/src/lib/testing_api_loop.c
+++ b/src/lib/testing_api_loop.c
@@ -491,7 +491,8 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is,
     is->timeout_task = NULL;
   }
   /* get the number of commands */
-  for (i = 0; NULL != commands[i].label; i++);
+  for (i = 0; NULL != commands[i].label; i++)
+    ;
   is->commands = GNUNET_new_array (i + 1,
                                    struct TALER_TESTING_Command);
   memcpy (is->commands,
@@ -831,4 +832,5 @@ TALER_TESTING_setup (TALER_TESTING_Main main_cb,
   return is.result;
 }
 
+
 /* end of testing_api_loop.c */
diff --git a/src/lib/testing_api_trait_blinding_key.c b/src/lib/testing_api_trait_blinding_key.c
index b723e5cfc..e6b9e485d 100644
--- a/src/lib/testing_api_trait_blinding_key.c
+++ b/src/lib/testing_api_trait_blinding_key.c
@@ -54,7 +54,6 @@ TALER_TESTING_get_trait_blinding_key
 }
 
 
-
 /**
  * Offer blinding key.
  *
@@ -77,4 +76,5 @@ TALER_TESTING_make_trait_blinding_key
   return ret;
 }
 
+
 /* end of testing_api_trait_blinding_key.c */
diff --git a/src/lib/testing_api_trait_cmd.c b/src/lib/testing_api_trait_cmd.c
index faf8799be..9c25fd886 100644
--- a/src/lib/testing_api_trait_cmd.c
+++ b/src/lib/testing_api_trait_cmd.c
@@ -79,4 +79,5 @@ TALER_TESTING_make_trait_cmd
   return ret;
 }
 
+
 /* end of testing_api_trait_cmd.c */
diff --git a/src/lib/testing_api_trait_coin_priv.c b/src/lib/testing_api_trait_coin_priv.c
index 85331de7e..b7ca1b8f6 100644
--- a/src/lib/testing_api_trait_coin_priv.c
+++ b/src/lib/testing_api_trait_coin_priv.c
@@ -75,4 +75,5 @@ TALER_TESTING_make_trait_coin_priv
   return ret;
 }
 
+
 /* end of testing_api_trait_coin_priv.c */
diff --git a/src/lib/testing_api_trait_denom_pub.c b/src/lib/testing_api_trait_denom_pub.c
index b11c459ee..3bb3182a2 100644
--- a/src/lib/testing_api_trait_denom_pub.c
+++ b/src/lib/testing_api_trait_denom_pub.c
@@ -75,4 +75,5 @@ TALER_TESTING_make_trait_denom_pub
   return ret;
 }
 
+
 /* end of testing_api_trait_denom_pub.c */
diff --git a/src/lib/testing_api_trait_exchange_pub.c b/src/lib/testing_api_trait_exchange_pub.c
index 711d56f0c..3e3adb75c 100644
--- a/src/lib/testing_api_trait_exchange_pub.c
+++ b/src/lib/testing_api_trait_exchange_pub.c
@@ -74,4 +74,5 @@ TALER_TESTING_make_trait_exchange_pub
   return ret;
 }
 
+
 /* end of testing_api_trait_exchange_pub.c */
diff --git a/src/lib/testing_api_trait_exchange_sig.c b/src/lib/testing_api_trait_exchange_sig.c
index c7ed29b2c..4b2672d74 100644
--- a/src/lib/testing_api_trait_exchange_sig.c
+++ b/src/lib/testing_api_trait_exchange_sig.c
@@ -74,4 +74,5 @@ TALER_TESTING_make_trait_exchange_sig
   return ret;
 }
 
+
 /* end of testing_api_trait_exchange_sig.c */
diff --git a/src/lib/testing_api_trait_fresh_coin.c b/src/lib/testing_api_trait_fresh_coin.c
index 92d6d4b9c..3c0ee1df1 100644
--- a/src/lib/testing_api_trait_fresh_coin.c
+++ b/src/lib/testing_api_trait_fresh_coin.c
@@ -76,4 +76,5 @@ TALER_TESTING_make_trait_fresh_coins
   return ret;
 }
 
+
 /* end of testing_api_trait_fresh_coin.c */
diff --git a/src/lib/testing_api_trait_json.c b/src/lib/testing_api_trait_json.c
index 5307dc370..b3370162b 100644
--- a/src/lib/testing_api_trait_json.c
+++ b/src/lib/testing_api_trait_json.c
@@ -74,6 +74,7 @@ TALER_TESTING_make_trait_exchange_keys
   return ret;
 }
 
+
 /**
  * Obtain wire details from @a cmd.
  *
@@ -119,4 +120,5 @@ TALER_TESTING_make_trait_wire_details
   return ret;
 }
 
+
 /* end of testing_api_trait_json.c */
diff --git a/src/lib/testing_api_trait_key_peer.c b/src/lib/testing_api_trait_key_peer.c
index f26169eb6..e5d1e82f2 100644
--- a/src/lib/testing_api_trait_key_peer.c
+++ b/src/lib/testing_api_trait_key_peer.c
@@ -54,6 +54,7 @@ TALER_TESTING_get_trait_peer_key
                       index);
 }
 
+
 /**
  * Offer private key, typically done when CMD_1 needs it to
  * sign a request.
@@ -100,6 +101,7 @@ TALER_TESTING_get_trait_peer_key_pub
                       index);
 }
 
+
 /**
  * Offer public key.
  *
diff --git a/src/lib/testing_api_trait_number.c b/src/lib/testing_api_trait_number.c
index b2c545457..ff7741650 100644
--- a/src/lib/testing_api_trait_number.c
+++ b/src/lib/testing_api_trait_number.c
@@ -73,6 +73,7 @@ TALER_TESTING_make_trait_uint
   return ret;
 }
 
+
 /**
  * Obtain a "number" value from @a cmd, 64-bit version.
  *
@@ -94,6 +95,7 @@ TALER_TESTING_get_trait_uint64
                       index);
 }
 
+
 /**
  * Offer number trait, 64-bit version.
  *
@@ -113,4 +115,5 @@ TALER_TESTING_make_trait_uint64
   return ret;
 }
 
+
 /* end of testing_api_trait_number.c */
diff --git a/src/lib/testing_api_trait_process.c b/src/lib/testing_api_trait_process.c
index a35314ef3..5145ff5d8 100644
--- a/src/lib/testing_api_trait_process.c
+++ b/src/lib/testing_api_trait_process.c
@@ -80,4 +80,5 @@ TALER_TESTING_make_trait_process
   return ret;
 }
 
+
 /* end of testing_api_trait_process.c */
diff --git a/src/lib/testing_api_trait_reserve_priv.c b/src/lib/testing_api_trait_reserve_priv.c
index b920c43d9..8a60687fc 100644
--- a/src/lib/testing_api_trait_reserve_priv.c
+++ b/src/lib/testing_api_trait_reserve_priv.c
@@ -73,4 +73,5 @@ TALER_TESTING_make_trait_reserve_priv
   return ret;
 }
 
+
 /* end of testing_api_trait_reserve_priv.c */
diff --git a/src/lib/testing_api_trait_string.c b/src/lib/testing_api_trait_string.c
index 606c6e0b6..8d3d5df04 100644
--- a/src/lib/testing_api_trait_string.c
+++ b/src/lib/testing_api_trait_string.c
@@ -57,6 +57,7 @@ TALER_TESTING_get_trait_contract_terms
                       index);
 }
 
+
 /**
  * Offer contract terms.
  *
@@ -100,6 +101,7 @@ TALER_TESTING_get_trait_transfer_subject
                       index);
 }
 
+
 /**
  * Offer transfer subject.
  *
@@ -145,6 +147,7 @@ TALER_TESTING_get_trait_amount
                       index);
 }
 
+
 /**
  * Offer amount in a trait.
  *
@@ -190,6 +193,7 @@ TALER_TESTING_get_trait_url
                       index);
 }
 
+
 /**
  * Offer url in a trait.
  *
@@ -235,6 +239,7 @@ TALER_TESTING_get_trait_order_id
                       index);
 }
 
+
 /**
  * Offer order id in a trait.
  *
@@ -257,6 +262,7 @@ TALER_TESTING_make_trait_order_id
   return ret;
 }
 
+
 /**
  * Obtain the reference to a "reject" CMD.  Usually offered
  * by _rejected_ bank transfers.
@@ -280,6 +286,7 @@ TALER_TESTING_get_trait_rejected
                       index);
 }
 
+
 /**
  * Offer a "reject" CMD reference.
  *
@@ -302,4 +309,5 @@ TALER_TESTING_make_trait_rejected
   return ret;
 }
 
+
 /* end of testing_api_trait_string.c */
diff --git a/src/lib/testing_api_trait_time.c b/src/lib/testing_api_trait_time.c
index 0cd71ad94..316527d75 100644
--- a/src/lib/testing_api_trait_time.c
+++ b/src/lib/testing_api_trait_time.c
@@ -52,6 +52,7 @@ TALER_TESTING_get_trait_absolute_time
                       index);
 }
 
+
 /**
  * Offer a absolute time.
  *
@@ -72,4 +73,5 @@ TALER_TESTING_make_trait_absolute_time
   return ret;
 }
 
+
 /* end of testing_api_trait_time.c */
diff --git a/src/lib/testing_api_trait_wtid.c b/src/lib/testing_api_trait_wtid.c
index 1353327af..81690f036 100644
--- a/src/lib/testing_api_trait_wtid.c
+++ b/src/lib/testing_api_trait_wtid.c
@@ -73,4 +73,5 @@ TALER_TESTING_make_trait_wtid
   return ret;
 }
 
+
 /* end of testing_api_trait_number.c */
diff --git a/src/lib/testing_api_traits.c b/src/lib/testing_api_traits.c
index 45e7668ee..703e14c8a 100644
--- a/src/lib/testing_api_traits.c
+++ b/src/lib/testing_api_traits.c
@@ -46,6 +46,7 @@ TALER_TESTING_trait_end ()
   return end;
 }
 
+
 /**
  * Pick the chosen trait from the traits array.
  *
@@ -77,4 +78,5 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
   return GNUNET_SYSERR;
 }
 
+
 /* end of testing_api_traits.c */
diff --git a/src/lib/testing_auditor_api_cmd_exchanges.c b/src/lib/testing_auditor_api_cmd_exchanges.c
index 014441761..9cc07553d 100644
--- a/src/lib/testing_auditor_api_cmd_exchanges.c
+++ b/src/lib/testing_auditor_api_cmd_exchanges.c
@@ -335,6 +335,7 @@ TALER_TESTING_cmd_exchanges_with_url
   return cmd;
 }
 
+
 /**
  * Modify an exchanges command to enable retries when we get
  * transient errors from the auditor.
diff --git a/src/lib/testing_auditor_api_cmd_exec_auditor.c b/src/lib/testing_auditor_api_cmd_exec_auditor.c
index afe9d38fc..cff234691 100644
--- a/src/lib/testing_auditor_api_cmd_exec_auditor.c
+++ b/src/lib/testing_auditor_api_cmd_exec_auditor.c
@@ -159,4 +159,5 @@ TALER_TESTING_cmd_exec_auditor (const char *label,
   return cmd;
 }
 
+
 /* end of testing_auditor_api_cmd_exec_auditor.c */
diff --git a/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c b/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
index 09771660c..3b7e3aa0b 100644
--- a/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
+++ b/src/lib/testing_auditor_api_cmd_exec_auditor_dbinit.c
@@ -160,4 +160,5 @@ TALER_TESTING_cmd_exec_auditor_dbinit (const char *label,
   return cmd;
 }
 
+
 /* end of testing_auditor_api_cmd_exec_auditor_dbinit.c */
diff --git a/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c b/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
index 8371f9690..744420d3f 100644
--- a/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
+++ b/src/lib/testing_auditor_api_cmd_exec_wire_auditor.c
@@ -159,4 +159,5 @@ TALER_TESTING_cmd_exec_wire_auditor (const char *label,
   return cmd;
 }
 
+
 /* end of testing_auditor_api_cmd_exec_wire_auditor.c */
diff --git a/src/lib/testing_auditor_api_helpers.c b/src/lib/testing_auditor_api_helpers.c
index 59b0e05de..cf15131da 100644
--- a/src/lib/testing_auditor_api_helpers.c
+++ b/src/lib/testing_auditor_api_helpers.c
@@ -70,6 +70,7 @@ cleanup_auditor (void *cls)
   GNUNET_free (cc);
 }
 
+
 /**
  * Closure for #auditor_main_wrapper()
  */
@@ -122,6 +123,7 @@ auditor_version_cb
   is->auditor_working = GNUNET_YES;
 }
 
+
 /**
  * Setup the @a is 'auditor' member before running the main test loop.
  *
@@ -227,5 +229,4 @@ TALER_TESTING_AUDITOR_setup (TALER_TESTING_Main main_cb,
 }
 
 
-
 /* end of testing_auditor_api_helpers.c */
diff --git a/src/util/crypto.c b/src/util/crypto.c
index b21397914..077f049eb 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -213,8 +213,7 @@ patch_private_key (struct GNUNET_CRYPTO_EddsaPrivateKey *pk)
    * Is it worth also adding a test case that runs gcry_pk_testkey on
    * this key after first parsing it into libgcrypt's s-expression mess
    * ala decode_private_eddsa_key from gnunet/src/util/crypto_ecc.c?
-   * It'd run check_secret_key but not test_keys from libgcrypt/cipher/ecc.c */
-}
+   * It'd run check_secret_key but not test_keys from libgcrypt/cipher/ecc.c */}
 
 
 /**
diff --git a/src/util/test_amount.c b/src/util/test_amount.c
index a8b37823c..d9110eaf8 100644
--- a/src/util/test_amount.c
+++ b/src/util/test_amount.c
@@ -238,4 +238,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_amount.c */
diff --git a/src/util/test_crypto.c b/src/util/test_crypto.c
index c3c7b957c..e19a5f5e8 100644
--- a/src/util/test_crypto.c
+++ b/src/util/test_crypto.c
@@ -134,4 +134,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_crypto.c */
diff --git a/src/util/test_url.c b/src/util/test_url.c
index da43f81ac..5fc47137c 100644
--- a/src/util/test_url.c
+++ b/src/util/test_url.c
@@ -84,4 +84,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_url.c */
diff --git a/src/util/util.c b/src/util/util.c
index 3cc494fad..42977a16c 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -93,8 +93,6 @@ TALER_config_get_denom (const struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
-
-
 /**
  * Set an option with an amount from the command line.  A pointer to
  * this function should be passed as part of the 'struct
@@ -193,6 +191,7 @@ is_reserved (char c)
   return GNUNET_YES;
 }
 
+
 /**
  * Get the length of a string after it has been
  * urlencoded.
@@ -210,6 +209,7 @@ urlencode_len (const char *s)
   return len;
 }
 
+
 /**
  * URL-encode a string according to rfc3986.
  *
@@ -748,4 +748,5 @@ TALER_buffer_write_vfstr (struct TALER_Buffer *buf,
   GNUNET_assert (buf->position <= buf->capacity);
 }
 
+
 /* end of util.c */
diff --git a/src/wire-plugins/plugin_wire_ebics.c b/src/wire-plugins/plugin_wire_ebics.c
index 1c74efd54..d51b4567e 100644
--- a/src/wire-plugins/plugin_wire_ebics.c
+++ b/src/wire-plugins/plugin_wire_ebics.c
@@ -272,7 +272,6 @@ ebics_get_history_cancel (void *cls,
 }
 
 
-
 /**
  * Context for a rejection operation.
  */
@@ -444,4 +443,5 @@ libtaler_plugin_wire_ebics_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_wire_ebics.c */
diff --git a/src/wire-plugins/plugin_wire_taler-bank.c b/src/wire-plugins/plugin_wire_taler-bank.c
index eed57cb97..b468496a8 100644
--- a/src/wire-plugins/plugin_wire_taler-bank.c
+++ b/src/wire-plugins/plugin_wire_taler-bank.c
@@ -999,8 +999,7 @@ taler_bank_get_history (void *cls,
      * Probably something is wrong with the DB, some
      * other component wrote a wrong value to it.  Instead
      * of completely stopping to work, we just scan from the
-     * beginning. */
-    start_off = NULL;
+     * beginning. */start_off = NULL;
   }
   if (NULL == start_off)
   {
@@ -1300,4 +1299,5 @@ libtaler_plugin_wire_taler_bank_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_wire_taler-bank.c */
diff --git a/src/wire-plugins/plugin_wire_template.c b/src/wire-plugins/plugin_wire_template.c
index 29c4553aa..731885ac6 100644
--- a/src/wire-plugins/plugin_wire_template.c
+++ b/src/wire-plugins/plugin_wire_template.c
@@ -380,4 +380,5 @@ libtaler_plugin_wire_template_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_wire_template.c */
diff --git a/src/wire-plugins/test_wire_plugin_transactions_taler-bank.c b/src/wire-plugins/test_wire_plugin_transactions_taler-bank.c
index fa0db5b41..79700818e 100644
--- a/src/wire-plugins/test_wire_plugin_transactions_taler-bank.c
+++ b/src/wire-plugins/test_wire_plugin_transactions_taler-bank.c
@@ -361,4 +361,5 @@ main (int argc,
   return 0;
 }
 
+
 /* end of test_wire_plugin_transactions_taler-bank.c */
diff --git a/src/wire/payto.c b/src/wire/payto.c
index 5e762a864..741549772 100644
--- a/src/wire/payto.c
+++ b/src/wire/payto.c
@@ -526,4 +526,5 @@ TALER_WIRE_payto_to_account (const char *payto_url,
   return TALER_EC_PAYTO_WRONG_METHOD;
 }
 
+
 /* end of payto.c */
diff --git a/src/wire/wire_helper.c b/src/wire/wire_helper.c
index e5ca8b168..76336f7d0 100644
--- a/src/wire/wire_helper.c
+++ b/src/wire/wire_helper.c
@@ -103,4 +103,5 @@ TALER_WIRE_get_plugin_from_method (const char *method)
   return NULL;
 }
 
+
 /* end of wire_helper.c */