250 files changed, 253 insertions, 142 deletions
diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 2c573fb20..292858031 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -33,6 +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 f05bb4a29..719a7db03 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -34,6 +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 cc78f2c32..660ee7742 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -36,6 +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 716ce9cb1..d33b70aaf 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -11,6 +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 458512657..50067d00e 100644
--- a/src/include/gettext.h
+++ b/src/include/gettext.h
@@ -23,6 +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 a52ed29ff..76a52414c 100644
--- a/src/include/gnunet_abd_service.h
+++ b/src/include/gnunet_abd_service.h
@@ -35,6 +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 9615f8c9d..453ff4b03 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -43,6 +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 4d976572e..84dd1e3bc 100644
--- a/src/include/gnunet_ats_application_service.h
+++ b/src/include/gnunet_ats_application_service.h
@@ -37,6 +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 59d09f690..8ef16d1e5 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -40,6 +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 321e621d2..68f34cf2d 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -37,6 +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 fd821baef..625211e82 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -34,6 +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 9f173a691..9ea6796ea 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -43,6 +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 5eefabff2..800a136ef 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -36,6 +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 53827f5f4..92bfe69a7 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -31,6 +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 6a6de712b..95c9514e1 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -34,6 +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 7cd744ac4..75681d227 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -38,6 +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 45c70df3e..63ebfbe9f 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -45,6 +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 321810eb4..63c988f34 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -50,6 +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 8c58fd6e3..d4654a75c 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -40,6 +40,7 @@
 #ifndef GNUNET_COMMON_H
 #define GNUNET_COMMON_H
