From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 13 Jul 2018 00:20:41 +0000 (-0400)
Subject: Rename main header files
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebad0dee3299bfcad0bb0e937e233c957ce0a39f;p=thirdparty%2Ffreeradius-server.git

Rename main header files
---

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 16ceb91dac8..6c2a9e5819f 100644
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -31,10 +31,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/map_proc.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/radmin.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index bfead7fb173..72f92a63730 100644
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -27,11 +27,11 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
diff --git a/src/lib/all.mk b/src/lib/all.mk
index 0fe0cf8f26e..c914a295f56 100644
--- a/src/lib/all.mk
+++ b/src/lib/all.mk
@@ -21,7 +21,7 @@ src/include/${1}:
 	$${Q}[ -e $$@ ] || ln -sf $${top_srcdir}/src/lib/${1} $$@
 	@echo LN-SF src/lib/${1} $$@
 
-install.src.include: $(addprefix ${SRC_INCLUDE_DIR}/,${1}/${1}.h)
+install.src.include: $(addprefix ${SRC_INCLUDE_DIR}/,${1}/base.h)
 endef
 
 
diff --git a/src/lib/io/application.h b/src/lib/io/application.h
index 09a087b63ca..60d1f4d58ad 100644
--- a/src/lib/io/application.h
+++ b/src/lib/io/application.h
@@ -25,7 +25,7 @@
  */
 #include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/dl.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 /*
  *	src/lib/io/schedule.h
diff --git a/src/lib/io/io.h b/src/lib/io/base.h
similarity index 100%
rename from src/lib/io/io.h
rename to src/lib/io/base.h
diff --git a/src/lib/io/channel.h b/src/lib/io/channel.h
index 35d881db21d..83d999122e0 100644
--- a/src/lib/io/channel.h
+++ b/src/lib/io/channel.h
@@ -27,7 +27,7 @@ RCSIDH(channel_h, "$Id$")
 
 #include <freeradius-devel/io/message.h>
 #include <freeradius-devel/io/control.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/util/dlist.h>
 
 #include <sys/types.h>
diff --git a/src/lib/io/listen.h b/src/lib/io/listen.h
index 69ab49c3186..7bbc426defb 100644
--- a/src/lib/io/listen.h
+++ b/src/lib/io/listen.h
@@ -14,7 +14,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 
 
diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index e312a4f8dbc..49a0310ec0e 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/io/master.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/lib/io/worker.h b/src/lib/io/worker.h
index 88b962c458f..bdd02194130 100644
--- a/src/lib/io/worker.h
+++ b/src/lib/io/worker.h
@@ -31,7 +31,7 @@ RCSIDH(worker_h, "$Id$")
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/fr_log.h>
 
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/json/json.h b/src/lib/json/base.h
similarity index 99%
rename from src/lib/json/json.h
rename to src/lib/json/base.h
index add111fba3d..42a5b544017 100644
--- a/src/lib/json/json.h
+++ b/src/lib/json/base.h
@@ -17,7 +17,7 @@
 
 /**
  * $Id$
- * @file jpath.c
+ * @file lib/json/base.h
  * @brief Implements the evaluation and parsing functions for the FreeRADIUS version of jpath.
  *
  * @author Arran Cudbard-Bell
diff --git a/src/lib/json/jpath.c b/src/lib/json/jpath.c
index a93d7d7cbd6..0a911bd83fd 100644
--- a/src/lib/json/jpath.c
+++ b/src/lib/json/jpath.c
@@ -26,7 +26,7 @@
  * @copyright 2015  The FreeRADIUS Server Project
  */
 #include <freeradius-devel/server/rad_assert.h>
-#include "json.h"
+#include "base.h"
 
 #define	SELECTOR_INDEX_UNSET			INT32_MAX
 
diff --git a/src/lib/json/json.c b/src/lib/json/json.c
index c2427b5bd8e..e57325f67f2 100644
--- a/src/lib/json/json.c
+++ b/src/lib/json/json.c
@@ -26,7 +26,7 @@
  * @copyright 2015 The FreeRADIUS Server Project
  */
 #include <freeradius-devel/server/rad_assert.h>
