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

115 files changed, 140 insertions, 176 deletions

diff --git a/src/include/.gitignore b/src/include/.gitignore
index 9529b45c3..b25882925 100644
--- a/src/include/.gitignore
+++ b/src/include/.gitignore
@@ -3,3 +3,4 @@ gnu_name_system_record_flags.h
 gnu_name_system_record_types.h
 gnunet_signatures.h
 !gnunet_config.h.in
+gnunet_config.h
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index fa964f672..ca1aff6e1 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -12,7 +12,6 @@ EXTRA_DIST = \
 gnunetinclude_HEADERS = \
   platform.h \
   gnunet_config.h \
-  gnunet_platform.h \
   gettext.h \
   compat.h \
   gnunet_abd_service.h \
diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 292858031..4ac6d0250 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -33,7 +33,7 @@
 #ifndef BLOCK_DNS_H
 #define BLOCK_DNS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index 719a7db03..b64a83f39 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -34,7 +34,7 @@
 #ifndef BLOCK_FS_H
 #define BLOCK_FS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 
diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 660ee7742..fea19e335 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -36,7 +36,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <stdint.h>
 
diff --git a/src/include/gauger.h b/src/include/gauger.h
index d33b70aaf..f811b335c 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -11,7 +11,7 @@
 #ifndef __GAUGER_H__
 #define __GAUGER_H__
 
-#include "gnunet_platform.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/wait.h>
diff --git a/src/include/gettext.h b/src/include/gettext.h
index 50067d00e..6e98f197a 100644
--- a/src/include/gettext.h
+++ b/src/include/gettext.h
@@ -23,7 +23,7 @@
 #if ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
-#include "gnunet_platform.h"
+
 #include <libintl.h>
 
 #else
diff --git a/src/include/gnunet_abd_service.h b/src/include/gnunet_abd_service.h
index 76a52414c..75c1757ab 100644
--- a/src/include/gnunet_abd_service.h
+++ b/src/include/gnunet_abd_service.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_ABD_SERVICE_H
 #define GNUNET_ABD_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_identity_service.h"
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 453ff4b03..639e723c5 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_ats_application_service.h b/src/include/gnunet_ats_application_service.h
index 84dd1e3bc..da7fd4b52 100644
--- a/src/include/gnunet_ats_application_service.h
+++ b/src/include/gnunet_ats_application_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_ATS_APPLICATION_SERVICE_H
 #define GNUNET_ATS_APPLICATION_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h
index 8ef16d1e5..206f2dd52 100644
--- a/src/include/gnunet_ats_plugin.h
+++ b/src/include/gnunet_ats_plugin.h
@@ -40,7 +40,7 @@
 #ifndef PLUGIN_ATS_H
 #define PLUGIN_ATS_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_ats_service.h"
 #include "gnunet_statistics_service.h"
 
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 68f34cf2d..ce149875a 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_ATS_SERVICE_H
 #define GNUNET_ATS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/include/gnunet_ats_transport_service.h b/src/include/gnunet_ats_transport_service.h
index 625211e82..b6c7b15ae 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_ATS_TRANSPORT_SERVICE_H
 #define GNUNET_ATS_TRANSPORT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 9ea6796ea..1df4cde56 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 800a136ef..f1a68022a 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_BIO_LIB_H
 #define GNUNET_BIO_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_container_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h
index 92bfe69a7..b1f59899e 100644
--- a/src/include/gnunet_block_group_lib.h
+++ b/src/include/gnunet_block_group_lib.h
@@ -31,7 +31,7 @@
 #ifndef GNUNET_BLOCK_GROUP_LIB_H
 #define GNUNET_BLOCK_GROUP_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 95c9514e1..fdccbab78 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_BLOCK_LIB_H
 #define GNUNET_BLOCK_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_block_types.h"
 
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index 75681d227..16e93c780 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -38,7 +38,7 @@
 #ifndef PLUGIN_BLOCK_H
 #define PLUGIN_BLOCK_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index 63ebfbe9f..acc7bb330 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 63c988f34..0fca362cd 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_mq_lib.h"
 
 
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index d4654a75c..375ff1adc 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -40,29 +40,35 @@
 #ifndef GNUNET_COMMON_H
 #define GNUNET_COMMON_H
 
