Merge "Remove ASTERISK_REGISTER_FILE."

82 files changed, 0 insertions, 163 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 3f3d11c25..9d73702f6 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 68bcfdead..4563b58a0 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 ace4df1dc..2169617ac 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 83da5330d..25649d4b6 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 f47db4534..f58ed3626 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 fda6ca5ed..34642a6af 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 0e03ad7ce..b17cddfb2 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 7862179f3..17dea431d 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 b98cd674d..67c7fbcbd 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 dbd49914c..af4b616f5 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 80c1ff03d..4f3b79197 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 df2deae3f..50d8d6321 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 a7fd92a37..d6229b93f 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 45580e4f0..cc557deea 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 51921a98e..6eaa1bd22 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 1376b6874..e3d550548 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 b5d8f50c7..d871f7f57 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 98e1fb154..43ea81a1c 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 cdcda0477..5ad29722c 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 c32bccb89..642b9b23a 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 ab8d3082f..8dc61ff64 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 8b32b93dc..0789ce06e 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 972e59f0a..0f4c94b8d 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 1695ee5b8..79c1b75b9 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 2bb1d8b53..273f96381 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 6e174d4a7..b7c39454f 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 19c9f3376..3e2e020b8 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 79ce0d0f1..f92b68d06 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 938e63ec4..72afa3dd1 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 4ff5cd610..acd8982ef 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 c896f9ef0..da0d3e67f 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 58201c450..4ca4b67c5 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 66751f541..b817309c7 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 2ec28b16b..38134e247 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 e5b0b9a41..bd9643403 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 61f3ab722..4ef525295 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 791f75eb0..36f5c7727 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 a736fd47f..3f076538c 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 c84b7d7dd..a060ad183 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 7d7a0cbf9..a5a00cc4e 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 8d06ac44c..048cf970f 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 05afe54b1..678f76d72 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 8175fc810..5f3bf0b92 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 f744b7a9d..99984f551 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 25f9510ff..d749a74ac 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 3543d0509..b52211074 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 2875ec2b4..35900e8f7 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 79e2a4576..59fb5ad66 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 70ec6562b..a9afe0222 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 51741d374..b40c1db30 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 1f586cb99..d1e14ed80 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 a0a3c5583..c406a93cb 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 fcd893876..ede50be26 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 55867bbeb..b44c1f6fe 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 c4efaf38e..b60c71e51 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 bca463024..5ed426eee 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 3b7f0ca2f..4417dec5c 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 36d554ee6..3a2225b6c 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 0f17d9bf3..0dbd4c58b 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 a748c3b4b..d053ecbe6 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 9660b4fd6..f74f7f9bd 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 7c34dca52..3a6a191e3 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 be8abbf58..008627cc3 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 ffe472779..81c58e8b0 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 e87aac643..5f8653981 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 7fcffb196..09179f7f7 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 6b5a64922..fbe2ea70f 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 94f746bec..2f0d77741 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 d4cb6b6e1..7bc67e154 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 863fa09eb..185712dec 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 826b4dcb9..d04e0713b 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 c285b2248..5b78e189b 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 300dc186d..03273c69b 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 c4e14ad60..d59f527c6 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 b63b0c8ac..5eaeace34 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 c55b821b9..d3313615e 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 cc048dfb3..6bac60ab5 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 27bcf6331..e876a70a8 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 4060b99c4..23a633668 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 dd438c159..5d3a7dbbe 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 6f8510552..1749b585e 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 133aceb9f..a99362b33 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"