From 4a58261694f1538a419dd869f87ea4590171a9f2 Mon Sep 17 00:00:00 2001
From: Matt Jordan <mjordan@digium.com>
Date: Sat, 11 Apr 2015 21:38:22 -0500
Subject: [PATCH] git migration: Refactor the ASTERISK_FILE_VERSION macro

Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file. As a
result, this patch removes Asterisk's support for showing source file
versions.

Specifically, it does the following:

* Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and
  remove passing the version in with the macro. Other facilities
  than 'core show file version' make use of the file names, such as
  setting a debug level only on a specific file. As such, the act of
  registering source files with the Asterisk core still has use. The
  macro rename now reflects the new macro purpose.

* main/asterisk:
  - Refactor the file_version structure to reflect that it no longer
    tracks a version field.
  - Remove the "core show file version" CLI command. Without the file
    version, it is no longer useful.
  - Remove the ast_file_version_find function. The file version is no
    longer tracked.
  - Rename ast_register_file_version/ast_unregister_file_version to
    ast_register_file/ast_unregister_file, respectively.

* main/manager: Remove value from the Version key of the ModuleCheck
  Action. The actual key itself has not been removed, as doing so would
  absolutely constitute a backwards incompatible change. However, since
  the file version is no longer tracked, there is no need to attempt to
  include it in the Version key.

* UPGRADE: Add notes for:
  - Modification to the ModuleCheck AMI Action
  - Removal of the "core show file version" CLI command

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 3514f5fae9..8a349f0df2 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -33,6 +33,15 @@ chan_dahdi:
 
 Core:
 
+AMI:
+ - The 'ModuleCheck' Action's Version key will no longer show the module
+   version. The value will always be blank.
+
+CLI:
+ - The 'core show file version' command has been removed. When Asterisk
+   moved to Git, the source control version support was removed. As a
+   result, the CLi command was no longer useful and was removed as well.
+
 Logging:
  - The first callid created is now 1 instead of 0.  The value 0
    is now reserved to represent a lack of callid.
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 4fb3ce54f3..d55f9e035f 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -42,7 +42,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 3304702d24..45357989c6 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -42,7 +42,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pthread.h>
 #include <signal.h>
diff --git a/addons/format_mp3.c b/addons/format_mp3.c
index e354148f09..07715b548a 100644
--- a/addons/format_mp3.c
+++ b/addons/format_mp3.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 ee02f5206a..e9087d1fec 100644
--- a/addons/ooh323c/src/ooSocket.c
+++ b/addons/ooh323c/src/ooSocket.c
@@ -15,7 +15,7 @@
  *****************************************************************************/
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/io.h"
 #include "asterisk/lock.h"
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index 640e06ef88..299fe5619a 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index efe1aa3696..7f5f3e6fe0 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 a8f2d2c1bd..68bcfdead8 100644
--- a/apps/app_agent_pool.c
+++ b/apps/app_agent_pool.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index aaf956ff2d..d5a01885e9 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include <sys/wait.h>
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 68d100858a..ee5dd6f42b 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -43,7 +43,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index a8370588b8..f47db45346 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c
index 1e722f184c..0e03ad7cec 100644
--- a/apps/app_bridgewait.c
+++ b/apps/app_bridgewait.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index bf4961a537..7862179f33 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index 3037ef60f3..fff495460f 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 47b631a76c..0c3b27bb3a 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/ioctl.h>
 
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index f636e02480..80c1ff03d2 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 9080594bfb..3c7a917163 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index cefc1337c2..07188877fa 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -43,7 +43,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index c27fd1c52c..45580e4f0a 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 701904beb2..e8bdad01e1 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/ioctl.h>
 #include <sys/wait.h>
diff --git a/apps/app_db.c b/apps/app_db.c
index ef8d0b3a43..1376b6874b 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index ff18f959bd..0390cfe7f9 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <sys/signal.h>
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 97011b1b2f..0e4ef8d466 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index fa06595ce2..cdcda04778 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 267e2e8c34..c87288680e 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -30,7 +30,7 @@
  ***/
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 824e8fe55d..ab8d3082f2 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include <sys/time.h>
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 1794c25659..93a65063cc 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_echo.c b/apps/app_echo.c
index d8b207967a..2ec9d709b4 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/module.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index ab9a9aecef..1695ee5b8c 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -31,7 +31,7 @@
  ***/
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 9cb8839db7..2bb1d8b535 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 7822a34e80..ff323df475 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -21,7 +21,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 7df8caf8a8..19c9f33767 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -42,7 +42,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/apps/app_flash.c b/apps/app_flash.c
index dbbad3332e..79ce0d0f12 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <dahdi/user.h>
 
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 8531b17b73..4a2e569df0 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index bbd15881a5..4ff5cd6103 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 319ed3cb9c..7e457fb6ec 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index d0fdf5cf16..58201c4501 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -33,7 +33,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 #include <fcntl.h>
diff --git a/apps/app_image.c b/apps/app_image.c
index 4218917b21..66751f5417 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index de59fbd704..2ec28b16bf 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_jack.c b/apps/app_jack.c
index a4e47267e6..e5b0b9a418 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -42,7 +42,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <limits.h>
 
diff --git a/apps/app_macro.c b/apps/app_macro.c
index d8fd47fb1c..d2da165237 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 907770e225..ba83eadd64 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -47,7 +47,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <dahdi/user.h>
 
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index a3509581d3..a736fd47f2 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 45d04d8ba6..b8a1ceb775 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -146,7 +146,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <sys/time.h>
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 35df01433b..f5f9b22c17 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/stringfields.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 27e70f09c3..8d06ac44c7 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index a22265d358..5712cfe33b 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -34,7 +34,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index a347cf3c83..8175fc8104 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <fcntl.h>
 #include <sys/time.h>
diff --git a/apps/app_originate.c b/apps/app_originate.c
index 15898b2400..f744b7a9dd 100644
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index ef816c3402..25f9510ff9 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <osp/osp.h>
 #include <osp/osputils.h>
