minimize more includes

diff --git a/src/lib/unlang/call.c b/src/lib/unlang/call.c
index 30df6b76f5c3102b8fbdfa09ded6868cf782ede3..bea19f208ec5bf2049edf87585f89cda35870ce1 100644 (file)
--- a/src/lib/unlang/call.c
+++ b/src/lib/unlang/call.c
@@ -29,7 +29,6 @@ RCSID("$Id$")
 
 #include "call_priv.h"
 #include "module_priv.h"
-#include "unlang_priv.h"
 
 static unlang_action_t unlang_call_resume(UNUSED rlm_rcode_t *p_result, request_t *request,
                                          unlang_stack_frame_t *frame)

diff --git a/src/lib/unlang/caller.c b/src/lib/unlang/caller.c
index 786add162fa0f6483650008f6804377a7a6c1b91..d9b3394996f080906142045c97e9db864f90bdb4 100644 (file)
--- a/src/lib/unlang/caller.c
+++ b/src/lib/unlang/caller.c
@@ -28,7 +28,6 @@ RCSID("$Id$")
 #include <freeradius-devel/server/state.h>
 
 #include "caller_priv.h"
-#include "unlang_priv.h"
 #include "group_priv.h"
 
 static unlang_action_t unlang_caller(rlm_rcode_t *p_result, request_t *request, unlang_stack_frame_t *frame)

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index b6bc15e8321e09ca7ca2304a6aa18693804fb1d5..8c78a688e795c1d19804eccc151ef6626be76d6b 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include "call_priv.h"
@@ -40,7 +39,6 @@ RCSID("$Id$")
 #include "subrequest_priv.h"
 #include "switch_priv.h"
 
-#include "unlang_priv.h"
 
 #define UNLANG_IGNORE ((unlang_t *) -1)
 

diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c
index 963de7b97738f6479e06853d94e6fdf579bfef45..014652d08e1c5d28a8a19e8717aba031f706c505 100644 (file)
--- a/src/lib/unlang/condition.c
+++ b/src/lib/unlang/condition.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include "condition_priv.h"
 #include "group_priv.h"
