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

diff --git a/CHANGES b/CHANGES
index 5948360dab..959774e16b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,11 @@ Build System
    Asterisk built with LOW_MEMORY can now successfully load binary modules
    built without LOW_MEMORY and vice versa.
 
+Core
+------------------
+ * ASTERISK_REGISTER_FILE was no longer useful and has been removed.  Sources
+   which use mtx_prof must now manually declare and initialize the variable.
+
 chan_sip
 ------------------
  * If an offer is received with optional SRTP (a media stream with RTP/AVP but
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 896bad603b..0878950e11 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 64d53b70dd..dc2efd4db3 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 07715b548a..e0f57b86b4 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 e9087d1fec..5f8f0f37b5 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 e6b0e53c06..bf38a4e69b 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 3f3d11c257..9d73702f6a 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 68bcfdead8..4563b58a09 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 ace4df1dc5..2169617acb 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 83da5330d8..25649d4b62 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 f47db45346..f58ed36261 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 fda6ca5ed8..34642a6af9 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 0e03ad7cec..b17cddfb2f 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 7862179f33..17dea431db 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 b98cd674db..67c7fbcbd7 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 dbd49914cf..af4b616f5b 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 80c1ff03d2..4f3b79197a 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 df2deae3f5..50d8d63210 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 a7fd92a374..d6229b93f6 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 45580e4f0a..cc557deea7 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 51921a98ec..6eaa1bd223 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 1376b6874b..e3d5505487 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 b5d8f50c76..d871f7f57a 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 98e1fb1547..43ea81a1c9 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 cdcda04778..5ad29722cb 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 c32bccb89b..642b9b23a0 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 ab8d3082f2..8dc61ff64c 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 8b32b93dc1..0789ce06eb 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 972e59f0ae..0f4c94b8d1 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 1695ee5b8c..79c1b75b99 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 2bb1d8b535..273f96381e 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 6e174d4a73..b7c39454f9 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 19c9f33767..3e2e020b83 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 79ce0d0f12..f92b68d068 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 938e63ec4b..72afa3dd13 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 4ff5cd6103..acd8982ef4 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 c896f9ef07..da0d3e67f2 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 58201c4501..4ca4b67c57 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 66751f5417..b817309c71 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 2ec28b16bf..38134e2474 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 e5b0b9a418..bd96434033 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 61f3ab722e..4ef525295c 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 791f75eb0a..36f5c77273 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 a736fd47f2..3f076538cd 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 c84b7d7dd6..a060ad1833 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 7d7a0cbf91..a5a00cc4ef 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 8d06ac44c7..048cf970f3 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 05afe54b10..678f76d727 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 8175fc8104..5f3bf0b92f 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 f744b7a9dd..99984f5510 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 25f9510ff9..d749a74ac5 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 3543d0509d..b522110749 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 2875ec2b49..35900e8f78 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 79e2a45769..59fb5ad667 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 70ec6562bb..a9afe02220 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 51741d3747..b40c1db30f 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 1f586cb991..d1e14ed806 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 a0a3c5583a..c406a93cba 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 fcd8938760..ede50be264 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 55867bbeb6..b44c1f6fed 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 c4efaf38e4..b60c71e513 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 bca4630247..5ed426eee3 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 3b7f0ca2f4..4417dec5c3 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 36d554ee62..3a2225b6c8 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 0f17d9bf3c..0dbd4c58b5 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 a748c3b4b1..d053ecbe6a 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 9660b4fd68..f74f7f9bd2 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 7c34dca527..3a6a191e34 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 be8abbf585..008627cc34 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 ffe4727794..81c58e8b0c 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 e87aac6438..5f86539810 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 7fcffb196a..09179f7f70 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 6b5a649226..fbe2ea70f4 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 94f746bec2..2f0d77741f 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 d4cb6b6e19..7bc67e1541 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 863fa09eb1..185712dece 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 826b4dcb96..d04e0713b0 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 c285b2248b..5b78e189b1 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 4727e2ee5a..fd6cb725ea 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 c4e14ad60d..d59f527c68 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 b63b0c8acb..5eaeace349 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 c55b821b90..d3313615e6 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 cc048dfb3a..6bac60ab5d 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 27bcf6331d..e876a70a8d 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 4060b99c4f..23a633668d 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 dd438c159c..5d3a7dbbe7 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 6f8510552b..1749b585e7 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 133aceb9f3..a99362b33a 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 f1d00c5a80..3821feef9d 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 0c8cf24fb3..a8edc21dc6 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 7bf7a39228..5f354c0d58 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 6c7c1cd5c5..05ef4ea35d 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 fc12bd16af..35544f84fa 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 0991e28970..31b72265fe 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 f0bcc09625..b7417ac259 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 2877a6b546..5666a3d4ee 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 bb63ea0c64..7d8b9d82ec 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 ef9d63e479..3f0cc6b6dd 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 5fddb7b23f..b44bbf52ae 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 ea38cc9837..cbd9e0558b 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 ddde5b890f..af434f6185 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 5a3b9e1448..b91296073b 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 b7f9978321..e8d763edd5 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 39f115920d..bbe2652295 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 6dabeff83a..f3d0628ec6 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,8 +64,6 @@ CREATE TABLE [dbo].[cdr] (
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index f75efdd4be..d1655413f3 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 bdf505b66d..365bb70c28 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 a10aadae95..2ab511418d 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 e4e280e41c..8d9d5dfce7 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 f6ab892677..e31cb5edc7 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 07407829ca..6075b8a2b5 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 30aa1fb0d8..0859fab7ac 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,8 +61,6 @@ CREATE TABLE [dbo].[cel] (
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include <time.h>
 #include <math.h>
 
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 0e2b2577fb..d09dc1c534 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 8e177ae0c4..118e08ee9a 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 bd849ad532..a24a6c8aff 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 8cccf843b4..78ebaa32d5 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 04cdad1e40..e2f575d048 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 6df5d3fd0f..af79e218e9 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 67f009d502..dc18d71969 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 0c710923f6..5828a11559 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 d50defeaf9..61e5398c30 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 94de58da00..0d1e24ab71 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 b7f694f815..aa10a56202 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 ea06d6757f..1c1f918c4e 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 f1f4f05b93..1c824fecc2 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 40ef6409a9..e3a638a9f6 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 fb6e619a1e..0ef0166357 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 5b64f963bf..4ad17dc66b 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 1f4b861c15..595ac8fee2 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -59,8 +59,6 @@ extern "C" {
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
diff --git a/channels/console_board.c b/channels/console_board.c
index 7755c449f6..e5ff1fcbda 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 da651baacb..de81a8a904 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 234228bd59..3302188cb8 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 fba06a1ed1..7811ca86b2 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 7e43bef43b..00a9d9ebbe 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 72fabf1160..1543792a9d 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 7538100703..ec9d34608d 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 fcad2fe112..6bd06faf93 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 ef644f2cbb..bfb3e32ea9 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 8d99379ffc..8ea39d144a 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 4d888c8faa..c3fe848e4a 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 036f7f7d23..4674901bee 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 53d15dddb6..e21bb2c240 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 358d6e568c..4d91446004 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 53f8805e2b..584b46b704 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 22b767c44c..b51c4736c3 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 ce8bb2b7d4..25817407e9 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 a831abfcfe..ea8d01488c 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 fa5d8769cb..3076d264e2 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 515835dd7f..ba16936b55 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 baa73f229d..2d08d36cd5 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 d368c38af1..9c868d3d9b 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 8b44cbbd94..4bf39b7cec 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 f80c955a6b..2ae42a6c0c 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 fc713beb77..16466a9c9d 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 e6dcf8c994..5f6ffff871 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 1c73bf3c8e..b54f5c9219 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 ca48eae622..49990e988e 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 ca2f411f93..cf4e358da9 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 f6807b9ca9..8cc942717a 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 777cd746b9..750bacaf15 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 684275c2b4..f3b09f0351 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 69e6a2563b..6e0632c535 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 bf82dd5c63..777d49a636 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 f02d030772..027f604f4a 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 6333091384..38f2734f3c 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 e07eedba0e..b556d6cc85 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 ed21f88f84..f69c547d36 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 6152e9c52e..747adb37ff 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 0daf64cba9..4c42181fcf 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 6361cd00f4..0b1706e504 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 71de82e98b..1ce7d18ad2 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 2fcc131a31..d205984457 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 68aa74d475..32972d09d0 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 5107ab9183..eb8ab0eadb 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 688c3e7e41..a415140f9f 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 d5661fbf68..21a8508059 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 d80636f6da..9392a1c7db 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 5352e172c2..16619d5323 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 5d3d4b9c9b..fdc899b9ab 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 d50774fa9d..ed5238c1f0 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 133e259224..527babb933 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 8dcb2bd0b2..83942db4cd 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 e816dcae00..27e9f41bf7 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 64676c0117..7279cc9003 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 8ec1032a76..2974b3c522 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 23995ba912..c8cda134b0 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 f031645a93..b2ccb237e7 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 d86f54eb95..965c7c7943 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 f6723119dc..e578000106 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 0a5220b090..6eaa03c892 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 58a05c0329..2e86625aec 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 3883de6016..1b11b1fa7c 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 025d4975de..d20fb2a0ba 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 e8c1094580..08c426161a 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 23e69d335e..795ddaf61f 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 9708ca7c0c..2b6ed40524 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 043e480f3b..2b4f9c5185 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 3e348c1cf1..c2435463a0 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 db52b11801..10ba1bb5f6 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 ef7ff71390..65aea53777 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 7bb50f5e34..88bf6e5bd3 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 8724ff51f5..1ec0b0c50a 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 ae13058871..6fc725581b 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 ff36c9e37e..101c1fd729 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 143804a07c..824d99294a 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 224cd7a7f6..e014b633c6 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 bb0ee0db7d..aae2abc90e 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 829498ab12..a995d42f1d 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 835955e1bc..799e9e4ed5 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 e9737049d8..c8403655ab 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 ef544f367d..a64d93b1ed 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 d7d6b2439a..0f2a431427 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 cc34517dc2..bc514b80c9 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 0ce191b543..e0ba4a5a18 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 9f596c4fe2..a3787b108c 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 f529cbf724..0398cd8396 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 8c1697abac..d4d8be2f23 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 a4cfa17b34..78ac4baab9 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 822937e55d..03d7bb27b0 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 79a24db00b..17d7d7a939 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 255e846531..885de61c57 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 9d8b765e46..d0a874e3ad 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 b8dd2d4583..02963f20e4 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 1cb6b8dd4f..05a02e1587 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 b7f891b70f..dfdeae9fea 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 5ccff8273a..e246302885 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 2c3563192f..be919dda18 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 a8f84586d7..fdf2064d56 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 f5ed091675..25737805bc 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -152,78 +152,9 @@ int ast_shutting_down(void);
  */
 int ast_shutdown_final(void);
 
-/*!
- * \brief Register the version of a source code file with the core.
- * \param file the source file name
- * \return nothing
- *
- * This function should not be called directly, but instead the
- * ASTERISK_REGISTER_FILE macro should be used to register a file with the core.
- */
-void __ast_register_file(const char *file);
-
-/*!
- * \brief Unregister a source code file from the core.
- * \param file the source file name
- * \return nothing
- *
- * This function should not be called directly, but instead the
- * ASTERISK_REGISTER_FILE macro should be used to automatically unregister
- * the file when the module is unloaded.
- */
-void __ast_unregister_file(const char *file);
-
-/*!
- * \brief Complete a source file name
- * \param partial The partial name of the file to look up.
- * \param n The n-th match to return.
- *
- * \retval NULL if there is no match for partial at the n-th position
- * \retval Matching source file name
- *
- * \note A matching source file is allocataed on the heap, and must be
- * free'd by the caller.
- */
-char *ast_complete_source_filename(const char *partial, int n);
-
-/*!
- * \brief Register/unregister a source code file with the core.
- *
- * This macro will place a file-scope constructor and destructor into the
- * source of the module using it; this will cause the file to be
- * registered with the Asterisk core (and unregistered) at the appropriate
- * times.
- *
- * Example:
- *
- * \code
- * ASTERISK_REGISTER_FILE()
- * \endcode
- */
 #ifdef MTX_PROFILE
 #define	HAVE_MTX_PROFILE	/* used in lock.h */
-#define ASTERISK_REGISTER_FILE() \
-	static int mtx_prof = -1;       /* profile mutex */	\
-	static void __attribute__((constructor)) __register_file_version(void) \
-	{ \
-		mtx_prof = ast_add_profile("mtx_lock_" __FILE__, 0);	\
-		__ast_register_file(__FILE__); \
-	} \
-	static void __attribute__((destructor)) __unregister_file_version(void) \
-	{ \
-		__ast_unregister_file(__FILE__); \
-	}
-#else /* !MTX_PROFILE */
-#define ASTERISK_REGISTER_FILE() \
-	static void __attribute__((constructor)) __register_file_version(void) \
-	{ \
-		__ast_register_file(__FILE__); \
-	} \
-	static void __attribute__((destructor)) __unregister_file_version(void) \
-	{ \
-		__ast_unregister_file(__FILE__); \
-	}
-#endif /* !MTX_PROFILE */
+#endif /* MTX_PROFILE */
 
 /*!
  * \brief support for event profiling
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index c703c68727..264ee97e62 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 d133b2a071..1c35be86df 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 3b9bfd6b9c..08de0fe63f 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 8d4332901f..d4b74ec921 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 e1d70498cf..621153e250 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 215f8312fd..4b06ffe91c 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 af03c013fa..542f01817f 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 8b32b2b9c0..f516291f9c 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 c6a1b97353..f6fa6b43fe 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -520,9 +520,7 @@ static yyconst flex_int16_t yy_chk[159] =
 #include <sys/types.h>
 #include <stdio.h>
 
-#if !defined(STANDALONE)
-ASTERISK_REGISTER_FILE()
-#else
+#if defined(STANDALONE)
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
 #endif
diff --git a/main/asterisk.c b/main/asterisk.c
index 7fc0912c48..d4b39a2652 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -149,8 +149,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/_private.h"
 
 #undef sched_setscheduler
@@ -487,75 +485,6 @@ static struct {
 	 unsigned int need_quit_handler:1;
 } sig_flags;
 
-#if !defined(LOW_MEMORY)
-struct registered_file {
-	AST_RWLIST_ENTRY(registered_file) list;
-	const char *file;
-};
-
-static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
-#endif /* ! LOW_MEMORY */
-
-void __ast_register_file(const char *file)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *reg;
-
-	reg = ast_calloc(1, sizeof(*reg));
-	if (!reg) {
-		return;
-	}
-
-	reg->file = file;
-	AST_RWLIST_WRLOCK(&registered_files);
-	AST_RWLIST_INSERT_HEAD(&registered_files, reg, list);
-	AST_RWLIST_UNLOCK(&registered_files);
-#endif /* ! LOW_MEMORY */
-}
-
-void __ast_unregister_file(const char *file)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *find;
-
-	AST_RWLIST_WRLOCK(&registered_files);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&registered_files, find, list) {
-		if (!strcasecmp(find->file, file)) {
-			AST_RWLIST_REMOVE_CURRENT(list);
-			break;
-		}
-	}
-	AST_RWLIST_TRAVERSE_SAFE_END;
-	AST_RWLIST_UNLOCK(&registered_files);
-
-	if (find) {
-		ast_free(find);
-	}
-#endif /* ! LOW_MEMORY */
-}
-
-char *ast_complete_source_filename(const char *partial, int n)
-{
-#if !defined(LOW_MEMORY)
-	struct registered_file *find;
-	size_t len = strlen(partial);
-	int count = 0;
-	char *res = NULL;
-
-	AST_RWLIST_RDLOCK(&registered_files);
-	AST_RWLIST_TRAVERSE(&registered_files, find, list) {
-		if (!strncasecmp(find->file, partial, len) && ++count > n) {
-			res = ast_strdup(find->file);
-			break;
-		}
-	}
-	AST_RWLIST_UNLOCK(&registered_files);
-	return res;
-#else /* if defined(LOW_MEMORY) */
-	return NULL;
-#endif
-}
-
 #if !defined(LOW_MEMORY)
 struct thread_list_t {
 	AST_RWLIST_ENTRY(thread_list_t) list;
diff --git a/main/astfd.c b/main/astfd.c
index 0a5e7ec801..34cf7bb6f3 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 1599d107a7..0ad29a6fb8 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 72bfcc8198..114f260454 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 15fd41286b..a978db3d46 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 eee90f513b..b1a8c1ce43 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 1760938fcb..61ab37b568 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 4a73fbd52e..8a0055e4b4 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 38d778438c..c7e5c00425 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 1af052d088..11c9eab969 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 3b490e8c3c..0b29385fdc 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 e92875d178..cd8ce99b4d 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 e2f14ab611..d649717e2b 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 6c411fbaf2..e31f385613 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 18f7195061..722fc66878 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 0305237351..a9b95a3521 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 7b8c689a00..e00284842f 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 d2b3218922..d6f8575fb2 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 13831b7198..6c3e6cbee1 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 baa17b9672..60fe977a88 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 aafeea4326..faf4fde716 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 4a9fe72a86..cdb6569c3b 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 3c156d4fa2..1cb91e7c33 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 d7922522cd..2cc90e43a6 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 3ba743d75d..632883d39f 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 49356a22fb..1870c393bc 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 1f2cb92704..cc4edd2399 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 6162149b16..a3e09f67ec 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 2d2300893d..18b04ff7dc 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 6644aaf509..aa232a4b6d 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 28886b6359..5da7408770 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 a4cf664b15..924618205a 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 1aaae18f18..15aca8b9d3 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 e536d601bc..1170e24f87 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 bb6e18bb55..94324355f2 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 400d655f63..1db9a1937f 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 7677c5a7d0..cc2366ed7a 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 fa94089e79..3b198a0f32 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 cfce8efb08..e1cbc21916 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 4d5a5f99ae..d24e1b5f44 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 40a89e168e..e8492ddb3c 100644
--- a/main/dns_query_set.c
+++ b/main/dns_query_set.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/vector.h"
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
@@ -283,4 +281,4 @@ int ast_dns_query_set_resolve_cancel(struct ast_dns_query_set *query_set)
 	}
 
 	return (query_set->queries_cancelled == query_count) ? 0 : -1;
-}
\ No newline at end of file
+}
diff --git a/main/dns_recurring.c b/main/dns_recurring.c
index 9925755079..294438f34c 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 e4a3d8bbdb..9d36fb61f9 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 d57814874c..9358577b6b 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 85db40b74b..8ec7e10212 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 b976c68c53..0e5efd6da6 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 1a3ebea6a1..e4e7fd3ebd 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 b73edd379a..d31405244e 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 865fa3a078..5c217c43ca 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 3af03147e2..1e623a1973 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 0af5a78e3c..ae16374b2e 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 450362544a..639440830c 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 db7c157c32..fc3e8cb664 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 cc9ac45d73..b5e577913e 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 c704f1c379..d0ae32e68d 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 ed7afc229a..1fe342b310 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 9bf263b5b2..84514ac8cd 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 92b92b6e2e..0175c7226b 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 e12b45931a..d17066d92b 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 98f0c173ba..5891191e6f 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 44ef928a82..5c7f8ecf2c 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 8ba769d3d2..521106defe 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 3719c2ad43..3d7b1991c6 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 73280fedc1..0f0bafd18e 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 da564da203..77feb397bb 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 22c3a016c2..b007ae1602 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 0f0e401d98..0af6668cfc 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 3441fbae9f..b063c22396 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 0e93507ef8..4795b6d06a 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 ca74f85dc0..7b5cfbe7e6 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 aed0ec8b14..22660e686a 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 7603465c74..16a1aa7395 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 36a3d5f61b..6617783cf2 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 b35ec597c6..9c1d383832 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 7d0d2de1e4..146d919855 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 32322b8c51..ef1afb03d3 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 b6aaa550e6..c6e997f42c 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 ce0e38d9c0..7f3c1b6458 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 ffcdef06f9..3b488ddbab 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 7492f78a9a..a7f94de247 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 8417b7741a..b20deea65f 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 477494ccaf..7c50bace9a 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 958a05bb25..7be358879f 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 0fc67ec025..a326fb97ea 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 fff51849d3..0bd7adb94b 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 0fc4df1871..8b5aedabb1 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 c71f3b5792..27772f23be 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 568add4ca8..b7a7566a76 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 d9123e434d..bfa181c86c 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 d89b9acb27..9b9a1a07c2 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 61a48960df..bf0d0b6b78 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 7cd420adb1..e5c3d3c079 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 b7e797d88b..0c030d12da 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 fa155888ae..20fdb4c22b 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 558be461f0..3c15e9d884 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 e013f31944..554cb342f5 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 1a2232c57a..5b21c3a1fd 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 46a41fb20f..1bdc39605f 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 0490ac6a2f..0cc8c0e702 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 bf733aed5e..62e7cf5a9a 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 98053e6a41..b3ef0891ed 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 c02bdc8cc3..eede21316f 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 8fb7e158be..f0936ddf44 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 b24322350a..b649357dcd 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 c0a0ebdc19..4121bf5b69 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 7b13fe7a82..c0cc31acfb 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 b91bc41157..c9d228c567 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 9f6f1eacbc..4b3711b854 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 9fee5b9cf5..a4ca260c62 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 940a6197d8..072e6487c7 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 9db932d85c..adcda3d5de 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 ea2273d5a9..cb7b53123a 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 9b68241681..83cf6232f6 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 ca0c4e45a1..461180db2b 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 9f8c35c3b9..51b0b22bec 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 c079749910..ef073a5178 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 e04d92a4ff..a82e938f4f 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 a5f29c74ef..43722b90ba 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 bd6d6fa1d6..e632a21b06 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 66563c4c6d..73cf0d2ca4 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 e1c50c6d05..91f209290a 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 c32dbb44f2..161fdfa449 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 37b9a2b6ff..88db49f1a6 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 85034bcf95..2c8d0a7684 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 c3a4d8663e..ee4f6bca5b 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 c946c5fa8d..bb221aebf6 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 25c5844627..7e52bbc9ef 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 e62eb9aad6..b8f1ccbfdd 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 ecabdadef1..356266c94d 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 3f493064bf..c468c035eb 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 ceb5f5c7f3..30ed763085 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 046501b77e..262fca0744 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 7f0d7e310f..370119cde3 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 11fbe2da9d..617f82ef38 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 2f6200f96f..062451fb66 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 920b2d5094..af37debb1a 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,8 +38,6 @@ void threadstorage_init(void)
 
 #else /* !defined(DEBUG_THREADLOCALS) */
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
diff --git a/main/timing.c b/main/timing.c
index e2e28f04fc..c6a9480c32 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 43e6e29bd5..fa606e71b8 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 e543b4e8ee..853e43c445 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 08d8060c84..c8904d56ed 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 fd1edf4902..775fae3af8 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 72d5821c10..d32a8c5e4f 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 1e3d368601..e9a0afcb85 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 9b41aa9a86..3b2005fabf 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 1985d27a0b..8ad4914852 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 0da4168f10..384bbc7c32 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 af5cb32ae3..50a91605e5 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 2919748b7e..2230d3593a 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 84b1f71266..01f468de06 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 7a444d7635..08c90aa62f 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 c858ed22fb..dcd2ce7342 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 4e87f3a401..b064646d9c 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 9f1f19bb62..414914101a 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 e5c1655c55..458863a026 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 9fbd664294..10f669382b 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,6 @@ static yyconst flex_int16_t yy_chk[1073] =
  */
 #line 71 "ael.flex"
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 485f5ee796..6803ab634e 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 633a94c1b0..03cd3a2386 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 ed024377da..6fe40c6b74 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 4468e44f10..9d156f21ee 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 f8fdc27450..deaa78073d 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 456d9c08b4..fc93b28e22 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 a54ce5c325..e76eb02bcc 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 28c3e43605..f5ae1c003a 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 afb4627a07..6027a8059a 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 493d7a1ee9..020d9301f2 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 10b49e38c1..e0bbcb5336 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 8fa15f5aa0..597f4dfeb6 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 f899ee476d..3577e65153 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 f2751f70d1..57f424c016 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 5661d608d9..39ef65ce34 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 a1420eaf22..59ace5d81f 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 1c95b6f03f..dd2fb75879 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 4eb3f71ed4..3fa7e42b31 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 89f553d9cf..6d0a4c06cb 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 e6ea9f945f..1572788234 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 7d4726cc21..f12963a2ba 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 314a4eabd7..698f935fbb 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 c6306abb84..3539eb8432 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 e0eb8e2ecb..06e8a03e25 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 eb15a88b85..e19881515a 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 7ce9722fd2..006d30ca84 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 71f72eea1c..5dbf3415c2 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 a60b7010a3..29fb07582d 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 9e8eeb4e90..252bc4fff2 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 c3876af8bb..39e678fc43 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 fd385313c0..5307cd1de3 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 40a18b8fb8..36c9b06d8e 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 5b05323090..4d418fe532 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 14265cdce9..dd8e1af388 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 b4dfd1c1cf..9678830cea 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 aee3d3d2ad..a43bbdd930 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 f5a1d41abc..eb4bbb3f78 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 029ecebd07..46775507cd 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 590408571f..11650375bd 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 05133a2a91..998188dcfa 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 577d65ba69..7292ecc46b 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 507f19cbf5..33480608aa 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 dfca39a8bf..9a26db78c2 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 74d763ac7f..1a2fc69399 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 451b1745de..37df8ed658 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 7b571d549b..9ad7a6e3db 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 8454273799..5e95853d46 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 161dc53450..5a25b6b5a0 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 73f43ee2cc..25a482705a 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 4375c3960e..6859497873 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 a306123688..b5c70ec2da 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 3ca596511a..705e8922d9 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 dbb8846974..79cd810cef 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 e7cb728789..8f97ce9f8b 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 0a781f1904..5c43632955 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 28e47d0d6f..249cbea9bb 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 f602ba9659..b25b6d16d4 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 46db86460b..540a9021b0 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 7d3f753ff9..4b923761ff 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 5ba4920d96..2b0cb02e28 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 d65a89fea3..139fbf17aa 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 ccf2176f2d..29d495bc77 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 dfdf9b6d6a..a3e48e3de7 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 e69e3f43c1..d2f9b35449 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 335b575980..2cc2a2f2c8 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 7aef019dab..7f4f165ffa 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 777239aaea..f9babd8715 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 e79f2b67ab..3bbf4c51eb 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 a3a93e9b28..358cbc934e 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 03db181596..25b90c7a26 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 2207b96ddd..8c67285866 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 37fc4fa091..241edfe593 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 d63caec3e7..28bf45fc8c 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 d844efe8c9..bff777d990 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 6fee0c2a08..2ab52d8730 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 3c7199ef45..3a751ecce6 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 e9b11dcc30..8040a3ac9b 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 3499885a5b..d797991968 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 7777214cd7..516969b1d5 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 b207049fef..0b81bc6396 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 78ae481ba7..171fdce615 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 2e4f873623..132c842ad6 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 151c99603d..66c95f2b75 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 a5d406cb58..27202c602f 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 f07265a320..b8a8d52122 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 aec923dfaa..2441184a24 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 34151244b1..e2ed29a2c6 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 09109ba2c3..774f9de7e0 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 339aecb74c..41c5bdf696 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 427cb6fb7d..d29a6e2136 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 a69aa1a743..83e01ebb23 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 b052cc428c..adc99c30d6 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 fedd069dfa..4f69448754 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 e7ef21222f..9e487a83fd 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 348e04f934..1877bbcc43 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 cdf0c560d0..79b8d4f4dc 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 fce4926594..42de11f65e 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 94a78d8039..555ba23c18 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 770ac62d2d..4c7a45164c 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 7eef9f85be..f9f064e557 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 79db668088..8d16335116 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 852537b19a..0de34c6401 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 774c9552a6..57d5eace03 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 f1fb3c38c5..4ce4e18e9a 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 4023654ab2..3f114046c7 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 1505ca428d..d6c5329714 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 1fb16ce6b9..a611e61657 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 464f7c42f1..8e596d557a 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 830de8015c..407a631354 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 453bfae6d6..8b53759107 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 e34cb2058f..4522adc10d 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 cfddb3af56..4370f17121 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 af5c41e877..630205c34d 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 e5b5bf6046..cd51638ea9 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 efdbc4b529..8b5bad7aea 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 f3a64e0f8e..22c4ba2e70 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 e1bd85b4f0..46deaff754 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 23fb8e3586..af2087599b 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 6476e74fb0..09952f9290 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 32e1dd1ffc..1aa865cd62 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 f0e089fb6f..7ff78d56e3 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 8bd1bc05ab..3301d926c9 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 6298e88960..05ebd7b1d2 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 219a2c6cd2..503f111aad 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 16e167e8f4..8dfd996083 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 aa21ec29c3..95e549a295 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 50232c4275..e25f9a7af5 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 78f19bf669..cd77da98bf 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 b8f20e6752..27e9099e54 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 c4e6f3d541..d5c86158bc 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 6274fb2ef8..53614bca13 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 ff64bc15c5..98eb4dcc04 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 5dda101776..1297cb57ff 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 2f7336fe25..9d1e230ffc 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 f81290eaed..f3dd135b14 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 da889ec45d..1bd77496ff 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 6c5c14d507..caf4118789 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 db9f1a2a2e..a5c1af7989 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 9297fb3c05..827ebb55bb 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 ef0da44ca5..a3592468d9 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 6a5eaeb99b..2755b6e52d 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 eb8fc90288..2b6e059c37 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 5f7af2b6c8..c7aafacf9c 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 ef9e76d0db..bdbffccbc9 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 e54fb59845..c9ceaf93c9 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 94037e2fa5..c9fdf09837 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 eb5409b3a1..6635c6f78a 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 7e5677022c..1da21cdc29 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 2140029726..a697f8e7d5 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 f4ce515847..cfd036d20d 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 52e0fe6956..afefeb0f03 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 581bf4d580..81c10b20d2 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 d1239037b8..85c4e76df9 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 0290a26976..70a93d4e27 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 5ea86a3413..374f857489 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 b01b0da1c7..2ed9780c2e 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 1f02c29cd3..096d17202b 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 a1e71b2707..43995fa08d 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 e0f618cd5f..0a702cf866 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 2f043c7b2b..ee77c92c03 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 76a6ecf345..cb0b248478 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 4cc4e38dc2..23ebbdfdfd 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 9f538ee09b..76fb3c4fcc 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 7362a6127a..fee17e7c26 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 4a17e6730c..5c3fcebb36 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 a39e2a981a..7a591cb8b1 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 1f7000a17f..07a4c369b8 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 685693c364..34f53190a1 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 017b84cf2d..1d03d74a93 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 780b0b06f2..8a9579b395 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 f7809d32ba..5c773899f4 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 88451672d6..576fe1fb88 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 10b0225cc1..a142ffc454 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 cc5313fd6f..da51d43be2 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 4598903732..cb79fa6fea 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 23a5e3ddf8..e995c2c885 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 bdca9b1570..0fa5ef1f7b 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 b5063d255e..208751c95f 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 5d96422aa9..0662336957 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 d62e844e76..62895960ca 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 d911e869ef..c0d25feb34 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 033bf5d6f6..8639c0f6f2 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 806fbf81fc..9d42d007cd 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 fe320f29bc..5744873647 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 6e97275889..134738fee5 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 28f6e1606b..90b0d3606c 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 c22f5e603d..ca84d00235 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 fcba960b9f..b58a4732b0 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 8a78644eaa..3004227a06 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 abb0c3395b..d8915ba28d 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 ff305b5d7e..8ca4efa1ab 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 fc371bad9c..9cadf2394e 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 ca8cb85ac8..6743b53693 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 5e6abc72ee..a49d6c1166 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 1801b12b8c..f22e9a05b2 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -18,8 +18,6 @@
 #include <regex.h>
 #include <limits.h>
 
