diff --git a/build_tools/strip_nonapi b/build_tools/strip_nonapi
index c2262cafac..5a52eef1e8 100755
--- a/build_tools/strip_nonapi
+++ b/build_tools/strip_nonapi
@@ -18,7 +18,7 @@
 FILTER="${GREP} -v -e ^ast_ -e ^_ast_ -e ^__ast_ -e ^astman_ -e ^pbx_"
 
 case "${OSARCH}" in
-    linux-gnu)
+    linux-gnu|FreeBSD)
 	nm ${1} | ${GREP} -e " T " | cut -d" " -f3 | ${FILTER} > striplist
 	sed -e "s/^/-N /" striplist | xargs ${STRIP} ${1}
 	rm -f striplist
diff --git a/include/asterisk.h b/include/asterisk.h
index da70e8a8c4..5605d2f3ba 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -50,40 +50,6 @@
 #define	sched_setscheduler	__PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__
 
 int ast_set_priority(int);			/*!< Provided by asterisk.c */
-int load_modules(unsigned int);			/*!< Provided by loader.c */
-int load_pbx(void);				/*!< Provided by pbx.c */
-int init_logger(void);				/*!< Provided by logger.c */
-void close_logger(void);			/*!< Provided by logger.c */
-int reload_logger(int);				/*!< Provided by logger.c */
-int init_framer(void);				/*!< Provided by frame.c */
-int ast_term_init(void);			/*!< Provided by term.c */
-int astdb_init(void);				/*!< Provided by db.c */
-void ast_channels_init(void);			/*!< Provided by channel.c */
-void ast_builtins_init(void);			/*!< Provided by cli.c */
-int dnsmgr_init(void);				/*!< Provided by dnsmgr.c */ 
-void dnsmgr_start_refresh(void);		/*!< Provided by dnsmgr.c */
-int dnsmgr_reload(void);			/*!< Provided by dnsmgr.c */
-void threadstorage_init(void);			/*!< Provided by threadstorage.c */
-void ast_event_init(void);          /*!< Provided by event.c */
-int ast_device_state_engine_init(void); /*!< Provided by devicestate.c */
-int astobj2_init(void);				/*! Provided by astobj2.c */
-
-/*!
- * \brief Reload asterisk modules.
- * \param name the name of the module to reload
- *
- * This function reloads the specified module, or if no modules are specified,
- * it will reload all loaded modules.
- *
- * \note Modules are reloaded using their reload() functions, not unloading
- * them and loading them again.
- * 
- * \return 0 if the specified module was not found.
- * \retval 1 if the module was found but cannot be reloaded.
- * \retval -1 if a reload operation is already in progress.
- * \retval 2 if the specfied module was found and reloaded.
- */
-int ast_module_reload(const char *name);
 
 /*!
  * \brief Register a function to be executed before Asterisk exits.
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h
new file mode 100644
index 0000000000..ad4ca72140
--- /dev/null
+++ b/include/asterisk/_private.h
@@ -0,0 +1,44 @@
+/*
+ * Prototypes for public functions only of internal interest,
+ * normally not used by modules.
+ * What goes here are typically *_init() routines.
+ */
+
+#ifndef _ASTERISK__PRIVATE_H
+#define _ASTERISK__PRIVATE_H
+
+int load_modules(unsigned int);		/*!< Provided by loader.c */
+int load_pbx(void);			/*!< Provided by pbx.c */
+int init_logger(void);			/*!< Provided by logger.c */
+void close_logger(void);		/*!< Provided by logger.c */
+int init_framer(void);			/*!< Provided by frame.c */
+int ast_term_init(void);		/*!< Provided by term.c */
+int astdb_init(void);			/*!< Provided by db.c */
+void ast_channels_init(void);		/*!< Provided by channel.c */
+void ast_builtins_init(void);		/*!< Provided by cli.c */
+int dnsmgr_init(void);			/*!< Provided by dnsmgr.c */ 
+void dnsmgr_start_refresh(void);	/*!< Provided by dnsmgr.c */
+int dnsmgr_reload(void);		/*!< Provided by dnsmgr.c */
+void threadstorage_init(void);		/*!< Provided by threadstorage.c */
+void ast_event_init(void);		/*!< Provided by event.c */
+int ast_device_state_engine_init(void);	/*!< Provided by devicestate.c */
+int astobj2_init(void);			/*! Provided by astobj2.c */
+
+/*!
+ * \brief Reload asterisk modules.
+ * \param name the name of the module to reload
+ *
+ * This function reloads the specified module, or if no modules are specified,
+ * it will reload all loaded modules.
+ *
+ * \note Modules are reloaded using their reload() functions, not unloading
+ * them and loading them again.
+ * 
+ * \return 0 if the specified module was not found.
+ * \retval 1 if the module was found but cannot be reloaded.
+ * \retval -1 if a reload operation is already in progress.
+ * \retval 2 if the specfied module was found and reloaded.
+ */
+int ast_module_reload(const char *name);
+
+#endif /* _ASTERISK__PRIVATE_H */
diff --git a/main/asterisk.c b/main/asterisk.c
index dc01337581..69e75abdfc 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -61,6 +61,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
+
 #undef sched_setscheduler
 #undef setpriority
 #include <sys/time.h>
