diff --git a/CHANGES b/CHANGES
index c9126e16b903704a9ceae75109693d7edd299876..d64f2d5ab74dd5624733acbc6bd3963b06ac02e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,11 @@ Build System
    Asterisk built with LOW_MEMORY can now successfully load binary modules
    built without LOW_MEMORY and vice versa.
 
+Core
+------------------
+ * ASTERISK_REGISTER_FILE was no longer useful and has been removed.  Sources
+   which use mtx_prof must now manually declare and initialize the variable.
+
 chan_sip
 ------------------
  * If an offer is received with optional SRTP (a media stream with RTP/AVP but
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 896bad603ba9ea1f73f9bc9c6b694969f28d0d11..0878950e112660c90716a208b86419e497742a18 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -42,8 +42,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
 
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 64d53b70ddfc721c41d4809462c48eb8062c45fb..dc2efd4db30a17c19b5634fce770199c6e046ae2 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -42,8 +42,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pthread.h>
 #include <signal.h>
 
diff --git a/addons/format_mp3.c b/addons/format_mp3.c
index 07715b548a1c182c38fbd68b3ce26d68f71b8ab1..e0f57b86b4f96a25aad6d393804525b3c0567e82 100644
--- a/addons/format_mp3.c
+++ b/addons/format_mp3.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "mp3/mpg123.h"
 #include "mp3/mpglib.h"
 
diff --git a/addons/ooh323c/src/ooSocket.c b/addons/ooh323c/src/ooSocket.c
index e9087d1fecca9be9969787d93c02037059c5f87c..5f8f0f37b5a57e630bfd7262838aef48481ab1d0 100644
--- a/addons/ooh323c/src/ooSocket.c
+++ b/addons/ooh323c/src/ooSocket.c
@@ -15,8 +15,6 @@
  *****************************************************************************/
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/io.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index e6b0e53c06bceb559dc388f22549f34dd7d80c58..bf38a4e69b6ef9c79cdd1cd2e270cccc969f434d 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include <mysql/mysql.h>
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 3f3d11c257f7f69ed031271b2509d36446bce10d..9d73702f6a0444442f14fd157c2e11f5a990cf0f 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <netinet/in.h>
 #include <ctype.h>
 
diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c
index 68bcfdead8c5debcd87079e639a1e9ee908b4696..4563b58a09afb6578ca3fad517cf2c1a571cc88b 100644
--- a/apps/app_agent_pool.c
+++ b/apps/app_agent_pool.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index ace4df1dc5f94fba346fa71de9bd57d5b0c42359..2169617acb3605f37cd36af76df2a30eb95d1ee5 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 #include <sys/wait.h>
 #include <sys/time.h>
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 83da5330d89d72958358524158836ae7a3e2ab0d..25649d4b624a0bb45ab355a5207955819c508f4a 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -43,8 +43,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index f47db45346d4b580f0678cd7cbbc44a62e830dd5..f58ed362619e1cbed672bfe912c8e75d2cfb5600 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_bridgeaddchan.c b/apps/app_bridgeaddchan.c
index fda6ca5ed8631309ebb7736705ce6efe072e6eb8..34642a6af9e6459d7cc2a0dd0bc57996bc94d5f7 100644
--- a/apps/app_bridgeaddchan.c
+++ b/apps/app_bridgeaddchan.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c
index 0e03ad7cecf700e32dfb7e253b869b5cf1194893..b17cddfb2fed9d64d218771f4cfb90ce7bccc49e 100644
--- a/apps/app_bridgewait.c
+++ b/apps/app_bridgewait.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 7862179f339ce55116d79478dfa0da5f2e039a77..17dea431db2c5c48bcabd0ddde24713144fa6432 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index b98cd674db74762c575888d93142b46e1b7cfc6a..67c7fbcbd752f5eaf41d00666039d62d834218f4 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index dbd49914cf3e9235677f5496e41e63a03fe8b5f8..af4b616f5b08ee56a638deeff9c562e8cff879c0 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/ioctl.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 80c1ff03d2b5224742b05f84a2212de57e5e4bca..4f3b79197af80b62603ea1d881b16a08312a40d1 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index df2deae3f5407bb64c31c7a65845e17898c007fe..50d8d63210ec5e4905cbe964321b282fb3eaf7e0 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index a7fd92a374622b2e4dedd9cc80207dfb1d1c85f8..d6229b93f65d600304cb5eca8d6ac9d262a2fe3a 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -43,8 +43,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 45580e4f0a13412b1dfccec3fc40e8b2549e5b09..cc557deea780fe98467900808cfedab18e43e3bf 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 51921a98ec7d10ccdacb3c32ff3d0ac557c6eb67..6eaa1bd2236b21d500e370fa52024a8fc3fa3121 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/apps/app_db.c b/apps/app_db.c
index 1376b6874b40522b3f09669b934668a6b0c163d3..e3d55054874331e680c361f14616180bf5389287 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index b5d8f50c767a0e07f7aacfb5d8479e99aae411c3..d871f7f57aec7dc07217bae90dc5b276d67387a8 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 98e1fb15471058d60b6c9534c6c90272cefdd26b..43ea81a1c975fa6289fc449c14397f350a7e86d2 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index cdcda047780e332e65be8d09c0690f923d8fbae5..5ad29722cb4db294be2dc0cda27cf6bbb08aca70 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_directory.c b/apps/app_directory.c
index c32bccb89b4da2544573e67e0624916666f88081..642b9b23a084b382439cada5dcd156488ad5d26f 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -30,8 +30,6 @@
  ***/
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 
 #include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_disa.c b/apps/app_disa.c
index ab8d3082f20356b889f84520b43010fd0a010c69..8dc61ff64c55ec9754a31dc7f7b6b537100f6a79 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 #include <sys/time.h>
 
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 8b32b93dc1293ad29f86bef09a0f15055d5915da..0789ce06eb80c1b93ecceffef15338072f319bfd 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 972e59f0aedc627d314c8bebe2128ce420203ace..0f4c94b8d1fe344613f0b1d0bdc51b775103c02d 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 1695ee5b8c2712c8b16f1ca6822747e42bef3367..79c1b75b996503d1847438afe54b73cd526d6bc7 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -31,8 +31,6 @@
  ***/
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 2bb1d8b535352a6132a72e68530698964c957397..273f96381e7a8b62ac5e661b6eeae32ad8181fef 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 6e174d4a7387de5769a5446ff92a33c18a51428e..b7c39454f970b9d41e12a6cd2fe5377d8b6c602d 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -21,8 +21,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 19c9f337676f13a5b54a9ee77cedd9cbdd2f437d..3e2e020b8340288fcf1c5086b9a217c767162a7d 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -42,8 +42,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 79ce0d0f122a03c9a6d6c17737065178270406eb..f92b68d0689e0982040d8b7918564c739cfee226 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <dahdi/user.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 938e63ec4bfd99f086036e99b53272ed19c63c4e..72afa3dd1371a09a4ed7b141852c759cf40423c7 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 4ff5cd61034834bff83ef23c69c4079b1048058d..acd8982ef4f655724f5e4af192483b4a37423eaa 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index c896f9ef0731245a8f9fcd96cc2d540d61cb7fc2..da0d3e67f252ea63a82ecd037da72ce600ca88ff 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 58201c4501a78b87599b2f7d0ccdffbd7e46fed3..4ca4b67c575fabd9495a0ab374026a3ec8af0ad3 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -33,8 +33,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/time.h>
diff --git a/apps/app_image.c b/apps/app_image.c
index 66751f54171f0b579e8ac7d27aafabb08d4f2be8..b817309c71aa9c3c18a248f4264a3ef64b8fdd6b 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/image.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 2ec28b16bffdb04a9d248cab1b3c6d0e74e8c6a6..38134e2474ba5694280c864a4f1b06953f6a60bf 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_jack.c b/apps/app_jack.c
index e5b0b9a4188071af9238b5ba16dd7a9c913d11c1..bd964340333d8515cabf11b6a639b018e5038236 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -42,8 +42,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <limits.h>
 
 #include <jack/jack.h>
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 61f3ab722ef8ca2d221c2c122a83e37f23dbcfa3..4ef525295c0c9f0177f6d884d4c24255cf1d99d6 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 791f75eb0a3b75fd2e4be0e4cd2cdb4223d0d53a..36f5c77273fa3573981400e0f3bdd1845ef6e998 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -47,8 +47,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <dahdi/user.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index a736fd47f293fdcd2044b70ba7065a3b18ef8911..3f076538cd4897bc4f7013ce80365f364ad307b3 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index c84b7d7dd637c338de1f8d12e78a9776a42ed683..a060ad1833f60d507cc3288b2836d895f31de9fd 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -146,8 +146,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 7d7a0cbf914b40f3cebc40671fcf9012042718ff..a5a00cc4efcd08f6e689a5ae0d6a8ac0d74388bd 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/stringfields.h"
 #include "asterisk/file.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 8d06ac44c7b24924178b00d0d369ba0b333dbaa2..048cf970f39d394d6c6d288191f73f338a04b5cb 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 05afe54b100600bd9eb74767ed33cdee33519568..678f76d7274edaaf8801d7845b4147916a4cecc1 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -34,8 +34,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 8175fc8104244455ba2ddc0e7330f4a3d3cbecb8..5f3bf0b92f241972b19e74ff9fe20045fdd02db4 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/apps/app_originate.c b/apps/app_originate.c
index f744b7a9ddbe2ca0751d468d761a366fa46f82d2..99984f5510ba6c9412f14f1a3c1e637dbaf9af4b 100644
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 25f9510ff957ebcf94ae405d062afad80d8b1675..d749a74ac51b11cff8e95b84041a5b26922f2b1c 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <osp/osp.h>
 #include <osp/osputils.h>
 #include <osp/ospb64.h>
diff --git a/apps/app_page.c b/apps/app_page.c
index 3543d0509d0e534bcc9f006e90be14fc31f236cb..b5221107492733d3ac1b3d64580e9588ece5d051 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 2875ec2b49b59607d85475ca3d5a98a09b22d04b..35900e8f78fdbfa79dc760f2b4c61c67f9ed8081 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_playtones.c b/apps/app_playtones.c
index 79e2a45769d6154abc73db977da0f5fd58e12faf..59fb5ad66775a88ce3332b08d09328ca9e67f81c 100644
--- a/apps/app_playtones.c
+++ b/apps/app_playtones.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 70ec6562bb254b28657154e23c0d2385d7304984..a9afe02220ed5f4096915267f3ef8be26fe73da6 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 51741d374719e79dd55b68afdeca8219dc6ee3a2..b40c1db30f8199ee8c54a731478831bb0eaa94ae 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -69,8 +69,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <netinet/in.h>
diff --git a/apps/app_read.c b/apps/app_read.c
index 1f586cb991efc822906662d0b90c50eb05ba95da..d1e14ed806dec02804308ebe89a3805f4ccdec87 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index a0a3c5583a4a49488904f08df9f07148104a71ca..c406a93cba5bf30b462a20d2727cb7e322336089 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
diff --git a/apps/app_record.c b/apps/app_record.c
index fcd89387607f69a952d761798cd9f5c21c225a5a..ede50be264500ca7ce5274e98a06fa9abc242b3f 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c
index 55867bbeb6c3087272eacd179546d7009b0b6c7b..b44c1f6fed2f465a3602266fbfc8bb58bd2293f4 100644
--- a/apps/app_saycounted.c
+++ b/apps/app_saycounted.c
@@ -114,8 +114,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index c4efaf38e44c7337a5df685bc06a1c2e33fa8a09..b60c71e51375c40f30f96a65224180792872a3cc 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index bca46302472965b9c244e9a2434b4e3fe790d7b9..5ed426eee36e4b6ddefed682e79ba0de56ab7fd2 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 3b7f0ca2f4c4e22802091e0e324606fd07228c7f..4417dec5c37269f7071f61dabe9b055bb07a44fa 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -33,8 +33,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 36d554ee62f8567b88c295e862db2db1c989edba..3a2225b6c8e8e3f2f7e1fb3f395635908fbf230b 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 0f17d9bf3cd33f31d3d1495b0ed89e6a7fbe6cec..0dbd4c58b593560f9387f970bad90e7c25d0e756 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h> /* log10 */
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index a748c3b4b19cb7579cf9aa2e7f19370998fa15a0..d053ecbe6a95c71a3f1b5274c94ba88ac897573f 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <dirent.h>
 #include <ctype.h>
 #include <sys/stat.h>
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 9660b4fd6865ad6a3bdba06bda9aebc8f342b3c6..f74f7f9bd2687cbb8975f542f3c31c1da738d94a 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 7c34dca527e0f6040db241ca71bb006f8ff67035..3a6a191e34a1bb95c0c3dbf741bf6c265c18efe3 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index be8abbf585063a31287604b1557d32b89000b8ce..008627cc345c34d8156e8564030ebe78754455b0 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
  
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index ffe4727794a74d4e5a97a3f382b8ed2e37ffc486..81c58e8b0cbc5a147d160b94568727fb07f9b7f5 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_statsd.c b/apps/app_statsd.c
index e87aac6438984b3153f2eb16128b135564972fd2..5f8653981077e3e35d4cf700b3a8f5c749d62eec 100644
--- a/apps/app_statsd.c
+++ b/apps/app_statsd.c
@@ -24,8 +24,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/module.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index 7fcffb196a18ee18d5627cb37847a4acdc351d95..09179f7f7076352972ca44be73912cfccee63e2d 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 6b5a649226205cc70e8c86c5190661ff7a3ba9d4..fbe2ea70f497cd8aedc0cfe2babd4fbde7f1a150 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index 94f746bec2ef6e80e628c5d2c67aa3dde09efc48..2f0d77741fdd04b024d4c4cfa80bb48138e4dc27 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index d4cb6b6e19c4e0fb755be8812266c344d5147829..7bc67e1541ac3b3416a207e2ca1d6278b70107a3 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index 863fa09eb139ba29abffea041ef156aad8ccfe3a..185712dece9c61a674069d86bfa6a7bf8c3f19d7 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 826b4dcb965695f3a6de7a7528a55239569ef4bd..d04e0713b007830755e84e80a277ceee4c1b7bb8 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/manager.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index c285b2248ba9a7b9d7bbc8f3b80109c26aa87904..5b78e189b143dcf16a93827edf79fd022bd40c95 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 300dc186d7dd7f7387393124b1d0c63dfe4206db..03273c69bc7a15888152fbb65bfe22244e6c31d8 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -101,8 +101,6 @@
 #endif
 #endif
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index c4e14ad60dd6729d1589e456283498d62bdaa269..d59f527c68d9cbd12448cfab7cf81d151be01d88 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index b63b0c8acbf0b3af89b832fc9e0bb31a38f16ec3..5eaeace349edb6bf1c4a1f284a53db6c07ad8bd0 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -44,8 +44,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_waituntil.c b/apps/app_waituntil.c
index c55b821b901dc6ae414daffc2295d5cf579aebea..d3313615e691570d72e91771e7c7b5b57d4e9656 100644
--- a/apps/app_waituntil.c
+++ b/apps/app_waituntil.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index cc048dfb3a1c9876f3948d2a6a0187280fab45da..6bac60ab5d9eeffab0c9635b76c12aae40c262c3 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 27bcf6331d226ad2bf3cd96da5f677c9000ee893..e876a70a8d778c4155b4a333d404a4cc98dcd7fc 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c
index 4060b99c4f1865c2db085285c6b585480b65f9fe..23a633668d0d69d5f6a1c3dab4754367423f6e8d 100644
--- a/apps/confbridge/conf_chan_announce.c
+++ b/apps/confbridge/conf_chan_announce.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
 #include "asterisk/core_unreal.h"
diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c
index dd438c159c32c293c6fb8d3f4bc49876b976f037..5d3a7dbbe7c1cf4569d1c7beb6da02b30e87e301 100644
--- a/apps/confbridge/conf_chan_record.c
+++ b/apps/confbridge/conf_chan_record.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
 #include "asterisk/format_cache.h"
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 6f8510552bd7c5d60b3f4e827d09a81fd8245916..1749b585e7c4352369d7f2064467a32a8a435ba5 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -29,7 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
 #include "asterisk/logger.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/apps/confbridge/confbridge_manager.c b/apps/confbridge/confbridge_manager.c
index 133aceb9f3d074089268d008bd26d8189548d8e3..a99362b33a30b1d8fdbb7ce3442bd576331c76f8 100644
--- a/apps/confbridge/confbridge_manager.c
+++ b/apps/confbridge/confbridge_manager.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
 #include "asterisk/stasis.h"
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index f1d00c5a801c915269307b35b997c5ff75be3ad6..3821feef9da2ce57b302474b408117a778992a21 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bridges/bridge_builtin_interval_features.c b/bridges/bridge_builtin_interval_features.c
index 0c8cf24fb3364612d21043d2a3ab83099a1a6ff4..a8edc21dc6b66dec775aa8ddb96c8af85d608094 100644
--- a/bridges/bridge_builtin_interval_features.c
+++ b/bridges/bridge_builtin_interval_features.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bridges/bridge_holding.c b/bridges/bridge_holding.c
index 7bf7a392288bb6ea23b2d72a15a1ac1bfa729da0..5f354c0d588c17aef309109a8446fca72b87c8cf 100644
--- a/bridges/bridge_holding.c
+++ b/bridges/bridge_holding.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c
index 6c7c1cd5c593c9480f671be2d531be5efa8d3a6c..05ef4ea35db2390a45f290b1353d85ed951c7bc7 100644
--- a/bridges/bridge_native_rtp.c
+++ b/bridges/bridge_native_rtp.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bridges/bridge_simple.c b/bridges/bridge_simple.c
index fc12bd16af977986f598e01e826016a57d07898b..35544f84fac1e7535e773d8fb8beaf187a737e88 100644
--- a/bridges/bridge_simple.c
+++ b/bridges/bridge_simple.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 0991e2897002e2f0aea4ff2f8f677be848366804..31b72265fee6eb1b7b94bca4fae67098e846dd53 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index f0bcc096253170b9004bfdbe3e3564d291ba14f8..b7417ac259aab0b9192dd74f443509e13748d52f 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <time.h>
 
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 2877a6b5462b437a5c8b57a25bdeeb57ec9f2902..5666a3d4eea68ffa4a20bc44d91687f5a4a6ae17 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index bb63ea0c646b5569805603d50194ed35dc0826a0..7d8b9d82ec95e7fd55962a349044c96e648a8a72 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index ef9d63e4798d5e9a9756a2c3dcbafe4c368ff6bc..3f0cc6b6dda065f2b0afb06ec19c3ee86081a2c2 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -166,8 +166,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 5fddb7b23fd5a62df7a8e206c12743d3df304342..b44bbf52ae4943ced4626216f0cfbe5106ca9104 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -44,8 +44,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index ea38cc9837c7c9975fe685f1c0f662c2929214eb..cbd9e0558b278f9d5120630523c3a0ddfc4282fa 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -49,8 +49,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libpq-fe.h>
 
 #include "asterisk/config.h"
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index ddde5b890f61017414bf3d8946d6c073a699b3fa..af434f61852532ecf2d0803be1362a6dcfe95428 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
 #else
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 5a3b9e1448d927219cc177696a0b07bd02dcb53a..b91296073b3501a28a84bb411d916a4d06e67a09 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -43,8 +43,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sqlite.h>
 
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index b7f99783217ba313589780d3775c7b8e4beb4b5a..e8d763edd5285ff2046e25160d1d02d6d9c1fdb9 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sqlite3.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 39f115920dc4a485b8b52330944c4c4f454d57b6..bbe265229542c37262bdfe25472e896fcce89781 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -43,8 +43,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/cdr.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 6dabeff83a0ad5ac2fb4b041d268b67936f1507d..f3d0628ec62e74f4cd9b91f59917acd1b7dee18c 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,8 +64,6 @@ CREATE TABLE [dbo].[cdr] (
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index f75efdd4be46303af9362ef17f6642b6401dc047..d1655413f3a4373a14d2e68026c88599ad28c1c0 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"
 #include "asterisk/channel.h"
 #include "asterisk/cel.h"
diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index bdf505b66df83f245c824e06bd1dceaab4304d33..365bb70c2849bae3155fb0c3d968147745c6defc 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -195,8 +195,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/cel.h"
 #include "asterisk/module.h"
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index a10aadae95754880cbc98050b12aaac65daec01c..2ab511418d0d5b3627ccf372fdf76830b8a5ed4a 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <time.h>
 
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index e4e280e41c7a9375c442acc836dcbcfa21277a26..8d9d5dfce71d15d0b67dba13ab91204107c804e2 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -44,8 +44,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libpq-fe.h>
 
 #include "asterisk/config.h"
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index f6ab8926771bfcebea68a0d4c404755bb5c0aae9..e31cb5edc7cfc42a40107b4941754fa511eb6789 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
 #else
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 07407829ca8e540fc245ae1d13e8021332a3deff..6075b8a2b5ca634453050237c241322c4988da16 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sqlite3.h>
 
 #include "asterisk/paths.h"
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index 30aa1fb0d85901eccce79aa9f6100fd09d91e1b1..0859fab7ac14996321fffa698aae380536d36720 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,8 +61,6 @@ CREATE TABLE [dbo].[cel] (
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <math.h>
 
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 0e2b2577fbe53980cd5cae9f05e3e104c1156c82..d09dc1c534725358f1be1c2410b424c2de7734bf 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
diff --git a/channels/chan_bridge_media.c b/channels/chan_bridge_media.c
index 8e177ae0c4f50ff9a13f703128860449969ef3cd..118e08ee9a346053a303fb2bbcfef737de8ee409 100644
--- a/channels/chan_bridge_media.c
+++ b/channels/chan_bridge_media.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
 #include "asterisk/core_unreal.h"
diff --git a/channels/chan_console.c b/channels/chan_console.c
index bd849ad5329ade3a0209574a468a993202f9310b..a24a6c8aff3c43e238b2669167f8b836582d7cc5 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -62,8 +62,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>  /* SIGURG */
 
 #include <portaudio.h>
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 8cccf843b423ade742fce1eb1f0796419f0d02b0..78ebaa32d5c718785b8113755243f49da252639d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -54,8 +54,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
 #endif
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 04cdad1e407afc4353c0771f3f1a9f6d2b7e589d..e2f575d048da2924fa69df9f5bee2c8f742e8da1 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -58,8 +58,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/mman.h>
 #include <dirent.h>
 #include <sys/socket.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 6df5d3fd0fc7790a12f19e11e9b8ac34b62728ab..af79e218e9c5bd8ef069586f5538775945c70183 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 67f009d5024b64d1f9305a5671d2f2376adec577..dc18d719697993e8a83b0b2c55e27a9984af6345 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -81,8 +81,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pthread.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 0c710923f680f25a8a2cc85b8b62249be64ed482..5828a11559f31392fe616cb6094f0354bba5a381 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -44,8 +44,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <netdb.h>
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index d50defeaf91b4c0a403d30cccc83d4b9242c2b09..61e5398c30eff93ca9c28258ccfddedc3350b0b5 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 94de58da001a804f0e1b24eb4aec69ad3290e188..0d1e24ab7119d8c858c775df23dc16a50c693ba8 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>		/* isalnum() used here */
 #include <math.h>
 #include <sys/ioctl.h>		
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index b7f694f815b6a8dda99020462dbd5db8db2463d4..aa10a56202d3656fdb95a9e8ef4a48101332a1cc 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index b0dba1b472d3c3f777dbecc46f1ebac4325a9ee7..d4a7d618dd94b0ecf350f1309b386514d2e2c12f 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -38,8 +38,6 @@
 #include <pjsip_ua.h>
 #include <pjlib.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_rtp.c b/channels/chan_rtp.c
index f1f4f05b93fced16bd7cbef1d95a711fa7d4c48e..1c824fecc2b782dc92d7b578334af24d2dd9c12f 100644
--- a/channels/chan_rtp.c
+++ b/channels/chan_rtp.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 40ef6409a91a7ce7c34cd5da04482e83ed973ff7..e3a638a9f6647c82a1f61539ded17afd54642447 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -221,8 +221,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 #include <regex.h>
 #include <inttypes.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index fb6e619a1e5c4d7742deab3029e2b3aeec4d0950..0ef01663574633ac96bc6d78e223253acd5b36cf 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 5b64f963bf37eb1f00cd0df7cf4577dbc9970477..4ad17dc66b7c08a5f6b753a89f11e4d0cbfe9da7 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 #include <signal.h>
 
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 1f4b861c1537894a1f9ceff943947d324a25f821..595ac8fee2cd00bd799d9697c62d5c10ec32b090 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -59,8 +59,6 @@ extern "C" {
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
diff --git a/channels/console_board.c b/channels/console_board.c
index 7755c449f6569be9100229d7b86153f3b90f2cef..e5ff1fcbda5bffbed2bb312c539d095cb1ca7be3 100644
--- a/channels/console_board.c
+++ b/channels/console_board.c
@@ -42,7 +42,6 @@
  ***/
 
 #include "asterisk.h"	/* ast_strdupa */
-ASTERISK_REGISTER_FILE()
 #include "asterisk/utils.h"	/* ast_strdupa */
 #include "console_video.h"	/* ast_strdupa */
 
diff --git a/channels/console_video.c b/channels/console_video.c
index da651baacb61501d568dd0896fb07433a08f8ffe..de81a8a904181f3828785ff80a6ddc2b4d00ab77 100644
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -41,7 +41,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 #include <sys/ioctl.h>
 #include "asterisk/cli.h"
 #include "asterisk/file.h"
diff --git a/channels/dahdi/bridge_native_dahdi.c b/channels/dahdi/bridge_native_dahdi.c
index 234228bd5973069a63478deeafb61db5a7a837b5..3302188cb836d16a9e5a5dcc2ca21ae65ccbbd09 100644
--- a/channels/dahdi/bridge_native_dahdi.c
+++ b/channels/dahdi/bridge_native_dahdi.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "../sig_analog.h"
 #if defined(HAVE_PRI)
 #include "../sig_pri.h"
diff --git a/channels/iax2/codec_pref.c b/channels/iax2/codec_pref.c
index fba06a1ed1276631d081b43f381da7e0217a874a..7811ca86b2103ef79d01c4e71668aaed76a5f2a8 100644
--- a/channels/iax2/codec_pref.c
+++ b/channels/iax2/codec_pref.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/codec.h"
diff --git a/channels/iax2/firmware.c b/channels/iax2/firmware.c
index 7e43bef43b7b44116588e5c79a73aa42fbdd422b..00a9d9ebbebd8e5ac2dbdd53c5fda84fcd0617c6 100644
--- a/channels/iax2/firmware.c
+++ b/channels/iax2/firmware.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/channels/iax2/format_compatibility.c b/channels/iax2/format_compatibility.c
index 72fabf116082ed0cab3e511ea20d8a26a82b1817..1543792a9d74d01ce9022aaa42fec725ef956ac3 100644
--- a/channels/iax2/format_compatibility.c
+++ b/channels/iax2/format_compatibility.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/codec.h"
diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c
index 7538100703c0cb0531c4b071ab7f3acaa1d8c2d5..ec9d34608d88c01d7262bb50ab9b6a7b8a86bcc1 100644
--- a/channels/iax2/parser.c
+++ b/channels/iax2/parser.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/channels/iax2/provision.c b/channels/iax2/provision.c
index fcad2fe112dfab9710d4a312349cc879d1c035eb..6bd06faf93dc4b59514154892a34caff8857005c 100644
--- a/channels/iax2/provision.c
+++ b/channels/iax2/provision.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index ef644f2cbb73842bd66e5f6255dedab361fe23cf..bfb3e32ea94d19b83b4221a011812ae94245609f 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "chan_misdn_config.h"
 
 #include "asterisk/config.h"
diff --git a/channels/pjsip/cli_commands.c b/channels/pjsip/cli_commands.c
index 8d99379ffc84011c3243a270f474c3af116b4e1f..8ea39d144a88793925a0ba8c5969e15ea2d5cc35 100644
--- a/channels/pjsip/cli_commands.c
+++ b/channels/pjsip/cli_commands.c
@@ -26,8 +26,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjlib.h>
 #include <pjsip_ua.h>
diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c
index 4d888c8faa426a82995ad6c9d50b545a07d4812e..c3fe848e4ac3e4f567defa59072bd5017aa12fb0 100644
--- a/channels/pjsip/dialplan_functions.c
+++ b/channels/pjsip/dialplan_functions.c
@@ -432,8 +432,6 @@
 #include <pjlib.h>
 #include <pjsip_ua.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
 #include "asterisk/acl.h"
diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c
index 036f7f7d23708a74c57e12c95e1a3e025d189f5e..4674901bee6bf1e204b80995b4f8fe506ea339dc 100644
--- a/channels/sip/config_parser.c
+++ b/channels/sip/config_parser.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "include/sip.h"
 #include "include/config_parser.h"
 #include "include/sip_utils.h"
diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index 53d15dddb6dfc0327d077bd4fe0941f36ec8a18b..e21bb2c240c235c1ca45ad1cba36015734629a14 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -107,8 +107,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/channel.h"
diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index 358d6e568cf8551d74731a9f2e71a0e03c409864..4d914460044969a8d970629b0988c7fddc52e361 100644
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "include/sip.h"
 #include "include/sip_utils.h"
 #include "include/reqresp_parser.h"
diff --git a/channels/sip/route.c b/channels/sip/route.c
index 53f8805e2bd83a171f0f70497a945f75f5e974a9..584b46b7043c11f57fd99434aa923d99b6c70799 100644
--- a/channels/sip/route.c
+++ b/channels/sip/route.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 
 #include "include/route.h"
diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c
index 22b767c44cd5b3d29629052b74b95c1b1d81e1c5..b51c4736c354054bfc88b348a8851c8b1d8494db 100644
--- a/channels/sip/security_events.c
+++ b/channels/sip/security_events.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "include/sip.h"
 #include "include/security_events.h"
 
diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c
index ce8bb2b7d4121cb66f5b87f554900262397268dd..25817407e992ab3624544a3d0f622c1af5574d44 100644
--- a/channels/vgrabbers.c
+++ b/channels/vgrabbers.c
@@ -49,7 +49,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 #include <sys/ioctl.h>
 #include "asterisk/file.h"
 #include "asterisk/utils.h"	/* ast_calloc */
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index a831abfcfe4aa9808e42f273f23a50a7882dca76..ea8d01488c4c5d4957f9c80cfe6b0a90e5aa7378 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/alaw.h"
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index fa5d8769cb5123a6db0ba77c7d5d429577edaa0d..3076d264e2b9984568cd2e93bbc2bfa145764c67 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 515835dd7f458933de022b3e573fca8144e20f7e..ba16936b551535d566ff62358cda536fdea61f44 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index baa73f229d5f73e64e627b6a470e099212750653..2d08d36cd57b3a181ffb50762527fe8f952ea0da 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -34,8 +34,6 @@
 #include "asterisk.h"
 #include <stdbool.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index d368c38af19ce928b1f4a38e18f59989200f01a0..9c868d3d9ba0af130dc14cb3d88b5cca018bfec7 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 8b44cbbd941d37a4ef8e212f9cf736d573303805..4bf39b7cec00b3ffd80a9789b4f50d093537acf9 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index f80c955a6b437cbdb9cd91b8f9d41f1e0e32ed56..2ae42a6c0c572ff07c22b04e87075582712ade27 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index fc713beb776eed622a152dec558eeb8bf1bc1b33..16466a9c9d4d8ee17a099922803d1a3ecdd9d754 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/codec.h"             /* for AST_MEDIA_TYPE_AUDIO */
 #include "asterisk/format.h"            /* for ast_format_get_attribute_data */
 #include "asterisk/frame.h"             /* for ast_frame, etc */
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index e6dcf8c994f4f7fefb3330b7955f9f1a8fbd611c..5f6ffff8716b3ba22ae788882747dd78a58ace36 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 1c73bf3c8edafaad1abb0da795afb0195198c523..b54f5c9219784d757788b3c407acdaf5b24dfb32 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -32,8 +32,6 @@
 #include "asterisk.h"
 #include "speex/speex_resampler.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/slin.h"
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index ca48eae6227125a8bb12f0d898ad082f1c6702a7..49990e988e8900d219e9e79516a249742e02df10 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <speex/speex.h>
 
 /* We require a post 1.1.8 version of Speex to enable preprocessing
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index ca2f411f93b7598faac3daa303cb5187907b2ede..cf4e358da97349953b87e3e09c29a0ed8e3e5b31 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/translate.h"
diff --git a/formats/format_g719.c b/formats/format_g719.c
index f6807b9ca92b0d5b8cedec29039a7ca09d21448f..8cc942717a84877c973997a31f8c63655affb5cd 100644
--- a/formats/format_g719.c
+++ b/formats/format_g719.c
@@ -29,8 +29,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 777cd746b9e213766e42ddda2de01feddb448a3d..750bacaf153853bec865ea0721449b487711a76e 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -31,8 +31,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/format_cache.h"
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 684275c2b4365da08e1b22141167a88e4d0113d8..f3b09f0351e36046b22ae2256ea02b57c5fd9624 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -34,8 +34,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 69e6a2563b45463092501c7d919d8944f9a5ce3e..6e0632c5351dc83675343e10c1a9173a8477cd89 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -32,8 +32,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index bf82dd5c636e27fb3c62c8bac4638ede05b50ebf..777d49a636ff2c5840e3aaf8183b22f16acaebb3 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -29,8 +29,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_h263.c b/formats/format_h263.c
index f02d030772bcd5d5b0fedcfd05d5c2aa364a978b..027f604f4accfe4aced46668b1bf3143a88d3139 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 633309138421f502cad0f2d04fb76de94f341458..38f2734f3c1f0f217d01d255de45c06dafc932d7 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index e07eedba0e25058608f91c9d6113af03daab130b..b556d6cc854c7c267bdf090425674fce510840d7 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index ed21f88f848d4a897dde9a32742a1555d81be467..f69c547d360ac33ba050bf1014d3b8006b71f7f2 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/image.h"
diff --git a/formats/format_ogg_speex.c b/formats/format_ogg_speex.c
index 6152e9c52ec67c9d1b09f313bbfaf35155c7a576..747adb37ff71429768268457ffd34a97d5566d15 100644
--- a/formats/format_ogg_speex.c
+++ b/formats/format_ogg_speex.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/format_cache.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 0daf64cba9f637ddaf60e3726f111d628e840f7d..4c42181fcfb99b3baec685364e28f94ff7881c61 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
 #include <vorbis/vorbisfile.h>
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 6361cd00f400d67bf3dc9afecec2ee47f8fd344a..0b1706e504ac9948c37a37157fecbf1ef19398e3 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_siren14.c b/formats/format_siren14.c
index 71de82e98ba944558d24727da4db08e3580f9f0d..1ce7d18ad299b0c2934cd79e332599e68dcdd981 100644
--- a/formats/format_siren14.c
+++ b/formats/format_siren14.c
@@ -29,8 +29,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_siren7.c b/formats/format_siren7.c
index 2fcc131a31439c865af811d0e92714436b003c8b..d2059844571c133f4e8ce88faf032d6b7c8763ae 100644
--- a/formats/format_siren7.c
+++ b/formats/format_siren7.c
@@ -29,8 +29,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 68aa74d475d07a9c970fdb64dfdd8e1b8574631a..32972d09d07f3d4d77b553c287a2531fa75d2022 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -27,8 +27,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 5107ab9183fb5f1191efe0fa522aa805b10497ba..eb8ab0eadb1bdf11693e8f32043ffd2406ede1dc 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -30,8 +30,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 688c3e7e410b6fb525e01915cdcb8507310675ac..a415140f9f3efb85ba2c9b55fe3f675869056ef4 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index d5661fbf68cd05f7396dcafb23249c0924e42bb4..21a8508059f2278990bd85b3e52d7033cd7ba79f 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -33,8 +33,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index d80636f6da6db2fb2c5fb0e4f4dfad96512cc97e..9392a1c7db7c39043111c355f4320d2bf47b344b 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 5352e172c2662433751a49be439d685c69d75158..16619d5323208730a148f75466e7a5d8f40e42cf 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"	/* function register/unregister */
 #include "asterisk/utils.h"
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index 5d3d4b9c9b80cb860bb9aa15875fb42afc3385cc..fdc899b9ab258d1540e9cb4c6e6929d387ebb8b7 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_callcompletion.c b/funcs/func_callcompletion.c
index d50774fa9dc2df5cae42bc986a24de3c729e2aca..ed5238c1f0462458e58a9b888c6414e7a1dc6a00 100644
--- a/funcs/func_callcompletion.c
+++ b/funcs/func_callcompletion.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/ccss.h"
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 133e2592240586faebc68628ed05da3d23dc7d30..527babb93338cdbbaff0617429d2ae81a15f826d 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 8dcb2bd0b2d030edd775859169561c3ea1194ea3..83942db4cd261c4a1c8d82121a878cbb960752fc 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index e816dcae00ca5e0373f82c29cdd79301cdef37bb..27e9f41bf7d2f341b2d92336f4b180b3cfe4c1bf 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 #include <ctype.h>
 
diff --git a/funcs/func_config.c b/funcs/func_config.c
index 64676c011766471b2c6f7b5868bbd7cdd4857213..7279cc90032735c58e1f380b7b475602a8493ffe 100644
--- a/funcs/func_config.c
+++ b/funcs/func_config.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 8ec1032a764b270966dc642dccc4ee7743a844e6..2974b3c522dc450a1a6caa9d8185cce23ce0e27b 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <curl/curl.h>
 
 #include "asterisk/lock.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 23995ba91231342b55249309cb5a8e0884076bc2..c8cda134b048b346f3eeeb2c8838d36071c05843 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_db.c b/funcs/func_db.c
index f031645a9353e0627cf4b313d4edded7a55eb966..b2ccb237e7472e5a8c9ab097b17ebb9aba35ef82 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index d86f54eb95e6543ae4742270662d89d8dddb056e..965c7c79430e2e79651822ea9e4b04ebaecde610 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c
index f6723119dc9a685e30f7d60f94112edb0f6df31e..e57800010645e0d7240e967e3f866930d4434d9d 100644
--- a/funcs/func_dialgroup.c
+++ b/funcs/func_dialgroup.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c
index 0a5220b0907d700c2e5f28598a692037375ab667..6eaa03c8929b23e128eff304f8125a1c7234fdef 100644
--- a/funcs/func_dialplan.c
+++ b/funcs/func_dialplan.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 58a05c0329e49f84a1a9fda9417f195b3ca28284..2e86625aec718bdc33fd9acaa44a489a436ff439 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_env.c b/funcs/func_env.c
index 3883de6016421a6026bbe255f6c80be43499e6aa..1b11b1fa7cfd3ea8ddd38d41c5c1b9a9d9c7cf0f 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>   /* stat(2) */
 
 #include "asterisk/module.h"
diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c
index 025d4975de84df5686b5a4143118c89050002769..d20fb2a0ba064667ea7cdc2b4cb762aaaf0ddb7e 100644
--- a/funcs/func_extstate.c
+++ b/funcs/func_extstate.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index e8c10945805314196713da3c3331586dc68accf7..08c426161a2f0022a732153e8dc65c61db220dd7 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_global.c b/funcs/func_global.c
index 23e69d335e907bdbef73040b428b333b92669967..795ddaf61fc414cc324325525d73d3fc223237c7 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index 9708ca7c0cfaf6d177d5b7aacd17feb2c6af9012..2b6ed40524e03c267b2114d29dc629fc5ec19d79 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_hangupcause.c b/funcs/func_hangupcause.c
index 043e480f3b6baa7d07a98b2e055a18da924bf5d1..2b4f9c5185594285f2626ab4253963253e3b1a70 100644
--- a/funcs/func_hangupcause.c
+++ b/funcs/func_hangupcause.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_holdintercept.c b/funcs/func_holdintercept.c
index 3e348c1cf1baa392f45be9be85a154e905dc9204..c2435463a0def6b9c5a4a0e990a47192892c9a44 100644
--- a/funcs/func_holdintercept.c
+++ b/funcs/func_holdintercept.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index db52b118011cdf66bc678647567ed36e581de017..10ba1bb5f60c4aab958b08011a89584372353d43 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <iconv.h>
 
diff --git a/funcs/func_jitterbuffer.c b/funcs/func_jitterbuffer.c
index ef7ff71390a234660a6ec24109463ee5c15c7459..65aea53777705f5995d0c09ae449734405d557f3 100644
--- a/funcs/func_jitterbuffer.c
+++ b/funcs/func_jitterbuffer.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/framehook.h"
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 7bb50f5e344ed94b9cd3b70e556b7897429b4d1d..88bf6e5bd30ceb8ffde202dc13d358a6711e9c97 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/lock.h"
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index 8724ff51f5f2ec7251a622d9fcc8d50cf08a67a2..1ec0b0c50a288d96845bb3288af3818e93b45c39 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_math.c b/funcs/func_math.c
index ae130588715fd7c647544e93710d863b027318c9..6fc725581b130e280dc60fc94559bde75aed22b3 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index ff36c9e37e5bbbbec4c1a2af8f60f08b0eb46f62..101c1fd729e9b14964aaf18315064603da422392 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 
diff --git a/funcs/func_module.c b/funcs/func_module.c
index 143804a07cd456b0d285cd6fee1bc3c290d2e495..824d99294af6540d2427b89bb8cc4797d78cd852 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 224cd7a7f683873027af1a396aa637a20cd5563e..e014b633c607569e3c5b0bc9af882ad6bfb971b5 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index bb0ee0db7de3245e897083af4bb51cbf3856c253..aae2abc90ec103b76b3b67248665d10d8cc82760 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_pitchshift.c b/funcs/func_pitchshift.c
index 829498ab12d41ca29b0a01e9f259ce2bd553c6b4..a995d42f1d40312c27e0675d7aa9072568383869 100644
--- a/funcs/func_pitchshift.c
+++ b/funcs/func_pitchshift.c
@@ -64,8 +64,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_pjsip_aor.c b/funcs/func_pjsip_aor.c
index 835955e1bc2d41215a1caa5bcc12e5fb47aeae5a..799e9e4ed5a394ec6de980f71306b13b6edf1bbe 100644
--- a/funcs/func_pjsip_aor.c
+++ b/funcs/func_pjsip_aor.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjlib.h>
 
diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c
index e9737049d84966b6452d0d7b893a0106f3e0a47b..c8403655ab16b3ea6bc0b889d7781cd5bb80bd72 100644
--- a/funcs/func_pjsip_contact.c
+++ b/funcs/func_pjsip_contact.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjlib.h>
 
diff --git a/funcs/func_pjsip_endpoint.c b/funcs/func_pjsip_endpoint.c
index ef544f367d3a561677f8a51060f5258dbbdfde26..a64d93b1edb84b82aef6d95366117564605b4f0f 100644
--- a/funcs/func_pjsip_endpoint.c
+++ b/funcs/func_pjsip_endpoint.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjlib.h>
 
diff --git a/funcs/func_presencestate.c b/funcs/func_presencestate.c
index d7d6b2439acb034c230911a08bb36bba1935be97..0f2a431427ec4833519cbf03ac6e0054863655c5 100644
--- a/funcs/func_presencestate.c
+++ b/funcs/func_presencestate.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index cc34517dc2a2a9dcdc72f6d83fb7905a1c1f9ff4..bc514b80c986b9ed73dff6bcf0a659b6aa87265d 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index 0ce191b543a0d07492fe284f14d9d3a09356df92..e0ba4a5a18ead90019942924b3014261cdbbc02f 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index 9f596c4fe2b0ef12f4abb8c11b6264028879f29b..a3787b108c023832edcc497fb39ff913c34a43a6 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 
diff --git a/funcs/func_shell.c b/funcs/func_shell.c
index f529cbf724b3da0c791aaec45c77a603590071e7..0398cd83960d55321324a9a0834dfdd0d1e6abb5 100644
--- a/funcs/func_shell.c
+++ b/funcs/func_shell.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_sorcery.c b/funcs/func_sorcery.c
index 8c1697abaca6ed9575f7051d042c651584cf1a6e..d4d8be2f23884db197a6cf96fe0fd7033b230e8e 100644
--- a/funcs/func_sorcery.c
+++ b/funcs/func_sorcery.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/funcs/func_speex.c b/funcs/func_speex.c
index a4cfa17b34b6198c97de413dcdbbb5765af3b630..78ac4baab9cb2e99c2f4f740ea693a9f9bccf720 100644
--- a/funcs/func_speex.c
+++ b/funcs/func_speex.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <speex/speex_preprocess.h>
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_sprintf.c b/funcs/func_sprintf.c
index 822937e55daf1f6048a9e4963b0af1ae7c308d8f..03d7bb27b0cf1073d697bf4a6df3253ffbe8b778 100644
--- a/funcs/func_sprintf.c
+++ b/funcs/func_sprintf.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 
 #include "asterisk/module.h"
diff --git a/funcs/func_srv.c b/funcs/func_srv.c
index 79a24db00bb55e69ef7e9243fd9f2eed81b0318d..17d7d7a9396251648ee383dc247f560bd231eea0 100644
--- a/funcs/func_srv.c
+++ b/funcs/func_srv.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/srv.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 255e846531252761173be9ff276f5747e1ef7cbd..885de61c57eb752f5f486657b7547bdc67c313c9 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 #include <ctype.h>
 
diff --git a/funcs/func_sysinfo.c b/funcs/func_sysinfo.c
index 9d8b765e4640bc92b5e8e94ddfdc5e4c60477521..d0a874e3ad0258f80b7bf2da0e6e3a24ccadde32 100644
--- a/funcs/func_sysinfo.c
+++ b/funcs/func_sysinfo.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
 #endif
diff --git a/funcs/func_talkdetect.c b/funcs/func_talkdetect.c
index b8dd2d458302d51af809f95e985d41f6228e1c0b..02963f20e4ffd4ae803e08be86b73ff1d3109131 100644
--- a/funcs/func_talkdetect.c
+++ b/funcs/func_talkdetect.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 1cb6b8dd4f9d7636f69005c0619667971fca40af..05a02e158795e5da69d6b475ad9685916b4f05a5 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index b7f891b70fd2c2565b8a2d71f5fd1b2c169690c1..dfdeae9feacaa4f08a9d500604fc617013481924 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_version.c b/funcs/func_version.c
index 5ccff8273ad8deec011a2f175fba64d516e51193..e2463028853f2d908a7ac05751d7030d11c22f96 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index 2c3563192fe8effbf47dd05190bf858974805e73..be919dda18f538773a6d090048baf2b7518580fa 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <dirent.h>
 
 #include "asterisk/file.h"
diff --git a/funcs/func_volume.c b/funcs/func_volume.c
index a8f84586d7e46c5d1692acfd5af06f38c9eb3b91..fdf2064d5629a01cb06eac1dcc826822956def4f 100644
--- a/funcs/func_volume.c
+++ b/funcs/func_volume.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/include/asterisk.h b/include/asterisk.h
index f5ed0916754fa7960c15a55b4efc218a64a7f9ec..25737805bca5f5d0f19a9332120652f2389cd2ec 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -152,78 +152,9 @@ int ast_shutting_down(void);
  */
 int ast_shutdown_final(void);
 
-/*!
- * \brief Register the version of a source code file with the core.
- * \param file the source file name
- * \return nothing
- *
- * This function should not be called directly, but instead the
- * ASTERISK_REGISTER_FILE macro should be used to register a file with the core.
- */
-void __ast_register_file(const char *file);
-
-/*!
- * \brief Unregister a source code file from the core.
- * \param file the source file name
- * \return nothing
- *
- * This function should not be called directly, but instead the
- * ASTERISK_REGISTER_FILE macro should be used to automatically unregister
- * the file when the module is unloaded.
- */
-void __ast_unregister_file(const char *file);
-
-/*!
- * \brief Complete a source file name
- * \param partial The partial name of the file to look up.
- * \param n The n-th match to return.
- *
- * \retval NULL if there is no match for partial at the n-th position
- * \retval Matching source file name
- *
- * \note A matching source file is allocataed on the heap, and must be
- * free'd by the caller.
- */
-char *ast_complete_source_filename(const char *partial, int n);
-
-/*!
- * \brief Register/unregister a source code file with the core.
- *
- * This macro will place a file-scope constructor and destructor into the
- * source of the module using it; this will cause the file to be
- * registered with the Asterisk core (and unregistered) at the appropriate
- * times.
- *
- * Example:
- *
- * \code
- * ASTERISK_REGISTER_FILE()
- * \endcode
- */
 #ifdef MTX_PROFILE
 #define	HAVE_MTX_PROFILE	/* used in lock.h */
-#define ASTERISK_REGISTER_FILE() \
-	static int mtx_prof = -1;       /* profile mutex */	\
-	static void __attribute__((constructor)) __register_file_version(void) \
-	{ \
-		mtx_prof = ast_add_profile("mtx_lock_" __FILE__, 0);	\
-		__ast_register_file(__FILE__); \
-	} \
-	static void __attribute__((destructor)) __unregister_file_version(void) \
-	{ \
-		__ast_unregister_file(__FILE__); \
-	}
-#else /* !MTX_PROFILE */
-#define ASTERISK_REGISTER_FILE() \
-	static void __attribute__((constructor)) __register_file_version(void) \
-	{ \
-		__ast_register_file(__FILE__); \
-	} \
-	static void __attribute__((destructor)) __unregister_file_version(void) \
-	{ \
-		__ast_unregister_file(__FILE__); \
-	}
-#endif /* !MTX_PROFILE */
+#endif /* MTX_PROFILE */
 
 /*!
  * \brief support for event profiling
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index c703c68727dbc148a0b1e7695dc12e22ed9f589f..264ee97e620562a1eedf37c95e5b708f4c0ba268 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
 #include "asterisk/term.h"
diff --git a/main/acl.c b/main/acl.c
index d133b2a0719dfd0c500d2a87e62e6f3b4670e1d6..1c35be86df480c60fbfe0da951b38e6ca12914cd 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/network.h"
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)
diff --git a/main/alaw.c b/main/alaw.c
index 3b9bfd6b9c5b7c2578347dfe24c99a939fdbcafb..08de0fe63f0e6b3ca4b25d3b27400d68b13533ef 100644
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/alaw.h"
 #include "asterisk/logger.h"
 
diff --git a/main/aoc.c b/main/aoc.c
index 8d4332901f655fb1837d19bfbfc6c4e49d3b575b..d4b74ec921b55df27f99654d093f790b32a3da57 100644
--- a/main/aoc.c
+++ b/main/aoc.c
@@ -28,7 +28,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE();
 
 #include "asterisk/aoc.h"
 #include "asterisk/utils.h"
diff --git a/main/app.c b/main/app.c
index e1d70498cf342729b6f8e6a9ab2997a0d49e230f..621153e250aa66f83a3b1e7321a4e5ca2ac48865 100644
--- a/main/app.c
+++ b/main/app.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index 215f8312fd3c534eaaa482d821342d24228e2c19..4b06ffe91c874a8b45b6862a5f9dc3daf768880a 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -98,10 +98,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#if !defined(STANDALONE) && !defined(STANDALONE2)	\
-	
-ASTERISK_REGISTER_FILE()
-#else
+#if defined(STANDALONE) || defined(STANDALONE2)
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index af03c013faedcb1e6d117530f62f864696d1daa9..542f01817f98aba1386d4e06329c647adee792a7 100644
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -25,9 +25,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#if !defined(STANDALONE)
-ASTERISK_REGISTER_FILE()
-#else
+#if defined(STANDALONE)
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 8b32b2b9c01621a50894162dc9457a42e0d6cff0..f516291f9c3ef7af0a366524bc127ba1ec51a1dd 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -19,10 +19,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#if !defined(STANDALONE) && !defined(STANDALONE2)	\
-	
-ASTERISK_REGISTER_FILE()
-#else
+#if defined(STANDALONE) || defined(STANDALONE2)
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index c6a1b97353bd86710b0168acfd29454465fabee1..f6fa6b43feef5493cdcf1180f264a9a0d861645d 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -520,9 +520,7 @@ static yyconst flex_int16_t yy_chk[159] =
 #include <sys/types.h>
 #include <stdio.h>
 
-#if !defined(STANDALONE)
-ASTERISK_REGISTER_FILE()
-#else
+#if defined(STANDALONE)
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
diff --git a/main/asterisk.c b/main/asterisk.c
index 7fc0912c48c1b04f03d719b22f91ae49fe4a0adb..d4b39a2652124c45537c8e03ccdfa8a556ed3c18 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -149,8 +149,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #undef sched_setscheduler
@@ -487,75 +485,6 @@ static struct {
 	 unsigned int need_quit_handler:1;
 } sig_flags;
 
-#if !defined(LOW_MEMORY)
-struct registered_file {
-	AST_RWLIST_ENTRY(registered_file) list;
-	const char *file;
-};
-
-static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
-#endif /* ! LOW_MEMORY */
-
-void __ast_register_file(const char *file)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *reg;
-
-	reg = ast_calloc(1, sizeof(*reg));
-	if (!reg) {
-		return;
-	}
-
-	reg->file = file;
-	AST_RWLIST_WRLOCK(&registered_files);
-	AST_RWLIST_INSERT_HEAD(&registered_files, reg, list);
-	AST_RWLIST_UNLOCK(&registered_files);
-#endif /* ! LOW_MEMORY */
-}
-
-void __ast_unregister_file(const char *file)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *find;
-
-	AST_RWLIST_WRLOCK(&registered_files);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&registered_files, find, list) {
-		if (!strcasecmp(find->file, file)) {
-			AST_RWLIST_REMOVE_CURRENT(list);
-			break;
-		}
-	}
-	AST_RWLIST_TRAVERSE_SAFE_END;
-	AST_RWLIST_UNLOCK(&registered_files);
-
-	if (find) {
-		ast_free(find);
-	}
-#endif /* ! LOW_MEMORY */
-}
-
-char *ast_complete_source_filename(const char *partial, int n)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *find;
-	size_t len = strlen(partial);
-	int count = 0;
-	char *res = NULL;
-
-	AST_RWLIST_RDLOCK(&registered_files);
-	AST_RWLIST_TRAVERSE(&registered_files, find, list) {
-		if (!strncasecmp(find->file, partial, len) && ++count > n) {
-			res = ast_strdup(find->file);
-			break;
-		}
-	}
-	AST_RWLIST_UNLOCK(&registered_files);
-	return res;
-#else /* if defined(LOW_MEMORY) */
-	return NULL;
-#endif
-}
-
 #if !defined(LOW_MEMORY)
 struct thread_list_t {
 	AST_RWLIST_ENTRY(thread_list_t) list;
diff --git a/main/astfd.c b/main/astfd.c
index 0a5e7ec801cfc82a1e370eaa376b85598aa10c75..34cf7bb6f3b508fc0738e5236b76d32a0b5a254c 100644
--- a/main/astfd.c
+++ b/main/astfd.c
@@ -31,8 +31,6 @@
 
 #ifdef DEBUG_FD_LEAKS
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
diff --git a/main/astmm.c b/main/astmm.c
index 1599d107a7e1ab5be410c3fdb057d3f889fbb73b..0ad29a6fb8e21cb6db92e3aed1da8ba78808d756 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -33,8 +33,6 @@
 
 #if defined(__AST_DEBUG_MALLOC)
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
 #include <stddef.h>
 #include <time.h>
diff --git a/main/astobj2.c b/main/astobj2.c
index 72bfcc8198ae1d072bdf8565e088835a8f95c554..114f260454d81f3e8c2dc2b9677f82b71ee9eaed 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "astobj2_private.h"
diff --git a/main/astobj2_container.c b/main/astobj2_container.c
index 15fd41286b021b32b1cd23a30d726af53c3c5af2..a978db3d467fe23aa73a5f618f395fd574fc6d91 100644
--- a/main/astobj2_container.c
+++ b/main/astobj2_container.c
@@ -22,8 +22,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "astobj2_private.h"
diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c
index eee90f513b83d5d9319c02c5053b829cf52bac6c..b1a8c1ce4350d165556d74ae04ceebf6d1b787d0 100644
--- a/main/astobj2_hash.c
+++ b/main/astobj2_hash.c
@@ -23,8 +23,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "astobj2_private.h"
diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c
index 1760938fcb725a9247672439b3281f7b7c456b59..61ab37b568752e99a43b139142aa1824b2cf0519 100644
--- a/main/astobj2_rbtree.c
+++ b/main/astobj2_rbtree.c
@@ -23,8 +23,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index 4a73fbd52e9ca3b39034cb11f1f44268046f1e46..8a0055e4b46be389278323a9baccdcd3a629ca17 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/channel.h"
diff --git a/main/autochan.c b/main/autochan.c
index 38d778438cbd7de81955e55cf26ffe0c691eaa9c..c7e5c00425891af61bf573cb5295ec6c1fa047f0 100644
--- a/main/autochan.c
+++ b/main/autochan.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/autochan.h"
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/autoservice.c b/main/autoservice.c
index 1af052d08891af58be61ba3d31178534add70fc3..11c9eab969d85c90346bb9254c14f94eefa900d7 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 
diff --git a/main/backtrace.c b/main/backtrace.c
index 3b490e8c3c8cc1624fc4b5a8366ea219f81f994c..0b29385fdc49fc57541c147f03a42a39b9694145 100644
--- a/main/backtrace.c
+++ b/main/backtrace.c
@@ -27,7 +27,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE();
 
 #include "asterisk/backtrace.h"
 #include "asterisk/utils.h"
diff --git a/main/bridge.c b/main/bridge.c
index e92875d1785065f547824a63f5d9ce2bbded808b..cd8ce99b4d5db937f5db7bb2ce389e3747376e71 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -83,8 +83,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
diff --git a/main/bridge_after.c b/main/bridge_after.c
index e2f14ab611b28b5a9ee8ef0401b4655783d6aaa0..d649717e2b8a630b2006e254dce9ddad3f5de7ea 100644
--- a/main/bridge_after.c
+++ b/main/bridge_after.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index 6c411fbaf2a8a6776bbd0bc2a82b816634e3a63d..e31f3856134016788e48633172dc9b82826c925e 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index 18f71950619b44930567fd18e48f6a542bd58852..722fc668785998fabf97f33eef151ef459a71754 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/heap.h"
diff --git a/main/bridge_roles.c b/main/bridge_roles.c
index 0305237351f2ebd951c6b72524e20d94348fd8dd..a9b95a3521402bdce1e5a9ccf4c2837cf67a8f06 100644
--- a/main/bridge_roles.c
+++ b/main/bridge_roles.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/logger.h"
diff --git a/main/bucket.c b/main/bucket.c
index 7b8c689a003ddee99d027c54f21a62f5881633f0..e00284842f513c2d5d0e5e7e7ecd828c33eec1f2 100644
--- a/main/bucket.c
+++ b/main/bucket.c
@@ -60,8 +60,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef HAVE_URIPARSER
 #include <uriparser/Uri.h>
 #endif
diff --git a/main/callerid.c b/main/callerid.c
index d2b3218922897c08aaa270ec73fbdf13bd074d3f..d6f8575fb2838000bef7a098631b6edc06cf3f3e 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <math.h>
 #include <ctype.h>
diff --git a/main/ccss.c b/main/ccss.c
index 13831b719879b18e705664ab8d05ec80c2c4c4c8..6c3e6cbee11162b116f70cf469cb4e4dd48fbc8d 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/strings.h"
 #include "asterisk/ccss.h"
diff --git a/main/cdr.c b/main/cdr.c
index baa17b96722312be14633b8e4b65b24c21c3bb66..60fe977a88676cf7a75761b22767a365d541f282 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 #include <inttypes.h>
 
diff --git a/main/cel.c b/main/cel.c
index aafeea43264be74688511740604057de2c3f133c..faf4fde7164873be8855b8407ae6cf865cf58d56 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include "asterisk/channel.h"
diff --git a/main/channel.c b/main/channel.c
index 4a9fe72a86a1b56f576f8f69d4fe12c22c3ceda0..cdb6569c3b5b01dadb4e48e5d2513948943a20a5 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include <sys/time.h>
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c
index 3c156d4fa211556aa0f1ff1a622b730399ba979b..1cb91e7c334721ca68ed4b44a857f0889d713f82 100644
--- a/main/channel_internal_api.c
+++ b/main/channel_internal_api.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/main/chanvars.c b/main/chanvars.c
index d7922522cd41cec748ad12d47ca57c3acb0656ff..2cc90e43a650ac4fd1dbad1d001222671aac9b57 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/chanvars.h"
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
diff --git a/main/cli.c b/main/cli.c
index 3ba743d75d4a498164ea80a0b1d5c8e91ef8e4cc..632883d39f3b28826e80eb9a4f37aef2e288eb0c 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
 #include <signal.h>
diff --git a/main/codec.c b/main/codec.c
index 49356a22fb1fb09b04dba4188e827d69715e6040..1870c393bc524c200b79083f882711f69cdeccf1 100644
--- a/main/codec.c
+++ b/main/codec.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/codec.h"
 #include "asterisk/format.h"
diff --git a/main/codec_builtin.c b/main/codec_builtin.c
index 1f2cb9270478f5952b116b49fcefd1615fb5ad32..cc4edd23990d0725b3ebf09997f82a9b7399a12a 100644
--- a/main/codec_builtin.c
+++ b/main/codec_builtin.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/ilbc.h"
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
diff --git a/main/config.c b/main/config.c
index 6162149b1670dabd7f72b552c8d00758e700b9f4..a3e09f67ecc7ae80578f126de6e77b4944fae82c 100644
--- a/main/config.c
+++ b/main/config.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_CONFIG_DIR */
 #include "asterisk/network.h"	/* we do some sockaddr manipulation here */
 
diff --git a/main/config_options.c b/main/config_options.c
index 2d2300893dc751fe43b2da583444544fe95c93d1..18b04ff7dcfebd84c0f27144c3301438ff0b40a7 100644
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/_private.h"
diff --git a/main/core_local.c b/main/core_local.c
index 6644aaf5094127004eb3fab6737b2d0d8f9c7f17..aa232a4b6df6c15f6010dea6de5321118956ccae 100644
--- a/main/core_local.c
+++ b/main/core_local.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 /* ------------------------------------------------------------------- */
 
 #include "asterisk/channel.h"
diff --git a/main/core_unreal.c b/main/core_unreal.c
index 28886b63595c15b6f06e65b262516b4fc3709e25..5da7408770d9aedd56049dea7179c693cb06b056 100644
--- a/main/core_unreal.c
+++ b/main/core_unreal.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/causes.h"
 #include "asterisk/channel.h"
 #include "asterisk/stasis_channels.h"
diff --git a/main/crypt.c b/main/crypt.c
index a4cf664b15b87fd3317ee26c5fd3806e7eeaf28f..924618205a474cca4f26ce9e8daf413d8dd12b29 100644
--- a/main/crypt.c
+++ b/main/crypt.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <unistd.h>
 #if defined(HAVE_CRYPT_R)
 #include <crypt.h>
diff --git a/main/data.c b/main/data.c
index 1aaae18f184c057a08f86e2f93f83ae671d29973..15aca8b9d3d75e968755e36850dd9cb6f5d904c3 100644
--- a/main/data.c
+++ b/main/data.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include <regex.h>
diff --git a/main/datastore.c b/main/datastore.c
index e536d601bc9dfc1dd2895076373d225dfb9122f6..1170e24f87862feeb83a048f28d704f9a5cf3f13 100644
--- a/main/datastore.c
+++ b/main/datastore.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include "asterisk/datastore.h"
diff --git a/main/db.c b/main/db.c
index bb6e18bb55a6b8902c9d27a4f8bde09ca792bd8f..94324355f2a554a425ace694f4646c9f93b67f57 100644
--- a/main/db.c
+++ b/main/db.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_DB */
 #include <sys/time.h>
diff --git a/main/devicestate.c b/main/devicestate.c
index 400d655f63ce3a200c13f6ae6b47ab048f40321b..1db9a1937f89edc631b3fcf4d3cdd0e5cdfbde92 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -143,8 +143,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
diff --git a/main/dial.c b/main/dial.c
index 7677c5a7d0f1251aa04406fa615a99c612e0a0ee..cc2366ed7aa2cb93825ba1cb72ea0b063b7241f9 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 
diff --git a/main/dns.c b/main/dns.c
index fa94089e7929c1ce2087c7889656a418cb01b6e3..3b198a0f3263cd444dea46089ca71f468185dc66 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/network.h"
 #include <arpa/nameser.h>	/* res_* functions */
 #include <resolv.h>
diff --git a/main/dns_core.c b/main/dns_core.c
index cfce8efb084724f12cafe8139912445eae8ff86a..e1cbc21916ae66e731f89e193b96bd958f511e99 100644
--- a/main/dns_core.c
+++ b/main/dns_core.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/linkedlists.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/strings.h"
diff --git a/main/dns_naptr.c b/main/dns_naptr.c
index 4d5a5f99aed8ff4295648352d67f3ba60628625a..d24e1b5f4471147a25cf6c19092cd8c38bb1cce5 100644
--- a/main/dns_naptr.c
+++ b/main/dns_naptr.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <regex.h>
diff --git a/main/dns_query_set.c b/main/dns_query_set.c
index 40a89e168eb73ba157783ad61585f90b61f7817a..e8492ddb3c35691668cd15899b69d1856ad68763 100644
--- a/main/dns_query_set.c
+++ b/main/dns_query_set.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/vector.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
@@ -283,4 +281,4 @@ int ast_dns_query_set_resolve_cancel(struct ast_dns_query_set *query_set)
 	}
 
 	return (query_set->queries_cancelled == query_count) ? 0 : -1;