+#include "gnunet_platform.h"
 #include <stdlib.h>
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 2d26f3c05..18bd2de62 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -35,6 +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 1d2ec63cd..c63012109 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -43,6 +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 b31a95fac..f02f5db22 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -58,6 +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 e201c2cf3..b3778dbf5 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -61,6 +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 4b824980b..b58e7f24a 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -43,6 +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 36e6743b3..eaf6b79b5 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -54,6 +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 92334887d..cabd5e268 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -32,6 +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 5a876af8c..28c600412 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -40,6 +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 298623cb1..352c7e31b 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -34,6 +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 4d1a7ff67..319423e4f 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -34,6 +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 c2ec9ce1f..33a4dfdb6 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -42,6 +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 e88e836f6..91730dea9 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -25,6 +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 0d1041a88..682fea303 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -40,6 +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 81b0f1d7b..913dfabca 100644
--- a/src/include/gnunet_dhtu_plugin.h
+++ b/src/include/gnunet_dhtu_plugin.h
@@ -27,6 +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 c76cdc231..8d1f96615 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -76,6 +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 fd1319dd9..8772229a2 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -36,6 +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 b8b908e84..979669a5f 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -35,6 +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 4cc5e7fd0..b9ab4c122 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -34,6 +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 bb4a3ee8c..7c7af0318 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -37,6 +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 03fa6c72d..b26af24ca 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -42,6 +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 d9f2ee563..6035b6915 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -36,6 +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 87ad591b7..13c9cf9ce 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -43,6 +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 a32bb77ae..ee2a8449c 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -37,6 +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 833e684f9..9727b3b0e 100644
--- a/src/include/gnunet_gnsrecord_json_lib.h
+++ b/src/include/gnunet_gnsrecord_json_lib.h
@@ -37,6 +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 0ccf28e7d..a49b2ea5f 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -37,6 +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 86bf35110..2c80f1df1 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -44,6 +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 89cd42d31..73cde8c0a 100644
--- a/src/include/gnunet_hello_uri_lib.h
+++ b/src/include/gnunet_hello_uri_lib.h
@@ -42,6 +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 3362d698e..967ecb070 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -41,6 +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 cd745ba51..ca203dd77 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -52,6 +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 8809afb71..a5808ab94 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -27,6 +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 397d3aa2d..974db45ef 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -43,6 +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 12f021d35..6878538b4 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -39,6 +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 0cfcc6445..4b0a62436 100644
--- a/src/include/gnunet_mhd_compat.h
+++ b/src/include/gnunet_mhd_compat.h
@@ -25,6 +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 479c7a71e..eb4181ef5 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -44,6 +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 a06fb4eb7..b99fff9e3 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -39,6 +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 ec82ce357..122ab4835 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -50,6 +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 96d8cab42..faaddf0c5 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -34,6 +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 8da7e5397..c1b52c9c3 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -30,6 +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 c41c516c8..5ab5f0be5 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -37,6 +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 fbc9f7e62..22b91f64c 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -41,6 +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 4f08ccbcf..16ea9e386 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -34,6 +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 39449be5d..372b26a1a 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -41,6 +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 db3a8460d..502031d5e 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -34,6 +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 628ca2ef8..9fbdc1dcb 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -36,6 +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 1e8b7e851..9d240151b 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -52,6 +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 7fe57a179..1c8857060 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -50,6 +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 0e09457cc..dfeb49686 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -32,6 +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 fc88e1123..d4d436338 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -60,6 +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 e088743e6..5da8edd22 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -36,6 +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 3be4a6977..0657c91f9 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -39,6 +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 fab3d41f9..f36aad98e 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -34,6 +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 f9b283a9f..48433355c 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -36,6 +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_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index d5f3f893a..ee650aa8b 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -44,6 +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 550ba5eee..2c125bc2e 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -25,6 +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 2d4dc626b..2b6f5c747 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -44,6 +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 35b58cd0e..1e3ea9916 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -40,6 +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 331f36f24..5c5ba9ccc 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -33,6 +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 a3f6c19b6..13605c43c 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -41,6 +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 b8572156b..096cf87f9 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -39,6 +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 80c92dc4e..953bf24cd 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -43,6 +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 82448697a..ced3d13b1 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -34,6 +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 acfe879b3..15065a6e3 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -32,6 +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 b3f6a5090..3b0e67a9a 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -21,6 +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 7f60bb325..879e022b0 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -31,6 +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 6492039dd..13a071054 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -96,6 +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 c13cf482a..9056dd66d 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -40,6 +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 8c8591af0..033b26ec9 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -50,6 +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 255eef265..d1e663948 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -47,6 +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 d2c3b59bb..e92bbf11c 100644
--- a/src/include/gnunet_seti_service.h
+++ b/src/include/gnunet_seti_service.h
@@ -44,6 +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 89ac3cd07..5d8d3e885 100644
--- a/src/include/gnunet_setu_service.h
+++ b/src/include/gnunet_setu_service.h
@@ -44,6 +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 b82943da3..9f124d3bb 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -43,6 +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 cb4d65fb9..116f8eb88 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -44,6 +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 3406b9031..d75b96785 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -25,6 +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 a886c6ed8..269176a4b 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -50,6 +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 7e06768b8..254f10ca5 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -44,6 +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 91ede19d8..505873452 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -43,6 +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 ef67ab8ca..d418381ec 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -38,6 +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 2f64c306b..cf33231b2 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -44,6 +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 f736e1b42..ae2f37b48 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -27,6 +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 d810a5342..e838839e7 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -27,6 +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 e66ce6ea9..a54d1d1ca 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -44,6 +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 9a6ddd36a..bc3c94efa 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -33,6 +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 6c99de78e..290fdc1e1 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -45,6 +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 fc8272892..3a3f52901 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -43,6 +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 6f737de23..3ed948b71 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -46,6 +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 b77735a61..5a541b20d 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -47,6 +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 c3d98ff53..b6ba71229 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -45,6 +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 3c857a34c..e48d7fcdd 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -39,6 +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 daa79bf1c..f5baaf65d 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -45,6 +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 e92d6ae04..079571520 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -37,6 +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 ee362f789..804bc3c39 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -61,7 +61,7 @@ extern "C"
 #define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v" \
  PACKAGE_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 d493dddd0..a55bb994f 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -34,6 +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/util/bandwidth.c b/src/util/bandwidth.c
index 44caec2fa..ff20d4632 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -23,7 +23,7 @@
 * @brief functions related to bandwidth (unit)
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/util/benchmark.c b/src/util/benchmark.c
index 12efde706..14d72a86b 100644
--- a/src/util/benchmark.c
+++ b/src/util/benchmark.c
@@ -24,7 +24,7 @@
 * @author Florian Dold <flo@dold.me>
 */
-#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 a09115048..888282e4b 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -22,7 +22,7 @@
 * @brief functions for buffering IO
 * @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 662e4d0f2..8a1e59a23 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -18,7 +18,7 @@
 * @brief Common buffer management functions.
 * @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 8c413a8b5..6cce44fdd 100644