-#include "unlang_priv.h"
 
 static unlang_action_t unlang_if(rlm_rcode_t *p_result, request_t *request, unlang_stack_frame_t *frame)
 {

diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c
index 03d0cdc03df4834e2530e6b0d59810bfc88643e7..0b5706b4858983214cd9a87bd02e4b5c4443adb1 100644 (file)
--- a/src/lib/unlang/foreach.c
+++ b/src/lib/unlang/foreach.c
@@ -28,7 +28,6 @@ RCSID("$Id$")
 
 #include "foreach_priv.h"
 #include "return_priv.h"
-#include "unlang_priv.h"
 #include "xlat_priv.h"
 
 static char const * const xlat_foreach_names[] = {"Foreach-Variable-0",

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 2bf729d7abedbd0e2114c05992cdd322ee6fe335..dc280a98c47ab757115fb33c9b5fd7f8e87eb7d1 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -26,13 +26,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/server/cond.h>
-#include <freeradius-devel/unlang/xlat.h>
 
 #include "interpret_priv.h"
 #include "module_priv.h"
 #include "parallel_priv.h"
-#include "unlang_priv.h"
 
 /** The default interpreter instance for this thread
  */

diff --git a/src/lib/unlang/interpret_synchronous.c b/src/lib/unlang/interpret_synchronous.c
index 1f3ec1970d84813ea5fd87973ac3ab240f354049..aa3b5009f942b5b7c0b9dc4b75486af5ebed5403 100644 (file)
--- a/src/lib/unlang/interpret_synchronous.c
+++ b/src/lib/unlang/interpret_synchronous.c
@@ -25,7 +25,6 @@
 
 #include "interpret_priv.h"
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/server/request.h>
 
 typedef struct {
        fr_heap_t               *runnable;

diff --git a/src/lib/unlang/load_balance.c b/src/lib/unlang/load_balance.c
index 0472c868f2e1051b696e0998f3753e001af77f17..5f3570eb98b6a753dc0ee4a7c8a7bc6f482828cd 100644 (file)
--- a/src/lib/unlang/load_balance.c
+++ b/src/lib/unlang/load_balance.c
@@ -27,7 +27,6 @@
 
 #include "load_balance_priv.h"
 #include "module_priv.h"
-#include "unlang_priv.h"
 
 #define unlang_redundant_load_balance unlang_load_balance
 

diff --git a/src/lib/unlang/map.c b/src/lib/unlang/map.c
index 838e57be9f0219bf5ae702e4a8a2a867f88312c5..e4727b668c5265f8796e4b4a71e81b12d170a584 100644 (file)
--- a/src/lib/unlang/map.c
+++ b/src/lib/unlang/map.c
@@ -29,14 +29,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/map.h>
-#include <freeradius-devel/unlang/xlat.h>
 #include <freeradius-devel/unlang/tmpl.h>
 
-#include <freeradius-devel/server/map_proc_priv.h>
 
 #include "map_priv.h"
-#include "unlang_priv.h"
 
 typedef enum {
        UNLANG_UPDATE_MAP_INIT = 0,                             //!< Start processing a map.

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 9247830d5b4b480b2c0a65142093c5fac6b62ac4..f410b2703f483555047d14b4681298e4c5f0ea0a 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -28,12 +28,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/request_data.h>
 
 #include "module_priv.h"
 #include "subrequest_priv.h"
-#include "unlang_priv.h"
 
 #include "tmpl.h"
 

diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index e733ae68ce5302a9591e896702520929c565abc3..0524823974e827fb53e13a67aab346b244eff74b 100644 (file)
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -29,7 +29,6 @@ RCSID("$Id$")
 #include "module_priv.h"
 #include "parallel_priv.h"
 #include "subrequest_priv.h"
-#include "unlang_priv.h"
 
 
 /** Cancel a specific child

diff --git a/src/lib/unlang/subrequest_child.c b/src/lib/unlang/subrequest_child.c
index 274a8a327c705027b758e52e1f4bc06b368cc950..3b0b63bccf0e4507637d9833c38e2edc7a971b46 100644 (file)
--- a/src/lib/unlang/subrequest_child.c
+++ b/src/lib/unlang/subrequest_child.c
@@ -25,8 +25,6 @@
 #include <freeradius-devel/server/state.h>
 #include "interpret_priv.h"
 #include "subrequest_child_priv.h"
-#include "subrequest_priv.h"
-#include "unlang_priv.h"
 
 /** Holds a synthesised instruction that we insert into the parent request
  *

diff --git a/src/lib/unlang/switch.c b/src/lib/unlang/switch.c
index 921acd89ad510897b3ee12854252d875cd58998c..f0e06eeb1f79df11f8a421712cf2b694ea690e6c 100644 (file)
--- a/src/lib/unlang/switch.c
+++ b/src/lib/unlang/switch.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 
 #include "group_priv.h"
 #include "switch_priv.h"
-#include "unlang_priv.h"
 
 static unlang_action_t unlang_switch(rlm_rcode_t *p_result, request_t *request, unlang_stack_frame_t *frame)
 {

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 811c32dfdd4665341cd97eb6c41b8613570b914a..e9a54896eef37585d0c1d60a989ffd67dff70389 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -31,30 +31,24 @@ RCSID("$Id$")
  */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/cond.h>
-#include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/unlang/xlat_priv.h>
 
 #include <freeradius-devel/io/test_point.h>
 
 #include <freeradius-devel/util/base64.h>
-#include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/base16.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/sha1.h>
-#include <freeradius-devel/util/value.h>
 
 #ifdef HAVE_OPENSSL_EVP_H
 #  include <openssl/evp.h>
 #endif
 
 #ifdef HAVE_REGEX_PCRE2
-#  include <pcre2.h>
 #endif
 
-#include <ctype.h>
 
 static fr_rb_tree_t *xlat_root = NULL;
 

diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c
index 523ba77e1189d9837e14b198d305ccce27ff233a..5d63d98d6e76b6cc2ea3fe29a32be1361b6562dc 100644 (file)
--- a/src/lib/unlang/xlat_eval.c
+++ b/src/lib/unlang/xlat_eval.c
@@ -27,16 +27,11 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
-#include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/regex.h>
-#include <freeradius-devel/server/request.h>
 #include <freeradius-devel/unlang/xlat_priv.h>
 
 #include <freeradius-devel/unlang/unlang_priv.h>       /* Remove when everything uses new xlat API */
 
-#include <ctype.h>
 
 static bool done_init = false;
 

diff --git a/src/lib/unlang/xlat_inst.c b/src/lib/unlang/xlat_inst.c
index 192bb5f69d7d31391e09ecfb7cf4a61452244f4f..71e95a34c0f913d9ac109650516e0d681c191809 100644 (file)
--- a/src/lib/unlang/xlat_inst.c
+++ b/src/lib/unlang/xlat_inst.c
@@ -30,7 +30,6 @@ RCSID("$Id$")
 #include <freeradius-devel/unlang/xlat_priv.h>
 #include <freeradius-devel/io/schedule.h>
 
-#include <ctype.h>
 
 /** Holds instance data created by xlat_instantiate
  */

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index 6f6181e39aa67304f4f365f369e82d6ca4ba7f5a..c01774e1a38ff7a3d6fa04d5da4d60e5b87be472 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -33,7 +33,6 @@ RCSID("$Id$")
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/unlang/xlat_priv.h>
 
-#include <ctype.h>
 
 #undef XLAT_DEBUG
 #undef XLAT_HEXDUMP

diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index dcd03eb60b1547161a5e3ce7e747a885c1e3c167..25c822ebbc217cff809ce93a1dd1c683aae1b21c 100644 (file)
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -67,7 +67,6 @@
 #endif
 
 #ifdef __APPLE__
-#include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
 

diff --git a/src/lib/util/dict_ext.c b/src/lib/util/dict_ext.c
index 486e3bfec248150e3a46e940dc5acb131f7b77d6..aec85183aaa7c2c618971a2e89a051b6bbe4c680 100644 (file)
--- a/src/lib/util/dict_ext.c
+++ b/src/lib/util/dict_ext.c
@@ -24,9 +24,6 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/dict_priv.h>
-#include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/table.h>
-#include <freeradius-devel/util/talloc.h>
 
 static fr_table_num_ordered_t const dict_attr_ext_table[] = {
        { L("name"),                    FR_DICT_ATTR_EXT_NAME                   },

diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c
index 3ef3a2ae2cd72d58b86fdfbceb3703136b43b1a2..eaeecfdd4fb29ccedd9ab694b6021de8c23462b1 100644 (file)
--- a/src/lib/util/dl.c
+++ b/src/lib/util/dl.c
@@ -32,7 +32,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/paths.h>
 #include <freeradius-devel/util/syserror.h>
 
-#include <ctype.h>
 
 #ifdef HAVE_VALGRIND_H
 #  include <valgrind.h>

diff --git a/src/lib/util/fopencookie.c b/src/lib/util/fopencookie.c
index 6e943a7d92363897a1a34fee92be366eaedc78cf..348c07f011aa98ac101bfca7ec5a73628297a13d 100644 (file)
--- a/src/lib/util/fopencookie.c
+++ b/src/lib/util/fopencookie.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 #ifndef HAVE_FOPENCOOKIE
 #include <freeradius-devel/util/talloc.h>
 #include <stdio.h>
-#include <errno.h>
 #include "fopencookie.h"
 
 #define NEED_READ 0x01

diff --git a/src/lib/util/md4.c b/src/lib/util/md4.c
index 5589504d3ade42a07b43acc6f5cfecb0e070da06..9a4bea54d5c932680481632f50630e34d3a66bcb 100644 (file)
--- a/src/lib/util/md4.c
+++ b/src/lib/util/md4.c
@@ -8,7 +8,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
 
 /*

diff --git a/src/lib/util/md5.c b/src/lib/util/md5.c
index ac9f4b6f97afaee66066686c5bb830a58ba0e5be..161eb85db970d82ddbc26de545924731149896c4 100644 (file)
--- a/src/lib/util/md5.c
+++ b/src/lib/util/md5.c
@@ -8,7 +8,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/strerror.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/atexit.h>
 
 /*

diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index 5ca29bba2f64d9369019b1ff5cfd4a9f3a92050b..2a0498a143f49649f86b7af1a8466df9a74bdb20 100644 (file)
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -24,7 +24,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/base16.h>
-#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
 
 

diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index b4b20ac986557375a83ef7ac8a7598e3c80a4160..6a7c25eef236cab3a0d3f33928a13b701f5c34f1 100644 (file)
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -10,7 +10,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/sha1.h>
 
-#include <arpa/inet.h>
 
 #ifndef WITH_OPENSSL_SHA1
 #  define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))

diff --git a/src/listen/arp/proto_arp_ethernet.c b/src/listen/arp/proto_arp_ethernet.c
index b2406f0a9b309e81947e1bf468b781ee2e1c4b66..954cfda133933eea737e8c08627bff2b1508d3e5 100644 (file)
--- a/src/listen/arp/proto_arp_ethernet.c
+++ b/src/listen/arp/proto_arp_ethernet.c
@@ -24,7 +24,6 @@
  */
 #include <netdb.h>
 #include <freeradius-devel/server/protocol.h>
-#include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>

diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index 9ebc4ed3fcfeadcd24f5bc82be811050480f0bff..362ecda228560da788b11f95182ef7c1181c06c9 100644 (file)
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -73,7 +73,6 @@ DIAG_ON(strict-prototypes)
 #include <freeradius-devel/server/radmin.h>
 
 #include <freeradius-devel/util/conf.h>
-#include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/socket.h>
 #include <freeradius-devel/util/atexit.h>

diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index deb71ac9c58b567aec8706bca4859a7c832617d4..9ac29a50afa48a343c0f0fcaf62356ae08adb85a 100644 (file)
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -25,9 +25,6 @@
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/master.h>
-#include <freeradius-devel/server/module.h>
-#include <freeradius-devel/server/protocol.h>
-#include <freeradius-devel/server/state.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <freeradius-devel/tacacs/tacacs.h>