From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 3 Sep 2019 17:52:40 +0000 (-0400)
Subject: Use full paths for headers.  This fixes some issues with stale symlinks in package... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcab159657d3dd68658183df3a2f53e74573b188;p=thirdparty%2Ffreeradius-server.git

Use full paths for headers.  This fixes some issues with stale symlinks in package build directories, and generally makes things more robust.
---

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 8cfa5840950..33c873d3c4d 100644
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -31,16 +31,15 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/cf_priv.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/util.h>
 
 #include <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/misc.h>
-
-#include "cf_priv.h"
+#include <freeradius-devel/util/syserror.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index 70eec12ee1d..c5d59dc6b41 100644
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/cf_file.h>
 #include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/cf_priv.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/tmpl.h>
@@ -38,10 +39,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/types.h>
 
-#include "cf_priv.h"
-
-
-
 static CONF_PARSER conf_term = CONF_PARSER_TERMINATOR;
 static char const parse_spaces[] = "                                                                                                                                                                                                                                              ";
 
diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c
index 330f1426be8..e7f3d258cd6 100644
--- a/src/lib/server/cf_util.c
+++ b/src/lib/server/cf_util.c
@@ -25,13 +25,13 @@ RCSID("$Id$")
 
 #include <string.h>
 
-#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/cf_priv.h>
+#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/util/cursor.h>
 
-#include "cf_priv.h"
+#include <freeradius-devel/util/cursor.h>
 
 static inline int cf_ident2_cmp(void const *a, void const *b);
 static int _cf_ident1_cmp(void const *a, void const *b);
diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 96c3da1382d..e8e11b8df6e 100644
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -33,8 +33,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/util/misc.h>
 
-
-
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index 1aa78aad7be..6fd7500d690 100644
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -29,11 +29,8 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-
-
 #include <ctype.h>
 
-
 static fr_table_num_sorted_t const allowed_return_codes[] = {
 	{ "fail",       1 },
 	{ "handled",    1 },
diff --git a/src/lib/server/dl_module.c b/src/lib/server/dl_module.c
index 42bfe66129c..c73ca30750e 100644
--- a/src/lib/server/dl_module.c
+++ b/src/lib/server/dl_module.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-
+#include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
 
@@ -33,8 +33,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/syserror.h>
 
-#include "dl_module.h"
-
 #include <ctype.h>
 #include <unistd.h>
 
diff --git a/src/lib/server/exfile.c b/src/lib/server/exfile.c
index be97a958d39..8cb48b00beb 100644
--- a/src/lib/server/exfile.c
+++ b/src/lib/server/exfile.c
@@ -29,8 +29,6 @@
 
 #include <freeradius-devel/util/misc.h>
 
-
-
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -487,7 +485,7 @@ try_lock:
 		    (fchmod(ef->entries[i].fd, (st.st_mode & ~S_IFMT) | permissions) < 0)) {
 			rad_mode_to_oct(oct_need, (st.st_mode & ~S_IFMT) | permissions);
 			rad_mode_to_str(str_need, (st.st_mode & ~S_IFMT) | permissions);
-			
+
 			WARN("Failed resetting file %s permissions to %s (%s): %s",
 			     filename, oct_need, str_need, fr_syserror(errno));
 		}
diff --git a/src/lib/server/main_loop.c b/src/lib/server/main_loop.c
index 5afe17d8833..70e36c8918e 100644
--- a/src/lib/server/main_loop.c
+++ b/src/lib/server/main_loop.c
@@ -27,17 +27,16 @@
 
 RCSID("$Id$")
 
-
+#include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/main_loop.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/trigger.h>
-#include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/util.h>
+
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/syserror.h>
 
-#include "main_loop.h"
-
 #include <signal.h>
 #include <fcntl.h>
 
diff --git a/src/lib/server/map_proc.c b/src/lib/server/map_proc.c
index 0f973eea957..ef2c23a465d 100644
--- a/src/lib/server/map_proc.c
+++ b/src/lib/server/map_proc.c
@@ -27,8 +27,8 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/map_proc_priv.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "map_proc_priv.h"
 
 static rbtree_t *map_proc_root = NULL;
 
diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 9f3f59741e4..25cf521de3c 100644
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -33,14 +33,13 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/virtual_servers.h>
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 
 #include <freeradius-devel/unlang/base.h>
 
