BUILD: Attempt to disentable platform.h, gnunet_common.h and gnunet_private_config.h insanity

978 files changed, 1007 insertions, 180 deletions

diff --git a/src/abd/abd_api.c b/src/abd/abd_api.c
index 57f831e85..2613bd4eb 100644
--- a/src/abd/abd_api.c
+++ b/src/abd/abd_api.c
@@ -23,6 +23,7 @@
  * @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 2ed24ff2f..18ec63555 100644
--- a/src/abd/abd_serialization.c
+++ b/src/abd/abd_serialization.c
@@ -26,6 +26,7 @@
  * @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 cc45cde04..af6726b12 100644
--- a/src/abd/delegate_misc.c
+++ b/src/abd/delegate_misc.c
@@ -26,6 +26,7 @@
  * @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 6f6521d98..e7bccb3b3 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/abd/gnunet-abd.c
@@ -23,6 +23,7 @@
  * @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 407d5bdc3..5b8ce3732 100644
--- a/src/abd/gnunet-service-abd.c
+++ b/src/abd/gnunet-service-abd.c
@@ -23,6 +23,7 @@
  * @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 7b2f4af5b..51878ad11 100644
--- a/src/abd/plugin_gnsrecord_abd.c
+++ b/src/abd/plugin_gnsrecord_abd.c
@@ -24,6 +24,7 @@
  * @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 1360ecf14..f69d98387 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -25,6 +25,7 @@
  * @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 2c418d0ce..e908ce20f 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -25,6 +25,7 @@
  * @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 ea3a012ab..908a4118e 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -24,6 +24,7 @@
  * @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 da94efdd8..ad81e1277 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -24,6 +24,7 @@
  * @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 43dd3c92b..514dd65df 100644
--- a/src/arm/mockup-service.c
+++ b/src/arm/mockup-service.c
@@ -18,6 +18,7 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#include "platform.h"
 #include <stdlib.h>
 #include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 56a0abbd2..04611645a 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -22,6 +22,7 @@
  * @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 e3eed8568..2018a0a7a 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -23,6 +23,7 @@
  * @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 90fb8bfa0..f99857ca7 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -24,6 +24,7 @@
  * @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 169daa6f1..d3601b6ef 100644
--- a/src/ats-tool/gnunet-ats.c
+++ b/src/ats-tool/gnunet-ats.c
@@ -25,6 +25,7 @@
  * @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 f62d89772..70c20b7ad 100644
--- a/src/ats/ats_api_connectivity.c
+++ b/src/ats/ats_api_connectivity.c
@@ -24,6 +24,7 @@
  * @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 242589851..8bff919b9 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -24,6 +24,7 @@
  * @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 82114f888..29c6263ae 100644
--- a/src/ats/ats_api_scanner.c
+++ b/src/ats/ats_api_scanner.c
@@ -24,6 +24,7 @@
  * @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 6fb61b2e8..cafce5f1a 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -32,6 +32,7 @@
  *   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 ba7994686..d941a3619 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -24,6 +24,7 @@
  * @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 5e27ecbd0..f4e182a0d 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -24,6 +24,7 @@
  * @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 9c9856094..b021aeaaf 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -25,6 +25,7 @@
  * @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 702c5ba87..d25f88f19 100644
--- a/src/ats/gnunet-service-ats_connectivity.c
+++ b/src/ats/gnunet-service-ats_connectivity.c
@@ -25,6 +25,7 @@
  * @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 36584e944..807f5fe49 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -25,6 +25,7 @@
  * @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 a4d7b36b6..738054a5d 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -27,6 +27,7 @@
  * - 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 d3db69caa..e729a8118 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -25,6 +25,7 @@
  * @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 c2b2dc4c1..c6e875f93 100644
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -24,6 +24,7 @@
  * @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 471a19859..28497ed4a 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -23,6 +23,7 @@
  * @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 2dfb70343..b461236eb 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -25,6 +25,7 @@
  * @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 363d0cfc9..eee4585b3 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -24,6 +24,7 @@
  * @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 d3062a5c0..332ad49a4 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -24,6 +24,7 @@
  * @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 390cafe0f..7b6913024 100644
--- a/src/ats/test_ats_api.c
+++ b/src/ats/test_ats_api.c
@@ -23,6 +23,7 @@
  * @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 d19da0106..910da8a5e 100644
--- a/src/ats/test_ats_lib.c
+++ b/src/ats/test_ats_lib.c
@@ -23,6 +23,7 @@
  * @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 f6a964df4..f3ccdbc2b 100644
--- a/src/ats/test_ats_reservation_api.c
+++ b/src/ats/test_ats_reservation_api.c
@@ -23,6 +23,7 @@
  * @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 93947b89c..93fdb9ee9 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/auction/gnunet-auction-create.c
@@ -24,6 +24,7 @@
  * @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 dded45ce6..e3d6a4b2d 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/auction/gnunet-auction-info.c
@@ -24,6 +24,7 @@
  * @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 dded45ce6..e3d6a4b2d 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/auction/gnunet-auction-join.c
@@ -24,6 +24,7 @@
  * @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 c20f0bdbe..b40a49232 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/auction/gnunet-service-auction.c
@@ -24,6 +24,7 @@
  * @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 1eac9b5c4..b84dc638a 100644
--- a/src/auction/test_auction_api.c
+++ b/src/auction/test_auction_api.c
@@ -22,6 +22,7 @@
  * @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 c8269498e..778d032d7 100644
--- a/src/block/bg_bf.c
+++ b/src/block/bg_bf.c
@@ -24,6 +24,7 @@
  * @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 9edc7ce5e..6b0cd6599 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -24,6 +24,7 @@
  * @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 4a271fa42..037dd050c 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -25,6 +25,7 @@
  */
 
 #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 5afac9205..14336c53e 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -26,6 +26,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
 
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 0bfb01868..63ea6b9fe 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -24,6 +24,7 @@
  * @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 e172418c4..c95121d97 100644
--- a/src/cadet/cadet_api_drop_message.c
+++ b/src/cadet/cadet_api_drop_message.c
@@ -23,6 +23,7 @@
  * @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 05e2a8383..9b7b53fdb 100644
--- a/src/cadet/cadet_api_get_channel.c
+++ b/src/cadet/cadet_api_get_channel.c
@@ -24,6 +24,7 @@
  * @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 f32a5e20b..d09c59866 100644
--- a/src/cadet/cadet_api_get_path.c
+++ b/src/cadet/cadet_api_get_path.c
@@ -24,6 +24,7 @@
  * @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 52aec6cc9..a616f2099 100644
--- a/src/cadet/cadet_api_helper.c
+++ b/src/cadet/cadet_api_helper.c
@@ -24,6 +24,7 @@
  * @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 52f59cc74..25509f2d4 100644
--- a/src/cadet/cadet_api_list_peers.c
+++ b/src/cadet/cadet_api_list_peers.c
@@ -24,6 +24,7 @@
  * @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 dce12835f..70a1626e2 100644
--- a/src/cadet/cadet_api_list_tunnels.c
+++ b/src/cadet/cadet_api_list_tunnels.c
@@ -24,6 +24,7 @@
  * @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 9c7b9063d..befec480b 100644
--- a/src/cadet/cadet_test_lib.c
+++ b/src/cadet/cadet_test_lib.c
@@ -23,6 +23,7 @@
  * @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/desirability_table.c b/src/cadet/desirability_table.c
index 829c618af..b4db7c2dd 100644
--- a/src/cadet/desirability_table.c
+++ b/src/cadet/desirability_table.c
@@ -5,6 +5,7 @@
  * for various plausible inputs.
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include <stdio.h>
 
 int
diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c
index b84337370..9d612c8e6 100644
--- a/src/cadet/gnunet-cadet-profiler.c
+++ b/src/cadet/gnunet-cadet-profiler.c
@@ -22,6 +22,7 @@
  *
  * @brief Profiler for cadet experiments.
  */
+#include "platform.h"
 #include <stdio.h>
 #include "platform.h"
 #include "cadet_test_lib.h"
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index 9b7538ae7..d52104d1f 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -25,6 +25,7 @@
  * @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 07b580005..09dcf5ecb 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -33,6 +33,7 @@
  *            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 78658c296..85028799d 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -34,6 +34,7 @@
  *   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 f01c1388e..05ac8f53c 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -26,6 +26,7 @@
  * @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 68f7405c3..54c55c60a 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -30,6 +30,7 @@
  * - 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 82ba326b4..f99d98e55 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -25,6 +25,7 @@
  */
 
 #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 e1850d60a..e3db7ce85 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -25,6 +25,7 @@
  * @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 83b996e05..bba7fa621 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -24,6 +24,7 @@
  * @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 f2b508ae0..5384e76a1 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -31,6 +31,7 @@
  *   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 c7e422926..d11693c33 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -31,6 +31,7 @@
  *     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 bdf2ac986..260822ba6 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  * @brief Test for the cadet service using mq API.
  */
+#include "platform.h"
 #include <stdio.h>
 #include "platform.h"
 #include "cadet.h"
diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c
index 9f5a45986..36f64c5c0 100644
--- a/src/cadet/test_cadet_flow.c
+++ b/src/cadet/test_cadet_flow.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  * @brief Test for flow control of CADET service
  */
+#include "platform.h"
 #include <stdio.h>
 #include "platform.h"
 #include "cadet_test_lib.h"
diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c
index 6f75dfd1f..33ccc0fd8 100644
--- a/src/cadet/test_cadet_local_mq.c
+++ b/src/cadet/test_cadet_local_mq.c
@@ -25,6 +25,7 @@
  */
 
 #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 d0af2d2d9..522e05aa8 100644
--- a/src/consensus/consensus_api.c
+++ b/src/consensus/consensus_api.c
@@ -24,6 +24,7 @@
  * @author Florian Dold
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_client_lib.h"
diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c
index 07a536a2d..7e9a1340c 100644
--- a/src/consensus/gnunet-consensus-profiler.c
+++ b/src/consensus/gnunet-consensus-profiler.c
@@ -24,6 +24,7 @@
  * @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 5b6b9bbd7..2304a7428 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -23,6 +23,7 @@
  * @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 241d8fc7b..dfc26e464 100644
--- a/src/consensus/plugin_block_consensus.c
+++ b/src/consensus/plugin_block_consensus.c
@@ -25,6 +25,7 @@
  */
 
 #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 235a67484..b0b11685a 100644
--- a/src/consensus/test_consensus_api.c
+++ b/src/consensus/test_consensus_api.c
@@ -23,6 +23,7 @@
  * @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 9c4c520be..08d26d0ec 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -26,6 +26,7 @@
  * @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 129192bf0..2aca4e3d0 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -26,6 +26,7 @@
  * @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 5e6bc805f..193bf18f3 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -24,6 +24,7 @@
  * @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 9ff0002e7..870267a94 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -24,6 +24,7 @@
  * @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 f1e1e773d..c8ecfa981 100644
--- a/src/conversation/gnunet-helper-audio-playback-gst.c
+++ b/src/conversation/gnunet-helper-audio-playback-gst.c
@@ -23,6 +23,7 @@
  * @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 dfa400d71..eca242c5f 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -25,6 +25,7 @@
  * @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 883dd9eea..bad119c5f 100644
--- a/src/conversation/gnunet-helper-audio-record-gst.c
+++ b/src/conversation/gnunet-helper-audio-record-gst.c
@@ -23,6 +23,7 @@
  * @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 060a7c779..005df3a68 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -25,6 +25,7 @@
  * @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 1fff8bd26..ef4c9a111 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -25,6 +25,7 @@
  * @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/gnunet_gst.c b/src/conversation/gnunet_gst.c
index d776189cd..48d41a457 100644
--- a/src/conversation/gnunet_gst.c
+++ b/src/conversation/gnunet_gst.c
@@ -22,6 +22,7 @@
  * @brief FIXME
  * @author Hark
  */
+#include "platform.h"
 #include "gnunet_gst_def.h"
 
 /**
diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c
index a7364aece..dd2ef5a38 100644
--- a/src/conversation/gnunet_gst_test.c
+++ b/src/conversation/gnunet_gst_test.c
@@ -23,6 +23,7 @@
  * @author Hark
  */
 
+#include "platform.h"
 #include "gnunet_gst_def.h"
 #include "gnunet_gst.h"
 
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c
index a4a40796f..cacacf3ec 100644
--- a/src/conversation/microphone.c
+++ b/src/conversation/microphone.c
@@ -27,6 +27,7 @@
  * @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 786711c8e..df515e5c9 100644
--- a/src/conversation/plugin_gnsrecord_conversation.c
+++ b/src/conversation/plugin_gnsrecord_conversation.c
@@ -28,6 +28,7 @@
  */
 
 #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 38eb1159c..165d54697 100644
--- a/src/conversation/speaker.c
+++ b/src/conversation/speaker.c
@@ -26,6 +26,7 @@
  * @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 22e9b1dd9..e9bc39283 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -26,6 +26,7 @@
  * 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 a7aab069f..155e29f0d 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -26,6 +26,7 @@
  * 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 1bd2b4e22..02e2dd1df 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -28,6 +28,7 @@
  * 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_api.c b/src/core/core_api.c
index 2e0bb1785..40ee99190 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -24,6 +24,7 @@
  * @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 3be8e3859..fbde999f6 100644
--- a/src/core/core_api_monitor_peers.c
+++ b/src/core/core_api_monitor_peers.c
@@ -25,6 +25,7 @@
  * @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 d90c8e1f5..2c78d8f8d 100644
--- a/src/core/gnunet-core.c
+++ b/src/core/gnunet-core.c
@@ -24,6 +24,7 @@
  * @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 c9c3e3ff5..8b112e365 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -24,6 +24,7 @@
  * @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 b203f4902..72ec50095 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -25,6 +25,7 @@
  * @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 e103c89f5..72e8d4d13 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -24,6 +24,7 @@
  * @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 7b7df2fe9..75c08154b 100644
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -24,6 +24,7 @@
  * @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 653ce1aa0..c2057d1c7 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -23,6 +23,7 @@
  * @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 d4b55a6b8..ef713864f 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -23,6 +23,7 @@
  * @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 c2e39cd26..4678cd43d 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -25,6 +25,7 @@
  * @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 e50d3b2ec..0dcb2617a 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -24,6 +24,7 @@
  * @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 eb5ca7c2b..23982e719 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -23,6 +23,7 @@
  * @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 b21153980..6a8a46ed9 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -24,6 +24,7 @@
  * @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 0c19bd171..db9d5fb03 100644
--- a/src/curl/curl_reschedule.c
+++ b/src/curl/curl_reschedule.c
@@ -23,6 +23,7 @@
  * @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 c93ed58d6..102b19b25 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -23,6 +23,7 @@
  * @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 84bc4a852..08f176f58 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -23,6 +23,7 @@
  * @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 0dd8e47f8..fa0b53b42 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -24,6 +24,7 @@
  * @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 8bfd04aea..96c73d619 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -24,6 +24,7 @@
  * @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 1c6f24a82..b249edfdb 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -24,6 +24,7 @@
  * @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 1bd712d39..901a1973c 100644
--- a/src/datacache/plugin_datacache_template.c
+++ b/src/datacache/plugin_datacache_template.c
@@ -24,6 +24,7 @@
  * @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 fd5a5f54c..665e87980 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -23,6 +23,7 @@
  * @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 994147a64..710cd5804 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -23,6 +23,7 @@
  * @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 4d27efb4e..d49583a37 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -25,6 +25,7 @@
  * @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 5901cce54..c2f145a5c 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -23,6 +23,7 @@
  * @brief tool to manipulate datastores
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include <inttypes.h>
 #include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index f45e71ee9..f267b7aea 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -25,6 +25,7 @@
  */
 
 #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 fef38891e..a141657ce 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -32,6 +32,7 @@
  * 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 d7488d4e7..7763e7f5d 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -24,6 +24,7 @@
  */
 
 #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 a827a2763..1f794ec29 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -28,6 +28,7 @@
  */
 
 #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 216a6faa4..ef271f178 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -118,6 +118,7 @@
  */
 
 #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 5fcacc17b..4874fa642 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -24,6 +24,7 @@
  * @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 5ea9da4cb..163d1efed 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -25,6 +25,7 @@
  */
 
 #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 2b455f8cb..92986e22e 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -25,6 +25,7 @@
  */
 
 #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 e72a6acd3..f35ae4106 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -27,6 +27,7 @@
  */
 
 #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 175765267..2f911fbf3 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -23,6 +23,7 @@
  * @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 9fe2462e7..bb6ce5367 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -24,6 +24,7 @@
  */
 
 #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 e31ac596c..c95fb8a8b 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -26,6 +26,7 @@
  */
 
 #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 29c5088d1..2662fff93 100644
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -23,6 +23,7 @@
  * @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 1ae9235f8..b2b924835 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -24,6 +24,7 @@
  * @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 369ed5643..d3832d0dc 100644
--- a/src/dht/gnunet-dht-hello.c
+++ b/src/dht/gnunet-dht-hello.c
@@ -23,6 +23,7 @@
  * @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 93ea1284a..08ec017d1 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -24,6 +24,7 @@
  * @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 531107ef2..ce9bda089 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -24,6 +24,7 @@
  * @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 39433791d..08c31acf3 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -25,6 +25,7 @@
  * @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 90bb4d1f7..95a2aa1b3 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -25,6 +25,7 @@
  * @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 dcb6308a9..ebae7429e 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -24,6 +24,7 @@
  * @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 25d69ac65..d4bc957ec 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -25,6 +25,7 @@
  * @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 d81a2b2e1..104b41246 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -24,6 +24,7 @@
  * @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 55a34bdf0..62ffe2cc0 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -25,6 +25,7 @@
  */
 
 #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 bee16736c..20bde1de3 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -26,6 +26,7 @@
  * @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 044983b7e..0d9bf5b2a 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -25,6 +25,7 @@
  * 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 3960a2235..8b208cae5 100644
--- a/src/dht/test_dht_monitor.c
+++ b/src/dht/test_dht_monitor.c
@@ -23,6 +23,7 @@
  * @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 a8294c65d..fc98c7734 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -25,6 +25,7 @@
  * 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 b0cee7e01..ad4519b07 100644
--- a/src/dhtu/plugin_dhtu_gnunet.c
+++ b/src/dhtu/plugin_dhtu_gnunet.c
@@ -25,6 +25,7 @@
  * @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 06d0f0f60..afe52f96c 100644
--- a/src/dhtu/plugin_dhtu_ip.c
+++ b/src/dhtu/plugin_dhtu_ip.c
@@ -25,6 +25,7 @@
  * @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 030b17b5f..047f9fdf9 100644
--- a/src/dhtu/test_dhtu_ip.c
+++ b/src/dhtu/test_dhtu_ip.c
@@ -24,6 +24,7 @@
  * @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 fe8e1c18a..bb9e46a11 100644