-}
\ No newline at end of file
+}
diff --git a/main/dns_recurring.c b/main/dns_recurring.c
index 99257550792dd645c489fc6e9aa4be86203603a2..294438f34c3c9e8de0f3d313b798b2b584639468 100644
--- a/main/dns_recurring.c
+++ b/main/dns_recurring.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/sched.h"
diff --git a/main/dns_srv.c b/main/dns_srv.c
index e4a3d8bbdb7090af878f167e970573ea7d5a6747..9d36fb61f9dd43c90fd1180ce7350f609f319c80 100644
--- a/main/dns_srv.c
+++ b/main/dns_srv.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
diff --git a/main/dns_system_resolver.c b/main/dns_system_resolver.c
index d57814874cdaa761894bbc1a2b54b6eda5a5d67e..9358577b6b8e3f3d023e4b79ae8c694e312fdc47 100644
--- a/main/dns_system_resolver.c
+++ b/main/dns_system_resolver.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/dns.h"
diff --git a/main/dns_tlsa.c b/main/dns_tlsa.c
index 85db40b74bce89d8415741f2e0073270678a1fdf..8ec7e10212b1ee9a317413daab520103575044b6 100644
--- a/main/dns_tlsa.c
+++ b/main/dns_tlsa.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/dns_core.h"
 #include "asterisk/dns_tlsa.h"
 
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index b976c68c5361f4f396fc75b124c859da89259eb9..0e5efd6da63bedf5da259c5c27f78fcadc12c6c0 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include <regex.h>
 #include <signal.h>
