[asterisk-commits] Remove ASTERISK REGISTER FILE. (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Oct 27 22:23:00 CDT 2016


Anonymous Coward #1000019 has submitted this change and it was merged. ( https://gerrit.asterisk.org/4205 )

Change subject: Remove ASTERISK_REGISTER_FILE.
......................................................................


Remove ASTERISK_REGISTER_FILE.

ASTERISK_REGISTER_FILE no longer has any purpose so this commit removes
all traces of it.

Previously exported symbols removed:
* __ast_register_file
* __ast_unregister_file
* ast_complete_source_filename

This also removes the mtx_prof static variable that was declared when
MTX_PROFILE was enabled.  This variable was only used in lock.c so it
is now initialized in that file only.

ASTERISK-26480 #close

Change-Id: I1074af07d71f9e159c48ef36631aa432c86f9966
---
M CHANGES
M addons/cdr_mysql.c
M addons/chan_mobile.c
M addons/format_mp3.c
M addons/ooh323c/src/ooSocket.c
M addons/res_config_mysql.c
M apps/app_adsiprog.c
M apps/app_agent_pool.c
M apps/app_alarmreceiver.c
M apps/app_amd.c
M apps/app_authenticate.c
M apps/app_bridgeaddchan.c
M apps/app_bridgewait.c
M apps/app_cdr.c
M apps/app_celgenuserevent.c
M apps/app_chanisavail.c
M apps/app_channelredirect.c
M apps/app_chanspy.c
M apps/app_confbridge.c
M apps/app_controlplayback.c
M apps/app_dahdiras.c
M apps/app_db.c
M apps/app_dial.c
M apps/app_dictate.c
M apps/app_directed_pickup.c
M apps/app_directory.c
M apps/app_disa.c
M apps/app_dumpchan.c
M apps/app_echo.c
M apps/app_exec.c
M apps/app_externalivr.c
M apps/app_fax.c
M apps/app_festival.c
M apps/app_flash.c
M apps/app_followme.c
M apps/app_forkcdr.c
M apps/app_getcpeid.c
M apps/app_ices.c
M apps/app_image.c
M apps/app_ivrdemo.c
M apps/app_jack.c
M apps/app_macro.c
M apps/app_meetme.c
M apps/app_milliwatt.c
M apps/app_minivm.c
M apps/app_mixmonitor.c
M apps/app_morsecode.c
M apps/app_mp3.c
M apps/app_nbscat.c
M apps/app_originate.c
M apps/app_osplookup.c
M apps/app_page.c
M apps/app_playback.c
M apps/app_playtones.c
M apps/app_privacy.c
M apps/app_queue.c
M apps/app_read.c
M apps/app_readexten.c
M apps/app_record.c
M apps/app_saycounted.c
M apps/app_sayunixtime.c
M apps/app_senddtmf.c
M apps/app_sendtext.c
M apps/app_setcallerid.c
M apps/app_skel.c
M apps/app_sms.c
M apps/app_softhangup.c
M apps/app_speech_utils.c
M apps/app_stack.c
M apps/app_stasis.c
M apps/app_statsd.c
M apps/app_system.c
M apps/app_talkdetect.c
M apps/app_test.c
M apps/app_transfer.c
M apps/app_url.c
M apps/app_userevent.c
M apps/app_verbose.c
M apps/app_voicemail.c
M apps/app_waitforring.c
M apps/app_waitforsilence.c
M apps/app_waituntil.c
M apps/app_while.c
M apps/app_zapateller.c
M apps/confbridge/conf_chan_announce.c
M apps/confbridge/conf_chan_record.c
M apps/confbridge/conf_config_parser.c
M apps/confbridge/confbridge_manager.c
M bridges/bridge_builtin_features.c
M bridges/bridge_builtin_interval_features.c
M bridges/bridge_holding.c
M bridges/bridge_native_rtp.c
M bridges/bridge_simple.c
M bridges/bridge_softmix.c
M cdr/cdr_adaptive_odbc.c
M cdr/cdr_csv.c
M cdr/cdr_custom.c
M cdr/cdr_manager.c
M cdr/cdr_odbc.c
M cdr/cdr_pgsql.c
M cdr/cdr_radius.c
M cdr/cdr_sqlite.c
M cdr/cdr_sqlite3_custom.c
M cdr/cdr_syslog.c
M cdr/cdr_tds.c
M cel/cel_custom.c
M cel/cel_manager.c
M cel/cel_odbc.c
M cel/cel_pgsql.c
M cel/cel_radius.c
M cel/cel_sqlite3_custom.c
M cel/cel_tds.c
M channels/chan_alsa.c
M channels/chan_bridge_media.c
M channels/chan_console.c
M channels/chan_dahdi.c
M channels/chan_iax2.c
M channels/chan_mgcp.c
M channels/chan_misdn.c
M channels/chan_motif.c
M channels/chan_nbs.c
M channels/chan_oss.c
M channels/chan_phone.c
M channels/chan_pjsip.c
M channels/chan_rtp.c
M channels/chan_sip.c
M channels/chan_skinny.c
M channels/chan_unistim.c
M channels/chan_vpb.cc
M channels/console_board.c
M channels/console_video.c
M channels/dahdi/bridge_native_dahdi.c
M channels/iax2/codec_pref.c
M channels/iax2/firmware.c
M channels/iax2/format_compatibility.c
M channels/iax2/parser.c
M channels/iax2/provision.c
M channels/misdn_config.c
M channels/pjsip/cli_commands.c
M channels/pjsip/dialplan_functions.c
M channels/sip/config_parser.c
M channels/sip/dialplan_functions.c
M channels/sip/reqresp_parser.c
M channels/sip/route.c
M channels/sip/security_events.c
M channels/vgrabbers.c
M codecs/codec_a_mu.c
M codecs/codec_adpcm.c
M codecs/codec_alaw.c
M codecs/codec_dahdi.c
M codecs/codec_g722.c
M codecs/codec_g726.c
M codecs/codec_gsm.c
M codecs/codec_ilbc.c
M codecs/codec_lpc10.c
M codecs/codec_resample.c
M codecs/codec_speex.c
M codecs/codec_ulaw.c
M formats/format_g719.c
M formats/format_g723.c
M formats/format_g726.c
M formats/format_g729.c
M formats/format_gsm.c
M formats/format_h263.c
M formats/format_h264.c
M formats/format_ilbc.c
M formats/format_jpeg.c
M formats/format_ogg_speex.c
M formats/format_ogg_vorbis.c
M formats/format_pcm.c
M formats/format_siren14.c
M formats/format_siren7.c
M formats/format_sln.c
M formats/format_vox.c
M formats/format_wav.c
M formats/format_wav_gsm.c
M funcs/func_aes.c
M funcs/func_base64.c
M funcs/func_blacklist.c
M funcs/func_callcompletion.c
M funcs/func_callerid.c
M funcs/func_cdr.c
M funcs/func_channel.c
M funcs/func_config.c
M funcs/func_curl.c
M funcs/func_cut.c
M funcs/func_db.c
M funcs/func_devstate.c
M funcs/func_dialgroup.c
M funcs/func_dialplan.c
M funcs/func_enum.c
M funcs/func_env.c
M funcs/func_extstate.c
M funcs/func_frame_trace.c
M funcs/func_global.c
M funcs/func_groupcount.c
M funcs/func_hangupcause.c
M funcs/func_holdintercept.c
M funcs/func_iconv.c
M funcs/func_jitterbuffer.c
M funcs/func_lock.c
M funcs/func_logic.c
M funcs/func_math.c
M funcs/func_md5.c
M funcs/func_module.c
M funcs/func_odbc.c
M funcs/func_periodic_hook.c
M funcs/func_pitchshift.c
M funcs/func_pjsip_aor.c
M funcs/func_pjsip_contact.c
M funcs/func_pjsip_endpoint.c
M funcs/func_presencestate.c
M funcs/func_rand.c
M funcs/func_realtime.c
M funcs/func_sha1.c
M funcs/func_shell.c
M funcs/func_sorcery.c
M funcs/func_speex.c
M funcs/func_sprintf.c
M funcs/func_srv.c
M funcs/func_strings.c
M funcs/func_sysinfo.c
M funcs/func_talkdetect.c
M funcs/func_timeout.c
M funcs/func_uri.c
M funcs/func_version.c
M funcs/func_vmcount.c
M funcs/func_volume.c
M include/asterisk.h
M main/abstract_jb.c
M main/acl.c
M main/alaw.c
M main/aoc.c
M main/app.c
M main/ast_expr2.c
M main/ast_expr2.fl
M main/ast_expr2.y
M main/ast_expr2f.c
M main/asterisk.c
M main/astfd.c
M main/astmm.c
M main/astobj2.c
M main/astobj2_container.c
M main/astobj2_hash.c
M main/astobj2_rbtree.c
M main/audiohook.c
M main/autochan.c
M main/autoservice.c
M main/backtrace.c
M main/bridge.c
M main/bridge_after.c
M main/bridge_basic.c
M main/bridge_channel.c
M main/bridge_roles.c
M main/bucket.c
M main/callerid.c
M main/ccss.c
M main/cdr.c
M main/cel.c
M main/channel.c
M main/channel_internal_api.c
M main/chanvars.c
M main/cli.c
M main/codec.c
M main/codec_builtin.c
M main/config.c
M main/config_options.c
M main/core_local.c
M main/core_unreal.c
M main/crypt.c
M main/data.c
M main/datastore.c
M main/db.c
M main/devicestate.c
M main/dial.c
M main/dns.c
M main/dns_core.c
M main/dns_naptr.c
M main/dns_query_set.c
M main/dns_recurring.c
M main/dns_srv.c
M main/dns_system_resolver.c
M main/dns_tlsa.c
M main/dnsmgr.c
M main/dsp.c
M main/endpoints.c
M main/enum.c
M main/event.c
M main/features.c
M main/file.c
M main/fixedjitterbuf.c
M main/format.c
M main/format_cache.c
M main/format_cap.c
M main/format_compatibility.c
M main/frame.c
M main/framehook.c
M main/fskmodem_float.c
M main/fskmodem_int.c
M main/global_datastores.c
M main/hashtab.c
M main/heap.c
M main/http.c
M main/image.c
M main/indications.c
M main/io.c
M main/jitterbuf.c
M main/json.c
M main/libasteriskpj.c
M main/libasteriskssl.c
M main/loader.c
M main/lock.c
M main/logger.c
M main/manager.c
M main/manager_bridges.c
M main/manager_channels.c
M main/manager_endpoints.c
M main/manager_mwi.c
M main/manager_system.c
M main/md5.c
M main/media_cache.c
M main/message.c
M main/mixmonitor.c
M main/named_acl.c
M main/named_locks.c
M main/netsock.c
M main/netsock2.c
M main/optional_api.c
M main/parking.c
M main/pbx.c
M main/pbx_app.c
M main/pbx_builtins.c
M main/pbx_functions.c
M main/pbx_hangup_handler.c
M main/pbx_ignorepat.c
M main/pbx_include.c
M main/pbx_sw.c
M main/pbx_switch.c
M main/pbx_timing.c
M main/pbx_variables.c
M main/pickup.c
M main/plc.c
M main/presencestate.c
M main/privacy.c
M main/rtp_engine.c
M main/say.c
M main/sched.c
M main/sdp_srtp.c
M main/security_events.c
M main/sem.c
M main/slinfactory.c
M main/smoother.c
M main/sorcery.c
M main/srv.c
M main/stasis.c
M main/stasis_bridges.c
M main/stasis_cache.c
M main/stasis_cache_pattern.c
M main/stasis_channels.c
M main/stasis_endpoints.c
M main/stasis_message.c
M main/stasis_message_router.c
M main/stasis_system.c
M main/stdtime/localtime.c
M main/stringfields.c
M main/strings.c
M main/stun.c
M main/syslog.c
M main/taskprocessor.c
M main/tcptls.c
M main/tdd.c
M main/term.c
M main/test.c
M main/threadstorage.c
M main/timing.c
M main/translate.c
M main/udptl.c
M main/ulaw.c
M main/utils.c
M main/xml.c
M main/xmldoc.c
M pbx/dundi-parser.c
M pbx/pbx_ael.c
M pbx/pbx_config.c
M pbx/pbx_dundi.c
M pbx/pbx_loopback.c
M pbx/pbx_lua.c
M pbx/pbx_realtime.c
M pbx/pbx_spool.c
M res/ael/ael.flex
M res/ael/ael.tab.c
M res/ael/ael.y
M res/ael/ael_lex.c
M res/ael/pval.c
M res/ari/ari_model_validators.c
M res/ari/ari_websockets.c
M res/ari/cli.c
M res/ari/config.c
M res/ari/resource_applications.c
M res/ari/resource_asterisk.c
M res/ari/resource_bridges.c
M res/ari/resource_channels.c
M res/ari/resource_device_states.c
M res/ari/resource_endpoints.c
M res/ari/resource_events.c
M res/ari/resource_mailboxes.c
M res/ari/resource_playbacks.c
M res/ari/resource_recordings.c
M res/ari/resource_sounds.c
M res/parking/parking_applications.c
M res/parking/parking_bridge_features.c
M res/parking/parking_manager.c
M res/parking/parking_tests.c
M res/parking/parking_ui.c
M res/res_adsi.c
M res/res_ael_share.c
M res/res_agi.c
M res/res_ari.c
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_model.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
M res/res_calendar.c
M res/res_calendar_caldav.c
M res/res_calendar_ews.c
M res/res_calendar_exchange.c
M res/res_calendar_icalendar.c
M res/res_chan_stats.c
M res/res_clialiases.c
M res/res_clioriginate.c
M res/res_config_curl.c
M res/res_config_ldap.c
M res/res_config_odbc.c
M res/res_config_pgsql.c
M res/res_config_sqlite.c
M res/res_config_sqlite3.c
M res/res_convert.c
M res/res_corosync.c
M res/res_crypto.c
M res/res_curl.c
M res/res_endpoint_stats.c
M res/res_fax.c
M res/res_fax_spandsp.c
M res/res_format_attr_celt.c
M res/res_format_attr_g729.c
M res/res_format_attr_h263.c
M res/res_format_attr_h264.c
M res/res_format_attr_opus.c
M res/res_format_attr_silk.c
M res/res_format_attr_siren14.c
M res/res_format_attr_siren7.c
M res/res_format_attr_vp8.c
M res/res_hep.c
M res/res_hep_pjsip.c
M res/res_hep_rtcp.c
M res/res_http_media_cache.c
M res/res_http_post.c
M res/res_http_websocket.c
M res/res_limit.c
M res/res_monitor.c
M res/res_musiconhold.c
M res/res_mutestream.c
M res/res_mwi_external.c
M res/res_mwi_external_ami.c
M res/res_odbc.c
M res/res_parking.c
M res/res_phoneprov.c
M res/res_pjproject.c
M res/res_pjsip/pjsip_scheduler.c
M res/res_pjsip/security_events.c
M res/res_pjsip_config_wizard.c
M res/res_pjsip_dlg_options.c
M res/res_pjsip_empty_info.c
M res/res_pjsip_history.c
M res/res_pjsip_logger.c
M res/res_pjsip_sdp_rtp.c
M res/res_pjsip_t38.c
M res/res_pktccops.c
M res/res_realtime.c
M res/res_resolver_unbound.c
M res/res_rtp_asterisk.c
M res/res_rtp_multicast.c
M res/res_security_log.c
M res/res_smdi.c
M res/res_snmp.c
M res/res_sorcery_astdb.c
M res/res_sorcery_config.c
M res/res_sorcery_memory.c
M res/res_sorcery_memory_cache.c
M res/res_sorcery_realtime.c
M res/res_speech.c
M res/res_srtp.c
M res/res_stasis.c
M res/res_stasis_answer.c
M res/res_stasis_device_state.c
M res/res_stasis_mailbox.c
M res/res_stasis_playback.c
M res/res_stasis_recording.c
M res/res_stasis_snoop.c
M res/res_stasis_test.c
M res/res_statsd.c
M res/res_stun_monitor.c
M res/res_timing_dahdi.c
M res/res_timing_pthread.c
M res/res_xmpp.c
M res/snmp/agent.c
M res/stasis/app.c
M res/stasis/command.c
M res/stasis/control.c
M res/stasis/messaging.c
M res/stasis/stasis_bridge.c
M res/stasis_recording/stored.c
M rest-api-templates/ari_model_validators.c.mustache
M rest-api-templates/ari_resource.c.mustache
M rest-api-templates/res_ari_resource.c.mustache
M tests/test_abstract_jb.c
M tests/test_acl.c
M tests/test_amihooks.c
M tests/test_aoc.c
M tests/test_app.c
M tests/test_ari.c
M tests/test_ari_model.c
M tests/test_ast_format_str_reduce.c
M tests/test_astobj2.c
M tests/test_astobj2_thrash.c
M tests/test_astobj2_weaken.c
M tests/test_bucket.c
M tests/test_callerid.c
M tests/test_cdr.c
M tests/test_cel.c
M tests/test_channel_feature_hooks.c
M tests/test_config.c
M tests/test_core_codec.c
M tests/test_core_format.c
M tests/test_db.c
M tests/test_devicestate.c
M tests/test_dlinklists.c
M tests/test_endpoints.c
M tests/test_event.c
M tests/test_expr.c
M tests/test_format_cache.c
M tests/test_format_cap.c
M tests/test_func_file.c
M tests/test_gosub.c
M tests/test_hashtab_thrash.c
M tests/test_heap.c
M tests/test_http_media_cache.c
M tests/test_jitterbuf.c
M tests/test_json.c
M tests/test_linkedlists.c
M tests/test_locale.c
M tests/test_logger.c
M tests/test_media_cache.c
M tests/test_message.c
M tests/test_netsock2.c
M tests/test_optional_api.c
M tests/test_pbx.c
M tests/test_poll.c
M tests/test_res_pjsip_scheduler.c
M tests/test_res_stasis.c
M tests/test_sched.c
M tests/test_security_events.c
M tests/test_skel.c
M tests/test_sorcery.c
M tests/test_sorcery_astdb.c
M tests/test_sorcery_memory_cache_thrash.c
M tests/test_sorcery_realtime.c
M tests/test_stasis.c
M tests/test_stasis_channels.c
M tests/test_stasis_endpoints.c
M tests/test_strings.c
M tests/test_substitution.c
M tests/test_time.c
M tests/test_uri.c
M tests/test_utils.c
M tests/test_vector.c
M tests/test_voicemail_api.c
M tests/test_websocket_client.c
M tests/test_xml_escape.c
M utils/ael_main.c
M utils/astman.c
M utils/check_expr.c
M utils/conf2ael.c
591 files changed, 19 insertions(+), 1,342 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/CHANGES b/CHANGES
index 5948360..959774e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,11 @@
    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 896bad6..0878950 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 64d53b7..dc2efd4 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 07715b5..e0f57b8 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 e9087d1..5f8f0f3 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 e6b0e53..bf38a4e 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 3f3d11c..9d73702 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 68bcfde..4563b58 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 ace4df1..2169617 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 83da533..25649d4 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 f47db45..f58ed36 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 fda6ca5..34642a6 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 0e03ad7..b17cddf 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 7862179..17dea43 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 b98cd67..67c7fbc 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 dbd4991..af4b616 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 80c1ff0..4f3b791 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 df2deae..50d8d63 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 a7fd92a..d6229b9 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 45580e4..cc557de 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 51921a9..6eaa1bd 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 1376b68..e3d5505 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 b5d8f50..d871f7f 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 98e1fb1..43ea81a 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 cdcda04..5ad2972 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 c32bccb..642b9b2 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 ab8d308..8dc61ff 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 8b32b93..0789ce0 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 972e59f..0f4c94b 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 1695ee5..79c1b75 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 2bb1d8b..273f963 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 6e174d4..b7c3945 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 19c9f33..3e2e020 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 79ce0d0..f92b68d 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 938e63e..72afa3d 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 4ff5cd6..acd8982 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 c896f9e..da0d3e6 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 58201c4..4ca4b67 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 66751f5..b817309 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 2ec28b1..38134e2 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 e5b0b9a..bd96434 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 61f3ab7..4ef5252 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 791f75e..36f5c77 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 a736fd4..3f07653 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 c84b7d7..a060ad1 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 7d7a0cb..a5a00cc 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 8d06ac4..048cf97 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 05afe54..678f76d 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 8175fc8..5f3bf0b 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 f744b7a..99984f5 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 25f9510..d749a74 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 3543d05..b522110 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 2875ec2..35900e8 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 79e2a45..59fb5ad 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 70ec656..a9afe02 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 51741d3..b40c1db 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 1f586cb..d1e14ed 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 a0a3c55..c406a93 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 fcd8938..ede50be 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 55867bb..b44c1f6 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 c4efaf3..b60c71e 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 bca4630..5ed426e 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 3b7f0ca..4417dec 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 36d554e..3a2225b 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 0f17d9b..0dbd4c5 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 a748c3b..d053ecb 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 9660b4f..f74f7f9 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 7c34dca..3a6a191 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 be8abbf..008627c 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 ffe4727..81c58e8 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 e87aac6..5f86539 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 7fcffb1..09179f7 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 6b5a649..fbe2ea7 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 94f746b..2f0d777 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 d4cb6b6..7bc67e1 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 863fa09..185712d 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 826b4dc..d04e071 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 c285b22..5b78e18 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 4727e2e..fd6cb72 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 c4e14ad..d59f527 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 b63b0c8..5eaeace 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 c55b821..d331361 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 cc048df..6bac60a 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 27bcf63..e876a70 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 4060b99..23a6336 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 dd438c1..5d3a7db 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 6f85105..1749b58 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 133aceb..a99362b 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 f1d00c5..3821fee 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 0c8cf24..a8edc21 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 7bf7a39..5f354c0 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 6c7c1cd..05ef4ea 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 fc12bd1..35544f8 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 0991e28..31b7226 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 f0bcc09..b7417ac 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 2877a6b..5666a3d 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 bb63ea0..7d8b9d8 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 ef9d63e..3f0cc6b 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 5fddb7b..b44bbf5 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 ea38cc9..cbd9e05 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 ddde5b8..af434f6 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 5a3b9e1..b912960 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 b7f9978..e8d763e 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 39f1159..bbe2652 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 6dabeff..f3d0628 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,8 +64,6 @@
 
 #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 f75efdd..d165541 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 bdf505b..365bb70 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 a10aada..2ab5114 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 e4e280e..8d9d5df 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 f6ab892..e31cb5e 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 0740782..6075b8a 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 30aa1fb..0859fab 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,8 +61,6 @@
 
 #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 0e2b257..d09dc1c 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 8e177ae..118e08e 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 bd849ad..a24a6c8 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 8cccf84..78ebaa3 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 04cdad1..e2f575d 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 6df5d3f..af79e21 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 67f009d..dc18d71 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 0c71092..5828a11 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 d50defe..61e5398 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 94de58d..0d1e24a 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 b7f694f..aa10a56 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 ea06d67..1c1f918 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 f1f4f05..1c824fe 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 40ef640..e3a638a 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 fb6e619..0ef0166 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 5b64f96..4ad17dc 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 1f4b861..595ac8f 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -59,8 +59,6 @@
 
 #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 7755c44..e5ff1fc 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 da651ba..de81a8a 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 234228b..3302188 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 fba06a1..7811ca8 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 7e43bef..00a9d9e 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 72fabf1..1543792 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 7538100..ec9d346 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 fcad2fe..6bd06fa 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 ef644f2..bfb3e32 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 8d99379..8ea39d1 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 4d888c8..c3fe848 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 036f7f7..4674901 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 53d15dd..e21bb2c 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 358d6e5..4d91446 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 53f8805..584b46b 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 22b767c..b51c473 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 ce8bb2b..2581740 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 a831abf..ea8d014 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 fa5d876..3076d26 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 515835d..ba16936 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 baa73f2..2d08d36 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 d368c38..9c868d3 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 8b44cbb..4bf39b7 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 f80c955..2ae42a6 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 fc713be..16466a9 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 e6dcf8c..5f6ffff 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 1c73bf3..b54f5c9 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 ca48eae..49990e9 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 ca2f411..cf4e358 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 f6807b9..8cc9427 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 777cd74..750baca 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 684275c..f3b09f0 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 69e6a25..6e0632c 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 bf82dd5..777d49a 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 f02d030..027f604 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 6333091..38f2734 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 e07eedb..b556d6c 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 ed21f88..f69c547 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 6152e9c..747adb3 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 0daf64c..4c42181 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 6361cd0..0b1706e 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 71de82e..1ce7d18 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 2fcc131..d205984 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 68aa74d..32972d0 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 5107ab9..eb8ab0ea 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 688c3e7..a415140 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 d5661fb..21a8508 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 d80636f..9392a1c 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 5352e17..16619d5 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 5d3d4b9..fdc899b 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 d50774f..ed5238c 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 133e259..527babb 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 8dcb2bd..83942db 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 e816dca..27e9f41 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 64676c0..7279cc9 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 8ec1032..2974b3c 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 23995ba..c8cda13 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 f031645..b2ccb23 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 d86f54e..965c7c7 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 f672311..e578000 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 0a5220b..6eaa03c 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 58a05c0..2e86625 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 3883de6..1b11b1f 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 025d497..d20fb2a 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 e8c1094..08c4261 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 23e69d3..795ddaf 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 9708ca7..2b6ed40 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 043e480..2b4f9c5 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 3e348c1..c243546 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 db52b11..10ba1bb 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 ef7ff71..65aea53 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 7bb50f5..88bf6e5 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 8724ff5..1ec0b0c 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 ae13058..6fc7255 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 ff36c9e..101c1fd 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 143804a..824d992 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 224cd7a..e014b63 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 bb0ee0d..aae2abc 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 829498a..a995d42 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 835955e..799e9e4 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 e973704..c840365 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 ef544f3..a64d93b 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 d7d6b24..0f2a431 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 cc34517..bc514b8 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 0ce191b..e0ba4a5 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 9f596c4..a3787b1 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 f529cbf..0398cd8 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 8c1697ab..d4d8be2 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 a4cfa17..78ac4ba 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 822937e..03d7bb2 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 79a24db..17d7d7a 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 255e846..885de61 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 9d8b765..d0a874e 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 b8dd2d4..02963f2 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 1cb6b8d..05a02e1 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 b7f891b..dfdeae9 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 5ccff82..e246302 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 2c35631..be919dd 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 a8f8458..fdf2064 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 f5ed091..2573780 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -152,78 +152,9 @@
  */
 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 c703c68..264ee97 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 d133b2a..1c35be8 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 3b9bfd6b..08de0fe 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 8d43329..d4b74ec 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 e1d7049..621153e 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 215f831..4b06ffe 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 af03c01..542f018 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 8b32b2b..f516291 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 c6a1b97..f6fa6b4 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -520,9 +520,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/asterisk.c b/main/asterisk.c
index 7fc0912..d4b39a2 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
@@ -486,75 +484,6 @@
 	 unsigned int need_quit:1;
 	 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 {
diff --git a/main/astfd.c b/main/astfd.c
index 0a5e7ec..34cf7bb 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 1599d10..0ad29a6 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 72bfcc8..114f260 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 15fd412..a978db3 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 eee90f5..b1a8c1c 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 1760938..61ab37b 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 4a73fbd..8a0055e 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 38d7784..c7e5c00 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 1af052d..11c9eab 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 3b490e8..0b29385 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 e92875d..cd8ce99 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 e2f14ab..d649717 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 6c411fb..e31f385 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 18f7195..722fc66 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 0305237..a9b95a3 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 7b8c689..e002848 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 d2b3218..d6f8575 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 13831b7..6c3e6cb 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 baa17b9..60fe977 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 aafeea4..faf4fde 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 4a9fe72..cdb6569 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 3c156d4..1cb91e7 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 d792252..2cc90e4 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 3ba743d..632883d 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 49356a2..1870c39 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 1f2cb92..cc4edd2 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 6162149..a3e09f6 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 2d23008..18b04ff 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 6644aaf..aa232a4 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 28886b6..5da7408 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 a4cf664..9246182 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 1aaae18..15aca8b 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 e536d60..1170e24 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 bb6e18b..9432435 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 400d655..1db9a19 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 7677c5a..cc2366e 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 fa94089..3b198a0 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 cfce8ef..e1cbc21 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 4d5a5f9..d24e1b5 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 40a89e1..e8492dd 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 @@
 	}
 
 	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 9925755..294438f 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 e4a3d8b..9d36fb6 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 d578148..9358577 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 85db40b..8ec7e10 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 b976c68..0e5efd6 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 1a3ebea..e4e7fd3 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 b73edd3..d314052 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 865fa3a..5c217c4 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 3af0314..1e623a1 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 0af5a78..ae16374 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 4503625..6394408 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 db7c157..fc3e8cb 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 cc9ac45..b5e5779 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 c704f1c..d0ae32e 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 ed7afc2..1fe342b 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 9bf263b..84514ac 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 92b92b6..0175c72 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 e12b459..d17066d 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 98f0c17..5891191 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 44ef928..5c7f8ec 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 8ba769d..521106d 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 3719c2a..3d7b199 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 73280fe..0f0bafd 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 da564da..77feb39 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 22c3a01..b007ae1 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 0f0e401..0af6668 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 3441fba..b063c223 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 0e93507..4795b6d 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 ca74f85..7b5cfbe 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 aed0ec8..22660e6 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 7603465..16a1aa7 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 36a3d5f..6617783 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 b35ec59..9c1d383 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 7d0d2de..146d919 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 32322b8..ef1afb0 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 b6aaa55..c6e997f 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 ce0e38d9..7f3c1b6 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 ffcdef0..3b488dd 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 7492f78..a7f94de 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 8417b77..b20deea 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 477494c..7c50bac 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 958a05b..7be3588 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 0fc67ec..a326fb9 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 fff5184..0bd7adb 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 0fc4df1..8b5aeda 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 c71f3b5..27772f2 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 568add4..b7a7566 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 d9123e4..bfa181c 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 d89b9ac..9b9a1a0 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 61a4896..bf0d0b6 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 7cd420a..e5c3d3c 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 b7e797d..0c030d1 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 fa15588..20fdb4c 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 558be46..3c15e9d 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 e013f31..554cb34 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 1a2232c..5b21c3a 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 46a41fb..1bdc396 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 0490ac6..0cc8c0e 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 bf733ae..62e7cf5 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 98053e6..b3ef089 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 c02bdc8..eede213 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 8fb7e15..f0936dd 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 b243223..b649357 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 c0a0ebd..4121bf5 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 7b13fe7..c0cc31a 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 b91bc41..c9d228c 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 9f6f1ea..4b3711b 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 9fee5b9..a4ca260 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 940a619..072e648 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 9db932d..adcda3d 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 ea2273d..cb7b531 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 9b68241..83cf623 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 ca0c4e4..461180d 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 9f8c35c..51b0b22 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 c079749..ef073a5 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 e04d92a..a82e938 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 a5f29c7..43722b9 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 bd6d6fa..e632a21 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 66563c4..73cf0d2 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 e1c50c6..91f2092 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 c32dbb4..161fdfa 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 37b9a2b..88db49f 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 85034bc..2c8d0a7 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 c3a4d86..ee4f6bc 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 c946c5f..bb221ae 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 25c5844..7e52bbc 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 e62eb9a..b8f1ccb 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 ecabdad..356266c 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 3f49306..c468c03 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 ceb5f5c..30ed763 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 046501b..262fca0 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 7f0d7e3..370119c 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 11fbe2d..617f82e 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 2f6200f..062451f 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 920b2d5..af37deb 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,8 +38,6 @@
 
 #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 e2e28f0..c6a9480 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 43e6e29..fa606e7 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 e543b4e..853e43c 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 08d8060..c8904d5 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 fd1edf4..775fae3 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 72d5821..d32a8c5 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 1e3d368..e9a0afc 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 9b41aa9..3b2005f 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 1985d27..8ad4914 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 0da4168..384bbc7 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 af5cb32..50a9160 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 2919748..2230d35 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 84b1f71..01f468d 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 7a444d7..08c90aa 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 c858ed2..dcd2ce7 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 4e87f3a..b064646 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 9f1f19b..4149141 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 e5c1655..458863a 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 9fbd664..10f6693 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,6 @@
  */
 #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 485f5ee..6803ab6 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 633a94c..03cd3a2 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 ed02437..6fe40c6 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 4468e44..9d156f2 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 f8fdc27..deaa780 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 456d9c0..fc93b28 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 a54ce5c..e76eb02 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 28c3e43..f5ae1c0 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 afb4627..6027a80 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 493d7a1..020d930 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 10b49e3..e0bbcb5 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 8fa15f5..597f4df 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 f899ee4..3577e65 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 f2751f7..57f424c 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 5661d60..39ef65c 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 a1420ea..59ace5d 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 1c95b6f..dd2fb75 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 4eb3f71..3fa7e42 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 89f553d..6d0a4c0 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 e6ea9f9..1572788 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 7d4726c..f12963a 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 314a4ea..698f935 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 c6306ab..3539eb8 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 e0eb8e2..06e8a03 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 eb15a88..e198815 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 7ce9722..006d30c 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 71f72ee..5dbf341 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 a60b701..29fb075 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 9e8eeb4..252bc4f 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 c3876af..39e678f 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 fd38531..5307cd1 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 40a18b8..36c9b06 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 5b05323..4d418fe 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 14265cd..dd8e1af 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 b4dfd1c..9678830 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 aee3d3d..a43bbdd 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 f5a1d41..eb4bbb3 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 029eceb..4677550 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 5904085..1165037 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 05133a2..998188d 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 577d65ba..7292ecc 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 507f19c..3348060 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 dfca39a..9a26db7 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 74d763a..1a2fc69 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 451b174..37df8ed 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 7b571d5..9ad7a6e 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 8454273..5e95853 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 161dc53..5a25b6b 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 73f43ee..25a4827 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 4375c39..6859497 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 a306123..b5c70ec 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 3ca5965..705e892 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 dbb8846..79cd810 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 e7cb728..8f97ce9 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 0a781f1..5c43632 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 28e47d0..249cbea 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 f602ba9..b25b6d1 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 46db864..540a902 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 7d3f753..4b92376 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 5ba4920..2b0cb02 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 d65a89f..139fbf1 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 ccf2176..29d495b 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 dfdf9b6..a3e48e3 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 e69e3f4..d2f9b35 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 335b575..2cc2a2f 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 7aef019..7f4f165 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 777239a..f9babd8 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 e79f2b6..3bbf4c5 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 a3a93e9..358cbc9 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 03db181..25b90c7 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 2207b96..8c67285 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 37fc4fa..241edfe 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 d63caec..28bf45f 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 d844efe..bff777d 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 6fee0c2..2ab52d8 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 3c7199e..3a751ec 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 e9b11dc..8040a3a 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 3499885..d797991 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 7777214..516969b 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 b207049..0b81bc6 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 78ae481..171fdce 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 2e4f873..132c842 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 151c996..66c95f2 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 a5d406c..27202c6 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 f07265a..b8a8d52 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 aec923d..2441184 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 3415124..e2ed29a 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 09109ba..774f9de 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 339aecb..41c5bdf 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 427cb6f..d29a6e2 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 a69aa1a..83e01eb 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 b052cc4..adc99c3 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 fedd069..4f69448 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 e7ef212..9e487a8 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 348e04f..1877bbc 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 cdf0c56..79b8d4f 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 fce4926..42de11f 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 94a78d8..555ba23 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 770ac62..4c7a451 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 7eef9f8..f9f064e 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 79db668..8d16335 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 852537b..0de34c6 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 774c955..57d5eac 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 f1fb3c3..4ce4e18 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 4023654..3f11404 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 1505ca4..d6c5329 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 1fb16ce..a611e61 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 464f7c4..8e596d5 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 830de80..407a631 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 453bfae..8b53759 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 e34cb20..4522adc 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 cfddb3a..4370f17 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 af5c41e..630205c 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 e5b5bf6..cd51638 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 efdbc4b..8b5bad7 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 f3a64e0..22c4ba2 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 e1bd85b..46deaff 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 23fb8e3..af20875 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 6476e74..09952f9 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 32e1dd1..1aa865c 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 f0e089f..7ff78d5 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 8bd1bc0..3301d92 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 6298e88..05ebd7b 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 219a2c6..503f111 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 16e167e..8dfd996 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 aa21ec2..95e549a 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 50232c4..e25f9a7 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 78f19bf..cd77da9 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 b8f20e6..27e9099 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 c4e6f3d..d5c8615 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 6274fb2..53614bc 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 ff64bc1..98eb4dc 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 5dda101..1297cb5 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 2f7336f..9d1e230 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 f81290e..f3dd135 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 da889ec..1bd7749 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 6c5c14d..caf4118 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 db9f1a2..a5c1af7 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 9297fb3..827ebb5 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 ef0da44..a359246 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 6a5eaeb..2755b6e 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 eb8fc90..2b6e059 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 5f7af2b..c7aafac 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 ef9e76d..bdbffcc 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 e54fb59..c9ceaf9 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 94037e2..c9fdf09 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 eb5409b..6635c6f 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 7e56770..1da21cd 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 2140029..a697f8e 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 f4ce515..cfd036d 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 52e0fe6..afefeb0 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 581bf4d..81c10b2 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 d123903..85c4e76 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 0290a26..70a93d4 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 5ea86a3..374f857 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 b01b0da..2ed9780 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 1f02c29..096d172 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 a1e71b2..43995fa 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 e0f618c..0a702cf 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 2f043c7..ee77c92 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 76a6ecf..cb0b248 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 4cc4e38..23ebbdf 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 9f538ee..76fb3c4 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 7362a61..fee17e7 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 4a17e67..5c3fceb 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 a39e2a9..7a591cb 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 1f7000a..07a4c36 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 685693c..34f5319 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 017b84c..1d03d74 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 780b0b0..8a9579b 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 f7809d3..5c77389 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 8845167..576fe1f 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 10b0225..a142ffc 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 cc5313f..da51d43 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 4598903..cb79fa6 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 23a5e3d..e995c2c 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 bdca9b1..0fa5ef1 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 b5063d2..208751c 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 5d96422..0662336 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 d62e844..6289596 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 d911e86..c0d25fe 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 033bf5d..8639c0f 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 806fbf8..9d42d00 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 fe320f2..5744873 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 6e97275..134738f 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 28f6e16..90b0d36 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 c22f5e6..ca84d00 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 fcba960..b58a473 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 8a78644..3004227 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 abb0c33..d8915ba 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 ff305b5..8ca4efa 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 fc371ba..9cadf23 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 ca8cb85..6743b53 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 5e6abc7..a49d6c1 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 1801b12..f22e9a0 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 @@
 
 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 a6803c8..63d7f5a 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 @@
 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 abfb91d..201fa04 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 @@
 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)
 {
@@ -166,11 +163,6 @@
         ret = *p;
         *p += 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 */
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 3ebc56e..1767d98 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 @@
 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)));

-- 
To view, visit https://gerrit.asterisk.org/4205
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1074af07d71f9e159c48ef36631aa432c86f9966
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>



More information about the asterisk-commits mailing list