[gnunet] 01/02: -more util include cleanups

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 8fd3a06ccdee5319d9a3b6d42201e879375bbb2a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Mon Dec 5 12:57:03 2022 +0900

    -more util include cleanups
---
 src/include/gnunet_bandwidth_lib.h | 5 ++++-
 src/include/gnunet_common.h        | 2 ++
 src/include/gnunet_crypto_lib.h    | 1 -
 src/include/gnunet_mst_lib.h       | 3 ---
 src/include/gnunet_os_lib.h        | 9 ++++-----
 src/include/gnunet_plugin_lib.h    | 4 ----
 src/include/gnunet_tun_lib.h       | 4 ----
 src/include/gnunet_util_lib.h      | 2 +-
 src/util/configuration.c           | 1 -
 9 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/include/gnunet_bandwidth_lib.h 
b/src/include/gnunet_bandwidth_lib.h
index 359bf95c4..7c854aab5 100644
--- a/src/include/gnunet_bandwidth_lib.h
+++ b/src/include/gnunet_bandwidth_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
@@ -48,7 +52,6 @@ extern "C" {
 #endif
 
 
-#include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 0c3300125..07a847814 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -44,7 +44,9 @@
 
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <sys/types.h>
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 3fac945a5..8d400118a 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -67,7 +67,6 @@ extern "C" {
  */
 struct GNUNET_PeerIdentity;
 
-#include "gnunet_common.h"
 #include <gcrypt.h>
 
 
diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h
index 3ad98a33b..af2dd3353 100644
--- a/src/include/gnunet_mst_lib.h
+++ b/src/include/gnunet_mst_lib.h
@@ -55,9 +55,6 @@ extern "C"
 #endif
 
 
-#include "gnunet_common.h"
-
-
 /**
  * Handle to a message stream tokenizer.
  */
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 428d8610b..015282054 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_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
@@ -61,11 +65,6 @@ extern "C"
 #endif
 
 
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_scheduler_lib.h"
-
-
 /**
  * Flags that determine which of the standard streams
  * should be inherited by the child process.
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index df555e0cf..a3135e2cf 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -49,10 +49,6 @@ extern "C"
 #endif
 
 
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-
-
 /**
  * Signature of any function exported by a plugin.
  *
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index ab397b049..17acfe5f8 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -42,10 +42,6 @@
 #define GNUNET_TUN_LIB_H
 
 
-#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-
-
 /* see http://www.iana.org/assignments/ethernet-numbers */
 #ifndef ETH_P_IPV4
 /**
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 337552a0c..280304825 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -65,7 +65,7 @@ extern "C"
 #define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v"; \
   GNUNET_VERSION
 
-
+#include "gnunet_common.h"
 #include "gnunet_crypto_lib.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_bio_lib.h"
diff --git a/src/util/configuration.c b/src/util/configuration.c
index af8a0746e..1a66458db 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -25,7 +25,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_os_lib.h"
 #include "gnunet_configuration_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util", __VA_ARGS__)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.