diff --git a/main/dsp.c b/main/dsp.c
index 1a3ebea6a15775342d970c6fcfcbfcfbe66c475d..e4e7fd3ebdd4de223bf9ad43f89f8dd860e38189 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -55,8 +55,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/frame.h"
diff --git a/main/endpoints.c b/main/endpoints.c
index b73edd379a62d6baf526f3045896d18595442ecc..d31405244e0352b0bbad15d35d3239cb2cfb9e62 100644
--- a/main/endpoints.c
+++ b/main/endpoints.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/endpoints.h"
 #include "asterisk/stasis.h"
diff --git a/main/enum.c b/main/enum.c
index 865fa3a0787c8f9e65675772a5ee409f9016cfb2..5c217c43ca2356cbe4e76b3fc1d71ebbff150cbd 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -60,8 +60,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/main/event.c b/main/event.c
index 3af03147e2ea4dcd74b17569fc4f716405dc2386..1e623a1973648b56ec9b857f798f177d35e2b463 100644
--- a/main/event.c
+++ b/main/event.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include "asterisk/event.h"
diff --git a/main/features.c b/main/features.c
index 0af5a78e3c32d4d7d16913b529b4f1c8053c5f9c..ae16374b2e02e9b5363b49bd49c3e260b41b95ae 100644
--- a/main/features.c
+++ b/main/features.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include <pthread.h>
diff --git a/main/file.c b/main/file.c
index 450362544a99f3a94511b996437396db03698840..639440830cb893793b45754a0ad354bd916282d5 100644
--- a/main/file.c
+++ b/main/file.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c
index db7c157c329866cb043a61531615f2ce8816ba38..fc3e8cb664cb97669b0480a35186ecf782dca775 100644
--- a/main/fixedjitterbuf.c
+++ b/main/fixedjitterbuf.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <assert.h>
 
 #include "asterisk/utils.h"
