[asterisk-dev] Change in asterisk[master]: git migration: Refactor the ASTERISK_FILE_VERSION macro

Matt Jordan (Code Review) asteriskteam at digium.com
Sun Apr 12 13:11:24 CDT 2015


Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/58

Change subject: git migration: Refactor the ASTERISK_FILE_VERSION macro
......................................................................

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


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/58/58/1

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 3514f5f..8a349f0 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -33,6 +33,15 @@
 
 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 4fb3ce5..d55f9e0 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 3304702..4535798 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 e354148..07715b5 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 ee02f52..e9087d1 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 640e06e..299fe56 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 efe1aa3..7f5f3e6 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 a8f2d2c..68bcfde 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 aaf956f..d5a0188 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 68d1008..ee5dd6f 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 a837058..f47db45 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 1e722f1..0e03ad7 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 bf4961a..7862179 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 3037ef6..fff4954 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 47b631a..0c3b27b 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 f636e02..80c1ff0 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 9080594..3c7a917 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 cefc133..0718887 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 c27fd1c..45580e4 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 701904b..e8bdad0 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 ef8d0b3..1376b68 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 ff18f95..0390cfe 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 97011b1..0e4ef8d 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 fa06595..cdcda04 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 267e2e8..c872886 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 824e8fe..ab8d308 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 1794c25..93a6506 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 d8b2079..2ec9d70 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 ab9a9ae..1695ee5 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 9cb8839..2bb1d8b 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 7822a34..ff323df 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 7df8caf..19c9f33 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 dbbad33..79ce0d0 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 8531b17..4a2e569 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 bbd1588..4ff5cd6 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 319ed3c..7e457fb 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 d0fdf5c..58201c4 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 4218917..66751f5 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 de59fbd..2ec28b1 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 a4e4726..e5b0b9a 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 d8fd47f..d2da165 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 907770e..ba83ead 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 a350958..a736fd4 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 45d04d8..b8a1ceb 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 35df014..f5f9b22 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 27e70f0..8d06ac4 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 a22265d..5712cfe 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 a347cf3..8175fc8 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 15898b2..f744b7a 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 ef816c3..25f9510 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 f5e1460..cea75cb 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 6787573..4b9eb15 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 fd947dd..79e2a45 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 0e04df6..70ec656 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 3aa30b0..a82632d 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 d2a1de7..1f586cb 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 deaf83f..a0a3c55 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 43a1e49..ed54a77 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 4eddc08..55867bb 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 3b4d2b5..c4efaf3 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 be70d7b..bca4630 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 98b7b2f..3b7f0ca 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 1bd093c..36d554e 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 337539e..54ecbe1 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 eb17c27..a748c3b 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 f3fc4c1..9660b4f 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 d946038..5b44d14 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 253f413..2d440ab 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 4f53aff..22e8342 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 7fe453d..7fcffb1 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 a021252..5cb10ad 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 410d686..94f746b 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 1b81082..d4cb6b6 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 d5dd701..863fa09 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 8f7219e..c4f985f 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 c6fc8d1..c285b22 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 620b767..532275e 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 7ed906b..c4e14ad 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 07f2824..b63b0c8 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 d1f4bb1..c55b821 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 90d3d58..273b466 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 8e966e9..27bcf63 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 b850e27..8ced0cc 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 6694fa5..dd438c1 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 41cc6c5..d3ffcb8 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 eb1b58e..133aceb 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 d09a7a2..f1d00c5 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 bb07e50..0c8cf24 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 2fd79d0..501ef9f 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 d5652bc..dc0c741 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 5704535..fc12bd1 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 b463f99..850e398 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 e53240a..22f7d79 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 046713a..944f98a 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 df76363..2c4d8b7 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 4fd5fdf..4a079ae 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 b8640f6..8f326f9 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 e9e9fc3..0c025ad 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 f590c76..d954265 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 88557b6..5a3b9e1 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 b5cb391..b7f9978 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 458721a..85860ec 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 7e44983..c71abd0 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,7 +64,7 @@
 
 #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 edb0096..0c55e49 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 b3ff6a5..bdf505b 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 11e3330..4803444 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 56a6069..bb42151 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 79caf22..e5a7972 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(__FILE__, "$Rev$")
 
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index afa99f7..0740782 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 a66115b..30aa1fb 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,7 +61,7 @@
 
 #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 74a6139..7559363 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 529fa26..0a3468a 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 b14d4b7..4fc538b 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 e3f5c81..b7df2b8 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 771f770..8d3e7f1 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 95fa2dc..602d38d 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 ae8bcd7..4bfb199 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 13baa70..05c6944 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 36c3435..c23eecd 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 51fce44..0eb777a 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 2bf7bdd..6d790fe 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 ca0e5cc..07dd1b7 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 97fbf9f..04eb0b1 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 179aa0f..3ee92da 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 d1c05ab..06878fb 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 f429617..4379aa5 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 6c920a9..7755c44 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 a1db5cd..da651ba 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 9df82b2..d67cb5c 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 85167c3..fba06a1 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 a1ee435..7e43bef 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 be7852c..72fabf1 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 2a3eabf..7538100 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 85dfe94..fcad2fe 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 32f92c3..5915b6e 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 e291110..24daac8 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 d48ff08..a3964b0 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 ee34249..91a4678 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 e5c1ff2..1541d7c 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 14c2b44..53f8805 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 691c5bd..e1b9c17 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 45dced4..ce8bb2b 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 c21c706..a831abf 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 6b64f86..d462309 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 de9c4c4..21ca5c8 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 8832bc3..69f6f32 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 e262ebd..fdae2a7 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 1954c51..0f9d33c 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 8cb4943..92ccd82 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 af23b90..8247f24 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 ca2eb8e..b560e62 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 26b1f0e..67e9ce2 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 c91070d..f7b6046 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 58c0a89..e75e29b 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 f582862..f6807b9 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 6d0b963..777cd74 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 25daff9..684275c 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 2c677b2..69e6a25 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 4a688e2..bf82dd5 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 731b746..f02d030 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 7c3d2d4..6333091 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 6b811e6..e07eedb 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 5b2c72d..ed21f88 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 ed616c5..0daf64c 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 beb0015..6361cd0 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 d0a16c4..71de82e 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 acfde42..2fcc131 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 143e4da..68aa74d 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 6724c54..5107ab9 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 90ef986..688c3e7 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 06597ab..d5661fb 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 3338118..52fddb6 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 1a7619d..5352e17 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 bb04505..5d3d4b9 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 cb1cd59..d50774f 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 4f6a677..1599349 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 ca54b1e..2bb6a8e 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 68baa1e..77e18ae 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 ca6dad1..64676c0 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 beab0c1..ed5f12f 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 4b6dc9d..23995ba 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 b56fef9..f031645 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 88a5c5c..d86f54e 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 37aba6a..f672311 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 0f3c0f8..70bb111 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 4b5fb9f..58a05c0 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 3c260a2..8f9753a 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 940c455..025d497 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 512d685..e8c1094 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 a2329c4..23e69d3 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 fd775d9..9708ca7 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 983a0e1..043e480 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 c3d0286..9582d67 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 e33b2c2..ef7ff71 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 2102d5c..7bb50f5 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 e371f7e..8724ff5 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 5c8d3bc..ae13058 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 2e60185..ff36c9e 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 b0b3461..143804a 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 088cd5a..7d09ec5 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 ce5aac0..e62e660 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 bec5f71..829498a 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 e44ee94..41c15ff 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 0f5a204..fc65ae9 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 8d079ed..ef544f3 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 f1af8b4..775c7dc 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 6491b37..cc34517 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 a870ab4..0ce191b 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 c6b7575..9f596c4 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 e403efc..f529cbf 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 1671b3f..8c1697ab 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 d0d451b..a4cfa17 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 4d5fc7a..822937e 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 3786a2f..79a24db 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 efa4bfd..255e846 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 8da94dd..9d8b765 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 ccc74fd..b8dd2d4 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 b757e99..1cb6b8d 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 f53b75f..b7f891b 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 da733d1..5ccff82 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 6c98e72..2c35631 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 9fd0200..a8f8458 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 9a0264e..14e88e6 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -156,13 +156,12 @@
 /*!
  * \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 @@
  * \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 b629fe8..c703c68 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 fa1e35c..92b6754 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 c5069f3..3b9bfd6b 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 5bce066..ba44fbf 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 37afe42..2046ac8 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 f42604e..84a3d7b 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 51af56b..c2d4e00 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -521,7 +521,7 @@
 #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 baf5ded..574451c 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,85 +475,63 @@
 } 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;
+	struct registered_file *reg;
 
-	work = ast_strdupa(version);
-	work = ast_strip(ast_strip_quoted(work, "$", "$"));
-	version_length = strlen(work) + 1;
-
-	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 {
@@ -1030,88 +1008,6 @@
 	return CLI_SUCCESS;
 }
 #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 */
 