--- a/src/util/child_management.c
+++ b/src/util/child_management.c
@@ -25,7 +25,7 @@
 * @author Dominik Meister (ANASTASIS)
 * @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 91e0c1a85..7297f8743 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -26,7 +26,7 @@
 * Generic TCP code for reliable, record-oriented TCP
 * 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 a43ac3865..08bd212f8 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -23,7 +23,7 @@
 * @brief wrapper around malloc/free
 * @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 ce70f91da..f0d024559 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -25,7 +25,7 @@
 * @author Gabor X Toth
 */
-#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 9fa848224..15ca9e106 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -23,7 +23,7 @@
 * @brief error handling API
 * @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 5c415aff7..3ed8599a8 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -22,7 +22,7 @@
 * @brief configuration management
 * @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 8f995ec03..63c39f9b7 100644
--- a/src/util/configuration_helper.c
+++ b/src/util/configuration_helper.c
@@ -22,7 +22,7 @@
 * @brief helper logic for gnunet-config
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /**
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 4bfb82d14..059857671 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -39,7 +39,7 @@
 * @author Christian Grothoff
 */
-#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 24f753adb..b75f1d7cb 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -25,7 +25,7 @@
 * @author Christian Grothoff
 */
-#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 52882c5f3..c0ee78f48 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 8b1deac12..bb20d7144 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 */
-#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 2416c40f2..8053f832e 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -25,7 +25,7 @@
 * @author Sree Harsha Totakura
 */
-#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 976f172e1..9c7accf31 100644
--- a/src/util/container_multipeermap.c
+++ b/src/util/container_multipeermap.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 */
-#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 a02d55770..3b1fe1532 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 */
-#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 fbc4c8c39..e9abee51e 100644
--- a/src/util/container_multiuuidmap.c
+++ b/src/util/container_multiuuidmap.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 */
-#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 8b0449d4b..e7bfcf93d 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -27,7 +27,7 @@
 * @brief implementation of CRC16 and CRC32
 * @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 4c6648229..394b288cc 100644
--- a/src/util/crypto_cs.c
+++ b/src/util/crypto_cs.c
@@ -24,7 +24,7 @@
 * @author Lucien Heuzeveldt <lucienclaude.heuzeveldt@students.bfh.ch>
 * @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 c4f0e64bd..9a28436fb 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 * @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 916acd9dd..b42a034e9 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -25,7 +25,7 @@
 *        result is relativey small.
 * @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 0ee0570c0..d6b2fa4ad 100644
--- a/src/util/crypto_ecc_gnsrecord.c
+++ b/src/util/crypto_ecc_gnsrecord.c
@@ -25,7 +25,7 @@
 * @author Florian Dold
 * @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 cee912e90..eb86dceaa 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -23,7 +23,7 @@
 * @brief helper function for easy EdDSA key setup
 * @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 e43c1685b..cffcbb00a 100644
--- a/src/util/crypto_edx25519.c
+++ b/src/util/crypto_edx25519.c
@@ -26,7 +26,7 @@
 * @author Florian Dold
 * @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 c910eb81c..252830cf6 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -23,7 +23,7 @@
 * @brief SHA-512 #GNUNET_CRYPTO_hash() related functions
 * @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 42056fb38..1108fe1e4 100644
--- a/src/util/crypto_hash_file.c
+++ b/src/util/crypto_hash_file.c
@@ -23,7 +23,7 @@
 * @brief incremental hashing of files
 * @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 838e37d8d..f2c2e5182 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -50,7 +50,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 f577e0f7a..345ce6ef9 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -27,7 +27,7 @@
 #include <gcrypt.h>
-#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-kdf", __VA_ARGS__)
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 6df47c7e1..97f48382b 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 * @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 5d762eba4..b11d2e0c7 100644
--- a/src/util/crypto_paillier.c
+++ b/src/util/crypto_paillier.c
@@ -24,7 +24,7 @@
 * @author Florian Dold
 * @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 051a0c209..6e5e08de0 100644
--- a/src/util/crypto_pow.c
+++ b/src/util/crypto_pow.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 * @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 b2dcde124..613829050 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -24,7 +24,7 @@
 * @brief functions to gather random numbers
 * @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 325a1fe86..c9e8077f4 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -25,7 +25,7 @@
 * @author Christian Grothoff
 * @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 ad54aa8b3..9cf8b45cc 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -25,7 +25,7 @@
 * @author Ioana Patrascu
 */