diff --git a/apps/app_page.c b/apps/app_page.c
index f5e1460edb..cea75cb5e4 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 6787573192..4b9eb15e5f 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_playtones.c b/apps/app_playtones.c
index fd947dd661..79e2a45769 100644
--- a/apps/app_playtones.c
+++ b/apps/app_playtones.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 0e04df60b4..70ec6562bb 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3aa30b0ac3..a82632d8e5 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -69,7 +69,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <sys/signal.h>
diff --git a/apps/app_read.c b/apps/app_read.c
index d2a1de7b64..1f586cb991 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index deaf83f539..a0a3c5583a 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_record.c b/apps/app_record.c
index 43a1e490f3..ed54a77892 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c
index 4eddc08e52..55867bbeb6 100644
--- a/apps/app_saycounted.c
+++ b/apps/app_saycounted.c
@@ -114,7 +114,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 3b4d2b51e7..c4efaf38e4 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index be70d7b0fd..bca4630247 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 98b7b2fad4..3b7f0ca2f4 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -33,7 +33,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 1bd093cfff..36d554ee62 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 337539efe5..54ecbe1ecb 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h> /* log10 */
 #include "asterisk/file.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index eb17c271b1..a748c3b4b1 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -40,7 +40,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <dirent.h>
 #include <ctype.h>
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index f3fc4c18fc..9660b4fd68 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index d94603837e..5b44d14687 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 253f41310c..2d440abfd4 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
  
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 4f53aff784..22e8342923 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index 7fe453de13..7fcffb196a 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index a021252dee..5cb10ad7ff 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index 410d686066..94f746bec2 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 1b81082782..d4cb6b6e19 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index d5dd70176a..863fa09eb1 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 8f7219eabb..c4f985f0ea 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index c6fc8d17b9..c285b2248b 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 620b767323..532275e3d4 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -102,7 +102,7 @@
 #endif
 #endif
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
 #include <sys/time.h>
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 7ed906bfaf..c4e14ad60d 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 07f2824da3..b63b0c8acb 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_waituntil.c b/apps/app_waituntil.c
index d1f4bb103a..c55b821b90 100644
--- a/apps/app_waituntil.c
+++ b/apps/app_waituntil.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index 90d3d5826c..273b466787 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 8e966e954c..27bcf6331d 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c
index b850e27f79..8ced0cccd8 100644
--- a/apps/confbridge/conf_chan_announce.c
+++ b/apps/confbridge/conf_chan_announce.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c
index 6694fa52c6..dd438c159c 100644
--- a/apps/confbridge/conf_chan_record.c
+++ b/apps/confbridge/conf_chan_record.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 41cc6c5c49..d3ffcb8813 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 eb1b58e155..133aceb9f3 100644
--- a/apps/confbridge/confbridge_manager.c
+++ b/apps/confbridge/confbridge_manager.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index d09a7a2ec9..f1d00c5a80 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bridges/bridge_builtin_interval_features.c b/bridges/bridge_builtin_interval_features.c
index bb07e5058f..0c8cf24fb3 100644
--- a/bridges/bridge_builtin_interval_features.c
+++ b/bridges/bridge_builtin_interval_features.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bridges/bridge_holding.c b/bridges/bridge_holding.c
index 2fd79d09ae..501ef9fa59 100644
--- a/bridges/bridge_holding.c
+++ b/bridges/bridge_holding.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c
index d5652bc78f..dc0c741b40 100644
--- a/bridges/bridge_native_rtp.c
+++ b/bridges/bridge_native_rtp.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bridges/bridge_simple.c b/bridges/bridge_simple.c
index 570453500c..fc12bd16af 100644
--- a/bridges/bridge_simple.c
+++ b/bridges/bridge_simple.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index b463f9936d..850e3982ce 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index e53240afde..22f7d79160 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -40,7 +40,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <time.h>
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 046713a866..944f98a6a0 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
 #include "asterisk/config.h"
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index df763639fa..2c4d8b712b 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 4fd5fdf61a..4a079aecd3 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -166,7 +166,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index b8640f6bca..8f326f932a 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index e9e9fc3d84..0c025ad124 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -49,7 +49,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libpq-fe.h>
 
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index f590c766b8..d9542653fa 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 88557b6ab0..5a3b9e1448 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -43,7 +43,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sqlite.h>
 
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index b5cb391c2b..b7f9978321 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sqlite3.h>
 
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 458721aa83..85860ececd 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -43,7 +43,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 7e44983a35..c71abd0e7e 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,7 +64,7 @@ CREATE TABLE [dbo].[cdr] (
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index edb009686e..0c55e497b9 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"
 #include "asterisk/channel.h"
diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index b3ff6a5de3..bdf505b66d 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -195,7 +195,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/cel.h"
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index 11e3330977..480344499a 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <time.h>
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 56a6069d45..bb42151995 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libpq-fe.h>
 
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index 79caf22f58..617ca660d4 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index afa99f7dce..07407829ca 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sqlite3.h>
 
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index a66115b713..30aa1fb0d8 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,7 +61,7 @@ CREATE TABLE [dbo].[cel] (
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <math.h>
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 74a61398ae..755936367d 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_bridge_media.c b/channels/chan_bridge_media.c
index 529fa26526..0a3468a122 100644
--- a/channels/chan_bridge_media.c
+++ b/channels/chan_bridge_media.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/bridge.h"
diff --git a/channels/chan_console.c b/channels/chan_console.c
index b14d4b746a..4fc538b77e 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -62,7 +62,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/signal.h>  /* SIGURG */
 
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e3f5c81ff1..b7df2b8113 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -54,7 +54,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 771f7706d7..8d3e7f1452 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -58,7 +58,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/mman.h>
 #include <dirent.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 95fa2dc7cd..602d38d014 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -40,7 +40,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <sys/ioctl.h>
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index ae8bcd7b8a..4bfb1993d7 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -81,7 +81,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pthread.h>
 #include <sys/socket.h>
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 13baa70eb9..05c6944ef3 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 36c3435bbc..c23eecdc95 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 51fce44c0b..0eb777a75e 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>		/* isalnum() used here */
 #include <math.h>
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 2bf7bddb4d..6d790fefdb 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -40,7 +40,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <sys/socket.h>
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index ca0e5cc037..07dd1b7b45 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -38,7 +38,7 @@
 #include <pjsip_ua.h>
 #include <pjlib.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/channels/chan_rtp.c b/channels/chan_rtp.c
index 97fbf9f318..04eb0b1fe1 100644
--- a/channels/chan_rtp.c
+++ b/channels/chan_rtp.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 179aa0fe46..3ee92da5ec 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -221,7 +221,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 #include <sys/signal.h>
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index d1c05abecb..06878fb961 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index f429617258..4379aa5c60 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/channels/console_board.c b/channels/console_board.c
index 6c920a944c..7755c449f6 100644
--- a/channels/console_board.c
+++ b/channels/console_board.c
@@ -42,7 +42,7 @@
  ***/
 
 #include "asterisk.h"	/* ast_strdupa */
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 a1db5cd773..da651baacb 100644
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -41,7 +41,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 9df82b29bf..d67cb5c435 100644
--- a/channels/dahdi/bridge_native_dahdi.c
+++ b/channels/dahdi/bridge_native_dahdi.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "../sig_analog.h"
 #if defined(HAVE_PRI)
diff --git a/channels/iax2/codec_pref.c b/channels/iax2/codec_pref.c
index 85167c368e..fba06a1ed1 100644
--- a/channels/iax2/codec_pref.c
+++ b/channels/iax2/codec_pref.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
diff --git a/channels/iax2/firmware.c b/channels/iax2/firmware.c
index a1ee435505..7e43bef43b 100644
--- a/channels/iax2/firmware.c
+++ b/channels/iax2/firmware.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/channels/iax2/format_compatibility.c b/channels/iax2/format_compatibility.c
index be7852c8f5..72fabf1160 100644
--- a/channels/iax2/format_compatibility.c
+++ b/channels/iax2/format_compatibility.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c
index 2a3eabf412..7538100703 100644
--- a/channels/iax2/parser.c
+++ b/channels/iax2/parser.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/channels/iax2/provision.c b/channels/iax2/provision.c
index 85dfe9448c..fcad2fe112 100644
--- a/channels/iax2/provision.c
+++ b/channels/iax2/provision.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 32f92c3238..5915b6e9e4 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "chan_misdn_config.h"
 
diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c
index e291110e22..24daac8dcf 100644
--- a/channels/pjsip/dialplan_functions.c
+++ b/channels/pjsip/dialplan_functions.c
@@ -369,7 +369,7 @@
 #include <pjlib.h>
 #include <pjsip_ua.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c
index d48ff08dd0..a3964b047d 100644
--- a/channels/sip/config_parser.c
+++ b/channels/sip/config_parser.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "include/sip.h"
 #include "include/config_parser.h"
diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index ee34249551..91a46784f9 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index e5c1ff2bca..1541d7c25b 100644
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "include/sip.h"
 #include "include/sip_utils.h"
diff --git a/channels/sip/route.c b/channels/sip/route.c
index 14c2b443f3..53f8805e2b 100644
--- a/channels/sip/route.c
+++ b/channels/sip/route.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 
diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c
index 691c5bde18..e1b9c174a4 100644
--- a/channels/sip/security_events.c
+++ b/channels/sip/security_events.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "include/sip.h"
 #include "include/security_events.h"
diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c
index 45dced4e1f..ce8bb2b7d4 100644
--- a/channels/vgrabbers.c
+++ b/channels/vgrabbers.c
@@ -49,7 +49,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 c21c706f50..a831abfcfe 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 6b64f86935..d46230971e 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index de9c4c4be2..21ca5c89d4 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index 8832bc3174..69f6f32fe5 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -34,7 +34,7 @@
 #include "asterisk.h"
 #include <stdbool.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <fcntl.h>
 #include <netinet/in.h>
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index e262ebd719..fdae2a7d30 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 1954c5134d..0f9d33c017 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 8cb49430fb..92ccd82572 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index af23b906d7..8247f24733 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index ca2eb8ef08..b560e62d2d 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 26b1f0e08a..67e9ce2b0f 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -32,7 +32,7 @@
 #include "asterisk.h"
 #include "speex/speex_resampler.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index c91070d9e1..f7b6046dce 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <speex/speex.h>
 
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 58c0a895e1..e75e29b107 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/formats/format_g719.c b/formats/format_g719.c
index f58286290b..f6807b9ca9 100644
--- a/formats/format_g719.c
+++ b/formats/format_g719.c
@@ -29,7 +29,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 6d0b96337b..777cd746b9 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -31,7 +31,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 25daff9081..684275c2b4 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -34,7 +34,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 2c677b2e9e..69e6a2563b 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -32,7 +32,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 4a688e22ab..bf82dd5c63 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -29,7 +29,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 731b746e0b..f02d030772 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 7c3d2d4738..6333091384 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 6b811e6931..e07eedba0e 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index 5b2c72d0db..ed21f88f84 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index ed616c5e78..0daf64cba9 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index beb0015912..6361cd00f4 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_siren14.c b/formats/format_siren14.c
index d0a16c4a2c..71de82e98b 100644
--- a/formats/format_siren14.c
+++ b/formats/format_siren14.c
@@ -29,7 +29,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_siren7.c b/formats/format_siren7.c
index acfde420c4..2fcc131a31 100644
--- a/formats/format_siren7.c
+++ b/formats/format_siren7.c
@@ -29,7 +29,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 143e4da2fd..68aa74d475 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -27,7 +27,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 6724c54d76..5107ab9183 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -30,7 +30,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 90ef986ef0..688c3e7e41 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 06597abb3f..d5661fbf68 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -33,7 +33,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/mod_format.h"
 #include "asterisk/module.h"
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 3338118f9a..52fddb67ec 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 1a7619d916..5352e172c2 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"	/* function register/unregister */
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index bb045059b2..5d3d4b9c9b 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/funcs/func_callcompletion.c b/funcs/func_callcompletion.c
index cb1cd59b3f..d50774fa9d 100644
--- a/funcs/func_callcompletion.c
+++ b/funcs/func_callcompletion.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 4f6a6779b4..1599349490 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index ca54b1e429..2bb6a8efed 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 68baa1e5e9..77e18aefa6 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 #include <ctype.h>
diff --git a/funcs/func_config.c b/funcs/func_config.c
index ca6dad1a19..64676c0117 100644
--- a/funcs/func_config.c
+++ b/funcs/func_config.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index beab0c144c..ed5f12f582 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <curl/curl.h>
 
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 4b6dc9d48a..23995ba912 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_db.c b/funcs/func_db.c
index b56fef9f5e..f031645a93 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index 88a5c5c716..d86f54eb95 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c
index 37aba6afbe..f6723119dc 100644
--- a/funcs/func_dialgroup.c
+++ b/funcs/func_dialgroup.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c
index 0f3c0f823b..70bb111b14 100644
--- a/funcs/func_dialplan.c
+++ b/funcs/func_dialplan.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index 4b5fb9f7b8..58a05c0329 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_env.c b/funcs/func_env.c
index 3c260a2fb3..8f9753aaa9 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>   /* stat(2) */
 
diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c
index 940c455c28..025d4975de 100644
--- a/funcs/func_extstate.c
+++ b/funcs/func_extstate.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 512d685f10..e8c1094580 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_global.c b/funcs/func_global.c
index a2329c46e9..23e69d335e 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index fd775d9945..9708ca7c0c 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_hangupcause.c b/funcs/func_hangupcause.c
index 983a0e1088..043e480f3b 100644
--- a/funcs/func_hangupcause.c
+++ b/funcs/func_hangupcause.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index c3d02865cc..9582d67c51 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <iconv.h>
diff --git a/funcs/func_jitterbuffer.c b/funcs/func_jitterbuffer.c
index e33b2c23a5..ef7ff71390 100644
--- a/funcs/func_jitterbuffer.c
+++ b/funcs/func_jitterbuffer.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 2102d5c9a2..7bb50f5e34 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index e371f7ec1a..8724ff51f5 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_math.c b/funcs/func_math.c
index 5c8d3bce8f..ae13058871 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 2e60185864..ff36c9e37e 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_module.c b/funcs/func_module.c
index b0b3461169..143804a07c 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 088cd5a0a6..7d09ec5a73 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/file.h"
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index ce5aac054f..e62e660bf2 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_pitchshift.c b/funcs/func_pitchshift.c
index bec5f71dd3..829498ab12 100644
--- a/funcs/func_pitchshift.c
+++ b/funcs/func_pitchshift.c
@@ -64,7 +64,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_pjsip_aor.c b/funcs/func_pjsip_aor.c
index e44ee946ba..41c15ffa16 100644
--- a/funcs/func_pjsip_aor.c
+++ b/funcs/func_pjsip_aor.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pjlib.h>
diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c
index 0f5a204b88..fc65ae9222 100644
--- a/funcs/func_pjsip_contact.c
+++ b/funcs/func_pjsip_contact.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pjlib.h>
diff --git a/funcs/func_pjsip_endpoint.c b/funcs/func_pjsip_endpoint.c
index 8d079ed2de..ef544f367d 100644
--- a/funcs/func_pjsip_endpoint.c
+++ b/funcs/func_pjsip_endpoint.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pjlib.h>
diff --git a/funcs/func_presencestate.c b/funcs/func_presencestate.c
index f1af8b4fdd..775c7dc794 100644
--- a/funcs/func_presencestate.c
+++ b/funcs/func_presencestate.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 6491b371de..cc34517dc2 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index a870ab4508..0ce191b543 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index c6b7575454..9f596c4fe2 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_shell.c b/funcs/func_shell.c
index e403efc2e8..f529cbf724 100644
--- a/funcs/func_shell.c
+++ b/funcs/func_shell.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_sorcery.c b/funcs/func_sorcery.c
index 1671b3f055..8c1697abac 100644
--- a/funcs/func_sorcery.c
+++ b/funcs/func_sorcery.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_speex.c b/funcs/func_speex.c
index d0d451bd16..a4cfa17b34 100644
--- a/funcs/func_speex.c
+++ b/funcs/func_speex.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <speex/speex_preprocess.h>
 #include "asterisk/module.h"
diff --git a/funcs/func_sprintf.c b/funcs/func_sprintf.c
index 4d5fc7a6c0..822937e55d 100644
--- a/funcs/func_sprintf.c
+++ b/funcs/func_sprintf.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 
diff --git a/funcs/func_srv.c b/funcs/func_srv.c
index 3786a2fa2a..79a24db00b 100644
--- a/funcs/func_srv.c
+++ b/funcs/func_srv.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/srv.h"
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index efa4bfda71..255e846531 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 #include <ctype.h>
diff --git a/funcs/func_sysinfo.c b/funcs/func_sysinfo.c
index 8da94dd334..9d8b765e46 100644
--- a/funcs/func_sysinfo.c
+++ b/funcs/func_sysinfo.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>
diff --git a/funcs/func_talkdetect.c b/funcs/func_talkdetect.c
index ccc74fd7f1..b8dd2d4583 100644
--- a/funcs/func_talkdetect.c
+++ b/funcs/func_talkdetect.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index b757e998f8..1cb6b8dd4f 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index f53b75fa34..b7f891b70f 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_version.c b/funcs/func_version.c
index da733d1e36..5ccff8273a 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index 6c98e72f66..2c3563192f 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <dirent.h>
 
diff --git a/funcs/func_volume.c b/funcs/func_volume.c
index 9fd02008fe..a8f84586d7 100644
--- a/funcs/func_volume.c
+++ b/funcs/func_volume.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
diff --git a/include/asterisk.h b/include/asterisk.h
index 9a0264e8ce..14e88e6256 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -156,13 +156,12 @@ int ast_shutdown_final(void);
 /*!
  * \brief Register the version of a source code file with the core.
  * \param file the source file name
- * \param version the version string (typically a SVN revision keyword string)
  * \return nothing
  *
  * This function should not be called directly, but instead the
- * ASTERISK_FILE_VERSION macro should be used to register a file with the core.
+ * ASTERISK_REGISTER_FILE macro should be used to register a file with the core.
  */
-void ast_register_file_version(const char *file, const char *version);
+void __ast_register_file(const char *file);
 
 /*!
  * \brief Unregister a source code file from the core.
@@ -170,66 +169,64 @@ void ast_register_file_version(const char *file, const char *version);
  * \return nothing
  *
  * This function should not be called directly, but instead the
- * ASTERISK_FILE_VERSION macro should be used to automatically unregister
+ * ASTERISK_REGISTER_FILE macro should be used to automatically unregister
  * the file when the module is unloaded.
  */
-void ast_unregister_file_version(const char *file);
+void __ast_unregister_file(const char *file);
 
-/*! \brief Find version for given module name
- * \param file Module name (i.e. chan_sip.so)
- * \return version string or NULL if the module is not found
+/*!
+ * \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.
  */
-const char *ast_file_version_find(const char *file);
-
 char *ast_complete_source_filename(const char *partial, int n);
 
 /*!
  * \brief Register/unregister a source code file with the core.
- * \param file the source file name
- * \param version the version string (typically a SVN revision keyword string)
  *
  * This macro will place a file-scope constructor and destructor into the
- * source of the module using it; this will cause the version of this file
- * to registered with the Asterisk core (and unregistered) at the appropriate
+ * 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_FILE_VERSION(__FILE__, "\$Revision\$")
+ * ASTERISK_REGISTER_FILE()
  * \endcode
- *
- * \note The dollar signs above have been protected with backslashes to keep
- * SVN from modifying them in this file; under normal circumstances they would
- * not be present and SVN would expand the Revision keyword into the file's
- * revision number.
  */
 #ifdef MTX_PROFILE
 #define	HAVE_MTX_PROFILE	/* used in lock.h */
-#define ASTERISK_FILE_VERSION(file, version) \
+#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_version(file, version); \
+		mtx_prof = ast_add_profile("mtx_lock_" __FILE__, 0);	\
+		__ast_register_file(__FILE__); \
 	} \
 	static void __attribute__((destructor)) __unregister_file_version(void) \
 	{ \
-		ast_unregister_file_version(file); \
+		__ast_unregister_file(__FILE__); \
 	}
 #else /* !MTX_PROFILE */
-#define ASTERISK_FILE_VERSION(file, version) \
+#define ASTERISK_REGISTER_FILE() \
 	static void __attribute__((constructor)) __register_file_version(void) \
 	{ \
-		ast_register_file_version(file, version); \
+		__ast_register_file(__FILE__); \
 	} \
 	static void __attribute__((destructor)) __unregister_file_version(void) \
 	{ \
-		ast_unregister_file_version(file); \
+		__ast_unregister_file(__FILE__); \
 	}
 #endif /* !MTX_PROFILE */
 #else /* LOW_MEMORY */
-#define ASTERISK_FILE_VERSION(file, x)
+#define ASTERISK_REGISTER_FILE()
 #endif /* LOW_MEMORY */
 
 #if !defined(LOW_MEMORY)
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index b629fe826d..c703c68727 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
diff --git a/main/acl.c b/main/acl.c
index fa1e35c741..92b675443b 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/network.h"
 
diff --git a/main/alaw.c b/main/alaw.c
index c5069f358e..3b9bfd6b9c 100644
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/alaw.h"
 #include "asterisk/logger.h"
diff --git a/main/aoc.c b/main/aoc.c
index 5bce066515..ba44fbfb97 100644
--- a/main/aoc.c
+++ b/main/aoc.c
@@ -28,7 +28,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/aoc.h"
 #include "asterisk/utils.h"
diff --git a/main/app.c b/main/app.c
index 37afe42978..2046ac8a02 100644
--- a/main/app.c
+++ b/main/app.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index f42604ee67..84a3d7b977 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -99,7 +99,7 @@
 
 #if !defined(STANDALONE) && !defined(STANDALONE2)	\
 	
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index 51af56b402..c2d4e00a4b 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -521,7 +521,7 @@ static yyconst flex_int16_t yy_chk[159] =
 #include <stdio.h>
 
 #if !defined(STANDALONE)
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
diff --git a/main/asterisk.c b/main/asterisk.c
index baf5ded4fe..574451c659 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -149,7 +149,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
@@ -475,87 +475,65 @@ static struct {
 } sig_flags;
 
 #if !defined(LOW_MEMORY)
-struct file_version {
-	AST_RWLIST_ENTRY(file_version) list;
+struct registered_file {
+	AST_RWLIST_ENTRY(registered_file) list;
 	const char *file;
-	char *version;
 };
 
-static AST_RWLIST_HEAD_STATIC(file_versions, file_version);
+static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
 
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file)
 {
-	struct file_version *new;
-	char *work;
-	size_t version_length;
-
-	work = ast_strdupa(version);
-	work = ast_strip(ast_strip_quoted(work, "$", "$"));
-	version_length = strlen(work) + 1;
+	struct registered_file *reg;
 
-	if (!(new = ast_calloc(1, sizeof(*new) + version_length)))
+	reg = ast_calloc(1, sizeof(*reg));
+	if (!reg) {
 		return;
+	}
 
-	new->file = file;
-	new->version = (char *) new + sizeof(*new);
-	memcpy(new->version, work, version_length);
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_INSERT_HEAD(&file_versions, new, list);
-	AST_RWLIST_UNLOCK(&file_versions);
+	reg->file = file;
+	AST_RWLIST_WRLOCK(&registered_files);
+	AST_RWLIST_INSERT_HEAD(&registered_files, reg, list);
+	AST_RWLIST_UNLOCK(&registered_files);
 }
 
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file)
 {
-	struct file_version *find;
+	struct registered_file *find;
 
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&file_versions, find, list) {
+	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(&file_versions);
+	AST_RWLIST_UNLOCK(&registered_files);
 
-	if (find)
+	if (find) {
 		ast_free(find);
+	}
 }
 
 char *ast_complete_source_filename(const char *partial, int n)
 {
-	struct file_version *find;
+	struct registered_file *find;
 	size_t len = strlen(partial);
 	int count = 0;
 	char *res = NULL;
 
-	AST_RWLIST_RDLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, find, list) {
+	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(&file_versions);
+	AST_RWLIST_UNLOCK(&registered_files);
 	return res;
 }
 
