Fix includes

diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index a8e56e79070ae16d0cdb91327cc0d5f881a48a38..d631245b2231ee07e6f0596d0838022e70122d61 100644 (file)
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -24,12 +24,11 @@
  * @copyright 2000 Miquel van Smoorenburg (miquels@cistron.nl)
  * @copyright 2000 Alan DeKok (aland@freeradius.org)
  */
-#include "lib/util/syserror.h"
-#include <sys/errno.h>
-#include <sys/fcntl.h>
 RCSID("$Id$")
 
 #include <string.h>
+#include <sys/errno.h>
+#include <sys/fcntl.h>
 
 #include <freeradius-devel/server/cf_file.h>
 #include <freeradius-devel/server/cf_parse.h>
@@ -42,6 +41,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/perm.h>
+#include <freeradius-devel/util/syserror.h>
 
 static conf_parser_t conf_term = CONF_PARSER_TERMINATOR;
 static char const parse_spaces[] = "                                                                                                                                                                                                                                              ";

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index f7559dadf1c98bfe2082f1cde8c1c889749f881f..b9a5cf13963f2b4bf3c15129a3a4f7905c7b3cc6 100644 (file)
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -23,12 +23,12 @@
  * @copyright 2021 The FreeRADIUS server project
  * @copyright 2021 Network RADIUS SAS (legal@networkradius.com)
  */
-
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/unlang/xlat_priv.h>
 #include <freeradius-devel/util/calc.h>
+#include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/tmpl_dcursor.h>
 
 #undef XLAT_DEBUG

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 2fd63a335908a3ef6976593089db400b5b697861..2311d32b05100e642e8048e9a7ff43471ce94435 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -22,7 +22,6 @@
  * @copyright 2024 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2012-2014 The FreeRADIUS server project
  */
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 
 #define LOG_PREFIX mctx->mi->name
@@ -36,8 +35,10 @@ RCSID("$Id$")
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/value.h>
+#include <freeradius-devel/unlang/action.h>
 #include <freeradius-devel/unlang/xlat_func.h>
 #include <freeradius-devel/unlang/call_env.h>
+#include <freeradius-devel/unlang/xlat.h>
 
 #include "rlm_cache.h"
 

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index e536ff56c601ac95e38f70bcee38bf82bbf18690..16aacf4c3ed53cdee2c2e09e579dc4b8bb06aedd 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -23,8 +23,6 @@
  */
 
 /*  MPPE support from Takahiro Wagatsuma <waga@sic.shibaura-it.ac.jp> */
-
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 
 #define LOG_PREFIX mctx->mi->name
@@ -43,6 +41,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/sha1.h>
 
+#include <freeradius-devel/unlang/action.h>
 #include <freeradius-devel/unlang/function.h>
 #include <freeradius-devel/unlang/xlat_func.h>
 

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index 3b94d07a7874f64a8d71a0c78689dca6ad3036db..2e4d15bf9609eea3229dbb0bb4769fc394e4e429 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -23,7 +23,6 @@
  * @copyright 2012 Matthew Newton (matthew@newtoncomputing.co.uk)
  * @copyright 2001 Kostas Kalevras (kkalev@noc.ntua.gr)
  */
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
@@ -39,6 +38,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/sha1.h>
 
+#include <freeradius-devel/unlang/action.h>
 #include <freeradius-devel/unlang/call_env.h>
 
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.password.h>

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index 94f4f476a52e0eea2ace2b3f2b59c1e26a7b9fce..7bc22dcfac3c904a6d2f27bbc35a219927a93b24 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -24,7 +24,6 @@
  * @copyright 2000,2006,2015-2016 The FreeRADIUS server project
  * @copyright 2025 Network RADIUS SAS
  */
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 
 #define LOG_PREFIX inst->name
@@ -33,6 +32,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/lsan.h>
+#include <freeradius-devel/unlang/action.h>
 
 #include <Python.h>
 #include <structmember.h>

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index 5263e22e8c8613614abb99787666b92fe6c04de8..99e1194d166e1fb3453a2d9696191ae95613a514 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -21,13 +21,13 @@
  *
  * @copyright 2023 Network RADIUS SAS (legal@networkradius.com)
  */
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/dlist.h>
+#include <freeradius-devel/unlang/action.h>
 
 #include "rlm_tacacs.h"
 

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index e21119355396fc2d999f6a3bee7a0a8a0f6650c4..95057be243e345f7813a0ea46b5be229c0f28126 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -23,12 +23,12 @@
  * @copyright 2013 The FreeRADIUS server project
  * @copyright 2013 Network RADIUS (legal@networkradius.com)
  */
-#include "lib/server/rcode.h"
-#include "lib/unlang/action.h"
 RCSID("$Id$")
 
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/unlang/xlat_func.h>
+#include <freeradius-devel/server/rcode.h>
+#include <freeradius-devel/unlang/action.h>
 #include "rlm_yubikey.h"
 
 #ifdef HAVE_YKCLIENT