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

86 files changed, 88 insertions, 2 deletions

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"