-#include "gnunet_platform.h"
+#include "gnunet_config.h"
+
 #include <stdlib.h>
-#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
-#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#endif
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 
+#if defined(__FreeBSD__)
+
+#include <sys/endian.h>
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+
+#elif defined(__OpenBSD__)
+
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+
+#elif defined(__NetBSD__)
+
+#include <machine/bswap.h>
+#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#endif
 
-#ifdef HAVE_BYTESWAP_H
+#elif defined(__linux__) || defined(GNU)
 #include <byteswap.h>
 #endif
 
@@ -156,7 +162,7 @@ enum GNUNET_GenericReturnValue
  */
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#ifdef HAVE_BYTESWAP_H
+#if defined(bswap_16) || defined(bswap_32) || defined(bswap_64)
 #define BYTE_SWAP_16(x) bswap_16 (x)
 #define BYTE_SWAP_32(x) bswap_32 (x)
 #define BYTE_SWAP_64(x) bswap_64 (x)
diff --git a/src/include/gnunet_config.h.in b/src/include/gnunet_config.h.in
index 4eb00388f..5b0d69a03 100644
--- a/src/include/gnunet_config.h.in
+++ b/src/include/gnunet_config.h.in
@@ -45,7 +45,10 @@
 /* Set to 1 is this is an experimental build */
 #define GNUNET_EXPERIMENTAL @enable_experimental@
 
-/* Define to 1 if GnuTLS has DANE support */
+/* Set to 1 if GnuTLS has DANE support */
 #define GNUNET_CURL_GNUTLS @curl_gnutls@
 
+/* Set to 1 is we have the byteswap header */
+#define GNUNET_HAVE_BYTESWAP_H @have_byteswap@
+
 #endif
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 18bd2de62..3b9be5849 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_CONFIGURATION_LIB_H
 #define GNUNET_CONFIGURATION_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_time_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index c63012109..47a928d9c 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index f02f5db22..f6fd8e641 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -58,7 +58,7 @@
 #define GNUNET_CONTAINER_LIB_H
 
 /* add error and config prototypes */
-#include "gnunet_platform.h"
+
 #include "gnunet_crypto_lib.h"
 
 
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index b3778dbf5..7d54914d1 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -61,7 +61,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index b58e7f24a..4e188df87 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index eaf6b79b5..9ee23cf62 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -54,7 +54,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include <stdbool.h>
 #include <sodium.h>
 
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index cabd5e268..bdf3843b1 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -32,7 +32,7 @@
  */
 #ifndef GNUNET_CURL_LIB_H
 #define GNUNET_CURL_LIB_H
-#include "gnunet_platform.h"
+
 #include <curl/curl.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 28c600412..2c7bf1e8f 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -40,7 +40,7 @@
 #ifndef GNUNET_DATACACHE_LIB_H
 #define GNUNET_DATACACHE_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_dht_service.h"
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 352c7e31b..e144e155e 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -34,7 +34,7 @@
 #ifndef PLUGIN_DATACACHE_H
 #define PLUGIN_DATACACHE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_datacache_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 319423e4f..c4f31c7ce 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef PLUGIN_DATASTORE_H
 #define PLUGIN_DATASTORE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_block_lib.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_datastore_service.h"
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 33a4dfdb6..153387238 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -42,7 +42,7 @@
 #ifndef GNUNET_DATASTORE_SERVICE_H
 #define GNUNET_DATASTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 91730dea9..1ff665c2b 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_DB_LIB_H
 #define GNUNET_DB_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 /**
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 682fea303..3d1264991 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -40,7 +40,7 @@
 #ifndef GNUNET_DHT_SERVICE_H
 #define GNUNET_DHT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_hello_lib.h"