diff --git a/main/astobj2.c b/main/astobj2.c
index 8404f036d0..e7a091c80b 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -21,6 +21,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
diff --git a/main/channel.c b/main/channel.c
index 94814e4500..1fcc096bbc 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -27,6 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
+
 #include <sys/time.h>
 #include <signal.h>
 #include <math.h>
diff --git a/main/cli.c b/main/cli.c
index aae8dfc046..b4c4b5fd26 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
diff --git a/main/db.c b/main/db.c
index ea22f5674a..aea825d1a0 100644
--- a/main/db.c
+++ b/main/db.c
@@ -31,6 +31,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <sys/time.h>
 #include <signal.h>
 #include <dirent.h>
diff --git a/main/devicestate.c b/main/devicestate.c
index 91ef8ee5d0..7f00425fea 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -112,6 +112,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index d5ab8e0cec..c6e3adffc5 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <regex.h>
 #include <signal.h>
 
diff --git a/main/event.c b/main/event.c
index f9d9b657c1..be0d3f2865 100644
--- a/main/event.c
+++ b/main/event.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include "asterisk/event.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/lock.h"
diff --git a/main/frame.c b/main/frame.c
index 85fa6a96a4..13d81d4b4a 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
 #include "asterisk/options.h"
diff --git a/main/loader.c b/main/loader.c
index 5e51c84018..3ffa68758b 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -31,6 +31,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <dirent.h>
 
 #include "asterisk/linkedlists.h"
diff --git a/main/logger.c b/main/logger.c
index 4150197617..c94cf4b442 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,14 +25,17 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
-/* Prevent inclusion of logger.h - it redefines LOG_* which we need
- * to define syslog_level_map. Later, we force its inclusion again.
+/*
+ * define _ASTERISK_LOGGER_H to prevent the inclusion of logger.h;
+ * it redefines LOG_* which we need to define syslog_level_map.
+ * Later, we force the inclusion of logger.h again.
  */
 #define _ASTERISK_LOGGER_H
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <signal.h>
 #include <time.h>
 #include <sys/stat.h>
@@ -511,7 +514,7 @@ static int rotate_file(const char *filename)
 	return res;
 }
 
-int reload_logger(int rotate)
+static int reload_logger(int rotate)
 {
 	char old[PATH_MAX] = "";
 	int event_rotate = rotate, queue_rotate = rotate;
diff --git a/main/manager.c b/main/manager.c
index f7f818c79c..14a9d9881f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -45,6 +45,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <ctype.h>
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/pbx.c b/main/pbx.c
index cd8a23ca88..d1a0570c7c 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <ctype.h>
 #include <time.h>
 #include <sys/time.h>
diff --git a/main/term.c b/main/term.c
index d79c83c106..825a710da3 100644
--- a/main/term.c
+++ b/main/term.c
@@ -27,6 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include "asterisk/_private.h"
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 5a6f4b3e86..35d3eca55a 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -24,8 +24,15 @@
  */
 
 #include "asterisk.h"
+#include "asterisk/_private.h"
 
-#if defined(DEBUG_THREADLOCALS)
+#if !defined(DEBUG_THREADLOCALS)
+
+void threadstorage_init(void)
+{
+}
+
+#else /* !defined(DEBUG_THREADLOCALS) */
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
@@ -226,11 +233,5 @@ void threadstorage_init(void)
 	ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0]));
 }
 
-#else /* !defined(DEBUG_THREADLOCALS) */
-
-void threadstorage_init(void)
-{
-}
-
 #endif /* !defined(DEBUG_THREADLOCALS) */