-/*! \brief Find version for given module name */
-const char *ast_file_version_find(const char *file)
-{
-	struct file_version *iterator;
-
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, iterator, list) {
-		if (!strcasecmp(iterator->file, file))
-			break;
-	}
-	AST_RWLIST_UNLOCK(&file_versions);
-	if (iterator)
-		return iterator->version;
-	return NULL;
-}
-
 struct thread_list_t {
 	AST_RWLIST_ENTRY(thread_list_t) list;
 	char *name;
@@ -1031,88 +1009,6 @@ static char *handle_clear_profile(struct ast_cli_entry *e, int cmd, struct ast_c
 }
 #undef DEFINE_PROFILE_MIN_MAX_VALUES
 
-/*! \brief CLI command to list module versions */
-static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-#define FORMAT "%-25.25s %-40.40s\n"
-	struct file_version *iterator;
-	regex_t regexbuf;
-	int havepattern = 0;
-	int havename = 0;
-	int count_files = 0;
-	char *ret = NULL;
-	int matchlen, which = 0;
-	struct file_version *find;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "core show file version [like]";
-		e->usage =
-			"Usage: core show file version [like <pattern>]\n"
-			"       Lists the revision numbers of the files used to build this copy of Asterisk.\n"
-			"       Optional regular expression pattern is used to filter the file list.\n";
-		return NULL;
-	case CLI_GENERATE:
-		matchlen = strlen(a->word);
-		if (a->pos != 3)
-			return NULL;
-		AST_RWLIST_RDLOCK(&file_versions);
-		AST_RWLIST_TRAVERSE(&file_versions, find, list) {
-			if (!strncasecmp(a->word, find->file, matchlen) && ++which > a->n) {
-				ret = ast_strdup(find->file);
-				break;
-			}
-		}
-		AST_RWLIST_UNLOCK(&file_versions);
-		return ret;
-	}
-
-
-	switch (a->argc) {
-	case 6:
-		if (!strcasecmp(a->argv[4], "like")) {
-			if (regcomp(&regexbuf, a->argv[5], REG_EXTENDED | REG_NOSUB))
-				return CLI_SHOWUSAGE;
-			havepattern = 1;
-		} else
-			return CLI_SHOWUSAGE;
-		break;
-	case 5:
-		havename = 1;
-		break;
-	case 4:
-		break;
-	default:
-		return CLI_SHOWUSAGE;
-	}
-
-	ast_cli(a->fd, FORMAT, "File", "Revision");
-	ast_cli(a->fd, FORMAT, "----", "--------");
-	AST_RWLIST_RDLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, iterator, list) {
-		if (havename && strcasecmp(iterator->file, a->argv[4]))
-			continue;
-
-		if (havepattern && regexec(&regexbuf, iterator->file, 0, NULL, 0))
-			continue;
-
-		ast_cli(a->fd, FORMAT, iterator->file, iterator->version);
-		count_files++;
-		if (havename)
-			break;
-	}
-	AST_RWLIST_UNLOCK(&file_versions);
-	if (!havename) {
-		ast_cli(a->fd, "%d files listed.\n", count_files);
-	}
-
-	if (havepattern)
-		regfree(&regexbuf);
-
-	return CLI_SUCCESS;
-#undef FORMAT
-}
-
 #endif /* ! LOW_MEMORY */
 
 static void publish_fully_booted(void)