diff --git a/src/include/gnunet_dhtu_plugin.h b/src/include/gnunet_dhtu_plugin.h
index 913dfabca..0503dda1c 100644
--- a/src/include/gnunet_dhtu_plugin.h
+++ b/src/include/gnunet_dhtu_plugin.h
@@ -27,7 +27,7 @@
 #ifndef PLUGIN_DHTU_H
 #define PLUGIN_DHTU_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 8d1f96615..d982dfe72 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -76,7 +76,7 @@ struct GNUNET_DISK_FileHandle
    or unsigned long long, this IS platform dependent;
    but "stdlib.h" should be portable 'enough' to be
    unconditionally available... */
-#include "gnunet_platform.h"
+
 #include <stdlib.h>
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h
index 8772229a2..b5741a7e2 100644
--- a/src/include/gnunet_dns_service.h
+++ b/src/include/gnunet_dns_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_DNS_SERVICE_H
 #define GNUNET_DNS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 979669a5f..06fa7a5a7 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -35,7 +35,7 @@
 #ifndef GNUNET_DNSPARSER_LIB_H
 #define GNUNET_DNSPARSER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index b9ab4c122..8cd4bfa80 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_DNSSTUB_LIB_H
 #define GNUNET_DNSSTUB_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index 7c7af0318..cec4b9154 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_FRAGMENTATION_LIB_H
 #define GNUNET_FRAGMENTATION_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h
index b26af24ca..4f4d5e88b 100644
--- a/src/include/gnunet_friends_lib.h
+++ b/src/include/gnunet_friends_lib.h
@@ -42,7 +42,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 6035b6915..6b46f1553 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_FS_LIB_H
 #define GNUNET_FS_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 13c9cf9ce..49bb0d77b 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 
 /**
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index ee2a8449c..e296d0ef9 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNS_SERVICE_H
 #define GNUNET_GNS_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
diff --git a/src/include/gnunet_gnsrecord_json_lib.h b/src/include/gnunet_gnsrecord_json_lib.h
index 9727b3b0e..1216f1f5e 100644
--- a/src/include/gnunet_gnsrecord_json_lib.h
+++ b/src/include/gnunet_gnsrecord_json_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNSRECORD_JSON_LIB_H
 #define GNUNET_GNSRECORD_JSON_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_json_lib.h"
 
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index a49b2ea5f..6fc2a05c5 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_GNSRECORD_LIB_H
 #define GNUNET_GNSRECORD_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 2c80f1df1..20a61cbfb 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_hello_uri_lib.h b/src/include/gnunet_hello_uri_lib.h
index 73cde8c0a..bba7078e6 100644
--- a/src/include/gnunet_hello_uri_lib.h
+++ b/src/include/gnunet_hello_uri_lib.h
@@ -42,7 +42,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index 967ecb070..ac7d1602d 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_HELPER_LIB_H
 #define GNUNET_HELPER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_mst_lib.h"
 
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index ca203dd77..67327af5d 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -52,7 +52,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index a5808ab94..a65293a7c 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_JSON_LIB_H
 #define GNUNET_JSON_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <jansson.h>
 #include <microhttpd.h>
diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h
index 974db45ef..56cacfbbb 100644
--- a/src/include/gnunet_load_lib.h
+++ b/src/include/gnunet_load_lib.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 6878538b4..961f57eb0 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/include/gnunet_mhd_compat.h b/src/include/gnunet_mhd_compat.h
index 4b0a62436..ca41fb95a 100644
--- a/src/include/gnunet_mhd_compat.h
+++ b/src/include/gnunet_mhd_compat.h
@@ -25,7 +25,7 @@
  * MHD compatibility definitions for warning-less compile of
  * our code against MHD before and after #MHD_VERSION 0x00097002.
  */
