no need to include server/base.h everywhere

diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index 16946e46c3769d29968f4b1542deb9374917514e..5debd9326c4970d74dbd05a803433ec651f7e4b4 100644 (file)
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/arp/proto_arp_ethernet.c b/src/listen/arp/proto_arp_ethernet.c
index d1ded6d696dc0b0401947a31face278496a670f1..b903f1d7ac674f29c40e972a59b0309c3418f46e 100644 (file)
--- a/src/listen/arp/proto_arp_ethernet.c
+++ b/src/listen/arp/proto_arp_ethernet.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/control/conduit.c b/src/listen/control/conduit.c
index 08ff5eafc75818ab6012e7b16e0611c095f46289..3d9f46e142b73e284de2ed1ab2df673883eb4b6a 100644 (file)
--- a/src/listen/control/conduit.c
+++ b/src/listen/control/conduit.c
@@ -25,7 +25,11 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/server/base.h>
+#include <freeradius-devel/util/strerror.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <errno.h>
 #include "conduit.h"
 
 static ssize_t lo_read(int fd, void *out, size_t outlen)

diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c
index 117a1c5ef9e7e36e2a166173b980d86847643220..ad75a3e643d3e397dfd560963d82f3f882fa92ff 100644 (file)
--- a/src/listen/control/proto_control.c
+++ b/src/listen/control/proto_control.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2018 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index 20b6218909245c522880188d99bd7c6d5e256fa5..9bad0b998ccefc87590e5eae24d0ab2b83cee44d 100644 (file)
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/fopencookie.h>

diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index c37561dd09940c2e802d74e23edc3b869d7d6118..c3b4cd7d4509a4ddf7dea1f2589b482b114ebbe1 100644 (file)
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -67,8 +67,10 @@ DIAG_ON(strict-prototypes)
 
 #define LOG_PREFIX "radmin - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/cf_util.h>
+#include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/radmin.h>
 
 #include <freeradius-devel/util/conf.h>
@@ -76,7 +78,9 @@ DIAG_ON(strict-prototypes)
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/socket.h>
+#include <freeradius-devel/util/atexit.h>
 
 #ifdef USE_READLINE_HISTORY
 #ifndef READLINE_MAX_HISTORY_LINES

diff --git a/src/listen/cron/proto_cron.c b/src/listen/cron/proto_cron.c
index 65ee251327ce69ebfdbe514e873abcb87fede6f2..204ebe000a00c17b92d138ba3381ff180e8acd54 100644 (file)
--- a/src/listen/cron/proto_cron.c
+++ b/src/listen/cron/proto_cron.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/listen/cron/proto_cron_crontab.c b/src/listen/cron/proto_cron_crontab.c
index f179994f3c531cc8a7866e70562674acc61f9ae1..52b2fa656d59c2ec09d6b12fb32ca8619eeafc6b 100644 (file)
--- a/src/listen/cron/proto_cron_crontab.c
+++ b/src/listen/cron/proto_cron_crontab.c
@@ -23,7 +23,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index 7bb5a68e64a7f1255a2b318d7230a59ddd677ee1..397c4e4b2ea6e0ae4431c132cb79c10e374f61a8 100644 (file)
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -26,8 +26,8 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "proto_detail.h"

diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index cef9187f27a3167a13757aa5c9146b12a644b36c..ba521fdf359df57c9ce6de3d78d9f74af25efb45 100644 (file)
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -28,8 +28,8 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <freeradius-devel/util/misc.h>

diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index fe3a5d4542286773184e046d2837f1db6f30f7d6..72e9bfc36fb9ea01d05f301db73ad915aa020ddf 100644 (file)
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -23,13 +23,14 @@
  * @copyright 2017 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/time.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_detail.h"
 

diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index f4f3f0fd0f41f89b05e713c3b166e084e4a76176..4b209d5dbdaee61beb2e3e33b96c9e4ac83007f0 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -24,7 +24,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv4 - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index 134869375d515e6b3cc4f54856f25b80830ccf40..b29017ba35dd8b07ddae68a9c0efa2a053288d0e 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -25,7 +25,6 @@
 #define LOG_PREFIX "proto_dhcpv4_udp - "
 
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 36932c16d3f1b1ae1227627d4b51359d8ca50065..71faca50c4dcd999d7a3d2ed1ad906b7d3bab052 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv6 - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 54dd1e36497339740657acd4baa76ea50a4c7c01..c25ebc982984878ef471d0cf713dc16e6a2e0b94 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv6_udp - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index 45169779f5b626f18090079ba59fe53833cff20d..e2ede7df655407ec1b58c6b3137d9d292ddc5f74 100644 (file)
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dns - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 81ba4cd324bb2c422ce3772bfce25a3b742cafcb..165f40dabdbd601a230f8b23a9dadcac5c14df62 100644 (file)
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dns_udp - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/load/proto_load.c b/src/listen/load/proto_load.c
index d87e84d84af4f8c31357deed32143a9dc71cf3d4..cbae07e2fd73418d58a2c83758829fd0674825dc 100644 (file)
--- a/src/listen/load/proto_load.c
+++ b/src/listen/load/proto_load.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/listen/load/proto_load_step.c b/src/listen/load/proto_load_step.c
index fa5061484707d7aa9d65ea70c6fd43b42355cb55..1478e3d574833eaddac9570a35db61a86ae39724 100644 (file)
--- a/src/listen/load/proto_load_step.c
+++ b/src/listen/load/proto_load_step.c
@@ -24,7 +24,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/base.h>

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index a56cf213637405ece179786bf2735afe5e568d01..465c5c8465b49f080139db7f87e0960f088a28eb 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index bc84f95b640337c949fdc659a858e93f92c92086..304bf00fb74f4e81b18c1c1718a9a96694dca5e2 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/tcp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index bc4cde5727d24bf8a743686801fbaac4f69e6f64..e8eeb41107e3d8a428c2eb3dd287d4ebab78c01c 100644 (file)
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

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

diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index 90ec551df849c872757f4204db94dd745413e2fd..c90a7dda0c8a6bc3d0b8cfc50b7f6e42d1f2d489 100644 (file)
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -25,7 +25,6 @@
  */
 
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/base.h>

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index ec2f7f7ab4d92ff82718783f1caec65d756fa820..afcda25dcb2e46c68b11aaf8c80130227b957471 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index 6c2bb63fa609cb3be5750f80782112ef477a7db7..6a24b23ca98e309cb4fb5781bed988463e90c3a7 100644 (file)
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index d996ba458a4fa8185f52d1bdcc686ed2e91ffd9c..290e8969a280213e6c30adacdf03e98c6164887e 100644 (file)
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -26,7 +26,6 @@
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/master.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/unlang/call.h>