--- a/src/dhtu/testing_dhtu_cmd_send.c
+++ b/src/dhtu/testing_dhtu_cmd_send.c
@@ -24,6 +24,7 @@
  * @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 b0bbb894f..573f3e359 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -24,6 +24,7 @@
  * @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 48923b613..0f7c8a9d2 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -25,6 +25,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index 835497dba..4bf9f4d06 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -25,6 +25,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c
index f0e39464d..a58176893 100644
--- a/src/dns/gnunet-helper-dns.c
+++ b/src/dns/gnunet-helper-dns.c
@@ -64,6 +64,7 @@
  * - Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 4840c0c95..19f8d12f8 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -37,6 +37,7 @@
  * 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"
diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c
index 91f8456df..c4c1072dd 100644
--- a/src/dns/gnunet-zonewalk.c
+++ b/src/dns/gnunet-zonewalk.c
@@ -24,6 +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>
diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index 1bbd7f750..7f151b6ab 100644
--- a/src/dns/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
@@ -28,6 +28,7 @@
  * 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 425f7c816..237958f4a 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -35,6 +35,7 @@
  *   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"
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index 4f32ea1f1..b4b2b0822 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -42,6 +42,7 @@
  * - Philipp Tölke
  */
 #include "platform.h"
+#include "platform.h"
 
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index c0ca86b37..192ee7e3b 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -23,6 +23,7 @@
  * @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 a2e097b8b..5f0b0c187 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -23,6 +23,7 @@
  * @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/test_fragmentation.c b/src/fragmentation/test_fragmentation.c
index 77879f75b..6291b7482 100644
--- a/src/fragmentation/test_fragmentation.c
+++ b/src/fragmentation/test_fragmentation.c
@@ -23,6 +23,7 @@
  * @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 d19296cf5..240405dd9 100644
--- a/src/fragmentation/test_fragmentation_parallel.c
+++ b/src/fragmentation/test_fragmentation_parallel.c
@@ -23,6 +23,7 @@
  * @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 6e97a3812..982517f8f 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -25,6 +25,7 @@
  */
 
 #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 eb7aac5bb..b59dc66cd 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -33,6 +33,7 @@
  *   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 8dd216324..c6a1e2b1c 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -26,6 +26,7 @@
  * @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 102b297c1..ebef12ab1 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -23,6 +23,7 @@
  * @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 dc5db9d3f..b9cf8e8d4 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -24,6 +24,7 @@
  * @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 43a02a9fa..c61899236 100644
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -24,6 +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"
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index eaee4ce55..12cb3921c 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -25,6 +25,7 @@
  */
 
 #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 2e7816d65..292e19fee 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -23,6 +23,7 @@
  * @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 bc94dd1fc..124e5a423 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -25,6 +25,7 @@
  * @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 5cdf8f6e8..38ce45fc4 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -25,6 +25,7 @@
  * @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 dae5ccdf3..ce26f352d 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -27,6 +27,7 @@
  */
 
 #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 aed090bb3..0e4c9fe5b 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/fs/fs_publish_ublock.c
@@ -26,6 +26,7 @@
  * @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 5538b7838..7da2bdec5 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -23,6 +23,7 @@
  * @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 3610b202e..0dd87c339 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -25,6 +25,7 @@
  * @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 f80a2859c..1d0232649 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -27,6 +27,7 @@
  * @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 65f589966..9fe7fbae7 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -25,6 +25,7 @@
  * @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 8c27af9de..da9f4ea5a 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -25,6 +25,7 @@
  * @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 cdea8b72d..8b91646b1 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -81,6 +81,7 @@
  *
  */
 #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 f91e9d00d..1c464001f 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -27,6 +27,7 @@
  * - 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 fbb7c6028..4ab096ad8 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/fs/gnunet-daemon-fsprofiler.c
@@ -27,6 +27,7 @@
  * - 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 ef5c40ae2..c9d92acbd 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -23,6 +23,7 @@
  * @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 eebf8e993..25f2af39f 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -26,6 +26,7 @@
  * @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 62da46834..9503d55cf 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -24,6 +24,7 @@
  * @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 0f8f02a1c..1895276aa 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -23,6 +23,7 @@
  * @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 ef1a9ce4b..fc2751397 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -27,6 +27,7 @@
  * 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 c62edcd61..7a9a1fe5d 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -26,6 +26,7 @@
  * @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 54f0095ea..8ea9c0957 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -26,6 +26,7 @@
  * @author Igor Wronsky
  * @author madmurphy
  */
+#include "platform.h"
 #include <ctype.h>
 #include <inttypes.h>
 #include <limits.h>
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 7da92ed44..ce94fade4 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include <float.h>
 #include "gnunet_constants.h"
 #include "gnunet_core_service.h"
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 398fcd604..f647dc782 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -28,6 +28,7 @@
  *   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 8bfe91cf0..ecfdf437a 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -28,6 +28,7 @@
  *   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 29e4c5910..cd74ba441 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -23,6 +23,7 @@
  * @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 b88cbe365..43ae2e9f2 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include <float.h>
 #include "gnunet_core_service.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index 60dd0ab70..cccc8905b 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -24,6 +24,7 @@
  * @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 b938e3593..9a9510158 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -24,6 +24,7 @@
  * @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 92dbba8e6..a2d387208 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -25,6 +25,7 @@
  * @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 ca2c85724..e997322fd 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -24,6 +24,7 @@
  * @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 afc547127..fb1a96455 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -26,6 +26,7 @@
  * @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 2c7830f5f..6ae218db6 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -24,6 +24,7 @@
  * @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 6b71b1f93..989039558 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c
@@ -44,6 +44,7 @@
  * 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 11677a6b2..6a81f2347 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -24,6 +24,7 @@
  * @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 7a57e98b0..bec4b5d98 100644
--- a/src/fs/test_fs.c
+++ b/src/fs/test_fs.c
@@ -25,6 +25,7 @@
  */
 
 #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 908e7c555..fe0d81959 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -23,6 +23,7 @@
  * @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 2fe0da77c..bff66d7e6 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -25,6 +25,7 @@
  */
 
 #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 35d4ed441..f3bf75a3f 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -24,6 +24,7 @@
  * @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 22013db27..f7c09c77a 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -32,6 +32,7 @@
  *   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 3d0da752b..00510e2f5 100644
--- a/src/fs/test_fs_getopt.c
+++ b/src/fs/test_fs_getopt.c
@@ -23,6 +23,7 @@
  * @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 2f04a017a..4d037a524 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -28,6 +28,7 @@
  * - 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 c1e10d575..c3c8bc1c5 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -24,6 +24,7 @@
  * @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 2132220fb..c14791d77 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/fs/test_fs_namespace_list_updateable.c
@@ -24,6 +24,7 @@
  * @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 2ffc722da..6acc66475 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -24,6 +24,7 @@
  * @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 da0209793..f6864b86e 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -23,6 +23,7 @@
  * @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 b392cc8ac..ebcff83bb 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -23,6 +23,7 @@
  * @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 d523a6404..e745ee54a 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -23,6 +23,7 @@
  * @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 b3c717aa1..3367bd950 100644
--- a/src/fs/test_fs_search_probes.c
+++ b/src/fs/test_fs_search_probes.c
@@ -24,6 +24,7 @@
  * @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 2187f4531..157bd5ed4 100644
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/fs/test_fs_search_with_and.c
@@ -23,6 +23,7 @@
  * @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 509fbe76a..93e4ec3e6 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -24,6 +24,7 @@
  */
 
 #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 714dd452e..3c318648c 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -24,6 +24,7 @@
  * @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 992672244..f7928a19b 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -24,6 +24,7 @@
  * @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 802aaf7ca..9ff5cf453 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -24,6 +24,7 @@
  * @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 e0f23097b..c7b794f07 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -23,6 +23,7 @@
  * @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 38b00f3e8..51b98d26a 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -24,6 +24,7 @@
  * @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 2d1fbb788..265b0de9c 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -24,6 +24,7 @@
  * @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 f15d10b17..22ef87412 100644
--- a/src/fs/test_plugin_block_fs.c
+++ b/src/fs/test_plugin_block_fs.c
@@ -23,6 +23,7 @@
  * @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 9e25154ef..2da63e9b7 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -24,6 +24,7 @@
  * @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 c88ce776e..e3da0d9c3 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -24,6 +24,7 @@
  * @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 754f8ac6f..7c36f9497 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/gns/gnunet-bcd.c
@@ -25,6 +25,7 @@
  */
 
 #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 960d84fb3..5fe28591a 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -23,6 +23,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>
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c
index b36a83f21..325fc5207 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/gns/gnunet-gns-benchmark.c
@@ -23,6 +23,7 @@
  * @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 e99c4d3dd..c16f9a94f 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -24,6 +24,7 @@
  * @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 312fde293..dca419b5d 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -28,6 +28,7 @@
  * - 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 5cf496808..baa784404 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 7e770ce5a..17f02126a 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 86c059c5f..c495c63c2 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 45d971c85..114c64ef7 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 75e182092..3075c45f5 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -26,6 +26,7 @@
  */
 
 #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 296957f19..3fd9e14cd 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -27,6 +27,7 @@
  * @author Christian Grothoff
  */
 #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/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index 659b77493..61d556571 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -24,6 +24,7 @@
  */
 
 #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 e09db5787..3daf11fca 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -24,6 +24,7 @@
  * @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 ae4223021..55100a95e 100644
--- a/src/gnsrecord/gnsrecord.c
+++ b/src/gnsrecord/gnsrecord.c
@@ -26,6 +26,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_gnsrecord_lib.h"
diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c
index a62304c40..e6036b72b 100644
--- a/src/gnsrecord/gnsrecord_crypto.c
+++ b/src/gnsrecord/gnsrecord_crypto.c
@@ -25,6 +25,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "gnsrecord_crypto.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "gnsrecord", __VA_ARGS__)
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index e225bcc7f..c179534c9 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -26,6 +26,7 @@
  * @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/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c
index ef7684892..a32605692 100644
--- a/src/gnsrecord/gnsrecord_serialization.c
+++ b/src/gnsrecord/gnsrecord_serialization.c
@@ -26,6 +26,7 @@
  * @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/gnsrecord/gnunet-gnsrecord-tvg.c b/src/gnsrecord/gnunet-gnsrecord-tvg.c
index 91abe1954..6f6ee6347 100644
--- a/src/gnsrecord/gnunet-gnsrecord-tvg.c
+++ b/src/gnsrecord/gnunet-gnsrecord-tvg.c
@@ -24,6 +24,7 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_gns_service.h"
diff --git a/src/gnsrecord/json_gnsrecord.c b/src/gnsrecord/json_gnsrecord.c
index 0725cb1a1..9ef681b60 100644
--- a/src/gnsrecord/json_gnsrecord.c
+++ b/src/gnsrecord/json_gnsrecord.c
@@ -24,6 +24,7 @@
  * @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 6b5f84235..0cedb8ee0 100644
--- a/src/gnsrecord/perf_gnsrecord_crypto.c
+++ b/src/gnsrecord/perf_gnsrecord_crypto.c
@@ -22,6 +22,7 @@
  * @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 e8c24501c..4c7f36594 100644
--- a/src/gnsrecord/plugin_gnsrecord_dns.c
+++ b/src/gnsrecord/plugin_gnsrecord_dns.c
@@ -24,6 +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 d14ce3914..6d2ad6d5b 100644
--- a/src/gnsrecord/test_gnsrecord_block_expiration.c
+++ b/src/gnsrecord/test_gnsrecord_block_expiration.c
@@ -22,6 +22,7 @@
  * @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 ad7b62cc8..612db4c99 100644
--- a/src/gnsrecord/test_gnsrecord_crypto.c
+++ b/src/gnsrecord/test_gnsrecord_crypto.c
@@ -22,6 +22,7 @@
  * @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 d268cb7f3..e89cc3e1b 100644
--- a/src/gnsrecord/test_gnsrecord_serialization.c
+++ b/src/gnsrecord/test_gnsrecord_serialization.c
@@ -22,6 +22,7 @@
  * @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 bb4922417..f2b90df3b 100644
--- a/src/gnsrecord/test_gnsrecord_testvectors.c
+++ b/src/gnsrecord/test_gnsrecord_testvectors.c
@@ -1,4 +1,5 @@
 #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 6a1b68029..1d867c752 100644
--- a/src/hello/address.c
+++ b/src/hello/address.c
@@ -24,6 +24,7 @@
  * @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 1f110ac18..f1a5c8222 100644
--- a/src/hello/gnunet-hello.c
+++ b/src/hello/gnunet-hello.c
@@ -23,6 +23,7 @@
  * @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 da3a069e0..3843bebc6 100644
--- a/src/hello/hello-ng.c
+++ b/src/hello/hello-ng.c
@@ -24,6 +24,7 @@
  * @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 dd191738f..b51545b95 100644
--- a/src/hello/hello-uri.c
+++ b/src/hello/hello-uri.c
@@ -35,6 +35,7 @@
  *   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 45d27c5d4..811532f9b 100644
--- a/src/hello/hello.c
+++ b/src/hello/hello.c
@@ -25,6 +25,7 @@
  * @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 1b092c0b8..35e27905c 100644
--- a/src/hello/test_friend_hello.c
+++ b/src/hello/test_friend_hello.c
@@ -23,6 +23,7 @@
  * @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 4ace9439f..e38ba0db5 100644
--- a/src/hello/test_hello-ng.c
+++ b/src/hello/test_hello-ng.c
@@ -18,6 +18,7 @@
      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 7e70d6763..d66f3c464 100644
--- a/src/hello/test_hello-uri.c
+++ b/src/hello/test_hello-uri.c
@@ -23,6 +23,7 @@
  * @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 8631d2af3..b8c161b87 100644
--- a/src/hello/test_hello.c
+++ b/src/hello/test_hello.c
@@ -23,6 +23,7 @@
  * @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 54e070f89..7ec25202e 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -24,6 +24,7 @@
  * @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 399a7dc39..061fde312 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -24,6 +24,7 @@
  * @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 46b18b266..4e087b76a 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -26,6 +26,7 @@
  * @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 063db2f99..d3ac238ca 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -23,6 +23,7 @@
  * @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 a0656f770..82a8e1655 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -23,6 +23,7 @@
  * @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 321f96f3d..a57801eb1 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -24,6 +24,7 @@
  * @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 06e6fb613..ba5d85f4c 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -26,6 +26,7 @@
  * - 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 07296a882..8c7b1eb37 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -31,6 +31,7 @@
  *   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 47a78e2bb..7f040337d 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -24,6 +24,7 @@
  * @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 4cc0b6334..ad77e64cb 100644
--- a/src/identity/identity_api_lookup.c
+++ b/src/identity/identity_api_lookup.c
@@ -24,6 +24,7 @@
  * @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 4b459345d..db693b79f 100644
--- a/src/identity/identity_api_suffix_lookup.c
+++ b/src/identity/identity_api_suffix_lookup.c
@@ -24,6 +24,7 @@
  * @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 17d214c15..e913cb840 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -25,6 +25,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_rest_plugin.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_rest_lib.h"
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index 2c44f73ba..4d47eba81 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -24,6 +24,7 @@
  * @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/.gitignore b/src/include/.gitignore
index 9529b45c3..b25882925 100644
--- a/src/include/.gitignore
+++ b/src/include/.gitignore
@@ -3,3 +3,4 @@ gnu_name_system_record_flags.h
 gnu_name_system_record_types.h
 gnunet_signatures.h
 !gnunet_config.h.in
+gnunet_config.h
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index fa964f672..ca1aff6e1 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST = \
 gnunetinclude_HEADERS = \
   platform.h \
   gnunet_config.h \
-  gnunet_platform.h \
   gettext.h \
   compat.h \
   gnunet_abd_service.h \
diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 292858031..4ac6d0250 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -33,7 +33,7 @@
 #ifndef BLOCK_DNS_H
 #define BLOCK_DNS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index 719a7db03..b64a83f39 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -34,7 +34,7 @@
 #ifndef BLOCK_FS_H
 #define BLOCK_FS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 
diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 660ee7742..fea19e335 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -36,7 +36,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <stdint.h>
 
diff --git a/src/include/gauger.h b/src/include/gauger.h
index d33b70aaf..f811b335c 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -11,7 +11,7 @@
 #ifndef __GAUGER_H__
 #define __GAUGER_H__
 
-#include "gnunet_platform.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/wait.h>
diff --git a/src/include/gettext.h b/src/include/gettext.h
index 50067d00e..6e98f197a 100644
--- a/src/include/gettext.h
+++ b/src/include/gettext.h
@@ -23,7 +23,7 @@
 #if ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
-#include "gnunet_platform.h"
+
 #include <libintl.h>
 
 #else
diff --git a/src/include/gnunet_abd_service.h b/src/include/gnunet_abd_service.h
index 76a52414c..75c1757ab 100644
--- a/src/include/gnunet_abd_service.h
+++ b/src/include/gnunet_abd_service.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_ABD_SERVICE_H
 #define GNUNET_ABD_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_identity_service.h"
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 453ff4b03..639e723c5 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_ats_application_service.h b/src/include/gnunet_ats_application_service.h
index 84dd1e3bc..da7fd4b52 100644
--- a/src/include/gnunet_ats_application_service.h
+++ b/src/include/gnunet_ats_application_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_ATS_APPLICATION_SERVICE_H
 #define GNUNET_ATS_APPLICATION_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 8ef16d1e5..206f2dd52 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -40,7 +40,7 @@
 #ifndef PLUGIN_ATS_H
 #define PLUGIN_ATS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_ats_service.h"
 #include "gnunet_statistics_service.h"
 
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 68f34cf2d..ce149875a 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_ATS_SERVICE_H
 #define GNUNET_ATS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/include/gnunet_ats_transport_service.h b/src/include/gnunet_ats_transport_service.h
index 625211e82..b6c7b15ae 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_ATS_TRANSPORT_SERVICE_H
 #define GNUNET_ATS_TRANSPORT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 9ea6796ea..1df4cde56 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 800a136ef..f1a68022a 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_BIO_LIB_H
 #define GNUNET_BIO_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_container_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h
index 92bfe69a7..b1f59899e 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -31,7 +31,7 @@
 #ifndef GNUNET_BLOCK_GROUP_LIB_H
 #define GNUNET_BLOCK_GROUP_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 95c9514e1..fdccbab78 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_BLOCK_LIB_H
 #define GNUNET_BLOCK_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_block_types.h"
 
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index 75681d227..16e93c780 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -38,7 +38,7 @@
 #ifndef PLUGIN_BLOCK_H
 #define PLUGIN_BLOCK_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index 63ebfbe9f..acc7bb330 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 63c988f34..0fca362cd 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_mq_lib.h"
 
 
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index d4654a75c..375ff1adc 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -40,29 +40,35 @@
 #ifndef GNUNET_COMMON_H
 #define GNUNET_COMMON_H
 
-#include "gnunet_platform.h"
+#include "gnunet_config.h"
+
 #include <stdlib.h>
