diff --git a/include/asterisk/options.h b/include/asterisk/options.h
index 0e8fb97fa6..70d488aec3 100644
--- a/include/asterisk/options.h
+++ b/include/asterisk/options.h
@@ -202,8 +202,6 @@ extern struct timeval ast_lastreloadtime;
 extern pid_t ast_mainpid;
 
 extern char record_cache_dir[AST_CACHE_DIR_LEN];
-extern char dahdi_chan_name[AST_CHANNEL_NAME];
-extern int dahdi_chan_name_len;
 
 extern int ast_language_is_prefix;
 
diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in
index f997587c9f..b434d38afd 100644
--- a/main/asterisk.exports.in
+++ b/main/asterisk.exports.in
@@ -13,9 +13,6 @@
 		LINKER_SYMBOL_PREFIX__ao2_*;
 		LINKER_SYMBOL_PREFIXoption_debug;
 		LINKER_SYMBOL_PREFIXoption_verbose;
-		LINKER_SYMBOL_PREFIXdahdi_chan_name;
-		LINKER_SYMBOL_PREFIXdahdi_chan_name_len;
-		LINKER_SYMBOL_PREFIXdahdi_chan_mode;
 		LINKER_SYMBOL_PREFIXcallerid_*;
 		LINKER_SYMBOL_PREFIXcid_di;
 		LINKER_SYMBOL_PREFIXcid_dr;
@@ -30,8 +27,6 @@
 		LINKER_SYMBOL_PREFIXterm_*;
 		LINKER_SYMBOL_PREFIXchannelreloadreason2txt;
 		LINKER_SYMBOL_PREFIXdevstate2str;
-		LINKER_SYMBOL_PREFIX__manager_event;
-		LINKER_SYMBOL_PREFIXdialed_interface_info;
 		LINKER_SYMBOL_PREFIXstrsep;
 		LINKER_SYMBOL_PREFIXsetenv;
 		LINKER_SYMBOL_PREFIXstasis_*;
@@ -49,6 +44,7 @@
 		LINKER_SYMBOL_PREFIXres_srtp;
 		LINKER_SYMBOL_PREFIXres_srtp_policy;
 		LINKER_SYMBOL_PREFIXsecure_call_info;
+		/* __progname and environ are needed by FreeBSD for bundled pjproject. */
 		LINKER_SYMBOL_PREFIX__progname;
 		LINKER_SYMBOL_PREFIXenviron;
 		/*
diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c
index 1f10a0166b..522ed54c34 100644
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -40,7 +40,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/manager.h"
 
-/* The helper function is required by struct manager_custom_hook. See __manager_event for details */
+/* The helper function is required by struct manager_custom_hook.
+ * See __ast_manager_event_multichan for details */
 static int amihook_helper(int category, const char *event, char *content)
 {
 	ast_log(LOG_NOTICE, "AMI Event: \nCategory: %d Event: %s\n%s\n", category, event, content);