UTIL: Allow only inlcusion of util glib-style.

32 files changed, 26 insertions, 51 deletions

diff --git a/src/util/buffer.c b/src/util/buffer.c
index 38c3ccac9..f88c56849 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -21,7 +21,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_buffer_lib.h"
 
 /**
  * Initialize a buffer with the given capacity.
diff --git a/src/util/child_management.c b/src/util/child_management.c
index 14d64ec33..680dbcabe 100644
--- a/src/util/child_management.c
+++ b/src/util/child_management.c
@@ -28,7 +28,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_child_management_lib.h"
 
 /**
  * Generic logging shortcut
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 5ebed750c..36d49eddb 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index da70d4538..59c15326d 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -27,7 +27,7 @@
 
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_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 409910c48..d27f70e83 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -25,9 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 #include <regex.h>
 
 
diff --git a/src/util/configuration.c b/src/util/configuration.c
index b6e9d42ce..af8a0746e 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -24,13 +24,9 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_os_lib.h"
 #include "gnunet_configuration_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_buffer_lib.h"
-#include "gnunet_container_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util", __VA_ARGS__)
 
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index f480fefd3..77b828d31 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -27,7 +27,7 @@
 
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-container-heap", \
                                         __VA_ARGS__)
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index 84e35d3cd..ab909484a 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -25,7 +25,7 @@
 
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
   GNUNET_log_from (kind, "util-container-multihashmap", __VA_ARGS__)
diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index 2ae35911b..4ff4e1678 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -27,7 +27,7 @@
 
 
 #include "platform.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) \
   GNUNET_log_from (kind, "util-container-multihashmap32", __VA_ARGS__)
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index 7629bbffe..d33a19db2 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -29,7 +29,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_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 eea456792..8506c7fa6 100644
--- a/src/util/crypto_cs.c
+++ b/src/util/crypto_cs.c
@@ -26,7 +26,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <sodium.h>
 #include <gcrypt.h>
 
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index e6220d148..7f9e3c070 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -28,8 +28,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 
 #define EXTRA_CHECKS 0
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index c193be2b7..6e333686f 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -28,8 +28,7 @@
 
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
 
 
 /**
diff --git a/src/util/crypto_ecc_gnsrecord.c b/src/util/crypto_ecc_gnsrecord.c
index bd4a631b7..b902e0e0a 100644
--- a/src/util/crypto_ecc_gnsrecord.c
+++ b/src/util/crypto_ecc_gnsrecord.c
@@ -29,8 +29,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 
 #define CURVE "Ed25519"
 
diff --git a/src/util/crypto_edx25519.c b/src/util/crypto_edx25519.c
index 440dd27c2..2d9a76aa3 100644
--- a/src/util/crypto_edx25519.c
+++ b/src/util/crypto_edx25519.c
@@ -30,8 +30,7 @@
 #include "platform.h"
 #include <gcrypt.h>
 #include <sodium.h>
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 
 #define CURVE "Ed25519"
 
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index a77a0f82a..e45cb42e0 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -25,8 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 #include <gcrypt.h>
 
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index 22d4643eb..e724bc9ba 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -52,7 +52,7 @@
 #if GNUNET_BUILD
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 #else
 #define GNUNET_NO 0
@@ -127,7 +127,7 @@ getPRK (gcry_md_hd_t mac,
   if (0 == xts_len)
   {
     char zero_salt[dlen];
-    
+
     memset (zero_salt, 0, dlen);
     ret = doHMAC (mac, zero_salt, dlen, skm, skm_len);
   }
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 039cd135f..7cfd8fea4 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -29,7 +29,7 @@
 #include <gcrypt.h>
 
 
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_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 3d810f27b..06f2fd786 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -27,7 +27,7 @@
 
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-mpi", __VA_ARGS__)
diff --git a/src/util/crypto_pow.c b/src/util/crypto_pow.c
index 038e58cae..bfaaf555d 100644
--- a/src/util/crypto_pow.c
+++ b/src/util/crypto_pow.c
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <sodium.h>
 
 /**
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 492bfdb9e..72474d04b 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -26,8 +26,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-random", __VA_ARGS__)
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index 4a866a5df..2c446d21a 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -28,7 +28,7 @@
 
 #include "platform.h"
 #include <gcrypt.h>
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include "benchmark.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-rsa", __VA_ARGS__)
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index f663f2da1..a9217febd 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -27,7 +27,7 @@
 
 
 #include "platform.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-crypto-symmetric", \
diff --git a/src/util/disk.c b/src/util/disk.c
index 4ccadc78e..1d0e14b98 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -25,9 +25,7 @@
  */
 
 #include "platform.h"
-#include "disk.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-disk", __VA_ARGS__)
 
diff --git a/src/util/disk.h b/src/util/disk.h
index 89ff76687..bca398e26 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -26,8 +26,7 @@
 #ifndef GNUNET_DISK_H_
 #define GNUNET_DISK_H_
 
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Retrieve OS file handle
diff --git a/src/util/helper.c b/src/util/helper.c
index ad4423f3a..fe8643d31 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -28,8 +28,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_mst_lib.h"
-
 
 /**
  * Entry in the queue of messages we need to transmit to the helper.
diff --git a/src/util/network.c b/src/util/network.c
index 82b6ee464..ac3de89bf 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -26,7 +26,6 @@
  */
 
 #include "platform.h"
-#include "gnunet_util_lib.h"
 #include "disk.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-network", __VA_ARGS__)
diff --git a/src/util/peer.c b/src/util/peer.c
index c82317654..e5c15b098 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_peer_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util-peer", __VA_ARGS__)
 
diff --git a/src/util/proc_compat.c b/src/util/proc_compat.c
index a278ec045..0423a0d5c 100644
--- a/src/util/proc_compat.c
+++ b/src/util/proc_compat.c
@@ -27,7 +27,6 @@
  */
 
 #include "platform.h"
-#include "platform.h"
 
 /**
  * memrchr as defined in glibc
diff --git a/src/util/regex.c b/src/util/regex.c
index f06fd85d6..282d3aa99 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -26,7 +26,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_tun_lib.h"
 
 /**
  * 'wildcard', matches all possible values (for HEX encoding).
diff --git a/src/util/strings.c b/src/util/strings.c
index 817e4d3ce..479c0fcd6 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -29,9 +29,7 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #endif
-#include "gnunet_crypto_lib.h"
-#include "gnunet_buffer_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 #include <unicase.h>
 #include <unistr.h>
 #include <uniconv.h>
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index f8b0b89f4..ed582517b 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -23,7 +23,6 @@
  */
 
 #include "platform.h"
-#include "platform.h"
 
 
 void *