-#include "json.h"
+#include "base.h"
 
 /** Convert json object to fr_value_box_t
  *
diff --git a/src/lib/json/json_missing.h b/src/lib/json/json_missing.h
index 41b6697edb7..4bf3b570913 100644
--- a/src/lib/json/json_missing.h
+++ b/src/lib/json/json_missing.h
@@ -30,7 +30,7 @@ RCSIDH(jsonc_missing_h, "$Id$")
 #  if defined(HAVE_JSONMC_JSON_H)
 #    include <json-c/json.h>
 #  elif defined(HAVE_JSON_JSON_H)
-#    include <json/json.h>
+#    include <json/base.h>
 #  else
 #    error "Need json-c headers"
 #  endif
diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index b8a4a32501f..8756e0a7c56 100644
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -31,7 +31,7 @@
 #define LOG_PREFIX_ARGS handle_config->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 LDAP *ldap_global_handle;			//!< Hack for OpenLDAP libldap global initialisation.
 
diff --git a/src/lib/ldap/ldap.h b/src/lib/ldap/base.h
similarity index 100%
rename from src/lib/ldap/ldap.h
rename to src/lib/ldap/base.h
diff --git a/src/lib/ldap/bind.c b/src/lib/ldap/bind.c
index ed507a8b294..de9c48b55f5 100644
--- a/src/lib/ldap/bind.c
+++ b/src/lib/ldap/bind.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 /** Holds arguments for the bind operation
diff --git a/src/lib/ldap/connection.c b/src/lib/ldap/connection.c
index d90e9516e5e..6fa8fd91dac 100644
--- a/src/lib/ldap/connection.c
+++ b/src/lib/ldap/connection.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #if LDAP_SET_REBIND_PROC_ARGS == 3
diff --git a/src/lib/ldap/control.c b/src/lib/ldap/control.c
index ace76681c84..826248ea8b9 100644
--- a/src/lib/ldap/control.c
+++ b/src/lib/ldap/control.c
@@ -22,7 +22,7 @@
  * @author Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  * @copyright 2015 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /** Merge connection and call specific client and server controls
  *
diff --git a/src/lib/ldap/directory.c b/src/lib/ldap/directory.c
index 5247551b6d3..57afa3bc5bf 100644
--- a/src/lib/ldap/directory.c
+++ b/src/lib/ldap/directory.c
@@ -27,7 +27,7 @@
 #define LOG_PREFIX "%s - "
 #define LOG_PREFIX_ARGS (*pconn)->config->name
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 static FR_NAME_NUMBER const fr_ldap_directory_type_table[] = {
 	{ "Unknown",			FR_LDAP_DIRECTORY_UNKNOWN	},
diff --git a/src/lib/ldap/edir.c b/src/lib/ldap/edir.c
index 85a2477c175..d821831b24a 100644
--- a/src/lib/ldap/edir.c
+++ b/src/lib/ldap/edir.c
@@ -29,7 +29,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /* NMAS error codes */
 #define NMAS_E_BASE	(-1600)
diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index 0a6f9bc8be7..7031b316eaa 100644
--- a/src/lib/ldap/map.c
+++ b/src/lib/ldap/map.c
@@ -27,7 +27,7 @@
 #define LOG_PREFIX_ARGS handle_config->name
 
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /** Callback for map_to_request
  *
diff --git a/src/lib/ldap/sasl.c b/src/lib/ldap/sasl.c
index f8257f22067..6cecb685eaf 100644
--- a/src/lib/ldap/sasl.c
+++ b/src/lib/ldap/sasl.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <sasl/sasl.h>
 
diff --git a/src/lib/ldap/sasl_s.c b/src/lib/ldap/sasl_s.c
index 0288ccaf78f..7be8802b2b4 100644
--- a/src/lib/ldap/sasl_s.c
+++ b/src/lib/ldap/sasl_s.c
@@ -28,7 +28,7 @@
 
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #include <sasl/sasl.h>
 
diff --git a/src/lib/ldap/start_tls.c b/src/lib/ldap/start_tls.c
index 7966aa921fd..ad512964584 100644
--- a/src/lib/ldap/start_tls.c
+++ b/src/lib/ldap/start_tls.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 /** Holds arguments for the start_tls operation
diff --git a/src/lib/ldap/state.c b/src/lib/ldap/state.c
index 26f42c18488..786c55e6b0c 100644
--- a/src/lib/ldap/state.c
+++ b/src/lib/ldap/state.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #define STATE_TRANSITION(_new) \
 do { \
diff --git a/src/lib/ldap/util.c b/src/lib/ldap/util.c
index be8645e1c25..2bc8d8c0aac 100644
--- a/src/lib/ldap/util.c
+++ b/src/lib/ldap/util.c
@@ -23,7 +23,7 @@
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  * @copyright 2017 The FreeRADIUS Server Project.
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #include <stdarg.h>
 #include <ctype.h>
diff --git a/src/lib/redis/redis.h b/src/lib/redis/base.h
similarity index 100%
rename from src/lib/redis/redis.h
rename to src/lib/redis/base.h
diff --git a/src/lib/redis/cluster.c b/src/lib/redis/cluster.c
index 9f038618d64..e3edbba927f 100644
--- a/src/lib/redis/cluster.c
+++ b/src/lib/redis/cluster.c
@@ -145,7 +145,7 @@
  *   after some time.  This time is configurable.
  *
  */