@@ -2701,7 +2597,6 @@ static struct ast_cli_entry cli_asterisk[] = {
 	AST_CLI_DEFINE(handle_version, "Display version info"),
 	AST_CLI_DEFINE(handle_bang, "Execute a shell command"),
 #if !defined(LOW_MEMORY)
-	AST_CLI_DEFINE(handle_show_version_files, "List versions of files used to build Asterisk"),
 	AST_CLI_DEFINE(handle_show_threads, "Show running threads"),
 #if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL)
 	AST_CLI_DEFINE(handle_show_sysinfo, "Show System Information"),
diff --git a/main/astfd.c b/main/astfd.c
index d9119c9688..72c5761d73 100644
--- a/main/astfd.c
+++ b/main/astfd.c
@@ -31,7 +31,7 @@
 
 #ifdef DEBUG_FD_LEAKS
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <string.h>
diff --git a/main/astmm.c b/main/astmm.c
index 5812174d5c..a4d5602ce6 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -32,7 +32,7 @@
 
 #if defined(__AST_DEBUG_MALLOC)
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
 #include <stddef.h>
diff --git a/main/astobj2.c b/main/astobj2.c
index f1d5001748..0f6ed739be 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
diff --git a/main/astobj2_container.c b/main/astobj2_container.c
index dc6f5e5c55..d0abc7985f 100644
--- a/main/astobj2_container.c
+++ b/main/astobj2_container.c
@@ -22,7 +22,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c
index 37d4b60178..76259dc7ff 100644
--- a/main/astobj2_hash.c
+++ b/main/astobj2_hash.c
@@ -23,7 +23,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c
index 2e3a73eaae..a069c408e1 100644
--- a/main/astobj2_rbtree.c
+++ b/main/astobj2_rbtree.c
@@ -23,7 +23,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index 1883c0091c..b754f23298 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/main/autochan.c b/main/autochan.c
index 7da249a136..d41a8d8214 100644
--- a/main/autochan.c
+++ b/main/autochan.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/autochan.h"
 #include "asterisk/utils.h"
diff --git a/main/autoservice.c b/main/autoservice.c
index 9630990d1b..1af052d088 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/backtrace.c b/main/backtrace.c
index a1156467f7..3b490e8c3c 100644
--- a/main/backtrace.c
+++ b/main/backtrace.c
@@ -27,7 +27,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/backtrace.h"
 #include "asterisk/utils.h"
diff --git a/main/bridge.c b/main/bridge.c
index 7b69b6fb35..b1c42ff586 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -71,7 +71,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/main/bridge_after.c b/main/bridge_after.c
index a41f8a5483..e2f14ab611 100644
--- a/main/bridge_after.c
+++ b/main/bridge_after.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index 522a7d40cb..c48db5c005 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index c25d827cb7..9e300684d7 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/main/bridge_roles.c b/main/bridge_roles.c
index 1d781ca93c..0305237351 100644
--- a/main/bridge_roles.c
+++ b/main/bridge_roles.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/main/bucket.c b/main/bucket.c
index 7618761b9f..e93c66b19d 100644
--- a/main/bucket.c
+++ b/main/bucket.c
@@ -60,7 +60,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef HAVE_URIPARSER
 #include <uriparser/Uri.h>
diff --git a/main/callerid.c b/main/callerid.c
index a99dafc44c..69fe6ff706 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <math.h>
diff --git a/main/ccss.c b/main/ccss.c
index ff5739ab07..c1b3372dce 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/strings.h"
diff --git a/main/cdr.c b/main/cdr.c
index 5e24dae1b2..9b32f9d9f4 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 #include <inttypes.h>
diff --git a/main/cel.c b/main/cel.c
index 0c1e37b689..f2d5168833 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/channel.c b/main/channel.c
index af93956161..4e418b6ea9 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c
index 0ff8444405..a2fafbf338 100644
--- a/main/channel_internal_api.c
+++ b/main/channel_internal_api.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/main/chanvars.c b/main/chanvars.c
index 37714e9a21..dc97df7735 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/chanvars.h"
 #include "asterisk/strings.h"
diff --git a/main/cli.c b/main/cli.c
index 42f56fcfde..9d3cdf3f4f 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
diff --git a/main/codec.c b/main/codec.c
index 543d4d0bde..9c4169a1cc 100644
--- a/main/codec.c
+++ b/main/codec.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/codec.h"
diff --git a/main/codec_builtin.c b/main/codec_builtin.c
index 2e89e9a7d8..4be635e1b5 100644
--- a/main/codec_builtin.c
+++ b/main/codec_builtin.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
diff --git a/main/config.c b/main/config.c
index daccae535b..bc622ccaba 100644
--- a/main/config.c
+++ b/main/config.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 0cc2dda3e5..a1ba5d2e56 100644
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/main/core_local.c b/main/core_local.c
index 1bcd91db2a..f81c71cd61 100644
--- a/main/core_local.c
+++ b/main/core_local.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 /* ------------------------------------------------------------------- */
 
diff --git a/main/core_unreal.c b/main/core_unreal.c
index f26642429b..55b4ea3686 100644
--- a/main/core_unreal.c
+++ b/main/core_unreal.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/causes.h"
 #include "asterisk/channel.h"
diff --git a/main/crypt.c b/main/crypt.c
index 5e5df02cd9..a4cf664b15 100644
--- a/main/crypt.c
+++ b/main/crypt.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <unistd.h>
 #if defined(HAVE_CRYPT_R)
diff --git a/main/data.c b/main/data.c
index 33a7c040fd..1aaae18f18 100644
--- a/main/data.c
+++ b/main/data.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/datastore.c b/main/datastore.c
index ed9b3210e7..a9079e8375 100644
--- a/main/datastore.c
+++ b/main/datastore.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/db.c b/main/db.c
index 4bb9355c66..bb6e18bb55 100644
--- a/main/db.c
+++ b/main/db.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_DB */
diff --git a/main/devicestate.c b/main/devicestate.c
index 7eb9e3057d..e2cc2f2f3b 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -143,7 +143,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/channel.h"
diff --git a/main/dial.c b/main/dial.c
index 210715556b..f0cf127375 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/dns.c b/main/dns.c
index 320d91768d..fd87420267 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/network.h"
 #include <arpa/nameser.h>	/* res_* functions */
diff --git a/main/dns_core.c b/main/dns_core.c
index 53ea1d09ea..e66c71d62b 100644
--- a/main/dns_core.c
+++ b/main/dns_core.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/linkedlists.h"
 #include "asterisk/vector.h"
diff --git a/main/dns_naptr.c b/main/dns_naptr.c
index 72f28dc81a..4d5a5f99ae 100644
--- a/main/dns_naptr.c
+++ b/main/dns_naptr.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <arpa/nameser.h>
 #include <resolv.h>
diff --git a/main/dns_query_set.c b/main/dns_query_set.c
index 45626d1b94..852fa3e533 100644
--- a/main/dns_query_set.c
+++ b/main/dns_query_set.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/vector.h"
 #include "asterisk/astobj2.h"
diff --git a/main/dns_recurring.c b/main/dns_recurring.c
index 3ebbab070c..855273f106 100644
--- a/main/dns_recurring.c
+++ b/main/dns_recurring.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/dns_srv.c b/main/dns_srv.c
index a617ede4d7..f5d038ae70 100644
--- a/main/dns_srv.c
+++ b/main/dns_srv.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/main/dns_tlsa.c b/main/dns_tlsa.c
index aa6f5308f1..85db40b74b 100644
--- a/main/dns_tlsa.c
+++ b/main/dns_tlsa.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/dns_core.h"
 #include "asterisk/dns_tlsa.h"
@@ -52,4 +52,4 @@ unsigned int ast_dns_tlsa_get_matching_type(const struct ast_dns_record *record)
 const char *ast_dns_tlsa_get_association_data(const struct ast_dns_record *record)
 {
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index b5bfd17bea..b976c68c53 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include <regex.h>
diff --git a/main/dsp.c b/main/dsp.c
index 087416358e..193bf9fd50 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -55,7 +55,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/main/endpoints.c b/main/endpoints.c
index 66ad4618e3..c70170b41f 100644
--- a/main/endpoints.c
+++ b/main/endpoints.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/endpoints.h"
diff --git a/main/enum.c b/main/enum.c
index bae1299656..865fa3a078 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -60,7 +60,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/main/event.c b/main/event.c
index 8880b96993..228807dd84 100644
--- a/main/event.c
+++ b/main/event.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/features.c b/main/features.c
index df464d5665..971fb4a025 100644
--- a/main/features.c
+++ b/main/features.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/file.c b/main/file.c
index c32de28118..acd2cc6bca 100644
--- a/main/file.c
+++ b/main/file.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <dirent.h>
 #include <sys/stat.h>
diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c
index 17cad494ae..db7c157c32 100644
--- a/main/fixedjitterbuf.c
+++ b/main/fixedjitterbuf.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <assert.h>
 
diff --git a/main/format.c b/main/format.c
index 3e1ee866ec..8fed71f734 100644
--- a/main/format.c
+++ b/main/format.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/codec.h"
diff --git a/main/format_cache.c b/main/format_cache.c
index 6638a78c0d..3e729769c4 100644
--- a/main/format_cache.c
+++ b/main/format_cache.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/format.h"
diff --git a/main/format_cap.c b/main/format_cap.c
index 177652efbd..c9c6c3b303 100644
--- a/main/format_cap.c
+++ b/main/format_cap.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/format.h"
diff --git a/main/format_compatibility.c b/main/format_compatibility.c
index cf66af282a..9bf263b5b2 100644
--- a/main/format_compatibility.c
+++ b/main/format_compatibility.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/astobj2.h"
diff --git a/main/frame.c b/main/frame.c
index 64af882379..ae2120a5a3 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/lock.h"
diff --git a/main/framehook.c b/main/framehook.c
index e42a232c06..e12b45931a 100644
--- a/main/framehook.c
+++ b/main/framehook.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c
index 7bddee7f53..98f0c173ba 100644
--- a/main/fskmodem_float.c
+++ b/main/fskmodem_float.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 
diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c
index cc720fe446..44ef928a82 100644
--- a/main/fskmodem_int.c
+++ b/main/fskmodem_int.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/fskmodem.h"
 
diff --git a/main/global_datastores.c b/main/global_datastores.c
index 92c6bb4f7a..dd1e0278e4 100644
--- a/main/global_datastores.c
+++ b/main/global_datastores.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/global_datastores.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/hashtab.c b/main/hashtab.c
index a35af6718f..27a700a9da 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -29,7 +29,7 @@
 #define WRAP_LIBC_MALLOC
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 
diff --git a/main/heap.c b/main/heap.c
index c04f7a0103..29f069b30a 100644
--- a/main/heap.c
+++ b/main/heap.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/heap.h"
 #include "asterisk/utils.h"
diff --git a/main/http.c b/main/http.c
index 26e218ba0b..3a9d9ce9cb 100644
--- a/main/http.c
+++ b/main/http.c
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/main/image.c b/main/image.c
index 118cd17c24..22c3a016c2 100644
--- a/main/image.c
+++ b/main/image.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/main/indications.c b/main/indications.c
index 02a68b7cac..0f0e401d98 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/main/io.c b/main/io.c
index cd35995ad3..ff5ca57f79 100644
--- a/main/io.c
+++ b/main/io.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <termios.h>
 #include <sys/ioctl.h>
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 1bfe508dac..0e93507ef8 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "jitterbuf.h"
 #include "asterisk/utils.h"
diff --git a/main/json.c b/main/json.c
index 35e6f16cef..12d5fc865a 100644
--- a/main/json.c
+++ b/main/json.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/json.h"
 #include "asterisk/localtime.h"
diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
index ca3fb569c3..06790ffd0c 100644
--- a/main/libasteriskssl.c
+++ b/main/libasteriskssl.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef HAVE_OPENSSL
 #include <openssl/ssl.h>
diff --git a/main/loader.c b/main/loader.c
index eac38422cb..26d229fdbf 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
diff --git a/main/lock.c b/main/lock.c
index dd90d7bd9a..13b8fb388e 100644
--- a/main/lock.c
+++ b/main/lock.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/logger.c b/main/logger.c
index 29122b514c..41f26e8238 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -40,7 +40,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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. */
diff --git a/main/manager.c b/main/manager.c
index d2d9896c25..4cfae75dfb 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -54,7 +54,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use various ast_config_AST_* */
 #include <ctype.h>
@@ -5979,9 +5979,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 	const char *module = astman_get_header(m, "Module");
 	const char *id = astman_get_header(m, "ActionID");
 	char idText[256];
-#if !defined(LOW_MEMORY)
-	const char *version;
-#endif
 	char filename[PATH_MAX];
 	char *cut;
 
@@ -5998,11 +5995,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 		astman_send_error(s, m, "Module not loaded");
 		return 0;
 	}
-	snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
-	ast_debug(1, "**** ModuleCheck .c file %s\n", filename);
-#if !defined(LOW_MEMORY)
-	version = ast_file_version_find(filename);
-#endif
 
 	if (!ast_strlen_zero(id)) {
 		snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
@@ -6011,7 +6003,7 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 	}
 	astman_append(s, "Response: Success\r\n%s", idText);
 #if !defined(LOW_MEMORY)
-	astman_append(s, "Version: %s\r\n\r\n", version ? version : "");
+	astman_append(s, "Version: %s\r\n\r\n", "");
 #endif
 	return 0;
 }
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index e190baa83c..dd3e98b8d5 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_channels.h"
diff --git a/main/manager_channels.c b/main/manager_channels.c
index 3aaab92d05..e459a73825 100644
--- a/main/manager_channels.c
+++ b/main/manager_channels.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
diff --git a/main/manager_endpoints.c b/main/manager_endpoints.c
index 0d08660161..424e321085 100644
--- a/main/manager_endpoints.c
+++ b/main/manager_endpoints.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
diff --git a/main/manager_mwi.c b/main/manager_mwi.c
index 8facc90936..7492f78a9a 100644
--- a/main/manager_mwi.c
+++ b/main/manager_mwi.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/manager.h"
 #include "asterisk/app.h"