diff --git a/main/format.c b/main/format.c
index cc9ac45d73a5d22ed3dd0f42dc6fbd924fe855ff..b5e577913ed82937821bbe720fbebd06cfdb0486 100644
--- a/main/format.c
+++ b/main/format.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/codec.h"
 #include "asterisk/format.h"
diff --git a/main/format_cache.c b/main/format_cache.c
index c704f1c379a96a4b31523b386c5e34c475948cb0..d0ae32e68dcda0e29cfd1e23eac364749bb3637a 100644
--- a/main/format_cache.c
+++ b/main/format_cache.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/format.h"
 #include "asterisk/format_cache.h"
diff --git a/main/format_cap.c b/main/format_cap.c
index ed7afc229a899200b534795f8648453babcfc25d..1fe342b3107066b91d4dfdaf283b2f246bf39d59 100644
--- a/main/format_cap.c
+++ b/main/format_cap.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/format.h"
 #include "asterisk/format_cap.h"
diff --git a/main/format_compatibility.c b/main/format_compatibility.c
index 9bf263b5b2c7fb569cc7558dee7beba86cf3ccf2..84514ac8cdc14b2d25b73df21980e7e83a6d6bfc 100644
--- a/main/format_compatibility.c
+++ b/main/format_compatibility.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/codec.h"
diff --git a/main/frame.c b/main/frame.c
index 92b92b6e2e1d47c4e0166f484f6193a1ea1a9ddf..0175c7226b43552adb46569ce72ead6b78ab79ac 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
diff --git a/main/framehook.c b/main/framehook.c
index e12b45931af1b77ca4f4362ce2452f792174d6ee..d17066d92b3ee56ead901efd216f0fd8a5363c84 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/framehook.h"
diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c
index 98f0c173bab5485fa5bbcfb37ca541be54cb2046..5891191e6f36206c016f0a8da62ae6db642b658e 100644
--- a/main/fskmodem_float.c
+++ b/main/fskmodem_float.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 
 #include "asterisk/fskmodem.h"
diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c
index 44ef928a82c25e7b67b6b289cd7e119901fd05d2..5c7f8ecf2cc0454e61c403abd3673e19c3967aa7 100644
--- a/main/fskmodem_int.c
+++ b/main/fskmodem_int.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/fskmodem.h"
 
 #define NBW	2
diff --git a/main/global_datastores.c b/main/global_datastores.c
index 8ba769d3d2f8175113c32c7fc762035a44027dec..521106defe3bf1075febf124e03341ee579e155f 100644
--- a/main/global_datastores.c
+++ b/main/global_datastores.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/global_datastores.h"
 
 static void secure_call_store_destroy(void *data)
diff --git a/main/hashtab.c b/main/hashtab.c
index 3719c2ad43701a51129c6cf8ac2c9f7b9ef0162f..3d7b1991c6fd91f43005bd4c4fb400dff44b0e4b 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -29,8 +29,6 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 
 #include "asterisk/lock.h"
diff --git a/main/heap.c b/main/heap.c
index 73280fedc1e23286cb2be7490c699a9afa079320..0f0bafd18ee65b26ed91fe9da23a30e08318cf5e 100644
--- a/main/heap.c
+++ b/main/heap.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/heap.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
diff --git a/main/http.c b/main/http.c
index da564da203a9029dca193bd17b8c2caca8813324..77feb397bbabbff3361f17998278a8c1abdf1b1d 100644
--- a/main/http.c
+++ b/main/http.c
@@ -44,8 +44,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/main/image.c b/main/image.c
index 22c3a016c2e774f8c5b59e4299fce698b871c0c4..b007ae1602a140043f876dfe985a012d11b71555 100644
--- a/main/image.c
+++ b/main/image.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/main/indications.c b/main/indications.c
index 0f0e401d9830354e5005717d9ae4482eb3b8f69b..0af6668cfc0751a1bb9fb96ecef892b243f29ad3 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/lock.h"
diff --git a/main/io.c b/main/io.c
index 3441fbae9ff90ab10866e499b4a6d5707e34341f..b063c22396c481b81d2bc8130d7fd282e51a4a0d 100644
--- a/main/io.c
+++ b/main/io.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <termios.h>
 #include <sys/ioctl.h>
 
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 0e93507ef8accf44549cae25b496603af6abc5d7..4795b6d06af8f8763e79965ef8bdf8af22cc10ea 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "jitterbuf.h"
 #include "asterisk/utils.h"
 
diff --git a/main/json.c b/main/json.c
index ca74f85dc0012947cfcfad2de4087bdca4bb9653..7b5cfbe7e6e93456001272ae939b407540e6f2bf 100644
--- a/main/json.c
+++ b/main/json.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/json.h"
 #include "asterisk/localtime.h"
 #include "asterisk/module.h"
diff --git a/main/libasteriskpj.c b/main/libasteriskpj.c
index aed0ec8b146c5222a07ea24dd9311c6f51e04795..22660e686a654a3ac5dd11930d9e111db602e6a4 100644
--- a/main/libasteriskpj.c
+++ b/main/libasteriskpj.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef HAVE_PJPROJECT
 #include <pjlib.h>
 #endif
diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
index 7603465c74669cedb2e5eb06f18c6c66def5ed4e..16a1aa7395c250f45f28e1b4ff6dd5cccc5fd83b 100644
--- a/main/libasteriskssl.c
+++ b/main/libasteriskssl.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef HAVE_OPENSSL
 #include <openssl/ssl.h>
 #include <openssl/err.h>
diff --git a/main/loader.c b/main/loader.c
index 36a3d5f61b6727019a5d8e01cf2edb162921a6e2..6617783cf28c6acfd1563d0ddc732ebf4f4faa88 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
 #include <dirent.h>
diff --git a/main/lock.c b/main/lock.c
index b35ec597c63aa72792042e13e767a53a7a80c6a5..9c1d38383265b6086f3bcd2e18bd8e1690c7c6fc 100644
--- a/main/lock.c
+++ b/main/lock.c
@@ -27,7 +27,14 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
+#ifdef HAVE_MTX_PROFILE
+/* profile mutex */
+static int mtx_prof = -1;
+static void __attribute__((constructor)) __mtx_init(void)
+{
+	mtx_prof = ast_add_profile("mtx_lock_" __FILE__, 0);
+}
+#endif
 
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/logger.c b/main/logger.c
index 7d0d2de1e498a068b8252d49932d1ee07b5efda0..146d91985556872add2baadc620ca1c5bb6fab4a 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 /* When we include logger.h again it will trample on some stuff in syslog.h, but
  * nothing we care about in here. */
 #include <syslog.h>
diff --git a/main/manager.c b/main/manager.c
index 32322b8c517736f7674f2dfa0a9929183fcf3783..ef1afb03d31befcf3c15697a0333f9f37c6fe69f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -54,8 +54,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use various ast_config_AST_* */
 #include <ctype.h>
 #include <sys/time.h>
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index b6aaa550e63a5df5bd47c0363813183e189a6247..c6e997f42c72ddba50dea24b291c463d517d8866 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_channels.h"
 #include "asterisk/manager.h"
diff --git a/main/manager_channels.c b/main/manager_channels.c
index ce0e38d9c0a558ff8cfd64bb59107828a7d09efd..7f3c1b6458c8ad056581a8c593fbe9eeb24aa973 100644
--- a/main/manager_channels.c
+++ b/main/manager_channels.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/manager.h"
diff --git a/main/manager_endpoints.c b/main/manager_endpoints.c
index ffcdef06f94fcdf0cb8238173819ad8bae77407f..3b488ddbabc5750bc444c9b32826aa27c497d0ed 100644
--- a/main/manager_endpoints.c
+++ b/main/manager_endpoints.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/manager.h"
diff --git a/main/manager_mwi.c b/main/manager_mwi.c
index 7492f78a9a6cc4d4a557ed59d3d3dbea7fbc5a33..a7f94de2477752fa5924d1cabe9a34915a0620c1 100644
--- a/main/manager_mwi.c
+++ b/main/manager_mwi.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/manager.h"
 #include "asterisk/app.h"
 #include "asterisk/channel.h"
diff --git a/main/manager_system.c b/main/manager_system.c
index 8417b7741af589be977e4a98961eb21f7ec4d657..b20deea65fede0a9450451cc1279aae45ed77697 100644
--- a/main/manager_system.c
+++ b/main/manager_system.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_message_router.h"
 #include "asterisk/stasis_system.h"
