summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--addons/cdr_mysql.c2
-rw-r--r--addons/chan_mobile.c2
-rw-r--r--addons/format_mp3.c2
-rw-r--r--addons/ooh323c/src/ooSocket.c2
-rw-r--r--addons/res_config_mysql.c2
-rw-r--r--apps/app_adsiprog.c2
-rw-r--r--apps/app_agent_pool.c2
-rw-r--r--apps/app_alarmreceiver.c2
-rw-r--r--apps/app_amd.c2
-rw-r--r--apps/app_authenticate.c2
-rw-r--r--apps/app_bridgeaddchan.c2
-rw-r--r--apps/app_bridgewait.c2
-rw-r--r--apps/app_cdr.c2
-rw-r--r--apps/app_celgenuserevent.c2
-rw-r--r--apps/app_chanisavail.c2
-rw-r--r--apps/app_channelredirect.c2
-rw-r--r--apps/app_chanspy.c2
-rw-r--r--apps/app_confbridge.c2
-rw-r--r--apps/app_controlplayback.c2
-rw-r--r--apps/app_dahdiras.c2
-rw-r--r--apps/app_db.c2
-rw-r--r--apps/app_dial.c2
-rw-r--r--apps/app_dictate.c2
-rw-r--r--apps/app_directed_pickup.c2
-rw-r--r--apps/app_directory.c2
-rw-r--r--apps/app_disa.c2
-rw-r--r--apps/app_dumpchan.c2
-rw-r--r--apps/app_echo.c2
-rw-r--r--apps/app_exec.c2
-rw-r--r--apps/app_externalivr.c2
-rw-r--r--apps/app_fax.c2
-rw-r--r--apps/app_festival.c2
-rw-r--r--apps/app_flash.c2
-rw-r--r--apps/app_followme.c2
-rw-r--r--apps/app_forkcdr.c2
-rw-r--r--apps/app_getcpeid.c2
-rw-r--r--apps/app_ices.c2
-rw-r--r--apps/app_image.c2
-rw-r--r--apps/app_ivrdemo.c2
-rw-r--r--apps/app_jack.c2
-rw-r--r--apps/app_macro.c2
-rw-r--r--apps/app_meetme.c2
-rw-r--r--apps/app_milliwatt.c2
-rw-r--r--apps/app_minivm.c2
-rw-r--r--apps/app_mixmonitor.c2
-rw-r--r--apps/app_morsecode.c2
-rw-r--r--apps/app_mp3.c2
-rw-r--r--apps/app_nbscat.c2
-rw-r--r--apps/app_originate.c2
-rw-r--r--apps/app_osplookup.c2
-rw-r--r--apps/app_page.c2
-rw-r--r--apps/app_playback.c2
-rw-r--r--apps/app_playtones.c2
-rw-r--r--apps/app_privacy.c2
-rw-r--r--apps/app_queue.c2
-rw-r--r--apps/app_read.c2
-rw-r--r--apps/app_readexten.c2
-rw-r--r--apps/app_record.c2
-rw-r--r--apps/app_saycounted.c2
-rw-r--r--apps/app_sayunixtime.c2
-rw-r--r--apps/app_senddtmf.c2
-rw-r--r--apps/app_sendtext.c2
-rw-r--r--apps/app_setcallerid.c2
-rw-r--r--apps/app_skel.c2
-rw-r--r--apps/app_sms.c2
-rw-r--r--apps/app_softhangup.c2
-rw-r--r--apps/app_speech_utils.c2
-rw-r--r--apps/app_stack.c2
-rw-r--r--apps/app_stasis.c2
-rw-r--r--apps/app_statsd.c2
-rw-r--r--apps/app_system.c2
-rw-r--r--apps/app_talkdetect.c2
-rw-r--r--apps/app_test.c2
-rw-r--r--apps/app_transfer.c2
-rw-r--r--apps/app_url.c2
-rw-r--r--apps/app_userevent.c2
-rw-r--r--apps/app_verbose.c2
-rw-r--r--apps/app_voicemail.c2
-rw-r--r--apps/app_waitforring.c2
-rw-r--r--apps/app_waitforsilence.c2
-rw-r--r--apps/app_waituntil.c2
-rw-r--r--apps/app_while.c2
-rw-r--r--apps/app_zapateller.c2
-rw-r--r--apps/confbridge/conf_chan_announce.c2
-rw-r--r--apps/confbridge/conf_chan_record.c2
-rw-r--r--apps/confbridge/conf_config_parser.c1
-rw-r--r--apps/confbridge/confbridge_manager.c2
-rw-r--r--bridges/bridge_builtin_features.c2
-rw-r--r--bridges/bridge_builtin_interval_features.c2
-rw-r--r--bridges/bridge_holding.c2
-rw-r--r--bridges/bridge_native_rtp.c2
-rw-r--r--bridges/bridge_simple.c2
-rw-r--r--bridges/bridge_softmix.c2
-rw-r--r--cdr/cdr_adaptive_odbc.c2
-rw-r--r--cdr/cdr_csv.c2
-rw-r--r--cdr/cdr_custom.c2
-rw-r--r--cdr/cdr_manager.c2
-rw-r--r--cdr/cdr_odbc.c2
-rw-r--r--cdr/cdr_pgsql.c2
-rw-r--r--cdr/cdr_radius.c2
-rw-r--r--cdr/cdr_sqlite.c2
-rw-r--r--cdr/cdr_sqlite3_custom.c2
-rw-r--r--cdr/cdr_syslog.c2
-rw-r--r--cdr/cdr_tds.c2
-rw-r--r--cel/cel_custom.c2
-rw-r--r--cel/cel_manager.c2
-rw-r--r--cel/cel_odbc.c2
-rw-r--r--cel/cel_pgsql.c2
-rw-r--r--cel/cel_radius.c2
-rw-r--r--cel/cel_sqlite3_custom.c2
-rw-r--r--cel/cel_tds.c2
-rw-r--r--channels/chan_alsa.c2
-rw-r--r--channels/chan_bridge_media.c2
-rw-r--r--channels/chan_console.c2
-rw-r--r--channels/chan_dahdi.c2
-rw-r--r--channels/chan_iax2.c2
-rw-r--r--channels/chan_mgcp.c2
-rw-r--r--channels/chan_misdn.c2
-rw-r--r--channels/chan_motif.c2
-rw-r--r--channels/chan_nbs.c2
-rw-r--r--channels/chan_oss.c2
-rw-r--r--channels/chan_phone.c2
-rw-r--r--channels/chan_pjsip.c2
-rw-r--r--channels/chan_rtp.c2
-rw-r--r--channels/chan_sip.c2
-rw-r--r--channels/chan_skinny.c2
-rw-r--r--channels/chan_unistim.c2
-rw-r--r--channels/chan_vpb.cc2
-rw-r--r--channels/console_board.c1
-rw-r--r--channels/console_video.c1
-rw-r--r--channels/dahdi/bridge_native_dahdi.c2
-rw-r--r--channels/iax2/codec_pref.c2
-rw-r--r--channels/iax2/firmware.c2
-rw-r--r--channels/iax2/format_compatibility.c2
-rw-r--r--channels/iax2/parser.c2
-rw-r--r--channels/iax2/provision.c2
-rw-r--r--channels/misdn_config.c2
-rw-r--r--channels/pjsip/cli_commands.c2
-rw-r--r--channels/pjsip/dialplan_functions.c2
-rw-r--r--channels/sip/config_parser.c2
-rw-r--r--channels/sip/dialplan_functions.c2
-rw-r--r--channels/sip/reqresp_parser.c2
-rw-r--r--channels/sip/route.c2
-rw-r--r--channels/sip/security_events.c2
-rw-r--r--channels/vgrabbers.c1
-rw-r--r--codecs/codec_a_mu.c2
-rw-r--r--codecs/codec_adpcm.c2
-rw-r--r--codecs/codec_alaw.c2
-rw-r--r--codecs/codec_dahdi.c2
-rw-r--r--codecs/codec_g722.c2
-rw-r--r--codecs/codec_g726.c2
-rw-r--r--codecs/codec_gsm.c2
-rw-r--r--codecs/codec_ilbc.c2
-rw-r--r--codecs/codec_lpc10.c2
-rw-r--r--codecs/codec_resample.c2
-rw-r--r--codecs/codec_speex.c2
-rw-r--r--codecs/codec_ulaw.c2
-rw-r--r--formats/format_g719.c2
-rw-r--r--formats/format_g723.c2
-rw-r--r--formats/format_g726.c2
-rw-r--r--formats/format_g729.c2
-rw-r--r--formats/format_gsm.c2
-rw-r--r--formats/format_h263.c2
-rw-r--r--formats/format_h264.c2
-rw-r--r--formats/format_ilbc.c2
-rw-r--r--formats/format_jpeg.c2
-rw-r--r--formats/format_ogg_speex.c2
-rw-r--r--formats/format_ogg_vorbis.c2
-rw-r--r--formats/format_pcm.c2
-rw-r--r--formats/format_siren14.c2
-rw-r--r--formats/format_siren7.c2
-rw-r--r--formats/format_sln.c2
-rw-r--r--formats/format_vox.c2
-rw-r--r--formats/format_wav.c2
-rw-r--r--formats/format_wav_gsm.c2
-rw-r--r--funcs/func_aes.c2
-rw-r--r--funcs/func_base64.c2
-rw-r--r--funcs/func_blacklist.c2
-rw-r--r--funcs/func_callcompletion.c2
-rw-r--r--funcs/func_callerid.c2
-rw-r--r--funcs/func_cdr.c2
-rw-r--r--funcs/func_channel.c2
-rw-r--r--funcs/func_config.c2
-rw-r--r--funcs/func_curl.c2
-rw-r--r--funcs/func_cut.c2
-rw-r--r--funcs/func_db.c2
-rw-r--r--funcs/func_devstate.c2
-rw-r--r--funcs/func_dialgroup.c2
-rw-r--r--funcs/func_dialplan.c2
-rw-r--r--funcs/func_enum.c2
-rw-r--r--funcs/func_env.c2
-rw-r--r--funcs/func_extstate.c2
-rw-r--r--funcs/func_frame_trace.c2
-rw-r--r--funcs/func_global.c2
-rw-r--r--funcs/func_groupcount.c2
-rw-r--r--funcs/func_hangupcause.c2
-rw-r--r--funcs/func_holdintercept.c2
-rw-r--r--funcs/func_iconv.c2
-rw-r--r--funcs/func_jitterbuffer.c2
-rw-r--r--funcs/func_lock.c2
-rw-r--r--funcs/func_logic.c2
-rw-r--r--funcs/func_math.c2
-rw-r--r--funcs/func_md5.c2
-rw-r--r--funcs/func_module.c2
-rw-r--r--funcs/func_odbc.c2
-rw-r--r--funcs/func_periodic_hook.c2
-rw-r--r--funcs/func_pitchshift.c2
-rw-r--r--funcs/func_pjsip_aor.c2
-rw-r--r--funcs/func_pjsip_contact.c2
-rw-r--r--funcs/func_pjsip_endpoint.c2
-rw-r--r--funcs/func_presencestate.c2
-rw-r--r--funcs/func_rand.c2
-rw-r--r--funcs/func_realtime.c2
-rw-r--r--funcs/func_sha1.c2
-rw-r--r--funcs/func_shell.c2
-rw-r--r--funcs/func_sorcery.c2
-rw-r--r--funcs/func_speex.c2
-rw-r--r--funcs/func_sprintf.c2
-rw-r--r--funcs/func_srv.c2
-rw-r--r--funcs/func_strings.c2
-rw-r--r--funcs/func_sysinfo.c2
-rw-r--r--funcs/func_talkdetect.c2
-rw-r--r--funcs/func_timeout.c2
-rw-r--r--funcs/func_uri.c2
-rw-r--r--funcs/func_version.c2
-rw-r--r--funcs/func_vmcount.c2
-rw-r--r--funcs/func_volume.c2
-rw-r--r--include/asterisk.h71
-rw-r--r--main/abstract_jb.c2
-rw-r--r--main/acl.c2
-rw-r--r--main/alaw.c2
-rw-r--r--main/aoc.c1
-rw-r--r--main/app.c2
-rw-r--r--main/ast_expr2.c5
-rw-r--r--main/ast_expr2.fl4
-rw-r--r--main/ast_expr2.y5
-rw-r--r--main/ast_expr2f.c4
-rw-r--r--main/asterisk.c71
-rw-r--r--main/astfd.c2
-rw-r--r--main/astmm.c2
-rw-r--r--main/astobj2.c2
-rw-r--r--main/astobj2_container.c2
-rw-r--r--main/astobj2_hash.c2
-rw-r--r--main/astobj2_rbtree.c2
-rw-r--r--main/audiohook.c2
-rw-r--r--main/autochan.c2
-rw-r--r--main/autoservice.c2
-rw-r--r--main/backtrace.c1
-rw-r--r--main/bridge.c2
-rw-r--r--main/bridge_after.c2
-rw-r--r--main/bridge_basic.c2
-rw-r--r--main/bridge_channel.c2
-rw-r--r--main/bridge_roles.c2
-rw-r--r--main/bucket.c2
-rw-r--r--main/callerid.c2
-rw-r--r--main/ccss.c2
-rw-r--r--main/cdr.c2
-rw-r--r--main/cel.c2
-rw-r--r--main/channel.c2
-rw-r--r--main/channel_internal_api.c2
-rw-r--r--main/chanvars.c2
-rw-r--r--main/cli.c2
-rw-r--r--main/codec.c2
-rw-r--r--main/codec_builtin.c2
-rw-r--r--main/config.c2
-rw-r--r--main/config_options.c2
-rw-r--r--main/core_local.c2
-rw-r--r--main/core_unreal.c2
-rw-r--r--main/crypt.c2
-rw-r--r--main/data.c2
-rw-r--r--main/datastore.c2
-rw-r--r--main/db.c2
-rw-r--r--main/devicestate.c2
-rw-r--r--main/dial.c2
-rw-r--r--main/dns.c2
-rw-r--r--main/dns_core.c2
-rw-r--r--main/dns_naptr.c2
-rw-r--r--main/dns_query_set.c4
-rw-r--r--main/dns_recurring.c2
-rw-r--r--main/dns_srv.c2
-rw-r--r--main/dns_system_resolver.c2
-rw-r--r--main/dns_tlsa.c2
-rw-r--r--main/dnsmgr.c2
-rw-r--r--main/dsp.c2
-rw-r--r--main/endpoints.c2
-rw-r--r--main/enum.c2
-rw-r--r--main/event.c2
-rw-r--r--main/features.c2
-rw-r--r--main/file.c2
-rw-r--r--main/fixedjitterbuf.c2
-rw-r--r--main/format.c2
-rw-r--r--main/format_cache.c2
-rw-r--r--main/format_cap.c2
-rw-r--r--main/format_compatibility.c2
-rw-r--r--main/frame.c2
-rw-r--r--main/framehook.c2
-rw-r--r--main/fskmodem_float.c2
-rw-r--r--main/fskmodem_int.c2
-rw-r--r--main/global_datastores.c2
-rw-r--r--main/hashtab.c2
-rw-r--r--main/heap.c2
-rw-r--r--main/http.c2
-rw-r--r--main/image.c2
-rw-r--r--main/indications.c2
-rw-r--r--main/io.c2
-rw-r--r--main/jitterbuf.c2
-rw-r--r--main/json.c2
-rw-r--r--main/libasteriskpj.c2
-rw-r--r--main/libasteriskssl.c2
-rw-r--r--main/loader.c2
-rw-r--r--main/lock.c9
-rw-r--r--main/logger.c2
-rw-r--r--main/manager.c2
-rw-r--r--main/manager_bridges.c2
-rw-r--r--main/manager_channels.c2
-rw-r--r--main/manager_endpoints.c2
-rw-r--r--main/manager_mwi.c2
-rw-r--r--main/manager_system.c2
-rw-r--r--main/md5.c2
-rw-r--r--main/media_cache.c2
-rw-r--r--main/message.c2
-rw-r--r--main/mixmonitor.c2
-rw-r--r--main/named_acl.c2
-rw-r--r--main/named_locks.c2
-rw-r--r--main/netsock.c2
-rw-r--r--main/netsock2.c2
-rw-r--r--main/optional_api.c2
-rw-r--r--main/parking.c2
-rw-r--r--main/pbx.c2
-rw-r--r--main/pbx_app.c2
-rw-r--r--main/pbx_builtins.c2
-rw-r--r--main/pbx_functions.c2
-rw-r--r--main/pbx_hangup_handler.c2
-rw-r--r--main/pbx_ignorepat.c2
-rw-r--r--main/pbx_include.c2
-rw-r--r--main/pbx_sw.c2
-rw-r--r--main/pbx_switch.c2
-rw-r--r--main/pbx_timing.c2
-rw-r--r--main/pbx_variables.c2
-rw-r--r--main/pickup.c2
-rw-r--r--main/plc.c2
-rw-r--r--main/presencestate.c2
-rw-r--r--main/privacy.c2
-rw-r--r--main/rtp_engine.c2
-rw-r--r--main/say.c2
-rw-r--r--main/sched.c2
-rw-r--r--main/sdp_srtp.c2
-rw-r--r--main/security_events.c2
-rw-r--r--main/sem.c2
-rw-r--r--main/slinfactory.c2
-rw-r--r--main/smoother.c2
-rw-r--r--main/sorcery.c2
-rw-r--r--main/srv.c2
-rw-r--r--main/stasis.c2
-rw-r--r--main/stasis_bridges.c2
-rw-r--r--main/stasis_cache.c2
-rw-r--r--main/stasis_cache_pattern.c2
-rw-r--r--main/stasis_channels.c2
-rw-r--r--main/stasis_endpoints.c2
-rw-r--r--main/stasis_message.c2
-rw-r--r--main/stasis_message_router.c2
-rw-r--r--main/stasis_system.c2
-rw-r--r--main/stdtime/localtime.c2
-rw-r--r--main/stringfields.c2
-rw-r--r--main/strings.c2
-rw-r--r--main/stun.c2
-rw-r--r--main/syslog.c2
-rw-r--r--main/taskprocessor.c2
-rw-r--r--main/tcptls.c2
-rw-r--r--main/tdd.c2
-rw-r--r--main/term.c2
-rw-r--r--main/test.c2
-rw-r--r--main/threadstorage.c2
-rw-r--r--main/timing.c2
-rw-r--r--main/translate.c2
-rw-r--r--main/udptl.c2
-rw-r--r--main/ulaw.c2
-rw-r--r--main/utils.c2
-rw-r--r--main/xml.c2
-rw-r--r--main/xmldoc.c2
-rw-r--r--pbx/dundi-parser.c2
-rw-r--r--pbx/pbx_ael.c9
-rw-r--r--pbx/pbx_config.c2
-rw-r--r--pbx/pbx_dundi.c2
-rw-r--r--pbx/pbx_loopback.c2
-rw-r--r--pbx/pbx_lua.c2
-rw-r--r--pbx/pbx_realtime.c2
-rw-r--r--pbx/pbx_spool.c2
-rw-r--r--res/ael/ael.flex1
-rw-r--r--res/ael/ael.tab.c2
-rw-r--r--res/ael/ael.y2
-rw-r--r--res/ael/ael_lex.c1
-rw-r--r--res/ael/pval.c2
-rw-r--r--res/ari/ari_model_validators.c2
-rw-r--r--res/ari/ari_websockets.c2
-rw-r--r--res/ari/cli.c2
-rw-r--r--res/ari/config.c2
-rw-r--r--res/ari/resource_applications.c2
-rw-r--r--res/ari/resource_asterisk.c2
-rw-r--r--res/ari/resource_bridges.c2
-rw-r--r--res/ari/resource_channels.c2
-rw-r--r--res/ari/resource_device_states.c2
-rw-r--r--res/ari/resource_endpoints.c2
-rw-r--r--res/ari/resource_events.c2
-rw-r--r--res/ari/resource_mailboxes.c2
-rw-r--r--res/ari/resource_playbacks.c2
-rw-r--r--res/ari/resource_recordings.c2
-rw-r--r--res/ari/resource_sounds.c2
-rw-r--r--res/parking/parking_applications.c2
-rw-r--r--res/parking/parking_bridge_features.c2
-rw-r--r--res/parking/parking_manager.c2
-rw-r--r--res/parking/parking_tests.c2
-rw-r--r--res/parking/parking_ui.c2
-rw-r--r--res/res_adsi.c2
-rw-r--r--res/res_ael_share.c2
-rw-r--r--res/res_agi.c2
-rw-r--r--res/res_ari.c2
-rw-r--r--res/res_ari_applications.c2
-rw-r--r--res/res_ari_asterisk.c2
-rw-r--r--res/res_ari_bridges.c2
-rw-r--r--res/res_ari_channels.c2
-rw-r--r--res/res_ari_device_states.c2
-rw-r--r--res/res_ari_endpoints.c2
-rw-r--r--res/res_ari_events.c2
-rw-r--r--res/res_ari_mailboxes.c2
-rw-r--r--res/res_ari_model.c2
-rw-r--r--res/res_ari_playbacks.c2
-rw-r--r--res/res_ari_recordings.c2
-rw-r--r--res/res_ari_sounds.c2
-rw-r--r--res/res_calendar.c2
-rw-r--r--res/res_calendar_caldav.c2
-rw-r--r--res/res_calendar_ews.c2
-rw-r--r--res/res_calendar_exchange.c2
-rw-r--r--res/res_calendar_icalendar.c2
-rw-r--r--res/res_chan_stats.c2
-rw-r--r--res/res_clialiases.c2
-rw-r--r--res/res_clioriginate.c2
-rw-r--r--res/res_config_curl.c2
-rw-r--r--res/res_config_ldap.c2
-rw-r--r--res/res_config_odbc.c2
-rw-r--r--res/res_config_pgsql.c2
-rw-r--r--res/res_config_sqlite.c1
-rw-r--r--res/res_config_sqlite3.c2
-rw-r--r--res/res_convert.c2
-rw-r--r--res/res_corosync.c2
-rw-r--r--res/res_crypto.c2
-rw-r--r--res/res_curl.c2
-rw-r--r--res/res_endpoint_stats.c2
-rw-r--r--res/res_fax.c2
-rw-r--r--res/res_fax_spandsp.c2
-rw-r--r--res/res_format_attr_celt.c2
-rw-r--r--res/res_format_attr_g729.c2
-rw-r--r--res/res_format_attr_h263.c2
-rw-r--r--res/res_format_attr_h264.c2
-rw-r--r--res/res_format_attr_opus.c2
-rw-r--r--res/res_format_attr_silk.c2
-rw-r--r--res/res_format_attr_siren14.c2
-rw-r--r--res/res_format_attr_siren7.c2
-rw-r--r--res/res_format_attr_vp8.c2
-rw-r--r--res/res_hep.c2
-rw-r--r--res/res_hep_pjsip.c2
-rw-r--r--res/res_hep_rtcp.c2
-rw-r--r--res/res_http_media_cache.c2
-rw-r--r--res/res_http_post.c2
-rw-r--r--res/res_http_websocket.c2
-rw-r--r--res/res_limit.c2
-rw-r--r--res/res_monitor.c2
-rw-r--r--res/res_musiconhold.c2
-rw-r--r--res/res_mutestream.c2
-rw-r--r--res/res_mwi_external.c2
-rw-r--r--res/res_mwi_external_ami.c2
-rw-r--r--res/res_odbc.c2
-rw-r--r--res/res_parking.c2
-rw-r--r--res/res_phoneprov.c1
-rw-r--r--res/res_pjproject.c2
-rw-r--r--res/res_pjsip/pjsip_scheduler.c2
-rw-r--r--res/res_pjsip/security_events.c2
-rw-r--r--res/res_pjsip_config_wizard.c2
-rw-r--r--res/res_pjsip_dlg_options.c2
-rw-r--r--res/res_pjsip_empty_info.c2
-rw-r--r--res/res_pjsip_history.c2
-rw-r--r--res/res_pjsip_logger.c2
-rw-r--r--res/res_pjsip_sdp_rtp.c2
-rw-r--r--res/res_pjsip_t38.c2
-rw-r--r--res/res_pktccops.c2
-rw-r--r--res/res_realtime.c2
-rw-r--r--res/res_resolver_unbound.c2
-rw-r--r--res/res_rtp_asterisk.c2
-rw-r--r--res/res_rtp_multicast.c2
-rw-r--r--res/res_security_log.c2
-rw-r--r--res/res_smdi.c2
-rw-r--r--res/res_snmp.c2
-rw-r--r--res/res_sorcery_astdb.c2
-rw-r--r--res/res_sorcery_config.c2
-rw-r--r--res/res_sorcery_memory.c2
-rw-r--r--res/res_sorcery_memory_cache.c2
-rw-r--r--res/res_sorcery_realtime.c2
-rw-r--r--res/res_speech.c2
-rw-r--r--res/res_srtp.c2
-rw-r--r--res/res_stasis.c2
-rw-r--r--res/res_stasis_answer.c2
-rw-r--r--res/res_stasis_device_state.c2
-rw-r--r--res/res_stasis_mailbox.c2
-rw-r--r--res/res_stasis_playback.c2
-rw-r--r--res/res_stasis_recording.c2
-rw-r--r--res/res_stasis_snoop.c2
-rw-r--r--res/res_stasis_test.c2
-rw-r--r--res/res_statsd.c2
-rw-r--r--res/res_stun_monitor.c2
-rw-r--r--res/res_timing_dahdi.c2
-rw-r--r--res/res_timing_pthread.c2
-rw-r--r--res/res_xmpp.c2
-rw-r--r--res/snmp/agent.c2
-rw-r--r--res/stasis/app.c2
-rw-r--r--res/stasis/command.c2
-rw-r--r--res/stasis/control.c2
-rw-r--r--res/stasis/messaging.c2
-rw-r--r--res/stasis/stasis_bridge.c2
-rw-r--r--res/stasis_recording/stored.c2
-rw-r--r--rest-api-templates/ari_model_validators.c.mustache2
-rw-r--r--rest-api-templates/ari_resource.c.mustache2
-rw-r--r--rest-api-templates/res_ari_resource.c.mustache2
-rw-r--r--tests/test_abstract_jb.c2
-rw-r--r--tests/test_acl.c2
-rw-r--r--tests/test_amihooks.c2
-rw-r--r--tests/test_aoc.c2
-rw-r--r--tests/test_app.c2
-rw-r--r--tests/test_ari.c2
-rw-r--r--tests/test_ari_model.c2
-rw-r--r--tests/test_ast_format_str_reduce.c2
-rw-r--r--tests/test_astobj2.c2
-rw-r--r--tests/test_astobj2_thrash.c1
-rw-r--r--tests/test_astobj2_weaken.c2
-rw-r--r--tests/test_bucket.c2
-rw-r--r--tests/test_callerid.c2
-rw-r--r--tests/test_cdr.c2
-rw-r--r--tests/test_cel.c2
-rw-r--r--tests/test_channel_feature_hooks.c2
-rw-r--r--tests/test_config.c2
-rw-r--r--tests/test_core_codec.c2
-rw-r--r--tests/test_core_format.c2
-rw-r--r--tests/test_db.c2
-rw-r--r--tests/test_devicestate.c2
-rw-r--r--tests/test_dlinklists.c2
-rw-r--r--tests/test_endpoints.c2
-rw-r--r--tests/test_event.c2
-rw-r--r--tests/test_expr.c2
-rw-r--r--tests/test_format_cache.c2
-rw-r--r--tests/test_format_cap.c2
-rw-r--r--tests/test_func_file.c2
-rw-r--r--tests/test_gosub.c2
-rw-r--r--tests/test_hashtab_thrash.c1
-rw-r--r--tests/test_heap.c2
-rw-r--r--tests/test_http_media_cache.c2
-rw-r--r--tests/test_jitterbuf.c2
-rw-r--r--tests/test_json.c1
-rw-r--r--tests/test_linkedlists.c2
-rw-r--r--tests/test_locale.c2
-rw-r--r--tests/test_logger.c2
-rw-r--r--tests/test_media_cache.c2
-rw-r--r--tests/test_message.c2
-rw-r--r--tests/test_netsock2.c2
-rw-r--r--tests/test_optional_api.c2
-rw-r--r--tests/test_pbx.c2
-rw-r--r--tests/test_poll.c2
-rw-r--r--tests/test_res_pjsip_scheduler.c2
-rw-r--r--tests/test_res_stasis.c2
-rw-r--r--tests/test_sched.c2
-rw-r--r--tests/test_security_events.c2
-rw-r--r--tests/test_skel.c2
-rw-r--r--tests/test_sorcery.c2
-rw-r--r--tests/test_sorcery_astdb.c2
-rw-r--r--tests/test_sorcery_memory_cache_thrash.c2
-rw-r--r--tests/test_sorcery_realtime.c2
-rw-r--r--tests/test_stasis.c2
-rw-r--r--tests/test_stasis_channels.c2
-rw-r--r--tests/test_stasis_endpoints.c2
-rw-r--r--tests/test_strings.c2
-rw-r--r--tests/test_substitution.c2
-rw-r--r--tests/test_time.c2
-rw-r--r--tests/test_uri.c2
-rw-r--r--tests/test_utils.c2
-rw-r--r--tests/test_vector.c2
-rw-r--r--tests/test_voicemail_api.c2
-rw-r--r--tests/test_websocket_client.c2
-rw-r--r--tests/test_xml_escape.c2
-rw-r--r--utils/ael_main.c4
-rw-r--r--utils/astman.c11
-rw-r--r--utils/check_expr.c8
-rw-r--r--utils/conf2ael.c10
591 files changed, 19 insertions, 1342 deletions
diff --git a/CHANGES b/CHANGES
index c9126e16b..d64f2d5ab 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 896bad603..0878950e1 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 64d53b70d..dc2efd4db 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 07715b548..e0f57b86b 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 e9087d1fe..5f8f0f37b 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 e6b0e53c0..bf38a4e69 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 3f3d11c25..9d73702f6 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -41,8 +41,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <netinet/in.h>
#include <ctype.h>
diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c
index 68bcfdead..4563b58a0 100644
--- a/apps/app_agent_pool.c
+++ b/apps/app_agent_pool.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/cli.h"
#include "asterisk/app.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index ace4df1dc..2169617ac 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -45,8 +45,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <math.h>
#include <sys/wait.h>
#include <sys/time.h>
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 83da5330d..25649d4b6 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -43,8 +43,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/module.h"
#include "asterisk/lock.h"
#include "asterisk/channel.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index f47db4534..f58ed3626 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/app_bridgeaddchan.c b/apps/app_bridgeaddchan.c
index fda6ca5ed..34642a6af 100644
--- a/apps/app_bridgeaddchan.c
+++ b/apps/app_bridgeaddchan.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/module.h"
#include "asterisk/channel.h"
diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c
index 0e03ad7ce..b17cddfb2 100644
--- a/apps/app_bridgewait.c
+++ b/apps/app_bridgewait.c
@@ -34,8 +34,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 7862179f3..17dea431d 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/channel.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index b98cd674d..67c7fbcbd 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -29,8 +29,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/channel.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index dbd49914c..af4b616f5 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/ioctl.h>
#include "asterisk/lock.h"
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 80c1ff03d..4f3b79197 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -29,8 +29,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index df2deae3f..50d8d6321 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -35,8 +35,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <ctype.h>
#include <errno.h>
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index a7fd92a37..d6229b93f 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -43,8 +43,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 45580e4f0..cc557deea 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/app.h"
#include "asterisk/module.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 51921a98e..6eaa1bd22 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <signal.h>
diff --git a/apps/app_db.c b/apps/app_db.c
index 1376b6874..e3d550548 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -34,8 +34,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index b5d8f50c7..d871f7f57 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/time.h>
#include <signal.h>
#include <sys/stat.h>
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 98e1fb154..43ea81a1c 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/stat.h>
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index cdcda0477..5ad29722c 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -35,8 +35,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_directory.c b/apps/app_directory.c
index c32bccb89..642b9b23a 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -30,8 +30,6 @@
***/
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <ctype.h>
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_disa.c b/apps/app_disa.c
index ab8d3082f..8dc61ff64 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <math.h>
#include <sys/time.h>
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 8b32b93dc..0789ce06e 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -34,8 +34,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/channel.h"
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 972e59f0a..0f4c94b8d 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/module.h"
#include "asterisk/channel.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 1695ee5b8..79c1b75b9 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -31,8 +31,6 @@
***/
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 2bb1d8b53..273f96381 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -37,8 +37,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <signal.h>
#include "asterisk/lock.h"
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 6e174d4a7..b7c39454f 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -21,8 +21,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 19c9f3376..3e2e020b8 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -42,8 +42,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 79ce0d0f1..f92b68d06 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <dahdi/user.h>
#include "asterisk/lock.h"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 938e63ec4..72afa3dd1 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -41,8 +41,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <signal.h>
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 4ff5cd610..acd8982ef 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index c896f9ef0..da0d3e67f 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 58201c450..4ca4b67c5 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <signal.h>
#include <fcntl.h>
#include <sys/time.h>
diff --git a/apps/app_image.c b/apps/app_image.c
index 66751f541..b817309c7 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/image.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 2ec28b16b..38134e247 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_jack.c b/apps/app_jack.c
index e5b0b9a41..bd9643403 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -42,8 +42,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <limits.h>
#include <jack/jack.h>
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 61f3ab722..4ef525295 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 791f75eb0..36f5c7727 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -47,8 +47,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <dahdi/user.h>
#include "asterisk/lock.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index a736fd47f..3f076538c 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/module.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index c84b7d7dd..a060ad183 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -146,8 +146,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <ctype.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 7d7a0cbf9..a5a00cc4e 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -39,8 +39,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/paths.h" /* use ast_config_AST_MONITOR_DIR */
#include "asterisk/stringfields.h"
#include "asterisk/file.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 8d06ac44c..048cf970f 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -30,8 +30,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 05afe54b1..678f76d72 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -34,8 +34,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/time.h>
#include <signal.h>
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 8175fc810..5f3bf0b92 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <fcntl.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/apps/app_originate.c b/apps/app_originate.c
index f744b7a9d..99984f551 100644
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -38,8 +38,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 25f9510ff..d749a74ac 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -36,8 +36,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <osp/osp.h>
#include <osp/osputils.h>
#include <osp/ospb64.h>
diff --git a/apps/app_page.c b/apps/app_page.c
index 3543d0509..b52211074 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 2875ec2b4..35900e8f7 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
diff --git a/apps/app_playtones.c b/apps/app_playtones.c
index 79e2a4576..59fb5ad66 100644
--- a/apps/app_playtones.c
+++ b/apps/app_playtones.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/module.h"
#include "asterisk/pbx.h"
#include "asterisk/channel.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 70ec6562b..a9afe0222 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/utils.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 51741d374..b40c1db30 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -69,8 +69,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/time.h>
#include <signal.h>
#include <netinet/in.h>
diff --git a/apps/app_read.c b/apps/app_read.c
index 1f586cb99..d1e14ed80 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/pbx.h"
#include "asterisk/channel.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index a0a3c5583..c406a93cb 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -30,8 +30,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/pbx.h"
#include "asterisk/app.h"
diff --git a/apps/app_record.c b/apps/app_record.c
index fcd893876..ede50be26 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c
index 55867bbeb..b44c1f6fe 100644
--- a/apps/app_saycounted.c
+++ b/apps/app_saycounted.c
@@ -114,8 +114,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/logger.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index c4efaf38e..b60c71e51 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index bca463024..5ed426eee 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 3b7f0ca2f..4417dec5c 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 36d554ee6..3a2225b6c 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 0f17d9bf3..0dbd4c58b 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -45,8 +45,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <math.h> /* log10 */
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index a748c3b4b..d053ecbe6 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -40,8 +40,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <dirent.h>
#include <ctype.h>
#include <sys/stat.h>
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 9660b4fd6..f74f7f9bd 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 7c34dca52..3a6a191e3 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE();
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index be8abbf58..008627cc3 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -32,8 +32,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index ffe472779..81c58e8b0 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -30,8 +30,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/app.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_statsd.c b/apps/app_statsd.c
index e87aac643..5f8653981 100644
--- a/apps/app_statsd.c
+++ b/apps/app_statsd.c
@@ -24,8 +24,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <math.h>
#include "asterisk/module.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index 7fcffb196..09179f7f7 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 6b5a64922..fbe2ea70f 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index 94f746bec..2f0d77741 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include <sys/stat.h>
#include "asterisk/paths.h" /* use ast_config_AST_LOG_DIR */
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index d4cb6b6e1..7bc67e154 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -33,8 +33,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index 863fa09eb..185712dec 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 826b4dcb9..d04e0713b 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -27,8 +27,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/manager.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index c285b2248..5b78e189b 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -30,8 +30,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/channel.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 300dc186d..03273c69b 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -101,8 +101,6 @@
#endif
#endif
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index c4e14ad60..d59f527c6 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index b63b0c8ac..5eaeace34 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -44,8 +44,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/file.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_waituntil.c b/apps/app_waituntil.c
index c55b821b9..d3313615e 100644
--- a/apps/app_waituntil.c
+++ b/apps/app_waituntil.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index cc048dfb3..6bac60ab5 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/channel.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 27bcf6331..e876a70a8 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -31,8 +31,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/channel.h"
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c
index 4060b99c4..23a633668 100644
--- a/apps/confbridge/conf_chan_announce.c
+++ b/apps/confbridge/conf_chan_announce.c
@@ -29,8 +29,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/channel.h"
#include "asterisk/bridge.h"
#include "asterisk/core_unreal.h"
diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c
index dd438c159..5d3a7dbbe 100644
--- a/apps/confbridge/conf_chan_record.c
+++ b/apps/confbridge/conf_chan_record.c
@@ -29,8 +29,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/channel.h"
#include "asterisk/bridge.h"
#include "asterisk/format_cache.h"
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 6f8510552..1749b585e 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -29,7 +29,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
#include "asterisk/logger.h"
#include "asterisk/config.h"
#include "asterisk/config_options.h"
diff --git a/apps/confbridge/confbridge_manager.c b/apps/confbridge/confbridge_manager.c
index 133aceb9f..a99362b33 100644
--- a/apps/confbridge/confbridge_manager.c
+++ b/apps/confbridge/confbridge_manager.c
@@ -25,8 +25,6 @@
#include "asterisk.h"
-ASTERISK_REGISTER_FILE()
-
#include "asterisk/channel.h"
#include "asterisk/bridge.h"
#include "asterisk/stasis.h"
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index f1d00c5a8..3821feef9 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 0c8cf24fb..a8edc21dc 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 7bf7a3922..5f354c0d5 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 6c7c1cd5c..05ef4ea35 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 fc12bd16a..35544f84f 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 0991e2897..31b72265f 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 f0bcc0962..b7417ac25 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 2877a6b54..5666a3d4e 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 bb63ea0c6..7d8b9d82e 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 ef9d63e47..3f0cc6b6d 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 5fddb7b23..b44bbf52a 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 ea38cc983..cbd9e0558 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 ddde5b890..af434f618 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 5a3b9e144..b91296073 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 b7f997832..e8d763edd 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 39f115920..bbe265229 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 6dabeff83..f3d0628ec 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 f75efdd4b..d1655413f 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 bdf505b66..365bb70c2 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 a10aadae9..2ab511418 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 e4e280e41..8d9d5dfce 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 f6ab89267..e31cb5edc 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 07407829c..6075b8a2b 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 30aa1fb0d..0859fab7a 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 0e2b2577f..d09dc1c53 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 8e177ae0c..118e08ee9 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 bd849ad53..a24a6c8af 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 8cccf843b..78ebaa32d 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 04cdad1e4..e2f575d04 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 6df5d3fd0..af79e218e 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 67f009d50..dc18d7196 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 0c710923f..5828a1155 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 d50defeaf..61e5398c3 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 94de58da0..0d1e24ab7 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 b7f694f81..aa10a5620 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 b0dba1b47..d4a7d618d 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 f1f4f05b9..1c824fecc 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 40ef6409a..e3a638a9f 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 fb6e619a1..0ef016635 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 5b64f963b..4ad17dc66 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 1f4b861c1..595ac8fee 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 7755c449f..e5ff1fcbd 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 da651baac..de81a8a90 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 234228bd5..3302188cb 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 fba06a1ed..7811ca86b 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 7e43bef43..00a9d9ebb 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 72fabf116..1543792a9 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 753810070..ec9d34608 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 fcad2fe11..6bd06faf9 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 ef644f2cb..bfb3e32ea 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 8d99379ff..8ea39d144 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 4d888c8fa..c3fe848e4 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 036f7f7d2..4674901be 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 53d15dddb..e21bb2c24 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 358d6e568..4d9144600 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 53f8805e2..584b46b70 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 22b767c44..b51c4736c 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 ce8bb2b7d..25817407e 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 a831abfcf..ea8d01488 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 fa5d8769c..3076d264e 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 515835dd7..ba16936b5 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 baa73f229..2d08d36cd 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 d368c38af..9c868d3d9 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 8b44cbbd9..4bf39b7ce 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 f80c955a6..2ae42a6c0 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 fc713beb7..16466a9c9 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 e6dcf8c99..5f6ffff87 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 1c73bf3c8..b54f5c921 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 ca48eae62..49990e988 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 ca2f411f9..cf4e358da 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 f6807b9ca..8cc942717 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 777cd746b..750bacaf1 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 684275c2b..f3b09f035 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 69e6a2563..6e0632c53 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 bf82dd5c6..777d49a63 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 f02d03077..027f604f4 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 633309138..38f2734f3 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 e07eedba0..b556d6cc8 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 ed21f88f8..f69c547d3 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 6152e9c52..747adb37f 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 0daf64cba..4c42181fc 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 6361cd00f..0b1706e50 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 71de82e98..1ce7d18ad 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 2fcc131a3..d20598445 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 68aa74d47..32972d09d 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 5107ab918..eb8ab0ead 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 688c3e7e4..a415140f9 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 d5661fbf6..21a850805 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 d80636f6d..9392a1c7d 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 5352e172c..16619d532 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 5d3d4b9c9..fdc899b9a 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 d50774fa9..ed5238c1f 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 133e25922..527babb93 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 8dcb2bd0b..83942db4c 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 e816dcae0..27e9f41bf 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 64676c011..7279cc900 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 8ec1032a7..2974b3c52 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 23995ba91..c8cda134b 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 f031645a9..b2ccb237e 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 d86f54eb9..965c7c794 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 f6723119d..e57800010 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 0a5220b09..6eaa03c89 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 58a05c032..2e86625ae 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 3883de601..1b11b1fa7 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 025d4975d..d20fb2a0b 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 e8c109458..08c426161 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 23e69d335..795ddaf61 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 9708ca7c0..2b6ed4052 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 043e480f3..2b4f9c518 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 3e348c1cf..c2435463a 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 db52b1180..10ba1bb5f 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 ef7ff7139..65aea5377 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 7bb50f5e3..88bf6e5bd 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 8724ff51f..1ec0b0c50 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 ae1305887..6fc725581 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 ff36c9e37..101c1fd72 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 143804a07..824d99294 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 224cd7a7f..e014b633c 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 bb0ee0db7..aae2abc90 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 829498ab1..a995d42f1 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 835955e1b..799e9e4ed 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 e9737049d..c8403655a 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 ef544f367..a64d93b1e 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 d7d6b2439..0f2a43142 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 cc34517dc..bc514b80c 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 0ce191b54..e0ba4a5a1 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 9f596c4fe..a3787b108 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 f529cbf72..0398cd839 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 8c1697aba..d4d8be2f2 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 a4cfa17b3..78ac4baab 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 822937e55..03d7bb27b 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 79a24db00..17d7d7a93 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 255e84653..885de61c5 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 9d8b765e4..d0a874e3a 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 b8dd2d458..02963f20e 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 1cb6b8dd4..05a02e158 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 b7f891b70..dfdeae9fe 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 5ccff8273..e24630288 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 2c3563192..be919dda1 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 a8f84586d..fdf2064d5 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 f5ed09167..25737805b 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 c703c6872..264ee97e6 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 d133b2a07..1c35be86d 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 3b9bfd6b9..08de0fe63 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 8d4332901..d4b74ec92 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 e1d70498c..621153e25 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 215f8312f..4b06ffe91 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 af03c013f..542f01817 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 8b32b2b9c..f516291f9 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 c6a1b9735..f6fa6b43f 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 7fc0912c4..d4b39a265 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
@@ -488,75 +486,6 @@ static struct {
} 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;
char *name;
diff --git a/main/astfd.c b/main/astfd.c
index 0a5e7ec80..34cf7bb6f 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 1599d107a..0ad29a6fb 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 72bfcc819..114f26045 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 15fd41286..a978db3d4 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 eee90f513..b1a8c1ce4 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 1760938fc..61ab37b56 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 4a73fbd52..8a0055e4b 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 38d778438..c7e5c0042 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 1af052d08..11c9eab96 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 3b490e8c3..0b29385fd 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 e92875d17..cd8ce99b4 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 e2f14ab61..d649717e2 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 6c411fbaf..e31f38561 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 18f719506..722fc6687 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 030523735..a9b95a352 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 7b8c689a0..e00284842 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 d2b321892..d6f8575fb 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 13831b719..6c3e6cbee 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 baa17b967..60fe977a8 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 aafeea432..faf4fde71 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 4a9fe72a8..cdb6569c3 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 3c156d4fa..1cb91e7c3 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 d7922522c..2cc90e43a 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 3ba743d75..632883d39 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 49356a22f..1870c393b 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 1f2cb9270..cc4edd239 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 6162149b1..a3e09f67e 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 2d2300893..18b04ff7d 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 6644aaf50..aa232a4b6 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 28886b635..5da740877 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 a4cf664b1..924618205 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 1aaae18f1..15aca8b9d 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 e536d601b..1170e24f8 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 bb6e18bb5..94324355f 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 400d655f6..1db9a1937 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 7677c5a7d..cc2366ed7 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 fa94089e7..3b198a0f3 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 cfce8efb0..e1cbc2191 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 4d5a5f99a..d24e1b5f4 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 40a89e168..e8492ddb3 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 992575507..294438f34 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 e4a3d8bbd..9d36fb61f 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 d57814874..9358577b6 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 85db40b74..8ec7e1021 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 b976c68c5..0e5efd6da 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 1a3ebea6a..e4e7fd3eb 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 b73edd379..d31405244 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 865fa3a07..5c217c43c 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 3af03147e..1e623a197 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 0af5a78e3..ae16374b2 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 450362544..639440830 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 db7c157c3..fc3e8cb66 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 cc9ac45d7..b5e577913 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 c704f1c37..d0ae32e68 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 ed7afc229..1fe342b31 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 9bf263b5b..84514ac8c 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 92b92b6e2..0175c7226 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 e12b45931..d17066d92 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 98f0c173b..5891191e6 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 44ef928a8..5c7f8ecf2 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 8ba769d3d..521106def 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 3719c2ad4..3d7b1991c 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 73280fedc..0f0bafd18 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 da564da20..77feb397b 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 22c3a016c..b007ae160 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 0f0e401d9..0af6668cf 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 3441fbae9..b063c2239 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 0e93507ef..4795b6d06 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 ca74f85dc..7b5cfbe7e 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 aed0ec8b1..22660e686 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 7603465c7..16a1aa739 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 36a3d5f61..6617783cf 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 b35ec597c..9c1d38383 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 7d0d2de1e..146d91985 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 32322b8c5..ef1afb03d 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 b6aaa550e..c6e997f42 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 ce0e38d9c..7f3c1b645 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 ffcdef06f..3b488ddba 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 7492f78a9..a7f94de24 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 8417b7741..b20deea65 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 477494cca..7c50bace9 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 958a05bb2..7be358879 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 0fc67ec02..a326fb97e 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 fff51849d..0bd7adb94 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 0fc4df187..8b5aedabb 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 c71f3b579..27772f23b 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 568add4ca..b7a7566a7 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 d9123e434..bfa181c86 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 d89b9acb2..9b9a1a07c 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 61a48960d..bf0d0b6b7 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 7cd420adb..e5c3d3c07 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 b7e797d88..0c030d12d 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 fa155888a..20fdb4c22 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 558be461f..3c15e9d88 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 e013f3194..554cb342f 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 1a2232c57..5b21c3a1f 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 46a41fb20..1bdc39605 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 0490ac6a2..0cc8c0e70 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 bf733aed5..62e7cf5a9 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 98053e6a4..b3ef0891e 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 c02bdc8cc..eede21316 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 8fb7e158b..f0936ddf4 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 b24322350..b649357dc 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 c0a0ebdc1..4121bf5b6 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 7b13fe7a8..c0cc31acf 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 b91bc4115..c9d228c56 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 9f6f1eacb..4b3711b85 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 9fee5b9cf..a4ca260c6 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 940a6197d..072e6487c 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 9db932d85..adcda3d5d 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 ea2273d5a..cb7b53123 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 9b6824168..83cf6232f 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 ca0c4e45a..461180db2 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 9f8c35c3b..51b0b22be 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 c07974991..ef073a517 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 e04d92a4f..a82e938f4 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 a5f29c74e..43722b90b 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 bd6d6fa1d..e632a21b0 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 66563c4c6..73cf0d2ca 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 e1c50c6d0..91f209290 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 c32dbb44f..161fdfa44 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 37b9a2b6f..88db49f1a 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 85034bcf9..2c8d0a768 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 c3a4d8663..ee4f6bca5 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 c946c5fa8..bb221aebf 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 25c584462..7e52bbc9e 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 e62eb9aad..b8f1ccbfd 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 ecabdadef..356266c94 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 3f493064b..c468c035e 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 ceb5f5c7f..30ed76308 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 046501b77..262fca074 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 7f0d7e310..370119cde 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 11fbe2da9..617f82ef3 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 2f6200f96..062451fb6 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 920b2d509..af37debb1 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 e2e28f04f..c6a9480c3 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 43e6e29bd..fa606e71b 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 e543b4e8e..853e43c44 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 08d8060c8..c8904d56e 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 fd1edf490..775fae3af 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 72d5821c1..d32a8c5e4 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 1e3d36860..e9a0afcb8 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 9b41aa9a8..3b2005fab 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 1985d27a0..8ad491485 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 0da4168f1..384bbc7c3 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 af5cb32ae..50a91605e 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 2919748b7..2230d3593 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 84b1f7126..01f468de0 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 7a444d763..08c90aa62 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 c858ed22f..dcd2ce734 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 4e87f3a40..b064646d9 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 9f1f19bb6..414914101 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 e5c1655c5..458863a02 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 9fbd66429..10f669382 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 485f5ee79..6803ab634 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 633a94c1b..03cd3a238 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 ed024377d..6fe40c6b7 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 4468e44f1..9d156f21e 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 f8fdc2745..deaa78073 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 456d9c08b..fc93b28e2 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 a54ce5c32..e76eb02bc 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 28c3e4360..f5ae1c003 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 afb4627a0..6027a8059 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 493d7a1ee..020d9301f 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 10b49e38c..e0bbcb533 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 8fa15f5aa..597f4dfeb 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 f899ee476..3577e6515 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 f2751f70d..57f424c01 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 5661d608d..39ef65ce3 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 a1420eaf2..59ace5d81 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 1c95b6f03..dd2fb7587 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 4eb3f71ed..3fa7e42b3 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 89f553d9c..6d0a4c06c 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 e6ea9f945..157278823 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 7d4726cc2..f12963a2b 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 314a4eabd..698f935fb 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 c6306abb8..3539eb843 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 e0eb8e2ec..06e8a03e2 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 eb15a88b8..e19881515 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 7ce9722fd..006d30ca8 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 71f72eea1..5dbf3415c 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 a60b7010a..29fb07582 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 9e8eeb4e9..252bc4fff 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 c3876af8b..39e678fc4 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 fd385313c..5307cd1de 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 40a18b8fb..36c9b06d8 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 5b0532309..4d418fe53 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 14265cdce..dd8e1af38 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 b4dfd1c1c..9678830ce 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 aee3d3d2a..a43bbdd93 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 f5a1d41ab..eb4bbb3f7 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 029ecebd0..46775507c 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 590408571..11650375b 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 05133a2a9..998188dcf 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 577d65ba6..7292ecc46 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 507f19cbf..33480608a 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 dfca39a8b..9a26db78c 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 74d763ac7..1a2fc6939 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 451b1745d..37df8ed65 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 7b571d549..9ad7a6e3d 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 845427379..5e95853d4 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 161dc5345..5a25b6b5a 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 73f43ee2c..25a482705 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 4375c3960..685949787 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 a30612368..b5c70ec2d 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 3ca596511..705e8922d 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 dbb884697..79cd810ce 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 e7cb72878..8f97ce9f8 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 0a781f190..5c4363295 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 28e47d0d6..249cbea9b 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 f602ba965..b25b6d16d 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 46db86460..540a9021b 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 7d3f753ff..4b923761f 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 5ba4920d9..2b0cb02e2 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 d65a89fea..139fbf17a 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 ccf2176f2..29d495bc7 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 dfdf9b6d6..a3e48e3de 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 e69e3f43c..d2f9b3544 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 335b57598..2cc2a2f2c 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 7aef019da..7f4f165ff 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 777239aae..f9babd871 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 e79f2b67a..3bbf4c51e 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 a3a93e9b2..358cbc934 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 03db18159..25b90c7a2 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 2207b96dd..8c6728586 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 37fc4fa09..241edfe59 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 d63caec3e..28bf45fc8 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 d844efe8c..bff777d99 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 6fee0c2a0..2ab52d873 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 3c7199ef4..3a751ecce 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 e9b11dcc3..8040a3ac9 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 3499885a5..d79799196 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 7777214cd..516969b1d 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 b207049fe..0b81bc639 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 78ae481ba..171fdce61 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 2e4f87362..132c842ad 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 151c99603..66c95f2b7 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 a5d406cb5..27202c602 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 f07265a32..b8a8d5212 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 aec923dfa..2441184a2 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 34151244b..e2ed29a2c 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 09109ba2c..774f9de7e 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 339aecb74..41c5bdf69 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 427cb6fb7..d29a6e213 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 6d6f3f12f..037b8e45f 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 b052cc428..adc99c30d 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 fedd069df..4f6944875 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 e7ef21222..9e487a83f 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 348e04f93..1877bbcc4 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 cdf0c560d..79b8d4f4d 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 fce492659..42de11f65 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 94a78d803..555ba23c1 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 770ac62d2..4c7a45164 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 7eef9f85b..f9f064e55 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 79db66808..8d1633511 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 852537b19..0de34c640 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 774c9552a..57d5eace0 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 f1fb3c38c..4ce4e18e9 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 4023654ab..3f114046c 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 1505ca428..d6c532971 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 1fb16ce6b..a611e6165 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 464f7c42f..8e596d557 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 830de8015..407a63135 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 453bfae6d..8b5375910 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 e34cb2058..4522adc10 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 cfddb3af5..4370f1712 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 af5c41e87..630205c34 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 e5b5bf604..cd51638ea 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 efdbc4b52..8b5bad7ae 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 f3a64e0f8..22c4ba2e7 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 e1bd85b4f..46deaff75 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 23fb8e358..af2087599 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 6476e74fb..09952f929 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 32e1dd1ff..1aa865cd6 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 f0e089fb6..7ff78d56e 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 8bd1bc05a..3301d926c 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 6298e8896..05ebd7b1d 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 219a2c6cd..503f111aa 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 16e167e8f..8dfd99608 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 aa21ec29c..95e549a29 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 50232c427..e25f9a7af 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 78f19bf66..cd77da98b 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 b8f20e675..27e9099e5 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 c4e6f3d54..d5c86158b 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 6274fb2ef..53614bca1 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 ff64bc15c..98eb4dcc0 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 5dda10177..1297cb57f 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 2f7336fe2..9d1e230ff 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 f81290eae..f3dd135b1 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 da889ec45..1bd77496f 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 6c5c14d50..caf411878 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 db9f1a2a2..a5c1af798 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 9297fb3c0..827ebb55b 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 ef0da44ca..a3592468d 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 6a5eaeb99..2755b6e52 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 eb8fc9028..2b6e059c3 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 5f7af2b6c..c7aafacf9 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 ef9e76d0d..bdbffccbc 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 e54fb5984..c9ceaf93c 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 94037e2fa..c9fdf0983 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 eb5409b3a..6635c6f78 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 7e5677022..1da21cdc2 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 214002972..a697f8e7d 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 f4ce51584..cfd036d20 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 52e0fe695..afefeb0f0 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 581bf4d58..81c10b20d 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 d1239037b..85c4e76df 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 0290a2697..70a93d4e2 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 5ea86a341..374f85748 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 b01b0da1c..2ed9780c2 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 1f02c29cd..096d17202 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 a1e71b270..43995fa08 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 e0f618cd5..0a702cf86 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 2f043c7b2..ee77c92c0 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 76a6ecf34..cb0b24847 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 4cc4e38dc..23ebbdfdf 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 9f538ee09..76fb3c4fc 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 7362a6127..fee17e7c2 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 4a17e6730..5c3fcebb3 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 a39e2a981..7a591cb8b 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 1f7000a17..07a4c369b 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 685693c36..34f53190a 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 017b84cf2..1d03d74a9 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 780b0b06f..8a9579b39 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 f7809d32b..5c773899f 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 88451672d..576fe1fb8 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 10b0225cc..a142ffc45 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 cc5313fd6..da51d43be 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 459890373..cb79fa6fe 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 23a5e3ddf..e995c2c88 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 bdca9b157..0fa5ef1f7 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 b5063d255..208751c95 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 5d96422aa..066233695 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 d62e844e7..62895960c 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 d911e869e..c0d25feb3 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 033bf5d6f..8639c0f6f 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 806fbf81f..9d42d007c 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 fe320f29b..574487364 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 6e9727588..134738fee 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 28f6e1606..90b0d3606 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 c22f5e603..ca84d0023 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 fcba960b9..b58a4732b 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 8a78644ea..3004227a0 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 abb0c3395..d8915ba28 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 ff305b5d7..8ca4efa1a 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 fc371bad9..9cadf2394 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 ca8cb85ac..6743b5369 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 5e6abc72e..a49d6c116 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 1801b12b8..f22e9a05b 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 a6803c8a5..63d7f5ada 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 abfb91dcf..201fa04d2 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 3ebc56e4a..1767d9833 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)));