diff --git a/main/manager_system.c b/main/manager_system.c
index b852c52e6b..8417b7741a 100644
--- a/main/manager_system.c
+++ b/main/manager_system.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_message_router.h"
diff --git a/main/md5.c b/main/md5.c
index 5e79729b58..477494ccaf 100644
--- a/main/md5.c
+++ b/main/md5.c
@@ -22,7 +22,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/endian.h"
 #include "asterisk/md5.h"
diff --git a/main/message.c b/main/message.c
index 581487fcd7..64cefcb1b5 100644
--- a/main/message.c
+++ b/main/message.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/mixmonitor.c b/main/mixmonitor.c
index 9a6d86ca12..fff51849d3 100644
--- a/main/mixmonitor.c
+++ b/main/mixmonitor.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/lock.h"
 #include "asterisk/logger.h"
diff --git a/main/named_acl.c b/main/named_acl.c
index 3b81c8c382..0fc4df1871 100644
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config.h"
 #include "asterisk/config_options.h"
diff --git a/main/netsock.c b/main/netsock.c
index c11f14a89b..568add4ca8 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifndef __linux__
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
diff --git a/main/netsock2.c b/main/netsock2.c
index 8d36805f98..d9123e434d 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config.h"
 #include "asterisk/netsock2.h"
diff --git a/main/optional_api.c b/main/optional_api.c
index 92f36eaf99..d89b9acb27 100644
--- a/main/optional_api.c
+++ b/main/optional_api.c
@@ -18,7 +18,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/optional_api.h"
 #include "asterisk/utils.h"
diff --git a/main/parking.c b/main/parking.c
index f7f1dfb5c0..25fdfe8f30 100644
--- a/main/parking.c
+++ b/main/parking.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/astobj2.h"
diff --git a/main/pbx.c b/main/pbx.c
index 0573ab0767..209de66d15 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_SYSTEM_NAME */
diff --git a/main/pickup.c b/main/pickup.c
index 6f1e0f12f6..8fb7e158be 100644
--- a/main/pickup.c
+++ b/main/pickup.c
@@ -47,7 +47,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/pickup.h"
 #include "asterisk/channel.h"
diff --git a/main/plc.c b/main/plc.c
index 1f0206920e..b24322350a 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/main/presencestate.c b/main/presencestate.c
index 4b3e94e61b..32f19e6c85 100644
--- a/main/presencestate.c
+++ b/main/presencestate.c
@@ -57,7 +57,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/utils.h"
diff --git a/main/privacy.c b/main/privacy.c
index 8863f09966..7b13fe7a82 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index e3ab52d3b7..34e6a9439f 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -137,7 +137,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 
diff --git a/main/say.c b/main/say.c
index ef80dfa7de..9579293263 100644
--- a/main/say.c
+++ b/main/say.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <netinet/in.h>
 #include <time.h>
diff --git a/main/sched.c b/main/sched.c
index 8fdbfed367..911143c9d6 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef DEBUG_SCHEDULER
 #define DEBUG(a) do { \
diff --git a/main/sdp_srtp.c b/main/sdp_srtp.c
index fee3fea56c..8c86f1407f 100644
--- a/main/sdp_srtp.c
+++ b/main/sdp_srtp.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include "asterisk/options.h"
diff --git a/main/security_events.c b/main/security_events.c
index 5a8df66d11..0da62a20a8 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -362,7 +362,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
diff --git a/main/sem.c b/main/sem.c
index 7315165d7f..ea2273d5a9 100644
--- a/main/sem.c
+++ b/main/sem.c
@@ -23,7 +23,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/sem.h"
 #include "asterisk/utils.h"
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 8c117d6523..9b68241681 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/frame.h"
 #include "asterisk/format_cache.h"
diff --git a/main/smoother.c b/main/smoother.c
index 720ad85495..ca0c4e45a1 100644
--- a/main/smoother.c
+++ b/main/smoother.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/frame.h"
diff --git a/main/sorcery.c b/main/sorcery.c
index d3d6f3d7d2..1a4b3a072c 100644
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/sorcery.h"
diff --git a/main/srv.c b/main/srv.c
index 0938a0c036..c079749910 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/main/stasis.c b/main/stasis.c
index c2d552e4be..6a59265460 100644
--- a/main/stasis.c
+++ b/main/stasis.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_internal.h"
diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c
index 1838557737..d06ee14a7a 100644
--- a/main/stasis_bridges.c
+++ b/main/stasis_bridges.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
diff --git a/main/stasis_cache.c b/main/stasis_cache.c
index 9129c0064c..bd6d6fa1d6 100644
--- a/main/stasis_cache.c
+++ b/main/stasis_cache.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/hashtab.h"
diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c
index 9e3de367ad..bbe63ba1de 100644
--- a/main/stasis_cache_pattern.c
+++ b/main/stasis_cache_pattern.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 968afbd7d3..5990cddce4 100644
--- a/main/stasis_channels.c
+++ b/main/stasis_channels.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/json.h"
diff --git a/main/stasis_endpoints.c b/main/stasis_endpoints.c
index 7374681772..f19bb91fe3 100644
--- a/main/stasis_endpoints.c
+++ b/main/stasis_endpoints.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
diff --git a/main/stasis_message.c b/main/stasis_message.c
index c797cdfa05..0e6ff92046 100644
--- a/main/stasis_message.c
+++ b/main/stasis_message.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index 26df76c53f..f60180d68b 100644
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_message_router.h"
diff --git a/main/stasis_system.c b/main/stasis_system.c
index e232b8e8a3..7e449b544f 100644
--- a/main/stasis_system.c
+++ b/main/stasis_system.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 4b005207e6..927d473fd3 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -50,7 +50,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/main/strings.c b/main/strings.c
index da63cdfc06..7aaff7992a 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/strings.h"
 #include "asterisk/pbx.h"
diff --git a/main/stun.c b/main/stun.c
index f5bdc9ad4d..ecabdadef1 100644
--- a/main/stun.c
+++ b/main/stun.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/stun.h"
diff --git a/main/syslog.c b/main/syslog.c
index 51da69a8c3..3f493064bf 100644
--- a/main/syslog.c
+++ b/main/syslog.c
@@ -30,7 +30,7 @@
 #include "asterisk/utils.h"
 #include "asterisk/syslog.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <syslog.h>
 
diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index dd416dbae6..87302538d4 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/module.h"
diff --git a/main/tcptls.c b/main/tcptls.c
index 92fee604d3..ddeeeeaba6 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/main/tdd.c b/main/tdd.c
index eee3f0e738..7f0d7e310f 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <math.h>
diff --git a/main/term.c b/main/term.c
index 2e28032a79..a19c1f1443 100644
--- a/main/term.c
+++ b/main/term.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include <sys/time.h>
diff --git a/main/test.c b/main/test.c
index f64a572fd6..47ae7f8f7a 100644
--- a/main/test.c
+++ b/main/test.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/_private.h"
 
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 4c46a0f585..920b2d5094 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,7 +38,7 @@ void threadstorage_init(void)
 
 #else /* !defined(DEBUG_THREADLOCALS) */
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
diff --git a/main/timing.c b/main/timing.c
index ae8c3ebff6..e2e28f04fc 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
diff --git a/main/translate.c b/main/translate.c
index 2b11d7b4a1..f13ecf4561 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/main/udptl.c b/main/udptl.c
index 4e878195c4..c059ad3a4b 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -63,7 +63,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/main/ulaw.c b/main/ulaw.c
index 76e4b04198..08d8060c84 100644
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ulaw.h"
 #include "asterisk/logger.h"
diff --git a/main/utils.c b/main/utils.c
index 888aaab810..b1b7ac9afe 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/main/xml.c b/main/xml.c
index dee2497113..72d5821c10 100644
--- a/main/xml.c
+++ b/main/xml.c
@@ -31,7 +31,7 @@
 #include "asterisk/utils.h"
 #include "asterisk/autoconfig.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #if defined(HAVE_LIBXML2)
 #include <libxml/parser.h>
diff --git a/main/xmldoc.c b/main/xmldoc.c
index fcf1b2cacb..399a7be978 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index c178fd6544..9b41aa9a86 100644
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 5cc07cfa22..7e28b89466 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -30,7 +30,7 @@
 #include "asterisk.h"
 
 #if !defined(STANDALONE)
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #endif
 
 #include <ctype.h>
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 70d4dc3ce9..92462bf178 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -82,7 +82,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index fc9e182b2e..8ea8dd369e 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/network.h"
 #include <sys/ioctl.h>
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index bd87b1fbe5..2919748b7e 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 77762e226b..002f05fa65 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 6c8e671ed4..7a444d7635 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
 
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 119ab08b85..0dad6060de 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 #include <time.h>
diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c
index 8fe93f39ed..f146ffb096 100644
--- a/res/ael/ael.tab.c
+++ b/res/ael/ael.tab.c
@@ -102,7 +102,7 @@
 #define WRAP_LIBC_MALLOC
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index 0539063054..c5eba92b76 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,7 @@ static yyconst flex_int16_t yy_chk[1073] =
  */
 #line 71 "ael.flex"
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 7363827329..d29bbcfbd9 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -30,7 +30,7 @@
 #define WRAP_LIBC_MALLOC
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c
index 97435d0252..db12f0000c 100644
--- a/res/ari/ari_model_validators.c
+++ b/res/ari/ari_model_validators.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
diff --git a/res/ari/ari_websockets.c b/res/ari/ari_websockets.c
index f3b764bf15..ac5b5788dc 100644
--- a/res/ari/ari_websockets.c
+++ b/res/ari/ari_websockets.c
@@ -18,7 +18,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ari.h"
 #include "asterisk/astobj2.h"
diff --git a/res/ari/cli.c b/res/ari/cli.c
index 819407997f..4468e44f10 100644
--- a/res/ari/cli.c
+++ b/res/ari/cli.c
@@ -24,7 +24,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/cli.h"
diff --git a/res/ari/config.c b/res/ari/config.c
index 667d91ac07..e2d5b1c0ab 100644
--- a/res/ari/config.c
+++ b/res/ari/config.c
@@ -24,7 +24,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config_options.h"
 #include "asterisk/http_websocket.h"
diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c
index 85a631a025..456d9c08b4 100644
--- a/res/ari/resource_applications.c
+++ b/res/ari/resource_applications.c
@@ -26,7 +26,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 9871df4ff2..a2198bb934 100644
--- a/res/ari/resource_asterisk.c
+++ b/res/ari/resource_asterisk.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ast_version.h"
 #include "asterisk/buildinfo.h"
diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c
index 5914a07113..70365ec6dd 100644
--- a/res/ari/resource_bridges.c
+++ b/res/ari/resource_bridges.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "resource_bridges.h"
 #include "asterisk/stasis.h"
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index 5943158317..e35fc8b05c 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
diff --git a/res/ari/resource_device_states.c b/res/ari/resource_device_states.c
index 621910e1c9..53a3683a92 100644
--- a/res/ari/resource_device_states.c
+++ b/res/ari/resource_device_states.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 f794969f29..10b49e38c1 100644
--- a/res/ari/resource_endpoints.c
+++ b/res/ari/resource_endpoints.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "resource_endpoints.h"
 
diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c
index d159741c26..eddcb662c9 100644
--- a/res/ari/resource_events.c
+++ b/res/ari/resource_events.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis_app.h"
diff --git a/res/ari/resource_mailboxes.c b/res/ari/resource_mailboxes.c
index 0d9bac7040..de41338ef6 100644
--- a/res/ari/resource_mailboxes.c
+++ b/res/ari/resource_mailboxes.c
@@ -26,7 +26,7 @@
 #include "asterisk.h"
 #include "asterisk/stasis_app_mailbox.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "resource_mailboxes.h"
 
diff --git a/res/ari/resource_playbacks.c b/res/ari/resource_playbacks.c
index 3ef6710ace..f610c6d1be 100644
--- a/res/ari/resource_playbacks.c
+++ b/res/ari/resource_playbacks.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 bd273aa628..e7e74ff9fd 100644
--- a/res/ari/resource_recordings.c
+++ b/res/ari/resource_recordings.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 5a523d3877..a1420eaf22 100644
--- a/res/ari/resource_sounds.c
+++ b/res/ari/resource_sounds.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "resource_sounds.h"
 #include "asterisk/media_index.h"
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index 22ae9c4485..762bf55665 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "res_parking.h"
 #include "asterisk/config.h"
diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index a21be90687..4a01e4cee5 100644
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "res_parking.h"
 #include "asterisk/utils.h"
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index b9e46c7d50..ffa4bc7208 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "res_parking.h"
 #include "asterisk/config.h"
diff --git a/res/parking/parking_tests.c b/res/parking/parking_tests.c
index 91cea26534..e6ea9f945f 100644
--- a/res/parking/parking_tests.c
+++ b/res/parking/parking_tests.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "res_parking.h"
 #include "asterisk/utils.h"
diff --git a/res/parking/parking_ui.c b/res/parking/parking_ui.c
index 55b2d5b45e..7d4726cc21 100644
--- a/res/parking/parking_ui.c
+++ b/res/parking/parking_ui.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "res_parking.h"
 #include "asterisk/config.h"
diff --git a/res/res_adsi.c b/res/res_adsi.c
index e4d3404b24..80086f8fdc 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <math.h>
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index bbe870b10b..936d3b42ed 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/res/res_agi.c b/res/res_agi.c
index 921eeffce4..fb62cc8c3b 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include <signal.h>
diff --git a/res/res_ari.c b/res/res_ari.c
index 28f9be18b1..d676b5ee12 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -140,7 +140,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "ari/internal.h"
 #include "asterisk/ari.h"
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 0b09213d95..04992c108c 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index c90437905c..df4d276d58 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index e0b9f789f7..524b03d090 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 0d1334eb04..ef92b6b218 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index 24ea554316..6d18b3447c 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index 8d8ed716c1..e6c9d295e6 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index c601f571fa..2c9c1d9993 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index c1c7e48183..5eabbd2b79 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_model.c b/res/res_ari_model.c
index 96cab80966..64e2c5d9b9 100644
--- a/res/res_ari_model.c
+++ b/res/res_ari_model.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "ari/ari_model_validators.h"
 #include "asterisk/logger.h"
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index 8155b2a5ac..8128bb919d 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index 0657fa3115..edc614f209 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 107f47cdf0..7c3528ef9f 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_calendar.c b/res/res_calendar.c
index 5b911ca5b7..78bc24b212 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -38,7 +38,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/channel.h"
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index a8eac7c20c..2e3eb934ba 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libical/ical.h>
 #include <ne_session.h>
diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
index c45ac0b754..05133a2a91 100644
--- a/res/res_calendar_ews.c
+++ b/res/res_calendar_ews.c
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ne_request.h>
 #include <ne_session.h>
diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index e8c80cd5ae..b11edcf222 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libical/ical.h>
 #include <ne_session.h>
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index 8ac905174d..4c7c8a903b 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -28,7 +28,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libical/ical.h>
 #include <ne_session.h>
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index df34718652..c9167d93a2 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/stasis_channels.h"
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 633ed89f47..ba55551b9d 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 3903b6c3b8..173f9f579d 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_config_curl.c b/res/res_config_curl.c
index a51802928b..985f51eedf 100644
--- a/res/res_config_curl.c
+++ b/res/res_config_curl.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <curl/curl.h>
 
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 06ffbfb7cb..95eae29c19 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -53,7 +53,7 @@
 #include <stdio.h>
 #include <ldap.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 2888d35973..b36bcb68a1 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 23b6a466f1..00cde50ed6 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <libpq-fe.h>			/* PostgreSQL */
 
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index fe2fb3cdb4..41fbb0e951 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -86,7 +86,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sqlite.h>
 
diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c
index 04b8e374c6..0b0a78cf47 100644
--- a/res/res_config_sqlite3.c
+++ b/res/res_config_sqlite3.c
@@ -45,7 +45,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sqlite3.h>
 
diff --git a/res/res_convert.c b/res/res_convert.c
index c2966a85f2..2a691a56a8 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/res/res_corosync.c b/res/res_corosync.c
index 58290c7ccf..6e73727428 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include <corosync/cpg.h>
 #include <corosync/cfg.h>
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 78b8df209b..a1d711c813 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use ast_config_AST_KEY_DIR */
 #include <openssl/ssl.h>
diff --git a/res/res_curl.c b/res/res_curl.c
index 4906dde77b..c3f22c785a 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -42,7 +42,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <curl/curl.h>
 