-#include "platform.h"
 #include "gnunet_crypto_lib.h"
 #include <gcrypt.h>
diff --git a/src/util/disk.c b/src/util/disk.c
index 2efb52d46..be3051928 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 * @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 d8b4a9bed..50f3c038b 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -24,7 +24,8 @@
 * @author Philipp Toelke
 * @author Christian Grothoff
 */
-#include "platform.h"
+#include "gnunet_util_lib.h"
 #if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
@@ -38,8 +39,6 @@
 #include <idn/idna.h>
 #endif
 #endif
-#include "gnunet_util_lib.h"
 /**
 * Check if a label in UTF-8 format can be coded into valid IDNA.
diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c
index 9763f6501..0d2268c1b 100644
--- a/src/util/dnsstub.c
+++ b/src/util/dnsstub.c
@@ -22,7 +22,7 @@
 * @brief DNS stub resolver which sends DNS requests to an actual resolver
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /**
diff --git a/src/util/getopt.c b/src/util/getopt.c
index 6dfad96da..08c490fce 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -37,7 +37,7 @@
 * replace main GNU getopt parser with one that
 * 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 96aee40e3..197255f7a 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -23,7 +23,7 @@
 * @brief implements command line that sets option
 * @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 217185ed0..2c6408cf8 100644
--- a/src/util/gnunet-base32.c
+++ b/src/util/gnunet-base32.c
@@ -23,7 +23,7 @@
 * @brief tool to encode/decode from/to the Crockford Base32 encoding GNUnet uses
 * @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 207b9518a..ba4af8ad8 100644
--- a/src/util/gnunet-config-diff.c
+++ b/src/util/gnunet-config-diff.c
@@ -1,4 +1,4 @@
-#include "platform.h"
 #include <gnunet_util_lib.h>
 int
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 7fda209da..c42f16e5b 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -23,7 +23,7 @@
 * @brief tool to access and manipulate GNUnet configuration files
 * @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 6ec9229e3..183b845bc 100644
--- a/src/util/gnunet-crypto-tvg.c
+++ b/src/util/gnunet-crypto-tvg.c
@@ -47,7 +47,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 8e30ac416..ae3135e65 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -23,7 +23,7 @@
 * @brief tool to manipulate EDDSA key files
 * @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 5bccd3916..215093c2e 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <zbar.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #if HAVE_PNG
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index d8e6a1f0d..6bbeb7521 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -23,7 +23,7 @@
 * @brief tool to test resolver
 * @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 3c219ef4f..1b019d942 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -22,7 +22,7 @@
 * @brief tool to manipulate SCRYPT proofs of work.
 * @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 bb70ac3bd..52b716111 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -23,7 +23,7 @@
 * @brief code to do DNS resolution
 * @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-uri.c b/src/util/gnunet-uri.c
index de0ff1f92..bb0aa1aad 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -23,7 +23,7 @@
 * @brief tool to dispatch URIs to the appropriate GNUnet helper process
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /**
diff --git a/src/util/helper.c b/src/util/helper.c
index 09d3fffab..d8e95b67a 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -25,7 +25,7 @@
 * @author Philipp Toelke
 * @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 64f0b19c1..05e3c72da 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -23,7 +23,7 @@
 * @brief functions related to load calculations
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/util/mq.c b/src/util/mq.c
index 585389ce8..c61b6e707 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -23,7 +23,7 @@
 * @file util/mq.c
 * @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 18f144906..6d1822a30 100644
--- a/src/util/mst.c
+++ b/src/util/mst.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
diff --git a/src/util/nc.c b/src/util/nc.c
index 49c95c14e..0bad01e70 100644
--- a/src/util/nc.c
+++ b/src/util/nc.c
@@ -25,7 +25,7 @@
 * @author Christian Grothoff
 */
-#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 7588033c4..d27c3c33c 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -24,7 +24,7 @@
 * @author Nils Durner
 * @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 647fedb53..eea6b9657 100644