@@ -2701,7 +2597,6 @@
 	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 d9119c9..72c5761 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 5812174..a4d5602 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 f1d5001..0f6ed73 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 dc6f5e5..d0abc79 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 37d4b60..76259dc 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 2e3a73e..a069c40 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 1883c00..b754f23 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 7da249a..d41a8d8 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 9630990..1af052d 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 a115646..3b490e8 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 7b69b6f..b1c42ff 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 a41f8a5..e2f14ab 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 522a7d4..c48db5c 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 c25d827..9e30068 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 1d781ca..0305237 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 7618761..e93c66b 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 a99dafc..69fe6ff 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 ff5739a..c1b3372 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 5e24dae..9b32f9d 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 0c1e37b..f2d5168 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 af93956..4e418b6 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 0ff8444..a2fafbf 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 37714e9..dc97df7 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 42f56fc..9d3cdf3 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 543d4d0..9c4169a 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 2e89e9a..4be635e 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 daccae5..bc622cc 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 0cc2dda..a1ba5d2 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 1bcd91d..f81c71c 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 f266424..55b4ea3 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 5e5df02..a4cf664 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 33a7c04..1aaae18 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 ed9b321..a9079e8 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 4bb9355..bb6e18b 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 7eb9e30..e2cc2f2 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 2107155..f0cf127 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 320d917..fd87420 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 53ea1d0..e66c71d 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 72f28dc..4d5a5f9 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 45626d1..852fa3e 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 3ebbab0..855273f 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 a617ede..f5d038a 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 aa6f530..85db40b 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 @@
 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 b5bfd17..b976c68 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 0874163..193bf9f 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 66ad461..c70170b 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 bae1299..865fa3a 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 8880b96..228807d 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 df464d5..971fb4a 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 c32de28..acd2cc6 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 17cad49..db7c157 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 3e1ee86..8fed71f 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 6638a78..3e72976 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 177652e..c9c6c3b 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 cf66af2..9bf263b 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 64af882..ae2120a 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 e42a232..e12b459 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 7bddee7..98f0c17 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 cc720fe..44ef928 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 92c6bb4..dd1e027 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 a35af67..27a700a 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 c04f7a0..29f069b 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 26e218b..3a9d9ce 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 118cd17..22c3a01 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 02a68b7..0f0e401 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 cd35995..ff5ca57 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 1bfe508..0e93507 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 35e6f16..12d5fc8 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 ca3fb56..06790ff 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 eac3842..26d229f 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 dd90d7b..13b8fb3 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 29122b5..41f26e8 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 d2d9896..4cfae75 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 @@
 	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 @@
 		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 @@
 	}
 	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 e190baa..dd3e98b 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 3aaab92..e459a73 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 0d08660..424e321 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 8facc90..7492f78 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 b852c52..8417b77 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 5e79729..477494c 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 581487f..64cefcb 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 9a6d86c..fff5184 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 3b81c8c..0fc4df1 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 c11f14a..568add4 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 8d36805..d9123e4 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 92f36ea..d89b9ac 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 f7f1dfb..25fdfe8 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 0573ab0..209de66 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 6f1e0f1..8fb7e15 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 1f02069..b243223 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 4b3e94e..32f19e6 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 8863f09..7b13fe7 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 e3ab52d..34e6a94 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 ef80dfa..9579293 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 8fdbfed..911143c 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 fee3fea..8c86f14 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 5a8df66..0da62a2 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 7315165..ea2273d 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 8c117d6..9b68241 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 720ad85..ca0c4e4 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 d3d6f3d..1a4b3a0 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 0938a0c..c079749 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 c2d552e..6a59265 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 1838557..d06ee14 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 9129c00..bd6d6fa 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 9e3de36..bbe63ba 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 968afbd..5990cdd 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 7374681..f19bb91 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 c797cdf..0e6ff92 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 26df76c..f60180d 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 e232b8e..7e449b5 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 4b00520..927d473 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 da63cdf..7aaff79 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 f5bdc9a..ecabdad 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 51da69a..3f49306 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 dd416db..8730253 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 92fee60..ddeeeea 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 eee3f0e..7f0d7e3 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 2e28032..a19c1f1 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 f64a572..47ae7f8 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 4c46a0f..920b2d5 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,7 +38,7 @@
 
 #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 ae8c3eb..e2e28f0 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 2b11d7b..f13ecf4 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 4e87819..c059ad3 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 76e4b04..08d8060 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 888aaab..b1b7ac9 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 dee2497..72d5821 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 fcf1b2c..399a7be 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 c178fd6..9b41aa9 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 5cc07cf..7e28b89 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 70d4dc3..92462bf 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 fc9e182..8ea8dd3 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 bd87b1f..2919748 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 77762e2..002f05f 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 6c8e671..7a444d7 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 119ab08..0dad606 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 8fe93f3..f146ffb 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 0539063..c5eba92 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,7 @@
  */
 #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 7363827..d29bbcf 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 97435d0..db12f00 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 f3b764b..ac5b578 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 8194079..4468e44 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 667d91a..e2d5b1c 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 85a631a..456d9c0 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 9871df4..a2198bb 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 5914a07..70365ec 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 5943158..e35fc8b 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 621910e..53a3683 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 f794969..10b49e3 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 d159741..eddcb66 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 0d9bac7..de41338 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 3ef6710..f610c6d 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 bd273aa..e7e74ff 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 5a523d3..a1420ea 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 22ae9c4..762bf55 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 a21be90..4a01e4c 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 b9e46c7..ffa4bc7 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 91cea26..e6ea9f9 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 55b2d5b..7d4726c 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 e4d3404..80086f8 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 bbe870b..936d3b4 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 921eeff..fb62cc8 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 28f9be1..d676b5e 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 0b09213..04992c1 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 c904379..df4d276 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 e0b9f78..524b03d 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 0d1334e..ef92b6b 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 24ea554..6d18b34 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 8d8ed71..e6c9d29 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 c601f57..2c9c1d9 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 c1c7e48..5eabbd2 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 96cab80..64e2c5d 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 8155b2a..8128bb9 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 0657fa3..edc614f 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 107f47c..7c3528e 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 5b911ca..78bc24b 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 a8eac7c..2e3eb93 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 c45ac0b..05133a2 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 e8c80cd..b11edcf 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 8ac9051..4c7c8a9 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 df34718..c9167d9 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 633ed89..ba55551 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 3903b6c..173f9f5 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 a518029..985f51e 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 06ffbfb..95eae29 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 2888d35..b36bcb6 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 23b6a46..00cde50 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 fe2fb3c..41fbb0e 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 04b8e37..0b0a78c 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 c2966a8..2a691a5 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 58290c7..6e73727 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 78b8df2..a1d711c 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 4906dde..c3f22c7 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 421369a..c57f446 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 914b732..7a58799 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 7d7d140..7d3f753 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 22f1936..d65a89f 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 d263a55..9527469 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 7748ecc..3c9c3ef 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 3a8ca60..3467f5a 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 69a8ab3..72b8069 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 b5cf0b8..d0c95e3 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 fe39f19..a6b7351 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 2ee792a..37fc4fa 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 7e71f8b..0481e7e 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 e883ff3..d844efe 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 872f565..047b370 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 14d4eb5..24a3a28 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 479b3d7..e9b11dc 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 e5d8a3d..9722822 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 87ce411..24562e1 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 259467a..5f2f2c5 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 3edbd46..a40990e 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 51c03db..b9eecce 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 5c30e1c..f07265a 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 d6d5d5b..6bde704 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 54c9f86..45a1940 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 7b095bb..5324063 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 2e5c76c..db54aa9 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 7756179..55fbfd4 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 ac31086..f097909 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 f2052a6..06282c5 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 b26cde5..e7ef212 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 f539984..4e79359 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 4ab7626..0513c11 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 8327cf2..887eed2 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 e56f7f7..e147616 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 fc89d9e..6d9a678 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 c7cfa31..1a19d76 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 e282d8b..122e27d 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 f8ea864..60ecb83 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 7d398c2..1532358 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 fcdc2a9..65eb4b8 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 7d75985..39c7d5a 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 8d8daf0..1e68f96 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 095e2b3..0fa51d8 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 05d5302..8ced30b 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 8a1c230..cbebce8 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 d061d70..3076532 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 2eac55f..2d40ec0 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 df7f8b3..7af9c10 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 16d47f8..5311aed 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 9860b0e..12b9cc5 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 2cbd7f0..0123335 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 4cdc2fd..34558c7 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 1ef5117..4f96959 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 1e76720..dc7d091 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 9d21297..59b59e6 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 9d1528d..bebcee1 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 330e711..5a1c5f8 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 534e434..6298e88 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 e239de2..0f8b540 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 fd7cf9f..bf8aebb 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 e410881..1f501ca 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 59c07f8..acabb65 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 7f16cec..6274fb2 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 c7a711f..ff64bc1 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 1f10a01..5dda101 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 35387df..2f7336f 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 2d7148a..f81290e 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 fc74544..7da98f2 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 12c9a1e..6c5c14d 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 e0e468c..db9f1a2 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 6484753..9297fb3 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 814234c..eaadbb6 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 13fd684..610ab58 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(__FILE__, "")
 
 #include <sys/stat.h>
 