diff --git a/res/res_fax.c b/res/res_fax.c
index 421369a237..c57f446ff2 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -65,7 +65,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/io.h"
 #include "asterisk/file.h"
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 914b732a64..7a58799f99 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -50,7 +50,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 #include <spandsp.h>
diff --git a/res/res_format_attr_celt.c b/res/res_format_attr_celt.c
index 7d7d140a51..7d3f753ff9 100644
--- a/res/res_format_attr_celt.c
+++ b/res/res_format_attr_celt.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 22f1936e4f..d65a89fea3 100644
--- a/res/res_format_attr_h263.c
+++ b/res/res_format_attr_h263.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 d263a556fa..95274691c5 100644
--- a/res/res_format_attr_h264.c
+++ b/res/res_format_attr_h264.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 7748ecc92a..3c9c3ef304 100644
--- a/res/res_format_attr_opus.c
+++ b/res/res_format_attr_opus.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/format.h"
diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
index 3a8ca60d2d..3467f5ae48 100644
--- a/res/res_format_attr_silk.c
+++ b/res/res_format_attr_silk.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/format.h"
diff --git a/res/res_hep.c b/res/res_hep.c
index 69a8ab3915..72b8069454 100644
--- a/res/res_hep.c
+++ b/res/res_hep.c
@@ -76,7 +76,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_hep_pjsip.c b/res/res_hep_pjsip.c
index b5cf0b81e9..d0c95e3480 100644
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pjsip_ua.h>
diff --git a/res/res_hep_rtcp.c b/res/res_hep_rtcp.c
index fe39f195b5..a6b7351af8 100644
--- a/res/res_hep_rtcp.c
+++ b/res/res_hep_rtcp.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/res_hep.h"
 #include "asterisk/module.h"
diff --git a/res/res_http_post.c b/res/res_http_post.c
index 2ee792af93..37fc4fa091 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index 7e71f8bf15..0481e7ecd4 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/http.h"
diff --git a/res/res_limit.c b/res/res_limit.c
index e883ff3833..d844efe8c9 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -24,7 +24,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <sys/time.h>
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 872f565f0b..047b370085 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -29,7 +29,7 @@
  
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 #include <libgen.h>
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 14d4eb5478..24a3a280fa 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <signal.h>
diff --git a/res/res_mutestream.c b/res/res_mutestream.c
index 479b3d7ca3..e9b11dcc30 100644
--- a/res/res_mutestream.c
+++ b/res/res_mutestream.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c
index e5d8a3d328..97228220f6 100644
--- a/res/res_mwi_external.c
+++ b/res/res_mwi_external.c
@@ -55,7 +55,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"
diff --git a/res/res_mwi_external_ami.c b/res/res_mwi_external_ami.c
index 87ce411e61..24562e193a 100644
--- a/res/res_mwi_external_ami.c
+++ b/res/res_mwi_external_ami.c
@@ -127,7 +127,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/res_mwi_external.h"
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 259467ace4..5f2f2c514c 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -47,7 +47,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/res/res_parking.c b/res/res_parking.c
index 3edbd46633..a40990ede3 100644
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -188,7 +188,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "parking/res_parking.h"
 #include "asterisk/config.h"
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 51c03dbf9c..b9eeccee62 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -52,7 +52,7 @@
 #ifdef SOLARIS
 #include <sys/sockio.h>
 #endif
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/res/res_pjsip/security_events.c b/res/res_pjsip/security_events.c
index 5c30e1c5e7..f07265a320 100644
--- a/res/res_pjsip/security_events.c
+++ b/res/res_pjsip/security_events.c
@@ -26,7 +26,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 
diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c
index d6d5d5bcb0..6bde704f2e 100644
--- a/res/res_pjsip_config_wizard.c
+++ b/res/res_pjsip_config_wizard.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 54c9f860fe..45a19408d4 100644
--- a/res/res_pjsip_dlg_options.c
+++ b/res/res_pjsip_dlg_options.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pjsip_ua.h>
diff --git a/res/res_pjsip_log_forwarder.c b/res/res_pjsip_log_forwarder.c
index 7b095bb1f2..5324063bfd 100644
--- a/res/res_pjsip_log_forwarder.c
+++ b/res/res_pjsip_log_forwarder.c
@@ -39,7 +39,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 #include <pj/log.h>
diff --git a/res/res_pjsip_logger.c b/res/res_pjsip_logger.c
index 2e5c76c29f..db54aa9498 100644
--- a/res/res_pjsip_logger.c
+++ b/res/res_pjsip_logger.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <pjsip.h>
 
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 7756179b32..55fbfd462b 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -38,7 +38,7 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/format.h"
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index ac31086a68..f097909bd7 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -37,7 +37,7 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/udptl.h"
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index f2052a6d66..06282c5727 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/res/res_realtime.c b/res/res_realtime.c
index b26cde5b34..e7ef21222f 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/res/res_resolver_unbound.c b/res/res_resolver_unbound.c
index f539984255..4e79359a76 100644
--- a/res/res_resolver_unbound.c
+++ b/res/res_resolver_unbound.c
@@ -23,7 +23,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <unbound.h>
 #include <arpa/nameser.h>
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 4ab7626cd8..0513c11271 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/res/res_rtp_multicast.c b/res/res_rtp_multicast.c
index 8327cf20a4..887eed2298 100644
--- a/res/res_rtp_multicast.c
+++ b/res/res_rtp_multicast.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
 #include <signal.h>
diff --git a/res/res_security_log.c b/res/res_security_log.c
index e56f7f76fc..e14761694a 100644
--- a/res/res_security_log.c
+++ b/res/res_security_log.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index fc89d9efee..6d9a678aa9 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -46,7 +46,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <termios.h>
 #include <sys/time.h>
diff --git a/res/res_snmp.c b/res/res_snmp.c
index c7cfa31740..1a19d76993 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 e282d8b688..122e27d7f4 100644
--- a/res/res_sorcery_astdb.c
+++ b/res/res_sorcery_astdb.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c
index f8ea864ff5..60ecb83110 100644
--- a/res/res_sorcery_config.c
+++ b/res/res_sorcery_config.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/res/res_sorcery_memory.c b/res/res_sorcery_memory.c
index 7d398c2eb4..153235838b 100644
--- a/res/res_sorcery_memory.c
+++ b/res/res_sorcery_memory.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/res/res_sorcery_realtime.c b/res/res_sorcery_realtime.c
index fcdc2a9717..65eb4b88e3 100644
--- a/res/res_sorcery_realtime.c
+++ b/res/res_sorcery_realtime.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/res/res_speech.c b/res/res_speech.c
index 7d75985cad..39c7d5a9ae 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 8d8daf0b03..1e68f9675c 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -37,7 +37,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <srtp/srtp.h>
 #include <srtp/crypto_kernel.h>
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 095e2b313f..0fa51d8cdf 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -53,7 +53,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/callerid.h"
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 05d5302fdf..8ced30b87a 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 8a1c230491..cbebce8b23 100644
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -23,7 +23,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astdb.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index d061d70ec3..30765329d1 100644
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -24,7 +24,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astdb.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index 2eac55f190..2d40ec0e56 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/astobj2.h"
diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index df7f8b33a5..7af9c10600 100644
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/dsp.h"
 #include "asterisk/file.h"
diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index 16d47f8ba7..5311aed268 100644
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/stasis_app_impl.h"
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 9860b0ebd7..12b9cc5cee 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/res/res_statsd.c b/res/res_statsd.c
index 2cbd7f09c9..012333524a 100644
--- a/res/res_statsd.c
+++ b/res/res_statsd.c
@@ -52,7 +52,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config_options.h"
 #include "asterisk/module.h"
diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index 4cdc2fdca7..34558c755c 100644
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/sched.h"
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index 1ef5117c78..4f96959c1f 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 1e76720ecd..dc7d0918b5 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include <stdbool.h>
 #include <math.h>
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 9d21297b04..59b59e69db 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -48,7 +48,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <ctype.h>
 #include <iksemel.h>
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 9d1528dde9..bebcee11ec 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -20,7 +20,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 /*
  * There is some collision collision between netsmp and asterisk names,
diff --git a/res/stasis/app.c b/res/stasis/app.c
index 330e711e68..5a1c5f8e24 100644
--- a/res/stasis/app.c
+++ b/res/stasis/app.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "app.h"
 #include "control.h"
diff --git a/res/stasis/command.c b/res/stasis/command.c
index 534e434ecf..6298e88960 100644
--- a/res/stasis/command.c
+++ b/res/stasis/command.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "command.h"
 
diff --git a/res/stasis/control.c b/res/stasis/control.c
index e239de29bb..0f8b540f05 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/stasis_channels.h"
 
diff --git a/res/stasis/messaging.c b/res/stasis/messaging.c
index fd7cf9f7bb..bf8aebb969 100644
--- a/res/stasis/messaging.c
+++ b/res/stasis/messaging.c
@@ -26,7 +26,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/message.h"
 #include "asterisk/endpoints.h"
diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c
index e410881341..1f501cad11 100644
--- a/res/stasis/stasis_bridge.c
+++ b/res/stasis/stasis_bridge.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/bridge.h"
 #include "asterisk/bridge_after.h"
diff --git a/res/stasis_recording/stored.c b/res/stasis_recording/stored.c
index 59c07f8dea..acabb65bbe 100644
--- a/res/stasis_recording/stored.c
+++ b/res/stasis_recording/stored.c
@@ -25,7 +25,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/paths.h"
diff --git a/tests/test_abstract_jb.c b/tests/test_abstract_jb.c
index 7f16cecf4f..6274fb2ef8 100644
--- a/tests/test_abstract_jb.c
+++ b/tests/test_abstract_jb.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_acl.c b/tests/test_acl.c
index c7a711fe3b..ff64bc15c5 100644
--- a/tests/test_acl.c
+++ b/tests/test_acl.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/acl.h"
diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c
index 1f10a0166b..5dda101776 100644
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/tests/test_aoc.c b/tests/test_aoc.c
index 35387df90e..2f7336fe25 100644
--- a/tests/test_aoc.c
+++ b/tests/test_aoc.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_app.c b/tests/test_app.c
index 2d7148a4dd..f81290eaed 100644
--- a/tests/test_app.c
+++ b/tests/test_app.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_ari.c b/tests/test_ari.c
index fc74544af5..7da98f2cf0 100644
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_ari_model.c b/tests/test_ari_model.c
index 12c9a1e99e..6c5c14d507 100644
--- a/tests/test_ari_model.c
+++ b/tests/test_ari_model.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_ast_format_str_reduce.c b/tests/test_ast_format_str_reduce.c
index e0e468c3c9..db9f1a2a2e 100644
--- a/tests/test_ast_format_str_reduce.c
+++ b/tests/test_ast_format_str_reduce.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/file.h"
diff --git a/tests/test_astobj2.c b/tests/test_astobj2.c
index 6484753834..9297fb3c05 100644
--- a/tests/test_astobj2.c
+++ b/tests/test_astobj2.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_astobj2_thrash.c b/tests/test_astobj2_thrash.c
index 814234cc30..eaadbb6475 100644
--- a/tests/test_astobj2_thrash.c
+++ b/tests/test_astobj2_thrash.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #include <pthread.h>
 #include "asterisk/astobj2.h"
 #include "asterisk/hashtab.h"
diff --git a/tests/test_bucket.c b/tests/test_bucket.c
index 13fd684cbd..7dadd1473f 100644
--- a/tests/test_bucket.c
+++ b/tests/test_bucket.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/tests/test_callerid.c b/tests/test_callerid.c
index d0788a4006..5f7af2b6c8 100644
--- a/tests/test_callerid.c
+++ b/tests/test_callerid.c
@@ -34,7 +34,7 @@
 #include "asterisk.h"
 #include "asterisk/callerid.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_cdr.c b/tests/test_cdr.c
index 7e1dcb00c8..9c982e28a0 100644
--- a/tests/test_cdr.c
+++ b/tests/test_cdr.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include "asterisk/module.h"
diff --git a/tests/test_cel.c b/tests/test_cel.c
index 7f77a1beea..71fc636fdf 100644
--- a/tests/test_cel.c
+++ b/tests/test_cel.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <math.h>
 #include "asterisk/module.h"
diff --git a/tests/test_channel_feature_hooks.c b/tests/test_channel_feature_hooks.c
index 478cf36cf9..8faaf9fb24 100644
--- a/tests/test_channel_feature_hooks.c
+++ b/tests/test_channel_feature_hooks.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_config.c b/tests/test_config.c
index df618f9f77..ad7ddcae51 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include <math.h> /* HUGE_VAL */
 