--- a/src/util/op.c
+++ b/src/util/op.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-op", __VA_ARGS__)
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 7a348b42e..592ef0dc7 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <unistr.h> /* for u16_to_u8 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #if DARWIN
 #include <mach-o/ldsyms.h>
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 9ee26f0a9..9b32f14b1 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -27,7 +27,7 @@
 * @author LRN
 * @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 e60273814..900f46484 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -24,7 +24,7 @@
 * @author Nils Durner
 */
-#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 809efdcd5..7ed333a7e 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -23,7 +23,7 @@
 * @brief peer-ID table that assigns integer IDs to peer-IDs to save memory
 * @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 8533351e1..ac7e1985f 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -23,7 +23,7 @@
 * @file util/perf_crypto_asymmetric.c
 * @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 54c9c8e0e..8d2d476ef 100644
--- a/src/util/perf_crypto_cs.c
+++ b/src/util/perf_crypto_cs.c
@@ -25,7 +25,7 @@
 * @brief measure performance of Clause Blind Schnorr Signatures
 */
-#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 f32ffbd67..ef5c13f46 100644
--- a/src/util/perf_crypto_ecc_dlog.c
+++ b/src/util/perf_crypto_ecc_dlog.c
@@ -23,7 +23,7 @@
 * @brief benchmark for ECC DLOG calculation
 * @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 3bd483639..e6cde698b 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -23,7 +23,7 @@
 * @file util/perf_crypto_hash.c
 * @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 35e6cce16..23453ffbf 100644
--- a/src/util/perf_crypto_paillier.c
+++ b/src/util/perf_crypto_paillier.c
@@ -23,7 +23,7 @@
 * @file util/perf_crypto_paillier.c
 * @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 3806fe43d..ed43926cc 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -23,7 +23,7 @@
 * @file util/perf_crypto_rsa.c
 * @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 8176361ba..f31fe4942 100644
--- a/src/util/perf_crypto_symmetric.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -23,7 +23,7 @@
 * @file util/perf_crypto_symmetric.c
 * @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 ea25148ec..199eac793 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -23,7 +23,7 @@
 * @file util/perf_malloc.c
 * @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 f6e3d78e2..51cb9be47 100644
--- a/src/util/perf_mq.c
+++ b/src/util/perf_mq.c
@@ -24,7 +24,7 @@
 * @author Florian Dold
 * @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 4d4d0a228..fd679d3b7 100644
--- a/src/util/perf_scheduler.c
+++ b/src/util/perf_scheduler.c
@@ -22,7 +22,7 @@
 * @file util/perf_scheduler.c
 * @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 ffbae06ff..1fe01a1d6 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 6e852cb35..e86ec70ad 100644
--- a/src/util/proc_compat.c
+++ b/src/util/proc_compat.c
@@ -17,7 +17,7 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
-#include "platform.h"
 /**
 * @author Martin Schanzenbach
@@ -26,6 +26,7 @@
 * Definitions for macOS and Win32
 */
+#include "gnunet_platform.h"
 /**
 * memrchr as defined in glibc
diff --git a/src/util/program.c b/src/util/program.c
index fb7929b98..7c35f0457 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 c2040a4b8..739e6162c 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -23,7 +23,7 @@
 * @author Maximilian Szengel
 * @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 d38c700e4..71c97af2f 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -23,7 +23,7 @@
 * @brief resolver for writing a tool
 * @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 acae4d7e2..36df8291b 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -22,7 +22,7 @@
 * @brief schedule computations using continuation passing style
 * @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 27183981e..3650a4701 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 * @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 8b9a9a291..aec722fc4 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 a1990ec8b..2460e1b77 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -25,7 +25,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 82a8746a9..11de2ff4f 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -23,7 +23,7 @@
 * @author Matthias Wachs
 * @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 7e218cc59..97d5d755e 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 f18014719..4bd0164b3 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -25,7 +25,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 62c143420..c7fb6bf3f 100644
--- a/src/util/test_child_management.c
+++ b/src/util/test_child_management.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 * @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 ef5765fff..f6f572d31 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -22,7 +22,7 @@
 * @brief tests for client.c
 * @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 50f259257..0b618837f 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -22,7 +22,7 @@
 * @file util/test_common_allocation.c
 * @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 10a85a1bb..80a5e16c9 100644
--- a/src/util/test_common_endian.c
+++ b/src/util/test_common_endian.c
@@ -21,7 +21,7 @@
 * @file util/test_common_endian.c
 * @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 7d7656ed8..606d94eae 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -23,7 +23,7 @@
 * @brief testcase for the logging module
 * @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 c6c6411da..53a19d48a 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -24,7 +24,7 @@
 * log level adjustment)
 * @author LRN
 */
