UTIL: Allow only inlcusion of util glib-style.

author: Martin Schanzenbach <schanzen@gnunet.org> 2022-12-04 19:35:42 +0900
committer: Martin Schanzenbach <schanzen@gnunet.org> 2022-12-04 19:35:42 +0900
commit: 38e77d7ab84a21e9aebd558558105c95254ac430 (patch)
tree: 016efa7b50dfd39e42b41b6e3075874de6e5b633 /src
parent: 292cefa2a12a78ae54fb56a3961452f439cb744f (diff)
download: gnunet-38e77d7ab84a21e9aebd558558105c95254ac430.tar.gz
gnunet-38e77d7ab84a21e9aebd558558105c95254ac430.zip
736 files changed, 182 insertions, 843 deletions
diff --git a/src/abd/abd_api.c b/src/abd/abd_api.c
index 2613bd4eb..57f831e85 100644
--- a/src/abd/abd_api.c
+++ b/src/abd/abd_api.c
@@ -23,7 +23,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/abd/abd_serialization.c b/src/abd/abd_serialization.c
index 18ec63555..2ed24ff2f 100644
--- a/src/abd/abd_serialization.c
+++ b/src/abd/abd_serialization.c
@@ -26,7 +26,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_abd_service.h"
diff --git a/src/abd/delegate_misc.c b/src/abd/delegate_misc.c
index af6726b12..cc45cde04 100644
--- a/src/abd/delegate_misc.c
+++ b/src/abd/delegate_misc.c
@@ -26,7 +26,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_abd_service.h"
diff --git a/src/abd/gnunet-abd.c b/src/abd/gnunet-abd.c
index e7bccb3b3..6f6521d98 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/abd/gnunet-abd.c
@@ -23,7 +23,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_abd_service.h>
 #include <gnunet_gnsrecord_lib.h>
diff --git a/src/abd/gnunet-service-abd.c b/src/abd/gnunet-service-abd.c
index 5b8ce3732..407d5bdc3 100644
--- a/src/abd/gnunet-service-abd.c
+++ b/src/abd/gnunet-service-abd.c
@@ -23,7 +23,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/abd/plugin_gnsrecord_abd.c b/src/abd/plugin_gnsrecord_abd.c
index 51878ad11..7b2f4af5b 100644
--- a/src/abd/plugin_gnsrecord_abd.c
+++ b/src/abd/plugin_gnsrecord_abd.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index f69d98387..1360ecf14 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -25,7 +25,6 @@
 * @author LRN
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index e908ce20f..2c418d0ce 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -25,7 +25,6 @@
 * @author LRN
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 908a4118e..ea3a012ab 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index ad81e1277..da94efdd8 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c
index 514dd65df..3d3f79d35 100644
--- a/src/arm/mockup-service.c
+++ b/src/arm/mockup-service.c
@@ -20,7 +20,6 @@
 #include "platform.h"
 #include <stdlib.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 04611645a..56a0abbd2 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -22,7 +22,6 @@
 * @brief testcase for arm_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_resolver_service.h"
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 2018a0a7a..e3eed8568 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index f99857ca7..90fb8bfa0 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_os_lib.h"
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c
index d3601b6ef..169daa6f1 100644
--- a/src/ats-tool/gnunet-ats.c
+++ b/src/ats-tool/gnunet-ats.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_transport_service.h"
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c
index 70c20b7ad..f62d89772 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_service.h"
 #include "ats.h"
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index 8bff919b9..242589851 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_service.h"
 #include "ats.h"
diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c
index 29c6263ae..82114f888 100644
--- a/src/ats/ats_api_scanner.c
+++ b/src/ats/ats_api_scanner.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_service.h"
 /**
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index cafce5f1a..6fb61b2e8 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -32,7 +32,6 @@
 *   to do with accessing the ATS service.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_service.h"
 #include "ats.h"
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index d941a3619..ba7994686 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-ats-solver-eval.h"
 #include "gnunet-service-ats_normalization.h"
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index f4e182a0d..5e27ecbd0 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index b021aeaaf..9c9856094 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_normalization.h"
diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c
index d25f88f19..702c5ba87 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_connectivity.h"
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index 807f5fe49..36584e944 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <float.h>
 #include "gnunet_ats_service.h"
 #include "gnunet-service-ats_addresses.h"
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 738054a5d..a4d7b36b6 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -27,7 +27,6 @@
 * - simplify functions by passing a `struct GNUNET_HELLO_Address`
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c
index e729a8118..d3db69caa 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_plugin.h"
 #include "gnunet-service-ats_connectivity.h"
 #include "gnunet-service-ats_performance.h"
diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c
index c6e875f93..c2b2dc4c1 100644
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index 28497ed4a..471a19859 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats_reservations.h"
 #include "gnunet-service-ats.h"
 #include "ats.h"
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index b461236eb..2dfb70343 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "ats.h"
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index eee4585b3..363d0cfc9 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-ats_addresses.h"
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index 332ad49a4..d3062a5c0 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_ats_plugin.h"
diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c
index 7b6913024..390cafe0f 100644
--- a/src/ats/test_ats_api.c
+++ b/src/ats/test_ats_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "test_ats_lib.h"
 /**
diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c
index 910da8a5e..d19da0106 100644
--- a/src/ats/test_ats_lib.c
+++ b/src/ats/test_ats_lib.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/ats/test_ats_reservation_api.c b/src/ats/test_ats_reservation_api.c
index f3ccdbc2b..f6a964df4 100644
--- a/src/ats/test_ats_reservation_api.c
+++ b/src/ats/test_ats_reservation_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "test_ats_lib.h"
 /**
diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c
index 93fdb9ee9..93947b89c 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -24,7 +24,6 @@
 * @author Markus Teich
 */
 #include "platform.h"
-#include "platform.h"
 #include <float.h>
diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c
index e3d6a4b2d..dded45ce6 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /* #include "gnunet_auction_service.h" */
diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c
index e3d6a4b2d..dded45ce6 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /* #include "gnunet_auction_service.h" */
diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c
index b40a49232..c20f0bdbe 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/auction/gnunet-service-auction.c
@@ -24,7 +24,6 @@
 * @author Markus Teich
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "auction.h"
diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c
index b84dc638a..1eac9b5c4 100644
--- a/src/auction/test_auction_api.c
+++ b/src/auction/test_auction_api.c
@@ -22,7 +22,6 @@
 * @brief testcase for auction.c
 */
 #include "platform.h"
-#include "platform.h"
 static int
 check ()
diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c
index 778d032d7..c8269498e 100644
--- a/src/block/bg_bf.c
+++ b/src/block/bg_bf.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_block_group_lib.h"
 #include "gnunet_block_plugin.h"
diff --git a/src/block/block.c b/src/block/block.c
index 6b0cd6599..9edc7ce5e 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c
index 037dd050c..4a271fa42 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c
index 14336c53e..5afac9205 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index 31dad4117..e8caa7d35 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -55,7 +55,6 @@ extern "C" {
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_cadet_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 63ea6b9fe..0bfb01868 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_api_drop_message.c b/src/cadet/cadet_api_drop_message.c
index c95121d97..e172418c4 100644
--- a/src/cadet/cadet_api_drop_message.c
+++ b/src/cadet/cadet_api_drop_message.c
@@ -23,7 +23,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "cadet.h"
diff --git a/src/cadet/cadet_api_get_channel.c b/src/cadet/cadet_api_get_channel.c
index 9b7b53fdb..05e2a8383 100644
--- a/src/cadet/cadet_api_get_channel.c
+++ b/src/cadet/cadet_api_get_channel.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_api_get_path.c b/src/cadet/cadet_api_get_path.c
index d09c59866..f32a5e20b 100644
--- a/src/cadet/cadet_api_get_path.c
+++ b/src/cadet/cadet_api_get_path.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_api_helper.c b/src/cadet/cadet_api_helper.c
index a616f2099..52aec6cc9 100644
--- a/src/cadet/cadet_api_helper.c
+++ b/src/cadet/cadet_api_helper.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_api_list_peers.c b/src/cadet/cadet_api_list_peers.c
index 25509f2d4..52f59cc74 100644
--- a/src/cadet/cadet_api_list_peers.c
+++ b/src/cadet/cadet_api_list_peers.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_api_list_tunnels.c b/src/cadet/cadet_api_list_tunnels.c
index 70a1626e2..dce12835f 100644
--- a/src/cadet/cadet_api_list_tunnels.c
+++ b/src/cadet/cadet_api_list_tunnels.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c
index befec480b..9c7b9063d 100644
--- a/src/cadet/cadet_test_lib.c
+++ b/src/cadet/cadet_test_lib.c
@@ -23,7 +23,6 @@
 * @brief library for writing CADET tests
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "cadet_test_lib.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c
index 9d612c8e6..22cbe55dc 100644
--- a/src/cadet/gnunet-cadet-profiler.c
+++ b/src/cadet/gnunet-cadet-profiler.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "cadet_test_lib.h"
 #include "gnunet_cadet_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index d52104d1f..9b7538ae7 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_cadet_service.h"
 #include "cadet.h"
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 09dcf5ecb..07b580005 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -33,7 +33,6 @@
 *            have properties like reliability.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "cadet.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 85028799d..78658c296 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -34,7 +34,6 @@
 *   reserve more bits in 'options' to allow for buffer size control?
 */
 #include "platform.h"
-#include "platform.h"
 #include "cadet.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-cadet_channel.h"
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 05ac8f53c..f01c1388e 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet-service-cadet_connection.h"
 #include "gnunet-service-cadet_channel.h"
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c
index 54c55c60a..68f7405c3 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -30,7 +30,6 @@
 * - Optimization: given BROKEN messages, destroy paths (?)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-cadet_core.h"
 #include "gnunet-service-cadet_paths.h"
 #include "gnunet-service-cadet_peer.h"
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index f99d98e55..82ba326b4 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index e3db7ce85..e1850d60a 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c
index bba7fa621..83b996e05 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-cadet_connection.h"
 #include "gnunet-service-cadet_tunnels.h"
 #include "gnunet-service-cadet_peer.h"
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 5384e76a1..f2b508ae0 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -31,7 +31,6 @@
 *   to take a break if we have some connections and have searched a lot (?))
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index d11693c33..c7e422926 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -31,7 +31,6 @@
 *     on how much we like our connections
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_signatures.h"
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 260822ba6..61c09f389 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "cadet.h"
 #include "cadet_test_lib.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c
index 36f64c5c0..441599973 100644
--- a/src/cadet/test_cadet_flow.c
+++ b/src/cadet/test_cadet_flow.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "cadet_test_lib.h"
 #include "gnunet_cadet_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c
index 33ccc0fd8..6f75dfd1f 100644
--- a/src/cadet/test_cadet_local_mq.c
+++ b/src/cadet/test_cadet_local_mq.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c
index 522e05aa8..01d0ad3de 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -24,10 +24,8 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_client_lib.h"
 #include "gnunet_consensus_service.h"
 #include "consensus.h"
diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c
index 7e9a1340c..07a536a2d 100644
--- a/src/consensus/gnunet-consensus-profiler.c
+++ b/src/consensus/gnunet-consensus-profiler.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_consensus_service.h"
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 2304a7428..5b6b9bbd7 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -23,7 +23,6 @@
 * @author Florian Dold <flo@dold.me>
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/consensus/plugin_block_consensus.c b/src/consensus/plugin_block_consensus.c
index dfc26e464..241d8fc7b 100644
--- a/src/consensus/plugin_block_consensus.c
+++ b/src/consensus/plugin_block_consensus.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "consensus_protocol.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c
index b0b11685a..235a67484 100644
--- a/src/consensus/test_consensus_api.c
+++ b/src/consensus/test_consensus_api.c
@@ -23,7 +23,6 @@
 * @brief testcase for consensus_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_consensus_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index 08d26d0ec..9c4c520be 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_conversation_service.h"
 #include "conversation.h"
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index 2aca4e3d0..129192bf0 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_conversation_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_gns_service.h"
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index 193bf18f3..5e6bc805f 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_speaker_lib.h"
 #include "gnunet_microphone_lib.h"
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index 870267a94..9ff0002e7 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -24,7 +24,6 @@
 * @author Andreas Fuchs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c
index c8ecfa981..f1e1e773d 100644
--- a/src/conversation/gnunet-helper-audio-playback-gst.c
+++ b/src/conversation/gnunet-helper-audio-playback-gst.c
@@ -23,7 +23,6 @@
 * @author LRN
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "conversation.h"
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index eca242c5f..dfa400d71 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "conversation.h"
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c
index bad119c5f..883dd9eea 100644
--- a/src/conversation/gnunet-helper-audio-record-gst.c
+++ b/src/conversation/gnunet-helper-audio-record-gst.c
@@ -23,7 +23,6 @@
 * @author LRN
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "conversation.h"
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c
index 005df3a68..060a7c779 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "conversation.h"
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index ef4c9a111..1fff8bd26 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_applications.h"
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c
index cacacf3ec..a4a40796f 100644
--- a/src/conversation/microphone.c
+++ b/src/conversation/microphone.c
@@ -27,7 +27,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_microphone_lib.h"
 #include "conversation.h"
diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c
index df515e5c9..786711c8e 100644
--- a/src/conversation/plugin_gnsrecord_conversation.c
+++ b/src/conversation/plugin_gnsrecord_conversation.c
@@ -28,7 +28,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_conversation_service.h"
diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c
index 165d54697..38eb1159c 100644
--- a/src/conversation/speaker.c
+++ b/src/conversation/speaker.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_speaker_lib.h"
 #include "conversation.h"
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index e9bc39283..22e9b1dd9 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -26,7 +26,6 @@
 * terminated by the party that initiated the call.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c
index 155e29f0d..a7aab069f 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -26,7 +26,6 @@
 * call).
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 02e2dd1df..1bd2b4e22 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -28,7 +28,6 @@
 * second call.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/core/core.h b/src/core/core.h
index 4d8619a29..17df7acb7 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,9 +26,8 @@
 #ifndef CORE_H
 #define CORE_H
-#include "gnunet_bandwidth_lib.h"
 #include "gnunet_transport_service.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 /**
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 40ee99190..2e0bb1785 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_core_service.h"
diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c
index fbde999f6..3be8e3859 100644
--- a/src/core/core_api_monitor_peers.c
+++ b/src/core/core_api_monitor_peers.c
@@ -25,7 +25,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_core_service.h"
 #include "core.h"
diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c
index 2c78d8f8d..d90c8e1f5 100644
--- a/src/core/gnunet-core.c
+++ b/src/core/gnunet-core.c
@@ -24,7 +24,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_core_service.h"
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 8b112e365..c9c3e3ff5 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
 #include "gnunet-service-core.h"
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 72ec50095..b203f4902 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-core_kx.h"
 #include "gnunet-service-core.h"
 #include "gnunet-service-core_sessions.h"
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 72e8d4d13..e103c89f5 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-core.h"
 #include "gnunet-service-core_kx.h"
 #include "gnunet-service-core_typemap.h"
diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c
index 75c08154b..7b7df2fe9 100644
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet-service-core.h"
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index c2057d1c7..653ce1aa0 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_util_lib.h"
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index ef713864f..d4b55a6b8 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_util_lib.h"
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index 4678cd43d..c2e39cd26 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 0dcb2617a..e50d3b2ec 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_util_lib.h"
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 23982e719..eb5ca7c2b 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_util_lib.h"
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 6a8a46ed9..b21153980 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <jansson.h>
 #include <microhttpd.h>
 #include "gnunet_curl_lib.h"
diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c
index db9d5fb03..0c19bd171 100644
--- a/src/curl/curl_reschedule.c
+++ b/src/curl/curl_reschedule.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <jansson.h>
 #include "gnunet_curl_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index 102b19b25..c93ed58d6 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 08f176f58..84bc4a852 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -23,7 +23,6 @@
 * @author Nils Durner
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c
index fa0b53b42..0dd8e47f8 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_plugin.h"
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index 96c73d619..8bfd04aea 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_pq_lib.h"
 #include "gnunet_datacache_plugin.h"
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index b249edfdb..1c6f24a82 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_plugin.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c
index 901a1973c..1bd712d39 100644
--- a/src/datacache/plugin_datacache_template.c
+++ b/src/datacache/plugin_datacache_template.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_plugin.h"
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 665e87980..fd5a5f54c 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -23,7 +23,6 @@
 * @author Nils Durner
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 710cd5804..994147a64 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -23,7 +23,6 @@
 * @author Nils Durner
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index d49583a37..4d27efb4e 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c
index c2f145a5c..9a76d1160 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
 #include <inttypes.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index f267b7aea..f45e71ee9 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index a141657ce..fef38891e 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -32,7 +32,6 @@
 * dates are set using a pseudo-random value within a realistic range.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 7763e7f5d..d7488d4e7 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_plugin.h"
diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c
index 1f794ec29..a827a2763 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -28,7 +28,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datastore_plugin.h"
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index ef271f178..216a6faa4 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -118,7 +118,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datastore_plugin.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_mysql_lib.h"
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 4874fa642..5fcacc17b 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datastore_plugin.h"
 #include "gnunet_pq_lib.h"
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 163d1efed..5ea9da4cb 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datastore_plugin.h"
 #include "gnunet_sq_lib.h"
 #include <sqlite3.h>
diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index 92986e22e..2b455f8cb 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datastore_plugin.h"
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index f35ae4106..e72a6acd3 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 2f911fbf3..175765267 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index bb6ce5367..9fe2462e7 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_plugin.h"
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index c95fb8a8b..e31ac596c 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index 2662fff93..29c5088d1 100644
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -23,7 +23,6 @@
 * @brief library for writing DHT tests
 */
 #include "platform.h"
-#include "platform.h"
 #include "dht_test_lib.h"
 /**
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index b2b924835..1ae9235f8 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -24,7 +24,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dht_service.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "dht-clients", __VA_ARGS__)
diff --git a/src/dht/gnunet-dht-hello.c b/src/dht/gnunet-dht-hello.c
index d3832d0dc..369ed5643 100644
--- a/src/dht/gnunet-dht-hello.c
+++ b/src/dht/gnunet-dht-hello.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dht_service.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "dht-clients", __VA_ARGS__)
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index 08ec017d1..93ea1284a 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -24,7 +24,6 @@
 * @author Bartlomiej Polot
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dht_service.h"
 /**
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index ce9bda089..531107ef2 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -24,7 +24,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dht_service.h"
 /**
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 08c31acf3..39433791d 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -25,7 +25,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index 95a2aa1b3..90bb4d1f7 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -25,7 +25,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c
index ebae7429e..dcb6308a9 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -24,7 +24,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet-service-dht_datacache.h"
 #include "gnunet-service-dht_neighbours.h"
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index d4bc957ec..25d69ac65 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -25,7 +25,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
 #include "gnunet_signatures.h"
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 104b41246..d81a2b2e1 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-dht_neighbours.h"
 #include "gnunet-service-dht_routing.h"
 #include "gnunet-service-dht.h"
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index 62ffe2cc0..55a34bdf0 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_dht_service.h"
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index 20bde1de3..bee16736c 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_hello_uri_lib.h"
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 0d9bf5b2a..044983b7e 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -25,7 +25,6 @@
 * This test case tests DHT api to DUMMY DHT service communication.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c
index 8b208cae5..3960a2235 100644
--- a/src/dht/test_dht_monitor.c
+++ b/src/dht/test_dht_monitor.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_dht_service.h"
 #include "dht_test_lib.h"
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index fc98c7734..a8294c65d 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -25,7 +25,6 @@
 * value from each other peer.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "dht_test_lib.h"
diff --git a/src/dhtu/plugin_dhtu_gnunet.c b/src/dhtu/plugin_dhtu_gnunet.c
index ad4519b07..b0cee7e01 100644
--- a/src/dhtu/plugin_dhtu_gnunet.c
+++ b/src/dhtu/plugin_dhtu_gnunet.c
@@ -25,7 +25,6 @@
 * @brief plain IP based DHT network underlay
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dhtu_plugin.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_core_service.h"
diff --git a/src/dhtu/plugin_dhtu_ip.c b/src/dhtu/plugin_dhtu_ip.c
index afe52f96c..06d0f0f60 100644
--- a/src/dhtu/plugin_dhtu_ip.c
+++ b/src/dhtu/plugin_dhtu_ip.c
@@ -25,7 +25,6 @@
 * @brief plain IP based DHT network underlay
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dhtu_plugin.h"
 /**
diff --git a/src/dhtu/test_dhtu_ip.c b/src/dhtu/test_dhtu_ip.c
index 047f9fdf9..030b17b5f 100644
--- a/src/dhtu/test_dhtu_ip.c
+++ b/src/dhtu/test_dhtu_ip.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/dhtu/testing_dhtu_cmd_send.c b/src/dhtu/testing_dhtu_cmd_send.c
index bb9e46a11..fe8e1c18a 100644
--- a/src/dhtu/testing_dhtu_cmd_send.c
+++ b/src/dhtu/testing_dhtu_cmd_send.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 573f3e359..b0bbb894f 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_dns_service.h"
 #include "dns.h"
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index 0f7c8a9d2..c1ef17255 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -25,10 +25,8 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
 /**
 * Handle to transport service.
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index 4bf9f4d06..045207f8c 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -25,10 +25,8 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
 /**
 * Handle to DNS service.
diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c
index a58176893..54443cd7a 100644
--- a/src/dns/gnunet-helper-dns.c
+++ b/src/dns/gnunet-helper-dns.c
@@ -64,7 +64,6 @@
 * - Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
@@ -73,7 +72,7 @@
 /**
 * Need 'struct GNUNET_MessageHeader'.
 */
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 /**
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 19f8d12f8..24566ae21 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -37,7 +37,6 @@
 * time, the system will never use more than 256 UDP sockets.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_applications.h"
 #include "gnunet_constants.h"
@@ -45,10 +44,7 @@
 #include "gnunet_signatures.h"
 #include "dns.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_dnsstub_lib.h"
 #include "gnunet_statistics_service.h"
-#include "gnunet_tun_lib.h"
 /**
 * Port number for DNS
diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c
index c4c1072dd..0526df698 100644
--- a/src/dns/gnunet-zonewalk.c
+++ b/src/dns/gnunet-zonewalk.c
@@ -24,10 +24,7 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
-#include <gnunet_dnsstub_lib.h>
-#include <gnunet_dnsparser_lib.h>
 /**
 * Request we should make.
diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index 7f151b6ab..1bbd7f750 100644
--- a/src/dns/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
@@ -28,7 +28,6 @@
 * might be a natural enough place for people to find the code...
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 237958f4a..eb2380439 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -35,18 +35,14 @@
 *   service with an API to add local-exit services dynamically?
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_applications.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_dnsstub_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_regex_service.h"
 #include "exit.h"
 #include "block_dns.h"
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index b4b2b0822..d9578cfa0 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -42,7 +42,6 @@
 * - Philipp Tölke
 */
 #include "platform.h"
-#include "platform.h"
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
@@ -56,7 +55,7 @@
 /**
 * Need 'struct GNUNET_MessageHeader'.
 */
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 /**
diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index 192ee7e3b..c0ca86b37 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fragmentation_lib.h"
 #include "fragmentation.h"
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index 5f0b0c187..b35ccc100 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -23,8 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
-#include "gnunet_fragmentation_lib.h"
 #include "gnunet_protocols.h"
 #include "fragmentation.h"
diff --git a/src/fragmentation/fragmentation.h b/src/fragmentation/fragmentation.h
index 2d7abd4f7..1207e4eeb 100644
--- a/src/fragmentation/fragmentation.h
+++ b/src/fragmentation/fragmentation.h
@@ -24,7 +24,9 @@
 */
 #ifndef FRAGMENTATION_H
 #define FRAGMENTATION_H
 #include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_fragmentation_lib.h"
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c
index 6291b7482..77879f75b 100644
--- a/src/fragmentation/test_fragmentation.c
+++ b/src/fragmentation/test_fragmentation.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fragmentation_lib.h"
 #define DETAILS GNUNET_NO
diff --git a/src/fragmentation/test_fragmentation_parallel.c b/src/fragmentation/test_fragmentation_parallel.c
index 240405dd9..d19296cf5 100644
--- a/src/fragmentation/test_fragmentation_parallel.c
+++ b/src/fragmentation/test_fragmentation_parallel.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fragmentation_lib.h"
 #define DETAILS GNUNET_NO
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 982517f8f..6e97a3812 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index b59dc66cd..eb7aac5bb 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -33,7 +33,6 @@
 *   into memory
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index c6a1e2b1c..8dd216324 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_scheduler_lib.h"
 #include <pthread.h>
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index ebef12ab1..102b297c1 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index b9cf8e8d4..dc5db9d3f 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #if HAVE_EXTRACTOR_H
 #include <extractor.h>
 #endif
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index c61899236..945883a45 100644
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -24,9 +24,7 @@
 * @author Igor Wronsky, Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
-#include "gnunet_getopt_lib.h"
 #include "fs_api.h"
 /* ******************** command-line option parsing API ******************** */
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 12cb3921c..eaee4ce55 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c
index 292e19fee..2e7816d65 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 124e5a423..bc94dd1fc 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 38ce45fc4..5cdf8f6e8 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index ce26f352d..dae5ccdf3 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c
index 0e4c9fe5b..aed090bb3 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "fs_publish_ublock.h"
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 7da2bdec5..5538b7838 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index 0dd87c339..3610b202e 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_scheduler_lib.h"
 #include <pthread.h>
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index 1d0232649..f80a2859c 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -27,7 +27,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_api.h"
 #include "fs_test_lib.h"
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index 9fe7fbae7..65f589966 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_tree.h"
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index da9f4ea5a..8c27af9de 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -25,7 +25,6 @@
 * @brief Unindex file.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 8b91646b1..cdea8b72d 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -81,7 +81,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_signatures.h"
 #include "fs_api.h"
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index 1c464001f..f91e9d00d 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -27,7 +27,6 @@
 * - add stability timer (a la buildbot)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #define MAX_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c
index 4ab096ad8..fbb7c6028 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/fs/gnunet-daemon-fsprofiler.c
@@ -27,7 +27,6 @@
 * - how to signal driver that we're done?
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index c9d92acbd..ef5c40ae2 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 static int ret;
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 25f2af39f..eebf8e993 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -26,7 +26,6 @@
 * @author Igor Wronsky
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 static int ret;
diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index 9503d55cf..62da46834 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index 1895276aa..0f8f02a1c 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 /**
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c
index fc2751397..ef1a9ce4b 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -27,7 +27,6 @@
 * and report the results to stdout.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 7a9a1fe5d..c62edcd61 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -26,7 +26,6 @@
 * @author Igor Wronsky
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_identity_service.h"
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 8ea9c0957..78f4f3d4d 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -30,7 +30,6 @@
 #include <ctype.h>
 #include <inttypes.h>
 #include <limits.h>
-#include "platform.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index ce94fade4..597e89e14 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -24,14 +24,12 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <float.h>
 #include "gnunet_constants.h"
 #include "gnunet_core_service.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_datastore_service.h"
 #include "gnunet_load_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_signatures.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index f647dc782..398fcd604 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -28,7 +28,6 @@
 *   it that way (fine for now)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c
index ecfdf437a..8bfe91cf0 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -28,7 +28,6 @@
 *   it that way (fine for now)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index cd74ba441..29e4c5910 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_load_lib.h"
 #include "gnunet-service-fs.h"
diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c
index 43ae2e9f2..8fb34c067 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -24,11 +24,9 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <float.h>
 #include "gnunet_core_service.h"
 #include "gnunet_datastore_service.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
diff --git a/src/fs/gnunet-service-fs_indexing.h b/src/fs/gnunet-service-fs_indexing.h
index 546dbb172..244a51900 100644
--- a/src/fs/gnunet-service-fs_indexing.h
+++ b/src/fs/gnunet-service-fs_indexing.h
@@ -29,7 +29,6 @@
 #include "gnunet_block_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_datastore_service.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index cccc8905b..60dd0ab70 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-fs.h"
 #include "gnunet-service-fs_cp.h"
 #include "gnunet-service-fs_pe.h"
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 9a9510158..b938e3593 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_load_lib.h"
 #include "gnunet-service-fs.h"
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index a2d387208..92dbba8e6 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-fs.h"
 #include "gnunet-service-fs_cp.h"
 #include "gnunet-service-fs_indexing.h"
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index e997322fd..ca2c85724 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-fs.h"
 #include "gnunet-service-fs_put.h"
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index fb1a96455..afc547127 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -26,7 +26,6 @@
 * @author Igor Wronsky
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
 static int ret;
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index 6ae218db6..2c7830f5f 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_test_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c
index 989039558..6b71b1f93 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -44,7 +44,6 @@
 * Download speed of type `leach` was 1384 KiB/s
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_test_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index 6a81f2347..11677a6b2 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_fs_service.h"
 #include "block_fs.h"
diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c
index bec4b5d98..7a57e98b0 100644
--- a/src/fs/test_fs.c
+++ b/src/fs/test_fs.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util.h"
 #include "gnunet_fsui_lib.h"
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index fe0d81959..908e7c555 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #if HAVE_EXTRACTOR_H
 #include <extractor.h>
 #endif
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index bff66d7e6..2fe0da77c 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index f3bf75a3f..35d4ed441 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index f7c09c77a..22013db27 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -32,7 +32,6 @@
 *   filedata-from-callback)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c
index 00510e2f5..3d0da752b 100644
--- a/src/fs/test_fs_getopt.c
+++ b/src/fs/test_fs_getopt.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 4d037a524..2f04a017a 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -28,7 +28,6 @@
 * - actually call list_indexed API!
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index c3c8bc1c5..c1e10d575 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c
index c14791d77..2132220fb 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/fs/test_fs_namespace_list_updateable.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 6acc66475..2ffc722da 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index f6864b86e..da0209793 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index ebcff83bb..b392cc8ac 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index e745ee54a..d523a6404 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c
index 3367bd950..b3c717aa1 100644
--- a/src/fs/test_fs_search_probes.c
+++ b/src/fs/test_fs_search_probes.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c
index 157bd5ed4..2187f4531 100644
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/fs/test_fs_search_with_and.c
@@ -23,7 +23,6 @@
 * @author Bruno Cabral - 99% based on Christian Grothoff code
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index 93e4ec3e6..509fbe76a 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index 3c318648c..714dd452e 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_test_lib.h"
 #define VERBOSE GNUNET_NO
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index f7928a19b..992672244 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index 9ff5cf453..802aaf7ca 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index c7b794f07..e0f23097b 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 51b98d26a..38b00f3e8 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_test_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 265b0de9c..2d1fbb788 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "fs_test_lib.h"
 #define VERBOSE GNUNET_NO
diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c
index 22ef87412..f15d10b17 100644
--- a/src/fs/test_plugin_block_fs.c
+++ b/src/fs/test_plugin_block_fs.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_lib.h"
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 2da63e9b7..9e25154ef 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index e3da0d9c3..c88ce776e 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c
index 7c36f9497..754f8ac6f 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/gns/gnunet-bcd.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include <microhttpd.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 5fe28591a..04d320c62 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -23,11 +23,8 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
-#include <gnunet_dnsparser_lib.h>
 #include <gnunet_gns_service.h>
-#include <gnunet_dnsstub_lib.h>
 #include "gnunet_vpn_service.h"
 #include "gns.h"
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index 325fc5207..b36a83f21 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_gns_service.h>
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index c16f9a94f..e99c4d3dd 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -24,7 +24,6 @@
 * @author LRN
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_identity_service.h>
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index dca419b5d..312fde293 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -28,7 +28,6 @@
 * - double-check queueing logic
 */
 #include "platform.h"
