Fix warnings; CADET not FTBFS because old hello removed

28 files changed, 52 insertions, 102 deletions

diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index 1e3322733..135fde25a 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -84,7 +84,7 @@ got_hello (void *cls,
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Hello for %s (%d bytes), expires on %s\n",
        GNUNET_i2s (id),
-       sizeof (hello),
+       ntohs (hello->size),
        GNUNET_STRINGS_absolute_time_to_string (
          GNUNET_HELLO_builder_get_expiration_time (hello)));
   peer = GCP_get (id,
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 4727842ea..931654c49 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -25,7 +25,6 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index c04b85106..5b923055b 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -9,7 +9,6 @@ endif
 lib_LTLIBRARIES = libgnunethello.la
 
 libgnunethello_la_SOURCES = \
-  hello.c \
   address.c \
   hello-ng.c \
   hello-uri.c
@@ -20,8 +19,8 @@ libgnunethello_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 1:0:1
 
-noinst_PROGRAMS = \
- gnunet-hello
+#noinst_PROGRAMS = \
+# gnunet-hello
 
 check_PROGRAMS = \
  test_hello \
@@ -60,10 +59,11 @@ test_friend_hello_LDADD = \
  libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-gnunet_hello_SOURCES = \
- gnunet-hello.c
-gnunet_hello_LDADD = \
- libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
-gnunet_hello_LDFLAGS = \
-  $(GN_LIBINTL)
+# Not TNG ready
+#gnunet_hello_SOURCES = \
+# gnunet-hello.c
+#gnunet_hello_LDADD = \
+# libgnunethello.la \
+# $(top_builddir)/src/util/libgnunetutil.la
+#gnunet_hello_LDFLAGS = \
+#  $(GN_LIBINTL)
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index 06333afeb..4c05a14fc 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -536,7 +536,7 @@ handle_store (void *cls, const struct StoreRecordMessage *srm)
 static void
 store_hello_continuation (void *cls, int success)
 {
-  (void *) cls;
+  (void) cls;
 
   if (GNUNET_OK != success)
   {
@@ -550,7 +550,7 @@ store_hello_continuation (void *cls, int success)
 static int
 hosts_directory_scan_callback (void *cls, const char *fullname)
 {
-  (void *) cls;
+  (void) cls;
   const char *filename;
   ssize_t size_total;
   char buffer[GNUNET_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
@@ -568,7 +568,7 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "2 hosts_directory_scan_callback filename %s\n",
               fullname);
-  
+
   /* filename = strrchr (fullname, DIR_SEPARATOR); */
   /* if ((NULL == filename) || (1 > strlen (filename))) */
   /*   filename = fullname; */
@@ -578,7 +578,7 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
   /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, */
   /*             "3 hosts_directory_scan_callback filename %s\n", */
   /*             filename); */
-  
+
   /* if (GNUNET_YES != GNUNET_DISK_file_test (filename)) */
   /*   return GNUNET_OK; */
   size_total = GNUNET_DISK_fn_read (fullname, buffer, sizeof(buffer));
@@ -604,7 +604,7 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
                                      pid,
                                      "",
                                      hello,
-                                     sizeof (hello),
+                                     size_total,
                                      GNUNET_TIME_UNIT_FOREVER_ABS,
                                      GNUNET_PEERSTORE_STOREOPTION_REPLACE,
                                      &store_hello_continuation,
@@ -613,6 +613,7 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
     GNUNET_break (0);
   }
   GNUNET_HELLO_builder_free (builder);
+  return GNUNET_OK;
 }
 
 
@@ -636,7 +637,7 @@ run (void *cls,
   in_shutdown = GNUNET_NO;
   num_clients = 0;
   cfg = c;
-  
+
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
                                                           "peerstore",
                                                           "DATABASE",
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index df1971c4e..e2ed06d28 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -1139,7 +1139,7 @@ hello_updated (void *cls,
   hello = record->value;
   builder = GNUNET_HELLO_builder_from_msg (hello);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "hello_updated with expired %s and size %lu for peer %s\n",
+              "hello_updated with expired %s and size %u for peer %s\n",
               GNUNET_STRINGS_absolute_time_to_string (GNUNET_HELLO_builder_get_expiration_time (hello)),
               ntohs (hello->size),
               GNUNET_i2s (&record->peer));
@@ -1355,7 +1355,7 @@ GNUNET_PEERSTORE_hello_add (struct GNUNET_PEERSTORE_Handle *h,
   huc->pid = GNUNET_malloc (pid_size);
   GNUNET_memcpy (huc->pid, pid, pid_size);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Adding hello for peer %s with expiration %s msg size %lu\n",
+       "Adding hello for peer %s with expiration %s msg size %u\n",
        GNUNET_i2s (huc->pid),
        GNUNET_STRINGS_absolute_time_to_string (huc_exp),
        size_msg);
@@ -1376,9 +1376,10 @@ free_store_context(void *cls,
                    const struct GNUNET_PeerIdentity *key,
                    void *value)
 {
-  (void *) cls;
+  (void) cls;
 
   GNUNET_PEERSTORE_store_cancel ((struct GNUNET_PEERSTORE_StoreContext *) value);
+  return GNUNET_YES; // FIXME why is this a map anyway
 }
 
 
@@ -1386,8 +1387,6 @@ void
 GNUNET_PEERSTORE_hello_add_cancel (struct
                                    GNUNET_PEERSTORE_StoreHelloContext *huc)
 {
-  struct GNUNET_PEERSTORE_StoreContext *sc;
-
   GNUNET_PEERSTORE_watch_cancel (huc->wc);
   GNUNET_CONTAINER_multipeermap_iterate (huc->store_context_map,
                                          free_store_context,
diff --git a/src/sq/sq.c b/src/sq/sq.c
index 557ec2771..96d1d333d 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -22,7 +22,6 @@
  * @brief helper functions for Sqlite3 DB interactions
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_sq_lib.h"
 
diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c
index 1df564bfb..d1ca0e8bd 100644
--- a/src/sq/sq_prepare.c
+++ b/src/sq/sq_prepare.c
@@ -22,7 +22,6 @@
  * @brief helper functions for executing SQL statements
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_sq_lib.h"
 
diff --git a/src/testing/testing_api_cmd_barrier_reached.c b/src/testing/testing_api_cmd_barrier_reached.c
index 0075f8ef0..161240d4d 100644
--- a/src/testing/testing_api_cmd_barrier_reached.c
+++ b/src/testing/testing_api_cmd_barrier_reached.c
@@ -181,7 +181,7 @@ barrier_reached_traits (void *cls,
   struct GNUNET_TESTING_AsyncContext *ac = &brs->ac;
 
   struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_async_context ((const void *) ac),
+    GNUNET_TESTING_make_trait_async_context (ac),
     GNUNET_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_block_until_external_trigger.c b/src/testing/testing_api_cmd_block_until_external_trigger.c
index 58f095842..6a3b00e51 100644
--- a/src/testing/testing_api_cmd_block_until_external_trigger.c
+++ b/src/testing/testing_api_cmd_block_until_external_trigger.c
@@ -58,8 +58,8 @@ block_until_external_trigger_traits (void *cls,
   struct GNUNET_TESTING_BlockState *bs = cls;
   struct GNUNET_TESTING_AsyncContext *ac = &bs->ac;
   struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_async_context ((const void *) ac),
-    GNUNET_TESTING_make_trait_block_state ((const void *) bs),
+    GNUNET_TESTING_make_trait_async_context (ac),
+    GNUNET_TESTING_make_trait_block_state (bs),
     GNUNET_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_exec_bash_script.c b/src/testing/testing_api_cmd_exec_bash_script.c
index 5b9f5cbbb..7e7aafb69 100644
--- a/src/testing/testing_api_cmd_exec_bash_script.c
+++ b/src/testing/testing_api_cmd_exec_bash_script.c
@@ -37,7 +37,7 @@ struct BashScriptState
   struct GNUNET_TESTING_AsyncContext ac;
 
   /**
-   * Callback handed over to the command, which should 
+   * Callback handed over to the command, which should
    * be called upon death or completion of the script.
    */
   GNUNET_ChildCompletedCallback cb;
@@ -55,13 +55,13 @@ struct BashScriptState
    */
   const char *script;
 
-  
+
   /**
    * Arguments for the script
    */
   char **script_argv;
-  
-  /** 
+
+  /**
    * Size of script_argv.
    */
   int argc;
@@ -115,8 +115,7 @@ child_completed_callback (void *cls,
   if (0 == exit_code)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Child succeeded!\n",
-                exit_code);
+                "Child succeeded!\n");
     GNUNET_TESTING_async_finish (&bss->ac);
   }
   else
@@ -141,7 +140,7 @@ exec_bash_script_run (void *cls,
   struct BashScriptState *bss = cls;
   enum GNUNET_GenericReturnValue helper_check;
   char *argv[bss->argc + 2];
-  
+
   char *data_dir;
   char *script_name;
 
@@ -180,7 +179,7 @@ exec_bash_script_run (void *cls,
       argv[i + 1] = bss->script_argv[i];
   }
   argv[bss->argc] = NULL;
-  
+
   bss->start_proc = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
                                      NULL,
                                      NULL,
@@ -204,7 +203,7 @@ GNUNET_TESTING_cmd_exec_bash_script (const char *label,
 
   bss = GNUNET_new (struct BashScriptState);
   bss->script = script;
-  bss->script_argv = script_argv;
+  bss->script_argv = script_argv; // FIXME this is not just a cast to fix
   bss->argc = argc;
   bss->cb = cb;
 
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index efe014776..fa8640bf4 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -126,7 +126,7 @@ struct Peer
 
 
 /**
- * The task to delayed start the notification process intially. 
+ * The task to delayed start the notification process intially.
  * We like to give transport some time to give us our hello to distribute it.
  */
 struct GNUNET_SCHEDULER_Task *peerstore_notify_task;
@@ -551,7 +551,7 @@ reschedule_hellos (void *cls,
                    const struct GNUNET_PeerIdentity *pid,
                    void *value)
 {
-  (void *) cls;
+  (void) cls;
   struct Peer *peer = value;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -878,7 +878,7 @@ process_peer (void *cls,
 static void
 start_notify (void *cls)
 {
-  (void *) cls;
+  (void) cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to process new hellos for gossiping.\n");
   peerstore_notify =
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index f2ee685bc..7a7603e91 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -11243,7 +11243,7 @@ hello_for_client_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "hello for client %s\n",
               address);
-  
+
   start_address_validation (peer, address);
   GNUNET_free (address);
 }
@@ -11262,7 +11262,7 @@ handle_hello_for_client (void *cls,
                          const struct GNUNET_MessageHeader *hello,
                          const char *emsg)
 {
-  (void *) cls;
+  (void) cls;
   const char *val;
   struct GNUNET_HELLO_Builder *builder;
 
diff --git a/src/transport/test_transport_plugin_cmd_nat_upnp.c b/src/transport/test_transport_plugin_cmd_nat_upnp.c
index 31206e63f..82623ece7 100644
--- a/src/transport/test_transport_plugin_cmd_nat_upnp.c
+++ b/src/transport/test_transport_plugin_cmd_nat_upnp.c
@@ -75,7 +75,7 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_receive,
                                           &ac);
@@ -112,25 +112,6 @@ get_waiting_for_barriers ()
 
 
 /**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
  * Function called with the final result of the test.
  *
  * @param cls the `struct MainParams`
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index d83c539fa..c6d75cce4 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -75,7 +75,7 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_receive,
                                           &ac);
@@ -102,7 +102,7 @@ get_waiting_for_barriers ()
 static void
 all_peers_started ()
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_send,
                                           &ac);
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 7000851c4..d2870ab34 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -75,7 +75,7 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_receive,
                                           &ac);
@@ -102,7 +102,7 @@ get_waiting_for_barriers ()
 static void
 all_peers_started ()
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received message\n");
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
index c07fd3cf4..d35672cd9 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -84,7 +84,7 @@ handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
   struct GNUNET_PeerIdentity *peer = cls;
-  const struct GNUNET_TESTING_AsyncContext *ac_block;
+  struct GNUNET_TESTING_AsyncContext *ac_block;
   const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
   unsigned int connected;
   struct GNUNET_TESTING_BlockState *bs;
@@ -129,7 +129,7 @@ handle_test (void *cls,
       {
         GNUNET_TESTING_get_trait_block_state (
           &block_receive,
-          (const struct GNUNET_TESTING_BlockState  **) &bs);
+          &bs);
         bs->asynchronous_finish = GNUNET_YES;
       }
 
@@ -154,7 +154,7 @@ get_waiting_for_barriers ()
 static void
 all_peers_started ()
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received message\n");
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_performance.c b/src/transport/test_transport_plugin_cmd_simple_send_performance.c
index 931801d77..c4158f472 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_performance.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_performance.c
@@ -104,7 +104,7 @@ handle_test (void *cls,
              GNUNET_TRANSPORT_TESTING_PerformanceTestMessage *message)
 {
   struct GNUNET_PeerIdentity *peer = cls;
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
   struct Sender *sender;
   struct GNUNET_TIME_Absolute time_send;
   struct GNUNET_TIME_Absolute now;
@@ -218,25 +218,6 @@ get_waiting_for_barriers ()
 
 
 /**
- * Callback to set the flag indicating all peers started. Will be called via the plugin api.
- *
- */
-static void
-all_peers_started ()
-{
-  const struct GNUNET_TESTING_AsyncContext *ac;
-
-  GNUNET_TESTING_get_trait_async_context (&block_send,
-                                          &ac);
-  GNUNET_assert  (NULL != ac);
-  if (NULL == ac->cont)
-    GNUNET_TESTING_async_fail ((struct GNUNET_TESTING_AsyncContext *) ac);
-  else
-    GNUNET_TESTING_async_finish ((struct GNUNET_TESTING_AsyncContext *) ac);
-}
-
-
-/**
  * Function called with the final result of the test.
  *
  * @param cls the `struct MainParams`
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index 303790afc..378caf7df 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -100,7 +100,7 @@ get_waiting_for_barriers ()
 static void
 all_peers_started ()
 {
-  const struct GNUNET_TESTING_AsyncContext *ac;
+  struct GNUNET_TESTING_AsyncContext *ac;
 
   GNUNET_TESTING_get_trait_async_context (&block_send,
                                           &ac);
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index 26895e457..196dbdc39 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -1203,7 +1203,7 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send
   if (last_queue != tc_queue)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Selected sending queue changed to %u with length %lu and MTU %u\n",
-                ntohl (tc_queue->qid), tc_queue->q_len, tc_queue->mtu);
+                ntohl (tc_queue->qid), (unsigned long) tc_queue->q_len, tc_queue->mtu);
   GNUNET_assert (NULL != tc_queue);
   last_queue = tc_queue;
   // Uncomment this for alternativ 1 of backchannel functionality
@@ -1215,7 +1215,7 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send
   if (msg_count % 100 == 0)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending %u-th (%lu-th for queue) message on queue %u\n",
-                msg_count, tc_queue->mid, ntohl (tc_queue->qid));
+                msg_count, (unsigned long) tc_queue->mid, ntohl (tc_queue->qid));
   inbox_size = sizeof (struct GNUNET_MessageHeader) + payload_size;
   env = GNUNET_MQ_msg_extra (msg,
                              inbox_size,
diff --git a/src/transport/transport_api2_core.c b/src/transport/transport_api2_core.c
index c2beee779..0d2a0ac7f 100644
--- a/src/transport/transport_api2_core.c
+++ b/src/transport/transport_api2_core.c
@@ -407,8 +407,8 @@ peer_mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
   if (GNUNET_MQ_ERROR_MALFORMED == error)
     GNUNET_break_op (0);
   //TODO Look into bug #7887
-  
-  GNUNET_TRANSPORT_core_receive_continue (n->h, (const struct PeerIdentity *) &n->id);
+
+  GNUNET_TRANSPORT_core_receive_continue (n->h, &n->id);
 }
 
 
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index 1bdb8817f..68bdae69c 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -30,7 +30,6 @@
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_transport_service.h"
 #include "transport-testing-cmds.h"
 
 /**
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 33991bc29..c59c4b006 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -29,7 +29,6 @@
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_transport_service.h"
 #include "transport-testing-cmds.h"
 
 /**
diff --git a/src/util/bio.c b/src/util/bio.c
index 3a463bcd1..caf533108 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -23,7 +23,6 @@
  * @author Christian Grothoff
  */
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 45aec7981..17ba253ff 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -23,7 +23,6 @@
  * @author Christian Grothoff
  */
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 56a002f8c..232e66bf9 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -26,7 +26,6 @@
  */
 
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index 65d7f33c0..73333d22a 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -24,7 +24,6 @@
  */
 
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c
index 327616048..c626b55e5 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -24,7 +24,6 @@
  */
 
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/container_multiuuidmap.c b/src/util/container_multiuuidmap.c
index 53975b3f7..3e957d47b 100644
--- a/src/util/container_multiuuidmap.c
+++ b/src/util/container_multiuuidmap.c
@@ -24,7 +24,6 @@
  */
 
 
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"