-ASTERISK_REGISTER_FILE()
-
 #include "asterisk/backtrace.h"
 #include "asterisk/channel.h"
 #include "asterisk/ast_expr.h"
@@ -32,8 +30,6 @@ ASTERISK_REGISTER_FILE()
 
 int option_debug = 0;
 int option_verbose = 0;
-void __ast_register_file(const char *file) { }
-void __ast_unregister_file(const char *file) { }
 
 /*** MODULEINFO
   	<depend>res_ael_share</depend>
diff --git a/utils/astman.c b/utils/astman.c
index a6803c8a58..63d7f5ada1 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -27,7 +27,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include <newt.h>
 #include <stdio.h>
@@ -88,16 +87,6 @@ struct ast_chan {
 static AST_LIST_HEAD_NOLOCK_STATIC(chans, ast_chan);
 
 /* dummy functions to be compatible with the Asterisk core for md5.c */
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file)
-{
-}
-
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
-
 int ast_add_profile(const char *, uint64_t scale);
 int ast_add_profile(const char *s, uint64_t scale)
 {
diff --git a/utils/check_expr.c b/utils/check_expr.c
index abfb91dcfd..201fa04d21 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -21,7 +21,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ast_expr.h"
 
@@ -157,8 +156,6 @@ unsigned int check_expr(char* buffer, char* error_report);
 int check_eval(char *buffer, char *error_report);
 void parse_file(const char *fname);
 
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file) { }
 int ast_add_profile(const char *x, uint64_t scale) { return 0;}
 int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
 {
@@ -168,11 +165,6 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
         return ret;
 }
 
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
-
 char *find_var(const char *varname) /* the list should be pretty short, if there's any list at all */
 {
 	struct varz *t;
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 3ebc56e4ac..1767d98333 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -28,7 +28,6 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* CONFIG_DIR */
 #include <locale.h>
@@ -79,15 +78,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void __ast_register_file(const char *file);
-void __ast_register_file(const char *file)
-{
-}
-
-void __ast_unregister_file(const char *file);
-void __ast_unregister_file(const char *file)
-{
-}
 int ast_add_profile(const char *x, uint64_t scale) { return 0;}
 /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */
 void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf,5,6)));
-- 
GitLab