-#include "platform.h"
 #undef GNUNET_EXTRA_LOGGING
 #define GNUNET_EXTRA_LOGGING GNUNET_YES
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 79cf9d53a..5098c9d4a 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -23,7 +23,7 @@
 * @brief testcase for the logging module  (runtime log level adjustment)
 * @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 823bf273d..e1f28f63c 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 */
-#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 06a3fb500..cdfd306e3 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -24,7 +24,7 @@
 * @author Igor Wronsky
 */
-#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 33671d00b..229c45721 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -24,7 +24,7 @@
 * @brief Test of DLL operations
 */
-#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 c83c7810f..3faf0ea9d 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -24,7 +24,7 @@
 * @brief Test of heap operations
 */
-#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 db413f313..9d7b22fba 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 f46b9f56e..8ea392729 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 92aac6eeb..056748ffe 100644
--- a/src/util/test_container_multihashmap32.c
+++ b/src/util/test_container_multihashmap32.c
@@ -25,7 +25,7 @@
 * @author Sree Harsha Totakura
 */
-#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 cb6fc30d2..6d7d6600e 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 */
-#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 4507deadd..20b0920da 100644
--- a/src/util/test_crypto_crc.c
+++ b/src/util/test_crypto_crc.c
@@ -26,7 +26,7 @@
 * @file util/test_crypto_crc.c
 * @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 a56ff7421..c89332ee5 100644
--- a/src/util/test_crypto_cs.c
+++ b/src/util/test_crypto_cs.c
@@ -24,7 +24,7 @@
 * @author Lucien Heuzeveldt <lucienclaude.heuzeveldt@students.bfh.ch>
 * @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 51f290d51..e616b0538 100644
--- a/src/util/test_crypto_ecc_dlog.c
+++ b/src/util/test_crypto_ecc_dlog.c
@@ -23,7 +23,7 @@
 * @brief testcase for ECC DLOG calculation
 * @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 3cc12de9b..d35358cba 100644
--- a/src/util/test_crypto_ecdh_ecdsa.c
+++ b/src/util/test_crypto_ecdh_ecdsa.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 * @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 6efd4d2fe..8e64086ae 100644
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 * @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 1144f1fe5..4d47cd754 100644
--- a/src/util/test_crypto_ecdhe.c
+++ b/src/util/test_crypto_ecdhe.c
@@ -23,7 +23,7 @@
 * @brief testcase for ECC ECDHE public key crypto
 * @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 7908590a8..2e66ae8b9 100644
--- a/src/util/test_crypto_ecdsa.c
+++ b/src/util/test_crypto_ecdsa.c
@@ -23,7 +23,7 @@
 * @brief testcase for ECC ECDSA public key crypto
 * @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 e9573a307..74a69aeb9 100644
--- a/src/util/test_crypto_eddsa.c
+++ b/src/util/test_crypto_eddsa.c
@@ -23,7 +23,7 @@
 * @brief testcase for ECC public key crypto
 * @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 ead6f0bb9..dd4ddf094 100644
--- a/src/util/test_crypto_edx25519.c
+++ b/src/util/test_crypto_edx25519.c
@@ -23,7 +23,7 @@
 * @brief testcase for ECC public key crypto for edx25519
 * @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 8241676da..293b5e546 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -23,7 +23,7 @@
 * @file util/test_crypto_hash.c
 * @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 8c652595f..139f90f78 100644
--- a/src/util/test_crypto_hash_context.c
+++ b/src/util/test_crypto_hash_context.c
@@ -22,7 +22,7 @@
 * @brief test case for incremental hashing
 * @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 85be5bb80..f39f5cf7a 100644
--- a/src/util/test_crypto_hkdf.c
+++ b/src/util/test_crypto_hkdf.c
@@ -29,7 +29,7 @@
 #include <gcrypt.h>
-#include "platform.h"
 #include "gnunet_crypto_lib.h"
 void
diff --git a/src/util/test_crypto_kdf.c b/src/util/test_crypto_kdf.c
index 7c33e0ba8..04aec56e5 100644
--- a/src/util/test_crypto_kdf.c
+++ b/src/util/test_crypto_kdf.c
@@ -28,7 +28,7 @@
 #include <gcrypt.h>
