28 files changed, 116 insertions, 19 deletions

diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h
index 1df4cde56..359bf95c4 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_lib.h
@@ -33,6 +33,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_BANDWIDTH_LIB_H
 #define GNUNET_BANDWIDTH_LIB_H
 
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index f1a68022a..e165b9d90 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -33,6 +33,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_BIO_LIB_H
 #define GNUNET_BIO_LIB_H
 
diff --git a/src/include/gnunet_buffer_lib.h b/src/include/gnunet_buffer_lib.h
index 174d2d010..e65981206 100644
--- a/src/include/gnunet_buffer_lib.h
+++ b/src/include/gnunet_buffer_lib.h
@@ -28,6 +28,10 @@
  * @author Florian Dold
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_BUFFER_LIB_H
 #define GNUNET_BUFFER_LIB_H
 
diff --git a/src/include/gnunet_child_management_lib.h b/src/include/gnunet_child_management_lib.h
index e7f1271ee..d8f63b60d 100644
--- a/src/include/gnunet_child_management_lib.h
+++ b/src/include/gnunet_child_management_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 0fca362cd..ab4c7d088 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -39,6 +39,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_CLIENT_LIB_H
 #define GNUNET_CLIENT_LIB_H
 
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index f6fd8e641..55774a209 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -28,11 +28,11 @@
  *
  * @file
  * Container classes for GNUnet
- * 
+ *
  * @addtogroup container
- * Common data structures in GNUnet programs 
+ * Common data structures in GNUnet programs
  * @{
- * 
+ *
  * @defgroup hashmap  MultiHashMap
  * Hash map with multiple values per key.
  *
@@ -50,10 +50,14 @@
  *
  * @defgroup metadata  Metadata
  * GNU libextractor key-value pairs
- * 
+ *
  * @}
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_CONTAINER_LIB_H
 #define GNUNET_CONTAINER_LIB_H
 
@@ -1265,10 +1269,10 @@ GNUNET_CONTAINER_multipeermap_iterator_create (
  * position.  If there are no elements left, #GNUNET_NO is returned,
  * and @a key and @a value are not modified.
  *
- * This operation is only allowed if no elements have been removed 
- * from the multihashmap since the creation of @a iter, and the map 
+ * This operation is only allowed if no elements have been removed
+ * from the multihashmap since the creation of @a iter, and the map
  * has not been destroyed.
- * 
+ *
  * Adding elements may result in repeating or skipping elements.
  *
  * @param iter the iterator to get the next element from
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 9ee23cf62..3fac945a5 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -44,6 +44,10 @@
  * @see [Documentation](https://gnunet.org/crypto-api)
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_CRYPTO_LIB_H
 #define GNUNET_CRYPTO_LIB_H
 
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index d982dfe72..b14c5e59d 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -31,6 +31,11 @@
  * Disk IO APIs
  * @{
  */
+
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_DISK_LIB_H
 #define GNUNET_DISK_LIB_H
 
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 06fa7a5a7..8064b554b 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -18,6 +18,11 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
+
 /**
  * @addtogroup libgnunetutil
  * @{
@@ -35,9 +40,6 @@
 #ifndef GNUNET_DNSPARSER_LIB_H
 #define GNUNET_DNSPARSER_LIB_H
 
-
-#include "gnunet_util_lib.h"
-
 /**
  * Maximum length of a label in DNS.
  */
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h
index 8cd4bfa80..fa5151a8c 100644
--- a/src/include/gnunet_dnsstub_lib.h
+++ b/src/include/gnunet_dnsstub_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * @{
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index cec4b9154..c8e99826a 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -39,7 +39,6 @@
 
 
 #include "gnunet_util_lib.h"
-#include "gnunet_bandwidth_lib.h"
 #include "gnunet_statistics_service.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 49bb0d77b..390e8c153 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -33,6 +33,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_GETOPT_LIB_H
 #define GNUNET_GETOPT_LIB_H
 
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index e296d0ef9..1fcf7aa8b 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -39,7 +39,6 @@
 
 
 #include "gnunet_util_lib.h"
-#include "gnunet_dnsparser_lib.h"
 #include "gnunet_identity_service.h"
 #include "gnunet_namestore_service.h"
 
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index ac7d1602d..2279abb24 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -38,11 +38,14 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_HELPER_LIB_H
 #define GNUNET_HELPER_LIB_H
 
 
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_mst_lib.h"
 
 
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index 961f57eb0..07d22d85c 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -42,9 +42,8 @@ extern "C" {
 
 #include "platform.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 09d2ff0ea..95e8c619b 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -18,6 +18,11 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 052540ff5..3ad98a33b 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -39,6 +39,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_MST_LIB_H
 #define GNUNET_MST_LIB_H
 
diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h
index dbd2aa12f..8f4d9a16f 100644
--- a/src/include/gnunet_nc_lib.h
+++ b/src/include/gnunet_nc_lib.h
@@ -17,6 +17,12 @@
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
+
+
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h
index 2c2abf7da..e028fb7fb 100644
--- a/src/include/gnunet_op_lib.h
+++ b/src/include/gnunet_op_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index e4a34021a..4a67878b9 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 89c6b65f8..806de963c 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -41,8 +41,7 @@
 
 
 #include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
 
 #ifdef __cplusplus
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index ea548b196..df555e0cf 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index 2aadd1b8e..0c51d6cf7 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index aef42be5f..7c6ce0c0e 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -18,6 +18,11 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
@@ -50,9 +55,8 @@ extern "C"
 #endif
 #endif
 
-
+#include "gnunet_util_lib.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_mq_lib.h"
 
 
 /**
diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h
index f70f22403..02fbbf005 100644
--- a/src/include/gnunet_signal_lib.h
+++ b/src/include/gnunet_signal_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 65d643b2d..b751ef044 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup libgnunetutil
  * Multi-function utilities library for GNUnet programs
@@ -37,6 +41,10 @@
  * @{
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 #ifndef GNUNET_STRINGS_LIB_H
 #define GNUNET_STRINGS_LIB_H
 
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index a48bb3fbe..ab397b049 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -18,6 +18,10 @@
      SPDX-License-Identifier: AGPL3.0-or-later
  */
 
+#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#error "Only <gnunet_util_lib.h> can be included directly."
+#endif
+
 /**
  * @addtogroup vpn_suite  VPN services and libraries
  * @{
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 25df4e234..52fa5c373 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -30,6 +30,8 @@
 #ifndef GNUNET_UTIL_LIB_H
 #define GNUNET_UTIL_LIB_H
 
+#define __GNUNET_UTIL_LIB_H_INSIDE__
+
 #include <sys/socket.h>
 
 #ifdef __cplusplus
@@ -97,4 +99,6 @@ extern "C"
 }
 #endif
 
+#undef __GNUNET_UTIL_LIB_H_INSIDE__
+
 #endif