-#include "platform.h"
 #include <microhttpd.h>
 /* Just included for the right curl.h */
 #include "gnunet_curl_lib.h"
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index baa784404..c71676a08 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
@@ -38,7 +37,6 @@
 #endif
 #endif
 #include <gnunet_util_lib.h>
-#include <gnunet_dnsparser_lib.h>
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_namestore_service.h>
 #include <gnunet_gns_service.h>
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 17f02126a..fc8de860d 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -24,10 +24,8 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index c495c63c2..3358692da 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -24,10 +24,8 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet-service-gns.h"
 #include "gnunet-service-gns_resolver.h"
 #include "gnunet-service-gns_interceptor.h"
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 114c64ef7..b6a81b3a1 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
@@ -40,15 +39,12 @@
 #endif
 #endif
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsstub_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_revocation_service.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_gns_service.h"
 #include "gns.h"
 #include "gnunet-service-gns.h"
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 3075c45f5..75e182092 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_group_lib.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index 3fd9e14cd..7c1c9b2e6 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -27,10 +27,8 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gnsrecord_plugin.h"
 #include <inttypes.h>
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index 61d556571..659b77493 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include "gnunet_rest_lib.h"
 #include "gnunet_json_lib.h"
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 3daf11fca..e09db5787 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 /* Just included for the right curl.h */
 #include "gnunet_curl_lib.h"
 #include <microhttpd.h>
diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c
index 55100a95e..c71dc1708 100644
--- a/src/gnsrecord/gnsrecord.c
+++ b/src/gnsrecord/gnsrecord.c
@@ -26,12 +26,10 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_gnsrecord_plugin.h"
-#include "gnunet_tun_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "gnsrecord", __VA_ARGS__)
diff --git a/src/gnsrecord/gnsrecord_crypto.h b/src/gnsrecord/gnsrecord_crypto.h
index 79a7e6fb9..4f2e4a5ca 100644
--- a/src/gnsrecord/gnsrecord_crypto.h
+++ b/src/gnsrecord/gnsrecord_crypto.h
@@ -31,8 +31,6 @@
 #include "gnunet_signatures.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_tun_lib.h"
 /**
 * Information we have in an encrypted block with record data (i.e. in the DHT).
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index c179534c9..fde553a83 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -26,14 +26,11 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_tun_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "gnsrecord", __VA_ARGS__)
diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c
index a32605692..053edfd33 100644
--- a/src/gnsrecord/gnsrecord_serialization.c
+++ b/src/gnsrecord/gnsrecord_serialization.c
@@ -26,15 +26,11 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_signatures.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
-#include "gnunet_tun_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "gnsrecord", __VA_ARGS__)
diff --git a/src/gnsrecord/gnunet-gnsrecord-tvg.c b/src/gnsrecord/gnunet-gnsrecord-tvg.c
index 6f6ee6347..ef111b3bd 100644
--- a/src/gnsrecord/gnunet-gnsrecord-tvg.c
+++ b/src/gnsrecord/gnunet-gnsrecord-tvg.c
@@ -24,15 +24,13 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_testing_lib.h"
-#include <inttypes.h>
 #include "gnsrecord_crypto.h"
+#include <inttypes.h>
 static char *d_pkey =
diff --git a/src/gnsrecord/json_gnsrecord.c b/src/gnsrecord/json_gnsrecord.c
index 9ef681b60..0725cb1a1 100644
--- a/src/gnsrecord/json_gnsrecord.c
+++ b/src/gnsrecord/json_gnsrecord.c
@@ -24,7 +24,6 @@
 * @author Philippe Buschmann
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gnsrecord/perf_gnsrecord_crypto.c b/src/gnsrecord/perf_gnsrecord_crypto.c
index 0cedb8ee0..6b5f84235 100644
--- a/src/gnsrecord/perf_gnsrecord_crypto.c
+++ b/src/gnsrecord/perf_gnsrecord_crypto.c
@@ -22,7 +22,6 @@
 * @brief testcase for block creation, verification and decryption
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c
index 4c7f36594..5844d9eda 100644
--- a/src/gnsrecord/plugin_gnsrecord_dns.c
+++ b/src/gnsrecord/plugin_gnsrecord_dns.c
@@ -24,9 +24,7 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gnsrecord_plugin.h"
diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c b/src/gnsrecord/test_gnsrecord_block_expiration.c
index 6d2ad6d5b..d14ce3914 100644
--- a/src/gnsrecord/test_gnsrecord_block_expiration.c
+++ b/src/gnsrecord/test_gnsrecord_block_expiration.c
@@ -22,7 +22,6 @@
 * @brief testcase for block creation, verification and decryption
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c
index 612db4c99..ad7b62cc8 100644
--- a/src/gnsrecord/test_gnsrecord_crypto.c
+++ b/src/gnsrecord/test_gnsrecord_crypto.c
@@ -22,7 +22,6 @@
 * @brief testcase for block creation, verification and decryption
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c
index e89cc3e1b..d268cb7f3 100644
--- a/src/gnsrecord/test_gnsrecord_serialization.c
+++ b/src/gnsrecord/test_gnsrecord_serialization.c
@@ -22,7 +22,6 @@
 * @brief testcase for gnsrecord_serialization.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/gnsrecord/test_gnsrecord_testvectors.c b/src/gnsrecord/test_gnsrecord_testvectors.c
index f2b90df3b..bb4922417 100644
--- a/src/gnsrecord/test_gnsrecord_testvectors.c
+++ b/src/gnsrecord/test_gnsrecord_testvectors.c
@@ -1,5 +1,4 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_gns_service.h"
diff --git a/src/hello/address.c b/src/hello/address.c
index 1d867c752..6a1b68029 100644
--- a/src/hello/address.c
+++ b/src/hello/address.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c
index f1a5c8222..1f110ac18 100644
--- a/src/hello/gnunet-hello.c
+++ b/src/hello/gnunet-hello.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/hello/hello-ng.c b/src/hello/hello-ng.c
index 3843bebc6..da3a069e0 100644
--- a/src/hello/hello-ng.c
+++ b/src/hello/hello-ng.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/hello/hello-uri.c b/src/hello/hello-uri.c
index b51545b95..dd191738f 100644
--- a/src/hello/hello-uri.c
+++ b/src/hello/hello-uri.c
@@ -35,7 +35,6 @@
 *   the TGZ.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_hello_uri_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/hello/hello.c b/src/hello/hello.c
index 811532f9b..45d27c5d4 100644
--- a/src/hello/hello.c
+++ b/src/hello/hello.c
@@ -25,7 +25,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
diff --git a/src/hello/test_friend_hello.c b/src/hello/test_friend_hello.c
index 35e27905c..1b092c0b8 100644
--- a/src/hello/test_friend_hello.c
+++ b/src/hello/test_friend_hello.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/hello/test_hello-ng.c b/src/hello/test_hello-ng.c
index e38ba0db5..4ace9439f 100644
--- a/src/hello/test_hello-ng.c
+++ b/src/hello/test_hello-ng.c
@@ -18,7 +18,6 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/hello/test_hello-uri.c b/src/hello/test_hello-uri.c
index d66f3c464..7e70d6763 100644
--- a/src/hello/test_hello-uri.c
+++ b/src/hello/test_hello-uri.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_hello_uri_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c
index b8c161b87..8631d2af3 100644
--- a/src/hello/test_hello.c
+++ b/src/hello/test_hello.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index 7ec25202e..54e070f89 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-daemon-hostlist_client.h"
 #include "gnunet_core_service.h"
 #include "gnunet_util_lib.h"
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index 061fde312..399a7dc39 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-daemon-hostlist_client.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index 4e087b76a..46b18b266 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -26,7 +26,6 @@
 * @brief application to provide an integrated hostlist HTTP server
 */
 #include "platform.h"
-#include "platform.h"
 #include <microhttpd.h>
 #include "gnunet-daemon-hostlist_server.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index d3ac238ca..063db2f99 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_transport_service.h"
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 82a8e1655..a0656f770 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index a57801eb1..321f96f3d 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_transport_service.h"
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index ba5d85f4c..06e6fb613 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -26,7 +26,6 @@
 * - add options to get default egos
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index 8c7b1eb37..07296a882 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -31,7 +31,6 @@
 *   initializations (such as gnunet-gns-import.sh?)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 7f040337d..47a78e2bb 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_error_codes.h"
diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c
index ad77e64cb..4cc0b6334 100644
--- a/src/identity/identity_api_lookup.c
+++ b/src/identity/identity_api_lookup.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "identity.h"
diff --git a/src/identity/identity_api_suffix_lookup.c b/src/identity/identity_api_suffix_lookup.c
index db693b79f..4b459345d 100644
--- a/src/identity/identity_api_suffix_lookup.c
+++ b/src/identity/identity_api_suffix_lookup.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "identity.h"
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index e913cb840..093a24c39 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -25,12 +25,11 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_rest_lib.h"
 #include "identity.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "microhttpd.h"
 #include <jansson.h>
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index 4d47eba81..2c44f73ba 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 1df4cde56..359bf95c4 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -33,6 +33,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_BANDWIDTH_LIB_H
 #define GNUNET_BANDWIDTH_LIB_H
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index f1a68022a..e165b9d90 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -33,6 +33,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_BIO_LIB_H
 #define GNUNET_BIO_LIB_H
diff --git a/src/include/gnunet_buffer_lib.h b/src/include/gnunet_buffer_lib.h
index 174d2d010..e65981206 100644
--- a/src/include/gnunet_buffer_lib.h
+++ b/src/include/gnunet_buffer_lib.h
@@ -28,6 +28,10 @@
 * @author Florian Dold
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_BUFFER_LIB_H
 #define GNUNET_BUFFER_LIB_H
diff --git a/src/include/gnunet_child_management_lib.h b/src/include/gnunet_child_management_lib.h
index e7f1271ee..d8f63b60d 100644
--- a/src/include/gnunet_child_management_lib.h
+++ b/src/include/gnunet_child_management_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 0fca362cd..ab4c7d088 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -39,6 +39,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_CLIENT_LIB_H
 #define GNUNET_CLIENT_LIB_H
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index f6fd8e641..55774a209 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -28,11 +28,11 @@
 *
 * @file
 * Container classes for GNUnet
- * 
+ *
 * @addtogroup container
- * Common data structures in GNUnet programs 
+ * Common data structures in GNUnet programs
 * @{
- * 
+ *
 * @defgroup hashmap  MultiHashMap
 * Hash map with multiple values per key.
 *
@@ -50,10 +50,14 @@
 *
 * @defgroup metadata  Metadata
 * GNU libextractor key-value pairs
- * 
+ *
 * @}
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_CONTAINER_LIB_H
 #define GNUNET_CONTAINER_LIB_H