-#include "redis.h"
+#include "base.h"
 #include "cluster.h"
 #include "crc16.h"
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/lib/redis/redis.c b/src/lib/redis/redis.c
index b9aefbb5bb9..68be51c864a 100644
--- a/src/lib/redis/redis.c
+++ b/src/lib/redis/redis.c
@@ -23,7 +23,7 @@
  * @copyright 2000,2006,2015  The FreeRADIUS server project
  * @copyright 2011 TekSavvy Solutions <gabe@teksavvy.com>
  */
-#include "redis.h"
+#include "base.h"
 #include <freeradius-devel/server/rad_assert.h>
 
 FR_NAME_NUMBER const redis_reply_types[] = {
diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 2d62294b7cd..63daf9039fd 100644
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/radmin.h>
 #include <freeradius-devel/server/cf_file.h>
 
diff --git a/src/lib/server/modules.h b/src/lib/server/modules.h
index e48edff5451..1822406d44b 100644
--- a/src/lib/server/modules.h
+++ b/src/lib/server/modules.h
@@ -32,7 +32,7 @@ RCSIDH(modules_h, "$Id$")
 #include <freeradius-devel/server/exfile.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/server/components.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/lib/server/protocol.h b/src/lib/server/protocol.h
index c12b8e411df..56474d1ff43 100644
--- a/src/lib/server/protocol.h
+++ b/src/lib/server/protocol.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 #include <freeradius-devel/server/dl.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 /*
  *	We'll use this below.
diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 47a2f0940e4..838e380ddae 100644
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 /** Per-request opaque data, added by modules
  *
diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 7fee2e48c1e..a51b8b617c5 100644
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/parser.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/io/listen.h>
diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
index 9e1b1c6ea22..7312532b406 100644
--- a/src/lib/server/xlat_eval.c
+++ b/src/lib/server/xlat_eval.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/parser.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <ctype.h>
diff --git a/src/lib/soh/soh.h b/src/lib/soh/base.h
similarity index 97%
rename from src/lib/soh/soh.h
rename to src/lib/soh/base.h
index 667cc4670bb..7cc5ce46873 100644
--- a/src/lib/soh/soh.h
+++ b/src/lib/soh/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file src/lib/soh/soh.h
+ * @file src/lib/soh/base.h
  * @brief Common libraries for parsing Microsoft SOH data
  *
  * @copyright 2010 Phil Mayers <p.mayers@imperial.ac.uk>
diff --git a/src/lib/soh/soh.c b/src/lib/soh/soh.c
index fa49ecd6c0e..9d11b4744ca 100644
--- a/src/lib/soh/soh.c
+++ b/src/lib/soh/soh.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "soh.h"
+#include "base.h"
 
 /*
  * This code implements parsing of MS-SOH data into FreeRadius AVPs
diff --git a/src/lib/tls/all.mk b/src/lib/tls/all.mk
index ab1c60c7d7b..9df3763e49e 100644
--- a/src/lib/tls/all.mk
+++ b/src/lib/tls/all.mk
@@ -21,8 +21,8 @@ TGT_PREREQS := libfreeradius-util.la
 TGT_LDLIBS  := $(LIBS) $(OPENSSL_LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(OPENSSL_FLAGS) $(GPERFTOOL_FLAGS)
 
-src/lib/tls/tls.h: src/lib/tls/tls-h src/include/autoconf.sed src/include/autoconf.h
+src/lib/tls/base.h: src/lib/tls/base-h src/include/autoconf.sed src/include/autoconf.h
 	${Q}$(ECHO) HEADER $@
 	${Q}sed -f src/include/autoconf.sed < $< > $@
 
-src/freeradius-devel: | src/lib/tls/tls.h
+src/freeradius-devel: | src/lib/tls/base.h
diff --git a/src/lib/tls/tls-h b/src/lib/tls/base-h
similarity index 100%
rename from src/lib/tls/tls-h
rename to src/lib/tls/base-h
diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 8a15b45dc0a..75ab02cb054 100644
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -34,7 +34,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 static int instance_count = 0;
diff --git a/src/lib/tls/tls.h b/src/lib/tls/base.h
similarity index 99%
rename from src/lib/tls/tls.h
rename to src/lib/tls/base.h
index 2fe52253d81..05d9dff3731 100644
--- a/src/lib/tls/tls.h
+++ b/src/lib/tls/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file lib/tls/tls.h
+ * @file lib/tls/base.h
  * @brief Structures and prototypes for TLS wrappers
  *
  * @copyright 2010 Network RADIUS SARL <info@networkradius.com>
diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index 28e0684af7c..329df918413 100644
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -32,7 +32,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Add attributes identifying the TLS session to be acted upon, and the action to be performed
diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c
index ece6440dcfd..4f330f5bea6 100644
--- a/src/lib/tls/conf.c
+++ b/src/lib/tls/conf.c
@@ -38,7 +38,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 /** Certificate formats
  *
diff --git a/src/lib/tls/ctx.c b/src/lib/tls/ctx.c
index adf76e605ec..2102a57fb3c 100644
--- a/src/lib/tls/ctx.c
+++ b/src/lib/tls/ctx.c
@@ -35,7 +35,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #  ifndef OPENSSL_NO_ECDH
diff --git a/src/lib/tls/log.c b/src/lib/tls/log.c
index f1cfcb05b82..84f89804f91 100644
--- a/src/lib/tls/log.c
+++ b/src/lib/tls/log.c
@@ -31,7 +31,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 
 DIAG_OFF(format-nonliteral)
 /** Print errors in the TLS thread local error stack
diff --git a/src/lib/tls/ocsp.c b/src/lib/tls/ocsp.c
index e4dece05bec..c06057107d5 100644
--- a/src/lib/tls/ocsp.c
+++ b/src/lib/tls/ocsp.c
@@ -33,7 +33,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <openssl/ocsp.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Rcodes returned by the OCSP check function
diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index d4d9ba189b9..483c18dbace 100644
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -32,7 +32,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <openssl/x509v3.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /*
diff --git a/src/lib/tls/utils.c b/src/lib/tls/utils.c
index 45bbcff1277..176418e53e1 100644
--- a/src/lib/tls/utils.c
+++ b/src/lib/tls/utils.c
@@ -25,7 +25,7 @@
 
 #include <openssl/ssl.h>
 #include <freeradius-devel/server/base.h>
-#include "tls.h"
+#include "base.h"
 
 /** PKEY types (friendly names)
  *
diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index cfafc23208d..66dc520c4c6 100644
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -30,7 +30,7 @@
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Validates a certificate using custom logic
diff --git a/src/lib/unlang/unlang.h b/src/lib/unlang/base.h
similarity index 99%
rename from src/lib/unlang/unlang.h
rename to src/lib/unlang/base.h
index 0dd9a0590b7..44333c25b24 100644
--- a/src/lib/unlang/unlang.h
+++ b/src/lib/unlang/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file lib/unlang/unlang.h
+ * @file lib/unlang/base.h
  * @brief Public interface to the interpreter
  *
  */
diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 0ac10590507..79e6446dd0c 100644
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "unlang_priv.h"
 
 /* Here's where we recognize all of our keywords: first the rcodes, then the
diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 855e842c181..2771af5267d 100644
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/xlat.h>
 #include "unlang_priv.h"
 
diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index 41728714540..2c21ccb826e 100644
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/cf_util.h> /* Need CONF_* definitions */
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #ifdef __cplusplus
diff --git a/src/modules/proto_arp/proto_arp.c b/src/modules/proto_arp/proto_arp.c
index 175491ada90..3a7fb32cb1e 100644
--- a/src/modules/proto_arp/proto_arp.c
+++ b/src/modules/proto_arp/proto_arp.c
@@ -23,7 +23,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/util/pcap.h>
diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c
index 4c959bd779b..2a0ae2dab24 100644
--- a/src/modules/proto_bfd/proto_bfd.c
+++ b/src/modules/proto_bfd/proto_bfd.c
@@ -23,7 +23,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/md5.h>
diff --git a/src/modules/proto_control/proto_control.c b/src/modules/proto_control/proto_control.c
index db7f004ed94..66534ecd4ba 100644
--- a/src/modules/proto_control/proto_control.c
+++ b/src/modules/proto_control/proto_control.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_control.h"
 
diff --git a/src/modules/proto_control/proto_control_tcp.c b/src/modules/proto_control/proto_control_tcp.c
index a8156dcc723..909d6a08f4d 100644
--- a/src/modules/proto_control/proto_control_tcp.c
+++ b/src/modules/proto_control/proto_control_tcp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_control/proto_control_unix.c b/src/modules/proto_control/proto_control_unix.c
index 9ebc75260d5..abba678498a 100644
--- a/src/modules/proto_control/proto_control_unix.c
+++ b/src/modules/proto_control/proto_control_unix.c
@@ -27,7 +27,7 @@
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c
index caa61758eb0..1aaafa6bbd8 100644
--- a/src/modules/proto_detail/proto_detail_file.c
+++ b/src/modules/proto_detail/proto_detail_file.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
index 6a3351f99d6..400eca842c0 100644
--- a/src/modules/proto_detail/proto_detail_process.c
+++ b/src/modules/proto_detail/proto_detail_process.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c
index 99703066103..1a87999bdac 100644
--- a/src/modules/proto_detail/proto_detail_work.c
+++ b/src/modules/proto_detail/proto_detail_work.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.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>
diff --git a/src/modules/proto_dhcpv4/old.c b/src/modules/proto_dhcpv4/old.c
index 2f1a3a7d88e..a0abba3a3ef 100644
--- a/src/modules/proto_dhcpv4/old.c
+++ b/src/modules/proto_dhcpv4/old.c
@@ -47,7 +47,7 @@
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index e9280979c8d..1361247b7bf 100644
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_dhcpv4.h"
 
diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index 7d755a00fea..18d4b77d025 100644
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
index 1e362d4f265..1557a312fef 100644
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 6378984387f..d532ac9c913 100644
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -23,9 +23,9 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/proto_ldap_sync/sync.c b/src/modules/proto_ldap_sync/sync.c
index 87202b904ab..a728c19a7e2 100644
--- a/src/modules/proto_ldap_sync/sync.c
+++ b/src/modules/proto_ldap_sync/sync.c
@@ -27,7 +27,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <lber.h>
 #include "sync.h"
diff --git a/src/modules/proto_ldap_sync/sync.h b/src/modules/proto_ldap_sync/sync.h
index a6eec02112e..7a2ef8411e1 100644
--- a/src/modules/proto_ldap_sync/sync.h
+++ b/src/modules/proto_ldap_sync/sync.h
@@ -24,7 +24,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <lber.h>
 
 #define SYNC_UUID_LENGTH		16
diff --git a/src/modules/proto_ldap_sync/sync_touch.c b/src/modules/proto_ldap_sync/sync_touch.c
index c3237d0e6e3..aeb1db2f88f 100644
--- a/src/modules/proto_ldap_sync/sync_touch.c
+++ b/src/modules/proto_ldap_sync/sync_touch.c
@@ -23,7 +23,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 typedef struct {
diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index 2d6bb5c1251..51e05020d9f 100644
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_radius.h"
 
diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 4ba7984a746..d0dce405c7f 100644
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index 96ecfa35ed7..e7c1d1e9465 100644
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index ff37653e2cf..405b04caac4 100644
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index 62f1d2c591e..39db9809ce2 100644
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 816da6003ba..6431fe887f4 100644
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/modules/proto_radius/proto_radius_tcp.c b/src/modules/proto_radius/proto_radius_tcp.c
index 099bc89f265..0a803aaf683 100644
--- a/src/modules/proto_radius/proto_radius_tcp.c
+++ b/src/modules/proto_radius/proto_radius_tcp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index 7c8cafc284e..da6d76cf89e 100644
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c
index 53ede435e3e..f4a2d98c7f8 100644
--- a/src/modules/proto_tacacs/proto_tacacs.c
+++ b/src/modules/proto_tacacs/proto_tacacs.c
@@ -22,7 +22,7 @@
  */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/state.h>
diff --git a/src/modules/proto_tls_cache/proto_tls_cache.c b/src/modules/proto_tls_cache/proto_tls_cache.c
index 3dce1609c00..3a4eb80daeb 100644
--- a/src/modules/proto_tls_cache/proto_tls_cache.c
+++ b/src/modules/proto_tls_cache/proto_tls_cache.c
@@ -22,10 +22,10 @@
  * @copyright 2018 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/dl.h>
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 /** Compile various unlang sections
  *
diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index e1e3c1aec8e..27dde1fbd2c 100644
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_vmps.h"
 
diff --git a/src/modules/proto_vmps/proto_vmps_all.c b/src/modules/proto_vmps/proto_vmps_all.c
index bda03551c8d..0b47eba7763 100644
--- a/src/modules/proto_vmps/proto_vmps_all.c
+++ b/src/modules/proto_vmps/proto_vmps_all.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/vqp/vqp.h>
diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
index 028a0f6ad12..492e902c040 100644
--- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c
+++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/vqp/vqp.h>
diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index c6e6c959640..60c7401cf2c 100644
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index e609db7c82e..dbb579fb75a 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -27,7 +27,7 @@
 #include <freeradius-devel/server/rad_assert.h>
 
 #include "../../rlm_cache.h"
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 static CONF_PARSER driver_config[] = {
 	REDIS_COMMON_CONFIG,
diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index 115b13998f8..60ba4bb5543 100644
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
diff --git a/src/modules/rlm_couchbase/couchbase.c b/src/modules/rlm_couchbase/couchbase.c
index 5e83d00c9f3..9a1f0c1fe20 100644
--- a/src/modules/rlm_couchbase/couchbase.c
+++ b/src/modules/rlm_couchbase/couchbase.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "couchbase.h"
 
diff --git a/src/modules/rlm_couchbase/couchbase.h b/src/modules/rlm_couchbase/couchbase.h
index f536c944218..b4d4cb8d19c 100644
--- a/src/modules/rlm_couchbase/couchbase.h
+++ b/src/modules/rlm_couchbase/couchbase.h
@@ -27,7 +27,7 @@
 RCSIDH(couchbase_h, "$Id$")
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 /** Information relating to the parsing of Couchbase document payloads
  *
diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index 2d006db302a..eb100be983e 100644
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "mod.h"
 #include "couchbase.h"
diff --git a/src/modules/rlm_couchbase/mod.h b/src/modules/rlm_couchbase/mod.h
index 711ea94b3d8..0e30893c2c4 100644
--- a/src/modules/rlm_couchbase/mod.h
+++ b/src/modules/rlm_couchbase/mod.h
@@ -29,7 +29,7 @@ RCSIDH(mod_h, "$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/pool.h>
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 /* maximum size of a stored value */
 #define MAX_VALUE_SIZE 20480
diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index bbcfb6d0578..221db98e1de 100644
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -34,7 +34,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "mod.h"
 #include "couchbase.h"
diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index fea7f78eaeb..c2cbf288926 100644
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/map_proc.h>
 
diff --git a/src/modules/rlm_eap/lib/base/eap_tls.h b/src/modules/rlm_eap/lib/base/eap_tls.h
index fa78f63ef81..5113e2896a0 100644
--- a/src/modules/rlm_eap/lib/base/eap_tls.h
+++ b/src/modules/rlm_eap/lib/base/eap_tls.h
@@ -46,7 +46,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #endif
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include "eap.h"
 
diff --git a/src/modules/rlm_eap/lib/sim/base.c b/src/modules/rlm_eap/lib/sim/base.c
index 73843f00f4c..87a6743b888 100644
--- a/src/modules/rlm_eap/lib/sim/base.c
+++ b/src/modules/rlm_eap/lib/sim/base.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include "eap_types.h"
 #include "eap_sim_common.h"
diff --git a/src/modules/rlm_eap/lib/sim/crypto.c b/src/modules/rlm_eap/lib/sim/crypto.c
index 449ef6b965a..d2752f5bdc8 100644
--- a/src/modules/rlm_eap/lib/sim/crypto.c
+++ b/src/modules/rlm_eap/lib/sim/crypto.c
@@ -41,7 +41,7 @@ RCSID("$Id$")
 #include "milenage.h"
 
 #include <freeradius-devel/util/sha1.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <openssl/evp.h>
 
 
diff --git a/src/modules/rlm_eap/lib/sim/decode.c b/src/modules/rlm_eap/lib/sim/decode.c
index 16e19119588..1aee6acb739 100644
--- a/src/modules/rlm_eap/lib/sim/decode.c
+++ b/src/modules/rlm_eap/lib/sim/decode.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/io/test_point.h>
 
 #include "eap_types.h"
diff --git a/src/modules/rlm_eap/lib/sim/encode.c b/src/modules/rlm_eap/lib/sim/encode.c
index 1a019406981..7be12c927c4 100644
--- a/src/modules/rlm_eap/lib/sim/encode.c
+++ b/src/modules/rlm_eap/lib/sim/encode.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/io/test_point.h>
 
 #include "eap_types.h"
diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 4a117ac0257..1f607696729 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap.h"
 
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index cf0280d705b..3ff0a9d9b86 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -25,7 +25,7 @@ RCSID("$Id$")
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap_mschapv2.h"
 
 #include <freeradius-devel/server/rad_assert.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
index 37be584de80..fabdc9009d0 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
@@ -24,7 +24,7 @@
 RCSIDH(eap_peap_h, "$Id$")
 
 #include "eap_tls.h"
-#include <freeradius-devel/soh/soh.h>
+#include <freeradius-devel/soh/base.h>
 
 typedef enum {
 	PEAP_STATUS_INVALID,
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 8a946dddf61..884ba665a1b 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap_peap.h"
 
 static int setup_fake_request(REQUEST *request, REQUEST *fake, peap_tunnel_t *t);
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
index b06ae371f73..aefb2e62dfc 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
@@ -35,7 +35,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/modules.h>
 
 #include "eap_pwd.h"
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 8757c4a7f92..421195da70c 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -36,7 +36,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #define LOG_PREFIX "rlm_eap_pwd - "
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/modules.h>
 
 #include "eap_pwd.h"
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 5506a17323b..b431696ec47 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -41,7 +41,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #  include <sys/stat.h>
 #endif
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 static CONF_PARSER submodule_config[] = {
 	{ FR_CONF_OFFSET("tls", FR_TYPE_STRING, rlm_eap_tls_t, tls_conf_name) },
diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index a2c95b6d282..d996252f853 100644
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include <ctype.h>
 
diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index dd955f4ee8c..11c155e1b2c 100644
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -15,7 +15,7 @@
  */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 typedef struct ldap_inst_s rlm_ldap_t;
 
diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index adb96f2ed33..b26713e8a5d 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -35,7 +35,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/sha1.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #ifdef HAVE_OPENSSL_EVP_H
 #  include <openssl/evp.h>
diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 5ae9252afe9..74710131908 100644
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 022da8fa3ca..2a52303b083 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 #include "rlm_radius.h"
 #include "track.h"
diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 7b1cc93d321..e4c6ed28e52 100644
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 
 #define MAX_QUERY_LEN	4096			//!< Maximum command length.
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 9ed4d7dfeb3..38c45f8a966 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -46,7 +46,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 #include "redis_ippool.h"
 
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
index f22943e4d17..b455834cfb5 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include "redis.h"
+#include "base.h"
 #include "cluster.h"
 #include "redis_ippool.h"
 
diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index c134bd4a8f2..9795477b8b5 100644
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 
 typedef struct rlm_rediswho {
diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c
index b470f3b8ac6..d14fcf03594 100644
--- a/src/modules/rlm_rest/io.c
+++ b/src/modules/rlm_rest/io.c
@@ -24,7 +24,7 @@
 #include "rest.h"
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 /*
  *  CURL headers do:
diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index 80baba6148f..bbd902fc9ca 100644
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -33,7 +33,7 @@ RCSIDH(other_h, "$Id$")
 /*
  *	The common JSON library (also tells us if we have json-c)
  */
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #define REST_URI_MAX_LEN		2048
 #define REST_BODY_MAX_LEN		8192
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index fc2a5611e4f..33c98edb8ed 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -25,7 +25,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/token.h>
 #include <freeradius-devel/server/rad_assert.h>
 
diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index 0e76551ab89..3b02e4013f5 100644
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -30,7 +30,7 @@
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/eap.aka.h>
 #include <freeradius-devel/eap.sim.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/modules.h>
 #include "sigtran.h"
 
diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 27340ef4601..0feee6dbf68 100644
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
-#include <freeradius-devel/soh/soh.h>
+#include <freeradius-devel/soh/base.h>
 
 typedef struct rlm_soh_t {
 	char const *xlat_name;
diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 7141e44fc20..1026e1fc6cd 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -28,7 +28,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 /*
  *	FIXME: Add check for this header to configure.ac
  */