diff --git a/main/md5.c b/main/md5.c
index 477494ccaf215f9e6938fa9ee23aac2c143d4a0b..7c50bace9ad57dbaf2c67f033129fa585c45fa20 100644
--- a/main/md5.c
+++ b/main/md5.c
@@ -22,8 +22,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/endian.h"
 #include "asterisk/md5.h"
 
diff --git a/main/media_cache.c b/main/media_cache.c
index 958a05bb254e5baed38a86934709a7a7393a35a8..7be358879fca60ee1f277a25476516f4693f306e 100644
--- a/main/media_cache.c
+++ b/main/media_cache.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 #include "asterisk/config.h"
 #include "asterisk/bucket.h"
diff --git a/main/message.c b/main/message.c
index 0fc67ec0259135ce239619e64e141136574bb315..a326fb97eaf670a655b61043e46534d9a841f534 100644
--- a/main/message.c
+++ b/main/message.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include "asterisk/module.h"
diff --git a/main/mixmonitor.c b/main/mixmonitor.c
index fff51849d3f39ecc9e942510a175268224863fb1..0bd7adb94b98f1182ebced7d513bdb534ce6e0ba 100644
--- a/main/mixmonitor.c
+++ b/main/mixmonitor.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
 #include "asterisk/mixmonitor.h"
diff --git a/main/named_acl.c b/main/named_acl.c
index 0fc4df1871de74f80e2ba37227252bc19244d4af..8b5aedabb1b1a0bbb3b44bd2097b79982a6421e2 100644
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
 #include "asterisk/utils.h"
diff --git a/main/named_locks.c b/main/named_locks.c
index c71f3b579234c8afa0374c1b2bf91d421873e194..27772f23be244a08db49f71b49f9ed1528670f20 100644
--- a/main/named_locks.c
+++ b/main/named_locks.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/named_locks.h"
diff --git a/main/netsock.c b/main/netsock.c
index 568add4ca8e69f823d4a6f302640f68d213c794d..b7a7566a76f1c4bad9ffd0081df97016dc7f607d 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifndef __linux__
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
 #include <net/if_dl.h>
diff --git a/main/netsock2.c b/main/netsock2.c
index d9123e434d8d1d67cd3335947945743668a32a9f..bfa181c86cb2c5382c4697717f30310cf1a8856b 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config.h"
 #include "asterisk/netsock2.h"
 #include "asterisk/utils.h"
diff --git a/main/optional_api.c b/main/optional_api.c
index d89b9acb2730106b5c95c835361f50a252f91d16..9b9a1a07c25dde422accbf83677d3bb2e640cf07 100644
--- a/main/optional_api.c
+++ b/main/optional_api.c
@@ -18,8 +18,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/optional_api.h"
 #include "asterisk/utils.h"
 
diff --git a/main/parking.c b/main/parking.c
index 61a48960dfa341a155f7711c2a51a3a23506e7b6..bf0d0b6b78ca983a075dc7f64251afd426e80e2f 100644
--- a/main/parking.c
+++ b/main/parking.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/pbx.h"
diff --git a/main/pbx.c b/main/pbx.c
index 7cd420adb1bc00be0eba6b005cfac2e4d14201e4..e5c3d3c07960ab73ab888fb790d22a85b231b0f1 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_SYSTEM_NAME */
 #include <ctype.h>
diff --git a/main/pbx_app.c b/main/pbx_app.c
index b7e797d88b7e6f18aa97816fc96fba1f724532f8..0c030d12da76afca1fb8bd01deb73581aec85c61 100644
--- a/main/pbx_app.c
+++ b/main/pbx_app.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/pbx_builtins.c b/main/pbx_builtins.c
index fa155888aecf6d083b695476e783bbe59dfdab8a..20fdb4c22b7102108033faea28dea15ef7843ff3 100644
--- a/main/pbx_builtins.c
+++ b/main/pbx_builtins.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/pbx.h"
 #include "asterisk/causes.h"
diff --git a/main/pbx_functions.c b/main/pbx_functions.c
index 558be461f0eb4e8039a5ae0cc491b9f9ee4a7739..3c15e9d8849790776cd20cc70778966f5b173be2 100644
--- a/main/pbx_functions.c
+++ b/main/pbx_functions.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/pbx_hangup_handler.c b/main/pbx_hangup_handler.c
index e013f319445a9559bc66d4d6cdb0e9f4b8c1811c..554cb342f52acf418058cb756541318255c2b323 100644
--- a/main/pbx_hangup_handler.c
+++ b/main/pbx_hangup_handler.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/app.h"
 #include "asterisk/cli.h"
diff --git a/main/pbx_ignorepat.c b/main/pbx_ignorepat.c
index 1a2232c57ae577e99e74c68da7f1cf36b8093102..5b21c3a1fdbdf9d29b97a6a2dcebe130e2a00a6a 100644
--- a/main/pbx_ignorepat.c
+++ b/main/pbx_ignorepat.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/pbx.h"
 #include "pbx_private.h"
diff --git a/main/pbx_include.c b/main/pbx_include.c
index 46a41fb20f8f06da6e7c4f04e9022e9839225dd1..1bdc39605fecfe1f9c350dc60ac96fc31dd20e60 100644
--- a/main/pbx_include.c
+++ b/main/pbx_include.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/pbx.h"
 #include "pbx_private.h"
diff --git a/main/pbx_sw.c b/main/pbx_sw.c
index 0490ac6a2f59571e1ecd9312c3d7a71ed15fea04..0cc8c0e702b7d9b745adc7cfb3c893196f6b9180 100644
--- a/main/pbx_sw.c
+++ b/main/pbx_sw.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/pbx.h"
 #include "pbx_private.h"
diff --git a/main/pbx_switch.c b/main/pbx_switch.c
index bf733aed5e5c82a4a33f4e80d8ce29701f33c5ed..62e7cf5a9a2bcc474e269ff832a3e4454b802d51 100644
--- a/main/pbx_switch.c
+++ b/main/pbx_switch.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/pbx_timing.c b/main/pbx_timing.c
index 98053e6a416b43ee69d0320e1fa8c3aa55fa9649..b3ef0891ed8c6e4cb7e9c5bc0042b9b48f90f626 100644
--- a/main/pbx_timing.c
+++ b/main/pbx_timing.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/localtime.h"
 #include "asterisk/logger.h"
 #include "asterisk/pbx.h"
diff --git a/main/pbx_variables.c b/main/pbx_variables.c
index c02bdc8cc3a768dea487e63cdeb288397a1e3bb5..eede21316fa9c4b4c82333607dbbc4b82a3ecaaf 100644
--- a/main/pbx_variables.c
+++ b/main/pbx_variables.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/app.h"
 #include "asterisk/ast_expr.h"
diff --git a/main/pickup.c b/main/pickup.c
index 8fb7e158bed64340186e45e91f25767409b48d09..f0936ddf4459b2805c07228420ddc28c8f7778a5 100644
--- a/main/pickup.c
+++ b/main/pickup.c
@@ -47,8 +47,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/pickup.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/main/plc.c b/main/plc.c
index b24322350a227b49c334b908ccaa4a55f48bd968..b649357dcd6ce9b690f71b0aeb7a2f4eab6dab7f 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/plc.h"
diff --git a/main/presencestate.c b/main/presencestate.c
index c0a0ebdc194ea6d7cea43913df2a743d5f5603b1..4121bf5b69a15a07696e2a49739c06f61b55995d 100644
--- a/main/presencestate.c
+++ b/main/presencestate.c
@@ -57,8 +57,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/privacy.c b/main/privacy.c
index 7b13fe7a8251bed8bbc2130547d80de7003240f8..c0cc31acfb5509566e2a8aaef0aa94ca2a3a9467 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <dirent.h>
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index b91bc411576d376590eccb5a39b88f7aeb2c22cb..c9d228c5677f6cfc688fcc79b8eacea14123c029 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -143,8 +143,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 
 #include "asterisk/channel.h"
diff --git a/main/say.c b/main/say.c
index 9f6f1eacbc6fef7567175ccad93a5bb83c367e85..4b3711b854597dda563ee39f2551e2dc995ee5bd 100644
--- a/main/say.c
+++ b/main/say.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <netinet/in.h>
 #include <time.h>
 #include <ctype.h>
diff --git a/main/sched.c b/main/sched.c
index 9fee5b9cf58f7d0bc2f5f2854186c6b2af2c0c29..a4ca260c624ece6f92b53889c9083ae407813290 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef DEBUG_SCHEDULER
 #define DEBUG(a) do { \
 	if (option_debug) \
diff --git a/main/sdp_srtp.c b/main/sdp_srtp.c
index 940a6197d8fb816b36f42e6dc55b754059adc31c..072e6487c7bac2d1208a112dd59935751ecf4909 100644
--- a/main/sdp_srtp.c
+++ b/main/sdp_srtp.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/linkedlists.h"       /* for AST_LIST_NEXT, etc */
 #include "asterisk/logger.h"            /* for ast_log, LOG_ERROR, etc */
 #include "asterisk/sdp_srtp.h"          /* for ast_sdp_srtp, etc */
diff --git a/main/security_events.c b/main/security_events.c
index 9db932d85c6a178d0cff2a3fcfcf802777fabb96..adcda3d5deb0b430e546bbe2eb3c0466b11a45fa 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -362,8 +362,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
 #include "asterisk/network.h"
diff --git a/main/sem.c b/main/sem.c
index ea2273d5a932d26f871853469eb48450667bef17..cb7b53123a8663116051dcfa5983f40a05c3bcec 100644
--- a/main/sem.c
+++ b/main/sem.c
@@ -23,8 +23,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/sem.h"
 #include "asterisk/utils.h"
 
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 9b68241681e7b6bee8c215c3849f6c775cbfcde5..83cf6232f6fb15b79e5836944ea81d955f94c134 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/frame.h"
 #include "asterisk/format_cache.h"
 #include "asterisk/slinfactory.h"
diff --git a/main/smoother.c b/main/smoother.c
index ca0c4e45a1f37074cd27835abe2aa8ccf0b78b20..461180db2bbb98d7d0ac191502c6a9369f3bf67c 100644
--- a/main/smoother.c
+++ b/main/smoother.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/frame.h"
 #include "asterisk/astobj2.h"
diff --git a/main/sorcery.c b/main/sorcery.c
index 9f8c35c3b9e174a449251f87bd89a995547f4ffa..51b0b22bec6daae488071389fd8d472ef320b6a4 100644
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/sorcery.h"
 #include "asterisk/astobj2.h"
diff --git a/main/srv.c b/main/srv.c
index c0797499101342d3319860005ad2684c6c52c06c..ef073a5178580c043c605e0b8c4e2244efbd5f6c 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #ifdef __APPLE__
diff --git a/main/stasis.c b/main/stasis.c
index e04d92a4ff9db6a9bacc3a88ac1525b2abb59286..a82e938f4fba6bcb5da3ecd0e1616a7868313d76 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_internal.h"
 #include "asterisk/stasis.h"
diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c
index a5f29c74eff481b77a001816a68cb025570b1a1a..43722b90ba67927ae7e1cb152fee1c7c22a9e553 100644
--- a/main/stasis_bridges.c
+++ b/main/stasis_bridges.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_cache_pattern.h"
diff --git a/main/stasis_cache.c b/main/stasis_cache.c
index bd6d6fa1d6a5ccf5eab3f5307f5e842cc006f172..e632a21b06df8f23625022020a332b740bdce4be 100644
--- a/main/stasis_cache.c
+++ b/main/stasis_cache.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/hashtab.h"
 #include "asterisk/stasis_internal.h"
diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c
index 66563c4c6d6507952213bf87100420cfa53a8cbc..73cf0d2ca4e69fc044bba86dc5af40a76b5dc564 100644
--- a/main/stasis_cache_pattern.c
+++ b/main/stasis_cache_pattern.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_cache_pattern.h"
 
diff --git a/main/stasis_channels.c b/main/stasis_channels.c
index e1c50c6d05f9ee07c231f62fb1d176c5178d0c53..91f209290aec11c7c72726d09d1f5fff1c9f31f0 100644
--- a/main/stasis_channels.c
+++ b/main/stasis_channels.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/json.h"
 #include "asterisk/pbx.h"
diff --git a/main/stasis_endpoints.c b/main/stasis_endpoints.c
index c32dbb44f298d1ec35a1cd520d7bfe43078984dd..161fdfa449f78704215a9c6d73919aeee0f8fd68 100644
--- a/main/stasis_endpoints.c
+++ b/main/stasis_endpoints.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_endpoints.h"
diff --git a/main/stasis_message.c b/main/stasis_message.c
index 37b9a2b6ff5df35cf703ce38fd744521ed1a33e3..88db49f1a63b2dbebc142b6850d588ff83c1afbf 100644
--- a/main/stasis_message.c
+++ b/main/stasis_message.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/utils.h"
diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index 85034bcf958e5a74ae5137c088edef8cd7168ef2..2c8d0a7684d9abb10983d66a7ec3a0b707ff77a7 100644
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_message_router.h"
 #include "asterisk/vector.h"
diff --git a/main/stasis_system.c b/main/stasis_system.c
index c3a4d8663ebe50907fb6179ac794b3ec400c0984..ee4f6bca5bc885e78e0293a2ef6e404cdcba7b82 100644
--- a/main/stasis_system.c
+++ b/main/stasis_system.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_system.h"
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index c946c5fa8d28fc7473627c64a58d7b61cf870a89..bb221aebf60b6d658783cddd49ab306f8f9a460e 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -50,8 +50,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/main/stringfields.c b/main/stringfields.c
index 25c584462740ccd8cae7a79d2b1a46bec33f30a4..7e52bbc9ef43a4a23bf48439861dd2eea2262304 100644
--- a/main/stringfields.c
+++ b/main/stringfields.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stringfields.h"
 #include "asterisk/utils.h"
 
diff --git a/main/strings.c b/main/strings.c
index e62eb9aad62c80b5bbd752f4b7018746cfa8125e..b8f1ccbfdd9a44e25bb937083a4f9fd85e2d4a8e 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 #include "asterisk/strings.h"
 #include "asterisk/pbx.h"
diff --git a/main/stun.c b/main/stun.c
index ecabdadef113da79c2988e481b342188c49da9f7..356266c94d6604b1db41fdcc44b3569a39622423 100644
--- a/main/stun.c
+++ b/main/stun.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/stun.h"
 #include "asterisk/cli.h"