-#include "platform.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index 64c9569cb..74fd52379 100644
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -24,7 +24,7 @@
 * @author Christian Fuchs
 * @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 b9cbbdf76..3bb6ef374 100644
--- a/src/util/test_crypto_random.c
+++ b/src/util/test_crypto_random.c
@@ -23,7 +23,7 @@
 * @file util/test_crypto_random.c
 * @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 2a676c711..b8dda52ce 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -24,7 +24,7 @@
 * @author Sree Harsha Totakura <sreeharsha@totakura.in>
 * @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 5012c7f5b..e36891d6d 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -23,7 +23,7 @@
 * @file util/test_crypto_symmetric.c
 * @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 12bde8107..461d35067 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -23,7 +23,7 @@
 * @brief testcase for the storage module
 * @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 7252530e2..c5574feb9 100644
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -21,7 +21,7 @@
 * @file util/test_getopt.c
 * @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 923652a00..3fcf413e6 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -24,7 +24,7 @@
 * @brief test for #GNUNET_DNSPARSER_hex_to_bin() and
 *                 #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 dc34f2da4..5ebe13493 100644
--- a/src/util/test_mq.c
+++ b/src/util/test_mq.c
@@ -24,7 +24,7 @@
 * @author Florian Dold
 * @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 cca29df0f..58994da25 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -21,7 +21,7 @@
 * @file util/test_os_network.c
 * @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 435b70e1a..63766595b 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -25,7 +25,7 @@
 * giving a file descriptor to write stdout to.  If the
 * 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 bb0bc48dc..67204d2f9 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -23,7 +23,7 @@
 * @author Safey Mohammed
 */
-#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 e739d17c9..e23126809 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -21,7 +21,7 @@
 * @file util/test_plugin.c
 * @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 bfaad52e8..68490bf8d 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -21,7 +21,8 @@
 * @file util/test_plugin_plug.c
 * @brief plugin for testing
 */
-#include "platform.h"
+#include "gnunet_platform.h"
 void *
diff --git a/src/util/test_program.c b/src/util/test_program.c
index 912a581a5..efb754e56 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -21,7 +21,7 @@
 * @file util/test_program.c
 * @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 b026ab955..ccd3e3ec6 100644
--- a/src/util/test_regex.c
+++ b/src/util/test_regex.c
@@ -22,7 +22,7 @@
 * @brief simple test for regex.c iptoregex functions
 * @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 eefb20890..91ad5d422 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -21,7 +21,7 @@
 * @file resolver/test_resolver_api.c
 * @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 0e2e7f760..6d7b1a0e1 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -21,7 +21,7 @@
 * @file util/test_scheduler.c
 * @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 003fac196..9e8c95e3d 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -23,7 +23,7 @@
 *  precise the timers are.  Expect values between 0.2 and 2 ms on
 *  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 61afc0cc5..9ca0c376c 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -22,7 +22,7 @@
 * @brief tests for service.c
 * @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 c5a703db4..7b8311455 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -21,7 +21,7 @@
 * @file util/test_socks.c
 * @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 bca6886aa..70d7e6fc8 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -21,7 +21,7 @@
 * @file util/test_speedup.c
 * @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 cccffcaf5..107263317 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -21,7 +21,7 @@
 * @file util/test_strings.c
 * @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 71861b128..5fd462459 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -21,7 +21,7 @@
 * @file util/test_strings_to_data.c
 * @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 59917793c..b27b51aa6 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -21,7 +21,7 @@
 * @file util/test_time.c
 * @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 ad4a5c19e..b8673b6b0 100644
--- a/src/util/test_tun.c
+++ b/src/util/test_tun.c
@@ -23,7 +23,7 @@
 * @brief test for tun.c
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 static int ret;
diff --git a/src/util/time.c b/src/util/time.c
index cf072aebf..acf6aedf2 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -23,7 +23,7 @@
 * @author Christian Grothoff
 * @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 e22cf0be8..ae1c5e05f 100644
--- a/src/util/tun.c
+++ b/src/util/tun.c
@@ -24,7 +24,7 @@
 * @author Philipp Toelke
 * @author Christian Grothoff
 */
-#include "platform.h"
 #include "gnunet_util_lib.h"
 /**