-#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
-#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#endif
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 
+#if defined(__FreeBSD__)
+
+#include <sys/endian.h>
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+
+#elif defined(__OpenBSD__)
+
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+
+#elif defined(__NetBSD__)
+
+#include <machine/bswap.h>
+#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#endif
 
-#ifdef HAVE_BYTESWAP_H
+#elif defined(__linux__) || defined(GNU)
 #include <byteswap.h>
 #endif
 
@@ -156,7 +162,7 @@ enum GNUNET_GenericReturnValue
  */
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#ifdef HAVE_BYTESWAP_H
+#if defined(bswap_16) || defined(bswap_32) || defined(bswap_64)
 #define BYTE_SWAP_16(x) bswap_16 (x)
 #define BYTE_SWAP_32(x) bswap_32 (x)
 #define BYTE_SWAP_64(x) bswap_64 (x)
diff --git a/src/include/gnunet_config.h.in b/src/include/gnunet_config.h.in
index 4eb00388f..5b0d69a03 100644
--- a/src/include/gnunet_config.h.in
+++ b/src/include/gnunet_config.h.in
@@ -45,7 +45,10 @@
 /* Set to 1 is this is an experimental build */
 #define GNUNET_EXPERIMENTAL @enable_experimental@
 
-/* Define to 1 if GnuTLS has DANE support */
+/* Set to 1 if GnuTLS has DANE support */
 #define GNUNET_CURL_GNUTLS @curl_gnutls@
 
+/* Set to 1 is we have the byteswap header */
+#define GNUNET_HAVE_BYTESWAP_H @have_byteswap@
+
 #endif
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 18bd2de62..3b9be5849 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_CONFIGURATION_LIB_H
 #define GNUNET_CONFIGURATION_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_time_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index c63012109..47a928d9c 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index f02f5db22..f6fd8e641 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -58,7 +58,7 @@
 #define GNUNET_CONTAINER_LIB_H
 
 /* add error and config prototypes */
-#include "gnunet_platform.h"
+
 #include "gnunet_crypto_lib.h"
 
 
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index b3778dbf5..7d54914d1 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -61,7 +61,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index b58e7f24a..4e188df87 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index eaf6b79b5..9ee23cf62 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -54,7 +54,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include <stdbool.h>
 #include <sodium.h>
 
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index cabd5e268..bdf3843b1 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -32,7 +32,7 @@
  */
 #ifndef GNUNET_CURL_LIB_H
 #define GNUNET_CURL_LIB_H
-#include "gnunet_platform.h"
+
 #include <curl/curl.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 28c600412..2c7bf1e8f 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -40,7 +40,7 @@
 #ifndef GNUNET_DATACACHE_LIB_H
 #define GNUNET_DATACACHE_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_dht_service.h"
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 352c7e31b..e144e155e 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -34,7 +34,7 @@
 #ifndef PLUGIN_DATACACHE_H
 #define PLUGIN_DATACACHE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_datacache_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 319423e4f..c4f31c7ce 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef PLUGIN_DATASTORE_H
 #define PLUGIN_DATASTORE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_block_lib.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 33a4dfdb6..153387238 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -42,7 +42,7 @@
 #ifndef GNUNET_DATASTORE_SERVICE_H
 #define GNUNET_DATASTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 91730dea9..1ff665c2b 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_DB_LIB_H
 #define GNUNET_DB_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 /**
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 682fea303..3d1264991 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -40,7 +40,7 @@
 #ifndef GNUNET_DHT_SERVICE_H
 #define GNUNET_DHT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/include/gnunet_dhtu_plugin.h b/src/include/gnunet_dhtu_plugin.h
index 913dfabca..0503dda1c 100644
--- a/src/include/gnunet_dhtu_plugin.h
+++ b/src/include/gnunet_dhtu_plugin.h
@@ -27,7 +27,7 @@
 #ifndef PLUGIN_DHTU_H
 #define PLUGIN_DHTU_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 8d1f96615..d982dfe72 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -76,7 +76,7 @@ struct GNUNET_DISK_FileHandle
    or unsigned long long, this IS platform dependent;
    but "stdlib.h" should be portable 'enough' to be
    unconditionally available... */
-#include "gnunet_platform.h"
+
 #include <stdlib.h>
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index 8772229a2..b5741a7e2 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_DNS_SERVICE_H
 #define GNUNET_DNS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 979669a5f..06fa7a5a7 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_DNSPARSER_LIB_H
 #define GNUNET_DNSPARSER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index b9ab4c122..8cd4bfa80 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_DNSSTUB_LIB_H
 #define GNUNET_DNSSTUB_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index 7c7af0318..cec4b9154 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_FRAGMENTATION_LIB_H
 #define GNUNET_FRAGMENTATION_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index b26af24ca..4f4d5e88b 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -42,7 +42,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 6035b6915..6b46f1553 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_FS_LIB_H
 #define GNUNET_FS_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 13c9cf9ce..49bb0d77b 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 
 /**
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index ee2a8449c..e296d0ef9 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNS_SERVICE_H
 #define GNUNET_GNS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/include/gnunet_gnsrecord_json_lib.h b/src/include/gnunet_gnsrecord_json_lib.h
index 9727b3b0e..1216f1f5e 100644
--- a/src/include/gnunet_gnsrecord_json_lib.h
+++ b/src/include/gnunet_gnsrecord_json_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNSRECORD_JSON_LIB_H
 #define GNUNET_GNSRECORD_JSON_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_json_lib.h"
 
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index a49b2ea5f..6fc2a05c5 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNSRECORD_LIB_H
 #define GNUNET_GNSRECORD_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 2c80f1df1..20a61cbfb 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_hello_uri_lib.h b/src/include/gnunet_hello_uri_lib.h
index 73cde8c0a..bba7078e6 100644
--- a/src/include/gnunet_hello_uri_lib.h
+++ b/src/include/gnunet_hello_uri_lib.h
@@ -42,7 +42,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index 967ecb070..ac7d1602d 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_HELPER_LIB_H
 #define GNUNET_HELPER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_mst_lib.h"
 
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index ca203dd77..67327af5d 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -52,7 +52,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index a5808ab94..a65293a7c 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_JSON_LIB_H
 #define GNUNET_JSON_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <jansson.h>
 #include <microhttpd.h>
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index 974db45ef..56cacfbbb 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 6878538b4..961f57eb0 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/include/gnunet_mhd_compat.h b/src/include/gnunet_mhd_compat.h
index 4b0a62436..ca41fb95a 100644
--- a/src/include/gnunet_mhd_compat.h
+++ b/src/include/gnunet_mhd_compat.h
@@ -25,7 +25,7 @@
  * MHD compatibility definitions for warning-less compile of
  * our code against MHD before and after #MHD_VERSION 0x00097002.
  */
-#include "gnunet_platform.h"
+
 #include <microhttpd.h>
 
 #if MHD_VERSION >= 0x00097002
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index eb4181ef5..394caed68 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index b99fff9e3..09d2ff0ea 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_MQ_LIB_H
 #define GNUNET_MQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_scheduler_lib.h"
 
 /**
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 122ab4835..052540ff5 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index faaddf0c5..68ce16286 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_MY_LIB_H
 #define GNUNET_MY_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_mysql_lib.h"
 #include <mysql/mysql.h>
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index c1b52c9c3..88408890b 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -30,7 +30,7 @@
 #ifndef GNUNET_MYSQL_LIB_H
 #define GNUNET_MYSQL_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <mysql/mysql.h>
 
diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h
index 5ab5f0be5..a3848bf4e 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_NAMECACHE_PLUGIN_H
 #define GNUNET_NAMECACHE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h
index 22b91f64c..669386c37 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_NAMECACHE_SERVICE_H
 #define GNUNET_NAMECACHE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 16ea9e386..f2bdf7cc6 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_NAMESTORE_PLUGIN_H
 #define GNUNET_NAMESTORE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 372b26a1a..b93a345c7 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_NAMESTORE_SERVICE_H
 #define GNUNET_NAMESTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_error_codes.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h
index 502031d5e..1c511cac3 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_NAT_AUTO_SERVICE_H
 #define GNUNET_NAT_AUTO_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index 9fbdc1dcb..f2854a0be 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_NAT_SERVICE_H
 #define GNUNET_NAT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 9d240151b..8d71d7764 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -52,7 +52,7 @@ extern "C"
  * Include "sys/select.h" because it is required to use
  * "fd_set" in "struct GNUNET_NETWORK_FDSet"!
  */
-#include "gnunet_platform.h"
+
 #include <sys/select.h>
 //#endif
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 1c8857060..fe9e1f853 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index dfeb49686..2c2abf7da 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -32,7 +32,7 @@
 #ifndef GNUNET_OP_H
 #define GNUNET_OP_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index d4d436338..428d8610b 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -60,7 +60,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index 5da8edd22..e4a34021a 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_PEER_LIB_H
 #define GNUNET_PEER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 0657c91f9..89c6b65f8 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_PEERINFO_SERVICE_H
 #define GNUNET_PEERINFO_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h
index f36aad98e..2636c3009 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_PEERSTORE_PLUGIN_H
 #define GNUNET_PEERSTORE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_peerstore_service.h"
 
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index 48433355c..c4000c680 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_PEERSTORE_SERVICE_H
 #define GNUNET_PEERSTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_platform.h b/src/include/gnunet_platform.h