diff --git a/tests/test_callerid.c b/tests/test_callerid.c
index d0788a4..5f7af2b 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 7e1dcb0..9c982e2 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 7f77a1b..71fc636 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 478cf36..8faaf9f 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 df618f9..ad7ddca 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 499e633..7e56770 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 a6614d6..12e44d2 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 9e1b5cb..9b12ce2 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_devicestate.c b/tests/test_devicestate.c
index f7075b4..531bf7a 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 cba367f..a449508 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 4447861..b7a2efd 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 ab6eab1..0290a26 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 e29a6a5..c215559 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 cc1696b..b01b0da 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 38320e6..76b1549 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 8349075..a1e71b2 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 604d8e3..c4b071e 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 7379b95..2f043c7 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 cf1a914..76a6ecf 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 58dd46d..9f538ee 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 9d624cd..b848994 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 9edab94..4a17e67 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 de14a08..a39e2a9 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 b0df4c6..1f7000a 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 13e24a8..7140b5f 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 e182b0a..153b1dd 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index 6a7d394..3867a55 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 5e2e232..388baa3 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 755bb0f..e71913c 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 5865f09..45e8f5d 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 5ad2f5d..ec53ce8 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 72d6fb5..bdca9b1 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 122003d..b5063d2 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 9d32e3b..da273d1 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_astdb.c b/tests/test_sorcery_astdb.c
index b87ed74..38f2d5f 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_realtime.c b/tests/test_sorcery_realtime.c
index ab9c188..b23192b 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 86b69cc..f5d74a8 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 2a36c4f..91dfe09 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 7ac5291..2059c60 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 4321d4a..31fb11a 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 46e8ce9..c22f5e6 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 ef6e954..fcba960 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 92bbb70..0aacdb4 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_utils.c b/tests/test_utils.c
index e4f6e0a..abb0c33 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 4e0eb08..e13b304 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 dcf1a17..f7b4809 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(__FILE__, "")
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_xml_escape.c b/tests/test_xml_escape.c
index e4c36de..5e6abc7 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 86588ee..2237625 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 @@
 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 ba35f93..38080e8 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 315b3b0..0099a13 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 @@
 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 6cd535d..de668f6 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 @@
 	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 @@
 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 @@
         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 5d36f42..99304b2 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 @@
 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)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>



More information about the asterisk-dev mailing list