-#include "gnunet_platform.h"
+
 #include <microhttpd.h>
 
 #if MHD_VERSION >= 0x00097002
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h
index eb4181ef5..394caed68 100644
--- a/src/include/gnunet_microphone_lib.h
+++ b/src/include/gnunet_microphone_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index b99fff9e3..09d2ff0ea 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_MQ_LIB_H
 #define GNUNET_MQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_scheduler_lib.h"
 
 /**
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 122ab4835..052540ff5 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 
diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index faaddf0c5..68ce16286 100644
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_MY_LIB_H
 #define GNUNET_MY_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_mysql_lib.h"
 #include <mysql/mysql.h>
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index c1b52c9c3..88408890b 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -30,7 +30,7 @@
 #ifndef GNUNET_MYSQL_LIB_H
 #define GNUNET_MYSQL_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <mysql/mysql.h>
 
diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h
index 5ab5f0be5..a3848bf4e 100644
--- a/src/include/gnunet_namecache_plugin.h
+++ b/src/include/gnunet_namecache_plugin.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_NAMECACHE_PLUGIN_H
 #define GNUNET_NAMECACHE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h
index 22b91f64c..669386c37 100644
--- a/src/include/gnunet_namecache_service.h
+++ b/src/include/gnunet_namecache_service.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_NAMECACHE_SERVICE_H
 #define GNUNET_NAMECACHE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_namestore_service.h"
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 16ea9e386..f2bdf7cc6 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_NAMESTORE_PLUGIN_H
 #define GNUNET_NAMESTORE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 372b26a1a..b93a345c7 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -41,7 +41,7 @@
 #ifndef GNUNET_NAMESTORE_SERVICE_H
 #define GNUNET_NAMESTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_error_codes.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_block_lib.h"
diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h
index 502031d5e..1c511cac3 100644
--- a/src/include/gnunet_nat_auto_service.h
+++ b/src/include/gnunet_nat_auto_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_NAT_AUTO_SERVICE_H
 #define GNUNET_NAT_AUTO_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index 9fbdc1dcb..f2854a0be 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_NAT_SERVICE_H
 #define GNUNET_NAT_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 9d240151b..8d71d7764 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -52,7 +52,7 @@ extern "C"
  * Include "sys/select.h" because it is required to use
  * "fd_set" in "struct GNUNET_NETWORK_FDSet"!
  */
-#include "gnunet_platform.h"
+
 #include <sys/select.h>
 //#endif
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 1c8857060..fe9e1f853 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index dfeb49686..2c2abf7da 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -32,7 +32,7 @@
 #ifndef GNUNET_OP_H
 #define GNUNET_OP_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index d4d436338..428d8610b 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -60,7 +60,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index 5da8edd22..e4a34021a 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_PEER_LIB_H
 #define GNUNET_PEER_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 0657c91f9..89c6b65f8 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_PEERINFO_SERVICE_H
 #define GNUNET_PEERINFO_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h
index f36aad98e..2636c3009 100644
--- a/src/include/gnunet_peerstore_plugin.h
+++ b/src/include/gnunet_peerstore_plugin.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_PEERSTORE_PLUGIN_H
 #define GNUNET_PEERSTORE_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_peerstore_service.h"
 
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index 48433355c..c4000c680 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -36,7 +36,7 @@
 #ifndef GNUNET_PEERSTORE_SERVICE_H
 #define GNUNET_PEERSTORE_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_platform.h b/src/include/gnunet_platform.h
