run min_includes.pl on these files

which removes extraneous includes.  Not that it does not reorder
the includes, or try to figure out which includes are necessary
for what.  That may be better done by something like
include-what-you-use, but the output of that tool requires
substantial work to understand.

diff --git a/src/lib/util/atexit.c b/src/lib/util/atexit.c
index d9335fd5c8a7ec8299303ae208c4327b9c70e508..74976e87046973a498e53fe7f3a9430869f7e346 100644 (file)
--- a/src/lib/util/atexit.c
+++ b/src/lib/util/atexit.c
@@ -28,13 +28,9 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/dlist.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
 
-#include <freeradius-devel/build.h>
-#include <freeradius-devel/missing.h>
 
-#include <errno.h>
 #include <pthread.h>
 
 #if defined(DEBUG_THREAD_LOCAL) && !defined(NDEBUG)

diff --git a/src/lib/util/base32.c b/src/lib/util/base32.c
index 164a010fc26bec5a908b1db71a34b4f2128f5189..8da1f32d8207825289fb6f9a856598ff15a5b8f5 100644 (file)
--- a/src/lib/util/base32.c
+++ b/src/lib/util/base32.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include "base32.h"
 
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/value.h>
 #define us(x) (uint8_t) x
 

diff --git a/src/lib/util/base64.c b/src/lib/util/base64.c
index fe486ce7706a5411060383917d0978f06b58c27b..51c1146a0abb7d8af8371358782d2b6d612c888c 100644 (file)
--- a/src/lib/util/base64.c
+++ b/src/lib/util/base64.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include "base64.h"
 
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/value.h>
 #define us(x) (uint8_t) x
 

diff --git a/src/lib/util/cursor.c b/src/lib/util/cursor.c
index c5d8ee05221e6c84d80153481ad47f57a4d64504..b5559fdce3891a4b73d293f9e8697f5712abde38 100644 (file)
--- a/src/lib/util/cursor.c
+++ b/src/lib/util/cursor.c
@@ -29,7 +29,6 @@ RCSID("$Id$")
 #include <string.h>
 #include <stdint.h>
 #include <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/talloc.h>
 
 #define NEXT_PTR(_v) ((void **)(((uint8_t *)(_v)) + cursor->offset))
 

diff --git a/src/lib/util/dbuff_tests.c b/src/lib/util/dbuff_tests.c
index ebdf70e28492014090c93a7f95a4133104caef16..1d52876ba8f041a4b59e7042b1dcca5e4c8b5b46 100644 (file)
--- a/src/lib/util/dbuff_tests.c
+++ b/src/lib/util/dbuff_tests.c
@@ -1,6 +1,5 @@
 #include <freeradius-devel/util/acutest.h>
 #include <float.h>
-#include <unistd.h>
 
 #include "dbuff.h"
 

diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index 67eda5cff205fa6ecbb384a8fcb50c794c39e60c..dcd03eb60b1547161a5e3ce7e747a885c1e3c167 100644 (file)
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -23,23 +23,14 @@
  */
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/hash.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <assert.h>
-#include <limits.h>
 #include <pthread.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #if defined(HAVE_MALLOPT) && defined(HAVE_MALLOC_H)
 #  include <malloc.h>
@@ -63,7 +54,6 @@
 
 #ifdef HAVE_SYS_PTRACE_H
 #  include <sys/ptrace.h>
-#  include <sys/types.h>
 #  if !defined(PT_ATTACH) && defined(PTRACE_ATTACH)
 #    define PT_ATTACH PTRACE_ATTACH
 #  endif

diff --git a/src/lib/util/dict_ext.c b/src/lib/util/dict_ext.c
index 697e9efff6ce77b92275667a9684008395de310b..486e3bfec248150e3a46e940dc5acb131f7b77d6 100644 (file)
--- a/src/lib/util/dict_ext.c
+++ b/src/lib/util/dict_ext.c
@@ -24,7 +24,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/dict_priv.h>
-#include <freeradius-devel/util/dict_ext_priv.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index 5396f2743f4e45b27beb2d99d1f8124d6a465db2..1535a06add2ee973fedfb06b907edca4f1cc324f 100644 (file)
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -25,14 +25,11 @@ RCSID("$Id$")
 #include <freeradius-devel/radius/defs.h>
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict_fixup_priv.h>
-#include <freeradius-devel/util/dict_priv.h>
 #include <freeradius-devel/util/file.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 
 #include <sys/stat.h>