diff --git a/tests/test_core_codec.c b/tests/test_core_codec.c
index 499e633df7..7e5677022c 100644
--- a/tests/test_core_codec.c
+++ b/tests/test_core_codec.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_core_format.c b/tests/test_core_format.c
index a6614d6a30..12e44d2d64 100644
--- a/tests/test_core_format.c
+++ b/tests/test_core_format.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_db.c b/tests/test_db.c
index 9e1b5cb606..f4ce515847 100644
--- a/tests/test_db.c
+++ b/tests/test_db.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_devicestate.c b/tests/test_devicestate.c
index f7075b4269..531bf7a7bd 100644
--- a/tests/test_devicestate.c
+++ b/tests/test_devicestate.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_dlinklists.c b/tests/test_dlinklists.c
index cba367f4cd..a4495088aa 100644
--- a/tests/test_dlinklists.c
+++ b/tests/test_dlinklists.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/tests/test_endpoints.c b/tests/test_endpoints.c
index 444786131a..b7a2efd57b 100644
--- a/tests/test_endpoints.c
+++ b/tests/test_endpoints.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/endpoints.h"
diff --git a/tests/test_event.c b/tests/test_event.c
index ab6eab1cb1..0290a26976 100644
--- a/tests/test_event.c
+++ b/tests/test_event.c
@@ -41,7 +41,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_expr.c b/tests/test_expr.c
index e29a6a5cf3..c215559f0d 100644
--- a/tests/test_expr.c
+++ b/tests/test_expr.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_format_cache.c b/tests/test_format_cache.c
index cc1696b70a..b01b0da1c7 100644
--- a/tests/test_format_cache.c
+++ b/tests/test_format_cache.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_format_cap.c b/tests/test_format_cap.c
index 38320e635c..76b15495fd 100644
--- a/tests/test_format_cap.c
+++ b/tests/test_format_cap.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_func_file.c b/tests/test_func_file.c
index 834907578a..a1e71b2707 100644
--- a/tests/test_func_file.c
+++ b/tests/test_func_file.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
diff --git a/tests/test_gosub.c b/tests/test_gosub.c
index 604d8e3011..c4b071ee29 100644
--- a/tests/test_gosub.c
+++ b/tests/test_gosub.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_hashtab_thrash.c b/tests/test_hashtab_thrash.c
index 7379b956fa..2f043c7b2b 100644
--- a/tests/test_hashtab_thrash.c
+++ b/tests/test_hashtab_thrash.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 cf1a914b00..76a6ecf345 100644
--- a/tests/test_heap.c
+++ b/tests/test_heap.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_jitterbuf.c b/tests/test_jitterbuf.c
index 58dd46d610..9f538ee09b 100644
--- a/tests/test_jitterbuf.c
+++ b/tests/test_jitterbuf.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_json.c b/tests/test_json.c
index 9d624cdc6c..b848994750 100644
--- a/tests/test_json.c
+++ b/tests/test_json.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+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 9edab942c6..4a17e6730c 100644
--- a/tests/test_linkedlists.c
+++ b/tests/test_linkedlists.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_locale.c b/tests/test_locale.c
index de14a08305..a39e2a981a 100644
--- a/tests/test_locale.c
+++ b/tests/test_locale.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/tests/test_logger.c b/tests/test_logger.c
index b0df4c606c..1f7000a17f 100644
--- a/tests/test_logger.c
+++ b/tests/test_logger.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/tests/test_message.c b/tests/test_message.c
index 13e24a8428..7140b5f172 100644
--- a/tests/test_message.c
+++ b/tests/test_message.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <regex.h>
 
diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c
index e182b0a759..638ff37ccb 100644
--- a/tests/test_netsock2.c
+++ b/tests/test_netsock2.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index 6a7d394c52..3867a55796 100644
--- a/tests/test_optional_api.c
+++ b/tests/test_optional_api.c
@@ -35,7 +35,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/optional_api.h"
diff --git a/tests/test_pbx.c b/tests/test_pbx.c
index 5e2e232edf..388baa3f5b 100644
--- a/tests/test_pbx.c
+++ b/tests/test_pbx.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/tests/test_poll.c b/tests/test_poll.c
index 755bb0f9e3..e71913c93b 100644
--- a/tests/test_poll.c
+++ b/tests/test_poll.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index 5865f0951d..45e8f5ddd2 100644
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/test.h"
diff --git a/tests/test_sched.c b/tests/test_sched.c
index 5ad2f5dde5..ec53ce8886 100644
--- a/tests/test_sched.c
+++ b/tests/test_sched.c
@@ -32,7 +32,7 @@
 
 #include <inttypes.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_security_events.c b/tests/test_security_events.c
index 72d6fb5d8b..bdca9b1570 100644
--- a/tests/test_security_events.c
+++ b/tests/test_security_events.c
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/tests/test_skel.c b/tests/test_skel.c
index 122003da35..b5063d255e 100644
--- a/tests/test_skel.c
+++ b/tests/test_skel.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery.c b/tests/test_sorcery.c
index 9d32e3b8d9..ce04c62cb0 100644
--- a/tests/test_sorcery.c
+++ b/tests/test_sorcery.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_astdb.c b/tests/test_sorcery_astdb.c
index b87ed74f86..ce97834233 100644
--- a/tests/test_sorcery_astdb.c
+++ b/tests/test_sorcery_astdb.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_realtime.c b/tests/test_sorcery_realtime.c
index ab9c188148..fe7ea52451 100644
--- a/tests/test_sorcery_realtime.c
+++ b/tests/test_sorcery_realtime.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 86b69cc329..f5d74a806e 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c
index 2a36c4f287..91dfe09c6f 100644
--- a/tests/test_stasis_channels.c
+++ b/tests/test_stasis_channels.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/module.h"
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 7ac52917a8..2059c60b1c 100644
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/astobj2.h"
 #include "asterisk/channel.h"
diff --git a/tests/test_strings.c b/tests/test_strings.c
index 4321d4a039..31fb11abcb 100644
--- a/tests/test_strings.c
+++ b/tests/test_strings.c
@@ -34,7 +34,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/utils.h"
diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index 46e8ce920d..c22f5e603d 100644
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/tests/test_time.c b/tests/test_time.c
index ef6e95447b..fcba960b9f 100644
--- a/tests/test_time.c
+++ b/tests/test_time.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
diff --git a/tests/test_uri.c b/tests/test_uri.c
index 92bbb70b0b..8a78644eaa 100644
--- a/tests/test_uri.c
+++ b/tests/test_uri.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_utils.c b/tests/test_utils.c
index e4f6e0a524..abb0c3395b 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+ASTERISK_REGISTER_FILE();
 
 #include "asterisk/utils.h"
 #include "asterisk/test.h"
diff --git a/tests/test_voicemail_api.c b/tests/test_voicemail_api.c
index 4e0eb0878d..e13b304d4c 100644
--- a/tests/test_voicemail_api.c
+++ b/tests/test_voicemail_api.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/tests/test_websocket_client.c b/tests/test_websocket_client.c
index dcf1a1773c..ca8cb85ac8 100644
--- a/tests/test_websocket_client.c
+++ b/tests/test_websocket_client.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_xml_escape.c b/tests/test_xml_escape.c
index e4c36de912..5e6abc72ee 100644
--- a/tests/test_xml_escape.c
+++ b/tests/test_xml_escape.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 86588ee4b0..2237625970 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -18,7 +18,7 @@
 #include <regex.h>
 #include <limits.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/backtrace.h"
 #include "asterisk/channel.h"
@@ -33,8 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 int option_debug = 0;
 int option_verbose = 0;
 #if !defined(LOW_MEMORY)
-void ast_register_file_version(const char *file, const char *version) { }
-void ast_unregister_file_version(const char *file) { }
+void __ast_register_file(const char *file) { }
+void __ast_unregister_file(const char *file) { }
 #endif
 
 /*** MODULEINFO
diff --git a/utils/astdb2sqlite3.c b/utils/astdb2sqlite3.c
index ba35f9360c..38080e84d2 100644
--- a/utils/astdb2sqlite3.c
+++ b/utils/astdb2sqlite3.c
@@ -29,8 +29,6 @@
 
 #include "asterisk.h"
 
-//ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/utils/astman.c b/utils/astman.c
index 315b3b065b..0099a13f63 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -27,8 +27,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk.h"
+ASTERISK_REGISTER_FILE()
 
 #include <newt.h>
 #include <stdio.h>
@@ -89,13 +88,13 @@ 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_version(const char *file, const char *version);
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file)
 {
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 
diff --git a/utils/check_expr.c b/utils/check_expr.c
index 6cd535df25..de668f6917 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -21,7 +21,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ast_expr.h"
 
@@ -152,8 +152,6 @@ void ast_log(int level, const char *file, int line, const char *function, const
 	fflush(stdout);
 	va_end(vars);
 }
-//void ast_register_file_version(const char *file, const char *version);
-//void ast_unregister_file_version(const char *file);
 
 char *find_var(const char *varname);
 void set_var(const char *varname, const char *varval);
@@ -161,8 +159,8 @@ 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_version(const char *file, const char *version);  
-void ast_register_file_version(const char *file, const char *version) { }
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file) { }
 #if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale) { return 0;} 
 #endif
@@ -174,8 +172,8 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
         return ret;
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 5d36f4231a..99304b2f5a 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -28,7 +28,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* CONFIG_DIR */
 #include <locale.h>
@@ -79,13 +79,13 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void ast_register_file_version(const char *file, const char *version);
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file)
 {
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 #if !defined(LOW_MEMORY)
-- 
GitLab