@@ -1265,10 +1269,10 @@ GNUNET_CONTAINER_multipeermap_iterator_create (
 * position.  If there are no elements left, #GNUNET_NO is returned,
 * and @a key and @a value are not modified.
 *
- * This operation is only allowed if no elements have been removed 
+ * This operation is only allowed if no elements have been removed
- * from the multihashmap since the creation of @a iter, and the map 
+ * from the multihashmap since the creation of @a iter, and the map
 * has not been destroyed.
- * 
+ *
 * Adding elements may result in repeating or skipping elements.
 *
 * @param iter the iterator to get the next element from
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 9ee23cf62..3fac945a5 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -44,6 +44,10 @@
 * @see [Documentation](https://gnunet.org/crypto-api)
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_CRYPTO_LIB_H
 #define GNUNET_CRYPTO_LIB_H
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index d982dfe72..b14c5e59d 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -31,6 +31,11 @@
 * Disk IO APIs
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_DISK_LIB_H
 #define GNUNET_DISK_LIB_H
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 06fa7a5a7..8064b554b 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -18,6 +18,11 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * @{
@@ -35,9 +40,6 @@
 #ifndef GNUNET_DNSPARSER_LIB_H
 #define GNUNET_DNSPARSER_LIB_H
-#include "gnunet_util_lib.h"
 /**
 * Maximum length of a label in DNS.
 */
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 8cd4bfa80..fa5151a8c 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * @{
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index cec4b9154..c8e99826a 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -39,7 +39,6 @@
 #include "gnunet_util_lib.h"
-#include "gnunet_bandwidth_lib.h"
 #include "gnunet_statistics_service.h"
 #ifdef __cplusplus
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 49bb0d77b..390e8c153 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -33,6 +33,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_GETOPT_LIB_H
 #define GNUNET_GETOPT_LIB_H
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index e296d0ef9..1fcf7aa8b 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -39,7 +39,6 @@
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index ac7d1602d..2279abb24 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -38,11 +38,14 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_HELPER_LIB_H
 #define GNUNET_HELPER_LIB_H
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_mst_lib.h"
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 961f57eb0..07d22d85c 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -42,9 +42,8 @@ extern "C" {
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 09d2ff0ea..95e8c619b 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -18,6 +18,11 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 052540ff5..3ad98a33b 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -39,6 +39,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_MST_LIB_H
 #define GNUNET_MST_LIB_H
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index dbd2aa12f..8f4d9a16f 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -17,6 +17,12 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index 2c2abf7da..e028fb7fb 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index e4a34021a..4a67878b9 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 89c6b65f8..806de963c 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -41,8 +41,7 @@
 #include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_hello_lib.h"
 #ifdef __cplusplus
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index ea548b196..df555e0cf 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 2aadd1b8e..0c51d6cf7 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index aef42be5f..7c6ce0c0e 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -18,6 +18,11 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
@@ -50,9 +55,8 @@ extern "C"
 #endif
 #endif
+#include "gnunet_util_lib.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_mq_lib.h"
 /**
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index f70f22403..02fbbf005 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 65d643b2d..b751ef044 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup libgnunetutil
 * Multi-function utilities library for GNUnet programs
@@ -37,6 +41,10 @@
 * @{
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 #ifndef GNUNET_STRINGS_LIB_H
 #define GNUNET_STRINGS_LIB_H
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index a48bb3fbe..ab397b049 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -18,6 +18,10 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
 /**
 * @addtogroup vpn_suite  VPN services and libraries
 * @{
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 25df4e234..52fa5c373 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -30,6 +30,8 @@
 #ifndef GNUNET_UTIL_LIB_H
 #define GNUNET_UTIL_LIB_H
+#define __GNUNET_UTIL_LIB_H_INSIDE__
 #include <sys/socket.h>
 #ifdef __cplusplus
@@ -97,4 +99,6 @@ extern "C"
 }
 #endif
+#undef __GNUNET_UTIL_LIB_H_INSIDE__
 #endif
diff --git a/src/json/json.c b/src/json/json.c
index d584ed772..07ec158be 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_json_lib.h"
diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index 452cf7bf1..4fda86e32 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -23,7 +23,6 @@
 * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 933c82cf7..aadc6804d 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_json_lib.h"
diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c
index 1808e6782..0b0fa0538 100644
--- a/src/json/json_mhd.c
+++ b/src/json/json_mhd.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_json_lib.h"
 #include <zlib.h>
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index 2cf83b0d6..8fc806086 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_json_lib.h"
diff --git a/src/json/test_json.c b/src/json/test_json.c
index c6784827a..d6c372cf3 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff <christian@grothoff.org>
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
diff --git a/src/json/test_json_mhd.c b/src/json/test_json_mhd.c
index 54eb88103..642715f25 100644
--- a/src/json/test_json_mhd.c
+++ b/src/json/test_json_mhd.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff <christian@grothoff.org>
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
 #include "gnunet_curl_lib.h"
diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
index 40f3e1d32..9444fa12d 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.c
@@ -26,7 +26,6 @@
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/gnunet-service-messenger.h b/src/messenger/gnunet-service-messenger.h
index 253fbaadb..1db5c651c 100644
--- a/src/messenger/gnunet-service-messenger.h
+++ b/src/messenger/gnunet-service-messenger.h
@@ -28,11 +28,7 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h b/src/messenger/gnunet-service-messenger_ego_store.h
index dbe6c05b9..a5f8a69d8 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.h
+++ b/src/messenger/gnunet-service-messenger_ego_store.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_EGO_STORE_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #include "messenger_api_ego.h"
diff --git a/src/messenger/gnunet-service-messenger_handle.h b/src/messenger/gnunet-service-messenger_handle.h
index c596f4d3b..edcd2ccd0 100644
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ b/src/messenger/gnunet-service-messenger_handle.h
@@ -28,11 +28,8 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet-service-messenger_service.h"
 #include "gnunet-service-messenger_member_session.h"
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h b/src/messenger/gnunet-service-messenger_list_handles.h
index f41807d00..8c066519e 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.h
+++ b/src/messenger/gnunet-service-messenger_list_handles.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
 struct GNUNET_MESSENGER_SrvHandle;
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h b/src/messenger/gnunet-service-messenger_list_messages.h
index e270209c8..5839f63ca 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.h
+++ b/src/messenger/gnunet-service-messenger_list_messages.h
@@ -27,9 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
 struct GNUNET_MESSENGER_ListMessage
 {
diff --git a/src/messenger/gnunet-service-messenger_member_session.h b/src/messenger/gnunet-service-messenger_member_session.h
index fcde2c3de..9b4065d05 100644
--- a/src/messenger/gnunet-service-messenger_member_session.h
+++ b/src/messenger/gnunet-service-messenger_member_session.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_time_lib.h"
diff --git a/src/messenger/gnunet-service-messenger_member_store.h b/src/messenger/gnunet-service-messenger_member_store.h
index c3f6d478a..05b00f39a 100644
--- a/src/messenger/gnunet-service-messenger_member_store.h
+++ b/src/messenger/gnunet-service-messenger_member_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
 #include "gnunet_identity_service.h"
 #include "messenger_api_message.h"
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h b/src/messenger/gnunet-service-messenger_message_handle.h
index 62940e6b6..0a97cd840 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/messenger/gnunet-service-messenger_message_handle.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet-service-messenger_message_kind.h"
diff --git a/src/messenger/gnunet-service-messenger_message_kind.h b/src/messenger/gnunet-service-messenger_message_kind.h
index d07680dfc..102a70e33 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.h
+++ b/src/messenger/gnunet-service-messenger_message_kind.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_time_lib.h"
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h b/src/messenger/gnunet-service-messenger_message_recv.h
index b4304762b..8e5b02504 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.h
+++ b/src/messenger/gnunet-service-messenger_message_recv.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet-service-messenger_message_kind.h"
diff --git a/src/messenger/gnunet-service-messenger_message_send.h b/src/messenger/gnunet-service-messenger_message_send.h
index 8d782c5a6..4f4c6cfc2 100644
--- a/src/messenger/gnunet-service-messenger_message_send.h
+++ b/src/messenger/gnunet-service-messenger_message_send.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet-service-messenger_message_kind.h"
diff --git a/src/messenger/gnunet-service-messenger_message_state.h b/src/messenger/gnunet-service-messenger_message_state.h
index af52b26b6..10e6a2c46 100644
--- a/src/messenger/gnunet-service-messenger_message_state.h
+++ b/src/messenger/gnunet-service-messenger_message_state.h
@@ -27,7 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "messenger_api_message.h"
 #include "gnunet-service-messenger_list_messages.h"
diff --git a/src/messenger/gnunet-service-messenger_message_store.h b/src/messenger/gnunet-service-messenger_message_store.h
index 60efb1380..262d10555 100644
--- a/src/messenger/gnunet-service-messenger_message_store.h
+++ b/src/messenger/gnunet-service-messenger_message_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_disk_lib.h"
 struct GNUNET_MESSENGER_MessageEntry
 {
diff --git a/src/messenger/gnunet-service-messenger_operation.h b/src/messenger/gnunet-service-messenger_operation.h
index 8d09ed1b7..b93282d24 100644
--- a/src/messenger/gnunet-service-messenger_operation.h
+++ b/src/messenger/gnunet-service-messenger_operation.h
@@ -28,9 +28,8 @@
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_scheduler_lib.h"
-#include "gnunet_strings_lib.h"
 #include "gnunet_time_lib.h"
 enum GNUNET_MESSENGER_OperationType
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h b/src/messenger/gnunet-service-messenger_operation_store.h
index db315f251..16531758c 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.h
+++ b/src/messenger/gnunet-service-messenger_operation_store.h
@@ -27,9 +27,7 @@
 #define GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 struct GNUNET_MESSENGER_SrvRoom;
diff --git a/src/messenger/gnunet-service-messenger_room.h b/src/messenger/gnunet-service-messenger_room.h
index 6767d96cb..2e9382595 100644
--- a/src/messenger/gnunet-service-messenger_room.h
+++ b/src/messenger/gnunet-service-messenger_room.h
@@ -28,10 +28,8 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_messenger_service.h"
 #include "gnunet-service-messenger_basement.h"
diff --git a/src/messenger/gnunet-service-messenger_service.h b/src/messenger/gnunet-service-messenger_service.h
index 55e8b6c50..36df81141 100644
--- a/src/messenger/gnunet-service-messenger_service.h
+++ b/src/messenger/gnunet-service-messenger_service.h
@@ -28,9 +28,7 @@
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet-service-messenger_ego_store.h"
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h b/src/messenger/gnunet-service-messenger_tunnel.h
index 13cf924f9..2ffa2d04f 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.h
+++ b/src/messenger/gnunet-service-messenger_tunnel.h
@@ -28,8 +28,7 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_peer_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet-service-messenger_room.h"
 #include "gnunet-service-messenger_message_state.h"
diff --git a/src/messenger/messenger_api_contact.h b/src/messenger/messenger_api_contact.h
index 6619d8fa2..e2919bcc3 100644
--- a/src/messenger/messenger_api_contact.h
+++ b/src/messenger/messenger_api_contact.h
@@ -27,7 +27,7 @@
 #define GNUNET_MESSENGER_API_CONTACT_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 struct GNUNET_MESSENGER_Contact
diff --git a/src/messenger/messenger_api_contact_store.h b/src/messenger/messenger_api_contact_store.h
index 1cdd3197b..c74a67740 100644
--- a/src/messenger/messenger_api_contact_store.h
+++ b/src/messenger/messenger_api_contact_store.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_CONTACT_STORE_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
 struct GNUNET_MESSENGER_Contact;
diff --git a/src/messenger/messenger_api_handle.h b/src/messenger/messenger_api_handle.h
index 8430f40d5..d246855ff 100644
--- a/src/messenger/messenger_api_handle.h
+++ b/src/messenger/messenger_api_handle.h
@@ -28,10 +28,8 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/messenger_api_list_tunnels.h b/src/messenger/messenger_api_list_tunnels.h
index e28935c3e..d2ceeafc2 100644
--- a/src/messenger/messenger_api_list_tunnels.h
+++ b/src/messenger/messenger_api_list_tunnels.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_LIST_TUNNELS_H
 #include "platform.h"
-#include "gnunet_peer_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
 struct GNUNET_MESSENGER_ListTunnel
 {
diff --git a/src/messenger/messenger_api_message.h b/src/messenger/messenger_api_message.h
index 209d80a4e..688c72994 100644
--- a/src/messenger/messenger_api_message.h
+++ b/src/messenger/messenger_api_message.h
@@ -27,9 +27,8 @@
 #define GNUNET_MESSENGER_API_MESSAGE_H
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/messenger_api_room.h b/src/messenger/messenger_api_room.h
index cf8ab782b..d5ffc5c4b 100644
--- a/src/messenger/messenger_api_room.h
+++ b/src/messenger/messenger_api_room.h
@@ -27,8 +27,7 @@
 #define GNUNET_MESSENGER_API_ROOM_H
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/messenger_api_util.h b/src/messenger/messenger_api_util.h
index 0597b94a8..3d68505a8 100644
--- a/src/messenger/messenger_api_util.h
+++ b/src/messenger/messenger_api_util.h
@@ -28,9 +28,7 @@
 #include "platform.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/messenger/plugin_gnsrecord_messenger.c
index eff3f62c4..e09a0330d 100644
--- a/src/messenger/plugin_gnsrecord_messenger.c
+++ b/src/messenger/plugin_gnsrecord_messenger.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/test_messenger.c b/src/messenger/test_messenger.c
index 30fa22db1..8758ce562 100644
--- a/src/messenger/test_messenger.c
+++ b/src/messenger/test_messenger.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/test_messenger_anonymous.c b/src/messenger/test_messenger_anonymous.c
index 15895ae9b..13f2b6f0e 100644
--- a/src/messenger/test_messenger_anonymous.c
+++ b/src/messenger/test_messenger_anonymous.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_messenger_service.h"
diff --git a/src/messenger/testing_messenger_setup.c b/src/messenger/testing_messenger_setup.c
index ee278ea77..65cf12e73 100644
--- a/src/messenger/testing_messenger_setup.c
+++ b/src/messenger/testing_messenger_setup.c
@@ -27,7 +27,6 @@
 #include "testing_messenger_setup.h"
 #include <stdio.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_logger_service.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/my/my.c b/src/my/my.c
index eb91ae3e5..468a4a47c 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <mysql/mysql.h>
 #include "gnunet_my_lib.h"
diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c
index ad3658106..e44caad91 100644
--- a/src/my/my_query_helper.c
+++ b/src/my/my_query_helper.c
@@ -24,7 +24,6 @@
 * @author Christophe Genevey
 */
 #include "platform.h"
-#include "platform.h"
 #include <mysql/mysql.h>
 #include "gnunet_my_lib.h"
diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index dc076d9a0..e500c0b27 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -24,7 +24,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_my_lib.h"
diff --git a/src/my/test_my.c b/src/my/test_my.c
index bba9f6008..ffb5a5f13 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -23,7 +23,6 @@
 * @author Christophe Genevey
 */
 #include "platform.h"
-#include "platform.h"
 #include <mysql/mysql.h>
 #include "gnunet_my_lib.h"
 #include "gnunet_mysql_lib.h"
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index 335e5fed3..4c701905c 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <mysql/mysql.h>
 #include "gnunet_mysql_lib.h"
diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c
index fe417992a..e58d3f960 100644
--- a/src/namecache/gnunet-namecache.c
+++ b/src/namecache/gnunet-namecache.c
@@ -26,9 +26,7 @@
 * - test
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_namecache_service.h"
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index aa9aa5ced..dce843801 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -25,9 +25,7 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_namecache_plugin.h"
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 7a8d30b17..fb4b0e304 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -27,11 +27,8 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_namecache_service.h"
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c
index b68e40cbb..eb7800051 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/namecache/plugin_namecache_flat.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c
index 06c4c6bbd..cdbe248b6 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/namecache/plugin_namecache_postgres.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c
index eb1fb8f3b..2271d1db5 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c
index 002c82c36..2e8940ba3 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/namecache/test_namecache_api_cache_block.c
@@ -22,7 +22,6 @@
 * @brief testcase for namecache_api.c: store a record and perform a lookup
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namecache/test_plugin_namecache.c b/src/namecache/test_plugin_namecache.c
index 6d51cd6de..242b3503b 100644
--- a/src/namecache/test_plugin_namecache.c
+++ b/src/namecache/test_plugin_namecache.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/namestore/gnunet-namestore-dbtool.c b/src/namestore/gnunet-namestore-dbtool.c
index 7526510e0..835d7a228 100644
--- a/src/namestore/gnunet-namestore-dbtool.c
+++ b/src/namestore/gnunet-namestore-dbtool.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_namestore_plugin.h>
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 619c056d6..857b16def 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include <microhttpd.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/namestore/gnunet-namestore-zonefile.c b/src/namestore/gnunet-namestore-zonefile.c
index df436652d..d9331aa32 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_namestore_plugin.h>
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 50c69810f..7288db902 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -26,9 +26,7 @@
 * - test
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
-#include <gnunet_dnsparser_lib.h>
 #include <gnunet_identity_service.h>
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_gns_service.h>
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index b86d12712..d25287c9f 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -25,9 +25,7 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_namestore_plugin.h"
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index fead9587d..485df4924 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -23,10 +23,7 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <gnunet_util_lib.h>
-#include <gnunet_dnsstub_lib.h>
-#include <gnunet_dnsparser_lib.h>
 #include <gnunet_gnsrecord_lib.h>
 #include <gnunet_namestore_service.h>
 #include <gnunet_statistics_service.h>
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index ae1bd2ca2..df6ba1f33 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -27,12 +27,9 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_error_codes.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_signatures.h"
 #include "gnunet_gns_service.h"
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 52d2dda37..a99b386d0 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -24,11 +24,8 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_signatures.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/namestore/perf_namestore_api_import.c b/src/namestore/perf_namestore_api_import.c
index 2f6a13148..4452de16c 100644
--- a/src/namestore/perf_namestore_api_import.c
+++ b/src/namestore/perf_namestore_api_import.c
@@ -23,7 +23,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c
index 079d72136..33868784f 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c
index eb88c03ac..3249d524a 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/namestore/plugin_namestore_flat.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 8f4d1052c..de819f196 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index ae60a0211..15a6586b5 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index db6a482be..1f2f58097 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_error_codes.h"
 #include "gnunet_rest_plugin.h"
 #include "gnunet_gns_service.h"
diff --git a/src/namestore/test_namestore_api_edit_records.c b/src/namestore/test_namestore_api_edit_records.c
index d45c845c5..ee05f498a 100644
--- a/src/namestore/test_namestore_api_edit_records.c
+++ b/src/namestore/test_namestore_api_edit_records.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api.c: Multiple clients work with record set.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c
index f76eade19..85a7a4025 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api.c: NICK records
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index 48e7d1df9..018cf89b1 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone monitoring functionality: monitor first, then add records
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index c0a3082b7..0123613fb 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone monitoring functionality: add records first, then monitor
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 703ac21b4..c6a4549d4 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api.c to: remove record
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 5923e23c3..ea95a6b57 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index 734057fff..f4f1e36d3 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api.c: store a record
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 4a66ad073..8f1f33542 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namestore/test_namestore_api_tx_rollback.c b/src/namestore/test_namestore_api_tx_rollback.c
index 0042b83be..3d0884e24 100644
--- a/src/namestore/test_namestore_api_tx_rollback.c
+++ b/src/namestore/test_namestore_api_tx_rollback.c
@@ -22,7 +22,6 @@
 * @brief testcase for namestore_api_tx_rollback.c to: rollback changes in TX
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 720445a48..6e07f78f2 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone iteration functionality: iterate all zones
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 349bacbae..941d43c28 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone iteration functionality: iterate all zones
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index ccf185a1f..daf711c3d 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -23,7 +23,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index d97686ea3..c51224d91 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone iteration functionality: stop iterating of zones
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 20eea8976..c9d781d39 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -22,7 +22,6 @@
 * @brief testcase for zone to name translation
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index 40df7163a..24af148bf 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c
index acebf8eb1..055a949bd 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -25,7 +25,6 @@
 * @author Bruno Cabral
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_nat_auto_service.h"
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c
index fec295535..4334cc953 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-nat-auto_legacy.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_lib.h"
 #include "nat.h"
diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c
index 6dcb4fac4..0ff71ca8c 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/nat-auto/gnunet-nat-server.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/nat-auto/gnunet-service-nat-auto.c
index f85736eac..7d7c732a0 100644
--- a/src/nat-auto/gnunet-service-nat-auto.c
+++ b/src/nat-auto/gnunet-service-nat-auto.c
@@ -31,7 +31,6 @@
 *   + test manually punched NAT (how?)
 */
 #include "platform.h"
-#include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c
index 924e1d1be..de7910588 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c
@@ -25,7 +25,6 @@
 * @author Bruno Cabral
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_nat_lib.h"
diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c
index de4789d50..3c982f883 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/nat-auto/nat_auto_api.c
@@ -26,7 +26,6 @@
 * Routines for NAT auto configuration.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_nat_auto_service.h"
 #include "nat-auto.h"
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c
index d6b00bd45..9067aafda 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/nat-auto/nat_auto_api_test.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_nat_auto_service.h"
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index c99a12f5e..fd85549d6 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -25,7 +25,6 @@
 * @author Bruno Cabral
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index 378764b16..dde269819 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -35,7 +35,6 @@
 *   basically, open port & try different methods.
 */
 #include "platform.h"
-#include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/nat/gnunet-service-nat_externalip.c
index c950e419b..c2625be2d 100644
--- a/src/nat/gnunet-service-nat_externalip.c
+++ b/src/nat/gnunet-service-nat_externalip.c
@@ -34,7 +34,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c
index 2feedcf98..d92f5a99c 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-nat_helper.h"
diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c
index 702019f67..1e13e3814 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet-service-nat_mini.h"
diff --git a/src/nat/gnunet-service-nat_stun.c b/src/nat/gnunet-service-nat_stun.c
index cb72a2833..203728ebf 100644
--- a/src/nat/gnunet-service-nat_stun.c
+++ b/src/nat/gnunet-service-nat_stun.c
@@ -37,7 +37,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "nat_stun.h"
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index b617f0da0..3072cff7f 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -27,7 +27,6 @@
 * and external IP address retrieval
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_nat_service.h"
 #include "nat.h"
 #include "nat_stun.h"
diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c
index f268a959a..94adc3d6c 100644
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -36,7 +36,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_nat_service.h"
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 4d9770f3c..a3072f712 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -34,7 +34,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 71295bb0a..528815e1a 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -29,7 +29,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index af07ed1f1..2abab4d5f 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_lib.h"
diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index 9ba110c9e..75eb877b3 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -29,7 +29,6 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index bcf86caa9..4b256bc52 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -30,7 +30,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_nse_service.h"
diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c
index 2776ee3d5..edb73c0fc 100644
--- a/src/nse/gnunet-nse.c
+++ b/src/nse/gnunet-nse.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_nse_service.h"
 /**
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 65db2c2d2..ee1cb025f 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -36,7 +36,6 @@
 * this can calculate the expected number of peers in the network.
 */
 #include "platform.h"
-#include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index 3ea8db922..23daa7f12 100644
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -24,7 +24,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c
index 86a9967bd..10207675f 100644
--- a/src/nse/perf_kdf.c
+++ b/src/nse/perf_kdf.c
@@ -24,7 +24,6 @@
 * @brief measure performance of KDF hash function
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 #include <gauger.h>
diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c
index f7bf363f7..f1b7c652b 100644
--- a/src/nse/test_nse_api.c
+++ b/src/nse/test_nse_api.c
@@ -22,7 +22,6 @@
 * @brief testcase for nse_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nse_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 98012e197..6ee03b3fa 100644
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -25,7 +25,6 @@
 *        for one message from each peer.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_nse_service.h"
diff --git a/src/nt/nt.c b/src/nt/nt.c
index 862748973..8dfacb02b 100644
--- a/src/nt/nt.c
+++ b/src/nt/nt.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index bff9b8501..8b149c98e 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -25,7 +25,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_transport_service.h"
diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.c b/src/peerinfo-tool/gnunet-peerinfo_plugins.c
index ce65bb929..e196ec58a 100644
--- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c
+++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-peerinfo_plugins.h"
 #include "gnunet_transport_plugin.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 4ff8b5d35..13e2e863b 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include "gnunet_peerinfo_service.h"
 #include "gnunet_transport_service.h"
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 4820bebc7..1b1232ecb 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -29,7 +29,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h
index 7db923d4d..9968733f0 100644
--- a/src/peerinfo/peerinfo.h
+++ b/src/peerinfo/peerinfo.h
@@ -27,10 +27,9 @@
 #ifndef PEERINFO_H
 #define PEERINFO_H
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_time_lib.h"
 #include "gnunet_peerinfo_service.h"
+#include "gnunet_time_lib.h"
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 89091e683..65e429bef 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "peerinfo.h"
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index bfc4b2e37..5f4c123ff 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerinfo_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
index 7ee6f24cb..055388d43 100644
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index 8edfd0af4..27df6e37b 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -27,7 +27,6 @@
 * - test merging of HELLOs (add same peer twice...)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/peerinfo/test_peerinfo_api_friend_only.c b/src/peerinfo/test_peerinfo_api_friend_only.c
index 4224cb4a7..a5414e701 100644
--- a/src/peerinfo/test_peerinfo_api_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_friend_only.c
@@ -28,7 +28,6 @@
 * - test merging of HELLOs (add same peer twice...)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index 80c345c93..6d5793dcf 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -28,7 +28,6 @@
 * - test merging of HELLOs (add same peer twice...)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c
index c12c07218..45ea73be6 100644
--- a/src/peerinfo/test_peerinfo_shipped_hellos.c
+++ b/src/peerinfo/test_peerinfo_shipped_hellos.c
@@ -26,7 +26,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c
index b92ecf85b..11313b5d3 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -24,7 +24,6 @@
 * @author Omar Tarabai
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index 44cc0dd81..959d088f9 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -24,7 +24,6 @@
 * @author Omar Tarabai
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "peerstore.h"
 #include "gnunet_peerstore_plugin.h"
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 6070fc1a1..b3e793d93 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "peerstore.h"
 #include "peerstore_common.h"
diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c
index 0d7e5a800..24c7e4f01 100644
--- a/src/peerstore/perf_peerstore_store.c
+++ b/src/peerstore/perf_peerstore_store.c
@@ -22,7 +22,6 @@
 * @brief performance test for peerstore store operation
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c
index 36ea5ef90..cc5b8b76b 100644
--- a/src/peerstore/plugin_peerstore_flat.c
+++ b/src/peerstore/plugin_peerstore_flat.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_peerstore_plugin.h"
 #include "gnunet_peerstore_service.h"
 #include "peerstore.h"
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index bed8e2f6f..ad69efdf4 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_peerstore_plugin.h"
 #include "gnunet_peerstore_service.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c
index cc6c22a6e..b6cd51906 100644
--- a/src/peerstore/test_peerstore_api_iterate.c
+++ b/src/peerstore/test_peerstore_api_iterate.c
@@ -22,7 +22,6 @@
 * @brief testcase for peerstore iteration operation
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c
index b04149f85..77e8a17c1 100644
--- a/src/peerstore/test_peerstore_api_store.c
+++ b/src/peerstore/test_peerstore_api_store.c
@@ -22,7 +22,6 @@
 * @brief testcase for peerstore store operation
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_peerstore_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c
index 1d1865326..5057c98b5 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff (minor fix, comments)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c
index 0248786d6..126b321df 100644
--- a/src/peerstore/test_peerstore_api_watch.c
+++ b/src/peerstore/test_peerstore_api_watch.c
@@ -22,7 +22,6 @@
 * @brief testcase for peerstore watch functionality
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/peerstore/test_plugin_peerstore.c b/src/peerstore/test_plugin_peerstore.c
index 7292c9acd..a4221ea63 100644
--- a/src/peerstore/test_plugin_peerstore.c
+++ b/src/peerstore/test_plugin_peerstore.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_peerstore_plugin.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/pq/pq.c b/src/pq/pq.c
index 026fa687a..c8deb8193 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 6c5650993..e8617a5c9 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
 #include <pthread.h>
diff --git a/src/pq/pq_eval.c b/src/pq/pq_eval.c
index c449db999..cc16c7864 100644
--- a/src/pq/pq_eval.c
+++ b/src/pq/pq_eval.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
diff --git a/src/pq/pq_event.c b/src/pq/pq_event.c
index 3bd275530..b0ed6798a 100644
--- a/src/pq/pq_event.c
+++ b/src/pq/pq_event.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
 #include <pthread.h>
diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c
index c0a8fdd01..33fe8733d 100644
--- a/src/pq/pq_exec.c
+++ b/src/pq/pq_exec.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c
index 9293749b6..b4292dea3 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 422e4244e..ce8ce8f87 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_pq_lib.h"
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 6fe635d72..f945c5d2e 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_pq_lib.h"
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index ba652def0..ff453b210 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff <christian@grothoff.org>
 */
 #include "platform.h"
-#include "platform.h"
 #include "pq.h"
 /**
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index a4df3ada7..13c5d62fd 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -23,12 +23,9 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_cadet_service.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_vpn_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 9f2d5bff6..b2797bc83 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -37,7 +37,6 @@
 * you should get a warning that gnunet-dns2gns failed to 'bind'.
 */
 #include "platform.h"
-#include "platform.h"
 /* Just included for the right curl.h */
 #include "gnunet_curl_lib.h"
 #include <microhttpd.h>
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index 92b16cebb..9552b12a9 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 /* Just included for the right curl.h */
 #include "gnunet_curl_lib.h"
 #include <microhttpd.h>
diff --git a/src/reclaim/did_helper.c b/src/reclaim/did_helper.c
index 14954e767..1c04ede33 100644
--- a/src/reclaim/did_helper.c
+++ b/src/reclaim/did_helper.c
@@ -24,7 +24,6 @@
 * @author Tristan Schwieren
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
diff --git a/src/reclaim/did_misc.c b/src/reclaim/did_misc.c
index 71220f5aa..44b72a69f 100644
--- a/src/reclaim/did_misc.c
+++ b/src/reclaim/did_misc.c
@@ -25,7 +25,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "jansson.h"
diff --git a/src/reclaim/gnunet-did.c b/src/reclaim/gnunet-did.c
index 19c9eed90..1f91e0ee2 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/reclaim/gnunet-did.c
@@ -34,7 +34,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_identity_service.h"
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index 3234fc735..da5f90409 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include <inttypes.h>
 #include "gnunet_util_lib.h"
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index e6c2b2659..8b468fc8e 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-reclaim_tickets.h"
 #include "gnunet_constants.h"
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c
index e91310296..b1ca7a4a5 100644
--- a/src/reclaim/json_reclaim.c
+++ b/src/reclaim/json_reclaim.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_json_lib.h"
 #include "gnunet_reclaim_lib.h"
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index 957421ee7..90c33375f 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -25,7 +25,6 @@
 * @author Tristan Schwieren
 */
 #include "platform.h"
-#include "platform.h"
 #include <inttypes.h>
 #include <jansson.h>
 #include <jose/jose.h>
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c
index b09389886..ce6fe483d 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/reclaim/plugin_gnsrecord_reclaim.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c b/src/reclaim/plugin_reclaim_attribute_basic.c
index 7ad46abb7..66f59998a 100644
--- a/src/reclaim/plugin_reclaim_attribute_basic.c
+++ b/src/reclaim/plugin_reclaim_attribute_basic.c
@@ -27,7 +27,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
 #include <inttypes.h>
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c
index cc0c252ac..3eb4bfebf 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/reclaim/plugin_reclaim_credential_jwt.c
@@ -26,7 +26,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
 #include <inttypes.h>
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c b/src/reclaim/plugin_reclaim_credential_pabc.c
index 78e7f971c..a906805fb 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/reclaim/plugin_reclaim_credential_pabc.c
@@ -26,7 +26,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
 #include <inttypes.h>
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index 49ba71751..ff882aca1 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -26,13 +26,11 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include <inttypes.h>
 #include <jansson.h>
 #include <jose/jose.h>
-#include "gnunet_buffer_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/reclaim/plugin_rest_pabc.c
index e632a4efe..4b7d21df3 100644
--- a/src/reclaim/plugin_rest_pabc.c
+++ b/src/reclaim/plugin_rest_pabc.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "microhttpd.h"
 #include <inttypes.h>
 #include <jansson.h>
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index e0a00ff4a..9cc41bf1a 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -25,7 +25,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "microhttpd.h"
 #include <inttypes.h>
 #include <jansson.h>
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index 5dfe15b88..fedee3fff 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -24,10 +24,8 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_reclaim_lib.h"
 #include "gnunet_reclaim_service.h"
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
index 24e46b91c..b235ed945 100644
--- a/src/reclaim/reclaim_attribute.c
+++ b/src/reclaim/reclaim_attribute.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
 #include "reclaim_attribute.h"
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
index d215f0d0d..1aad261a1 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -24,7 +24,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_plugin.h"
 #include "reclaim_credential.h"
diff --git a/src/reclaim/test_did_helper.c b/src/reclaim/test_did_helper.c
index ac8b1c186..446c199fc 100644
--- a/src/reclaim/test_did_helper.c
+++ b/src/reclaim/test_did_helper.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
diff --git a/src/reclaim/test_reclaim_attribute.c b/src/reclaim/test_reclaim_attribute.c
index 03b4b2d0f..f8faf8021 100644
--- a/src/reclaim/test_reclaim_attribute.c
+++ b/src/reclaim/test_reclaim_attribute.c
@@ -1,5 +1,4 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_reclaim_lib.h"
 #include "gnunet_container_lib.h"
diff --git a/src/reclaim/test_w3c_ed25519_2020.c b/src/reclaim/test_w3c_ed25519_2020.c
index 1355aca60..e2534e6ab 100644
--- a/src/reclaim/test_w3c_ed25519_2020.c
+++ b/src/reclaim/test_w3c_ed25519_2020.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_strings_lib.h"
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c
index d3303b255..70301338f 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -28,7 +28,6 @@
 * @author Bartlomiej Polot
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 92ba5dcd3..8238ad3df 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -25,7 +25,6 @@
 * @author Maximilian Szengel
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
 #include "regex_internal_lib.h"
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index fed0c786b..ab6d65d58 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -29,7 +29,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "regex_internal_lib.h"
 #include "gnunet_mysql_lib.h"
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
index 75ad76a2e..c25ef9eda 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "regex_internal_lib.h"
 #include "regex_ipc.h"
diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index ae84fb19e..fbddc58eb 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -26,7 +26,6 @@
 #include "platform.h"
 #include <regex.h>
 #include <time.h>
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 911909e0c..5f23a32df 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -24,7 +24,6 @@
 * @author Bartlomiej Polot
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
 #include "block_regex.h"
diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c
index 1451b42d0..12f173476 100644
--- a/src/regex/regex_api_announce.c
+++ b/src/regex/regex_api_announce.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_regex_service.h"
diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c
index b48b8b7ba..71219cbdd 100644
--- a/src/regex/regex_api_search.c
+++ b/src/regex/regex_api_search.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_regex_service.h"
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index 548d29eea..048d6d743 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -24,7 +24,6 @@
 *        regex in the DHT
 */
 #include "platform.h"
-#include "platform.h"
 #include "regex_block_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index b02e5501d..c4fab6b56 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -24,7 +24,6 @@
 * @author Maximilian Szengel
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_regex_service.h"
 #include "regex_internal_lib.h"
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 2f99e1047..bda979edb 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -24,7 +24,6 @@
 * @author Bartlomiej Polot
 */
 #include "platform.h"
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_block_lib.h"
 #include "gnunet_dht_service.h"
diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c
index 67a11e863..c8efae772 100644
--- a/src/regex/regex_test_graph.c
+++ b/src/regex/regex_test_graph.c
@@ -23,7 +23,6 @@
 * @author Maximilian Szengel
 */
 #include "platform.h"
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index fb31ab428..2fece6bff 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c
index 94ed3997f..56508b3b4 100644
--- a/src/regex/regex_test_random.c
+++ b/src/regex/regex_test_random.c
@@ -23,9 +23,8 @@
 * @author Maximilian Szengel
 */
 #include "platform.h"
-#include "platform.h"
 #include "regex_test_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c
index 9bacebf3f..9761e80f9 100644
--- a/src/regex/test_regex_api.c
+++ b/src/regex/test_regex_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_regex_service.h"
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 059eb6b0b..475bfb7c8 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -25,7 +25,6 @@
 #include "platform.h"
 #include <regex.h>
 #include <time.h>
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 7b1dfe550..5c12ea229 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -25,7 +25,6 @@
 #include "platform.h"
 #include <regex.h>
 #include <time.h>
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c
index 6d2221ef3..2e6874e4d 100644
--- a/src/regex/test_regex_integration.c
+++ b/src/regex/test_regex_integration.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_tun_lib.h"
diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c
index ec5113413..4fb4f7817 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/regex/test_regex_iterate_api.c
@@ -25,7 +25,6 @@
 #include "platform.h"
 #include <regex.h>
 #include <time.h>
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_block_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index 0d17ef210..289b1183b 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -23,7 +23,6 @@
 * @author Maximilian Szengel
 */
 #include "platform.h"
-#include "platform.h"
 #include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 #include "regex_internal.h"
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index d8d8b85ad..1ea4471d1 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -24,7 +24,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include <microhttpd.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_rest_plugin.h"
diff --git a/src/rest/plugin_rest_config.c b/src/rest/plugin_rest_config.c
index a015dc00e..826188702 100644
--- a/src/rest/plugin_rest_config.c
+++ b/src/rest/plugin_rest_config.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include <gnunet_rest_lib.h>
 #include <gnunet_util_lib.h>
diff --git a/src/rest/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
index 50c2219a8..52783a81a 100644
--- a/src/rest/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include <gnunet_rest_lib.h>
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 59dca479c..757c0b979 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -25,7 +25,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_rest_lib.h"
 #include "microhttpd.h"
diff --git a/src/revocation/gnunet-revocation-tvg.c b/src/revocation/gnunet-revocation-tvg.c
index 2fb904daa..e1c9aa044 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/revocation/gnunet-revocation-tvg.c
@@ -24,11 +24,9 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_revocation_service.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_testing_lib.h"
 #include "revocation.h"
 #include <inttypes.h>
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c
index 032068db1..853ca0f71 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_revocation_service.h"
 #include "gnunet_identity_service.h"
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c
index 57883afe9..e10771557 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -36,7 +36,6 @@
 *                 to make it rare to traverse each link twice (NSE-style)
 */
 #include "platform.h"
-#include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c
index 5cfc721c6..7de4fafe9 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 0b1664a4b..a0813ddcd 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_revocation_service.h"
 #include "gnunet_signatures.h"
 #include "gnunet_protocols.h"
diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c
index 40da67aa5..e6dd1a0db 100644
--- a/src/revocation/test_revocation.c
+++ b/src/revocation/test_revocation.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_core_service.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_revocation_service.h"
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index aa6c14056..df10ad5da 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -25,7 +25,6 @@
 *        for one message from each peer.
 */
 #include "platform.h"
-#include "platform.h"
 // #include "rps_test_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c
index 1c6fc6185..f90fc0d88 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_rps_service.h"
 #include <inttypes.h>
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 58f9e2e5f..be9324af9 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c
index 7bad7a93f..b1e73be17 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-rps_custommap.h"
 #include <inttypes.h>
diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c
index 4f98d8c4c..598cc887e 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/rps/gnunet-service-rps_sampler.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "rps.h"
diff --git a/src/rps/gnunet-service-rps_sampler_elem.c b/src/rps/gnunet-service-rps_sampler_elem.c
index 9f0389a13..a6dc755a3 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.c
+++ b/src/rps/gnunet-service-rps_sampler_elem.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-rps_sampler_elem.h"
diff --git a/src/rps/gnunet-service-rps_view.c b/src/rps/gnunet-service-rps_view.c
index d5452705f..d58b995a3 100644
--- a/src/rps/gnunet-service-rps_view.c
+++ b/src/rps/gnunet-service-rps_view.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-rps_view.h"
 #include <inttypes.h>
diff --git a/src/rps/rps-sampler_client.c b/src/rps/rps-sampler_client.c
index c1ab3838c..f6e98ce29 100644
--- a/src/rps/rps-sampler_client.c
+++ b/src/rps/rps-sampler_client.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "rps.h"
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c
index 3bc2342b8..e3fb79501 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index c8acf5fed..8fd82f7b3 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "rps-test_util.h"
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index f7237924f..c4166745a 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -24,7 +24,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "rps.h"
 #include "gnunet_rps_service.h"
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index a90cfc436..ab132ec8a 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -25,7 +25,6 @@
 *        for one message from each peer.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/rps/test_rps_api.c b/src/rps/test_rps_api.c
index 014a6ab7c..06dad2887 100644
--- a/src/rps/test_rps_api.c
+++ b/src/rps/test_rps_api.c
@@ -22,7 +22,6 @@
 * @brief testcase for rps_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_rps_service.h"
diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index 2dcb123bc..5ebab5baf 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -28,7 +28,6 @@
 #include <gcrypt.h>
 #include <inttypes.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_scalarproduct_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index 60982494f..c43a7e854 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <limits.h>
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index b749826e2..1945f1937 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <limits.h>
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index aa3859d69..59c3c6f6c 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <limits.h>
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
index 66caa32d2..15ad3038e 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <limits.h>
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 2b6a91313..8c667a72e 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_scalarproduct_service.h"
diff --git a/src/scalarproduct/test_ecc_scalarproduct.c b/src/scalarproduct/test_ecc_scalarproduct.c
index 34b0a9c5d..85460cb05 100644
--- a/src/scalarproduct/test_ecc_scalarproduct.c
+++ b/src/scalarproduct/test_ecc_scalarproduct.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c
index c6ab241e8..76bba0bc9 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/src/secretsharing/gnunet-secretsharing-profiler.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_secretsharing_service.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
index d45cc6e4a..84338bd11 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_signatures.h"
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c
index 93dfd13b3..595af751f 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/secretsharing/secretsharing_api.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_secretsharing_service.h"
 #include "secretsharing.h"
diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c
index 5dc1f4d61..227af1c3e 100644
--- a/src/secretsharing/test_secretsharing_api.c
+++ b/src/secretsharing/test_secretsharing_api.c
@@ -23,7 +23,6 @@
 * @brief testcase for the secretsharing api
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_secretsharing_service.h"
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 59287fe25..51a8d0dbc 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-set.h"
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 68ba88a1e..3a2bc8bd7 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-set.h"
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
index 20261e7b1..6de9fb5eb 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "ibf.h"
 #include "gnunet-service-set_union_strata_estimator.h"
diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c
index eb789b383..944b63d30 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "ibf.h"
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index f6e04dfe7..3014861a6 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_set_service.h"
diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c
index 137b040b9..cb5cef5ad 100644
--- a/src/set/plugin_block_set_test.c
+++ b/src/set/plugin_block_set_test.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 22c99f278..4f73ff06c 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_set_service.h"
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index 067c57531..d1afdd354 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_set_service.h"
diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c
index 035e5b5a5..42dedb846 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_set_service.h"
diff --git a/src/set/test_set_union_copy.c b/src/set/test_set_union_copy.c
index 3825f817d..908527017 100644
--- a/src/set/test_set_union_copy.c
+++ b/src/set/test_set_union_copy.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c
index 3344fa2f4..b6c7a82f6 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/set/test_set_union_result_symmetric.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_set_service.h"
diff --git a/src/seti/gnunet-seti-profiler.c b/src/seti/gnunet-seti-profiler.c
index dfead3a90..b8230bcfc 100644
--- a/src/seti/gnunet-seti-profiler.c
+++ b/src/seti/gnunet-seti-profiler.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_seti_service.h"
diff --git a/src/seti/plugin_block_seti_test.c b/src/seti/plugin_block_seti_test.c
index 60695ef42..5b9196cef 100644
--- a/src/seti/plugin_block_seti_test.c
+++ b/src/seti/plugin_block_seti_test.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/seti/seti_api.c b/src/seti/seti_api.c
index ec08af2c7..6522236c6 100644
--- a/src/seti/seti_api.c
+++ b/src/seti/seti_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_seti_service.h"
diff --git a/src/seti/test_seti_api.c b/src/seti/test_seti_api.c
index a61768534..9074fab41 100644
--- a/src/seti/test_seti_api.c
+++ b/src/seti/test_seti_api.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_seti_service.h"
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index ebe781a20..339d347f8 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -25,7 +25,6 @@
 * @author Elias Summermatter
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "ibf.h"
diff --git a/src/setu/gnunet-service-setu_strata_estimator.c b/src/setu/gnunet-service-setu_strata_estimator.c
index 7a449d8b3..7981cc847 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/setu/gnunet-service-setu_strata_estimator.c
@@ -25,7 +25,6 @@
 * @author Elias Summermatter
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "ibf.h"
 #include "gnunet-service-setu_strata_estimator.h"
diff --git a/src/setu/gnunet-setu-ibf-profiler.c b/src/setu/gnunet-setu-ibf-profiler.c
index eb789b383..944b63d30 100644
--- a/src/setu/gnunet-setu-ibf-profiler.c
+++ b/src/setu/gnunet-setu-ibf-profiler.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "ibf.h"
diff --git a/src/setu/gnunet-setu-profiler.c b/src/setu/gnunet-setu-profiler.c
index f162bece3..8d6a2dc8c 100644
--- a/src/setu/gnunet-setu-profiler.c
+++ b/src/setu/gnunet-setu-profiler.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_setu_service.h"
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 3beed821e..7f4d64f74 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -25,7 +25,6 @@
 * @author Elias Summermatter
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_setu_service.h"
diff --git a/src/setu/plugin_block_setu_test.c b/src/setu/plugin_block_setu_test.c
index 4829f7296..178ad3314 100644
--- a/src/setu/plugin_block_setu_test.c
+++ b/src/setu/plugin_block_setu_test.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
diff --git a/src/setu/setu_api.c b/src/setu/setu_api.c
index e528555aa..7fa144590 100644
--- a/src/setu/setu_api.c
+++ b/src/setu/setu_api.c
@@ -25,7 +25,6 @@
 *  @author Elias Summermatter
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_setu_service.h"
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c
index e9ab611a8..5a0c9d70d 100644
--- a/src/setu/test_setu_api.c
+++ b/src/setu/test_setu_api.c
@@ -24,7 +24,6 @@
 * @author Florian Dold
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_setu_service.h"
diff --git a/src/sq/sq.c b/src/sq/sq.c
index c53cbe98b..777fb6311 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/sq/sq_exec.c b/src/sq/sq_exec.c
index 7d0b026e4..8c47c22b4 100644
--- a/src/sq/sq_exec.c
+++ b/src/sq/sq_exec.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c
index cb1d1d632..b3825ee71 100644
--- a/src/sq/sq_prepare.c
+++ b/src/sq/sq_prepare.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index 207c6b837..ead1b5bdd 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c
index ae4c3bcb0..5ea3f1e56 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c
index 80a5b9b7e..ecd9918d7 100644
--- a/src/sq/test_sq.c
+++ b/src/sq/test_sq.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_sq_lib.h"
diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c
index 42f13c9c8..a6c897a79 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -24,15 +24,9 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_bio_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_getopt_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_service_lib.h"
 #include "gnunet_statistics_service.h"
-#include "gnunet_strings_lib.h"
 #include "gnunet_time_lib.h"
 #include "statistics.h"
diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index b1ad78c86..5894ef68c 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -25,7 +25,6 @@
 * @author Igor Wronsky
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "statistics.h"
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 2ac5880c7..88f127da8 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c
index d39de3e79..c9e568870 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c
index 03d76e446..ad273287d 100644
--- a/src/statistics/test_statistics_api_loop.c
+++ b/src/statistics/test_statistics_api_loop.c
@@ -22,7 +22,6 @@
 * @brief testcase for statistics_api.c
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c
index 96fb2bafd..2d9d08305 100644
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c
index d0d074a3b..cb2694f8f 100644
--- a/src/statistics/test_statistics_api_watch_zero_value.c
+++ b/src/statistics/test_statistics_api_watch_zero_value.c
@@ -22,7 +22,6 @@
 * @brief testcase for statistics_api.c watch functions with initial 0 value
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c
index 6f7236a39..e04d2f61d 100644
--- a/src/template/gnunet-service-template.c
+++ b/src/template/gnunet-service-template.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c
index 5890db63a..5e250bbdf 100644
--- a/src/template/gnunet-template.c
+++ b/src/template/gnunet-template.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /* #include "gnunet_template_service.h" */
diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c
index 4f7583b6b..196edec2d 100644
--- a/src/template/test_template_api.c
+++ b/src/template/test_template_api.c
@@ -22,7 +22,6 @@
 * @brief testcase for template.c
 */
 #include "platform.h"
-#include "platform.h"
 static int
 check ()
diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c
index b4f005b08..bc2f0abe0 100644
--- a/src/testbed-logger/gnunet-service-testbed-logger.c
+++ b/src/testbed-logger/gnunet-service-testbed-logger.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /**
diff --git a/src/testbed-logger/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c
index 3d5c1ff84..284fb5609 100644
--- a/src/testbed-logger/test_testbed_logger_api.c
+++ b/src/testbed-logger/test_testbed_logger_api.c
@@ -23,7 +23,6 @@
 * @author Sree Harsha Totakura
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testbed_logger_service.h"
diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c
index 9a88c0c5b..d67bdba8b 100644
--- a/src/testbed-logger/testbed_logger_api.c
+++ b/src/testbed-logger/testbed_logger_api.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_logger_service.h"
diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c
index f498b4fcb..b7bd8fce9 100644
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api_topology.h"
diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c
index 6c28db763..cbc9cfdbf 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 #include <sqlite3.h>
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c
index 8184233e7..c82f8075f 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c
index bc656fd57..c3b424c9b 100644
--- a/src/testbed/gnunet-daemon-testbed-underlay.c
+++ b/src/testbed/gnunet-daemon-testbed-underlay.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_transport_manipulation_service.h"
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index baef0bb01..938e50448 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -39,7 +39,6 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c
index 2290bb637..e10a28902 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "test_testbed_api_barriers.h"
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 73252b077..5b9528ba3 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -29,7 +29,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet-service-testbed_meminfo.h"
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c
index 6826143c8..1646b8d19 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -19,7 +19,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /*
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 60f7a02d2..49d975119 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api_hosts.h"
diff --git a/src/testbed/gnunet_mpi_test.c b/src/testbed/gnunet_mpi_test.c
index 30d470141..2ee707fe6 100644
--- a/src/testbed/gnunet_mpi_test.c
+++ b/src/testbed/gnunet_mpi_test.c
@@ -1,5 +1,4 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <mpi.h>
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index 98894e4aa..ea303a86c 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include <zlib.h>
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 79c1b4fba..a46a7596a 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index b1632de9f..1ca1d1b2e 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c
index 5b887ba99..17072ffa8 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -43,7 +43,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c
index c23c5367a..74dd89126 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "test_testbed_api_barriers.h"
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 333aec3d7..0ec9d63e1 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -38,7 +38,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
index f958b727c..9e49debf7 100644
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api_hosts.h"
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c
index e9fc55be0..133aadf21 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "testbed_api_operations.h"
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c
index 7a7e0ca06..22dd46b53 100644
--- a/src/testbed/test_testbed_api_peer_reconfiguration.c
+++ b/src/testbed/test_testbed_api_peer_reconfiguration.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c
index bc9c29790..93b0da550 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c
index 4cb26811a..816f8e9a6 100644
--- a/src/testbed/test_testbed_api_sd.c
+++ b/src/testbed/test_testbed_api_sd.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "testbed_api_sd.h"
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index b28a3d608..4d42cda6a 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index d5b930715..f451c6555 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c
index 036c09a39..fe76ad441 100644
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index 979b15bd1..fda5c3223 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 38fb2b5e3..dada7286f 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index f88d2fae6..33c21a69c 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c
index 0bea28223..8b706ff83 100644
--- a/src/testbed/test_testbed_underlay.c
+++ b/src/testbed/test_testbed_underlay.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 4d82eb4f6..2ae0a1703 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -27,7 +27,6 @@
 * @author Sree Harsha Totakura
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 24a03de8d..6074beb12 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -24,7 +24,6 @@
 * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api.h"
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index cac872c46..824bd0187 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index 7f3262732..ea7e71496 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "testbed_api_operations.h"
 #include "testbed_api_sd.h"
diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h
index 2dba9c14d..7d6659837 100644
--- a/src/testbed/testbed_api_operations.h
+++ b/src/testbed/testbed_api_operations.h
@@ -27,7 +27,7 @@
 #define NEW_TESTING_API_OPERATIONS_H
 #include "gnunet_testbed_service.h"
-#include "gnunet_helper_lib.h"
+#include "gnunet_util_lib.h"
 /**
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index ce39b7b58..b8e428441 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "testbed_api_peers.h"
 #include "testbed_api.h"
 #include "testbed.h"
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index db8ec9881..10129d961 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -29,7 +29,7 @@
 #define NEW_TESTING_API_PEERS_H
 #include "gnunet_testbed_service.h"
-#include "gnunet_helper_lib.h"
+#include "gnunet_util_lib.h"
 /**
diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c
index 6033985ae..59c7a3ebd 100644
--- a/src/testbed/testbed_api_sd.c
+++ b/src/testbed/testbed_api_sd.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "testbed_api_sd.h"
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index a45f204a0..2c9a90fd4 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "testbed_api.h"
 #include "testbed_api_peers.h"
 #include "testbed_api_operations.h"
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index 5d0b95fb2..e800baa73 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -25,7 +25,6 @@
 * @author Sree Harsha Totakura
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 99e34cb35..d9eb384ba 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -26,7 +26,6 @@
 * @author Tobias Frisch
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "testbed.h"
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 14cabd533..8e75daae3 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api.h"
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 807e500f7..f73be378e 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "testbed_api.h"
 #include "testbed_api_peers.h"
diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
index 8538c70f0..b9c3aa507 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -37,7 +37,6 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include "gnunet_testing_ng_lib.h"
diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c
index 9596cf306..88906e5fa 100644
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/list-keys.c b/src/testing/list-keys.c
index 0e474c944..f65b45a77 100644
--- a/src/testing/list-keys.c
+++ b/src/testing/list-keys.c
@@ -1,5 +1,4 @@
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c
index 55e408b1d..25cbb2a9f 100644
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c
index d3c93004a..8d357cb08 100644
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c
index ef97cc957..df3d8d523 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/test_testing_servicestartup.c b/src/testing/test_testing_servicestartup.c
index 8cc9dd4a2..83458898b 100644
--- a/src/testing/test_testing_servicestartup.c
+++ b/src/testing/test_testing_servicestartup.c
@@ -24,7 +24,6 @@
 * @author Sree Harsha Totakura
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/test_testing_sharedservices.c b/src/testing/test_testing_sharedservices.c
index 1049bd1a8..d2f760d7a 100644
--- a/src/testing/test_testing_sharedservices.c
+++ b/src/testing/test_testing_sharedservices.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 07142ad9f..20cf17895 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -30,7 +30,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/testing/testing_api_cmd_batch.c b/src/testing/testing_api_cmd_batch.c
index c303fc8aa..080a4880d 100644
--- a/src/testing/testing_api_cmd_batch.c
+++ b/src/testing/testing_api_cmd_batch.c
@@ -25,7 +25,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "testing.h"
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 914013cbf..f51b2109b 100644
--- a/src/testing/testing_api_cmd_block_until_external_trigger.c
+++ b/src/testing/testing_api_cmd_block_until_external_trigger.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_end.c b/src/testing/testing_api_cmd_end.c
index 7658e7f76..f0f036429 100644
--- a/src/testing/testing_api_cmd_end.c
+++ b/src/testing/testing_api_cmd_end.c
@@ -22,7 +22,6 @@
 * @brief command to end a command array
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
diff --git a/src/testing/testing_api_cmd_finish.c b/src/testing/testing_api_cmd_finish.c
index 02b8f0a59..47199d3d6 100644
--- a/src/testing/testing_api_cmd_finish.c
+++ b/src/testing/testing_api_cmd_finish.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_local_test_finished.c b/src/testing/testing_api_cmd_local_test_finished.c
index 5918264ac..709c6b62f 100644
--- a/src/testing/testing_api_cmd_local_test_finished.c
+++ b/src/testing/testing_api_cmd_local_test_finished.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_local_test_prepared.c b/src/testing/testing_api_cmd_local_test_prepared.c
index 3af237ef5..e71d3ef45 100644
--- a/src/testing/testing_api_cmd_local_test_prepared.c
+++ b/src/testing/testing_api_cmd_local_test_prepared.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_netjail_start.c b/src/testing/testing_api_cmd_netjail_start.c
index 78a48ff01..6cd648c3a 100644
--- a/src/testing/testing_api_cmd_netjail_start.c
+++ b/src/testing/testing_api_cmd_netjail_start.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem.c b/src/testing/testing_api_cmd_netjail_start_testsystem.c
index be5b36ee3..98de0698a 100644
--- a/src/testing/testing_api_cmd_netjail_start_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "testing_cmds.h"
diff --git a/src/testing/testing_api_cmd_netjail_stop.c b/src/testing/testing_api_cmd_netjail_stop.c
index 5683a05e4..f1b2260ab 100644
--- a/src/testing/testing_api_cmd_netjail_stop.c
+++ b/src/testing/testing_api_cmd_netjail_stop.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem.c b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
index 857ab1d73..4215beef6 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "testing_cmds.h"
diff --git a/src/testing/testing_api_cmd_send_peer_ready.c b/src/testing/testing_api_cmd_send_peer_ready.c
index 2e75c0678..5bbabce51 100644
--- a/src/testing/testing_api_cmd_send_peer_ready.c
+++ b/src/testing/testing_api_cmd_send_peer_ready.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_system_create.c b/src/testing/testing_api_cmd_system_create.c
index 6aeaa1258..221bbb8f6 100644
--- a/src/testing/testing_api_cmd_system_create.c
+++ b/src/testing/testing_api_cmd_system_create.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_cmd_system_destroy.c b/src/testing/testing_api_cmd_system_destroy.c
index df3c72ce1..5a2440766 100644
--- a/src/testing/testing_api_cmd_system_destroy.c
+++ b/src/testing/testing_api_cmd_system_destroy.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index e8d04fddc..90713e45e 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -26,7 +26,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "testing.h"
diff --git a/src/testing/testing_api_traits.c b/src/testing/testing_api_traits.c
index 270ec41f6..9b54443a1 100644
--- a/src/testing/testing_api_traits.c
+++ b/src/testing/testing_api_traits.c
@@ -26,7 +26,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/topology/friends.c b/src/topology/friends.c
index f923febad..65c7e81d7 100644
--- a/src/topology/friends.c
+++ b/src/topology/friends.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_friends_lib.h"
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index c85462908..b380c0bd4 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -37,7 +37,6 @@
 * program.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_friends_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c
index f726b1dda..6f9758b09 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -24,7 +24,6 @@
 * @author xrs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 401c0e3e9..84aa45b9a 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -28,7 +28,6 @@
 * - support other TCP-specific NAT traversal methods (#5531)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_peerstore_service.h"
diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
index 65a2a35f6..282902f1c 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -38,7 +38,6 @@
 * - support other UDP-specific NAT traversal methods (#)
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_signatures.h"
diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
index f898e116b..d7e18f87a 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -27,7 +27,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_constants.h"
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 3c9f30589..64f3b6160 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -21,7 +21,6 @@
 */
 #include "platform.h"
 #include "gnunet_private_config.h"
-#include "platform.h"
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c
index 698da9a0f..ab77f5c68 100644
--- a/src/transport/gnunet-helper-transport-wlan-dummy.c
+++ b/src/transport/gnunet-helper-transport-wlan-dummy.c
@@ -23,7 +23,6 @@
 * @author David Brodski
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 #include "plugin_transport_wlan.h"
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
index f50e20b76..c1a230bef 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -111,7 +111,6 @@
 */
 #include "platform.h"
 #include "gnunet_private_config.h"
-#include "platform.h"
 #include <netpacket/packet.h>
 #include <linux/if_ether.h>
 #include <linux/wireless.h>
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index fd7b6d244..dc470ca0e 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -73,7 +73,6 @@
 *   reduce CPU and memory use) [CPU, MEMORY]
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_transport_monitor_service.h"
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index ab6f73751..93790e293 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index 1bede0909..2438a0a48 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-transport.h"
 #include "gnunet-service-transport_ats.h"
 #include "gnunet-service-transport_manipulation.h"
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index 7c8e80eba..1e5e8a225 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c
index 0e6e3ff5c..9f39b2dca 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -25,7 +25,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-transport_hello.h"
 #include "gnunet-service-transport_neighbours.h"
 #include "gnunet-service-transport_plugins.h"
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 0cdb433fb..e61441d9f 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_ats_service.h"
 #include "gnunet-service-transport_ats.h"
 #include "gnunet-service-transport_neighbours.h"
diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c
index 54bed5f63..218ef80ab 100644
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-transport.h"
 #include "gnunet-service-transport_hello.h"
 #include "gnunet-service-transport_ats.h"
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index 2a3cb53a8..86161bd85 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet-service-transport_ats.h"
 #include "gnunet-service-transport_hello.h"
 #include "gnunet-service-transport_neighbours.h"
diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c
index db519eee7..6e5204e28 100644
--- a/src/transport/gnunet-transport-profiler.c
+++ b/src/transport/gnunet-transport-profiler.c
@@ -28,7 +28,6 @@
 * GNUnet.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_ats_service.h"
diff --git a/src/transport/gnunet-transport-wlan-receiver.c b/src/transport/gnunet-transport-wlan-receiver.c
index ea4530ac4..7f34a957f 100644
--- a/src/transport/gnunet-transport-wlan-receiver.c
+++ b/src/transport/gnunet-transport-wlan-receiver.c
@@ -24,7 +24,6 @@
 * @author David Brodski
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_protocols.h"
 #include "plugin_transport_wlan.h"
diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c
index 374215d9c..5256ec7be 100644
--- a/src/transport/gnunet-transport-wlan-sender.c
+++ b/src/transport/gnunet-transport-wlan-sender.c
@@ -24,7 +24,6 @@
 * @author David Brodski
 */
 #include "platform.h"
-#include "platform.h"
 #include "plugin_transport_wlan.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 03a836f3e..b5ad43770 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -25,7 +25,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 91099b570..82468992b 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -50,7 +50,6 @@
 #define ENABLE_GET GNUNET_YES
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_transport_plugin.h"
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index a2eb9ac19..40353daeb 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_plugin.h"
 #include "plugin_transport_http_common.h"
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index f82a800f4..3ad2356b0 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -26,7 +26,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_transport_plugin.h"
diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c
index 42c0105ea..f3db4fc5a 100644
--- a/src/transport/plugin_transport_smtp.c
+++ b/src/transport/plugin_transport_smtp.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 4010b9d25..ceae64709 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -23,7 +23,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c
index e5d8a5ca1..c39c72178 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 60aecac68..0d3ca449d 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -26,7 +26,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "plugin_transport_udp.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c
index 483324d28..a65f5bd2f 100644
--- a/src/transport/plugin_transport_udp_broadcasting.c
+++ b/src/transport/plugin_transport_udp_broadcasting.c
@@ -25,7 +25,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "plugin_transport_udp.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 2290971e3..269949a99 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -27,7 +27,6 @@
 * @author Nathan Evans
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 0f8513571..138fb5080 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -28,7 +28,6 @@
 * variant of this code is compiled.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c
index 755037204..551e79055 100644
--- a/src/transport/tcp_connection_legacy.c
+++ b/src/transport/tcp_connection_legacy.c
@@ -31,7 +31,6 @@
 * module they are VERY, VERY important.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c
index 6b4ff1c25..bb572c843 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c
index 32d101b9b..bed6874c9 100644
--- a/src/transport/tcp_server_mst_legacy.c
+++ b/src/transport/tcp_server_mst_legacy.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index 7472093eb..65b090187 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_constants.h"
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index 668864dbc..f43cdaaf3 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -25,7 +25,6 @@
 * @author Martin Schanzenbach
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "transport-testing-communicator.h"
 #include "gnunet_ats_transport_service.h"
diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c
index f8d17636c..fe6e4faa3 100644
--- a/src/transport/test_http_common.c
+++ b/src/transport/test_http_common.c
@@ -22,7 +22,6 @@
 * @brief base test case for common http functionality
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
 #include "plugin_transport_http_common.h"
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 358bee25d..04687d845 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -25,7 +25,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_peerinfo_service.h"
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index f6de5f56c..c3c46db37 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -24,7 +24,6 @@
 * This test case tests quota compliance both on transport level
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_ats_service.h"
 #include "gauger.h"
diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index c55f46e4e..ce5117bd1 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -43,7 +43,6 @@
 * out and returns "77" (skipped), so we set the timeout suitably low.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_ats_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 9de8d0b4c..5f5e03a9e 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -28,7 +28,6 @@
 * C code apparently.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api2.c b/src/transport/test_transport_api2.c
index 9d750f9f4..e1606e0be 100644
--- a/src/transport/test_transport_api2.c
+++ b/src/transport/test_transport_api2.c
@@ -28,7 +28,6 @@
 * C code apparently.
 */
 #include "platform.h"
-#include "platform.h"
 //#include "gnunet_transport_service.h"
 #include "transport-testing2.h"
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index a082152ea..2ba88a863 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -25,7 +25,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c
index 3d3ab3a67..c469f28bc 100644
--- a/src/transport/test_transport_api_disconnect.c
+++ b/src/transport/test_transport_api_disconnect.c
@@ -26,7 +26,6 @@
 * stops one peer, expects the others to send a disconnect notification.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index b5e24db5e..0e47800e8 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -27,7 +27,6 @@
 * C code apparently.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c
index 433da4d2f..73c81114e 100644
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -29,7 +29,6 @@
 * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY us
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c
index e4efd06bd..207c4416f 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp.c
+++ b/src/transport/test_transport_api_manipulation_recv_tcp.c
@@ -28,7 +28,6 @@
 * In addition the distance on receiver side will be manipulated to be 10
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c
index b89540af6..ea735cfc6 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ b/src/transport/test_transport_api_manipulation_send_tcp.c
@@ -28,7 +28,6 @@
 * In addition the distance on receiver side will be manipulated to be 10
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c
index a2c5ee5cb..c09e3782d 100644
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -22,7 +22,6 @@
 * @brief base test case for transport peer monitor API
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index e9f78f73e..508fed4f5 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -27,7 +27,6 @@
 * and ensures that all message were received.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "gauger.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_restart_reconnect.c b/src/transport/test_transport_api_restart_reconnect.c
index f432690a4..d58c1de54 100644
--- a/src/transport/test_transport_api_restart_reconnect.c
+++ b/src/transport/test_transport_api_restart_reconnect.c
@@ -26,7 +26,6 @@
 * How many peers are restarted is determined by the name of the binary.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index ae32dcf9f..9f8d3bb2b 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -28,7 +28,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c
index bf2650697..204935dcb 100644
--- a/src/transport/test_transport_blacklisting.c
+++ b/src/transport/test_transport_blacklisting.c
@@ -49,7 +49,6 @@
 *
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index 751469b3a..5941a991b 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
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 e07ade9d7..3a282bb11 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
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 afed9d6a8..8bfa1fd0a 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index df1321404..5a0dac32b 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/transport/test_transport_start_with_config.c b/src/transport/test_transport_start_with_config.c
index 06a0b0aae..0c3271436 100644
--- a/src/transport/test_transport_start_with_config.c
+++ b/src/transport/test_transport_start_with_config.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "transport-testing-cmds.h"
diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c
index 5be3836b0..f537af5fc 100644
--- a/src/transport/test_transport_testing_restart.c
+++ b/src/transport/test_transport_testing_restart.c
@@ -23,7 +23,6 @@
 * start the peer, get the HELLO message, restart and stop the peer
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c
index cc2104672..4783c1813 100644
--- a/src/transport/test_transport_testing_startstop.c
+++ b/src/transport/test_transport_testing_startstop.c
@@ -23,7 +23,6 @@
 * start the peer, get the HELLO message and stop the peer
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index 708bb9d75..1bf88bb3d 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -25,7 +25,6 @@
 * @author Julius Bünger
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_constants.h"
diff --git a/src/transport/transport.h b/src/transport/transport.h
index c06c2abb3..e060f81ba 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -26,7 +26,7 @@
 #ifndef TRANSPORT_H
 #define TRANSPORT_H
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/transport/transport_api2_application.c b/src/transport/transport_api2_application.c
index 915cc6aef..00f5f62eb 100644
--- a/src/transport/transport_api2_application.c
+++ b/src/transport/transport_api2_application.c
@@ -24,7 +24,6 @@
 * @author Matthias Wachs
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_transport_core_service.h"
 #include "transport.h"
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
index 8aabab8b4..b79f0d8bf 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_transport_communication_service.h"
diff --git a/src/transport/transport_api2_core.c b/src/transport/transport_api2_core.c
index 693babb91..8cd0b7c8c 100644
--- a/src/transport/transport_api2_core.c
+++ b/src/transport/transport_api2_core.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/transport/transport_api2_monitor.c b/src/transport/transport_api2_monitor.c
index 07519fe62..67aa1985e 100644
--- a/src/transport/transport_api2_monitor.c
+++ b/src/transport/transport_api2_monitor.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_transport_monitor_service.h"
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c
index 3bda5a39e..5b234f802 100644
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -23,7 +23,6 @@
 * @brief enable clients to convert addresses to human readable strings
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c
index ab392c11f..b195a7fc7 100644
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index 39bfb8580..0376275a3 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 9ac6fb9cc..a6006f698 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
index 6edc36f21..c71c952aa 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index f120401ae..4add06609 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/transport/transport_api_cmd_stop_peer.c
index 74b16be84..4ca730add 100644
--- a/src/transport/transport_api_cmd_stop_peer.c
+++ b/src/transport/transport_api_cmd_stop_peer.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index d0f364e38..12612de09 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c
index 76643c853..f8bcc5f07 100644
--- a/src/transport/transport_api_hello_get.c
+++ b/src/transport/transport_api_hello_get.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c
index 97125c64a..4f4ccc4a0 100644
--- a/src/transport/transport_api_manipulation.c
+++ b/src/transport/transport_api_manipulation.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c
index 3ce545eed..ef1dc6087 100644
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/transport_api_monitor_peers.c
@@ -29,7 +29,6 @@
 * state timeout for peer requests.
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c
index 8a51e62ea..43a11442b 100644
--- a/src/transport/transport_api_monitor_plugins.c
+++ b/src/transport/transport_api_monitor_plugins.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c
index e4f6688f2..1b611aa6b 100644
--- a/src/transport/transport_api_offer_hello.c
+++ b/src/transport/transport_api_offer_hello.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
diff --git a/src/transport/transport_api_traits.c b/src/transport/transport_api_traits.c
index f02b71124..7e66cc3d1 100644
--- a/src/transport/transport_api_traits.c
+++ b/src/transport/transport_api_traits.c
@@ -24,7 +24,6 @@
 * @author t3sserakt
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testing_netjail_lib.h"
 #include "transport-testing-cmds.h"
diff --git a/src/util/buffer.c b/src/util/buffer.c
index 38c3ccac9..f88c56849 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -21,7 +21,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_buffer_lib.h"
 /**
 * Initialize a buffer with the given capacity.
diff --git a/src/util/child_management.c b/src/util/child_management.c
index 14d64ec33..680dbcabe 100644
--- a/src/util/child_management.c
+++ b/src/util/child_management.c
@@ -28,7 +28,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_child_management_lib.h"
 /**
 * Generic logging shortcut
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 5ebed750c..36d49eddb 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -25,7 +25,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index da70d4538..59c15326d 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -27,7 +27,7 @@
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-common-endian", __VA_ARGS__)
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 409910c48..d27f70e83 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -25,9 +25,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_strings_lib.h"
 #include <regex.h>
diff --git a/src/util/configuration.c b/src/util/configuration.c
index b6e9d42ce..af8a0746e 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -24,13 +24,9 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #include "gnunet_os_lib.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_buffer_lib.h"
-#include "gnunet_container_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util", __VA_ARGS__)
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index f480fefd3..77b828d31 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -27,7 +27,7 @@
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-container-heap", \
                                        __VA_ARGS__)
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index 84e35d3cd..ab909484a 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -25,7 +25,7 @@
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) \
  GNUNET_log_from (kind, "util-container-multihashmap", __VA_ARGS__)
diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index 2ae35911b..4ff4e1678 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -27,7 +27,7 @@
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) \
  GNUNET_log_from (kind, "util-container-multihashmap32", __VA_ARGS__)
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index 7629bbffe..d33a19db2 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -29,7 +29,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-crc", __VA_ARGS__)
diff --git a/src/util/crypto_cs.c b/src/util/crypto_cs.c
index eea456792..8506c7fa6 100644
--- a/src/util/crypto_cs.c
+++ b/src/util/crypto_cs.c
@@ -26,7 +26,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <sodium.h>
 #include <gcrypt.h>
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index e6220d148..7f9e3c070 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -28,8 +28,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #include "benchmark.h"
 #define EXTRA_CHECKS 0
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index c193be2b7..6e333686f 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -28,8 +28,7 @@
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_container_lib.h"
 /**
diff --git a/src/util/crypto_ecc_gnsrecord.c b/src/util/crypto_ecc_gnsrecord.c
index bd4a631b7..b902e0e0a 100644
--- a/src/util/crypto_ecc_gnsrecord.c
+++ b/src/util/crypto_ecc_gnsrecord.c
@@ -29,8 +29,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #define CURVE "Ed25519"
diff --git a/src/util/crypto_edx25519.c b/src/util/crypto_edx25519.c
index 440dd27c2..2d9a76aa3 100644
--- a/src/util/crypto_edx25519.c
+++ b/src/util/crypto_edx25519.c
@@ -30,8 +30,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #define CURVE "Ed25519"
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index a77a0f82a..e45cb42e0 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -25,8 +25,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
 #include "benchmark.h"
 #include <gcrypt.h>
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index 22d4643eb..e724bc9ba 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -52,7 +52,7 @@
 #if GNUNET_BUILD
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 #else
 #define GNUNET_NO 0
@@ -127,7 +127,7 @@ getPRK (gcry_md_hd_t mac,
  if (0 == xts_len)
  {
    char zero_salt[dlen];
-    
    memset (zero_salt, 0, dlen);
    ret = doHMAC (mac, zero_salt, dlen, skm, skm_len);
  }
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 039cd135f..7cfd8fea4 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -29,7 +29,7 @@
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-kdf", __VA_ARGS__)
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 3d810f27b..06f2fd786 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-mpi", __VA_ARGS__)
diff --git a/src/util/crypto_pow.c b/src/util/crypto_pow.c
index 038e58cae..bfaaf555d 100644
--- a/src/util/crypto_pow.c
+++ b/src/util/crypto_pow.c
@@ -25,7 +25,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <sodium.h>
 /**
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 492bfdb9e..72474d04b 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -26,8 +26,7 @@
 */
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_time_lib.h"
 #include <gcrypt.h>
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-random", __VA_ARGS__)
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 4a866a5df..2c446d21a 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -28,7 +28,7 @@
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-rsa", __VA_ARGS__)
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index f663f2da1..a9217febd 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -27,7 +27,7 @@
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <gcrypt.h>
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-symmetric", \
diff --git a/src/util/disk.c b/src/util/disk.c
index 4ccadc78e..1d0e14b98 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -25,9 +25,7 @@
 */
 #include "platform.h"
-#include "disk.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_disk_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-disk", __VA_ARGS__)
diff --git a/src/util/disk.h b/src/util/disk.h
index 89ff76687..bca398e26 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -26,8 +26,7 @@
 #ifndef GNUNET_DISK_H_
 #define GNUNET_DISK_H_
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_disk_lib.h"
 /**
 * Retrieve OS file handle
diff --git a/src/util/helper.c b/src/util/helper.c
index ad4423f3a..fe8643d31 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -28,8 +28,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_mst_lib.h"
 /**
 * Entry in the queue of messages we need to transmit to the helper.
diff --git a/src/util/network.c b/src/util/network.c
index 82b6ee464..ac3de89bf 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -26,7 +26,6 @@
 */
 #include "platform.h"
-#include "gnunet_util_lib.h"
 #include "disk.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-network", __VA_ARGS__)
diff --git a/src/util/peer.c b/src/util/peer.c
index c82317654..e5c15b098 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -25,7 +25,7 @@
 */
 #include "platform.h"
-#include "gnunet_peer_lib.h"
+#include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-peer", __VA_ARGS__)
diff --git a/src/util/proc_compat.c b/src/util/proc_compat.c
index a278ec045..0423a0d5c 100644
--- a/src/util/proc_compat.c
+++ b/src/util/proc_compat.c
@@ -27,7 +27,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 /**
 * memrchr as defined in glibc
diff --git a/src/util/regex.c b/src/util/regex.c
index f06fd85d6..282d3aa99 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -26,7 +26,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 /**
 * 'wildcard', matches all possible values (for HEX encoding).
diff --git a/src/util/strings.c b/src/util/strings.c
index 817e4d3ce..479c0fcd6 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -29,9 +29,7 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #endif
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
-#include "gnunet_buffer_lib.h"
-#include "gnunet_strings_lib.h"
 #include <unicase.h>
 #include <unistr.h>
 #include <uniconv.h>
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index f8b0b89f4..ed582517b 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -23,7 +23,6 @@
 */
 #include "platform.h"
-#include "platform.h"
 void *
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 08786e999..30901da45 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -33,7 +33,6 @@
 * - Philipp Tölke
 */
 #include "platform.h"
-#include "platform.h"
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
 #endif
@@ -41,7 +40,7 @@
 /**
 * Need 'struct GNUNET_MessageHeader'.
 */
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 /**
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index d4a006cb9..aa3f6ffe3 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -31,7 +31,6 @@
 *   detect & recover from channel-to-exit failure gracefully
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_common.h"
 #include "gnunet_protocols.h"
@@ -39,7 +38,6 @@
 #include "gnunet_cadet_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_constants.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_regex_service.h"
 #include "vpn.h"
 #include "exit.h"
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index fdc9df7f4..a67e17016 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -25,9 +25,7 @@
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 #include "gnunet_vpn_service.h"
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 5148f21c5..8a3464786 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -24,7 +24,6 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include "gnunet_vpn_service.h"
 #include "vpn.h"
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index f6667e335..1893ccc03 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -24,10 +24,8 @@
 * @author Christian Grothoff
 */
 #include "platform.h"
-#include "platform.h"
 #include <pthread.h>
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_namecache_service.h"
author	Martin Schanzenbach <schanzen@gnunet.org>	2022-12-04 19:35:42 +0900
committer	Martin Schanzenbach <schanzen@gnunet.org>	2022-12-04 19:35:42 +0900
commit	38e77d7ab84a21e9aebd558558105c95254ac430 (patch)
tree	016efa7b50dfd39e42b41b6e3075874de6e5b633 /src
parent	292cefa2a12a78ae54fb56a3961452f439cb744f (diff)
download	gnunet-38e77d7ab84a21e9aebd558558105c95254ac430.tar.gz gnunet-38e77d7ab84a21e9aebd558558105c95254ac430.zip