-#include "virtual_servers.h"
-
 typedef struct {
 	char const		*namespace;		//!< Namespace function is registered to.
 	fr_virtual_server_compile_t	func;		//!< Function to call to compile sections.
diff --git a/src/lib/server/xlat_builtin.c b/src/lib/server/xlat_builtin.c
index abfa726efd6..4ac6680d175 100644
--- a/src/lib/server/xlat_builtin.c
+++ b/src/lib/server/xlat_builtin.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/regex.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <freeradius-devel/util/base64.h>
 #include <freeradius-devel/util/md5.h>
@@ -47,7 +48,6 @@ RCSID("$Id$")
 #endif
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 static rbtree_t *xlat_root = NULL;
 
diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
index 1d3211603a2..aab5bebfada 100644
--- a/src/lib/server/xlat_eval.c
+++ b/src/lib/server/xlat_eval.c
@@ -32,12 +32,12 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/server/request.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/unlang/unlang_priv.h>	/* Remove when everything uses new xlat API */
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 static bool done_init = false;
 
diff --git a/src/lib/server/xlat_inst.c b/src/lib/server/xlat_inst.c
index 8c7f1c9eb7e..478f5024d85 100644
--- a/src/lib/server/xlat_inst.c
+++ b/src/lib/server/xlat_inst.c
@@ -27,12 +27,11 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
+#include <freeradius-devel/server/xlat_priv.h>
 #include <freeradius-devel/io/schedule.h>
 
 #include <ctype.h>
 
-#include "xlat_priv.h"
-
 /** Holds instance data created by xlat_instantiate
  */
 static rbtree_t *xlat_inst_tree;
diff --git a/src/lib/server/xlat_tokenize.c b/src/lib/server/xlat_tokenize.c
index 43de6e7affb..6ffd67b1dcd 100644
--- a/src/lib/server/xlat_tokenize.c
+++ b/src/lib/server/xlat_tokenize.c
@@ -29,9 +29,9 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/server/regex.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 #undef XLAT_DEBUG
 #ifdef DEBUG_XLAT
diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index 57fc4f41c8d..54aa8c7c35a 100644
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -21,13 +21,12 @@
  * @copyright 2013 The FreeRADIUS server project
  * @copyright 2013 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "debug.h"
-
+#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 <freeradius-devel/util/hash.h>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c
index a6e0a8a22fc..f73172aaea3 100644
--- a/src/lib/util/dl.c
+++ b/src/lib/util/dl.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/syserror.h>
 
 #include <ctype.h>
@@ -48,7 +49,7 @@ RCSID("$Id$")
 #  define RTLD_LOCAL (0)
 #endif
 
-#include "dl.h"
+
 
 /** Symbol dependent initialisation callback
  *
diff --git a/src/lib/util/dlist.h b/src/lib/util/dlist.h
index 394e6ec8e73..02bc32d94ff 100644
--- a/src/lib/util/dlist.h
+++ b/src/lib/util/dlist.h
@@ -27,9 +27,12 @@ RCSIDH(dlist_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 
+#include <talloc.h>
+
 typedef struct fr_dlist_s fr_dlist_t;
 
 /** Entry in a doubly linked list
diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index e57716ed7dd..6a4af10e53b 100644
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -29,8 +29,6 @@
  */
 RCSID("$Id$")
 
-#include "event.h"
-
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/heap.h>
@@ -41,6 +39,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/time.h>
+#include <freeradius-devel/util/token.h>
 #include <sys/stat.h>
 
 #define FR_EV_BATCH_FDS (256)
diff --git a/src/lib/util/fifo.c b/src/lib/util/fifo.c
index c50a79aa205..e91aaa82e5a 100644
--- a/src/lib/util/fifo.c
+++ b/src/lib/util/fifo.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #include <string.h>
 #include <talloc.h>
 
-#include "fifo.h"
+#include <freeradius-devel/util/fifo.h>
 
 struct fr_fifo_t {
 	unsigned int	num;		//!< How many elements exist in the fifo.
diff --git a/src/lib/util/fring.c b/src/lib/util/fring.c
index df799415593..9438d77eea3 100644
--- a/src/lib/util/fring.c
+++ b/src/lib/util/fring.c
@@ -26,7 +26,7 @@
  */
 RCSID("$Id$")
 
-#include "fring.h"
+#include <freeradius-devel/util/fring.h>
 
 #include <pthread.h>
 
diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c
index 35bc9b97388..58e74d182cc 100644
--- a/src/lib/util/hash.c
+++ b/src/lib/util/hash.c
@@ -32,8 +32,7 @@
  */
 RCSID("$Id$")
 
-#include "hash.h"
-
+#include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/talloc.h>
 
 /*
diff --git a/src/lib/util/heap.c b/src/lib/util/heap.c
index 2e9d4c7ba7d..f9af9446ccc 100644
--- a/src/lib/util/heap.c
+++ b/src/lib/util/heap.c
@@ -22,8 +22,7 @@
  */
 RCSID("$Id$")
 
-#include "heap.h"
-
+#include <freeradius-devel/util/heap.h>
 #include <freeradius-devel/util/strerror.h>
 
 /*
diff --git a/src/lib/util/inet.c b/src/lib/util/inet.c
index d772924208a..5eef12a46e3 100644
--- a/src/lib/util/inet.c
+++ b/src/lib/util/inet.c
@@ -20,8 +20,7 @@
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "inet.h"
-
+#include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
diff --git a/src/lib/util/log.c b/src/lib/util/log.c
index 465a0cffc6c..3fb09bf03bb 100644
--- a/src/lib/util/log.c
+++ b/src/lib/util/log.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "log.h"
-
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
diff --git a/src/lib/util/md4.c b/src/lib/util/md4.c
index bfa694efbcf..ad2fb801e7a 100644
--- a/src/lib/util/md4.c
+++ b/src/lib/util/md4.c
@@ -15,7 +15,7 @@ RCSID("$Id$")
  *  FORCE MD4 TO USE OUR MD4 HEADER FILE!
  *  If we don't do this, it might pick up the systems broken MD4.
  */
-#include "md4.h"
+#include <freeradius-devel/util/md4.h>
 
 fr_thread_local_setup(fr_md4_ctx_t *, md4_ctx)
 
diff --git a/src/lib/util/md5.c b/src/lib/util/md5.c
index 007299800a9..1879f5d7139 100644
--- a/src/lib/util/md5.c
+++ b/src/lib/util/md5.c
@@ -16,7 +16,7 @@ RCSID("$Id$")
  *  FORCE MD5 TO USE OUR MD5 HEADER FILE!
  *  If we don't do this, it might pick up the systems broken MD5.
  */
-#include "md5.h"
+#include <freeradius-devel/util/md5.h>
 
 fr_thread_local_setup(fr_md5_ctx_t *, md5_ctx)
 
diff --git a/src/lib/util/misc.c b/src/lib/util/misc.c
index 43a8e42a321..11cec1c978d 100644
--- a/src/lib/util/misc.c
+++ b/src/lib/util/misc.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "misc.h"
-
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/time.h>
diff --git a/src/lib/util/net.c b/src/lib/util/net.c
index d064bcbc5bd..b5829f1191e 100644
--- a/src/lib/util/net.c
+++ b/src/lib/util/net.c
@@ -20,7 +20,7 @@
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2014-2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "net.h"
+#include <freeradius-devel/util/net.h>
 
 /** Strings for L4 protocols
  *
diff --git a/src/lib/util/packet.c b/src/lib/util/packet.c
index c0762b89c2b..3caec88b565 100644
--- a/src/lib/util/packet.c
+++ b/src/lib/util/packet.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "packet.h"
-
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/talloc.h>
 
diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index a58a830cd07..a2222db1611 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -22,20 +22,19 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/proto.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/pair_cursor.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>
 
-#include "pair.h"
-
 #ifndef NDEBUG
 #  define FREE_MAGIC (0xF4EEF4EE)
 #endif
diff --git a/src/lib/util/pair_cursor.c b/src/lib/util/pair_cursor.c
index 419cd490a43..381b0c07dc0 100644
--- a/src/lib/util/pair_cursor.c
+++ b/src/lib/util/pair_cursor.c
@@ -24,9 +24,8 @@
  * @copyright 2013-2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2013-2015 The FreeRADIUS Server Project.
  */
-#include "pair_cursor.h"
-
 #include <freeradius-devel/missing.h>
+#include <freeradius-devel/util/pair_cursor.h>
 
 /** Internal function to update cursor state
  *
diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c
index 2a4c7f2aad6..c43ae6204de 100644
--- a/src/lib/util/pcap.c
+++ b/src/lib/util/pcap.c
@@ -22,10 +22,9 @@
  */
 #ifdef HAVE_LIBPCAP
 
-#include "pcap.h"
-
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/net.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/talloc.h>
diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index f4df844816c..dcd15f8f435 100644
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -22,11 +22,10 @@
  */
 RCSID("$Id$")
 
-#include "print.h"
-
 #include <freeradius-devel/util/debug.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>
 
diff --git a/src/lib/util/rand.c b/src/lib/util/rand.c
index 40b890d9418..7d099a436d6 100644
--- a/src/lib/util/rand.c
+++ b/src/lib/util/rand.c
@@ -22,8 +22,7 @@
  */
 RCSID("$Id$")
 
-#include "rand.h"
-
+#include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/hash.h>
 
 #include <errno.h>
diff --git a/src/lib/util/rbtree.c b/src/lib/util/rbtree.c
index 573a96027a9..1be854f558b 100644
--- a/src/lib/util/rbtree.c
+++ b/src/lib/util/rbtree.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "rbtree.h"
-
 #include <freeradius-devel/util/log.h>
+#include <freeradius-devel/util/rbtree.h>
 #include <freeradius-devel/util/strerror.h>
 
 #include <pthread.h>
diff --git a/src/lib/util/regex.c b/src/lib/util/regex.c
index 170c3712857..fb93c224c89 100644
--- a/src/lib/util/regex.c
+++ b/src/lib/util/regex.c
@@ -24,9 +24,10 @@
 RCSID("$Id$")
 
 #ifdef HAVE_REGEX
-#include "regex.h"
 
+#include <freeradius-devel/util/regex.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/thread_local.h>
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/talloc.h>
diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index 7910eb537b7..141f248b11a 100644
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -8,7 +8,7 @@
  */
 RCSID("$Id$")
 
-#include "sha1.h"
+#include <freeradius-devel/util/sha1.h>
 
 #include <arpa/inet.h>
 
diff --git a/src/lib/util/snprintf.c b/src/lib/util/snprintf.c
index ceee19161f7..935636998a5 100644
--- a/src/lib/util/snprintf.c
+++ b/src/lib/util/snprintf.c
@@ -54,7 +54,7 @@
 
 RCSID("$Id$")
 
-#include "snprintf.h"
+#include <freeradius-devel/util/snprintf.h>
 
 #ifndef HAVE_VSNPRINTF
 
diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c
index 207aaece904..3bd20dceef4 100644
--- a/src/lib/util/socket.c
+++ b/src/lib/util/socket.c
@@ -23,10 +23,10 @@
  *
  * @copyright 2015 The FreeRADIUS project
  */
-#include "socket.h"
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/socket.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/udpfromto.h>
diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c
index 86ca75f526c..d71d355ef5b 100644
--- a/src/lib/util/strerror.c
+++ b/src/lib/util/strerror.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "strerror.h"
-
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/print.h>
+#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/thread_local.h>
 
 #include <stdbool.h>
diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index 23af3540f37..c40888fa2be 100644
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include "struct.h"
+#include <freeradius-devel/util/struct.h>
 
 VALUE_PAIR *fr_unknown_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 667818b8296..2407dab197d 100644
--- a/src/lib/util/syserror.c
+++ b/src/lib/util/syserror.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "syserror.h"
-
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/thread_local.h>
 
 #include <errno.h>
diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index cad985854b2..c7ae2ecb66b 100644
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "talloc.h"
-
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/talloc.h>
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/lib/util/token.c b/src/lib/util/token.c
index a57d70ba627..94129a5c517 100644
--- a/src/lib/util/token.c
+++ b/src/lib/util/token.c
@@ -24,10 +24,9 @@
  */
 RCSID("$Id$")
 
-#include "token.h"
-
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/token.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/src/lib/util/udp.c b/src/lib/util/udp.c
index fd416877f3b..bc3215f88f2 100644
--- a/src/lib/util/udp.c
+++ b/src/lib/util/udp.c
@@ -22,11 +22,10 @@
  */
 RCSID("$Id$")
 
-#include "udp.h"
-
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/udp.h>
 
 /*
  *	This is easier than ifdef's in the function definition.
diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index c1fbd251d53..a3e56b4fe56 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -44,13 +44,12 @@
  */
 RCSID("$Id$")
 
-#include "value.h"
-
 #include <freeradius-devel/util/ascend.h>
 #include <freeradius-devel/util/cursor.h>
 #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 <assert.h>
 #include <ctype.h>
diff --git a/src/lib/util/version.c b/src/lib/util/version.c
index d6de092ae11..de20dff3eb1 100644
--- a/src/lib/util/version.c
+++ b/src/lib/util/version.c
@@ -23,9 +23,8 @@
  */
 RCSID("$Id$")
 
-#include "version.h"
-
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/version.h>
 
 static uint64_t libmagic = RADIUSD_MAGIC_NUMBER;