-#include <ctype.h>
 
 #define MAX_ARGV (16)
 

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index 7a714168c898762086c57cc57ee8411809dc77a3..3550502785dbba1960cdb6aa253339b5a22efc49 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -24,16 +24,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict_fixup_priv.h>
-#include <freeradius-devel/util/dict_priv.h>
-#include <freeradius-devel/util/dl.h>
-#include <freeradius-devel/util/hash.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <ctype.h>
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #endif

diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c
index 2df38cdb3b131e78ad34c3d34a95fb47ac9ac2fa..3ef3a2ae2cd72d58b86fdfbceb3703136b43b1a2 100644 (file)
--- a/src/lib/util/dl.c
+++ b/src/lib/util/dl.c
@@ -29,12 +29,10 @@ RCSID("$Id$")
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/debug.h>
 
-#include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/paths.h>
 #include <freeradius-devel/util/syserror.h>
 
 #include <ctype.h>
-#include <unistd.h>
 
 #ifdef HAVE_VALGRIND_H
 #  include <valgrind.h>

diff --git a/src/lib/util/dns.c b/src/lib/util/dns.c
index c2d4cb44ac92654a284057fd94160cfcb9bdd195..6792edcddb94f0679d1017cc90bade59b6fdc5d5 100644 (file)
--- a/src/lib/util/dns.c
+++ b/src/lib/util/dns.c
@@ -25,7 +25,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/dns.h>
 #include <freeradius-devel/util/proto.h>

diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/dpair_legacy.c
index 130cda9112227e583a9134c99ed411d92153e577..4f59f5d0fac48256c892f43cdab2833f508b3d76 100644 (file)
--- a/src/lib/util/dpair_legacy.c
+++ b/src/lib/util/dpair_legacy.c
@@ -25,15 +25,12 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pair_legacy.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
-#include <ctype.h>
 
 fr_sbuff_term_t const          bareword_terminals =
                                FR_SBUFF_TERMS(

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index b6612256dfcce3b3dad561b8ea1027b17a184166..aefa06ce99479fe06068e46530a2fb16b446270c 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -32,13 +32,10 @@ RCSID("$Id$")
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/lst.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/rb.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/table.h>
-#include <freeradius-devel/util/talloc.h>
-#include <freeradius-devel/util/time.h>
 #include <freeradius-devel/util/token.h>
 #include <freeradius-devel/util/atexit.h>
 

diff --git a/src/lib/util/ext.c b/src/lib/util/ext.c
index ad0c7ea239061851e61a3e8973523e6fc4388b8b..bfa07ef9869f78205a6787ffcccfde5008e593ce 100644 (file)
--- a/src/lib/util/ext.c
+++ b/src/lib/util/ext.c
@@ -27,8 +27,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/ext.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/table.h>
-#include <freeradius-devel/util/talloc.h>
 
 /** Add a variable length extension to a talloc chunk
  *

diff --git a/src/lib/util/file.c b/src/lib/util/file.c
index 2f448cf11a6b9580592189a3f349d913d71e51d7..80e9ac7156f25cc2f7723ad5003ff381887ec8da 100644 (file)
--- a/src/lib/util/file.c
+++ b/src/lib/util/file.c
@@ -31,7 +31,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/file.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/value.h>
 
 static ssize_t _fr_mkdir(int *fd_out, char const *path, mode_t mode, fr_mkdir_func_t func, void *uctx)

diff --git a/src/lib/util/fuzzer.c b/src/lib/util/fuzzer.c
index 82c76d19e73284ba5d7fc017c3ec271474df2d8f..fdd78b4b9f81e78e1c88251384fda229147664b0 100644 (file)
--- a/src/lib/util/fuzzer.c
+++ b/src/lib/util/fuzzer.c
@@ -23,7 +23,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/io/test_point.h>
-#include <freeradius-devel/util/value.h>
 
 static int decode_test_ctx(void **out, UNUSED TALLOC_CTX *ctx)
 {

diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c
index a90c707167e5f32b5a896c7d040d17f8fc9fb1cb..79e0a2c4bd5f7b7ca38c3e0874510a1d92b37a87 100644 (file)
--- a/src/lib/util/hash.c
+++ b/src/lib/util/hash.c
@@ -33,7 +33,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/hash.h>
-#include <freeradius-devel/util/talloc.h>
 
 /*
  *     A reasonable number of buckets to start off with.

diff --git a/src/lib/util/inet.c b/src/lib/util/inet.c
index ab01f3eb1280d0d27e0e37769b347dd8e1006c8f..012c3100f9063925b05b91bb0f74c91f18fa5e56 100644 (file)
--- a/src/lib/util/inet.c
+++ b/src/lib/util/inet.c
@@ -26,12 +26,7 @@
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/value.h>
 
-#include <ctype.h>
-#include <netdb.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <ifaddrs.h>
 
 #ifdef HAVE_LINUX_IF_PACKET_H

diff --git a/src/lib/util/log.c b/src/lib/util/log.c
index c8175dd5898fd568c9a85956c3bacde605c88a83..5f2302587a997258482b854d6282fc311f021b45 100644 (file)
--- a/src/lib/util/log.c
+++ b/src/lib/util/log.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/sbuff.h>
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/atexit.h>
 #include <freeradius-devel/util/value.h>
@@ -35,12 +34,9 @@ RCSID("$Id$")
 #ifdef HAVE_FEATURES_H
 #  include <features.h>
 #endif
-#include <stdio.h>
 #ifdef HAVE_SYSLOG_H
 #  include <syslog.h>
 #endif
-#include <time.h>
-#include <unistd.h>
 
 FILE   *fr_log_fp = NULL;
 int    fr_debug_lvl = 0;

diff --git a/src/lib/util/misc.c b/src/lib/util/misc.c
index b726d4232806c0e60c8f87a1025c67c36ced7184..e0ec8642a7d7c58d116819cac22eb8e45e3d4b51 100644 (file)
--- a/src/lib/util/misc.c
+++ b/src/lib/util/misc.c
@@ -23,26 +23,15 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/dbuff.h>
-#include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/sbuff.h>
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
-#include <freeradius-devel/util/time.h>
 
-#include <ctype.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/uio.h>
-#include <unistd.h>
 
 #define FR_PUT_LE16(a, val)\
        do {\

diff --git a/src/lib/util/packet.c b/src/lib/util/packet.c
index 2535ce4b4afead701cd9465c40f23dfc1fce67dc..d5216f58cd20e823eb886ed5242bf6dde1f2d80b 100644 (file)
--- a/src/lib/util/packet.c
+++ b/src/lib/util/packet.c
@@ -25,7 +25,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/rand.h>
-#include <freeradius-devel/util/talloc.h>
 
 /** Allocate a new fr_radius_packet_t
  *

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index b1d344a5690b756f70c33986c7fe89b89dd63e22..375ceba7353ba7dece5d96dcfe534acf1b768584 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -29,12 +29,9 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pair_legacy.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <ctype.h>
 
 /** Initialise a pair list header
  *

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index 59f112277eb5bf8073d5bc61040f1709678b9eed..e997a90b39696e9efc8acf17b08ff19d1df93e25 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -25,15 +25,12 @@ RCSID("$Id$")
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
-#include <ctype.h>
 
 static fr_sbuff_term_t const   bareword_terminals =
                                FR_SBUFF_TERMS(

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index fd3526b2dac2c86bd974c0cc6e73500d0f563657..abca9cc7f0a94cde11a2bbea4806e578eb31b39f 100644 (file)
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/pair_legacy_tests.c
@@ -45,9 +45,7 @@ static void test_init(void);
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/dict_test.h>
 #include <freeradius-devel/util/pair_legacy.h>
-#include <freeradius-devel/util/talloc.h>
 
 #ifdef HAVE_GPERFTOOLS_PROFILER_H
 #  include <gperftools/profiler.h>

diff --git a/src/lib/util/pair_tests.c b/src/lib/util/pair_tests.c
index 84e065d793baa07af151534688b0ac2107280682..92eff8b49a866fd3f3f26a1a28c1b83f53cde899 100644 (file)
--- a/src/lib/util/pair_tests.c
+++ b/src/lib/util/pair_tests.c
@@ -45,9 +45,6 @@ static void test_init(void);
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/dict_test.h>
-#include <freeradius-devel/util/pair.h>
-#include <freeradius-devel/util/talloc.h>
 
 #ifdef HAVE_GPERFTOOLS_PROFILER_H
 #  include <gperftools/profiler.h>

diff --git a/src/lib/util/pair_tokenize.c b/src/lib/util/pair_tokenize.c
index 40614ca4403349b3a39dab3d4bdea584af6c7e84..58310f61f069773cb38a2eefaf67554c37c75b2b 100644 (file)
--- a/src/lib/util/pair_tokenize.c
+++ b/src/lib/util/pair_tokenize.c
@@ -24,15 +24,12 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
-#include <ctype.h>
 
 static ssize_t op_to_token(fr_token_t *token, char const *op, size_t oplen)
 {

diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c
index ceb4eac4fc0895762ca237bcb835a1b7e2a20693..55a88ff79f4ed8c55d7742f1517aa4532572f4c1 100644 (file)
--- a/src/lib/util/pcap.c
+++ b/src/lib/util/pcap.c
@@ -26,17 +26,11 @@
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pcap.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/types.h>
 #include <sys/uio.h>
-#include <unistd.h>
 
 #ifndef SIOCGIFHWADDR
 #  include <ifaddrs.h>

diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index 8b18607b0d17ca9e47ca9992acecb98cb4c535ae..5ca29bba2f64d9369019b1ff5cfd4a9f3a92050b 100644 (file)
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -26,12 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/base16.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
-#include <freeradius-devel/util/print.h>
-#include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <ctype.h>
-#include <string.h>
 
 /** Checks for utf-8, taken from http://www.w3.org/International/questions/qa-forms-utf-8
  *

diff --git a/src/lib/util/rand.c b/src/lib/util/rand.c
index 54527610adac48c12db15fae541a5accccc9f394..032e35f32d1239e5acfd17b18bbff56ed22d5d9f 100644 (file)
--- a/src/lib/util/rand.c
+++ b/src/lib/util/rand.c
@@ -25,12 +25,8 @@ RCSID("$Id$")
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/hash.h>
 
-#include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 static _Thread_local fr_randctx fr_rand_pool;          //!< A pool of pre-generated random integers
 static _Thread_local bool fr_rand_initialized = false;

diff --git a/src/lib/util/rb_tests.c b/src/lib/util/rb_tests.c
index 37c84d012b926dae57e7ab6ff87bb0bd0d0a2536..4998139919826148b8154d3a2e1be09224319115 100644 (file)
--- a/src/lib/util/rb_tests.c
+++ b/src/lib/util/rb_tests.c
@@ -23,7 +23,6 @@
 #include <freeradius-devel/util/acutest.h>
 #include <freeradius-devel/util/acutest_helpers.h>
 #include <freeradius-devel/util/rand.h>
-#include <stdlib.h>
 
 #include "rb.c"
 

diff --git a/src/lib/util/regex.c b/src/lib/util/regex.c
index 291d4d148ea678566c4e6ba0c588c5c86ad528c7..86981c6f6986148517219d5d724e2ade4abdd9f5 100644 (file)
--- a/src/lib/util/regex.c
+++ b/src/lib/util/regex.c
@@ -26,11 +26,7 @@ RCSID("$Id$")
 #ifdef HAVE_REGEX
 
 #include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
-#include <freeradius-devel/util/table.h>
-#include <freeradius-devel/util/talloc.h>
 
 #if defined(HAVE_REGEX_PCRE) || (defined(HAVE_REGEX_PCRE2) && defined(PCRE2_CONFIG_JIT))
 #ifndef FR_PCRE_JIT_STACK_MIN

diff --git a/src/lib/util/sbuff.c b/src/lib/util/sbuff.c
index 7449c9c2ba530e619388405888f27929cc87300b..eae7cc5f6f93c1eb6ea3fa05ee3b15eb6f9b0873 100644 (file)
--- a/src/lib/util/sbuff.c
+++ b/src/lib/util/sbuff.c
@@ -23,17 +23,9 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/print.h>
-#include <freeradius-devel/util/sbuff.h>
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
 
 static _Thread_local char *sbuff_scratch;
 

diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c
index a6c25beeab306a58109c98fdd9b3b89ef52b8125..cb49d9970f8f08b86092e1db12f928316ca0f6b6 100644 (file)
--- a/src/lib/util/socket.c
+++ b/src/lib/util/socket.c
@@ -34,12 +34,8 @@
 #include <freeradius-devel/util/cap.h>
 
 #include <fcntl.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #ifndef SO_BINDTODEVICE
-#include <net/if.h>
 #endif
 
 #include <ifaddrs.h>

diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c
index 613084b63fb76824fdd82342088f2258f843058e..eb50b1853fd765e7b15b9715dac34690076f10ed 100644 (file)
--- a/src/lib/util/strerror.c
+++ b/src/lib/util/strerror.c
@@ -24,7 +24,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/dlist.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/atexit.h>
 

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index c3865039d6752ffe25f30f4d9e46f36ace01b217..9ff0aa9a2897d252663f46e327a71d8a372c0a56 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -24,7 +24,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/struct.h>
-#include <freeradius-devel/util/proto.h>
 
 fr_pair_t *fr_raw_from_network(TALLOC_CTX *ctx, fr_dict_attr_t const *parent, uint8_t const *data, size_t data_len)
 {

diff --git a/src/lib/util/syserror.c b/src/lib/util/syserror.c
index 19559c032905f0f251f7aac032bb526931e0dce9..14e6c8a8839aa12551a06752964bf6992610ebfc 100644 (file)
--- a/src/lib/util/syserror.c
+++ b/src/lib/util/syserror.c
@@ -27,12 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/atexit.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
 
 #define FR_SYSERROR_BUFSIZE (2048)
 

diff --git a/src/lib/util/table.c b/src/lib/util/table.c
index 598ae00acb35f9c61962723cb40383ef5fbc1b63..3b25cba85c76434e2ee39a98261c40942387431b 100644 (file)
--- a/src/lib/util/table.c
+++ b/src/lib/util/table.c
@@ -27,7 +27,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 
 #include <string.h>
-#include <stdio.h>
 
 #define TABLE_IDX(_table, _idx, _element_size) (((uint8_t const *)(_table)) + ((_idx) * (_element_size)))
 #define ELEM_STR(_offset) (*((fr_table_elem_t const *)(_offset))).str

diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index 90e9458e98fe405f260b38166820bbf04df35d37..73d637b7fe929004ef930542b8c59375335a9010 100644 (file)
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -25,13 +25,9 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/dlist.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
 
-#include <string.h>
-#include <unistd.h>
 
 static _Thread_local TALLOC_CTX *thread_local_ctx;
 

diff --git a/src/lib/util/time.c b/src/lib/util/time.c
index 74106027b1a3a7b473a795c8a4d5b57d7a1f75af..51d84222e181768638d173237b3ab04541f14f10 100644 (file)
--- a/src/lib/util/time.c
+++ b/src/lib/util/time.c
@@ -27,10 +27,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/autoconf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/dlist.h>
-#include <freeradius-devel/util/sbuff.h>
-#include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/time.h>
 
 /*
  *     Avoid too many ifdef's later in the code.
@@ -51,7 +47,6 @@ USES_APPLE_DEPRECATED_API
 #  include <mach/mach_time.h>
 #endif
 
-#include <stdatomic.h>
 
 _Atomic int64_t                        our_realtime;   //!< realtime at the start of the epoch in nanoseconds.
 static char const              *tz_names[2] = { NULL, NULL };  //!< normal, DST, from localtime_r(), tm_zone

diff --git a/src/lib/util/token.c b/src/lib/util/token.c
index aea660375f0886dce1d95595c67307c3a7afac20..7dcc829d7a177acb59e9abe932aa5fda4da52a4f 100644 (file)
--- a/src/lib/util/token.c
+++ b/src/lib/util/token.c
@@ -29,8 +29,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/token.h>
 
 #include <ctype.h>
-#include <stdio.h>
-#include <string.h>
 
 fr_table_num_ordered_t const fr_tokens_table[] = {
        { L("=~"),      T_OP_REG_EQ     }, /* order is important! */

diff --git a/src/lib/util/trie.c b/src/lib/util/trie.c
index 88a26d28f99a44764878e1089094e24d13655ff8..c4419c0497abf88db7c8c1c3eda4ec45fc080e32 100644 (file)
--- a/src/lib/util/trie.c
+++ b/src/lib/util/trie.c
@@ -25,11 +25,8 @@ RCSID("$Id$")
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/trie.h>
 
-#include <ctype.h>
-#include <string.h>
 
 /*
  *     This file implements path-compressed, level-compressed

diff --git a/src/lib/util/udpfromto.c b/src/lib/util/udpfromto.c
index bd4cf8050808c618be1d56ecfe5bba5a1c0de0be..f59b9c6945bd6154c007f8fa916d741774252ed7 100644 (file)
--- a/src/lib/util/udpfromto.c
+++ b/src/lib/util/udpfromto.c
@@ -31,13 +31,7 @@ RCSID("$Id$")
 #  include <sys/uio.h>
 #endif
 
-#include <errno.h>
 #include <fcntl.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
 
 /*
  *     More portability idiocy

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 175323012aef7e0246c117688be6fdc1767067bf..184d321dd47f37d424d7fa6f505281f1eca38dd5 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -50,15 +50,8 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/ascend.h>
 #include <freeradius-devel/util/dcursor.h>
-#include <freeradius-devel/util/dbuff.h>
-#include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/base16.h>
-#include <freeradius-devel/util/net.h>
-#include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 
-#include <assert.h>
-#include <ctype.h>
 
 /** Sanity checks
  *