diff --git a/main/syslog.c b/main/syslog.c
index 3f493064bff1363bada4fe910d15da2da69460dc..c468c035eb8abc7fe687d011d5ec4c1322c1e4ee 100644
--- a/main/syslog.c
+++ b/main/syslog.c
@@ -30,8 +30,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/syslog.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <syslog.h>
 
 static const struct {
diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index ceb5f5c7f32dd307958102ac7ecf7da486efb501..30ed763085d04f0fdf1c33af6d31c5a478e540af 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/module.h"
 #include "asterisk/time.h"
diff --git a/main/tcptls.c b/main/tcptls.c
index 046501b77e25c76fea0640397d70b2a3b096e417..262fca0744374c60f94317ceba1eb12e244df318 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/main/tdd.c b/main/tdd.c
index 7f0d7e310f8bf516b5d18b836e54b0331ae382a7..370119cde3c26f47ec90a487eebcb5d458a70da0 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <math.h>
 #include <ctype.h>
diff --git a/main/term.c b/main/term.c
index 11fbe2da9daf03f7e26647663b198bd8754ad96f..617f82ef38bff768bda3dea3fc3cfabac0baf36f 100644
--- a/main/term.c
+++ b/main/term.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/test.c b/main/test.c
index 2f6200f96fc330200c12c9fef9f278ac166315b0..062451fb6683b2aad7e9a3adfece864f4938c7f2 100644
--- a/main/test.c
+++ b/main/test.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/_private.h"
 
 #ifdef TEST_FRAMEWORK
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 920b2d50941b3b4a3f84ff38cfd823230a6a1e2c..af37debb1aacd0a537fbba3e8d635945df3c7a75 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,8 +38,6 @@ void threadstorage_init(void)
 
 #else /* !defined(DEBUG_THREADLOCALS) */
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
diff --git a/main/timing.c b/main/timing.c
index e2e28f04fc90d80b1c89795520935e5baf03b697..c6a9480c32ba906baac19ae6f073f9eeab40748c 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #include "asterisk/timing.h"
diff --git a/main/translate.c b/main/translate.c
index 43e6e29bd5d70863e9a3f7689de1910859396e47..fa606e71b87345b87abd4b7a49b64b8abddd998f 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <math.h>
diff --git a/main/udptl.c b/main/udptl.c
index e543b4e8eecebd37983512ac61e34a3048d09d3f..853e43c4458bccd007ea1fc6294e4e5dbb9ce849 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -63,8 +63,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/main/ulaw.c b/main/ulaw.c
index 08d8060c845968c1045e124e4b70730eb1e474be..c8904d56ed37682ca1ae2fd8de72513a4c6c2fbe 100644
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/ulaw.h"
 #include "asterisk/logger.h"
 
diff --git a/main/utils.c b/main/utils.c
index fd1edf49020e67d8630dba69269a8a2883c2acec..775fae3af8c828ba0e1dd78fefa764d77861fdcd 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/main/xml.c b/main/xml.c
index 72d5821c1030a3eda3213eb44e3dcf3e22d75cd6..d32a8c5e4f4dcf56954032e793739f0926a6c4f3 100644
--- a/main/xml.c
+++ b/main/xml.c
@@ -31,8 +31,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/autoconfig.h"
 
-ASTERISK_REGISTER_FILE()
-
 #if defined(HAVE_LIBXML2)
 #include <libxml/parser.h>
 #include <libxml/tree.h>
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 1e3d3686015547bad65c92107b3c41a922d1e4da..e9a0afcb85bc0605587c30751a3cdfacbaa74d21 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"
 #include "asterisk/linkedlists.h"
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index 9b41aa9a86462f80fc0c9a2744a8a17d95847d98..3b2005fabf21be7a7e128cdafb82a4f7e7ac85f1 100644
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 1985d27a0bd5d8e89802a584b7b75b6ac5a85adf..8ad491485226d5ecc2fe04bbf3950acb32bf29eb 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -29,19 +29,10 @@
 
 #include "asterisk.h"
 
-#if !defined(STANDALONE)
-ASTERISK_REGISTER_FILE()
-#endif
-
 #include <ctype.h>
 #include <regex.h>
 #include <sys/stat.h>
 
-#ifdef STANDALONE
-#ifdef HAVE_MTX_PROFILE
-static int mtx_prof = -1; /* helps the standalone compile with the mtx_prof flag on */
-#endif
-#endif
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 0da4168f101d1077c6f3b6c5ddcd5cdd0f3a6156..384bbc7c3297c08ba1108c983c4670df5dd3bcb5 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -82,8 +82,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 
 #include "asterisk/paths.h"	/* ast_config_AST_CONFIG_DIR */
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index af5cb32ae30ea3438ff0b13ff9540cd738138c72..50a91605e58f9093cc78a156cba318ef1e432692 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/network.h"
 #include <sys/ioctl.h>
 #include <zlib.h>
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index 2919748b7e82491fbd2250439bf7b7b79af9a0bb..2230d3593ad1bbada7e97eefb4df814c820d4ab7 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 84b1f71266295285357226ba142c462145a81485..01f468de06780da3de3f1f628c1331eefe2694f9 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 7a444d763590f9a0ef10797dca3b55be666678e0..08c90aa62f7db43b45a87f11c94ca24046f3aa0a 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 
 #include "asterisk/file.h"
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index c858ed22fbc10478ef85d8b3e5ea6f823d3da664..dcd2ce73421589f3b43a1dfe3c50dbabff80f496 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 #include <time.h>
 #include <utime.h>
diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index 4e87f3a401ea9cca1aae5f614f4d0e308b36b533..b064646d9ce81a5fec526fe761356914c20bbdda 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -70,7 +70,6 @@
 %{
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c
index 9f1f19bb621ffa8bd2fa0235ef602387ac8626f7..414914101a4ec85aa297eace7c93739b3dc09fe5 100644
--- a/res/ael/ael.tab.c
+++ b/res/ael/ael.tab.c
@@ -102,8 +102,6 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/res/ael/ael.y b/res/ael/ael.y
index e5c1655c550433b9bb05410bbabbfe49d88d27c4..458863a026c76094fa56d99e9944e53d374e0daa 100644
--- a/res/ael/ael.y
+++ b/res/ael/ael.y
@@ -25,8 +25,6 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index 9fbd664294ed35cf7171606413c4131e1dc94b43..10f669382b6b5c9f105f24a3e5029f8756cb4566 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,6 @@ static yyconst flex_int16_t yy_chk[1073] =
  */
 #line 71 "ael.flex"
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 485f5ee7967322a03eba7aae6f581ff4190d8adf..6803ab634ee8d2b6c12a1ff93b52075dd0954ffb 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -30,8 +30,6 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c
index 633a94c1b0f1d1fa3ec4960c9ce7ff09e2a2cf75..03cd3a2386b9ed585e942dea2c6e4ce0992de7ef 100644
--- a/res/ari/ari_model_validators.c
+++ b/res/ari/ari_model_validators.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "ari_model_validators.h"
diff --git a/res/ari/ari_websockets.c b/res/ari/ari_websockets.c
index ed024377da2e5481f16b736d31e89acb8322b6f1..6fe40c6b7401e9e03a3de16f3edfcb8a46656198 100644
--- a/res/ari/ari_websockets.c
+++ b/res/ari/ari_websockets.c
@@ -18,8 +18,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/ari.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/http_websocket.h"
diff --git a/res/ari/cli.c b/res/ari/cli.c
index 4468e44f1000606b31e5f0ca55b0cb89c5c4eb3e..9d156f21ee7ed1c34b8ce365bd4d9b3eb67bac8b 100644
--- a/res/ari/cli.c
+++ b/res/ari/cli.c
@@ -24,8 +24,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/cli.h"
 #include "internal.h"
diff --git a/res/ari/config.c b/res/ari/config.c
index f8fdc27450f9fc221b01752bf2e5f5b069198669..deaa78073d585613e0c144148cd24d671ff4729a 100644
--- a/res/ari/config.c
+++ b/res/ari/config.c
@@ -24,8 +24,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config_options.h"
 #include "asterisk/http_websocket.h"
 #include "internal.h"
diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c
index 456d9c08b4c5f0f169949adea4f5ccb824e7647c..fc93b28e228c98db416837e17cfdc7fdb2493b46 100644
--- a/res/ari/resource_applications.c
+++ b/res/ari/resource_applications.c
@@ -26,8 +26,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis_app.h"
 #include "resource_applications.h"
 
diff --git a/res/ari/resource_asterisk.c b/res/ari/resource_asterisk.c
index a54ce5c325f144ff1badc0bed37a63963b634ebf..e76eb02bccce632330f4204879afdd5eb73b0149 100644
--- a/res/ari/resource_asterisk.c
+++ b/res/ari/resource_asterisk.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/ast_version.h"
 #include "asterisk/buildinfo.h"
 #include "asterisk/logger.h"
diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c
index 28c3e43605217b3df433feacae05633ef6ac2746..f5ae1c003acd178eebfe33f4db0018b9d28286ad 100644
--- a/res/ari/resource_bridges.c
+++ b/res/ari/resource_bridges.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_bridges.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_bridges.h"
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index afb4627a07c2eea30c9d6c56bc250f2693b92469..6027a8059a9d80c56fe6168235d9f824fbc419d8 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/bridge.h"
diff --git a/res/ari/resource_device_states.c b/res/ari/resource_device_states.c
index 493d7a1ee9f72dfc211b4aa2360c0d5a096b1891..020d9301f2792279f591f9bd30cf12c98c5bb4dd 100644
--- a/res/ari/resource_device_states.c
+++ b/res/ari/resource_device_states.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_device_states.h"
 #include "asterisk/stasis_app_device_state.h"
 
diff --git a/res/ari/resource_endpoints.c b/res/ari/resource_endpoints.c
index 10b49e38c1ba9d5c3ddf7b57f1f13eafc632ba54..e0bbcb53367f38975bb33cf0c6bedaffa4266b5e 100644
--- a/res/ari/resource_endpoints.c
+++ b/res/ari/resource_endpoints.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_endpoints.h"
 
 #include "asterisk/astobj2.h"
diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c
index 8fa15f5aa069d7eec2cd28186c0294023e3e33af..597f4dfeb6f150d8fef7eb305c1a1aeae5e85eac 100644
--- a/res/ari/resource_events.c
+++ b/res/ari/resource_events.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_events.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c
index f899ee476dd20a023ae8743ac5595e02910ec15f..3577e6515332653bf52abd718f8d1a4e5f3d51c3 100644
--- a/res/ari/resource_mailboxes.c
+++ b/res/ari/resource_mailboxes.c
@@ -31,8 +31,6 @@
 #include "asterisk.h"
 #include "asterisk/stasis_app_mailbox.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_mailboxes.h"
 
 void ast_ari_mailboxes_list(struct ast_variable *headers,
diff --git a/res/ari/resource_playbacks.c b/res/ari/resource_playbacks.c
index f2751f70d15d780fd0c2e0140767b4da18fe52a5..57f424c016f4b7cbf7244ef60bff6ff22b86f3e4 100644
--- a/res/ari/resource_playbacks.c
+++ b/res/ari/resource_playbacks.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis_app_playback.h"
 #include "resource_playbacks.h"
 
diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c
index 5661d608d90dfadaa9d764f824ea97aa7419b750..39ef65ce34fb6ba959447903fa824406b94ec0e0 100644
--- a/res/ari/resource_recordings.c
+++ b/res/ari/resource_recordings.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis_app_recording.h"
 #include "resource_recordings.h"
 
diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c
index a1420eaf220d58350042874c843c73a3fcc008ea..59ace5d81fab7f4e26eaaf6cf5f2d71cda677129 100644
--- a/res/ari/resource_sounds.c
+++ b/res/ari/resource_sounds.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_sounds.h"
 #include "asterisk/media_index.h"
 #include "asterisk/sounds_index.h"
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index 1c95b6f03f02af775b7b28b17e8725a78b875185..dd2fb75879e2c180f35e26f4913bf88543a1cab9 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index 4eb3f71ed4f2bfb58db2d75cd107714195fe8991..3fa7e42b31ecd9bc0d5894f70f1f24378fa5bdcc 100644
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "res_parking.h"
 #include "asterisk/utils.h"
 #include "asterisk/astobj2.h"
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index 89f553d9cfe82da14f6482db573645a82daa8fed..6d0a4c06cbf34a285cab37f055fb4d996f69c49a 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/res/parking/parking_tests.c b/res/parking/parking_tests.c
index e6ea9f945f081b01efc01661eef6ca2f7bab3053..15727882342eb31595096a5a448e240d31788944 100644
--- a/res/parking/parking_tests.c
+++ b/res/parking/parking_tests.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "res_parking.h"
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/res/parking/parking_ui.c b/res/parking/parking_ui.c
index 7d4726cc210db3cf5bd32387276a9868fcb0b541..f12963a2bafa5f194baae5db321536b6ec68e6f4 100644
--- a/res/parking/parking_ui.c
+++ b/res/parking/parking_ui.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 314a4eabd75bfb5ff914d32e7a28e4904adb18df..698f935fbb0cd183b9175c6adbf284d5d35d5eaf 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <math.h>
 
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index c6306abb84c08389bb2dca89981eeb402f83e9c7..3539eb8432f5c7dccf3d31968fd74565f3f0ae18 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_agi.c b/res/res_agi.c
index e0eb8e2ecbff75d43fdce9fa7429cf919324b8c5..06e8a03e2513e8f9abf362342e9bd5cc7e6ce3c4 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 #include <signal.h>
 #include <sys/time.h>
diff --git a/res/res_ari.c b/res/res_ari.c
index eb15a88b85dda89389f4fddfce3c5a0aea5849f3..e19881515ae80e9271c81dedced07a395f4ec579 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -140,8 +140,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "ari/internal.h"
 #include "asterisk/ari.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 7ce9722fd2b62e7952f4ddb352786ac7b732b869..006d30ca84f0430740e0c658497b05cd874d3706 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 71f72eea1c4b612d0eb5b1865c4c3a17539e4da3..5dbf3415c2941990285333f5a9bcae3ad1be9fb9 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index a60b7010a30d59a14ced39865f26c5f02971fc7a..29fb07582deb79a04e8a38a42547bd3860263b3a 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 9e8eeb4e901b359f7768d2f78091394f760028fa..252bc4fff2b508481e45c5a5dfa441456077cf98 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index c3876af8bbef7d4bcc3ace6213291acbadefadee..39e678fc43d2f5884032be64528301965a75a57e 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index fd385313c08b0f17d28817bb27fda3f87e2e641e..5307cd1de3db2383a6c45d6342048707a3aacc81 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 40a18b8fb865fbd2234b342ff4802cb82b29e9c3..36c9b06d8eee2febf5115e7ff20c31fc068532d1 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 5b0532309088075652bba2aa4481af72e69a055a..4d418fe5320963e0840bfffb945bc9e24f8b42a5 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_model.c b/res/res_ari_model.c
index 14265cdce97e10ae7aab109bd12fff908ab08331..dd8e1af388abca4bfbf3935931c50a4ced787bc8 100644
--- a/res/res_ari_model.c
+++ b/res/res_ari_model.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "ari/ari_model_validators.h"
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index b4dfd1c1cf98a38bb1958141ca19a5a5851747cb..9678830cead6e2a8b8e22b74f89dcb9095e2b128 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index aee3d3d2ad69d32fb7d28a08cf3254f8708fc8ce..a43bbdd930a97c0135bf7c4c86d2387046c96f21 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index f5a1d41abcaf68bb02f71fe78be91fe6a9641b70..eb4bbb3f78b761898d6cee7e233ae3e838cd0831 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -40,8 +40,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/res_calendar.c b/res/res_calendar.c
index 029ecebd07bc32d3121fd27076ce3ff2efe33ab3..46775507cd939c810804c0bb09478ae354e3ebfd 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -38,8 +38,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 #include "asterisk/channel.h"
 #include "asterisk/calendar.h"
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index 590408571fe3bfa89f6508986143366db7ad78c7..11650375bd82618a5526b31d6e35ea361fd362f4 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
index 05133a2a91af99eee6865093dc2d34d163ee4bc8..998188dcfa8ad736fdfe31c36a715df3eea301ec 100644
--- a/res/res_calendar_ews.c
+++ b/res/res_calendar_ews.c
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ne_request.h>
 #include <ne_session.h>
 #include <ne_uri.h>
diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index 577d65ba6966a387f5e82705ceee578b0c0cb047..7292ecc46bcded3ffa7afdeda0773fa94d2fb16b 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 507f19cbf50f94ccc9df3f9474e3ed95f1168ca8..33480608aadbfc5519bd35e55bf84d94d81c0999 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -28,8 +28,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index dfca39a8bf59d873363622a0a15c3fd28abf60bf..9a26db78c2c57e27b7a19647bc0d3161555139bf 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/stasis_channels.h"
 #include "asterisk/stasis_message_router.h"
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 74d763ac7fddae75658648fd4eadca3e366df7d4..1a2fc6939964c6927311d57841d12f46781ce8f1 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 451b1745de184b4fa3b5f32a40e909affea9aec1..37df8ed6580d61920050f5dd24cc901fb28334c9 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/res/res_config_curl.c b/res/res_config_curl.c
index 7b571d549b7eb059109dca0be50f3f12039aaa73..9ad7a6e3db7bddec8218cbd097f3adbabcfb2f64 100644
--- a/res/res_config_curl.c
+++ b/res/res_config_curl.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <curl/curl.h>
 
 #include "asterisk/file.h"
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 8454273799a19ab58021a7286ca5d7b8b913602e..5e95853d462def6eef468ed05c77b857e16dc960 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -53,8 +53,6 @@
 #include <stdio.h>
 #include <ldap.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
 #include "asterisk/config.h"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 161dc534501e997906c8f99098f91a85f7b437f8..5a25b6b5a0bf34c036fa0fe9d205c8cb584b493f 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 73f43ee2ccef0d2b6722f1637dd3c317637777e8..25a482705ae156745799369d4938268f9ab02f01 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <libpq-fe.h>			/* PostgreSQL */
 
 #include "asterisk/file.h"
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 4375c3960ea8ea4b54cbc4cc5be6cd9eccc8dea0..68594978736be45c13c9af46e1c706d8061ea5b7 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -86,7 +86,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <sqlite.h>
 
diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c
index a3061236883710bf3a1513d41ea6336e947db958..b5c70ec2da4d56954888beaf6dbabfcfc376a821 100644
--- a/res/res_config_sqlite3.c
+++ b/res/res_config_sqlite3.c
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sqlite3.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_convert.c b/res/res_convert.c
index 3ca596511aea865902735d051c8e2b6f6d98ed14..705e8922d9b463b75e9af4197abd5d03a1c7b7e2 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/res/res_corosync.c b/res/res_corosync.c
index dbb88469743fdc11f6221ee0f85cf31ac4be523d..79cd810cef422192639bd925b3324feeca85eeff 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include <corosync/cpg.h>
 #include <corosync/cfg.h>
 
diff --git a/res/res_crypto.c b/res/res_crypto.c
index e7cb728789cb847a662a25d87d1422af06dd1ff0..8f97ce9f8baf175f679836d53ebf6dc7eeb0ddc4 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/paths.h"	/* use ast_config_AST_KEY_DIR */
 #include <openssl/ssl.h>
 #include <openssl/err.h>
diff --git a/res/res_curl.c b/res/res_curl.c
index 0a781f190468ca470b7700935cd253fe3dbae31d..5c4363295520bf07ffad2b766358cf62d62c39f6 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -42,8 +42,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <curl/curl.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_endpoint_stats.c b/res/res_endpoint_stats.c
index 28e47d0d6f2f2e23b04486c5073b81f7a7ce9aca..249cbea9bb8c3326bd1c466b132a13cdcbdadd3f 100644
--- a/res/res_endpoint_stats.c
+++ b/res/res_endpoint_stats.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/stasis_endpoints.h"
 #include "asterisk/stasis_message_router.h"
diff --git a/res/res_fax.c b/res/res_fax.c
index f602ba9659d17740d38ae815339998e69b5861ef..b25b6d16d4a21f6102b25a2e4c641f6d1d441fcc 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -65,8 +65,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/io.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 46db86460b3cae40e9093669bb741508f7911e88..540a9021b0440592d5e783df4d40fdfe69d326c5 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -52,8 +52,6 @@
 #define ASTMM_LIBC ASTMM_IGNORE
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/strings.h"
diff --git a/res/res_format_attr_celt.c b/res/res_format_attr_celt.c
index 7d3f753ff9c1b517913221c332c34140e113df9b..4b923761ffbfa600ca9834aadeb428dd7bfc80d2 100644
--- a/res/res_format_attr_celt.c
+++ b/res/res_format_attr_celt.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_g729.c b/res/res_format_attr_g729.c
index 5ba4920d96dd05c4d43bd690d793de39d3a57000..2b0cb02e28a4e43ab0d22a709b7f869f21b88af8 100644
--- a/res/res_format_attr_g729.c
+++ b/res/res_format_attr_g729.c
@@ -22,8 +22,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_h263.c b/res/res_format_attr_h263.c
index d65a89fea336e8cb8cc46625a457172c8868c9e0..139fbf17aa9dba959cda1f4cf6df39ebf00f1db8 100644
--- a/res/res_format_attr_h263.c
+++ b/res/res_format_attr_h263.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_h264.c b/res/res_format_attr_h264.c
index ccf2176f2d6ccf791d1597501b9d9ce93bbeb2f9..29d495bc7723f029ecf465442e63fb659a0afa76 100644
--- a/res/res_format_attr_h264.c
+++ b/res/res_format_attr_h264.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_opus.c b/res/res_format_attr_opus.c
index dfdf9b6d6acfd1d8c4b4667dc8b346710f781824..a3e48e3de797ce27709f9ef97b32b72737142872 100644
--- a/res/res_format_attr_opus.c
+++ b/res/res_format_attr_opus.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 #include "asterisk/logger.h"
diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
index e69e3f43c1f63b7a2f383fd7ea51f116d0fe268b..d2f9b35449c1b247eaf2539c4138e68b0bdb5a8d 100644
--- a/res/res_format_attr_silk.c
+++ b/res/res_format_attr_silk.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_siren14.c b/res/res_format_attr_siren14.c
index 335b575980ba0a6d3ec4238f5bca6769043e7216..2cc2a2f2c859d00c4fd53d663609d6ac392e47f4 100644
--- a/res/res_format_attr_siren14.c
+++ b/res/res_format_attr_siren14.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_siren7.c b/res/res_format_attr_siren7.c
index 7aef019dabea622826d050f6a95f2ff41812406d..7f4f165ffa1e7a1f2ae21d6ecdb87a73c6b03832 100644
--- a/res/res_format_attr_siren7.c
+++ b/res/res_format_attr_siren7.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 
diff --git a/res/res_format_attr_vp8.c b/res/res_format_attr_vp8.c
index 777239aaea92fd9ae0b9e6c7d509425d06064a59..f9babd8715ae4ac4a9a8e99843e3a6f60c044a17 100644
--- a/res/res_format_attr_vp8.c
+++ b/res/res_format_attr_vp8.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 #include "asterisk/logger.h"            /* for ast_log, LOG_WARNING */
diff --git a/res/res_hep.c b/res/res_hep.c
index e79f2b67abc0ba72f115e2912fa6d083e8ab7535..3bbf4c51ebcb733098d2c0318e74885c8963e783 100644
--- a/res/res_hep.c
+++ b/res/res_hep.c
@@ -85,8 +85,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/config_options.h"
diff --git a/res/res_hep_pjsip.c b/res/res_hep_pjsip.c
index a3a93e9b28a2ef8ce3308bdb164b978681cef898..358cbc934e127bf14c9ad8aff26e4514ceefe98d 100644
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjsip_ua.h>
 #include <pjlib.h>
diff --git a/res/res_hep_rtcp.c b/res/res_hep_rtcp.c
index 03db181596606a1b5e37a296d7448267f6cef0b0..25b90c7a266259d8957234e7c422f4b060eb5dee 100644
--- a/res/res_hep_rtcp.c
+++ b/res/res_hep_rtcp.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/res_hep.h"
 #include "asterisk/module.h"
 #include "asterisk/netsock2.h"
diff --git a/res/res_http_media_cache.c b/res/res_http_media_cache.c
index 2207b96ddd4c4fe73e93cd815cf2c3649c12d5e3..8c67285866a0340855bcde4cfae28d72dfe2ec37 100644
--- a/res/res_http_media_cache.c
+++ b/res/res_http_media_cache.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <curl/curl.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_http_post.c b/res/res_http_post.c
index 37fc4fa091ca603459363cc4169e2f6d35f799e7..241edfe5937f9ba396e7a28eef14b31d17b533dd 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <gmime/gmime.h>
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index d63caec3e716b9353e675fd17390828996e64181..28bf45fc8cedc10fd98eb84523595c3a6d09a1e3 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/http.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_limit.c b/res/res_limit.c
index d844efe8c95ed665b7d5cd1e8eea7219bb3780a3..bff777d99095cd158deda5f690b5bd2deb72ec58 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -24,8 +24,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 6fee0c2a08c320f61fe6896e3b09c304b8e8dd60..2ab52d87304d1f1dfe8d36ec210e26a26d2daa3c 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -29,8 +29,6 @@
  
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 #include <libgen.h>
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 3c7199ef4594bdf6b5194e7acf6244d7ae512f98..3a751ecce611db0a8b608b78694491361140b8e8 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <signal.h>
 #include <sys/time.h>
diff --git a/res/res_mutestream.c b/res/res_mutestream.c
index e9b11dcc307dbf78766bf54d2cec9eb4880f671c..8040a3ac9bdbea36f18ecf3c5e14829c1af4f82e 100644
--- a/res/res_mutestream.c
+++ b/res/res_mutestream.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c
index 3499885a5b211cbe8731540c6b24451aa11cb0d5..d797991968ea5cdaad0875798944d9e1aa7c07d4 100644
--- a/res/res_mwi_external.c
+++ b/res/res_mwi_external.c
@@ -54,8 +54,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/res_mwi_external.h"
diff --git a/res/res_mwi_external_ami.c b/res/res_mwi_external_ami.c
index 7777214cd7af074da5ce84018e5da98841ee5ec0..516969b1d50fa12c0f615a7cb5324498ed0ca212 100644
--- a/res/res_mwi_external_ami.c
+++ b/res/res_mwi_external_ami.c
@@ -127,8 +127,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/res_mwi_external.h"
 #include "asterisk/manager.h"
diff --git a/res/res_odbc.c b/res/res_odbc.c
index b207049fef4c29074e89789dba6afca243054cf1..0b81bc6396feb81aba31b994f69830b1fbb54b53 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -48,8 +48,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
diff --git a/res/res_parking.c b/res/res_parking.c
index 78ae481ba7557b72884af41f447aa106674e124d..171fdce61524cb0f7fe3121a5c1bdd7c49102e0a 100644
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -233,8 +233,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "parking/res_parking.h"
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 2e4f87362354a4780533c78ec5dc1e1e43af4b9d..132c842ad6af353726c9a8999d9e5bf78afd14b8 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -52,7 +52,6 @@
 #ifdef SOLARIS
 #include <sys/sockio.h>
 #endif
-ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/res/res_pjproject.c b/res/res_pjproject.c
index 151c99603d35c7a8e53af5079aa5dba149e16d68..66c95f2b7543daccf3cd957fdb203fee321d3e61 100644
--- a/res/res_pjproject.c
+++ b/res/res_pjproject.c
@@ -77,8 +77,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <stdarg.h>
 #include <pjlib.h>
 #include <pjsip.h>
diff --git a/res/res_pjsip/pjsip_scheduler.c b/res/res_pjsip/pjsip_scheduler.c
index a5d406cb58924de7073cbe5ce6ede17fc670a8fe..27202c602f163b7c10ac58a74bbe94b4671984b2 100644
--- a/res/res_pjsip/pjsip_scheduler.c
+++ b/res/res_pjsip/pjsip_scheduler.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/res_pjsip.h"
 #include "include/res_pjsip_private.h"
 #include "asterisk/res_pjsip_cli.h"
diff --git a/res/res_pjsip/security_events.c b/res/res_pjsip/security_events.c
index f07265a320df61bf578bcf83ea809e15a5d295d8..b8a8d521225fbcf770f27b0eecb3e80cb9a906f7 100644
--- a/res/res_pjsip/security_events.c
+++ b/res/res_pjsip/security_events.c
@@ -26,8 +26,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 
 #include "asterisk/res_pjsip.h"
diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c
index aec923dfaa50ba8ecc5eca4a2e82906d88c9fc53..2441184a24350b660475ea575d6e3b04b3c5fe47 100644
--- a/res/res_pjsip_config_wizard.c
+++ b/res/res_pjsip_config_wizard.c
@@ -39,8 +39,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 #include <pjsip.h>
 
diff --git a/res/res_pjsip_dlg_options.c b/res/res_pjsip_dlg_options.c
index 34151244b1a7dfeca24adf27b150c0bd1989f5c0..e2ed29a2c62b27ad8a8ab1c3309839f45df4540d 100644
--- a/res/res_pjsip_dlg_options.c
+++ b/res/res_pjsip_dlg_options.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjsip_ua.h>
 #include <pjlib.h>
diff --git a/res/res_pjsip_empty_info.c b/res/res_pjsip_empty_info.c
index 09109ba2c3b3d2c49eff4e3d390dd92e6c0885fe..774f9de7e0138349f5e1fb534bf75c8f5994dff6 100644
--- a/res/res_pjsip_empty_info.c
+++ b/res/res_pjsip_empty_info.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <pjsip_ua.h>
 
diff --git a/res/res_pjsip_history.c b/res/res_pjsip_history.c
index 339aecb74ca4ea9b7b32c819446303e2d4b1bf92..41c5bdf69640e94887a5a2522d492e1d2a16a754 100644
--- a/res/res_pjsip_history.c
+++ b/res/res_pjsip_history.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include <regex.h>
 
diff --git a/res/res_pjsip_logger.c b/res/res_pjsip_logger.c
index 427cb6fb7d81919de26b93feb60eec93d1d50604..d29a6e213673dbbf89b99679daf4837b16421c6b 100644
--- a/res/res_pjsip_logger.c
+++ b/res/res_pjsip_logger.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 
 #include "asterisk/res_pjsip.h"
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 6d6f3f12f49a69bb0cb92c089d3f4820b277490e..037b8e45fc4ce85129073c40e9efcd603d3825bb 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -38,8 +38,6 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 #include "asterisk/format_cap.h"
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index b052cc428cbdf9ea8e3c89e000e5db1d2bb1ed15..adc99c30d6b71d1272e8f0103046cfa8779a2d89 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -37,8 +37,6 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/udptl.h"
 #include "asterisk/netsock2.h"
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index fedd069dfab105fa834efa3d8027ebc04c7fc67c..4f694487543f2b0e11fee23a8723d61237bc8ebf 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/res/res_realtime.c b/res/res_realtime.c
index e7ef21222f9664dda3eb9e02fd6da0db0106cd84..9e487a83fd9f240f56972e3523aa4dca37a1be1a 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_resolver_unbound.c b/res/res_resolver_unbound.c
index 348e04f9340ea6446088d675bae5d84ad83b8aa4..1877bbcc437805e7d6cafa84ae344c406340468c 100644
--- a/res/res_resolver_unbound.c
+++ b/res/res_resolver_unbound.c
@@ -23,8 +23,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <signal.h>
 #include <unbound.h>
 #include <arpa/nameser.h>
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index cdf0c560d0a9cbb216ceb3c9254cf0a7cd0fbc9b..79b8d4f4dce74fe92445d3c820e287a57fe3d795 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -35,8 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/res/res_rtp_multicast.c b/res/res_rtp_multicast.c
index fce4926594649f9ed3965de9274bafb18860e862..42de11f65e8239fbcd3e0e065c4ff6755a981552 100644
--- a/res/res_rtp_multicast.c
+++ b/res/res_rtp_multicast.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/time.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/res/res_security_log.c b/res/res_security_log.c
index 94a78d8039d9f74d7ee3bdf0744e6441b826aa69..555ba23c1843d6cb17f495de718ae922964c623a 100644
--- a/res/res_security_log.c
+++ b/res/res_security_log.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
 #include "asterisk/threadstorage.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index 770ac62d2d2b3f0a8ca02f58eb6e9f2b82dde303..4c7a45164c29357f4364434bac4166ba61107a7c 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -46,8 +46,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <termios.h>
 #include <sys/time.h>
 #include <time.h>
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 7eef9f85bec62f4d0f2017d622e67edc875af898..f9f064e557090fec8140c1afe15c208e7725d53d 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 
diff --git a/res/res_sorcery_astdb.c b/res/res_sorcery_astdb.c
index 79db66808894448446036b7520f66b1cd833dc02..8d16335116832bc8707f85f4a2d15287315e4b7f 100644
--- a/res/res_sorcery_astdb.c
+++ b/res/res_sorcery_astdb.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c
index 852537b19a641431e59df9add42af22cc4d6b779..0de34c64018b1356ff526dc43b35fb3af2e7860f 100644
--- a/res/res_sorcery_config.c
+++ b/res/res_sorcery_config.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_sorcery_memory.c b/res/res_sorcery_memory.c
index 774c9552a60e0195e409a665f1046c7ef396c8c4..57d5eace03d43d3d6b368e5953d072a29f7edda1 100644
--- a/res/res_sorcery_memory.c
+++ b/res/res_sorcery_memory.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c
index f1fb3c38c59373ae9c13c4e61f045fad57ee0001..4ce4e18e9a0508a95b2d36e886b436503903aaab 100644
--- a/res/res_sorcery_memory_cache.c
+++ b/res/res_sorcery_memory_cache.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/sorcery.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_sorcery_realtime.c b/res/res_sorcery_realtime.c
index 4023654ab278db38c454d03005de15e1aa702f8b..3f114046c762232855415a0035358658cd9adc69 100644
--- a/res/res_sorcery_realtime.c
+++ b/res/res_sorcery_realtime.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/res/res_speech.c b/res/res_speech.c
index 1505ca428da2a40b108ef347bd413004a91646b2..d6c5329714a7afdf08d3500f431eea28533e062f 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 1fb16ce6b9486f06fc49fdd70dfc1a80b8169ac6..a611e61657f70c7b8a23c25b972811caa2cd6db1 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -37,8 +37,6 @@
 
 #include "asterisk.h"                   /* for NULL, size_t, memcpy, etc */
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>                       /* for pow */
 #include <srtp/srtp.h>
 #ifdef HAVE_OPENSSL
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 464f7c42f1b228ea18bf7e8998164f12a1457e6a..8e596d557a1dda8f25fbdcf353375d1fa7b01949 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -53,8 +53,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/callerid.h"
 #include "asterisk/module.h"
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 830de8015ccdae582a29e71bc6261f98336d53c4..407a6313546f3d44ebe1d39e78b8fe79e197b013 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/stasis_app_impl.h"
 
diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index 453bfae6d61a7b7a0e6e70508f28698ac8a83413..8b5375910753ccfe3dd4e553044a1deb4e7886ce 100644
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -23,8 +23,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astdb.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index e34cb2058fafeed2830953c1fca2631a27c8aa11..4522adc10d830cc7c88fce908469c68fdbca67bc 100644
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -24,8 +24,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astdb.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index cfddb3af56dcf5cae298fc5aa17be24dfcc91934..4370f17121ddfd4ea851daefdfccd855097af601 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/bridge.h"
diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index af5c41e877c3bb8c5566e9c51c7edeb28add9db6..630205c34d5cd378dfb4df6d74d8b08ac86c9b94 100644
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/dsp.h"
 #include "asterisk/file.h"
 #include "asterisk/module.h"
diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index e5b5bf6046464ecf364e466e5963b552652318c2..cd51638ea918519d6ca8a32ef00207cb9929a163 100644
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/stasis_app_impl.h"
 #include "asterisk/stasis_app_snoop.h"
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index efdbc4b529fb2e6bb12222193a5d9dba1e0e0c7c..8b5bad7aea221e3ec126f3b60416171a52846eb8 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_test.h"
diff --git a/res/res_statsd.c b/res/res_statsd.c
index f3a64e0f8ef95c1dedcd6429f0f3163def194ea2..22c4ba2e700075180966d48b32fcef0a33ccb15d 100644
--- a/res/res_statsd.c
+++ b/res/res_statsd.c
@@ -52,8 +52,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config_options.h"
 #include "asterisk/module.h"
 #include "asterisk/netsock2.h"
diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index e1bd85b4f08bed2b0b329516e320f42a39529f68..46deaff75470c69fdfe3448c141f96a16e805981 100644
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/sched.h"
 #include "asterisk/config.h"
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index 23fb8e35860575ae1a0169daa5c8fb6b4a0b7987..af2087599b5632dcb204bc038d57fe10b806116e 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 6476e74fb0c22ddcd0f51ed58dc7dfbf1fffacbc..09952f92906ba3a39bee9d519fe52c6f51c8a7e7 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include <stdbool.h>
 #include <math.h>
 #include <unistd.h>
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 32e1dd1ffc9fa804f6c36585995350709118c9db..1aa865cd6267f1e9818b6d2c60b2291de69a0d47 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -48,8 +48,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <ctype.h>
 #include <iksemel.h>
 
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index f0e089fb6f2854768caa2b30fcdcb62eeecbe682..7ff78d56e3e7b066219f9e5d5ad429435e4d1273 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -22,8 +22,6 @@
 #define ASTMM_LIBC ASTMM_IGNORE
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 /*
  * There is some collision collision between netsmp and asterisk names,
  * causing build under AST_DEVMODE to fail.
diff --git a/res/stasis/app.c b/res/stasis/app.c
index 8bd1bc05aba27ff17faf8a709423e66f52c73c77..3301d926c9e08385ee8c518a1152a7cb58e79682 100644
--- a/res/stasis/app.c
+++ b/res/stasis/app.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "app.h"
 #include "control.h"
 #include "messaging.h"
diff --git a/res/stasis/command.c b/res/stasis/command.c
index 6298e88960bfa51457c227e6392c4bc5b2bd266c..05ebd7b1d2c2e606389f652b65bd53a90d0adf67 100644
--- a/res/stasis/command.c
+++ b/res/stasis/command.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "command.h"
 
 #include "asterisk/lock.h"
diff --git a/res/stasis/control.c b/res/stasis/control.c
index 219a2c6cd27ffa02fcf84190a12123464322d875..503f111aad6217c44b7f3e627872d5df35d20c65 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/stasis_channels.h"
 #include "asterisk/stasis_app.h"
 
diff --git a/res/stasis/messaging.c b/res/stasis/messaging.c
index 16e167e8f439ecb9a9c1fd1a99fa868a75c96427..8dfd99608383fe8c996a40759ecc698d48182f29 100644
--- a/res/stasis/messaging.c
+++ b/res/stasis/messaging.c
@@ -26,8 +26,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/message.h"
 #include "asterisk/endpoints.h"
 #include "asterisk/astobj2.h"
diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c
index aa21ec29c3adad49b618d0df14696f349ddaddaf..95e549a295685bf06fc12aa4b9906dd3f9d98113 100644
--- a/res/stasis/stasis_bridge.c
+++ b/res/stasis/stasis_bridge.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/bridge.h"
 #include "asterisk/bridge_after.h"
 #include "asterisk/bridge_internal.h"
diff --git a/res/stasis_recording/stored.c b/res/stasis_recording/stored.c
index 50232c42754f4e5bbfbd8b88ec611afecd0f0a49..e25f9a7af59bf0cf89a0d64293c69b8a063d9b84 100644
--- a/res/stasis_recording/stored.c
+++ b/res/stasis_recording/stored.c
@@ -25,8 +25,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/paths.h"
 #include "asterisk/stasis_app_recording.h"
diff --git a/rest-api-templates/ari_model_validators.c.mustache b/rest-api-templates/ari_model_validators.c.mustache
index 78f19bf6697a6daec39f648cb6086f6a6a57e3bb..cd77da98bf12960d52434693889d2860b12af039 100644
--- a/rest-api-templates/ari_model_validators.c.mustache
+++ b/rest-api-templates/ari_model_validators.c.mustache
@@ -27,8 +27,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "ari_model_validators.h"
diff --git a/rest-api-templates/ari_resource.c.mustache b/rest-api-templates/ari_resource.c.mustache
index b8f20e675283e9a08da0c899b037127a1cbcb077..27e9099e549c0ca66dbd4d29d5f5aa7004e80563 100644
--- a/rest-api-templates/ari_resource.c.mustache
+++ b/rest-api-templates/ari_resource.c.mustache
@@ -26,8 +26,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "resource_{{c_name}}.h"
 
 {{#apis}}
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index c4e6f3d5418b8d50f26a53e796bbc5c539fbda82..d5c86158bcbd4a76fd00c17cada8b0560c14d43f 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -45,8 +45,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
diff --git a/tests/test_abstract_jb.c b/tests/test_abstract_jb.c
index 6274fb2ef8066f5fcabd2dfc0d7209abb8ceac28..53614bca136282a32cf812e98b8b16b609f38dee 100644
--- a/tests/test_abstract_jb.c
+++ b/tests/test_abstract_jb.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_acl.c b/tests/test_acl.c
index ff64bc15c54602d078313ee46272e8fe1fdfd32a..98eb4dcc048c0732b6fbcf3363366ca3e57771eb 100644
--- a/tests/test_acl.c
+++ b/tests/test_acl.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/acl.h"
 #include "asterisk/module.h"
diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c
index 5dda1017760566ccacdde6c5fc2e9ab45095b9f6..1297cb57ffcc3760bba094fdb2f584e3e31244fb 100644
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_aoc.c b/tests/test_aoc.c
index 2f7336fe25ec337f044578188030a71955ae8c34..9d1e230ffc22dbdb535b5580761afc35025ee506 100644
--- a/tests/test_aoc.c
+++ b/tests/test_aoc.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_app.c b/tests/test_app.c
index f81290eaedaeadfc4524f30259cb9fc8c60f97d6..f3dd135b14b4259d8fcf6ea678bde960d81487e1 100644
--- a/tests/test_app.c
+++ b/tests/test_app.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_ari.c b/tests/test_ari.c
index da889ec45d510122847627af1d79e641a6cb5c1c..1bd77496ff6473db0bb7d566190858c0b8f7c4f1 100644
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/test.h"
 #include "asterisk/ari.h"
diff --git a/tests/test_ari_model.c b/tests/test_ari_model.c
index 6c5c14d507dab8ebddc760624e70b3493512964c..caf411878937fc234e6fe1e296df2bb8e692f502 100644
--- a/tests/test_ari_model.c
+++ b/tests/test_ari_model.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_ast_format_str_reduce.c b/tests/test_ast_format_str_reduce.c
index db9f1a2a2e34bcb5613bfdb92db358632e503a8e..a5c1af79894298f7e0396ea9433af7bd50173bfa 100644
--- a/tests/test_ast_format_str_reduce.c
+++ b/tests/test_ast_format_str_reduce.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/file.h"
 #include "asterisk/test.h"
diff --git a/tests/test_astobj2.c b/tests/test_astobj2.c
index 9297fb3c057a5336e51603003ed00b9e2b73bc5a..827ebb55bbcaea8fcfdfa9a59fb7a6a044d64619 100644
--- a/tests/test_astobj2.c
+++ b/tests/test_astobj2.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_astobj2_thrash.c b/tests/test_astobj2_thrash.c
index ef0da44ca5b8921a7debed5c543bd54b70a6b8c5..a3592468d911e250ab2801bff9f0cd425e886560 100644
--- a/tests/test_astobj2_thrash.c
+++ b/tests/test_astobj2_thrash.c
@@ -35,7 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
 #include <pthread.h>
 #include "asterisk/astobj2.h"
 #include "asterisk/hashtab.h"
diff --git a/tests/test_astobj2_weaken.c b/tests/test_astobj2_weaken.c
index 6a5eaeb99b6e78f7adb0554878187f2cb3d8cc5c..2755b6e52d9c01070f426784395540b70ebc63f6 100644
--- a/tests/test_astobj2_weaken.c
+++ b/tests/test_astobj2_weaken.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_bucket.c b/tests/test_bucket.c
index eb8fc902886bd6c30d6dee14cd7ad4763b7e082a..2b6e059c37098c9ea83188424302fa4fd77827d1 100644
--- a/tests/test_bucket.c
+++ b/tests/test_bucket.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/test.h"
diff --git a/tests/test_callerid.c b/tests/test_callerid.c
index 5f7af2b6c831380582a9dcf71a52877943398f3c..c7aafacf9cb88f51c0171027522d2de3f4655410 100644
--- a/tests/test_callerid.c
+++ b/tests/test_callerid.c
@@ -34,8 +34,6 @@
 #include "asterisk.h"
 #include "asterisk/callerid.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_cdr.c b/tests/test_cdr.c
index ef9e76d0dbe0038bae21ea3be2e0e23777a98e27..bdbffccbc9e26382bde30d73a5adc8cda3b5d419 100644
--- a/tests/test_cdr.c
+++ b/tests/test_cdr.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_cel.c b/tests/test_cel.c
index e54fb5984517c6eb7ebf665229541c0e7021ac92..c9ceaf93c94b3154544ba1b767f1998ea50b1424 100644
--- a/tests/test_cel.c
+++ b/tests/test_cel.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <math.h>
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_channel_feature_hooks.c b/tests/test_channel_feature_hooks.c
index 94037e2fa50c6b4bdc81fe06f4d650fb761777ec..c9fdf098377fcfa87a5bec3a0e5690b2cadb3674 100644
--- a/tests/test_channel_feature_hooks.c
+++ b/tests/test_channel_feature_hooks.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/test.h"
 #include "asterisk/channel.h"
diff --git a/tests/test_config.c b/tests/test_config.c
index eb5409b3a1370f3bf8656dfaef29ff3ff6c763b8..6635c6f78a1156d2a765afde7a02f6f69254c047 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include <math.h> /* HUGE_VAL */
 #include <sys/stat.h>
 
diff --git a/tests/test_core_codec.c b/tests/test_core_codec.c
index 7e5677022c6e9b6b721aeabfdda5c91e4e00119e..1da21cdc29610333baa9cdc6e41996c371f6ae2f 100644
--- a/tests/test_core_codec.c
+++ b/tests/test_core_codec.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/codec.h"
diff --git a/tests/test_core_format.c b/tests/test_core_format.c
index 2140029726a0b41a250d2e1792a5239125bb74d1..a697f8e7d599e1cc2c943a72be60a6b418333d96 100644
--- a/tests/test_core_format.c
+++ b/tests/test_core_format.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/codec.h"
diff --git a/tests/test_db.c b/tests/test_db.c
index f4ce515847af2a06bf9e9e4fbb2ed20d28d94b28..cfd036d20dfc73450c0e0a3425e835170555175e 100644
--- a/tests/test_db.c
+++ b/tests/test_db.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/astdb.h"
diff --git a/tests/test_devicestate.c b/tests/test_devicestate.c
index 52e0fe6956641bcf749835ae46f0b85d68b37643..afefeb0f032badf6b4333481d2f5af4887418b2b 100644
--- a/tests/test_devicestate.c
+++ b/tests/test_devicestate.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_dlinklists.c b/tests/test_dlinklists.c
index 581bf4d5804935248fe334b6d5570d09b46daea1..81c10b20d217303d8d7891d349c8fbeb5cb4456a 100644
--- a/tests/test_dlinklists.c
+++ b/tests/test_dlinklists.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/tests/test_endpoints.c b/tests/test_endpoints.c
index d1239037b8e0c8d6fddd620013e580ec32148282..85c4e76df9837cb2841c40fb94b7c1e41cff29ac 100644
--- a/tests/test_endpoints.c
+++ b/tests/test_endpoints.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/endpoints.h"
 #include "asterisk/module.h"
diff --git a/tests/test_event.c b/tests/test_event.c
index 0290a269761f60f753eeb4cea230fac4bfb51143..70a93d4e27b8dd3f2596f6d15b187dadaaa5dd44 100644
--- a/tests/test_event.c
+++ b/tests/test_event.c
@@ -41,8 +41,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
 #include "asterisk/test.h"
diff --git a/tests/test_expr.c b/tests/test_expr.c
index 5ea86a34138ed9f385c55ef17ac83823323e4f4c..374f8574899a7c171dd322942b6e355b9d475c31 100644
--- a/tests/test_expr.c
+++ b/tests/test_expr.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_format_cache.c b/tests/test_format_cache.c
index b01b0da1c701d2a6957973ecee28613112ff5f9d..2ed9780c2e92752f35ee76acd9b90e2fdfaf81ba 100644
--- a/tests/test_format_cache.c
+++ b/tests/test_format_cache.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/codec.h"
diff --git a/tests/test_format_cap.c b/tests/test_format_cap.c
index 1f02c29cd369328a0bf53c64aadf47d390e9338e..096d17202b434d4377a741c69a7ea98806186ca2 100644
--- a/tests/test_format_cap.c
+++ b/tests/test_format_cap.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/codec.h"
diff --git a/tests/test_func_file.c b/tests/test_func_file.c
index a1e71b2707d72ecb368da81449e94cbd9ab9f3f2..43995fa08dd716efbdf190432a265ec4cfddcd79 100644
--- a/tests/test_func_file.c
+++ b/tests/test_func_file.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/tests/test_gosub.c b/tests/test_gosub.c
index e0f618cd5f813af75a066461eb833c2ea950cf0c..0a702cf866b20068c2fbd4a195aa496fa3fc1f7c 100644
--- a/tests/test_gosub.c
+++ b/tests/test_gosub.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_hashtab_thrash.c b/tests/test_hashtab_thrash.c
index 2f043c7b2b6d8759fd34502408e16a4ef46192ae..ee77c92c0305ff1ebc0b4c9662686a430e410c44 100644
--- a/tests/test_hashtab_thrash.c
+++ b/tests/test_hashtab_thrash.c
@@ -35,7 +35,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
 #include <pthread.h>
 #include "asterisk/hashtab.h"
 #include "asterisk/lock.h"
diff --git a/tests/test_heap.c b/tests/test_heap.c
index 76a6ecf3459433200265d4aa3c3a7662ce747e27..cb0b248478107378598bc954e53236cacae6e959 100644
--- a/tests/test_heap.c
+++ b/tests/test_heap.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
 #include "asterisk/heap.h"
diff --git a/tests/test_http_media_cache.c b/tests/test_http_media_cache.c
index 4cc4e38dc22ec282e489bcaa1ddea749ce64cbfa..23ebbdfdfde139e626caeeaec0dcc2f06b31d71a 100644
--- a/tests/test_http_media_cache.c
+++ b/tests/test_http_media_cache.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <fcntl.h>
 
 #include "asterisk/module.h"
diff --git a/tests/test_jitterbuf.c b/tests/test_jitterbuf.c
index 9f538ee09b6e5d14d52a7403d4e111c4e360c49b..76fb3c4fcc8882ae3b51fa4134046bd1cc12b607 100644
--- a/tests/test_jitterbuf.c
+++ b/tests/test_jitterbuf.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_json.c b/tests/test_json.c
index 7362a6127a132ef8d212cf9abf67e3efb6616295..fee17e7c2633dda0a0ba4c53928128d868156c24 100644
--- a/tests/test_json.c
+++ b/tests/test_json.c
@@ -37,7 +37,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
 #include "asterisk/json.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_linkedlists.c b/tests/test_linkedlists.c
index 4a17e6730c1c7b235539c8ac8196509321a7b989..5c3fcebb36ff68e4def3850db6884cfe9ac68388 100644
--- a/tests/test_linkedlists.c
+++ b/tests/test_linkedlists.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/test.h"
 #include "asterisk/strings.h"
diff --git a/tests/test_locale.c b/tests/test_locale.c
index a39e2a981a8df74ba4e7096fe96a2040f6c80554..7a591cb8b194c1af83bfc99102ada33ca55210e5 100644
--- a/tests/test_locale.c
+++ b/tests/test_locale.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/types.h>
 #include <dirent.h>
 #ifndef __USE_GNU
diff --git a/tests/test_logger.c b/tests/test_logger.c
index 1f7000a17f3a2a356bef8e696391a3b4eef6ea05..07a4c369b818cad19dc8fad6baf518917b1a0f31 100644
--- a/tests/test_logger.c
+++ b/tests/test_logger.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/tests/test_media_cache.c b/tests/test_media_cache.c
index 685693c3645613597b9816ae17e35d1be5000761..34f53190a139b13fd4057c686483594d9b5a75e6 100644
--- a/tests/test_media_cache.c
+++ b/tests/test_media_cache.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_message.c b/tests/test_message.c
index 017b84cf2d044af37ecde9098859521a99656bca..1d03d74a939e4cf1347d0830676a45a8abbb2e89 100644
--- a/tests/test_message.c
+++ b/tests/test_message.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <regex.h>
 
 #include "asterisk/module.h"
diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c
index 780b0b06f26a48c6b8aa2ff0f78c244b2384bf89..8a9579b395bdc225185fce71027a087d557c22ec 100644
--- a/tests/test_netsock2.c
+++ b/tests/test_netsock2.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/netsock2.h"
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index f7809d32ba181350bbd9dd9fbea2ec40f4d50639..5c773899f49bf60b8071bbef6ca252f42059660d 100644
--- a/tests/test_optional_api.c
+++ b/tests/test_optional_api.c
@@ -36,8 +36,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/optional_api.h"
 #include "asterisk/test.h"
diff --git a/tests/test_pbx.c b/tests/test_pbx.c
index 88451672d6ef9b23349334482236a4a350789654..576fe1fb889b511223af1ca3ff4ff307ae7f6e6d 100644
--- a/tests/test_pbx.c
+++ b/tests/test_pbx.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/test.h"
diff --git a/tests/test_poll.c b/tests/test_poll.c
index 10b0225cc1a815e12d83946a134469f3a227f8d9..a142ffc454513e7217fe75135539bcc5b01bbb48 100644
--- a/tests/test_poll.c
+++ b/tests/test_poll.c
@@ -39,8 +39,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_res_pjsip_scheduler.c b/tests/test_res_pjsip_scheduler.c
index cc5313fd6fd61cd39490fa2f6caa4a9467d2d939..da51d43be2b2cd9488867eb4200ae0b36b283ae5 100644
--- a/tests/test_res_pjsip_scheduler.c
+++ b/tests/test_res_pjsip_scheduler.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <pjsip.h>
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index 45989037323ece2eaa3d97accda9abce11bf5c1e..cb79fa6fea7754d6181c66c36364791027a7dd19 100644
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/test.h"
 #include "asterisk/stasis_app.h"
diff --git a/tests/test_sched.c b/tests/test_sched.c
index 23a5e3ddf8978057098055f6a87c36db1f73c320..e995c2c885c88d9f53db7e3e7b92661ff98d3e28 100644
--- a/tests/test_sched.c
+++ b/tests/test_sched.c
@@ -32,8 +32,6 @@
 
 #include <inttypes.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
 #include "asterisk/sched.h"
diff --git a/tests/test_security_events.c b/tests/test_security_events.c
index bdca9b15705a1276b085d0732b096c123a0d101f..0fa5ef1f7bc2bad2eafe202d707a7ad58965f0bb 100644
--- a/tests/test_security_events.c
+++ b/tests/test_security_events.c
@@ -30,8 +30,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_skel.c b/tests/test_skel.c
index b5063d255e0835821a94e08e7506c50e917f2e57..208751c95fe1c4b65e35bd2c6fb4b8bb8f104a54 100644
--- a/tests/test_skel.c
+++ b/tests/test_skel.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_sorcery.c b/tests/test_sorcery.c
index 5d96422aa904c5dec1b62cff31be6eb028c8878f..06623369574a861e51c4bc67f4a4fdddac57dd8d 100644
--- a/tests/test_sorcery.c
+++ b/tests/test_sorcery.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/astobj2.h"
diff --git a/tests/test_sorcery_astdb.c b/tests/test_sorcery_astdb.c
index d62e844e76e252cce97833d4f4f19cda22f1d3d8..62895960caf2a5a70c0e871d9b718b07e4c39dc7 100644
--- a/tests/test_sorcery_astdb.c
+++ b/tests/test_sorcery_astdb.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/sorcery.h"
diff --git a/tests/test_sorcery_memory_cache_thrash.c b/tests/test_sorcery_memory_cache_thrash.c
index d911e869ef1dc04e8f69d6693c99bd45c923829c..c0d25feb3465605780071165afc9c2b10d3da94b 100644
--- a/tests/test_sorcery_memory_cache_thrash.c
+++ b/tests/test_sorcery_memory_cache_thrash.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/sorcery.h"
diff --git a/tests/test_sorcery_realtime.c b/tests/test_sorcery_realtime.c
index 033bf5d6f649bd9d0487acab54cfe258232ee31d..8639c0f6f260222d7848c23a0ec5f5b97450aa5d 100644
--- a/tests/test_sorcery_realtime.c
+++ b/tests/test_sorcery_realtime.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/sorcery.h"
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 806fbf81fcdfda0a30fc292e04e1fa9151f91412..9d42d007cdcad12921780cbfc4442dd7722a61ea 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis.h"
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c
index fe320f29bca066c909b0eb85a7c440896b2e8326..57448736478ce1faa68c3e81d62a7d75d7f181d0 100644
--- a/tests/test_stasis_channels.c
+++ b/tests/test_stasis_channels.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis.h"
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 6e9727588991b8fb708ed69e271c3d93dd2a44d3..134738fee53e43f60c17551a1ecd3de1c1ed38b8 100644
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/astobj2.h"
 #include "asterisk/channel.h"
 #include "asterisk/endpoints.h"
diff --git a/tests/test_strings.c b/tests/test_strings.c
index 28f6e1606ba952e89af42e6a76bcd16619cb4b41..90b0d3606c751ba0e2781132993a29d1dd537fb1 100644
--- a/tests/test_strings.c
+++ b/tests/test_strings.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index c22f5e603d2a96b6290e05691859c3640101530b..ca84d002356012ac4e6ef1a29232fc6e630af6db 100644
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/tests/test_time.c b/tests/test_time.c
index fcba960b9fdd8ed1a2516bd30a52ef60cd8c7768..b58a4732b0861632a10337308dc7b74f906a9f3c 100644
--- a/tests/test_time.c
+++ b/tests/test_time.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/tests/test_uri.c b/tests/test_uri.c
index 8a78644eaa2c4e4b13c89491cba6a35dfca5d764..3004227a066609530c797af36bad5bb89f8b2f3d 100644
--- a/tests/test_uri.c
+++ b/tests/test_uri.c
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/uri.h"
diff --git a/tests/test_utils.c b/tests/test_utils.c
index abb0c3395b8b356321476229f2a6f566ba119efe..d8915ba28dad459bfe027253de51701e6c4d846d 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE();
-
 #include "asterisk/utils.h"
 #include "asterisk/test.h"
 #include "asterisk/crypto.h"
diff --git a/tests/test_vector.c b/tests/test_vector.c
index ff305b5d7e672e669185fd53ee908a6947e6c19d..8ca4efa1abf233e84bb5690abac56eaa0f368272 100644
--- a/tests/test_vector.c
+++ b/tests/test_vector.c
@@ -34,8 +34,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
diff --git a/tests/test_voicemail_api.c b/tests/test_voicemail_api.c
index fc371bad9c8692cab40f9d8194fae67e8e8fdf02..9cadf2394ed06aa95f874c2c49e62d8fa5d5060f 100644
--- a/tests/test_voicemail_api.c
+++ b/tests/test_voicemail_api.c
@@ -33,8 +33,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <sys/stat.h>
 
 #include "asterisk/utils.h"
diff --git a/tests/test_websocket_client.c b/tests/test_websocket_client.c
index ca8cb85ac89ace2e563908d44ea64af3f9ff31df..6743b53693aaf461746f4109acc3acf4811b861d 100644
--- a/tests/test_websocket_client.c
+++ b/tests/test_websocket_client.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/test.h"
 #include "asterisk/module.h"
 #include "asterisk/astobj2.h"
diff --git a/tests/test_xml_escape.c b/tests/test_xml_escape.c
index 5e6abc72ee989ff3dfbf2325a48d835bed05c871..a49d6c1166369f0c38d1bcbccd0444a737eef5f8 100644
--- a/tests/test_xml_escape.c
+++ b/tests/test_xml_escape.c
@@ -32,8 +32,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 1801b12b8cc31403fc6337ca9851d12cc35154be..f22e9a05b2e010710df6da44a636be946e5a4d84 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -18,8 +18,6 @@
 #include <regex.h>
 #include <limits.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/backtrace.h"
 #include "asterisk/channel.h"
 #include "asterisk/ast_expr.h"
@@ -32,8 +30,6 @@ ASTERISK_REGISTER_FILE()
 
 int option_debug = 0;
 int option_verbose = 0;
-void __ast_register_file(const char *file) { }
-void __ast_unregister_file(const char *file) { }
 
 /*** MODULEINFO
   	<depend>res_ael_share</depend>
diff --git a/utils/astman.c b/utils/astman.c
index a6803c8a58f73c9024a54999f17ff76b49f4abaa..63d7f5ada1ebd485995f1375606694d8751f7bd0 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -27,7 +27,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <newt.h>
 #include <stdio.h>
@@ -88,16 +87,6 @@ struct ast_chan {
 static AST_LIST_HEAD_NOLOCK_STATIC(chans, ast_chan);
 
 /* dummy functions to be compatible with the Asterisk core for md5.c */
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file)
-{
-}
-
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
-
 int ast_add_profile(const char *, uint64_t scale);
 int ast_add_profile(const char *s, uint64_t scale)
 {
diff --git a/utils/check_expr.c b/utils/check_expr.c
index abfb91dcfd8f286e5a6fa9bc2f6f060ce1e0d7bc..201fa04d214af2dbc916c1c99b08945e5082c0d3 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -21,7 +21,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ast_expr.h"
 
@@ -157,8 +156,6 @@ unsigned int check_expr(char* buffer, char* error_report);
 int check_eval(char *buffer, char *error_report);
 void parse_file(const char *fname);
 
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file) { }
 int ast_add_profile(const char *x, uint64_t scale) { return 0;}
 int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
 {
@@ -168,11 +165,6 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
         return ret;
 }
 
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
-
 char *find_var(const char *varname) /* the list should be pretty short, if there's any list at all */
 {
 	struct varz *t;
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 3ebc56e4ac49ffe72f9a288b8fcdcacbe702fa9d..1767d983337369169ab7382c3d959b174c49bcfb 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -28,7 +28,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* CONFIG_DIR */
 #include <locale.h>
@@ -79,15 +78,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file)
-{
-}
-
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
 int ast_add_profile(const char *x, uint64_t scale) { return 0;}
 /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */
 void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf,5,6)));