deleted file mode 100644
index 40f07ecbd..000000000
--- a/src/include/gnunet_platform.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2022 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author Martin Schanzenbach
- *
- * @file
- * Convenience header including the default gnunet platform header or
- * a defined custom platform header.
- *
- */
-
-#ifndef GNUNET_PLATFORM_H
-#define GNUNET_PLATFORM_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-#if defined (GNUNET_CUSTOM_PLATFORM_H)
-#include GNUNET_CUSTOM_PLATFORM_H
-#else
-#include "platform.h"
-#endif
-
-#endif
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index ee650aa8b..ea548b196 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 2c125bc2e..4cbc2a139 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_PQ_LIB_H
 #define GNUNET_PQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include <libpq-fe.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_db_lib.h"
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 2b6f5c747..2aadd1b8e 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_scheduler_lib.h"
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 1e3ea9916..e4dec14fa 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -40,7 +40,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 enum GNUNET_RECLAIM_AttributeType {
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 5c5ba9ccc..f8b2084d2 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -33,7 +33,7 @@
 #ifndef GNUNET_RECLAIM_PLUGIN_H
 #define GNUNET_RECLAIM_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_lib.h"
 
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 13605c43c..49a006e91 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -41,7 +41,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 #include "gnunet_reclaim_lib.h"
 #include "gnunet_util_lib.h"
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index 096cf87f9..093bf2d6a 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -39,7 +39,7 @@
 #ifndef GNUNET_REGEX_SERVICE_H
 #define GNUNET_REGEX_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h
index 953bf24cd..89fec24f5 100644
--- a/src/include/gnunet_resolver_service.h
+++ b/src/include/gnunet_resolver_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index ced3d13b1..f70500de5 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_REST_LIB_H
 #define GNUNET_REST_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include <microhttpd.h>
 
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 15065a6e3..45b391ca1 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -32,7 +32,7 @@
 #ifndef GNUNET_REST_PLUGIN_H
 #define GNUNET_REST_PLUGIN_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_rest_lib.h"
 #include "microhttpd.h"
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index 3b0e67a9a..81a90189b 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -21,7 +21,7 @@
 #ifndef GNUNET_REVOCATION_SERVICE_H_
 #define GNUNET_REVOCATION_SERVICE_H_
 
-#include "gnunet_platform.h"
+
 #include "gnunet_identity_service.h"
 
 /**
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 879e022b0..96d12db3f 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -31,7 +31,7 @@
 #ifndef GNUNET_SCALARPRODUCT_SERVICE_H
 #define GNUNET_SCALARPRODUCT_SERVICE_H
 #define GCRYPT_NO_DEPRECATED
-#include "gnunet_platform.h"
+
 #include <gcrypt.h>
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 13a071054..0118a1535 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -96,7 +96,7 @@ enum GNUNET_SCHEDULER_Reason
 };
 
 
-#include "gnunet_platform.h"
+
 #include "gnunet_time_lib.h"
 #include "gnunet_network_lib.h"
 
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h
index 9056dd66d..de629b308 100644
--- a/src/include/gnunet_secretsharing_service.h
+++ b/src/include/gnunet_secretsharing_service.h
@@ -40,7 +40,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 033b26ec9..aef42be5f 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_mq_lib.h"
 
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index d1e663948..6874c9ec4 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -47,7 +47,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_seti_service.h b/src/include/gnunet_seti_service.h
index e92bbf11c..9125ae825 100644
--- a/src/include/gnunet_seti_service.h
+++ b/src/include/gnunet_seti_service.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_setu_service.h b/src/include/gnunet_setu_service.h
index 5d8d3e885..89a50f138 100644
--- a/src/include/gnunet_setu_service.h
+++ b/src/include/gnunet_setu_service.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_configuration_lib.h"
diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h
index 9f124d3bb..98a27cd1a 100644
--- a/src/include/gnunet_socks.h
+++ b/src/include/gnunet_socks.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h
index 116f8eb88..c6bb128dd 100644
--- a/src/include/gnunet_speaker_lib.h
+++ b/src/include/gnunet_speaker_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h
index d75b96785..b84e6759a 100644
--- a/src/include/gnunet_sq_lib.h
+++ b/src/include/gnunet_sq_lib.h
@@ -25,7 +25,7 @@
 #ifndef GNUNET_SQ_LIB_H
 #define GNUNET_SQ_LIB_H
 
-#include "gnunet_platform.h"
+
 #include <sqlite3.h>
 #include "gnunet_util_lib.h"
 
diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index 269176a4b..0fe09e69a 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -50,7 +50,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 254f10ca5..65d643b2d 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -44,7 +44,7 @@
    or unsigned long long, this IS platform dependent;
    but "stdlib.h" should be portable 'enough' to be
    unconditionally available... */
-#include "gnunet_platform.h"
+
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h
index 505873452..7ab943b15 100644
--- a/src/include/gnunet_testbed_logger_service.h
+++ b/src/include/gnunet_testbed_logger_service.h
@@ -43,7 +43,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index d418381ec..acd87e2cd 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -38,7 +38,7 @@
 #ifndef GNUNET_TESTBED_SERVICE_H
 #define GNUNET_TESTBED_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index cf33231b2..cd9d88822 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -44,7 +44,7 @@
 #ifndef GNUNET_TESTING_LIB_H
 #define GNUNET_TESTING_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_arm_service.h"
diff --git a/src/include/gnunet_testing_netjail_lib.h b/src/include/gnunet_testing_netjail_lib.h
index 8af13df53..d92734823 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_TESTING_NETJAIL_LIB_H
 #define GNUNET_TESTING_NETJAIL_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_plugin.h"
 #include "gnunet_testing_ng_lib.h"
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index e838839e7..44e88f4b1 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -27,7 +27,7 @@
 #ifndef GNUNET_TESTING_NG_LIB_H
 #define GNUNET_TESTING_NG_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_plugin.h"
 #include "gnunet_testing_lib.h"
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index a54d1d1ca..308aadb53 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -44,7 +44,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 
 /**
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index bc3c94efa..6ec1aa578 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -33,7 +33,7 @@
 #ifndef GNUNET_TRANSPORT_APPLICATION_SERVICE_H
 #define GNUNET_TRANSPORT_APPLICATION_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index 290fdc1e1..b523f1536 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_nt_lib.h"
 
diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h
index 3a3f52901..9153161d3 100644
--- a/src/include/gnunet_transport_core_service.h
+++ b/src/include/gnunet_transport_core_service.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 
 /**
diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h
index 3ed948b71..03305ec27 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -46,7 +46,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h
index 5a541b20d..694ca7dca 100644
--- a/src/include/gnunet_transport_manipulation_service.h
+++ b/src/include/gnunet_transport_manipulation_service.h
@@ -47,7 +47,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h
index b6ba71229..acf7ade69 100644
--- a/src/include/gnunet_transport_monitor_service.h
+++ b/src/include/gnunet_transport_monitor_service.h
@@ -45,7 +45,7 @@ extern "C"
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_transport_service.h"
 #include "gnunet_transport_communication_service.h"
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index e48d7fcdd..0ab4a995c 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -39,7 +39,7 @@
 #ifndef PLUGIN_TRANSPORT_H
 #define PLUGIN_TRANSPORT_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_configuration_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index f5baaf65d..72cdbe0a7 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -45,7 +45,7 @@ extern "C" {
 #endif
 #endif
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 079571520..a48bb3fbe 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -37,7 +37,7 @@
 #ifndef GNUNET_TUN_LIB_H
 #define GNUNET_TUN_LIB_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_common.h"
 #include "gnunet_crypto_lib.h"
 
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 804bc3c39..25df4e234 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -30,6 +30,8 @@
 #ifndef GNUNET_UTIL_LIB_H
 #define GNUNET_UTIL_LIB_H
 
+#include <sys/socket.h>
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -59,9 +61,9 @@ extern "C"
  * this service available to anyone but yourself.
  */
 #define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v" \
-  PACKAGE_VERSION
+  GNUNET_VERSION
+
 
-#include "gnunet_platform.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_bio_lib.h"
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h
index a55bb994f..f0a04ae1b 100644
--- a/src/include/gnunet_vpn_service.h
+++ b/src/include/gnunet_vpn_service.h
@@ -34,7 +34,7 @@
 #ifndef GNUNET_VPN_SERVICE_H
 #define GNUNET_VPN_SERVICE_H
 
-#include "gnunet_platform.h"
+
 #include "gnunet_util_lib.h"