deleted file mode 100644
index 40f07ecbd..000000000
--- a/src/include/gnunet_platform.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2022 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- *
- * @file
- * Convenience header including the default gnunet platform header or
- * a defined custom platform header.
- *
- */
-
-#ifndef GNUNET_PLATFORM_H
-#define GNUNET_PLATFORM_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-#if defined (GNUNET_CUSTOM_PLATFORM_H)
-#include GNUNET_CUSTOM_PLATFORM_H
-#else
-#include "platform.h"
-#endif
-
-#endif
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index ee650aa8b..ea548b196 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 2c125bc2e..4cbc2a139 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_PQ_LIB_H
 #define GNUNET_PQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include <libpq-fe.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_db_lib.h"
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 2b6f5c747..2aadd1b8e 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 1e3ea9916..e4dec14fa 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -40,7 +40,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 enum GNUNET_RECLAIM_AttributeType {
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 5c5ba9ccc..f8b2084d2 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -33,7 +33,7 @@
 #ifndef GNUNET_RECLAIM_PLUGIN_H
 #define GNUNET_RECLAIM_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_lib.h"
 
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 13605c43c..49a006e91 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -41,7 +41,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 #include "gnunet_reclaim_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index 096cf87f9..093bf2d6a 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_REGEX_SERVICE_H
 #define GNUNET_REGEX_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index 953bf24cd..89fec24f5 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index ced3d13b1..f70500de5 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_REST_LIB_H
 #define GNUNET_REST_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <microhttpd.h>
 
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 15065a6e3..45b391ca1 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -32,7 +32,7 @@
 #ifndef GNUNET_REST_PLUGIN_H
 #define GNUNET_REST_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_rest_lib.h"
 #include "microhttpd.h"
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index 3b0e67a9a..81a90189b 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -21,7 +21,7 @@
 #ifndef GNUNET_REVOCATION_SERVICE_H_
 #define GNUNET_REVOCATION_SERVICE_H_
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 
 /**
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 879e022b0..96d12db3f 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -31,7 +31,7 @@
 #ifndef GNUNET_SCALARPRODUCT_SERVICE_H
 #define GNUNET_SCALARPRODUCT_SERVICE_H
 #define GCRYPT_NO_DEPRECATED
-#include "gnunet_platform.h"
+
 #include <gcrypt.h>
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 13a071054..0118a1535 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -96,7 +96,7 @@ enum GNUNET_SCHEDULER_Reason
 };
 
 
-#include "gnunet_platform.h"
+
 #include "gnunet_time_lib.h"
 #include "gnunet_network_lib.h"
 
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h
index 9056dd66d..de629b308 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -40,7 +40,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 033b26ec9..aef42be5f 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_mq_lib.h"
 
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index d1e663948..6874c9ec4 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -47,7 +47,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_seti_service.h b/src/include/gnunet_seti_service.h
index e92bbf11c..9125ae825 100644
--- a/src/include/gnunet_seti_service.h
+++ b/src/include/gnunet_seti_service.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_setu_service.h b/src/include/gnunet_setu_service.h
index 5d8d3e885..89a50f138 100644
--- a/src/include/gnunet_setu_service.h
+++ b/src/include/gnunet_setu_service.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index 9f124d3bb..98a27cd1a 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index 116f8eb88..c6bb128dd 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index d75b96785..b84e6759a 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_SQ_LIB_H
 #define GNUNET_SQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include <sqlite3.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index 269176a4b..0fe09e69a 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 254f10ca5..65d643b2d 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -44,7 +44,7 @@
    or unsigned long long, this IS platform dependent;
    but "stdlib.h" should be portable 'enough' to be
    unconditionally available... */
-#include "gnunet_platform.h"
+
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 505873452..7ab943b15 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index d418381ec..acd87e2cd 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -38,7 +38,7 @@
 #ifndef GNUNET_TESTBED_SERVICE_H
 #define GNUNET_TESTBED_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index cf33231b2..cd9d88822 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -44,7 +44,7 @@
 #ifndef GNUNET_TESTING_LIB_H
 #define GNUNET_TESTING_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_arm_service.h"
diff --git a/src/include/gnunet_testing_netjail_lib.h b/src/include/gnunet_testing_netjail_lib.h
index 8af13df53..d92734823 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_TESTING_NETJAIL_LIB_H
 #define GNUNET_TESTING_NETJAIL_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_plugin.h"
 #include "gnunet_testing_ng_lib.h"
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index e838839e7..44e88f4b1 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_TESTING_NG_LIB_H
 #define GNUNET_TESTING_NG_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_plugin.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index a54d1d1ca..308aadb53 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 /**
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index bc3c94efa..6ec1aa578 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -33,7 +33,7 @@
 #ifndef GNUNET_TRANSPORT_APPLICATION_SERVICE_H
 #define GNUNET_TRANSPORT_APPLICATION_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index 290fdc1e1..b523f1536 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
 
diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h
index 3a3f52901..9153161d3 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h
index 3ed948b71..03305ec27 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -46,7 +46,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h
index 5a541b20d..694ca7dca 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -47,7 +47,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h
index b6ba71229..acf7ade69 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -45,7 +45,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_transport_service.h"
 #include "gnunet_transport_communication_service.h"
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index e48d7fcdd..0ab4a995c 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -39,7 +39,7 @@
 #ifndef PLUGIN_TRANSPORT_H
 #define PLUGIN_TRANSPORT_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index f5baaf65d..72cdbe0a7 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 079571520..a48bb3fbe 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_TUN_LIB_H
 #define GNUNET_TUN_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_crypto_lib.h"
 
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 804bc3c39..25df4e234 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
 
+#include <sys/socket.h>
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -59,9 +61,9 @@ extern "C"
  * this service available to anyone but yourself.
  */
 #define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v" \
-  PACKAGE_VERSION
+  GNUNET_VERSION
+
 
-#include "gnunet_platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_bio_lib.h"
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index a55bb994f..f0a04ae1b 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_VPN_SERVICE_H
 #define GNUNET_VPN_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/json/json.c b/src/json/json.c
index 07ec158be..d584ed772 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -25,6 +25,7 @@
  * @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 4fda86e32..452cf7bf1 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -23,6 +23,7 @@
  * @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 aadc6804d..933c82cf7 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -25,6 +25,7 @@
  * @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 0b0fa0538..1808e6782 100644
--- a/src/json/json_mhd.c
+++ b/src/json/json_mhd.c
@@ -25,6 +25,7 @@
  * @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 8fc806086..2cf83b0d6 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -23,6 +23,7 @@
  * @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 d6c372cf3..c6784827a 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -24,6 +24,7 @@
  * @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 642715f25..54eb88103 100644
--- a/src/json/test_json_mhd.c
+++ b/src/json/test_json_mhd.c
@@ -24,6 +24,7 @@
  * @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 11b0e091a..40f3e1d32 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.c
@@ -23,6 +23,7 @@
  * @brief Print information about messenger groups.
  */
 
+#include "platform.h"
 #include <stdio.h>
 
 #include "platform.h"
diff --git a/src/messenger/gnunet-service-messenger.c b/src/messenger/gnunet-service-messenger.c
index a4b46773d..f0bb853d7 100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/messenger/gnunet-service-messenger.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger.h"
 
 #include "gnunet-service-messenger_handle.h"
diff --git a/src/messenger/gnunet-service-messenger_basement.c b/src/messenger/gnunet-service-messenger_basement.c
index 89aa103ee..ae0dcaa62 100644
--- a/src/messenger/gnunet-service-messenger_basement.c
+++ b/src/messenger/gnunet-service-messenger_basement.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_basement.h"
 
 size_t
diff --git a/src/messenger/gnunet-service-messenger_ego_store.c b/src/messenger/gnunet-service-messenger_ego_store.c
index 434c418e5..3eb313b08 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.c
+++ b/src/messenger/gnunet-service-messenger_ego_store.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_ego_store.h"
 
 #include "gnunet-service-messenger_handle.h"
diff --git a/src/messenger/gnunet-service-messenger_handle.c b/src/messenger/gnunet-service-messenger_handle.c
index 28fa022c7..17692761d 100644
--- a/src/messenger/gnunet-service-messenger_handle.c
+++ b/src/messenger/gnunet-service-messenger_handle.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_handle.h"
 
 #include "gnunet-service-messenger.h"
diff --git a/src/messenger/gnunet-service-messenger_list_handles.c b/src/messenger/gnunet-service-messenger_list_handles.c
index f2daa2e70..0703c2de6 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.c
+++ b/src/messenger/gnunet-service-messenger_list_handles.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_list_handles.h"
 
 #include "gnunet-service-messenger_handle.h"
diff --git a/src/messenger/gnunet-service-messenger_list_messages.c b/src/messenger/gnunet-service-messenger_list_messages.c
index 7092dc76f..5bab52806 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.c
+++ b/src/messenger/gnunet-service-messenger_list_messages.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_list_messages.h"
 
 void
diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/messenger/gnunet-service-messenger_member.c
index 976b68fe6..444148831 100644
--- a/src/messenger/gnunet-service-messenger_member.c
+++ b/src/messenger/gnunet-service-messenger_member.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_member.h"
 
 #include "gnunet-service-messenger_member_session.h"
diff --git a/src/messenger/gnunet-service-messenger_member_session.c b/src/messenger/gnunet-service-messenger_member_session.c
index d71513046..519ac6f05 100644
--- a/src/messenger/gnunet-service-messenger_member_session.c
+++ b/src/messenger/gnunet-service-messenger_member_session.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_member_session.h"
 
 #include "gnunet-service-messenger_room.h"
diff --git a/src/messenger/gnunet-service-messenger_member_store.c b/src/messenger/gnunet-service-messenger_member_store.c
index 844130429..fc28babc4 100644
--- a/src/messenger/gnunet-service-messenger_member_store.c
+++ b/src/messenger/gnunet-service-messenger_member_store.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_member_store.h"
 
 #include "gnunet-service-messenger_member.h"
diff --git a/src/messenger/gnunet-service-messenger_message_handle.c b/src/messenger/gnunet-service-messenger_message_handle.c
index 6016ce438..06b987657 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/messenger/gnunet-service-messenger_message_handle.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_handle.h"
 
 static void
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/messenger/gnunet-service-messenger_message_kind.c
index 2449b9230..828e84d4f 100644
--- a/src/messenger/gnunet-service-messenger_message_kind.c
+++ b/src/messenger/gnunet-service-messenger_message_kind.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_kind.h"
 
 #include "messenger_api_util.h"
diff --git a/src/messenger/gnunet-service-messenger_message_recv.c b/src/messenger/gnunet-service-messenger_message_recv.c
index 4e96cf552..94202fdca 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.c
+++ b/src/messenger/gnunet-service-messenger_message_recv.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_recv.h"
 
 #include "gnunet-service-messenger_operation.h"
diff --git a/src/messenger/gnunet-service-messenger_message_send.c b/src/messenger/gnunet-service-messenger_message_send.c
index 5cb3cd627..09039758b 100644
--- a/src/messenger/gnunet-service-messenger_message_send.c
+++ b/src/messenger/gnunet-service-messenger_message_send.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_send.h"
 
 #include "gnunet-service-messenger_member.h"
diff --git a/src/messenger/gnunet-service-messenger_message_state.c b/src/messenger/gnunet-service-messenger_message_state.c
index 344962d11..b2328588e 100644
--- a/src/messenger/gnunet-service-messenger_message_state.c
+++ b/src/messenger/gnunet-service-messenger_message_state.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_state.h"
 
 void
diff --git a/src/messenger/gnunet-service-messenger_message_store.c b/src/messenger/gnunet-service-messenger_message_store.c
index 6805cd125..1f77de9ca 100644
--- a/src/messenger/gnunet-service-messenger_message_store.c
+++ b/src/messenger/gnunet-service-messenger_message_store.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_message_store.h"
 #include "messenger_api_message.h"
 
diff --git a/src/messenger/gnunet-service-messenger_operation.c b/src/messenger/gnunet-service-messenger_operation.c
index 2b92d0c1d..9c4201fdf 100644
--- a/src/messenger/gnunet-service-messenger_operation.c
+++ b/src/messenger/gnunet-service-messenger_operation.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_operation.h"
 
 #include "gnunet-service-messenger_operation_store.h"
diff --git a/src/messenger/gnunet-service-messenger_operation_store.c b/src/messenger/gnunet-service-messenger_operation_store.c
index 276f0b92b..6a639d69e 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.c
+++ b/src/messenger/gnunet-service-messenger_operation_store.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_operation_store.h"
 
 #include "gnunet-service-messenger_operation.h"
diff --git a/src/messenger/gnunet-service-messenger_room.c b/src/messenger/gnunet-service-messenger_room.c
index 068597f51..4b734cb40 100644
--- a/src/messenger/gnunet-service-messenger_room.c
+++ b/src/messenger/gnunet-service-messenger_room.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_room.h"
 
 #include "gnunet-service-messenger_member.h"
diff --git a/src/messenger/gnunet-service-messenger_service.c b/src/messenger/gnunet-service-messenger_service.c
index 3d5801b09..8dfc258c1 100644
--- a/src/messenger/gnunet-service-messenger_service.c
+++ b/src/messenger/gnunet-service-messenger_service.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_service.h"
 #include "gnunet-service-messenger_message_kind.h"
 #include "gnunet-service-messenger.h"
diff --git a/src/messenger/gnunet-service-messenger_tunnel.c b/src/messenger/gnunet-service-messenger_tunnel.c
index 83973bbbe..8ad7fff1c 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.c
+++ b/src/messenger/gnunet-service-messenger_tunnel.c
@@ -23,6 +23,7 @@
  * @brief GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet-service-messenger_tunnel.h"
 
 #include "gnunet-service-messenger_handle.h"
diff --git a/src/messenger/messenger_api.c b/src/messenger/messenger_api.c
index 85092fc43..610c979c4 100644
--- a/src/messenger/messenger_api.c
+++ b/src/messenger/messenger_api.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "gnunet_messenger_service.h"
 
 #include "gnunet-service-messenger.h"
diff --git a/src/messenger/messenger_api_contact.c b/src/messenger/messenger_api_contact.c
index cbca17640..a284c3b08 100644
--- a/src/messenger/messenger_api_contact.c
+++ b/src/messenger/messenger_api_contact.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_contact.h"
 
 struct GNUNET_MESSENGER_Contact*
diff --git a/src/messenger/messenger_api_contact_store.c b/src/messenger/messenger_api_contact_store.c
index 1c10a8fbf..d42155e20 100644
--- a/src/messenger/messenger_api_contact_store.c
+++ b/src/messenger/messenger_api_contact_store.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_contact_store.h"
 
 #include "messenger_api_contact.h"
diff --git a/src/messenger/messenger_api_handle.c b/src/messenger/messenger_api_handle.c
index 242389040..ec8d3dc7a 100644
--- a/src/messenger/messenger_api_handle.c
+++ b/src/messenger/messenger_api_handle.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_handle.h"
 
 #include "messenger_api_util.h"
diff --git a/src/messenger/messenger_api_list_tunnels.c b/src/messenger/messenger_api_list_tunnels.c
index 7e77d8f2f..a4126c286 100644
--- a/src/messenger/messenger_api_list_tunnels.c
+++ b/src/messenger/messenger_api_list_tunnels.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client and service implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_list_tunnels.h"
 
 void
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c
index dba08b40b..ac63f16ca 100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/messenger/messenger_api_message.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client and service implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_message.h"
 
 struct GNUNET_MESSENGER_MessageSignature
diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
index 6e2d33f48..c3e8bc957 100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/messenger/messenger_api_room.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_room.h"
 
 #include "messenger_api_handle.h"
diff --git a/src/messenger/messenger_api_util.c b/src/messenger/messenger_api_util.c
index 52b4e934a..f56e2e201 100644
--- a/src/messenger/messenger_api_util.c
+++ b/src/messenger/messenger_api_util.c
@@ -23,6 +23,7 @@
  * @brief messenger api: client implementation of GNUnet MESSENGER service
  */
 
+#include "platform.h"
 #include "messenger_api_util.h"
 
 static void
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/messenger/plugin_gnsrecord_messenger.c
index e09a0330d..eff3f62c4 100644
--- a/src/messenger/plugin_gnsrecord_messenger.c
+++ b/src/messenger/plugin_gnsrecord_messenger.c
@@ -25,6 +25,7 @@
  */
 
 #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 5784dfd82..30fa22db1 100644
--- a/src/messenger/test_messenger.c
+++ b/src/messenger/test_messenger.c
@@ -22,6 +22,7 @@
  * @author Tobias Frisch
  * @brief Test for the messenger service using cadet API.
  */
+#include "platform.h"
 #include <stdio.h>
 #include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/messenger/test_messenger_adapt.c b/src/messenger/test_messenger_adapt.c
index 3230af6b7..b19634152 100644
--- a/src/messenger/test_messenger_adapt.c
+++ b/src/messenger/test_messenger_adapt.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_anonymous.c b/src/messenger/test_messenger_anonymous.c
index 8cb339f0e..15895ae9b 100644
--- a/src/messenger/test_messenger_anonymous.c
+++ b/src/messenger/test_messenger_anonymous.c
@@ -22,6 +22,7 @@
  * @author Tobias Frisch
  * @brief Test for the messenger service using cadet API.
  */
+#include "platform.h"
 #include <stdio.h>
 #include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/messenger/test_messenger_async_client.c b/src/messenger/test_messenger_async_client.c
index 8404195dc..580fc1ecb 100644
--- a/src/messenger/test_messenger_async_client.c
+++ b/src/messenger/test_messenger_async_client.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_async_p2p.c b/src/messenger/test_messenger_async_p2p.c
index 25746f7ff..762be9d49 100644
--- a/src/messenger/test_messenger_async_p2p.c
+++ b/src/messenger/test_messenger_async_p2p.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_growth.c b/src/messenger/test_messenger_growth.c
index c3f243cbf..4a73e559d 100644
--- a/src/messenger/test_messenger_growth.c
+++ b/src/messenger/test_messenger_growth.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_ring.c b/src/messenger/test_messenger_ring.c
index 777d79eb8..c6b17861e 100644
--- a/src/messenger/test_messenger_ring.c
+++ b/src/messenger/test_messenger_ring.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_server.c b/src/messenger/test_messenger_server.c
index 61e96e879..fdd9a3684 100644
--- a/src/messenger/test_messenger_server.c
+++ b/src/messenger/test_messenger_server.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_sync_client.c b/src/messenger/test_messenger_sync_client.c
index 02d90a61d..74c9548bc 100644
--- a/src/messenger/test_messenger_sync_client.c
+++ b/src/messenger/test_messenger_sync_client.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_sync_p2p.c b/src/messenger/test_messenger_sync_p2p.c
index 0a900a39e..299d5ff68 100644
--- a/src/messenger/test_messenger_sync_p2p.c
+++ b/src/messenger/test_messenger_sync_p2p.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_worst_client.c b/src/messenger/test_messenger_worst_client.c
index a3d5aafec..ab535b876 100644
--- a/src/messenger/test_messenger_worst_client.c
+++ b/src/messenger/test_messenger_worst_client.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/test_messenger_worst_p2p.c b/src/messenger/test_messenger_worst_p2p.c
index 89e54cfbd..0af9489a4 100644
--- a/src/messenger/test_messenger_worst_p2p.c
+++ b/src/messenger/test_messenger_worst_p2p.c
@@ -23,6 +23,7 @@
  * @brief Test for the messenger service using cadet API.
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 /**
diff --git a/src/messenger/testing_messenger_barrier.c b/src/messenger/testing_messenger_barrier.c
index a95ea9ef1..60d1fc0fe 100644
--- a/src/messenger/testing_messenger_barrier.c
+++ b/src/messenger/testing_messenger_barrier.c
@@ -23,6 +23,7 @@
  * @brief Pseudo-barriers for simple event handling
  */
 
+#include "platform.h"
 #include "testing_messenger_barrier.h"
 
 struct GNUNET_BarrierHandle
diff --git a/src/messenger/testing_messenger_setup.c b/src/messenger/testing_messenger_setup.c
index 3cde8c9bb..ee278ea77 100644
--- a/src/messenger/testing_messenger_setup.c
+++ b/src/messenger/testing_messenger_setup.c
@@ -23,6 +23,7 @@
  * @brief A simple test-case setup for the messenger service
  */
 
+#include "platform.h"
 #include "testing_messenger_setup.h"
 
 #include <stdio.h>
diff --git a/src/my/my.c b/src/my/my.c
index 468a4a47c..eb91ae3e5 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -24,6 +24,7 @@
  * @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 e44caad91..ad3658106 100644
--- a/src/my/my_query_helper.c
+++ b/src/my/my_query_helper.c
@@ -24,6 +24,7 @@
  * @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 e500c0b27..dc076d9a0 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -24,6 +24,7 @@
  */
 
 #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 ffb5a5f13..bba9f6008 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -23,6 +23,7 @@
  * @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 4c701905c..335e5fed3 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -23,6 +23,7 @@
  * @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 19f2a5766..fe417992a 100644
--- a/src/namecache/gnunet-namecache.c
+++ b/src/namecache/gnunet-namecache.c
@@ -26,6 +26,7 @@
  * - test
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index 0d95cddfb..aa9aa5ced 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -25,6 +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"
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 5e820f8cc..7a8d30b17 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -27,6 +27,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c
index eb7800051..b68e40cbb 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/namecache/plugin_namecache_flat.c
@@ -25,6 +25,7 @@
  */
 
 #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 cdbe248b6..06c4c6bbd 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/namecache/plugin_namecache_postgres.c
@@ -24,6 +24,7 @@
  * @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 2271d1db5..eb1fb8f3b 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -24,6 +24,7 @@
  * @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 2e8940ba3..002c82c36 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/namecache/test_namecache_api_cache_block.c
@@ -22,6 +22,7 @@
  * @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 242b3503b..6d51cd6de 100644
--- a/src/namecache/test_plugin_namecache.c
+++ b/src/namecache/test_plugin_namecache.c
@@ -23,6 +23,7 @@
  * @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 835d7a228..7526510e0 100644
--- a/src/namestore/gnunet-namestore-dbtool.c
+++ b/src/namestore/gnunet-namestore-dbtool.c
@@ -24,6 +24,7 @@
  *
  */
 #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 857b16def..619c056d6 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -25,6 +25,7 @@
  */
 
 #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 d9331aa32..df436652d 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -24,6 +24,7 @@
  *
  */
 #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 8b5cf4dfd..50c69810f 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -26,6 +26,7 @@
  * - test
  */
 #include "platform.h"
+#include "platform.h"
 #include <gnunet_util_lib.h>
 #include <gnunet_dnsparser_lib.h>
 #include <gnunet_identity_service.h>
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index a9ce9e3a1..b86d12712 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -25,6 +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"
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index 0094baf0e..fead9587d 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -23,6 +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>
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 8deded9c0..ae1bd2ca2 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -27,6 +27,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_error_codes.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 199aec608..52d2dda37 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -24,6 +24,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
diff --git a/src/namestore/perf_namestore_api_import.c b/src/namestore/perf_namestore_api_import.c
index 4452de16c..2f6a13148 100644
--- a/src/namestore/perf_namestore_api_import.c
+++ b/src/namestore/perf_namestore_api_import.c
@@ -23,6 +23,7 @@
  * @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 33868784f..079d72136 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -23,6 +23,7 @@
  * @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 3249d524a..eb88c03ac 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/namestore/plugin_namestore_flat.c
@@ -25,6 +25,7 @@
  */
 
 #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 de819f196..8f4d1052c 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -24,6 +24,7 @@
  * @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 15a6586b5..ae60a0211 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -25,6 +25,7 @@
  */
 
 #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 1f2f58097..db6a482be 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -25,6 +25,7 @@
  */
 
 #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_common.c b/src/namestore/test_common.c
index 4f3a3562b..e35c76075 100644
--- a/src/namestore/test_common.c
+++ b/src/namestore/test_common.c
@@ -21,6 +21,7 @@
  * @file namestore/test_common.c
  * @brief common functions for testcase setup
  */
+#include "platform.h"
 #include <gnunet_namestore_plugin.h>
 
 /**
diff --git a/src/namestore/test_namestore_api_edit_records.c b/src/namestore/test_namestore_api_edit_records.c
index ee05f498a..d45c845c5 100644
--- a/src/namestore/test_namestore_api_edit_records.c
+++ b/src/namestore/test_namestore_api_edit_records.c
@@ -22,6 +22,7 @@
  * @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 85a7a4025..f76eade19 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -22,6 +22,7 @@
  * @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 018cf89b1..48e7d1df9 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -22,6 +22,7 @@
  * @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 0123613fb..c0a3082b7 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -22,6 +22,7 @@
  * @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 c6a4549d4..703ac21b4 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -22,6 +22,7 @@
  * @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 ea95a6b57..5923e23c3 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -22,6 +22,7 @@
  * @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 f4f1e36d3..734057fff 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -22,6 +22,7 @@
  * @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 8f1f33542..4a66ad073 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -24,6 +24,7 @@
  * @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 3d0884e24..0042b83be 100644
--- a/src/namestore/test_namestore_api_tx_rollback.c
+++ b/src/namestore/test_namestore_api_tx_rollback.c
@@ -22,6 +22,7 @@
  * @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 6e07f78f2..720445a48 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -22,6 +22,7 @@
  * @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 941d43c28..349bacbae 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -22,6 +22,7 @@
  * @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 daf711c3d..ccf185a1f 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -23,6 +23,7 @@
  * @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 c51224d91..d97686ea3 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -22,6 +22,7 @@
  * @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 c9d781d39..20eea8976 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -22,6 +22,7 @@
  * @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 24af148bf..40df7163a 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -23,6 +23,7 @@
  * @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 055a949bd..acebf8eb1 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -25,6 +25,7 @@
  * @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 4334cc953..fec295535 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-nat-auto_legacy.c
@@ -24,6 +24,7 @@
  * @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 0ff71ca8c..6dcb4fac4 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/nat-auto/gnunet-nat-server.c
@@ -24,6 +24,7 @@
  * @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 7d7c732a0..f85736eac 100644
--- a/src/nat-auto/gnunet-service-nat-auto.c
+++ b/src/nat-auto/gnunet-service-nat-auto.c
@@ -31,6 +31,7 @@
  *   + 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 de7910588..924e1d1be 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c
@@ -25,6 +25,7 @@
  * @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 3c982f883..de4789d50 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/nat-auto/nat_auto_api.c
@@ -26,6 +26,7 @@
  * 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 9067aafda..d6b00bd45 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/nat-auto/nat_auto_api_test.c
@@ -23,6 +23,7 @@
  * @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-helper-nat-client.c b/src/nat/gnunet-helper-nat-client.c
index b86ab591c..0b86aa0d2 100644
--- a/src/nat/gnunet-helper-nat-client.c
+++ b/src/nat/gnunet-helper-nat-client.c
@@ -43,6 +43,7 @@
  */
 #if HAVE_CONFIG_H
 /* Just needed for HAVE_SOCKADDR_IN_SIN_LEN test macro! */
+#include "platform.h"
 #include "gnunet_private_config.h"
 #else
 #define _GNU_SOURCE
diff --git a/src/nat/gnunet-helper-nat-server.c b/src/nat/gnunet-helper-nat-server.c
index 0ea68d46b..d190a5dba 100644
--- a/src/nat/gnunet-helper-nat-server.c
+++ b/src/nat/gnunet-helper-nat-server.c
@@ -44,6 +44,7 @@
  */
 #if HAVE_CONFIG_H
 /* Just needed for HAVE_SOCKADDR_IN_SIN_LEN test macro! */
+#include "platform.h"
 #include "gnunet_private_config.h"
 #else
 #define _GNU_SOURCE
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index fd85549d6..c99a12f5e 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -25,6 +25,7 @@
  * @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 dde269819..378764b16 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -35,6 +35,7 @@
  *   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 c2625be2d..c950e419b 100644
--- a/src/nat/gnunet-service-nat_externalip.c
+++ b/src/nat/gnunet-service-nat_externalip.c
@@ -34,6 +34,7 @@
  * @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 d92f5a99c..2feedcf98 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -25,6 +25,7 @@
  * @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 1e13e3814..702019f67 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -24,6 +24,7 @@
  * @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 203728ebf..cb72a2833 100644
--- a/src/nat/gnunet-service-nat_stun.c
+++ b/src/nat/gnunet-service-nat_stun.c
@@ -37,6 +37,7 @@
  */
 
 #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 3072cff7f..b617f0da0 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -27,6 +27,7 @@
  * 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 94adc3d6c..f268a959a 100644
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -36,6 +36,7 @@
  */
 
 #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 a3072f712..4d9770f3c 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -34,6 +34,7 @@
  */
 
 #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 528815e1a..71295bb0a 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -29,6 +29,7 @@
  */
 
 #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 2abab4d5f..af07ed1f1 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -23,6 +23,7 @@
  * @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 75eb877b3..9ba110c9e 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -29,6 +29,7 @@
 
 
 #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 4b256bc52..bcf86caa9 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -30,6 +30,7 @@
  */
 
 #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 edb73c0fc..2776ee3d5 100644
--- a/src/nse/gnunet-nse.c
+++ b/src/nse/gnunet-nse.c
@@ -25,6 +25,7 @@
  */
 
 #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 ee1cb025f..65db2c2d2 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -36,6 +36,7 @@
  * 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 23daa7f12..3ea8db922 100644
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -24,6 +24,7 @@
  * @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 10207675f..86a9967bd 100644
--- a/src/nse/perf_kdf.c
+++ b/src/nse/perf_kdf.c
@@ -24,6 +24,7 @@
  * @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 f1b7c652b..f7bf363f7 100644
--- a/src/nse/test_nse_api.c
+++ b/src/nse/test_nse_api.c
@@ -22,6 +22,7 @@
  * @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 6ee03b3fa..98012e197 100644
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -25,6 +25,7 @@
  *        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 8dfacb02b..862748973 100644
--- a/src/nt/nt.c
+++ b/src/nt/nt.c
@@ -24,6 +24,7 @@
  * @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 8b149c98e..bff9b8501 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -25,6 +25,7 @@
  * @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 e196ec58a..ce65bb929 100644
--- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c
+++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c
@@ -24,6 +24,7 @@
  * @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 13e2e863b..4ff8b5d35 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -25,6 +25,7 @@
  */
 
 #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 1b1232ecb..4820bebc7 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -29,6 +29,7 @@
  */
 
 #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_api.c b/src/peerinfo/peerinfo_api.c
index 65e429bef..89091e683 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -24,6 +24,7 @@
  * @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 5f4c123ff..bfc4b2e37 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -24,6 +24,7 @@
  * @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 055388d43..7ee6f24cb 100644
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -27,6 +27,7 @@
  */
 
 #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 27df6e37b..8edfd0af4 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -27,6 +27,7 @@
  * - 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 a5414e701..4224cb4a7 100644
--- a/src/peerinfo/test_peerinfo_api_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_friend_only.c
@@ -28,6 +28,7 @@
  * - 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 6d5793dcf..80c345c93 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -28,6 +28,7 @@
  * - 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 45ea73be6..c12c07218 100644
--- a/src/peerinfo/test_peerinfo_shipped_hellos.c
+++ b/src/peerinfo/test_peerinfo_shipped_hellos.c
@@ -26,6 +26,7 @@
  *
  */
 #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 11313b5d3..b92ecf85b 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -24,6 +24,7 @@
  * @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 959d088f9..44cc0dd81 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -24,6 +24,7 @@
  * @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 b3e793d93..6070fc1a1 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -24,6 +24,7 @@
  * @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/peerstore_common.c b/src/peerstore/peerstore_common.c
index 070a2a16e..e3bb77d86 100644
--- a/src/peerstore/peerstore_common.c
+++ b/src/peerstore/peerstore_common.c
@@ -23,6 +23,7 @@
  * @author Omar Tarabai
  */
 
+#include "platform.h"
 #include "peerstore_common.h"
 
 /**
diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c
index 24c7e4f01..0d7e5a800 100644
--- a/src/peerstore/perf_peerstore_store.c
+++ b/src/peerstore/perf_peerstore_store.c
@@ -22,6 +22,7 @@
  * @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 cc5b8b76b..36ea5ef90 100644
--- a/src/peerstore/plugin_peerstore_flat.c
+++ b/src/peerstore/plugin_peerstore_flat.c
@@ -25,6 +25,7 @@
  */
 
 #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 ad69efdf4..bed8e2f6f 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -26,6 +26,7 @@
  */
 
 #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 b6cd51906..cc6c22a6e 100644
--- a/src/peerstore/test_peerstore_api_iterate.c
+++ b/src/peerstore/test_peerstore_api_iterate.c
@@ -22,6 +22,7 @@
  * @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 77e8a17c1..b04149f85 100644
--- a/src/peerstore/test_peerstore_api_store.c
+++ b/src/peerstore/test_peerstore_api_store.c
@@ -22,6 +22,7 @@
  * @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 5057c98b5..1d1865326 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -26,6 +26,7 @@
  * @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 126b321df..0248786d6 100644
--- a/src/peerstore/test_peerstore_api_watch.c
+++ b/src/peerstore/test_peerstore_api_watch.c
@@ -22,6 +22,7 @@
  * @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 a4221ea63..7292c9acd 100644
--- a/src/peerstore/test_plugin_peerstore.c
+++ b/src/peerstore/test_plugin_peerstore.c
@@ -23,6 +23,7 @@
  * @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 c8deb8193..026fa687a 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -25,6 +25,7 @@
  * @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 e8617a5c9..6c5650993 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -23,6 +23,7 @@
  * @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 cc16c7864..c449db999 100644
--- a/src/pq/pq_eval.c
+++ b/src/pq/pq_eval.c
@@ -23,6 +23,7 @@
  * @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 b0ed6798a..3bd275530 100644
--- a/src/pq/pq_event.c
+++ b/src/pq/pq_event.c
@@ -23,6 +23,7 @@
  * @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 33fe8733d..c0a8fdd01 100644
--- a/src/pq/pq_exec.c
+++ b/src/pq/pq_exec.c
@@ -23,6 +23,7 @@
  * @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 b4292dea3..9293749b6 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -23,6 +23,7 @@
  * @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 ce8ce8f87..422e4244e 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -23,6 +23,7 @@
  * @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 f945c5d2e..6fe635d72 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -23,6 +23,7 @@
  * @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 ff453b210..ba652def0 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -23,6 +23,7 @@
  * @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 67227b97f..a4df3ada7 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index b2797bc83..9f2d5bff6 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -37,6 +37,7 @@
  * 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 9552b12a9..92b16cebb 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -24,6 +24,7 @@
  * @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_core.c b/src/reclaim/did_core.c
index f3caff707..4f2bd5a87 100644
--- a/src/reclaim/did_core.c
+++ b/src/reclaim/did_core.c
@@ -27,6 +27,7 @@
 // TODO: DID documents do not have an expiration date. Still we add one
 // TODO: Store DID document with empty label and own type (maybe DID-Document or JSON??)
 
+#include "platform.h"
 #include "did_core.h"
 
 struct DID_resolve_return
diff --git a/src/reclaim/did_helper.c b/src/reclaim/did_helper.c
index 1c04ede33..14954e767 100644
--- a/src/reclaim/did_helper.c
+++ b/src/reclaim/did_helper.c
@@ -24,6 +24,7 @@
  * @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 44b72a69f..71220f5aa 100644
--- a/src/reclaim/did_misc.c
+++ b/src/reclaim/did_misc.c
@@ -25,6 +25,7 @@
  *
  */
 #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 1f91e0ee2..19c9eed90 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/reclaim/gnunet-did.c
@@ -34,6 +34,7 @@
  *
  */
 #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 da5f90409..3234fc735 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -24,6 +24,7 @@
  *
  */
 #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 8b468fc8e..e6c2b2659 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -24,6 +24,7 @@
  *
  */
 #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/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 5e2a5e974..0c2fadd96 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -24,6 +24,7 @@
  * @brief reclaim tickets
  *
  */
+#include "platform.h"
 #include <inttypes.h>
 #include "gnunet-service-reclaim_tickets.h"
 
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c
index b1ca7a4a5..e91310296 100644
--- a/src/reclaim/json_reclaim.c
+++ b/src/reclaim/json_reclaim.c
@@ -24,6 +24,7 @@
  * @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 90c33375f..957421ee7 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -25,6 +25,7 @@
  * @author Tristan Schwieren
  */
 #include "platform.h"
+#include "platform.h"
 #include <inttypes.h>
 #include <jansson.h>
 #include <jose/jose.h>
diff --git a/src/reclaim/pabc_helper.c b/src/reclaim/pabc_helper.c
index e58b8a4f7..65a633f7b 100644
--- a/src/reclaim/pabc_helper.c
+++ b/src/reclaim/pabc_helper.c
@@ -4,6 +4,7 @@
 // https://github.com/ontio/ontology-crypto/wiki/Anonymous-Credential
 // using the relic library https://github.com/relic-toolkit/relic/
 
+#include "platform.h"
 #include "pabc_helper.h"
 #include <pwd.h>
 #include <stdlib.h>
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c
index ce6fe483d..b09389886 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/reclaim/plugin_gnsrecord_reclaim.c
@@ -24,6 +24,7 @@
  * @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 66f59998a..7ad46abb7 100644
--- a/src/reclaim/plugin_reclaim_attribute_basic.c
+++ b/src/reclaim/plugin_reclaim_attribute_basic.c
@@ -27,6 +27,7 @@
  * @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 3eb4bfebf..cc0c252ac 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/reclaim/plugin_reclaim_credential_jwt.c
@@ -26,6 +26,7 @@
  * @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 a906805fb..78e7f971c 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/reclaim/plugin_reclaim_credential_pabc.c
@@ -26,6 +26,7 @@
  * @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 4ead538ec..49ba71751 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -26,6 +26,7 @@
  *
  */
 #include "platform.h"
+#include "platform.h"
 #include <inttypes.h>
 #include <jansson.h>
 #include <jose/jose.h>
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/reclaim/plugin_rest_pabc.c
index 4b7d21df3..e632a4efe 100644
--- a/src/reclaim/plugin_rest_pabc.c
+++ b/src/reclaim/plugin_rest_pabc.c
@@ -24,6 +24,7 @@
  *
  */
 #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 9cc41bf1a..e0a00ff4a 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -25,6 +25,7 @@
  *
  */
 #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 e94a99708..5dfe15b88 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -24,6 +24,7 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_mq_lib.h"
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
index b235ed945..24e46b91c 100644
--- a/src/reclaim/reclaim_attribute.c
+++ b/src/reclaim/reclaim_attribute.c
@@ -24,6 +24,7 @@
  * @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 1aad261a1..d215f0d0d 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -24,6 +24,7 @@
  * @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 446c199fc..ac8b1c186 100644
--- a/src/reclaim/test_did_helper.c
+++ b/src/reclaim/test_did_helper.c
@@ -25,6 +25,7 @@
  */
 
 #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 f8faf8021..03b4b2d0f 100644
--- a/src/reclaim/test_reclaim_attribute.c
+++ b/src/reclaim/test_reclaim_attribute.c
@@ -1,4 +1,5 @@
 #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 e2534e6ab..1355aca60 100644
--- a/src/reclaim/test_w3c_ed25519_2020.c
+++ b/src/reclaim/test_w3c_ed25519_2020.c
@@ -26,6 +26,7 @@
  */
 
 #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 70301338f..d3303b255 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -28,6 +28,7 @@
  * @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 8238ad3df..92ba5dcd3 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -25,6 +25,7 @@
  * @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 ab6d65d58..fed0c786b 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -29,6 +29,7 @@
  */
 
 #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 c25ef9eda..75ad76a2e 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -25,6 +25,7 @@
  * @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 aea0c054f..ae84fb19e 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -23,6 +23,7 @@
  * @brief Test how long it takes to create a automaton from a string regex.
  * @author Bartlomiej Polot
  */
+#include "platform.h"
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 5f23a32df..911909e0c 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -24,6 +24,7 @@
  * @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 12f173476..1451b42d0 100644
--- a/src/regex/regex_api_announce.c
+++ b/src/regex/regex_api_announce.c
@@ -24,6 +24,7 @@
  * @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 71219cbdd..b48b8b7ba 100644
--- a/src/regex/regex_api_search.c
+++ b/src/regex/regex_api_search.c
@@ -25,6 +25,7 @@
  * @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 048d6d743..548d29eea 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -24,6 +24,7 @@
  *        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 c4fab6b56..b02e5501d 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -24,6 +24,7 @@
  * @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 bda979edb..2f99e1047 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -24,6 +24,7 @@
  * @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 c8efae772..67a11e863 100644
--- a/src/regex/regex_test_graph.c
+++ b/src/regex/regex_test_graph.c
@@ -23,6 +23,7 @@
  * @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 2fece6bff..fb31ab428 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -26,6 +26,7 @@
  */
 
 #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 823563d4d..94ed3997f 100644
--- a/src/regex/regex_test_random.c
+++ b/src/regex/regex_test_random.c
@@ -23,6 +23,7 @@
  * @author Maximilian Szengel
  */
 #include "platform.h"
+#include "platform.h"
 #include "regex_test_lib.h"
 #include "gnunet_crypto_lib.h"
 #include "regex_internal.h"
diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c
index 9761e80f9..9bacebf3f 100644
--- a/src/regex/test_regex_api.c
+++ b/src/regex/test_regex_api.c
@@ -23,6 +23,7 @@
  * @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 be3649dbd..059eb6b0b 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -22,6 +22,7 @@
  * @brief test for regex.c
  * @author Maximilian Szengel
  */
+#include "platform.h"
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 923bb9f42..7b1dfe550 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -22,6 +22,7 @@
  * @brief test for regex_graph.c
  * @author Maximilian Szengel
  */
+#include "platform.h"
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c
index 2e6874e4d..6d2221ef3 100644
--- a/src/regex/test_regex_integration.c
+++ b/src/regex/test_regex_integration.c
@@ -25,6 +25,7 @@
  * @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 e7ef72b58..ec5113413 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/regex/test_regex_iterate_api.c
@@ -22,6 +22,7 @@
  * @brief test for regex.c
  * @author Maximilian Szengel
  */
+#include "platform.h"
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index 289b1183b..0d17ef210 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -23,6 +23,7 @@
  * @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 1ea4471d1..d8d8b85ad 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -24,6 +24,7 @@
  *
  */
 #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 826188702..a015dc00e 100644
--- a/src/rest/plugin_rest_config.c
+++ b/src/rest/plugin_rest_config.c
@@ -25,6 +25,7 @@
  */
 
 #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 52783a81a..50c2219a8 100644
--- a/src/rest/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
@@ -25,6 +25,7 @@
  */
 
 #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 757c0b979..59dca479c 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -25,6 +25,7 @@
  * @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 a126709ce..2fb904daa 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/revocation/gnunet-revocation-tvg.c
@@ -24,6 +24,7 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_revocation_service.h"
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c
index 853ca0f71..032068db1 100644
--- a/src/revocation/gnunet-revocation.c
+++ b/src/revocation/gnunet-revocation.c
@@ -24,6 +24,7 @@
  * @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 e10771557..57883afe9 100644
--- a/src/revocation/gnunet-service-revocation.c
+++ b/src/revocation/gnunet-service-revocation.c
@@ -36,6 +36,7 @@
  *                 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 7de4fafe9..5cfc721c6 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/revocation/plugin_block_revocation.c
@@ -25,6 +25,7 @@
  */
 
 #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 a0813ddcd..0b1664a4b 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -23,6 +23,7 @@
  * @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 e6dd1a0db..40da67aa5 100644
--- a/src/revocation/test_revocation.c
+++ b/src/revocation/test_revocation.c
@@ -24,6 +24,7 @@
  * @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 df10ad5da..aa6c14056 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -25,6 +25,7 @@
  *        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 f90fc0d88..1c6fc6185 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -24,6 +24,7 @@
  * @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 be9324af9..58f9e2e5f 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -24,6 +24,7 @@
  * @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 b1e73be17..7bad7a93f 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -24,6 +24,7 @@
  * @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 598cc887e..4f98d8c4c 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/rps/gnunet-service-rps_sampler.c
@@ -24,6 +24,7 @@
  * @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 a6dc755a3..9f0389a13 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.c
+++ b/src/rps/gnunet-service-rps_sampler_elem.c
@@ -24,6 +24,7 @@
  * @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 d58b995a3..d5452705f 100644
--- a/src/rps/gnunet-service-rps_view.c
+++ b/src/rps/gnunet-service-rps_view.c
@@ -24,6 +24,7 @@
  * @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 f6e98ce29..c1ab3838c 100644
--- a/src/rps/rps-sampler_client.c
+++ b/src/rps/rps-sampler_client.c
@@ -24,6 +24,7 @@
  * @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 e3fb79501..3bc2342b8 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -24,6 +24,7 @@
  * @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 8fd82f7b3..c8acf5fed 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -27,6 +27,7 @@
  */
 
 #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 c4166745a..f7237924f 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -24,6 +24,7 @@
  * @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 ab132ec8a..a90cfc436 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -25,6 +25,7 @@
  *        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 06dad2887..014a6ab7c 100644
--- a/src/rps/test_rps_api.c
+++ b/src/rps/test_rps_api.c
@@ -22,6 +22,7 @@
  * @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/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c
index 3d885ca6b..82d75b7e0 100644
--- a/src/rps/test_service_rps_custommap.c
+++ b/src/rps/test_service_rps_custommap.c
@@ -21,6 +21,7 @@
  * @file rps/test_service_rps_custommap.c
  * @brief testcase for gnunet-service-rps_peers.c
  */
+#include "platform.h"
 #include <platform.h>
 #include "gnunet-service-rps_custommap.h"
 
diff --git a/src/rps/test_service_rps_sampler_elem.c b/src/rps/test_service_rps_sampler_elem.c
index 8fef5adaf..afa17611c 100644
--- a/src/rps/test_service_rps_sampler_elem.c
+++ b/src/rps/test_service_rps_sampler_elem.c
@@ -21,6 +21,7 @@
  * @file rps/test_service_rps_sampler_elem.c
  * @brief testcase for gnunet-service-rps_sampler_elem.c
  */
+#include "platform.h"
 #include <platform.h>
 #include "gnunet_util_lib.h"
 #include "gnunet-service-rps_sampler_elem.h"
diff --git a/src/rps/test_service_rps_view.c b/src/rps/test_service_rps_view.c
index 5a8c00849..bb1413168 100644
--- a/src/rps/test_service_rps_view.c
+++ b/src/rps/test_service_rps_view.c
@@ -21,6 +21,7 @@
  * @file rps/test_service_rps_view.c
  * @brief testcase for gnunet-service-rps_view.c
  */
+#include "platform.h"
 #include <platform.h>
 #include "gnunet-service-rps_view.h"
 
diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index 07af916b1..2dcb123bc 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -24,6 +24,7 @@
  * @author Christian M. Fuchs
  */
 #define GCRYPT_NO_DEPRECATED
+#include "platform.h"
 #include <gcrypt.h>
 #include <inttypes.h>
 
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index c43a7e854..60982494f 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -24,6 +24,7 @@
  * @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 1945f1937..b749826e2 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -24,6 +24,7 @@
  * @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 59c3c6f6c..aa3859d69 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -24,6 +24,7 @@
  * @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 15ad3038e..66caa32d2 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -24,6 +24,7 @@
  * @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 8c667a72e..2b6a91313 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -25,6 +25,7 @@
  * @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 85460cb05..34b0a9c5d 100644
--- a/src/scalarproduct/test_ecc_scalarproduct.c
+++ b/src/scalarproduct/test_ecc_scalarproduct.c
@@ -24,6 +24,7 @@
  * @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 76bba0bc9..c6ab241e8 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/src/secretsharing/gnunet-secretsharing-profiler.c
@@ -24,6 +24,7 @@
  * @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 84338bd11..d45cc6e4a 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -24,6 +24,7 @@
  * @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 595af751f..93dfd13b3 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/secretsharing/secretsharing_api.c
@@ -24,6 +24,7 @@
  * @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/secretsharing_common.c b/src/secretsharing/secretsharing_common.c
index 3003109a4..44b96b1c8 100644
--- a/src/secretsharing/secretsharing_common.c
+++ b/src/secretsharing/secretsharing_common.c
@@ -18,6 +18,7 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#include "platform.h"
 #include "secretsharing.h"
 
 /**
diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c
index 227af1c3e..5dc1f4d61 100644
--- a/src/secretsharing/test_secretsharing_api.c
+++ b/src/secretsharing/test_secretsharing_api.c
@@ -23,6 +23,7 @@
  * @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.c b/src/set/gnunet-service-set.c
index 208c63a1a..7c522ec34 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -23,6 +23,7 @@
  * @author Florian Dold
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "gnunet-service-set.h"
 #include "gnunet-service-set_union.h"
 #include "gnunet-service-set_intersection.h"
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 51a8d0dbc..59287fe25 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -24,6 +24,7 @@
  * @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 3a2bc8bd7..68ba88a1e 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -24,6 +24,7 @@
  * @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 6de9fb5eb..20261e7b1 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -24,6 +24,7 @@
  * @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 944b63d30..eb789b383 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/src/set/gnunet-set-ibf-profiler.c
@@ -25,6 +25,7 @@
  */
 
 #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 3014861a6..f6e04dfe7 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -24,6 +24,7 @@
  * @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/ibf.c b/src/set/ibf.c
index 0f7eb6a9f..b6fb52b6b 100644
--- a/src/set/ibf.c
+++ b/src/set/ibf.c
@@ -24,6 +24,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include "ibf.h"
 
 /**
diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c
index 6415d00e1..563ed0fb8 100644
--- a/src/set/ibf_sim.c
+++ b/src/set/ibf_sim.c
@@ -26,6 +26,7 @@
  * This code was used for some internal experiments, it is not
  * build or shipped as part of the GNUnet system.
  */
+#include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c
index cb5cef5ad..137b040b9 100644
--- a/src/set/plugin_block_set_test.c
+++ b/src/set/plugin_block_set_test.c
@@ -25,6 +25,7 @@
  */
 
 #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 4f73ff06c..22c99f278 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -24,6 +24,7 @@
  * @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 d1afdd354..067c57531 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -24,6 +24,7 @@
  * @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 42dedb846..035e5b5a5 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -25,6 +25,7 @@
  * @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 908527017..3825f817d 100644
--- a/src/set/test_set_union_copy.c
+++ b/src/set/test_set_union_copy.c
@@ -24,6 +24,7 @@
  * @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 b6c7a82f6..3344fa2f4 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/set/test_set_union_result_symmetric.c
@@ -25,6 +25,7 @@
  * @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-service-seti.c b/src/seti/gnunet-service-seti.c
index af478233b..6db24a5b6 100644
--- a/src/seti/gnunet-service-seti.c
+++ b/src/seti/gnunet-service-seti.c
@@ -23,6 +23,7 @@
  * @author Florian Dold
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "gnunet-service-seti_protocol.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_cadet_service.h"
diff --git a/src/seti/gnunet-seti-profiler.c b/src/seti/gnunet-seti-profiler.c
index b8230bcfc..dfead3a90 100644
--- a/src/seti/gnunet-seti-profiler.c
+++ b/src/seti/gnunet-seti-profiler.c
@@ -24,6 +24,7 @@
  * @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 5b9196cef..60695ef42 100644
--- a/src/seti/plugin_block_seti_test.c
+++ b/src/seti/plugin_block_seti_test.c
@@ -25,6 +25,7 @@
  */
 
 #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 6522236c6..ec08af2c7 100644
--- a/src/seti/seti_api.c
+++ b/src/seti/seti_api.c
@@ -24,6 +24,7 @@
  * @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 9074fab41..a61768534 100644
--- a/src/seti/test_seti_api.c
+++ b/src/seti/test_seti_api.c
@@ -25,6 +25,7 @@
  * @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 339d347f8..ebe781a20 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -25,6 +25,7 @@
  * @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 7981cc847..7a449d8b3 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/setu/gnunet-service-setu_strata_estimator.c
@@ -25,6 +25,7 @@
  * @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 944b63d30..eb789b383 100644
--- a/src/setu/gnunet-setu-ibf-profiler.c
+++ b/src/setu/gnunet-setu-ibf-profiler.c
@@ -25,6 +25,7 @@
  */
 
 #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 8d6a2dc8c..f162bece3 100644
--- a/src/setu/gnunet-setu-profiler.c
+++ b/src/setu/gnunet-setu-profiler.c
@@ -24,6 +24,7 @@
  * @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/ibf.c b/src/setu/ibf.c
index 3978aa3c6..a55e21764 100644
--- a/src/setu/ibf.c
+++ b/src/setu/ibf.c
@@ -25,6 +25,7 @@
  * @author Elias Summermatter
  */
 
+#include "platform.h"
 #include "ibf.h"
 #include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "setu", __VA_ARGS__)
diff --git a/src/setu/ibf_sim.c b/src/setu/ibf_sim.c
index 6415d00e1..563ed0fb8 100644
--- a/src/setu/ibf_sim.c
+++ b/src/setu/ibf_sim.c
@@ -26,6 +26,7 @@
  * This code was used for some internal experiments, it is not
  * build or shipped as part of the GNUnet system.
  */
+#include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 7f4d64f74..3beed821e 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -25,6 +25,7 @@
  * @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 178ad3314..4829f7296 100644
--- a/src/setu/plugin_block_setu_test.c
+++ b/src/setu/plugin_block_setu_test.c
@@ -24,6 +24,7 @@
  * @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 7fa144590..e528555aa 100644
--- a/src/setu/setu_api.c
+++ b/src/setu/setu_api.c
@@ -25,6 +25,7 @@
  *  @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 5a0c9d70d..e9ab611a8 100644
--- a/src/setu/test_setu_api.c
+++ b/src/setu/test_setu_api.c
@@ -24,6 +24,7 @@
  * @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 777fb6311..c53cbe98b 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -23,6 +23,7 @@
  * @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 8c47c22b4..7d0b026e4 100644
--- a/src/sq/sq_exec.c
+++ b/src/sq/sq_exec.c
@@ -23,6 +23,7 @@
  * @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 b3825ee71..cb1d1d632 100644
--- a/src/sq/sq_prepare.c
+++ b/src/sq/sq_prepare.c
@@ -23,6 +23,7 @@
  * @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 ead1b5bdd..207c6b837 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -23,6 +23,7 @@
  * @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 5ea3f1e56..ae4c3bcb0 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -23,6 +23,7 @@
  * @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 ecd9918d7..80a5b9b7e 100644
--- a/src/sq/test_sq.c
+++ b/src/sq/test_sq.c
@@ -23,6 +23,7 @@
  * @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 37cf524d0..42f13c9c8 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_bio_lib.h"
 #include "gnunet_container_lib.h"
 #include "gnunet_disk_lib.h"
diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index 5894ef68c..b1ad78c86 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -25,6 +25,7 @@
  * @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 88f127da8..2ac5880c7 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -24,6 +24,7 @@
  * @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 c9e568870..d39de3e79 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -23,6 +23,7 @@
  * @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 ad273287d..03d76e446 100644
--- a/src/statistics/test_statistics_api_loop.c
+++ b/src/statistics/test_statistics_api_loop.c
@@ -22,6 +22,7 @@
  * @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 2d9d08305..96fb2bafd 100644
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -23,6 +23,7 @@
  * @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 cb2694f8f..d0d074a3b 100644
--- a/src/statistics/test_statistics_api_watch_zero_value.c
+++ b/src/statistics/test_statistics_api_watch_zero_value.c
@@ -22,6 +22,7 @@
  * @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 e04d2f61d..6f7236a39 100644
--- a/src/template/gnunet-service-template.c
+++ b/src/template/gnunet-service-template.c
@@ -24,6 +24,7 @@
  * @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 5e250bbdf..5890db63a 100644
--- a/src/template/gnunet-template.c
+++ b/src/template/gnunet-template.c
@@ -24,6 +24,7 @@
  * @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 196edec2d..4f7583b6b 100644
--- a/src/template/test_template_api.c
+++ b/src/template/test_template_api.c
@@ -22,6 +22,7 @@
  * @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 bc2f0abe0..b4f005b08 100644
--- a/src/testbed-logger/gnunet-service-testbed-logger.c
+++ b/src/testbed-logger/gnunet-service-testbed-logger.c
@@ -25,6 +25,7 @@
  */
 
 #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 284fb5609..3d5c1ff84 100644
--- a/src/testbed-logger/test_testbed_logger_api.c
+++ b/src/testbed-logger/test_testbed_logger_api.c
@@ -23,6 +23,7 @@
  * @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 d67bdba8b..9a88c0c5b 100644
--- a/src/testbed-logger/testbed_logger_api.c
+++ b/src/testbed-logger/testbed_logger_api.c
@@ -26,6 +26,7 @@
  */
 
 #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 b7bd8fce9..f498b4fcb 100644
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -25,6 +25,7 @@
  */
 
 #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 cbc9cfdbf..6c28db763 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -25,6 +25,7 @@
  */
 
 #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 c82f8075f..8184233e7 100644
--- a/src/testbed/gnunet-daemon-testbed-blacklist.c
+++ b/src/testbed/gnunet-daemon-testbed-blacklist.c
@@ -27,6 +27,7 @@
  */
 
 #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 c3b424c9b..bc656fd57 100644
--- a/src/testbed/gnunet-daemon-testbed-underlay.c
+++ b/src/testbed/gnunet-daemon-testbed-underlay.c
@@ -27,6 +27,7 @@
  */
 
 #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 938e50448..baef0bb01 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -39,6 +39,7 @@
 
 
 #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 e10a28902..2290bb637 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -26,6 +26,7 @@
  */
 
 #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.c b/src/testbed/gnunet-service-testbed.c
index b2f04d5d8..1e6e02294 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -24,6 +24,7 @@
  * @author Sree Harsha Totakura
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 #include "gnunet-service-testbed_barriers.h"
 #include "gnunet-service-testbed_connectionpool.h"
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c
index c024a35e7..a7eba3201 100644
--- a/src/testbed/gnunet-service-testbed_barriers.c
+++ b/src/testbed/gnunet-service-testbed_barriers.c
@@ -24,6 +24,7 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 #include "gnunet-service-testbed_barriers.h"
 #include "testbed_api.h"
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index 5e74b865a..5d5c2e297 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -23,6 +23,7 @@
  * @brief testbed cache implementation
  * @author Sree Harsha Totakura
  */
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c
index 59780e6c1..64b6706a4 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -24,6 +24,7 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 #include "gnunet-service-testbed_connectionpool.h"
 #include "testbed_api_operations.h"
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 5b9528ba3..73252b077 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -29,6 +29,7 @@
  */
 
 #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_links.c b/src/testbed/gnunet-service-testbed_links.c
index fe87d64ea..f4c27ffa2 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -25,6 +25,7 @@
  * @author Sree Harsha Totakura
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 
 /**
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c
index 1646b8d19..6826143c8 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -19,6 +19,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /*
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index b13a3b7e0..54a566e89 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -24,6 +24,7 @@
  * @author Sree Harsha Totakura
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 #include "gnunet-service-testbed_connectionpool.h"
 #include "gnunet_transport_hello_service.h"
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index 154a6d4ec..05410c26a 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -25,6 +25,7 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
+#include "platform.h"
 #include "gnunet-service-testbed.h"
 #include "gnunet_arm_service.h"
 #include <zlib.h>
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 49d975119..60f7a02d2 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -25,6 +25,7 @@
  */
 
 #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 2ee707fe6..30d470141 100644
--- a/src/testbed/gnunet_mpi_test.c
+++ b/src/testbed/gnunet_mpi_test.c
@@ -1,4 +1,5 @@
 #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 ea303a86c..98894e4aa 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -25,6 +25,7 @@
  */
 
 #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 a46a7596a..79c1b4fba 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -25,6 +25,7 @@
  */
 
 #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 1ca1d1b2e..b1632de9f 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -26,6 +26,7 @@
  */
 
 #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 17072ffa8..5b887ba99 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -43,6 +43,7 @@
  */
 
 #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 74dd89126..c23c5367a 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -25,6 +25,7 @@
  */
 
 #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 0ec9d63e1..333aec3d7 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -38,6 +38,7 @@
  */
 
 #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 9e49debf7..f958b727c 100644
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -25,6 +25,7 @@
  */
 
 #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 133aadf21..e9fc55be0 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -25,6 +25,7 @@
  */
 
 #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 22dd46b53..7a7e0ca06 100644
--- a/src/testbed/test_testbed_api_peer_reconfiguration.c
+++ b/src/testbed/test_testbed_api_peer_reconfiguration.c
@@ -26,6 +26,7 @@
  */
 
 #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 93b0da550..bc9c29790 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -26,6 +26,7 @@
  */
 
 #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 816f8e9a6..4cb26811a 100644
--- a/src/testbed/test_testbed_api_sd.c
+++ b/src/testbed/test_testbed_api_sd.c
@@ -26,6 +26,7 @@
  */
 
 #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 4d42cda6a..b28a3d608 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -25,6 +25,7 @@
  */
 
 #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 f451c6555..d5b930715 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -25,6 +25,7 @@
  */
 
 #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 fe76ad441..036c09a39 100644
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -27,6 +27,7 @@
  */
 
 #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 fda5c3223..979b15bd1 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -25,6 +25,7 @@
  */
 
 #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 dada7286f..38fb2b5e3 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -25,6 +25,7 @@
  */
 
 #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 33c21a69c..f88d2fae6 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -25,6 +25,7 @@
  */
 
 #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 8b706ff83..0bea28223 100644
--- a/src/testbed/test_testbed_underlay.c
+++ b/src/testbed/test_testbed_underlay.c
@@ -25,6 +25,7 @@
  */
 
 #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 2ae0a1703..4d82eb4f6 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -27,6 +27,7 @@
  * @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 6074beb12..24a03de8d 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -24,6 +24,7 @@
  * @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 824bd0187..cac872c46 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -26,6 +26,7 @@
  * @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 ea7e71496..7f3262732 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -26,6 +26,7 @@
  */
 
 #include "platform.h"
+#include "platform.h"
 #include "testbed_api_operations.h"
 #include "testbed_api_sd.h"
 
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index b8e428441..ce39b7b58 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -27,6 +27,7 @@
  */
 
 #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_sd.c b/src/testbed/testbed_api_sd.c
index 59c7a3ebd..6033985ae 100644
--- a/src/testbed/testbed_api_sd.c
+++ b/src/testbed/testbed_api_sd.c
@@ -25,6 +25,7 @@
  */
 
 #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 2c9a90fd4..a45f204a0 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -24,6 +24,7 @@
  * @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 e800baa73..5d0b95fb2 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -25,6 +25,7 @@
  * @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 d9eb384ba..99e34cb35 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -26,6 +26,7 @@
  * @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 8e75daae3..14cabd533 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -26,6 +26,7 @@
  */
 
 #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 f73be378e..807e500f7 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -24,6 +24,7 @@
  * @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/testbed/testbed_api_underlay.c b/src/testbed/testbed_api_underlay.c
index 7e509fdfe..8c01e4503 100644
--- a/src/testbed/testbed_api_underlay.c
+++ b/src/testbed/testbed_api_underlay.c
@@ -24,6 +24,7 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
+#include "platform.h"
 #include "testbed_api_peers.h"
 
 
diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
index b9c3aa507..8538c70f0 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -37,6 +37,7 @@
 
 
 #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 88906e5fa..9596cf306 100644
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -24,6 +24,7 @@
  * @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 f65b45a77..0e474c944 100644
--- a/src/testing/list-keys.c
+++ b/src/testing/list-keys.c
@@ -1,4 +1,5 @@
 #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 25cbb2a9f..55e408b1d 100644
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -26,6 +26,7 @@
  */
 
 #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 8d357cb08..d3c93004a 100644
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -26,6 +26,7 @@
  */
 
 #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 df3d8d523..ef97cc957 100644
--- a/src/testing/test_testing_portreservation.c
+++ b/src/testing/test_testing_portreservation.c
@@ -26,6 +26,7 @@
  */
 
 #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 83458898b..8cc9dd4a2 100644
--- a/src/testing/test_testing_servicestartup.c
+++ b/src/testing/test_testing_servicestartup.c
@@ -24,6 +24,7 @@
  * @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 d2f760d7a..1049bd1a8 100644
--- a/src/testing/test_testing_sharedservices.c
+++ b/src/testing/test_testing_sharedservices.c
@@ -25,6 +25,7 @@
  */
 
 #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 20cf17895..07142ad9f 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -30,6 +30,7 @@
  *
  */
 #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 080a4880d..c303fc8aa 100644
--- a/src/testing/testing_api_cmd_batch.c
+++ b/src/testing/testing_api_cmd_batch.c
@@ -25,6 +25,7 @@
  * @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 f51b2109b..914013cbf 100644
--- a/src/testing/testing_api_cmd_block_until_external_trigger.c
+++ b/src/testing/testing_api_cmd_block_until_external_trigger.c
@@ -24,6 +24,7 @@
  * @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 f0f036429..7658e7f76 100644
--- a/src/testing/testing_api_cmd_end.c
+++ b/src/testing/testing_api_cmd_end.c
@@ -22,6 +22,7 @@
  * @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 47199d3d6..02b8f0a59 100644
--- a/src/testing/testing_api_cmd_finish.c
+++ b/src/testing/testing_api_cmd_finish.c
@@ -23,6 +23,7 @@
  * @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 709c6b62f..5918264ac 100644
--- a/src/testing/testing_api_cmd_local_test_finished.c
+++ b/src/testing/testing_api_cmd_local_test_finished.c
@@ -24,6 +24,7 @@
  * @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 e71d3ef45..3af237ef5 100644
--- a/src/testing/testing_api_cmd_local_test_prepared.c
+++ b/src/testing/testing_api_cmd_local_test_prepared.c
@@ -24,6 +24,7 @@
  * @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 6cd648c3a..78a48ff01 100644
--- a/src/testing/testing_api_cmd_netjail_start.c
+++ b/src/testing/testing_api_cmd_netjail_start.c
@@ -24,6 +24,7 @@
  * @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 98de0698a..be5b36ee3 100644
--- a/src/testing/testing_api_cmd_netjail_start_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -24,6 +24,7 @@
  * @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 f1b2260ab..5683a05e4 100644
--- a/src/testing/testing_api_cmd_netjail_stop.c
+++ b/src/testing/testing_api_cmd_netjail_stop.c
@@ -24,6 +24,7 @@
  * @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 4215beef6..857ab1d73 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -24,6 +24,7 @@
  * @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 5bbabce51..2e75c0678 100644
--- a/src/testing/testing_api_cmd_send_peer_ready.c
+++ b/src/testing/testing_api_cmd_send_peer_ready.c
@@ -24,6 +24,7 @@
  * @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 221bbb8f6..6aeaa1258 100644
--- a/src/testing/testing_api_cmd_system_create.c
+++ b/src/testing/testing_api_cmd_system_create.c
@@ -24,6 +24,7 @@
  * @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 5a2440766..df3c72ce1 100644
--- a/src/testing/testing_api_cmd_system_destroy.c
+++ b/src/testing/testing_api_cmd_system_destroy.c
@@ -24,6 +24,7 @@
  * @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 90713e45e..e8d04fddc 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -26,6 +26,7 @@
  * @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 9b54443a1..270ec41f6 100644
--- a/src/testing/testing_api_traits.c
+++ b/src/testing/testing_api_traits.c
@@ -26,6 +26,7 @@
  * @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 65c7e81d7..f923febad 100644
--- a/src/topology/friends.c
+++ b/src/topology/friends.c
@@ -24,6 +24,7 @@
  * @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 b380c0bd4..c85462908 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -37,6 +37,7 @@
  * 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 6f9758b09..f726b1dda 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/src/topology/test_gnunet_daemon_topology.c
@@ -24,6 +24,7 @@
  * @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 84aa45b9a..401c0e3e9 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -28,6 +28,7 @@
  * - 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 282902f1c..65a2a35f6 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -38,6 +38,7 @@
  * - 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 d7e18f87a..f898e116b 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -27,6 +27,7 @@
  * @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 2fc61cd91..3c9f30589 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -19,8 +19,9 @@
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
+#include "platform.h"
 #include "gnunet_private_config.h"
-#include "gnunet_platform.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 ab77f5c68..698da9a0f 100644
--- a/src/transport/gnunet-helper-transport-wlan-dummy.c
+++ b/src/transport/gnunet-helper-transport-wlan-dummy.c
@@ -23,6 +23,7 @@
  * @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 e2b133c06..f50e20b76 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -109,8 +109,9 @@
 /*
  * parts taken from aircrack-ng, parts changend.
  */
+#include "platform.h"
 #include "gnunet_private_config.h"
-#include "gnunet_platform.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 dc470ca0e..fd7b6d244 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -73,6 +73,7 @@
  *   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 93790e293..ab6f73751 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -23,6 +23,7 @@
  * @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 2438a0a48..1bede0909 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -23,6 +23,7 @@
  * @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 1e5e8a225..7c8e80eba 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -24,6 +24,7 @@
  * @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 9f39b2dca..0e6e3ff5c 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -25,6 +25,7 @@
  * @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 e61441d9f..0cdb433fb 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -24,6 +24,7 @@
  * @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 218ef80ab..54bed5f63 100644
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -24,6 +24,7 @@
  * @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 86161bd85..2a3cb53a8 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -24,6 +24,7 @@
  * @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 6e5204e28..db519eee7 100644
--- a/src/transport/gnunet-transport-profiler.c
+++ b/src/transport/gnunet-transport-profiler.c
@@ -28,6 +28,7 @@
  * 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 7f34a957f..ea4530ac4 100644
--- a/src/transport/gnunet-transport-wlan-receiver.c
+++ b/src/transport/gnunet-transport-wlan-receiver.c
@@ -24,6 +24,7 @@
  * @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 5256ec7be..374215d9c 100644
--- a/src/transport/gnunet-transport-wlan-sender.c
+++ b/src/transport/gnunet-transport-wlan-sender.c
@@ -24,6 +24,7 @@
  * @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 b5ad43770..03a836f3e 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -25,6 +25,7 @@
  * @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 82468992b..91099b570 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -50,6 +50,7 @@
 #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 40353daeb..a2eb9ac19 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -24,6 +24,7 @@
  * @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 3ad2356b0..f82a800f4 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -26,6 +26,7 @@
  * @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 f3db4fc5a..42c0105ea 100644
--- a/src/transport/plugin_transport_smtp.c
+++ b/src/transport/plugin_transport_smtp.c
@@ -26,6 +26,7 @@
  */
 
 #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 ceae64709..4010b9d25 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -23,6 +23,7 @@
  * @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 c39c72178..e5d8a5ca1 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -25,6 +25,7 @@
  */
 
 #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 0d3ca449d..60aecac68 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -26,6 +26,7 @@
  * @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 a65f5bd2f..483324d28 100644
--- a/src/transport/plugin_transport_udp_broadcasting.c
+++ b/src/transport/plugin_transport_udp_broadcasting.c
@@ -25,6 +25,7 @@
  * @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 269949a99..2290971e3 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -27,6 +27,7 @@
  * @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 138fb5080..0f8513571 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -28,6 +28,7 @@
  * 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 551e79055..755037204 100644
--- a/src/transport/tcp_connection_legacy.c
+++ b/src/transport/tcp_connection_legacy.c
@@ -31,6 +31,7 @@
  * 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 bb572c843..6b4ff1c25 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -25,6 +25,7 @@
  */
 
 #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 bed6874c9..32d101b9b 100644
--- a/src/transport/tcp_server_mst_legacy.c
+++ b/src/transport/tcp_server_mst_legacy.c
@@ -25,6 +25,7 @@
  */
 
 #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 65b090187..7472093eb 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -24,6 +24,7 @@
  * @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 f43cdaaf3..668864dbc 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -25,6 +25,7 @@
 * @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 fe6e4faa3..f8d17636c 100644
--- a/src/transport/test_http_common.c
+++ b/src/transport/test_http_common.c
@@ -22,6 +22,7 @@
  * @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 04687d845..358bee25d 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -25,6 +25,7 @@
  */
 
 #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 c3c46db37..f6de5f56c 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -24,6 +24,7 @@
  * 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 ce5117bd1..c55f46e4e 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -43,6 +43,7 @@
  * 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 5f5e03a9e..9de8d0b4c 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -28,6 +28,7 @@
  * 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 e1606e0be..9d750f9f4 100644
--- a/src/transport/test_transport_api2.c
+++ b/src/transport/test_transport_api2.c
@@ -28,6 +28,7 @@
  * 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 2ba88a863..a082152ea 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -25,6 +25,7 @@
  * @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 c469f28bc..3d3ab3a67 100644
--- a/src/transport/test_transport_api_disconnect.c
+++ b/src/transport/test_transport_api_disconnect.c
@@ -26,6 +26,7 @@
  * 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 0e47800e8..b5e24db5e 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -27,6 +27,7 @@
  * 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 73c81114e..433da4d2f 100644
--- a/src/transport/test_transport_api_manipulation_cfg.c
+++ b/src/transport/test_transport_api_manipulation_cfg.c
@@ -29,6 +29,7 @@
  * 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 207c4416f..e4efd06bd 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp.c
+++ b/src/transport/test_transport_api_manipulation_recv_tcp.c
@@ -28,6 +28,7 @@
  * 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 ea735cfc6..b89540af6 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ b/src/transport/test_transport_api_manipulation_send_tcp.c
@@ -28,6 +28,7 @@
  * 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 c09e3782d..a2c5ee5cb 100644
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -22,6 +22,7 @@
  * @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 508fed4f5..e9f78f73e 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -27,6 +27,7 @@
  * 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 d58c1de54..f432690a4 100644
--- a/src/transport/test_transport_api_restart_reconnect.c
+++ b/src/transport/test_transport_api_restart_reconnect.c
@@ -26,6 +26,7 @@
  * 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 9f8d3bb2b..ae32dcf9f 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -28,6 +28,7 @@
  */
 
 #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 204935dcb..bf2650697 100644
--- a/src/transport/test_transport_blacklisting.c
+++ b/src/transport/test_transport_blacklisting.c
@@ -49,6 +49,7 @@
  *
  */
 #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 5941a991b..751469b3a 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -24,6 +24,7 @@
  * @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 3a282bb11..e07ade9d7 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -24,6 +24,7 @@
  * @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 8bfa1fd0a..afed9d6a8 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -24,6 +24,7 @@
  * @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 5a0dac32b..df1321404 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -24,6 +24,7 @@
  * @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 0c3271436..06a0b0aae 100644
--- a/src/transport/test_transport_start_with_config.c
+++ b/src/transport/test_transport_start_with_config.c
@@ -24,6 +24,7 @@
  * @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 f537af5fc..5be3836b0 100644
--- a/src/transport/test_transport_testing_restart.c
+++ b/src/transport/test_transport_testing_restart.c
@@ -23,6 +23,7 @@
  * 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 4783c1813..cc2104672 100644
--- a/src/transport/test_transport_testing_startstop.c
+++ b/src/transport/test_transport_testing_startstop.c
@@ -23,6 +23,7 @@
  * 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 1bf88bb3d..708bb9d75 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -25,6 +25,7 @@
  * @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-testing-filenames.c b/src/transport/transport-testing-filenames.c
index 70c1ee55a..ee7b0aacf 100644
--- a/src/transport/transport-testing-filenames.c
+++ b/src/transport/transport-testing-filenames.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-filenames2.c b/src/transport/transport-testing-filenames2.c
index 7d6fd529d..59fa1ebd5 100644
--- a/src/transport/transport-testing-filenames2.c
+++ b/src/transport/transport-testing-filenames2.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c
index 330a392c6..21ed0592a 100644
--- a/src/transport/transport-testing-loggers.c
+++ b/src/transport/transport-testing-loggers.c
@@ -22,6 +22,7 @@
  * @brief convenience functions for logging common events in tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-loggers2.c b/src/transport/transport-testing-loggers2.c
index ead4fa365..e6c79b78a 100644
--- a/src/transport/transport-testing-loggers2.c
+++ b/src/transport/transport-testing-loggers2.c
@@ -22,6 +22,7 @@
  * @brief convenience functions for logging common events in tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
index 8d1727d77..63b91713c 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -22,6 +22,7 @@
  * @brief convenience main function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing-main2.c b/src/transport/transport-testing-main2.c
index de0b7f4cd..0a1710922 100644
--- a/src/transport/transport-testing-main2.c
+++ b/src/transport/transport-testing-main2.c
@@ -22,6 +22,7 @@
  * @brief convenience main function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c
index 38018c172..9b017c563 100644
--- a/src/transport/transport-testing-send.c
+++ b/src/transport/transport-testing-send.c
@@ -22,6 +22,7 @@
  * @brief convenience transmission function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 /**
diff --git a/src/transport/transport-testing-send2.c b/src/transport/transport-testing-send2.c
index bd2afb9b0..c48dc3a4a 100644
--- a/src/transport/transport-testing-send2.c
+++ b/src/transport/transport-testing-send2.c
@@ -22,6 +22,7 @@
  * @brief convenience transmission function for tests
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 /**
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 00c4a08dd..baced62e3 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing.h"
 
 
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index f0dee7388..566e0db71 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "transport-testing2.h"
 
 
diff --git a/src/transport/transport_api2_application.c b/src/transport/transport_api2_application.c
index 00f5f62eb..915cc6aef 100644
--- a/src/transport/transport_api2_application.c
+++ b/src/transport/transport_api2_application.c
@@ -24,6 +24,7 @@
  * @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 b79f0d8bf..8aabab8b4 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -24,6 +24,7 @@
  * @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 8cd0b7c8c..693babb91 100644
--- a/src/transport/transport_api2_core.c
+++ b/src/transport/transport_api2_core.c
@@ -24,6 +24,7 @@
  * @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 67aa1985e..07519fe62 100644
--- a/src/transport/transport_api2_monitor.c
+++ b/src/transport/transport_api2_monitor.c
@@ -24,6 +24,7 @@
  * @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 5b234f802..3bda5a39e 100644
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -23,6 +23,7 @@
  * @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 b195a7fc7..ab392c11f 100644
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -24,6 +24,7 @@
  * @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 0376275a3..39bfb8580 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -24,6 +24,7 @@
  * @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 a6006f698..9ac6fb9cc 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -24,6 +24,7 @@
  * @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 c71c952aa..6edc36f21 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -24,6 +24,7 @@
  * @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 4add06609..f120401ae 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -24,6 +24,7 @@
  * @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 4ca730add..74b16be84 100644
--- a/src/transport/transport_api_cmd_stop_peer.c
+++ b/src/transport/transport_api_cmd_stop_peer.c
@@ -24,6 +24,7 @@
  * @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 12612de09..d0f364e38 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -24,6 +24,7 @@
  * @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 f8bcc5f07..76643c853 100644
--- a/src/transport/transport_api_hello_get.c
+++ b/src/transport/transport_api_hello_get.c
@@ -24,6 +24,7 @@
  * @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 4f4ccc4a0..97125c64a 100644
--- a/src/transport/transport_api_manipulation.c
+++ b/src/transport/transport_api_manipulation.c
@@ -24,6 +24,7 @@
  * @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 ef1dc6087..3ce545eed 100644
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/transport_api_monitor_peers.c
@@ -29,6 +29,7 @@
  * 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 43a11442b..8a51e62ea 100644
--- a/src/transport/transport_api_monitor_plugins.c
+++ b/src/transport/transport_api_monitor_plugins.c
@@ -24,6 +24,7 @@
  * @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 1b611aa6b..e4f6688f2 100644
--- a/src/transport/transport_api_offer_hello.c
+++ b/src/transport/transport_api_offer_hello.c
@@ -24,6 +24,7 @@
  * @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 7e66cc3d1..f02b71124 100644
--- a/src/transport/transport_api_traits.c
+++ b/src/transport/transport_api_traits.c
@@ -24,6 +24,7 @@
  * @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/bandwidth.c b/src/util/bandwidth.c
index ff20d4632..8411c12ee 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/benchmark.c b/src/util/benchmark.c
index 14d72a86b..c9fc8842e 100644
--- a/src/util/benchmark.c
+++ b/src/util/benchmark.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "benchmark.h"
 #include <pthread.h>
diff --git a/src/util/bio.c b/src/util/bio.c
index 888282e4b..1abe6e324 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-bio", __VA_ARGS__)
diff --git a/src/util/buffer.c b/src/util/buffer.c
index 8a1e59a23..38c3ccac9 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -19,6 +19,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_buffer_lib.h"
 
diff --git a/src/util/child_management.c b/src/util/child_management.c
index 6cce44fdd..14d64ec33 100644
--- a/src/util/child_management.c
+++ b/src/util/child_management.c
@@ -26,6 +26,7 @@
  * @author t3sserakt
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_child_management_lib.h"
 
diff --git a/src/util/client.c b/src/util/client.c
index 7297f8743..fb2120ee8 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -27,6 +27,7 @@
  * connections between clients and service providers.
  */
 
+#include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 08bd212f8..5ebed750c 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #if HAVE_MALLOC_H
 #include <malloc.h>
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index f0d024559..da70d4538 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_crypto_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 15ca9e106..409910c48 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_strings_lib.h"
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 3ed8599a8..b6e9d42ce 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_strings_lib.h"
 #include "gnunet_os_lib.h"
diff --git a/src/util/configuration_helper.c b/src/util/configuration_helper.c
index 63c39f9b7..d4d5fc732 100644
--- a/src/util/configuration_helper.c
+++ b/src/util/configuration_helper.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/consttime_memcmp.c b/src/util/consttime_memcmp.c
index 5dfcb0757..d4fa45a5b 100644
--- a/src/util/consttime_memcmp.c
+++ b/src/util/consttime_memcmp.c
@@ -29,6 +29,7 @@ SOFTWARE.
 /* Rest of the file is 'original' */
 
 
+#include "platform.h"
 #include <stddef.h>
 #include <inttypes.h>
 
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 059857671..7e4faaf3f 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -40,6 +40,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index b75f1d7cb..f480fefd3 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_container_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-container-heap", \
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index c0ee78f48..b5b457291 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #if HAVE_EXTRACTOR_H
 #include <extractor.h>
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index bb20d7144..84e35d3cd 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_container_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index 8053f832e..2ae35911b 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_container_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c
index 9c7accf31..82a240fff 100644
--- a/src/util/container_multipeermap.c
+++ b/src/util/container_multipeermap.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c
index 3b1fe1532..3c0adc196 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/container_multiuuidmap.c b/src/util/container_multiuuidmap.c
index e9abee51e..96398e4f5 100644
--- a/src/util/container_multiuuidmap.c
+++ b/src/util/container_multiuuidmap.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index e7bfcf93d..7629bbffe 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -28,6 +28,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_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 394b288cc..eea456792 100644
--- a/src/util/crypto_cs.c
+++ b/src/util/crypto_cs.c
@@ -25,6 +25,7 @@
  * @author Gian Demarmels <gian@demarmels.org>
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include <sodium.h>
 #include <gcrypt.h>
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 9a28436fb..e6220d148 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -25,6 +25,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
 #include "gnunet_crypto_lib.h"
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index b42a034e9..c193be2b7 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -26,6 +26,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_crypto_lib.h"
 #include "gnunet_container_lib.h"
diff --git a/src/util/crypto_ecc_gnsrecord.c b/src/util/crypto_ecc_gnsrecord.c
index d6b2fa4ad..bd4a631b7 100644
--- a/src/util/crypto_ecc_gnsrecord.c
+++ b/src/util/crypto_ecc_gnsrecord.c
@@ -26,6 +26,7 @@
  * @author Martin Schanzenbach
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
 #include "gnunet_crypto_lib.h"
diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c
index eb86dceaa..e07d1e448 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/crypto_edx25519.c b/src/util/crypto_edx25519.c
index cffcbb00a..440dd27c2 100644
--- a/src/util/crypto_edx25519.c
+++ b/src/util/crypto_edx25519.c
@@ -27,6 +27,7 @@
  * @author Martin Schanzenbach
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
 #include "gnunet_crypto_lib.h"
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 252830cf6..a77a0f82a 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_strings_lib.h"
 #include "benchmark.h"
diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c
index 1108fe1e4..7300bab29 100644
--- a/src/util/crypto_hash_file.c
+++ b/src/util/crypto_hash_file.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index f2c2e5182..22d4643eb 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -51,6 +51,7 @@
 
 #if GNUNET_BUILD
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "benchmark.h"
 #else
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 345ce6ef9..039cd135f 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -25,6 +25,7 @@
  * @author Jeffrey Burdges <burdges@gnunet.org>
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 
 
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 97f48382b..3d810f27b 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -25,6 +25,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_crypto_lib.h"
 
diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c
index b11d2e0c7..169d1e49e 100644
--- a/src/util/crypto_paillier.c
+++ b/src/util/crypto_paillier.c
@@ -25,6 +25,7 @@
  * @author Christian Fuchs
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/crypto_pow.c b/src/util/crypto_pow.c
index 6e5e08de0..038e58cae 100644
--- a/src/util/crypto_pow.c
+++ b/src/util/crypto_pow.c
@@ -24,6 +24,7 @@
  * @author Bart Polot
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include <sodium.h>
 
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 613829050..492bfdb9e 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 #include <gcrypt.h>
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index c9e8077f4..4a866a5df 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -26,6 +26,7 @@
  * @author Jeffrey Burdges <burdges@gnunet.org>
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_crypto_lib.h"
 #include "benchmark.h"
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index 9cf8b45cc..f663f2da1 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/disk.c b/src/util/disk.c
index be3051928..4ccadc78e 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -24,6 +24,7 @@
  * @author Nils Durner
  */
 
+#include "platform.h"
 #include "disk.h"
 #include "gnunet_strings_lib.h"
 #include "gnunet_disk_lib.h"
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 50f3c038b..dab38def7 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c
index 0d2268c1b..c259b51dd 100644
--- a/src/util/dnsstub.c
+++ b/src/util/dnsstub.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/getopt.c b/src/util/getopt.c
index 08c490fce..b1737bbc7 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -38,6 +38,7 @@
  * actually fits our API.
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #ifdef VMS
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index 197255f7a..31020f185 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-getopt", __VA_ARGS__)
diff --git a/src/util/gnunet-base32.c b/src/util/gnunet-base32.c
index 2c6408cf8..209741740 100644
--- a/src/util/gnunet-base32.c
+++ b/src/util/gnunet-base32.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/gnunet-config-diff.c b/src/util/gnunet-config-diff.c
index ba4af8ad8..e1e3ffd5d 100644
--- a/src/util/gnunet-config-diff.c
+++ b/src/util/gnunet-config-diff.c
@@ -1,4 +1,5 @@
 
+#include "platform.h"
 #include <gnunet_util_lib.h>
 
 int
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index c42f16e5b..714c683dd 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/gnunet-crypto-tvg.c b/src/util/gnunet-crypto-tvg.c
index 183b845bc..4655407f0 100644
--- a/src/util/gnunet-crypto-tvg.c
+++ b/src/util/gnunet-crypto-tvg.c
@@ -48,6 +48,7 @@
  *
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index ae3135e65..812745085 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 #include <gcrypt.h>
diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c
index 215093c2e..d9b873c05 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -23,6 +23,7 @@
  * @author Martin Schanzenbach (integrate gnunet-uri)
  * @author Christian Grothoff (error handling)
  */
+#include "platform.h"
 #include <stdio.h>
 #include <stdbool.h>
 #include <signal.h>
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index 6bbeb7521..a23aeb4aa 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index 1b019d942..3d1b9c017 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -23,6 +23,7 @@
  * @author Bart Polot
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 52b716111..77b57c72b 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/util/gnunet-timeout.c b/src/util/gnunet-timeout.c
index 4c3c9125d..1d3002c08 100644
--- a/src/util/gnunet-timeout.c
+++ b/src/util/gnunet-timeout.c
@@ -24,6 +24,7 @@
  * @author Matthias Wachs
  */
 
+#include "platform.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index bb0aa1aad..128167cc5 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/helper.c b/src/util/helper.c
index d8e95b67a..ad4423f3a 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -26,6 +26,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_mst_lib.h"
 
diff --git a/src/util/load.c b/src/util/load.c
index 05e3c72da..a64171bd4 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/mq.c b/src/util/mq.c
index c61b6e707..788b9b636 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -24,6 +24,7 @@
  * @brief general purpose request queue
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-mq", __VA_ARGS__)
diff --git a/src/util/mst.c b/src/util/mst.c
index 6d1822a30..d8509b7ec 100644
--- a/src/util/mst.c
+++ b/src/util/mst.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/nc.c b/src/util/nc.c
index 0bad01e70..2a612917c 100644
--- a/src/util/nc.c
+++ b/src/util/nc.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-nc", __VA_ARGS__)
diff --git a/src/util/network.c b/src/util/network.c
index d27c3c33c..82b6ee464 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "disk.h"
 
diff --git a/src/util/op.c b/src/util/op.c
index eea6b9657..a8fc3de4a 100644
--- a/src/util/op.c
+++ b/src/util/op.c
@@ -25,6 +25,7 @@
  * @author Gabor X Toth
  */
 
+#include "platform.h"
 #include <inttypes.h>
 
 
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 592ef0dc7..ff04a8a7f 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -28,6 +28,7 @@
  * @author Heikki Lindholm
  * @author LRN
  */
+#include "platform.h"
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 9b32f14b1..30cc8a7ce 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -28,6 +28,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 900f46484..6f1c596c8 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "disk.h"
 #include <unistr.h>
diff --git a/src/util/peer.c b/src/util/peer.c
index 7ed333a7e..c82317654 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_peer_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-peer", __VA_ARGS__)
diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c
index ac7e1985f..c033a02ca 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -24,6 +24,7 @@
  * @brief measure performance of public key functions
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_crypto_cs.c b/src/util/perf_crypto_cs.c
index 8d2d476ef..43f32aae0 100644
--- a/src/util/perf_crypto_cs.c
+++ b/src/util/perf_crypto_cs.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c
index ef5c13f46..698a3aafa 100644
--- a/src/util/perf_crypto_ecc_dlog.c
+++ b/src/util/perf_crypto_ecc_dlog.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 #include <gauger.h>
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c
index e6cde698b..4e37ef758 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -24,6 +24,7 @@
  * @brief measure performance of hash function
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 #include <gcrypt.h>
diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c
index 23453ffbf..53c717a66 100644
--- a/src/util/perf_crypto_paillier.c
+++ b/src/util/perf_crypto_paillier.c
@@ -24,6 +24,7 @@
  * @brief measure performance of Paillier encryption
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index ed43926cc..ab9f362cf 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -24,6 +24,7 @@
  * @brief measure performance of RSA signing
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c
index f31fe4942..9be452015 100644
--- a/src/util/perf_crypto_symmetric.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -24,6 +24,7 @@
  * @brief measure performance of encryption function
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 199eac793..48a4a2ae7 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -24,6 +24,7 @@
  * @brief measure performance of allocation functions
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_mq.c b/src/util/perf_mq.c
index 51cb9be47..5c956e4e9 100644
--- a/src/util/perf_mq.c
+++ b/src/util/perf_mq.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/perf_scheduler.c b/src/util/perf_scheduler.c
index fd679d3b7..af084e04a 100644
--- a/src/util/perf_scheduler.c
+++ b/src/util/perf_scheduler.c
@@ -23,6 +23,7 @@
  * @brief measure performance of scheduler functions
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gauger.h>
 
diff --git a/src/util/plugin.c b/src/util/plugin.c
index 1fe01a1d6..62c2a1df0 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include <ltdl.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/proc_compat.c b/src/util/proc_compat.c
index e86ec70ad..a278ec045 100644
--- a/src/util/proc_compat.c
+++ b/src/util/proc_compat.c
@@ -26,7 +26,8 @@
  * Definitions for macOS and Win32
  */
 
-#include "gnunet_platform.h"
+#include "platform.h"
+#include "platform.h"
 
 /**
  * memrchr as defined in glibc
diff --git a/src/util/program.c b/src/util/program.c
index 7c35f0457..21b616ee2 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_constants.h"
diff --git a/src/util/regex.c b/src/util/regex.c
index 739e6162c..f06fd85d6 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_tun_lib.h"
 
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 71c97af2f..130363c77 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_resolver_service.h"
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 36df8291b..f3b220c4a 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "disk.h"
 // DEBUG
diff --git a/src/util/service.c b/src/util/service.c
index 3650a4701..2c280f5a1 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -25,6 +25,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_constants.h"
diff --git a/src/util/signal.c b/src/util/signal.c
index aec722fc4..67849a7d6 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-signal", __VA_ARGS__)
diff --git a/src/util/socks.c b/src/util/socks.c
index 2460e1b77..ffde8a667 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -26,6 +26,7 @@
  * These routines should be called only on newly active connections.
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/speedup.c b/src/util/speedup.c
index 11de2ff4f..02719e56e 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -24,6 +24,7 @@
  * @brief functions to speedup peer execution by manipulation system time
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "speedup.h"
 
diff --git a/src/util/strings.c b/src/util/strings.c
index 97d5d755e..817e4d3ce 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #if HAVE_ICONV
 #include <iconv.h>
 #endif
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 4bd0164b3..f655f8924 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -26,6 +26,7 @@
 
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #define TESTSTRING "testString"
 #define TESTNUMBER64 ((int64_t) 100000L)
diff --git a/src/util/test_child_management.c b/src/util/test_child_management.c
index c7fb6bf3f..90cc74c72 100644
--- a/src/util/test_child_management.c
+++ b/src/util/test_child_management.c
@@ -24,6 +24,7 @@
  * @author Dominik Meister
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_client.c b/src/util/test_client.c
index f6f572d31..64c32f646 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static int global_ret;
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index 0b618837f..e262b696e 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -23,6 +23,7 @@
  * @brief testcase for common_allocation.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c
index 80a5e16c9..2c11c594e 100644
--- a/src/util/test_common_endian.c
+++ b/src/util/test_common_endian.c
@@ -22,6 +22,7 @@
  * @brief testcase for common_endian.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define CHECK(n) if (n != GNUNET_htonll (GNUNET_ntohll (n))) return 1;
diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index 606d94eae..a2e49f20a 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static void
diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index 53a19d48a..fdb21ad5a 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -28,6 +28,7 @@
 #undef GNUNET_EXTRA_LOGGING
 #define GNUNET_EXTRA_LOGGING GNUNET_YES
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 5098c9d4a..f3f2fd64f 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -24,6 +24,7 @@
  * @author LRN
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define VERBOSE GNUNET_NO
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index e1f28f63c..75610fc74 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index cdfd306e3..244733dd9 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define K 4
diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c
index 229c45721..fcbef4e8b 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 3faf0ea9d..f11070ed5 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static int
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index 9d7b22fba..54b0dd100 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define ABORT(m) { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index 8ea392729..233369257 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define ABORT() { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c
index 056748ffe..eab5ad795 100644
--- a/src/util/test_container_multihashmap32.c
+++ b/src/util/test_container_multihashmap32.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define ABORT() { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c
index 6d7d6600e..6639b05ea 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -25,6 +25,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define ABORT() { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c
index 20b0920da..d95eaf260 100644
--- a/src/util/test_crypto_crc.c
+++ b/src/util/test_crypto_crc.c
@@ -27,6 +27,7 @@
  * @brief testcase for crypto_crc.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static int expected[] = {
diff --git a/src/util/test_crypto_cs.c b/src/util/test_crypto_cs.c
index c89332ee5..6fd2361fb 100644
--- a/src/util/test_crypto_cs.c
+++ b/src/util/test_crypto_cs.c
@@ -25,6 +25,7 @@
  * @author Gian Demarmels <gian@demarmels.org>
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <sodium.h>
 
diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c
index e616b0538..c3382a4fa 100644
--- a/src/util/test_crypto_ecc_dlog.c
+++ b/src/util/test_crypto_ecc_dlog.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_crypto_ecdh_ecdsa.c b/src/util/test_crypto_ecdh_ecdsa.c
index d35358cba..609f05282 100644
--- a/src/util/test_crypto_ecdh_ecdsa.c
+++ b/src/util/test_crypto_ecdh_ecdsa.c
@@ -25,6 +25,7 @@
  * @author Bart Polot
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c
index 8e64086ae..875f479c2 100644
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -25,6 +25,7 @@
  * @author Bart Polot
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c
index 4d47cd754..cf59cfa64 100644
--- a/src/util/test_crypto_ecdhe.c
+++ b/src/util/test_crypto_ecdhe.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c
index 2e66ae8b9..9dc1f863d 100644
--- a/src/util/test_crypto_ecdsa.c
+++ b/src/util/test_crypto_ecdsa.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include <gcrypt.h>
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c
index 74a69aeb9..820230fd2 100644
--- a/src/util/test_crypto_eddsa.c
+++ b/src/util/test_crypto_eddsa.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include <gcrypt.h>
diff --git a/src/util/test_crypto_edx25519.c b/src/util/test_crypto_edx25519.c
index dd4ddf094..85e235546 100644
--- a/src/util/test_crypto_edx25519.c
+++ b/src/util/test_crypto_edx25519.c
@@ -24,6 +24,7 @@
  * @author Özgür Kesim
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
 #include <gcrypt.h>
diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c
index 293b5e546..337694a89 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -24,6 +24,7 @@
  * @brief Test for crypto_hash.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static char block[65536];
diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c
index 139f90f78..08b63800f 100644
--- a/src/util/test_crypto_hash_context.c
+++ b/src/util/test_crypto_hash_context.c
@@ -23,6 +23,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define LEN 1234
diff --git a/src/util/test_crypto_hkdf.c b/src/util/test_crypto_hkdf.c
index f39f5cf7a..b9742468d 100644
--- a/src/util/test_crypto_hkdf.c
+++ b/src/util/test_crypto_hkdf.c
@@ -27,6 +27,7 @@
  * @author Nils Durner
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 
 
diff --git a/src/util/test_crypto_kdf.c b/src/util/test_crypto_kdf.c
index 04aec56e5..583b1bf30 100644
--- a/src/util/test_crypto_kdf.c
+++ b/src/util/test_crypto_kdf.c
@@ -26,6 +26,7 @@
  * @author Jeffrey Burdges <burdges@gnunet.org>
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 
 
diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index 74fd52379..412ce5c23 100644
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -25,6 +25,7 @@
  * @author Florian Dold
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c
index 3bb6ef374..b776aef18 100644
--- a/src/util/test_crypto_random.c
+++ b/src/util/test_crypto_random.c
@@ -24,6 +24,7 @@
  * @brief testcase for crypto_random.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static int
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index b8dda52ce..9f2ddb66e 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -25,6 +25,7 @@
  * @author Jeffrey Burdges <burdges@gnunet.org>
  */
 
+#include "platform.h"
 #include <gcrypt.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index e36891d6d..4c8c2f0c2 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -24,6 +24,7 @@
  * @brief test for AES ciphers
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define TESTSTRING "Hello World!"
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index 461d35067..35b4bd14a 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define TESTSTRING "Hello World\0"
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index c5574feb9..cad10504d 100644
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -22,6 +22,7 @@
  * @brief testcase for util/getopt.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
index 3fcf413e6..7861d3aa0 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -25,6 +25,7 @@
  *                 #GNUNET_DNSPARSER_bin_to_hex()
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
 
diff --git a/src/util/test_mq.c b/src/util/test_mq.c
index 5ebe13493..522589daf 100644
--- a/src/util/test_mq.c
+++ b/src/util/test_mq.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 #define NUM_TRANSMISSIONS 500
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 58994da25..74e98663b 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -22,6 +22,7 @@
  * @brief testcase for util/os_network.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 63766595b..cdb1acf03 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -26,6 +26,7 @@
  * correct data "HELLO" is read then all is well.
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "disk.h"
 
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 67204d2f9..ad4e6aac9 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -24,6 +24,7 @@
  */
 
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index e23126809..0831f3068 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -22,6 +22,7 @@
  * @brief testcase for plugin.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index 68490bf8d..f8b0b89f4 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -22,7 +22,8 @@
  * @brief plugin for testing
  */
 
-#include "gnunet_platform.h"
+#include "platform.h"
+#include "platform.h"
 
 
 void *
diff --git a/src/util/test_program.c b/src/util/test_program.c
index efb754e56..3d63b0336 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -22,6 +22,7 @@
  * @brief tests for program.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_regex.c b/src/util/test_regex.c
index ccd3e3ec6..968828755 100644
--- a/src/util/test_regex.c
+++ b/src/util/test_regex.c
@@ -23,6 +23,7 @@
  * @author Maximilian Szengel
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 91ad5d422..5ad0c6bf3 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -22,6 +22,7 @@
  * @brief testcase for resolver_api.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "resolver.h"
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 6d7b1a0e1..4573518fd 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -22,6 +22,7 @@
  * @brief tests for the scheduler
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index 9e8c95e3d..41990272a 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -24,6 +24,7 @@
  *  modern machines.
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static struct GNUNET_TIME_Absolute target;
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 9ca0c376c..198ae68ec 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -23,6 +23,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index 7b8311455..680ecada5 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -22,6 +22,7 @@
  * @brief tests for socks.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index 70d7e6fc8..58d78641b 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -22,6 +22,7 @@
  * @brief testcase for speedup.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 107263317..0e39b9958 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -22,6 +22,7 @@
  * @brief testcase for strings.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c
index 5fd462459..75cbd135d 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -22,6 +22,7 @@
  * @brief testcase for strings.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_time.c b/src/util/test_time.c
index b27b51aa6..35f270a44 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -22,6 +22,7 @@
  * @brief testcase for time.c
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/util/test_tun.c b/src/util/test_tun.c
index b8673b6b0..1086ef3ca 100644
--- a/src/util/test_tun.c
+++ b/src/util/test_tun.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 static int ret;
diff --git a/src/util/test_uri.c b/src/util/test_uri.c
index 7c8156648..d8fa38e96 100644
--- a/src/util/test_uri.c
+++ b/src/util/test_uri.c
@@ -1,3 +1,4 @@
+#include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/util/time.c b/src/util/time.c
index acf6aedf2..84957c6a8 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -24,6 +24,7 @@
  * @brief functions for handling time and time arithmetic
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 #if __STDC_NO_ATOMICS__
 #define ATOMIC
diff --git a/src/util/tun.c b/src/util/tun.c
index ae1c5e05f..c4ac6ff88 100644
--- a/src/util/tun.c
+++ b/src/util/tun.c
@@ -25,6 +25,7 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/util/uri.c b/src/util/uri.c
index fa383110d..b09968581 100644
--- a/src/util/uri.c
+++ b/src/util/uri.c
@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 7686d51d5..08786e999 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -33,6 +33,7 @@
  * - Philipp Tölke
  */
 #include "platform.h"
+#include "platform.h"
 #ifdef IF_TUN_HDR
 #include IF_TUN_HDR
 #endif
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index a2a16e380..d4a006cb9 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -31,6 +31,7 @@
  *   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"
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 60d631d5e..fdc9df7f4 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -25,6 +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 8a3464786..5148f21c5 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -24,6 +24,7 @@
  * @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 f5baada2e..f6667e335 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "platform.h"
 #include <pthread.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"