diff --git a/UPGRADE.txt b/UPGRADE.txt
index 3514f5fae9acf12e0ef75360ff80506c0f8685c0..8a349f0df22388258a476ec19f8ace8a462f8b48 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -33,6 +33,15 @@ chan_dahdi:
 
 Core:
 
+AMI:
+ - The 'ModuleCheck' Action's Version key will no longer show the module
+   version. The value will always be blank.
+
+CLI:
+ - The 'core show file version' command has been removed. When Asterisk
+   moved to Git, the source control version support was removed. As a
+   result, the CLi command was no longer useful and was removed as well.
+
 Logging:
  - The first callid created is now 1 instead of 0.  The value 0
    is now reserved to represent a lack of callid.
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 4fb3ce54f3332a22f98f940354608f9f9c6b32f8..d55f9e035fc241e37d92ec0624ef45c5fdc6fd99 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 3304702d24a9d594dcbd6028b4720f2b7c32830a..45357989c64a98297e73a48efaf8790f3e608846 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 e354148f09695841cfba4abf2b8b13eec3eb9cc1..07715b548a1c182c38fbd68b3ce26d68f71b8ab1 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 ee02f5206ad9d55aa1b4a55af5d600e929a31a98..e9087d1fecca9be9969787d93c02037059c5f87c 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 640e06ef88c96f93defffa12a0eac9d0f792e48c..299fe5619a6f99bd3002b8e4dcf176350a3f2a79 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 efe1aa36969d013785b88c6069cfb9d10f9131ed..7f5f3e6fe095710ba1c9e9a2a6f287147084346e 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 a8f2d2c1bd6f12e6f627c41a3fae92624d866462..68bcfdead8c5debcd87079e639a1e9ee908b4696 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 aaf956ff2dea77168e02486884679a9fc6f954a3..d5a01885e98ebe4788dfec3c1ca01233253aedbf 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 68d100858a3fe4d4413822dfb49e8a37b0e7acaf..ee5dd6f42bc5bc18ec842b92b6caed198816ebcc 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 a8370588b8fbf9829e6fb91264f200e9fd817f7f..f47db45346d4b580f0678cd7cbbc44a62e830dd5 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 1e722f184c39468ebd476903bbe212d7228a1a5a..0e03ad7cecf700e32dfb7e253b869b5cf1194893 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 bf4961a5374ddec6b569fe9e48559c0320d7fef2..7862179f339ce55116d79478dfa0da5f2e039a77 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 3037ef60f389b3582b544bd66543c1d7f0c7286f..fff495460fa67a44217c429cf39b6cdff681677e 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 47b631a76c55a158e420b36595a8d9b7617cb797..0c3b27bb3a250cf1c429f1f6915ff56c0c3be8b1 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 f636e02480187e88b2751898630731de8d0e6816..80c1ff03d2b5224742b05f84a2212de57e5e4bca 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 9080594bfbe6b40fe394edc2cf3d377420008165..3c7a9171635641d982d273c767d7cb510f6e1ef9 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 cefc1337c2be142500bcf64304919ca2375a7a37..07188877fa2d6c6a8e48ceed7f79b68e835ac2ee 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 c27fd1c52c56f58af8c279cd94f0aac533884610..45580e4f0a13412b1dfccec3fc40e8b2549e5b09 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 701904beb28d7d174dda4b7c55befb2bb9d9037a..e8bdad01e152cbca054cc61be40233c4b616c20b 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 ef8d0b3a43adbf07d316e5702fe2822cda748534..1376b6874b40522b3f09669b934668a6b0c163d3 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 ff18f959bd0c2d7c2f54179b134df1c2599ddfd8..0390cfe7f9c0fc4597e29d18a680c491afd46ee4 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 97011b1b2fc24e6428f079513cef723187a94af0..0e4ef8d466fd992b9e6780ee541ef264b093b957 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 fa06595ce2b3446ee1702b7e14b083cb10c8fe24..cdcda047780e332e65be8d09c0690f923d8fbae5 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 267e2e8c34141c3d96b703b8b9b304a09145409e..c87288680e0a413a7f08701a626532b67f72100b 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 824e8fe55de5323f0c6c1c89cbae54e0fe76e41b..ab8d3082f20356b889f84520b43010fd0a010c69 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 1794c2565983e0d0cb2b3d872d56fee19ec9cd0a..93a65063cc714580a0d7c64a171580ef4ecc386f 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 d8b207967a2f0c3271332cb8d7a499a187b9802e..2ec9d709b4e949b451236058980d6bbd4302a934 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 ab9a9aecefe63851aeebb78a9d1e916897d213c9..1695ee5b8c2712c8b16f1ca6822747e42bef3367 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 9cb8839db7b73b00573fde6db5ae2931c9259c98..2bb1d8b535352a6132a72e68530698964c957397 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 7822a34e80061f9a42c5d7c9731e9d91ce23bd71..ff323df47533dad81035337590a0c61572ec8b78 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 7df8caf8a851ae97905259776750b4e074c64f0b..19c9f337676f13a5b54a9ee77cedd9cbdd2f437d 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 dbbad3332edabc01fd21d35fc19f27c9566cfe1c..79ce0d0f122a03c9a6d6c17737065178270406eb 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 8531b17b735f0340dd3e82861a36e0b5bc275f1c..4a2e569df00dccaf51f74b6533cb76880755637e 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 bbd15881a5e0147d0ab7def527aec12b615ac70d..4ff5cd61034834bff83ef23c69c4079b1048058d 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 319ed3cb9c53a81fe7585d72c7aceb4330c1ed96..7e457fb6ec61f2a22c145ee65e3acfce7c855615 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 d0fdf5cf1631636136c1ed533e21395303532d05..58201c4501a78b87599b2f7d0ccdffbd7e46fed3 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 4218917b21c68a658ae15da1024a0ae237d8a12e..66751f54171f0b579e8ac7d27aafabb08d4f2be8 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 de59fbd70406bb3287ee4c3e11968e93b8c3605c..2ec28b16bffdb04a9d248cab1b3c6d0e74e8c6a6 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 a4e47267e6111ecd5e730bad009c3a86fcd1c7cc..e5b0b9a4188071af9238b5ba16dd7a9c913d11c1 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 d8fd47fb1cbfe9e906a99e45312b79fbb1c23310..d2da165237165a3f678f853418ace0b9b3693cf0 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 907770e225a570534e61f3aaddfb722266e8aae8..ba83eadd644c07a0d3fdf0c742dbcd3303771fcd 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 a3509581d359f7203cfecf78d5db4de8cbb0114d..a736fd47f293fdcd2044b70ba7065a3b18ef8911 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 45d04d8ba6e4752489743b81ec2e3a05fe28da04..b8a1ceb775980aa01d02b309e7e3d0685cfcac0b 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 35df01433b9bc54fd985f79357ff7356192385ff..f5f9b22c17b8335c7fc1c44ffa7e9c87e5886fa6 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 27e70f09c3bb0ceae0cd3b0e2d1a2ad68b6b22de..8d06ac44c7b24924178b00d0d369ba0b333dbaa2 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 a22265d3580d4b39fc52b7a58a2b5e7f07f89359..5712cfe33b155c7f8aec206d70b6a4d966841ad4 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 a347cf3c834424a19395487ef82da824517a8d7e..8175fc8104244455ba2ddc0e7330f4a3d3cbecb8 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 15898b2400177a47b45ce0563a70e13dfb3aff96..f744b7a9ddbe2ca0751d468d761a366fa46f82d2 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 ef816c3402ae7995c01520221d36fcc3eb27cf56..25f9510ff957ebcf94ae405d062afad80d8b1675 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 f5e1460edb2755ac5e32e2f27a5f00871471a975..cea75cb5e43787b2066f67d01326c3b2c7cb6bc4 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 6787573192a2aeb4d95539e2474eafce16029dba..4b9eb15e5f701f92b0d227d71beb9b48ba262446 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 fd947dd661bd2570b317070c62427151a5e0ad85..79e2a45769d6154abc73db977da0f5fd58e12faf 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 0e04df60b4246deee293ea2102c533b3875789b6..70ec6562bb254b28657154e23c0d2385d7304984 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 3aa30b0ac36d879e6a3b8b058e827ee8dd217877..a82632d8e506baa6f3d8f8c85e9771bd62f7d6dc 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 d2a1de7b64badd3d02d6df9b6562b80adc454dad..1f586cb991efc822906662d0b90c50eb05ba95da 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 deaf83f539e6fd40e5f13c276611c38f29183084..a0a3c5583a4a49488904f08df9f07148104a71ca 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 43a1e490f357bb556baf386e48bd06d28e6dd105..ed54a77892976f11cd75834e3f8a1f3706cd80da 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 4eddc08e526cb94963ccbdc1d2cde3fc3a7b067f..55867bbeb6c3087272eacd179546d7009b0b6c7b 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 3b4d2b51e79b5625e860b49ba7a9715ef7feebc0..c4efaf38e44c7337a5df685bc06a1c2e33fa8a09 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 be70d7b0fdf4200e8862b89f2f645aebfbe406ed..bca46302472965b9c244e9a2434b4e3fe790d7b9 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 98b7b2fad4fb60f7c86a1a8a3b46a177728041ee..3b7f0ca2f4c4e22802091e0e324606fd07228c7f 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 1bd093cfff0c6e6b7cc62b8de24b937a3772295b..36d554ee62f8567b88c295e862db2db1c989edba 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 337539efe5bcad4832d0ac357d59c2598d7593c0..54ecbe1ecb7c4149a960421867b7dd0ca24183da 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 eb17c271b156a33fe65f9396a3b8a6fb531b2a68..a748c3b4b19cb7579cf9aa2e7f19370998fa15a0 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 f3fc4c18fc0a27a5e6160b321bfc3f322eb5629b..9660b4fd6865ad6a3bdba06bda9aebc8f342b3c6 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 d94603837ee652ffeba4473447efc73b6f4ab8b9..5b44d1468790669701661195c701a30f2bda21f6 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 253f41310c0dc78a8356c3344370fe0e6272fac4..2d440abfd409e2aeafa868e81fff66833756b365 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 4f53aff784ca77cf8a62033b0a3c033ded35efb1..22e8342923383754f5a443c1af62b66030c4bca6 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 7fe453de134f50b160c66e7f84a84fe6f9135a54..7fcffb196a18ee18d5627cb37847a4acdc351d95 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 a021252deec0b3c1080790dcf557ca4454f114f4..5cb10ad7ff6347ca50adc0916382a31f2bddff58 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 410d686066ada595fc2b844debf71e68aaaf1296..94f746bec2ef6e80e628c5d2c67aa3dde09efc48 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 1b81082782987a8701e2e5d7f20d7a921fd98cbd..d4cb6b6e19c4e0fb755be8812266c344d5147829 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 d5dd70176a449459de4b32a78754d99b79905503..863fa09eb139ba29abffea041ef156aad8ccfe3a 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 8f7219eabb5bf97666b3f7304aace8aa66eb0dfe..c4f985f0eac97faa69274a2644db9d48fc431bc3 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 c6fc8d17b997973edf75c96bf15f33675c254167..c285b2248ba9a7b9d7bbc8f3b80109c26aa87904 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 620b767323b8b27de8e3a360dd71041eed222766..532275e3d40d0ee3f8ea56172c430c08c69d3d6c 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 7ed906bfaff058ee255794d56a30a20f5e8a9870..c4e14ad60dd6729d1589e456283498d62bdaa269 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 07f2824da3b81c06910198037efc86070f4d167a..b63b0c8acbf0b3af89b832fc9e0bb31a38f16ec3 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 d1f4bb103a2b346c7f2e9d34fa09f74f12275538..c55b821b901dc6ae414daffc2295d5cf579aebea 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 90d3d5826c7594683ea8db9244f4691661b24602..273b466787ea3bc670905f83e687b4d433726463 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 8e966e954c679967a94b7a25e78cf4c78c645b8c..27bcf6331d226ad2bf3cd96da5f677c9000ee893 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 b850e27f79584774a154bd0a62be95c2099224af..8ced0cccd8bacf3847bf9139373e02473bea2185 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 6694fa52c6cbc9118284266777891385b5b91c16..dd438c159c32c293c6fb8d3f4bc49876b976f037 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 41cc6c5c493a81f54ad2763ef45b72fc8df05fa9..d3ffcb881345be7737073849643f47ec21804316 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 eb1b58e1554bd53ce25718eb3d438651abc088f4..133aceb9f3d074089268d008bd26d8189548d8e3 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 d09a7a2ec95ee00b9be9ae106fc544eeee06cc4b..f1d00c5a801c915269307b35b997c5ff75be3ad6 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 bb07e5058f8b5b24d7551f37f255c5a0c3c38170..0c8cf24fb3364612d21043d2a3ab83099a1a6ff4 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 2fd79d09aed9331ecf7b422929c6cd836f9af4b3..501ef9fa59a54e93d3a976dae18a05a58efd3bba 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 d5652bc78fe14d80d69a7bf03a00e97fbb118006..dc0c741b403080cd645f710a8228e93bb1bf075e 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 570453500c9ae81df5e73dc094d17c3d5835ec75..fc12bd16af977986f598e01e826016a57d07898b 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 b463f9936db50a999c770aedfe94d2171bd08598..850e3982cef917e3167d6880dc4632b624dc8557 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 e53240afdef99a45ad7a61e7418d7b8906708cc3..22f7d79160068c78581f117d8fdc8a92bf0208db 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 046713a8666e4a7b7d67ea3799075312405f23e7..944f98a6a0d0ec0ba8415bd6c9dd523d758176a4 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 df763639fa8cb8277727636558fc47cda6c7b9c2..2c4d8b712b74872945798492372f28c486707605 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 4fd5fdf61acb4621c02a3ed8bd9a2a1e3f83a563..4a079aecd36e76e60fe5c0d676e4014ff8afbb12 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 b8640f6bcaa623864f71a801276d920fed2fd669..8f326f932a0e096f884c78a4eb6aee2ce8e14437 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 e9e9fc3d8449f30e3567ffafd689470d5346c297..0c025ad124f3f409ef87e721136fc14ea55e3016 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 f590c766b89b45368653dd7717029eb299cf8a08..d9542653fa7e5d2fbc9288118fbb2094b8ba7ece 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 88557b6ab093243de191c1c58c92672bc18d7bac..5a3b9e1448d927219cc177696a0b07bd02dcb53a 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 b5cb391c2bc60f7a79bc83b8faee399927a59d3b..b7f99783217ba313589780d3775c7b8e4beb4b5a 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 458721aa832213c77eeb8657f488f79d55badb0e..85860ececdcbbede4e4bc53bc2b3a6c84293953b 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 7e44983a3592028703e7a451d548a41dd1d448c4..c71abd0e7ed87308096906d5831e1d5b4ca3769e 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -64,7 +64,7 @@ CREATE TABLE [dbo].[cdr] (
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index edb009686ec38d0de9ea2f1db58abe606ae397a2..0c55e497b97a801960d673f0ec6ddda8415e5a4a 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 b3ff6a5de3276a35ab6b6213da8607f2dccef747..bdf505b66df83f245c824e06bd1dceaab4304d33 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 11e33309770db2797c81e54cb46a1e95d38aef68..480344499a30e9e17195b682351ba8dd515d11df 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 56a6069d45374b32f941e6f829a81eca5f89c237..bb421519954fac4c6bbfd48e19a309f59ba3f017 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 79caf22f58ac4473015cd8567a942bbe7b3351d3..617ca660d4f6e0421c6f59417a081053d1bf6751 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -33,7 +33,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
+ASTERISK_REGISTER_FILE()
 
 #ifdef FREERADIUS_CLIENT
 #include <freeradius-client.h>
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index afa99f7dcebec2edad831566e9cb70d2dd7956c2..07407829ca8e540fc245ae1d13e8021332a3deff 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 a66115b713a4d93c13fe7218d43ce9c9bf6f2ca6..30aa1fb0d85901eccce79aa9f6100fd09d91e1b1 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -61,7 +61,7 @@ CREATE TABLE [dbo].[cel] (
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <time.h>
 #include <math.h>
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 74a61398ae8db1b6286bc50cfe537df09e493b35..755936367dd41a310b7a4e7a20943b64cba5171a 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 529fa2652649eb57a23f0a4e0b53a116c3c1e035..0a3468a12275b5d70a5c50e14cf5667109aaec45 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 b14d4b746a63bb9de058c354dbefc4486d6b750c..4fc538b77e9b76e88a5bae9ec1c5a3f1c6cd1f8f 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 e3f5c81ff1f9dcae1a4538c9631d1ead6da3f55c..b7df2b8113ac84f7cc7043b1a149441952ceb63c 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 771f7706d7878035fc4ecbe378d0707b90178dd6..8d3e7f1452fe18450b57e85c84b932f1a3e4926d 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 95fa2dc7cdc84f6d0009bdbf220fc1c719131826..602d38d014a1ca972545e58a71177fb923778809 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 ae8bcd7b8ac5b707508fb3d33d51551e3cf93846..4bfb1993d709128228e5ff9b546bc09fdb828c9f 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 13baa70eb96ddb1bd3d7b6159cb6244ea1cf60c1..05c6944ef351645d5dc465a8f5589e22beb97243 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 36c3435bbc60132758c679e60bbfafdf0a59521a..c23eecdc95bac473e151f75f4e04ad96eb1d2ba2 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 51fce44c0b9b788b47c5789193544d677e1681f8..0eb777a75e3ca3bd9efb4180c4a7219306441b4f 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 2bf7bddb4d659caa3dbf6dd8380e3def3d8d30de..6d790fefdb387cc4609bf44bf2ba15131835e32e 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 ca0e5cc037261c4febda46ea6b5425e171ad474f..07dd1b7b4545bfc3c4068789ecb4bd585ca83221 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 97fbf9f31813553176806fa24b94358ffebd165c..04eb0b1fe1f548c61d8ca12378b73093b452ebdf 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 179aa0fe466fd49e06e5af9f392516df89938687..3ee92da5ec622490b56161ee47ad31802959b62d 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 d1c05abecbe2ef5837eb6dc53d9fbc1989fd36e3..06878fb96121abbb73a16d2cc4808bdd0183f173 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 f4296172583dadad6d64dbc2be41633d742ad4c4..4379aa5c60bbcf6ddddeaf3bcc5f01cdbe414b66 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 6c920a944c3ee0e501381ac26692c566f0efe692..7755c449f6569be9100229d7b86153f3b90f2cef 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 a1db5cd773605bf7bfca77c7e76c417b57e21145..da651baacb61501d568dd0896fb07433a08f8ffe 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 9df82b29bf090ce56a9625659dd793415985a0c8..d67cb5c4356e89cbf20d48130cc31e3aa68f76df 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 85167c368e908d3a41fe27919f404e7a38f2b384..fba06a1ed1276631d081b43f381da7e0217a874a 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 a1ee4355054070bb2c49f290aab843200813554e..7e43bef43b7b44116588e5c79a73aa42fbdd422b 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 be7852c8f5ec123d433ae6cd8006f3ea0a656a80..72fabf116082ed0cab3e511ea20d8a26a82b1817 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 2a3eabf4128e563c896ae3d566a433c7bae51854..7538100703c0cb0531c4b071ab7f3acaa1d8c2d5 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 85dfe9448c2bdffdbfdf233553762e5bf70ebee5..fcad2fe112dfab9710d4a312349cc879d1c035eb 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 32f92c323809a335d7dcd2d93c16df806858dbfd..5915b6e9e4cb2661c8bb7309e83a06c848bcff0a 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 e291110e22139cf2c99ec1a88aedd7c345c1ad84..24daac8dcf328c6175a8b959603065e38b7f4cbf 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 d48ff08dd022067a1b1318a92134c65ca6889594..a3964b047d57b1892ce6beb1b8a011d003a97690 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 ee342495516c2d83758d4ee1e5e10686cc5d7fd1..91a46784f926577fbbd506a37f4c96b0031f1aad 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 e5c1ff2bca3f34897bd951e1c7cdc7e3b5e7510d..1541d7c25b88f32aeaa0f7fe61600864765c656b 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 14c2b443f3ad1dacf8f9716ea527bdb2d24902c8..53f8805e2bd83a171f0f70497a945f75f5e974a9 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 691c5bde18cb996ec6e937d50e11acf818a2bc95..e1b9c174a4f64248ad3eab1c78c4cbefc575d337 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 45dced4e1ffe63bce873f44334845b8e9b75f61f..ce8bb2b7d4121cb66f5b87f554900262397268dd 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 c21c706f50e757dc81176f3779ae2f3e29f846f4..a831abfcfe4aa9808e42f273f23a50a7882dca76 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 6b64f86935a3a8abf35b7960c172deded89991f3..d46230971eed2df20f05473d581558c86e2bcfc5 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 de9c4c4be208d22c8b2dd5dc98e817c338f86d95..21ca5c89d4d73a0b5f7ad8755f63996696ca8a26 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 8832bc31741956471459f9d9e1d7efda1e6d4bff..69f6f32fe5af76b199b9595f5653967432a84143 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 e262ebd719f531c1cdeedb4dba91760284a899e7..fdae2a7d30e8c4e7b898f8dc1ede629970dd5449 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 1954c5134de225e84f3681b1522b119fb06d9d14..0f9d33c0173ed30c5fbb2bfccfb0290b54b5b0dd 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 8cb49430fb4978790c51657520578f50effb7528..92ccd8257214f0a228d2dd10fb9df561d233219d 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 af23b906d71632b2f5621932917c18b14b8008a9..8247f24733d654b289d6f3da4c02621c1b2474ab 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 ca2eb8ef08003644a71b3a8471f619defd9dbbba..b560e62d2d50a9a8da7ed1a8abfab5458e66e6b0 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 26b1f0e08ab58ea4a5631b67295288916a99139c..67e9ce2b0ffa1b75c2428cea2294371346f0578a 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 c91070d9e18359c45a68307daf95624cc6004097..f7b6046dce9d4b3436b0fa72dc322c34da6155ee 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 58c0a895e1e5625090a7e5aae1c14f8bf3c78335..e75e29b107886db7248a20247079001636e2ed3a 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 f58286290bea543e408441bd24391ad942bd88f8..f6807b9ca92b0d5b8cedec29039a7ca09d21448f 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 6d0b96337bd8cec4f76ee13e931b4c5fead77ad0..777cd746b9e213766e42ddda2de01feddb448a3d 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 25daff9081b02e82435df666fdbef4518d0b76fa..684275c2b4365da08e1b22141167a88e4d0113d8 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 2c677b2e9e74749ff7d550d3ad236d5c451dd9fe..69e6a2563b45463092501c7d919d8944f9a5ce3e 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 4a688e22abe294783577bb2eea50cf168adbeb0d..bf82dd5c636e27fb3c62c8bac4638ede05b50ebf 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 731b746e0b628d7ee2b3a1713449129786143796..f02d030772bcd5d5b0fedcfd05d5c2aa364a978b 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 7c3d2d4738cedb2768909f6e479089106b78d517..633309138421f502cad0f2d04fb76de94f341458 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 6b811e69310e71c306475f32f7fc905d843e013a..e07eedba0e25058608f91c9d6113af03daab130b 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 5b2c72d0db699489699fed3e1c42520e5b8a9df6..ed21f88f848d4a897dde9a32742a1555d81be467 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 ed616c5e783a5f8ab0b19164a0aff26ef28be4f0..0daf64cba9f637ddaf60e3726f111d628e840f7d 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 beb00159127690f8b88ddc964865ff85f8015380..6361cd00f400d67bf3dc9afecec2ee47f8fd344a 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 d0a16c4a2ca108a0fa2666c1572b03325d5e61e7..71de82e98ba944558d24727da4db08e3580f9f0d 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 acfde420c407a86724305a4db0965e251aa0a52c..2fcc131a31439c865af811d0e92714436b003c8b 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 143e4da2fdc854ce27d174005556267ae6075258..68aa74d475d07a9c970fdb64dfdd8e1b8574631a 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 6724c54d7603cf21c4cb708374d82b4870fe0460..5107ab9183fb5f1191efe0fa522aa805b10497ba 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 90ef986ef0be2237c49e1f3c8ccf645b8e6048c0..688c3e7e410b6fb525e01915cdcb8507310675ac 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 06597abb3f72e4879dc350e0cbe5692572977259..d5661fbf68cd05f7396dcafb23249c0924e42bb4 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 3338118f9a6c1ce9fa396e382cb99f48880e1848..52fddb67ecd069d8f2f6dae14b6f64667c4adf8a 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 1a7619d9161e610cf84a492c03890197735eb9e8..5352e172c2662433751a49be439d685c69d75158 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 bb045059b2acf9e1ed42698fc855af33f5e571a1..5d3d4b9c9b80cb860bb9aa15875fb42afc3385cc 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 cb1cd59b3f1f9d837c12cb4afb7b5cba983fd564..d50774fa9dc2df5cae42bc986a24de3c729e2aca 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 4f6a6779b47c58529cc3e3948c3d297129e77132..1599349490168ec3531a50af0da180e896ec5fe6 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 ca54b1e429c199409800374ab1e4fe204a175dfd..2bb6a8efed6197f69a44291059a435ea6626decd 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 68baa1e5e9ca9fef0f9b687547b9a2ad2611972b..77e18aefa6698199542d94b94ef5737a22c36396 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 ca6dad1a198dfc414d585a5c7299e401adde5958..64676c011766471b2c6f7b5868bbd7cdd4857213 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 beab0c144c1522d1af217a390181b7f01bedfcda..ed5f12f58200750b564dc15ff5dc1b837f40da50 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 4b6dc9d48a9a60a7f87033b05c4f027087364ca1..23995ba91231342b55249309cb5a8e0884076bc2 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 b56fef9f5e3937a4cb3cf8a63d0e44d69a0174cf..f031645a9353e0627cf4b313d4edded7a55eb966 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 88a5c5c7168163fcdee6f807cac04de0307274c5..d86f54eb95e6543ae4742270662d89d8dddb056e 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 37aba6afbe22ecf178c6528f21614c1168dc8c84..f6723119dc9a685e30f7d60f94112edb0f6df31e 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 0f3c0f823b947219cbea173ed790a031212e4ba5..70bb111b14b2f6364265acc1e3e3972912964449 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 4b5fb9f7b884675124b4725fef3a089ed57ce325..58a05c0329e49f84a1a9fda9417f195b3ca28284 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 3c260a2fb3a168ac9d1ebc3ae88097dc6bfa693a..8f9753aaa92b7cf484a20530fb3278fdb021f59b 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 940c455c281a2076612bbe7ff47b5fe332ed8fbc..025d4975de84df5686b5a4143118c89050002769 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 512d685f1055a85732e767fd29de4547642775d4..e8c10945805314196713da3c3331586dc68accf7 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 a2329c46e91a0ec1d42d3377154fb1fc5809964a..23e69d335e907bdbef73040b428b333b92669967 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 fd775d994592f5ff55e43dcd8af99824ad2fb9e2..9708ca7c0cfaf6d177d5b7aacd17feb2c6af9012 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 983a0e1088a0c525c7843c413cb9cac146ea6acf..043e480f3b6baa7d07a98b2e055a18da924bf5d1 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 c3d02865cc729729e1b8068180c0310276ca77cd..9582d67c51f9a0094648d8ce2b6d7c5c7e9a6694 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 e33b2c23a5e992a5554986e0118cab6344e3e5c4..ef7ff71390a234660a6ec24109463ee5c15c7459 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 2102d5c9a288c2a15e868c57a242be87d25eabf6..7bb50f5e344ed94b9cd3b70e556b7897429b4d1d 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 e371f7ec1a14d5fc98ae7097d59ffaa02bfe2071..8724ff51f5f2ec7251a622d9fcc8d50cf08a67a2 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 5c8d3bce8fc1e171607bca60b345f5c932563914..ae130588715fd7c647544e93710d863b027318c9 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 2e601858647d17233c9b944da09e4beb6e0fe943..ff36c9e37e5bbbbec4c1a2af8f60f08b0eb46f62 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 b0b346116956cff94b240fc44ca9db2c3b230156..143804a07cd456b0d285cd6fee1bc3c290d2e495 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 088cd5a0a60cf923024de0fc0382ea452cbcf6af..7d09ec5a73c982bb57a2a9b258f00a58cb8f4688 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 ce5aac054f0877a2727dede5e63ca17d8e715021..e62e660bf2d69ab2578a87fe6682f667eee16e9a 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 bec5f71dd386ca1fb85f1560e31f2262c789be2b..829498ab12d41ca29b0a01e9f259ce2bd553c6b4 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 e44ee946baf8b808611726c357a30df4e16443b8..41c15ffa16715c18454792d277d9b7e3b17b3aef 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 0f5a204b883f868bc0edcec35079457216f8f4c2..fc65ae9222e3bec2592998e421bc2086e383b02f 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 8d079ed2deb9ba608e7459e49dabbe49afe2d0de..ef544f367d3a561677f8a51060f5258dbbdfde26 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 f1af8b4fddf4c672e0c1b728ee77816fb01f41c6..775c7dc7942e6f1890b23ac0213046f6562d5475 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 6491b371de8a86c9aa7234f0474457b2d6f57222..cc34517dc2a2a9dcdc72f6d83fb7905a1c1f9ff4 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 a870ab450875c6667700f91f46e9dbe4bbcd2d9d..0ce191b543a0d07492fe284f14d9d3a09356df92 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 c6b7575454e641b95d7f49f19ac501cda7478e29..9f596c4fe2b0ef12f4abb8c11b6264028879f29b 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 e403efc2e82cf3a4d5d24e1b6e53869bfb9ec1e2..f529cbf724b3da0c791aaec45c77a603590071e7 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 1671b3f05552e2ef2bfddae1b992a098f8fd5ea5..8c1697abaca6ed9575f7051d042c651584cf1a6e 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 d0d451bd16ee905f0af6944bd1aa42687b79f022..a4cfa17b34b6198c97de413dcdbbb5765af3b630 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 4d5fc7a6c0819b613ce7377b33a1e210f1a7fc7a..822937e55daf1f6048a9e4963b0af1ae7c308d8f 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 3786a2fa2adc240984cbf543c7420df48847e7d5..79a24db00bb55e69ef7e9243fd9f2eed81b0318d 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 efa4bfda71f32cd2ef57d7203d669d0aa912bb51..255e846531252761173be9ff276f5747e1ef7cbd 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 8da94dd334e49180d8d3984474d485abef5923cd..9d8b765e4640bc92b5e8e94ddfdc5e4c60477521 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 ccc74fd7f1fcc664810b8ec3a914e82b1bec06e4..b8dd2d458302d51af809f95e985d41f6228e1c0b 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 b757e998f8e91226dbd5679182d8a6ac3797e7b0..1cb6b8dd4f9d7636f69005c0619667971fca40af 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 f53b75fa34df53c6cd6ef732b3dd38e8f42396fb..b7f891b70fd2c2565b8a2d71f5fd1b2c169690c1 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 da733d1e369bd33e67b97599165179bf1411678a..5ccff8273ad8deec011a2f175fba64d516e51193 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 6c98e72f6633393449071e29f27bc82327d6840a..2c3563192fe8effbf47dd05190bf858974805e73 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 9fd02008fe8e1458d01cdbf967f33806834a1058..a8f84586d7e46c5d1692acfd5af06f38c9eb3b91 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 9a0264e8ceed2c469ca7ed23927836dfdc67e365..14e88e62569829edfd8b3f49d32a405baac13775 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -156,13 +156,12 @@ int ast_shutdown_final(void);
 /*!
  * \brief Register the version of a source code file with the core.
  * \param file the source file name
- * \param version the version string (typically a SVN revision keyword string)
  * \return nothing
  *
  * This function should not be called directly, but instead the
- * ASTERISK_FILE_VERSION macro should be used to register a file with the core.
+ * ASTERISK_REGISTER_FILE macro should be used to register a file with the core.
  */
-void ast_register_file_version(const char *file, const char *version);
+void __ast_register_file(const char *file);
 
 /*!
  * \brief Unregister a source code file from the core.
@@ -170,66 +169,64 @@ void ast_register_file_version(const char *file, const char *version);
  * \return nothing
  *
  * This function should not be called directly, but instead the
- * ASTERISK_FILE_VERSION macro should be used to automatically unregister
+ * ASTERISK_REGISTER_FILE macro should be used to automatically unregister
  * the file when the module is unloaded.
  */
-void ast_unregister_file_version(const char *file);
+void __ast_unregister_file(const char *file);
 
-/*! \brief Find version for given module name
- * \param file Module name (i.e. chan_sip.so)
- * \return version string or NULL if the module is not found
+/*!
+ * \brief Complete a source file name
+ * \param partial The partial name of the file to look up.
+ * \param n The n-th match to return.
+ *
+ * \retval NULL if there is no match for partial at the n-th position
+ * \retval Matching source file name
+ *
+ * \note A matching source file is allocataed on the heap, and must be
+ * free'd by the caller.
  */
-const char *ast_file_version_find(const char *file);
-
 char *ast_complete_source_filename(const char *partial, int n);
 
 /*!
  * \brief Register/unregister a source code file with the core.
- * \param file the source file name
- * \param version the version string (typically a SVN revision keyword string)
  *
  * This macro will place a file-scope constructor and destructor into the
- * source of the module using it; this will cause the version of this file
- * to registered with the Asterisk core (and unregistered) at the appropriate
+ * source of the module using it; this will cause the file to be
+ * registered with the Asterisk core (and unregistered) at the appropriate
  * times.
  *
  * Example:
  *
  * \code
- * ASTERISK_FILE_VERSION(__FILE__, "\$Revision\$")
+ * ASTERISK_REGISTER_FILE()
  * \endcode
- *
- * \note The dollar signs above have been protected with backslashes to keep
- * SVN from modifying them in this file; under normal circumstances they would
- * not be present and SVN would expand the Revision keyword into the file's
- * revision number.
  */
 #ifdef MTX_PROFILE
 #define	HAVE_MTX_PROFILE	/* used in lock.h */
-#define ASTERISK_FILE_VERSION(file, version) \
+#define ASTERISK_REGISTER_FILE() \
 	static int mtx_prof = -1;       /* profile mutex */	\
 	static void __attribute__((constructor)) __register_file_version(void) \
 	{ \
-		mtx_prof = ast_add_profile("mtx_lock_" file, 0);	\
-		ast_register_file_version(file, version); \
+		mtx_prof = ast_add_profile("mtx_lock_" __FILE__, 0);	\
+		__ast_register_file(__FILE__); \
 	} \
 	static void __attribute__((destructor)) __unregister_file_version(void) \
 	{ \
-		ast_unregister_file_version(file); \
+		__ast_unregister_file(__FILE__); \
 	}
 #else /* !MTX_PROFILE */
-#define ASTERISK_FILE_VERSION(file, version) \
+#define ASTERISK_REGISTER_FILE() \
 	static void __attribute__((constructor)) __register_file_version(void) \
 	{ \
-		ast_register_file_version(file, version); \
+		__ast_register_file(__FILE__); \
 	} \
 	static void __attribute__((destructor)) __unregister_file_version(void) \
 	{ \
-		ast_unregister_file_version(file); \
+		__ast_unregister_file(__FILE__); \
 	}
 #endif /* !MTX_PROFILE */
 #else /* LOW_MEMORY */
-#define ASTERISK_FILE_VERSION(file, x)
+#define ASTERISK_REGISTER_FILE()
 #endif /* LOW_MEMORY */
 
 #if !defined(LOW_MEMORY)
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index b629fe826d2838c66e49ed8681f4da34c6cf473d..c703c68727dbc148a0b1e7695dc12e22ed9f589f 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 fa1e35c741df65e26600874e5b39cdb312350e3a..92b675443bdc5278574294877361f87d9cbe54e3 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 c5069f358eb2f42743f4992ffdbe4811bb153273..3b9bfd6b9c5b7c2578347dfe24c99a939fdbcafb 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 5bce0665155e776da6601ff7b179165a78605e81..ba44fbfb978d158a97f4a6b7a006026632ca22f7 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 37afe42978499d34b29013c24447051af31ba95f..2046ac8a02a2792c2b8c5a5bdd4caf5ec9ae377a 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 f42604ee67f54194d40008c859ce1423a60e1f59..84a3d7b977e0e6c8209184104234a7f09ec84b93 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 51af56b402fc83ed83502db7a0fd9e720bd2e898..c2d4e00a4b15b3f062be8191b01ab131f6f199e7 100644
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -521,7 +521,7 @@ static yyconst flex_int16_t yy_chk[159] =
 #include <stdio.h>
 
 #if !defined(STANDALONE)
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
diff --git a/main/asterisk.c b/main/asterisk.c
index baf5ded4fed4488eb967d08d0a1bc06c076f3498..574451c6597b89ce95ef4b10e4fa52d09f361a34 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -149,7 +149,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 
@@ -475,87 +475,65 @@ static struct {
 } sig_flags;
 
 #if !defined(LOW_MEMORY)
-struct file_version {
-	AST_RWLIST_ENTRY(file_version) list;
+struct registered_file {
+	AST_RWLIST_ENTRY(registered_file) list;
 	const char *file;
-	char *version;
 };
 
-static AST_RWLIST_HEAD_STATIC(file_versions, file_version);
+static AST_RWLIST_HEAD_STATIC(registered_files, registered_file);
 
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file)
 {
-	struct file_version *new;
-	char *work;
-	size_t version_length;
-
-	work = ast_strdupa(version);
-	work = ast_strip(ast_strip_quoted(work, "$", "$"));
-	version_length = strlen(work) + 1;
+	struct registered_file *reg;
 
-	if (!(new = ast_calloc(1, sizeof(*new) + version_length)))
+	reg = ast_calloc(1, sizeof(*reg));
+	if (!reg) {
 		return;
+	}
 
-	new->file = file;
-	new->version = (char *) new + sizeof(*new);
-	memcpy(new->version, work, version_length);
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_INSERT_HEAD(&file_versions, new, list);
-	AST_RWLIST_UNLOCK(&file_versions);
+	reg->file = file;
+	AST_RWLIST_WRLOCK(&registered_files);
+	AST_RWLIST_INSERT_HEAD(&registered_files, reg, list);
+	AST_RWLIST_UNLOCK(&registered_files);
 }
 
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file)
 {
-	struct file_version *find;
+	struct registered_file *find;
 
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&file_versions, find, list) {
+	AST_RWLIST_WRLOCK(&registered_files);
+	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&registered_files, find, list) {
 		if (!strcasecmp(find->file, file)) {
 			AST_RWLIST_REMOVE_CURRENT(list);
 			break;
 		}
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END;
-	AST_RWLIST_UNLOCK(&file_versions);
+	AST_RWLIST_UNLOCK(&registered_files);
 
-	if (find)
+	if (find) {
 		ast_free(find);
+	}
 }
 
 char *ast_complete_source_filename(const char *partial, int n)
 {
-	struct file_version *find;
+	struct registered_file *find;
 	size_t len = strlen(partial);
 	int count = 0;
 	char *res = NULL;
 
-	AST_RWLIST_RDLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, find, list) {
+	AST_RWLIST_RDLOCK(&registered_files);
+	AST_RWLIST_TRAVERSE(&registered_files, find, list) {
 		if (!strncasecmp(find->file, partial, len) && ++count > n) {
 			res = ast_strdup(find->file);
 			break;
 		}
 	}
-	AST_RWLIST_UNLOCK(&file_versions);
+	AST_RWLIST_UNLOCK(&registered_files);
 	return res;
 }
 
-/*! \brief Find version for given module name */
-const char *ast_file_version_find(const char *file)
-{
-	struct file_version *iterator;
-
-	AST_RWLIST_WRLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, iterator, list) {
-		if (!strcasecmp(iterator->file, file))
-			break;
-	}
-	AST_RWLIST_UNLOCK(&file_versions);
-	if (iterator)
-		return iterator->version;
-	return NULL;
-}
-
 struct thread_list_t {
 	AST_RWLIST_ENTRY(thread_list_t) list;
 	char *name;
@@ -1031,88 +1009,6 @@ static char *handle_clear_profile(struct ast_cli_entry *e, int cmd, struct ast_c
 }
 #undef DEFINE_PROFILE_MIN_MAX_VALUES
 
-/*! \brief CLI command to list module versions */
-static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-#define FORMAT "%-25.25s %-40.40s\n"
-	struct file_version *iterator;
-	regex_t regexbuf;
-	int havepattern = 0;
-	int havename = 0;
-	int count_files = 0;
-	char *ret = NULL;
-	int matchlen, which = 0;
-	struct file_version *find;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "core show file version [like]";
-		e->usage =
-			"Usage: core show file version [like <pattern>]\n"
-			"       Lists the revision numbers of the files used to build this copy of Asterisk.\n"
-			"       Optional regular expression pattern is used to filter the file list.\n";
-		return NULL;
-	case CLI_GENERATE:
-		matchlen = strlen(a->word);
-		if (a->pos != 3)
-			return NULL;
-		AST_RWLIST_RDLOCK(&file_versions);
-		AST_RWLIST_TRAVERSE(&file_versions, find, list) {
-			if (!strncasecmp(a->word, find->file, matchlen) && ++which > a->n) {
-				ret = ast_strdup(find->file);
-				break;
-			}
-		}
-		AST_RWLIST_UNLOCK(&file_versions);
-		return ret;
-	}
-
-
-	switch (a->argc) {
-	case 6:
-		if (!strcasecmp(a->argv[4], "like")) {
-			if (regcomp(&regexbuf, a->argv[5], REG_EXTENDED | REG_NOSUB))
-				return CLI_SHOWUSAGE;
-			havepattern = 1;
-		} else
-			return CLI_SHOWUSAGE;
-		break;
-	case 5:
-		havename = 1;
-		break;
-	case 4:
-		break;
-	default:
-		return CLI_SHOWUSAGE;
-	}
-
-	ast_cli(a->fd, FORMAT, "File", "Revision");
-	ast_cli(a->fd, FORMAT, "----", "--------");
-	AST_RWLIST_RDLOCK(&file_versions);
-	AST_RWLIST_TRAVERSE(&file_versions, iterator, list) {
-		if (havename && strcasecmp(iterator->file, a->argv[4]))
-			continue;
-
-		if (havepattern && regexec(&regexbuf, iterator->file, 0, NULL, 0))
-			continue;
-
-		ast_cli(a->fd, FORMAT, iterator->file, iterator->version);
-		count_files++;
-		if (havename)
-			break;
-	}
-	AST_RWLIST_UNLOCK(&file_versions);
-	if (!havename) {
-		ast_cli(a->fd, "%d files listed.\n", count_files);
-	}
-
-	if (havepattern)
-		regfree(&regexbuf);
-
-	return CLI_SUCCESS;
-#undef FORMAT
-}
-
 #endif /* ! LOW_MEMORY */
 
 static void publish_fully_booted(void)
@@ -2701,7 +2597,6 @@ static struct ast_cli_entry cli_asterisk[] = {
 	AST_CLI_DEFINE(handle_version, "Display version info"),
 	AST_CLI_DEFINE(handle_bang, "Execute a shell command"),
 #if !defined(LOW_MEMORY)
-	AST_CLI_DEFINE(handle_show_version_files, "List versions of files used to build Asterisk"),
 	AST_CLI_DEFINE(handle_show_threads, "Show running threads"),
 #if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL)
 	AST_CLI_DEFINE(handle_show_sysinfo, "Show System Information"),
diff --git a/main/astfd.c b/main/astfd.c
index d9119c9688341a99a64e521c5d8e2b41505fcb4f..72c5761d73cc32b696838886cd30073994307b4c 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 5812174d5caf782e25261beac515afa1856b9f7f..a4d5602ce6e0f661ac4fc524f3eeafe62a8aae52 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 f1d5001748bd3635811fb22f3ca19d180d6460f6..0f6ed739be71d80d24a2c27b2343a571edf1a632 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 dc6f5e5c552e506585f1b283394bb7339815bec2..d0abc7985f7e048965ca24d9bfa7b011ef9cef00 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 37d4b60178ea4efa0e3ff304fc170a30ecf55d97..76259dc7ffc33d1d00bb7dbcf4176dcd758be5b1 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 2e3a73eaae9dfe4f62495dcf8204f636fa58ecaf..a069c408e1737f6a13a7573d7461764742ecaf87 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 1883c0091c42a5c7511fbc727dc4dc69f5c0df55..b754f2329894369c0cd0f1ac44adcfb8006a8385 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 7da249a136358568a58f1ccef3698820330f6151..d41a8d82143387cf9a84aacac2ac76d76f7cffac 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 9630990d1b250b371aedb95f5455b0e19add7305..1af052d08891af58be61ba3d31178534add70fc3 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 a1156467f703e2c60731ba8b65769996d9389c94..3b490e8c3c8cc1624fc4b5a8366ea219f81f994c 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 7b69b6fb35c893201216b22dfcd7f534f2ea3b71..b1c42ff58631c2ac24b29583619729a1afa50083 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 a41f8a5483f3eab0582985a16c6f078efe4d5a4a..e2f14ab611b28b5a9ee8ef0401b4655783d6aaa0 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 522a7d40cb323df94dadb8d022094263f0435aac..c48db5c0056f9c047ec6191018621543bd37bc24 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 c25d827cb7606b9f35b3f4fcdee1c3b5e59c5004..9e300684d726e0238e2384234116b392bd6e6431 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 1d781ca93caab91f98312cafc06d99b9f52ac404..0305237351f2ebd951c6b72524e20d94348fd8dd 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 7618761b9fe8f9af8feba3331067cfe3131907a5..e93c66b19d5f8d7610c57fd0dc38f3d4cad138b4 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 a99dafc44c1d6ef6ee40a2d5299c3d7cbe4753cf..69fe6ff70629f835fa3b71ec7f0e8fa8416ff15c 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 ff5739ab077dfb4b9e3ca436e33aa9da53ea8fa1..c1b3372dce4a3b7c932f8e5aa066306f1c8a9591 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 5e24dae1b2a4a3cfe2ca71beaf61558897b12a89..9b32f9d9f49c48c0f26a0454cbb60c3c2e7f1b29 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 0c1e37b68944558962ac2498a279cb4d1760122f..f2d516883338707fa7ab4a6804100ff648137173 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 af93956161015e08d0da9d19de45657ca81c3c7d..4e418b6ea92527e0001d72ab382cbc7624af950b 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 0ff8444405a9550d80fc52209949cc3e85f56ae2..a2fafbf338af2f450fce0e10852679f3b561a931 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 37714e9a216d430ff666ff02bcbc9ef3f94b7f24..dc97df7735320d60373670f6f6cae0b323b213ca 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 42f56fcfde1bf21bbf03f71d839f9cf90fa06bca..9d3cdf3f4f70b28518c3190eea77498230aef749 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 543d4d0bde6dc9e8df51cace5d546dbe06c59926..9c4169a1cc72bc6eabeee962e3b5dc94bc3eada9 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 2e89e9a7d8da721d30e575947f219e6b175f843d..4be635e1b53df180ca0b0de3a92260f8815c0c46 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 daccae535bf5f7451af3879f70add14f812d7ae4..bc622ccaba8cbab0c1650001f1ea7f204c7f9438 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 0cc2dda3e5740f6e1ccbc58e9a47cceeac455cea..a1ba5d2e56594dc7af3a1a00f164dda7124fcd6e 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 1bcd91db2a0e727078fc3ae53f7fcf80214f4429..f81c71cd6145d594880ac5e7b29acbc708781692 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 f26642429b1f98259648a710fd66df6d669b8713..55b4ea368620157b342f94d23e5e4996f69b7468 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 5e5df02cd99e72ff938d80997716e076de5bd6ad..a4cf664b15b87fd3317ee26c5fd3806e7eeaf28f 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 33a7c040fdf187fba314d571c1f7b26d5fbe72bd..1aaae18f184c057a08f86e2f93f83ae671d29973 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 ed9b3210e7628c80dcbd212029a230478f4fc3b5..a9079e8375e86ca15364d135a6e5c4878eed4bad 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 4bb9355c66e6d045f03fa763b6811ac852d695bc..bb6e18bb55a6b8902c9d27a4f8bde09ca792bd8f 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 7eb9e3057de764fb1fd11d28c9c2493f8d24aa07..e2cc2f2f3bc1dcb0ce645a130c6ad6096fa695dd 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 210715556bfd87026667644ebbe0ccb6bcf5d226..f0cf127375f0cec5386b08bd49038ebc06692c7c 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 320d91768d584ea10708c779c218656e15c4dd63..fd87420267793d6a0e182ff6a2bc0fc0e0c71687 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 53ea1d09eabce75536adf557cace357e753c9a06..e66c71d62b1476f1cf8ead7b3b98edfa9817b8f3 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 72f28dc81a5ae75a8e869b157f9999b582efcd72..4d5a5f99aed8ff4295648352d67f3ba60628625a 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 45626d1b94e7999c015df929017d3bd647d39169..852fa3e53372ae8f727ac85585baf45c9782f401 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 3ebbab070c4e1558839d4f6d816d69ce6ce9605c..855273f1065637fd3e79121934ebec1f3a720da6 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 a617ede4d7fcffc6abdd7b1ac0003bb967ce9bba..f5d038ae70f85dc4c1aab750a786c24a1e5e690f 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 aa6f5308f171374b9fe566be94dac6f1214221da..85db40b74bce89d8415741f2e0073270678a1fdf 100644
--- a/main/dns_tlsa.c
+++ b/main/dns_tlsa.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/dns_core.h"
 #include "asterisk/dns_tlsa.h"
@@ -52,4 +52,4 @@ unsigned int ast_dns_tlsa_get_matching_type(const struct ast_dns_record *record)
 const char *ast_dns_tlsa_get_association_data(const struct ast_dns_record *record)
 {
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index b5bfd17bea0b2d15151e9a10595d552339ed8a16..b976c68c5361f4f396fc75b124c859da89259eb9 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 087416358e3609789a651d3c68589675e4eff8ef..193bf9fd5027a952ff1b34ce016cb27c06423b86 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 66ad4618e37055993052046a85dbfbeb73083dc9..c70170b41f4f4e3cea8fce626917fa0217961ff9 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 bae12996565c7e47f32b2d035c9579fffdbeee68..865fa3a0787c8f9e65675772a5ee409f9016cfb2 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 8880b9699329c4a1bc27e2c75e9eaa4d90365508..228807dd8475c4399fb8b42fb1fe909b0c90f0ef 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 df464d56654d0a80b8cba173bcddc7eb74dde3c0..971fb4a025308ac55a4b146f35e9d136e4a786af 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 c32de2811857cb0a554a11f7da6b749828b5995d..acd2cc6bca341cd8a1992057b501fbab6da83c59 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 17cad494ae8cbfb450f07a70a059de6ba64eaa45..db7c157c329866cb043a61531615f2ce8816ba38 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 3e1ee866ec3b042358193022bf5a8b1b0eb938d1..8fed71f734bcf71a110070ca85ab629dd8b8baca 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 6638a78c0d8e8ec238ff4aa623d5edc22d86fa35..3e729769c4563fc16235ec61a6db796d936f83e3 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 177652efbdbd22b6fdaa7d6e91a02d70a0e6c5cc..c9c6c3b303d4f0f26db91eb8c8809471a57c390d 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 cf66af282a092b067af65f7702b196f6b64d3eee..9bf263b5b2c7fb569cc7558dee7beba86cf3ccf2 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 64af8823790a31bb3704fdefe6c7479db4a79f9e..ae2120a5a3a70a45883400417a9751dc169b00df 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 e42a232c0624945f453f5cb632ef8b9f5e1a7ca3..e12b45931af1b77ca4f4362ce2452f792174d6ee 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 7bddee7f5362b6a88baed73933dc3405c8cde1dd..98f0c173bab5485fa5bbcfb37ca541be54cb2046 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 cc720fe4466a54fdcde394b7c5a4d16a4805728c..44ef928a82c25e7b67b6b289cd7e119901fd05d2 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 92c6bb4f7a123ecd242b7563be6a1f52e203573a..dd1e0278e495a7268c6acec94e112c185015db72 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 a35af6718f746905ce39749d5180401ea3c253ba..27a700a9da33dc8278a140e8761cba0b9a4be232 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 c04f7a010350b57dbe6b5ba5d81f363d762e0bcc..29f069b30a49a408c2d3868f6096c6153fe8e79d 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 26e218ba0bd38fbbefe4469a12051c4d4e9f4e01..3a9d9ce9cbffc928cfbeb8e93e049fdeca8a1730 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 118cd17c2449e9fb43edc1bf8a1d96009517f703..22c3a016c2e774f8c5b59e4299fce698b871c0c4 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 02a68b7caca7d3b15f6e77eaacffd3c7cda9dc48..0f0e401d9830354e5005717d9ae4482eb3b8f69b 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 cd35995ad303510eece132ae5721eead433a6ca8..ff5ca57f79fdd8fec25c0388609be8fa4774187e 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 1bfe508dac80fc5ddf772055d4ea1a2147b4afe9..0e93507ef8accf44549cae25b496603af6abc5d7 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 35e6f16cef890c563927fb06653911e8626298fc..12d5fc865a01d95f6e610f7c746a264ae8d01a36 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 ca3fb569c38a9eb4991ee49507d7c4d17b6acb22..06790ffd0cf653e34f6b221168fe76bf87301fce 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 eac38422cbfd0f7a7fd3aac3ed2163475b9181ea..26d229fdbf2602e9f860d6dbc06372c741bea27c 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 dd90d7bd9a9f920516f9f7504a6a8c7dc73255d1..13b8fb388e17ac63fd5dedbd1a7b51cb89bc88d8 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 29122b514c264d0cb443a223942ec7988f011e1b..41f26e823839d64e82e7f4fcc094f1387b69f0ca 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 d2d9896c2516c5fe1a306386d744d591642a1a6a..4cfae75dfb7cab0db2713f6e29e3b0083f601c6a 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -54,7 +54,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* use various ast_config_AST_* */
 #include <ctype.h>
@@ -5979,9 +5979,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 	const char *module = astman_get_header(m, "Module");
 	const char *id = astman_get_header(m, "ActionID");
 	char idText[256];
-#if !defined(LOW_MEMORY)
-	const char *version;
-#endif
 	char filename[PATH_MAX];
 	char *cut;
 
@@ -5998,11 +5995,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 		astman_send_error(s, m, "Module not loaded");
 		return 0;
 	}
-	snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
-	ast_debug(1, "**** ModuleCheck .c file %s\n", filename);
-#if !defined(LOW_MEMORY)
-	version = ast_file_version_find(filename);
-#endif
 
 	if (!ast_strlen_zero(id)) {
 		snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
@@ -6011,7 +6003,7 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
 	}
 	astman_append(s, "Response: Success\r\n%s", idText);
 #if !defined(LOW_MEMORY)
-	astman_append(s, "Version: %s\r\n\r\n", version ? version : "");
+	astman_append(s, "Version: %s\r\n\r\n", "");
 #endif
 	return 0;
 }
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index e190baa83c453a57a15bf6bc793a70c4ab203dc1..dd3e98b8d5ec346855ea7da978fe7a3156830725 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 3aaab92d058506b13a068ba9807d5ee5b2de2506..e459a73825e48dc60a7439e3fb1eaaaf1f3f38d3 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 0d0866016199a4e4973acbcd3d8a2a9f9f42f972..424e32108573f9ac0e0d0652b299684eea06c21c 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 8facc9093616447b910acc88cb5f19ca6a11f6da..7492f78a9a6cc4d4a557ed59d3d3dbea7fbc5a33 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 b852c52e6b3bc6951809b1cc105eef41ea8eb95a..8417b7741af589be977e4a98961eb21f7ec4d657 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 5e79729b58332987c6028cb7d7111aaaa75f2186..477494ccaf215f9e6938fa9ee23aac2c143d4a0b 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 581487fcd70c820499fe6240c36b2c3f7f742780..64cefcb1b5fa30fa6a5c7d51dbdd14f210b551fa 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 9a6d86ca126fc67ff67d94cf624e0bb000da8acd..fff51849d3f39ecc9e942510a175268224863fb1 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 3b81c8c382f7046e52a0ca10b0ce163131019d58..0fc4df1871de74f80e2ba37227252bc19244d4af 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 c11f14a89b7d5cc0de523efc95fbb4f84196f75d..568add4ca8e69f823d4a6f302640f68d213c794d 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 8d36805f98bfa6e7bf570c69e4b76716f585a883..d9123e434d8d1d67cd3335947945743668a32a9f 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 92f36eaf99b8e36cfc7339e4109db88bbf96d252..d89b9acb2730106b5c95c835361f50a252f91d16 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 f7f1dfb5c018f7daed396f89b9b2a4157bdaa521..25fdfe8f30b97ca20bf4780d035beeaefcc9f4c2 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 0573ab076795d7ab1975483398e127f81013f185..209de66d158bee70dfd0db8318da8422316b43d1 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 6f1e0f12f6eee70f62be8db0ccd12b321ce8ea5e..8fb7e158bed64340186e45e91f25767409b48d09 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 1f0206920efa422cd713b61f02db7c15996c7ba8..b24322350a227b49c334b908ccaa4a55f48bd968 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 4b3e94e61b37f7b3dad4402dd4960d04bcbcb99c..32f19e6c8595884b5104a331a0f0133f15bbcc40 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 8863f099660260f1760bac933b8bceb8f0d729fc..7b13fe7a8251bed8bbc2130547d80de7003240f8 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 e3ab52d3b7e4454595d074c0b3a81a1f3e21b134..34e6a9439ff0369c2edf5ab9b933b20d1e73cd5c 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 ef80dfa7de5a8632b4990d54f9ee76d0dd01cf50..95792932638cfef5091f3f47875ea3fdf7b58b95 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 8fdbfed36771c27df2d4f1deb4d7fc5d13a2d0b6..911143c9d633d6848f3991383e0efe25b4b89949 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 fee3fea56ce716daf60ab1a8ee36a2e44b1d6f6a..8c86f1407fc26d5cabeb2429dcdbdbcb6493d4a5 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 5a8df66d1188f951d6ca72cd51d7aa6c28d7e834..0da62a20a80b2b6123c453ba1bcf632617bf1174 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 7315165d7f563a95eb3b839c90d4fb4f5bdad258..ea2273d5a932d26f871853469eb48450667bef17 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 8c117d6523c97f459720e02868b55d1e626e6d18..9b68241681e7b6bee8c215c3849f6c775cbfcde5 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 720ad854957fc4cf094dafd9061207819d2d3738..ca0c4e45a1f37074cd27835abe2aa8ccf0b78b20 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 d3d6f3d7d2ddc1c1a4348b1da9e61530db098401..1a4b3a072c96ed49d4362c903fbd54c563c5f0a3 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 0938a0c036630f1f3ca0ad2ca7d7e42832ac6a6c..c0797499101342d3319860005ad2684c6c52c06c 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 c2d552e4bebd5a91b628782a9f668ca7bd6b242e..6a59265460cdec4e66c6f8fc4d069a7901f8b902 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 1838557737b14d3d6b3d51c304fde853804ec55b..d06ee14a7a699122178caae94e6cafd0436466f6 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 9129c0064c9cfb5c93e99b5319e3037c6eaa3bd0..bd6d6fa1d6a5ccf5eab3f5307f5e842cc006f172 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 9e3de367ad7c7bd4ace859268ed6f25cb731e568..bbe63ba1de463f15ad5ca468da5041189cae3c08 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 968afbd7d3021cf19adbafe1e5138360707bf993..5990cddce47c4c5cb1b6f3b633bd289bf6d4e092 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 73746817725cdbd19911dd0ffadb05b94d1710cc..f19bb91fe30bb5054987b4e07ada6f2d6bbeebf5 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 c797cdfa0509e6cf6c2b1201d695e2f8124cc502..0e6ff92046253ffda1fa3050d59847cf1f4befe3 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 26df76c53fc3935f7c4af957522ae0ba349043c3..f60180d68bb9ed006eaf0c342fe2e0a8f4c5c575 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 e232b8e8a3d1cb4d53dad18da0ecde808c730ab0..7e449b544f73cd2e379aa1fc1b3ada3a697fdcc6 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 4b005207e6a0bbd8d0f8069a4fb0a3d0d23ee0d8..927d473fd30b7febe87d8f7736408a18f1dffb97 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 da63cdfc0663cad8bd2d0daea7eaefe6ffc608e4..7aaff7992aacd22fc77428f0f3ff062851dab544 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 f5bdc9ad4db482503b9b89f9c8d71278bc178301..ecabdadef113da79c2988e481b342188c49da9f7 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 51da69a8c34aa9ee50e8c203bd76124985843996..3f493064bff1363bada4fe910d15da2da69460dc 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 dd416dbae6aec324df31957e828c5c500f450c5c..87302538d44173ba9ac13569274a73a1d59bbb2f 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 92fee604d3020713e8f887998e10a19783c2a3b0..ddeeeeaba6da9662333a3083223090ac2299378c 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 eee3f0e738441677d87785a89c6c7bfe698a2212..7f0d7e310f8bf516b5d18b836e54b0331ae382a7 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 2e28032a79f1d3d4bf545c524f3ba876d2d26687..a19c1f14436fe56a36cfa302565e09c7ca51a9b4 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 f64a572fd6c81e1b788b7e2d137a43b7d53288b3..47ae7f8f7a46a349d729a84e8e95798c83572808 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 4c46a0f585b6651d778c9ec0effd06c18be18cd3..920b2d50941b3b4a3f84ff38cfd823230a6a1e2c 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -38,7 +38,7 @@ void threadstorage_init(void)
 
 #else /* !defined(DEBUG_THREADLOCALS) */
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
diff --git a/main/timing.c b/main/timing.c
index ae8c3ebff6e77de4437906fd93909b3eb0881bd9..e2e28f04fc90d80b1c89795520935e5baf03b697 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 2b11d7b4a11a7323f7d0889b84f0b6ad71bc5bd9..f13ecf4561a60ac3e55b1ea512a0292cccdfbb99 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 4e878195c46846a0fa13cdccdd2f8aafa43e50de..c059ad3a4b5cf02b20769ed9c1a46176bdea9c32 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 76e4b041985090fd46ff400798322efe4413b735..08d8060c845968c1045e124e4b70730eb1e474be 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 888aaab81071d83f86cfa46066831f188611e9bc..b1b7ac9afeafd9685e82a2180da172c2424672bb 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 dee2497113746f92a426e2696cbef9daf27f59ff..72d5821c1030a3eda3213eb44e3dcf3e22d75cd6 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 fcf1b2cacb197eff120edb2b2ad4e55945d1a05b..399a7be978ca98ffc7efe96a9d875cb6920f102b 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 c178fd65441cbfd27d5c811e2f429b967e7d03e7..9b41aa9a86462f80fc0c9a2744a8a17d95847d98 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 5cc07cfa221f9401f7acb2f59a02addbf4357d19..7e28b8946672833a6979aacb833caa62245757f8 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 70d4dc3ce935a0ebec5cbb186d2e79ed7480195d..92462bf178b92db38c3d6c2be17e933ef6e2ffcb 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 fc9e182b2eddf206a3f4b77ef86993a21753d0b7..8ea8dd369e05043ceb31891b76b13d1e8170cad2 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 bd87b1fbe5f7616e81a7d9e90e0cedd30cf4ce9c..2919748b7e82491fbd2250439bf7b7b79af9a0bb 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 77762e226b20b23cf79e277fe48f0e17e23702b3..002f05fa655835594f6c863b18eb85f40687ffb9 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 6c8e671ed4651327b4052b1c315c9baa2cd78583..7a444d763590f9a0ef10797dca3b55be666678e0 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 119ab08b853c41de3c3f6f5adf17049bc46f1d7a..0dad6060de6501a835bbc7d53072ff6a424a3768 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 8fe93f39eda322a6ba93a59777ffc8ade64d545a..f146ffb096faf44fbd018711578881a98e7b7bee 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 05390630544db02ac91d43b61736168cd0e586c9..c5eba92b76c8d521fd24cb4e9223ddec6b59d013 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -829,7 +829,7 @@ static yyconst flex_int16_t yy_chk[1073] =
  */
 #line 71 "ael.flex"
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 7363827329788c9f236d2314e6634fb7df1249da..d29bbcfbd9c35c2a684135bc987b34b6d5e63ce8 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 97435d0252d93df9ed20cde4a4b4d831fcf166f6..db12f0000c5c7e5cd237b473659a2729dc223d01 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 f3b764bf15624d1b3b4cca14b7b38eee62171861..ac5b5788dc3583237e7313c59778881755876a5a 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 819407997f9a90e5f6429345ea1f0fceedd6734c..4468e44f1000606b31e5f0ca55b0cb89c5c4eb3e 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 667d91ac07ae5ade18f55c095d4bc81ab3d97105..e2d5b1c0ab214a42057fe519d5d0a778b65bbc0f 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 85a631a0256a75a2edf955456785e2db00ccf0ab..456d9c08b4c5f0f169949adea4f5ccb824e7647c 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 9871df4ff27ae7317e0fe7884ee7d6ebcb2f31d5..a2198bb9340da9581a8c905000fa03a74e9f607a 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 5914a071134c029b6bdcbff092cb751cb73a565a..70365ec6ddc1780929954a2b5efc57568beae9d0 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 59431583171d64fa06359cf55989c7db43ead986..e35fc8b05cc7020ce044ba7b2502e6797c7480b9 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 621910e1c9737a0a950c1ae0d3a38a2e54ca8fe4..53a3683a92bc5a34838cc243661a83c70cbad5f9 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 f794969f2925ce1b572cd0e5fc0e7099c9046bfe..10b49e38c1ba9d5c3ddf7b57f1f13eafc632ba54 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 d159741c268b4896a92a3cd6c68dd35883feb0af..eddcb662c94694c047c73b938bc402380274846e 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 0d9bac704017f85ba8f3f1b0062e9cac41b4be90..de41338ef6985351c2a735cdd2dbbe6724803b45 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 3ef6710acefe62f404cb00469292014cce595096..f610c6d1beb32d3eeeb8828d2a839f17d2ed11a4 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 bd273aa628aa6bc6028747ea4faaad220ca4a349..e7e74ff9fdba9c0887600a322397e40edf0e97af 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 5a523d38775ac69c9146dd319c0acc25735af3b3..a1420eaf220d58350042874c843c73a3fcc008ea 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 22ae9c4485e09e6152658a0f38abde76e24e8611..762bf5566583f9d3f1095bd454865c66cbce1490 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 a21be90687ec565a32c600a6ba4df5db11c4a499..4a01e4cee5a5590dd9e5952568fcfd0471d23722 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 b9e46c7d50183e9810d2f9291db0f9902d4d9f59..ffa4bc7208403abf71322678c334d209f6af2443 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 91cea265341c1f9d6cc78159982e007a4d5d1bed..e6ea9f945f081b01efc01661eef6ca2f7bab3053 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 55b2d5b45ec09674d59c2e6c28fb09961c0a9960..7d4726cc210db3cf5bd32387276a9868fcb0b541 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 e4d3404b24d54311a7100e27ac3d91bf514d3131..80086f8fdc875c34ff16e9c6d202f132a9c823ce 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 bbe870b10bf65aa8149811981cedd2e7e5d27b5b..936d3b42ed808c1091f2e9108f5527f2b4697d3f 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 921eeffce459c41e64b629e3f0e46f3fc9d61f88..fb62cc8c3b4054442e2a68359945dc0e4680ed35 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 28f9be18b1da9a3f524dc6d023dcdf7817f805f8..d676b5ee126af5839561b76156aa3570421c15b2 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 0b09213d953d357d642131eb00b9bc898d748cc2..04992c108cadf5b682602a6825ee12a189d415b6 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 c90437905c4d1fcc8709e29d1329d0f28359fdf5..df4d276d58a155669d89a095a879127a20303d1f 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 e0b9f789f7af09e049397e9a30a26bce6201905c..524b03d0903d25a9d2ba9bf0d73e5f394f454891 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 0d1334eb04891489335882655688ee71dfc193d1..ef92b6b218aea4143f27b780ba23e5c908f1eb06 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 24ea5543167f911498b175a0e962e29135bcb99d..6d18b3447c8bd622c89470cdff27745cc5b2d8d3 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 8d8ed716c19b98ed8708a7570f87fbf6340a1dad..e6c9d295e650eccc53a6ed41f18e04287370ea3f 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 c601f571fa2799bb461ea71a8bee75b788dc489a..2c9c1d999386cf20bd2ba111a4ae7ba67db05f9d 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 c1c7e48183d26673777af81b42f54589b2200df9..5eabbd2b79aee01406d6fa1e2857098b361c2eb3 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 96cab809663eedcfe6098315af86996c4cfd139f..64e2c5d9b99c66f929a5e896fda775bd993ad5b3 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 8155b2a5acf8c149d729e61a46f81b0e16844382..8128bb919de1581e07ed527de17e6adfaf92fccb 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 0657fa31156b2cdc97927ee3ea353cb1be6aacf1..edc614f209cf1e2a86fd381bcfdfbb4aa2da1581 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 107f47cdf0589ff593c191bca82157b012028a67..7c3528ef9fda05c22694addbd3473d78b1860a77 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 5b911ca5b747ccfd227671be4f3155beee0b7644..78bc24b2123b3d1f70d16668a23b35b2621a6ad2 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 a8eac7c20cc3d9eb8026fa68116e1ed146359a89..2e3eb934bab66a7d2143259113bf38550d5998b7 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 c45ac0b7546daef1e73483219572a2445cc26767..05133a2a91af99eee6865093dc2d34d163ee4bc8 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 e8c80cd5ae450713d202891d8060010d10dff78c..b11edcf222d4a0eaad4c31079724eac13a044aae 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 8ac905174d93beb653d8529ba190b7f0b09008ef..4c7c8a903b1dde829dbc8362fa7b4c835b83c023 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 df34718652a4e7d8b1ac74a0273452c289769b9e..c9167d93a27134d46a1bfe7072f48bacc7e9067c 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 633ed89f47be68ea92bfca014eba200a6433e5dd..ba55551b9d7931cd02b533baf854811863cc9da1 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 3903b6c3b8a5e0f2da13191d6c0e5c5707e67002..173f9f579dca40301d218e9b8e1c5710b85127b0 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 a51802928b1e1e19f2e4a45c0425353fd587ba38..985f51eedf90a56981e4df0dddc603a8bf19b128 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 06ffbfb7cb312287ddcab7ec8e1e8559ba272b6c..95eae29c19bf8a04b36b7903d89a91bd9143ae9c 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 2888d359734af1fa4e98eb531dac435e17bd54ac..b36bcb68a11b391d052aef2b705913d6a0bc881c 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 23b6a466f1e9b920f9882efda18b50fdfe7ac6f8..00cde50ed6f597bc372f246b48741d9a36dfa3bb 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 fe2fb3cdb468ccdbe97ee38d3146b1b4ac9dca4c..41fbb0e95111a08c28f0423ed7988e37346c7b67 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 04b8e374c620d4fe5309bda5d1bc270751d89088..0b0a78cf47a105b04906022b5fa32314471c3fb5 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 c2966a85f2d93c340e5718550e3ee96126fedb88..2a691a56a8acfab5d003b2a2c909a7883bbd8938 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 58290c7ccf3d00cbe2ec11b79c9c9f9692a1376b..6e73727428199ae2c4dacc9112fcc65ccef0a4e7 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 78b8df209bb830487f6c320fa9cce223a1ae7134..a1d711c813e4b68f4cd92faba5606d4e5aeca133 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 4906dde77b378564b5962ab4059131eab245e511..c3f22c785af8738e2dfe8c84b9ae03dd0a6b08dc 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 421369a237af58c971a29306259a9fe802182294..c57f446ff267924207e1755d3b77dcbcb9916063 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 914b732a64ae110bb8acb43f8edb2e454d9152fd..7a58799f99c61213da4846abe59173b1a4643721 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 7d7d140a515cde86eaacb86e50ba69b06094f32e..7d3f753ff9c1b517913221c332c34140e113df9b 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 22f1936e4f7898a737da48976bda49200f4033b4..d65a89fea336e8cb8cc46625a457172c8868c9e0 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 d263a556fad214ae2f8a6456566ac29f6b71780b..95274691c58d046bae3d8eeff8da6a79c7e31bc4 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 7748ecc92a41f86ac6785a1e74fbc4164ce5d98a..3c9c3ef304a90aa02fc49cff008626bd2812618f 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 3a8ca60d2dcc6aa65396c6e9b9064311b4ea92cb..3467f5ae48d68835a4478afcfc601391594d4139 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 69a8ab391549d2a27c4adf7eb851221cf1f81cbd..72b80694543c89c619aec7a461953f00d71ca64d 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 b5cf0b81e9e52f95bf6bc1a31a882d031adc21d5..d0c95e34808b0e4a0221a8e814eee582605b0888 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 fe39f195b53dd07cc4a21e57979e2ac82c4a4fd8..a6b7351af80e29db5cd5467e1c5ac806f8171f23 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 2ee792af93895c29154e3b3eaaaa28d98aa6bd3c..37fc4fa091ca603459363cc4169e2f6d35f799e7 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 7e71f8bf158cb8e61cd2c1cabbf56a294a6571d9..0481e7ecd47d25658e961f68ca93d289ea0dcce1 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 e883ff383362ecfb91fef9293a66c22e8f412bc9..d844efe8c95ed665b7d5cd1e8eea7219bb3780a3 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 872f565f0b6e31d9049b37758d60987592cf130c..047b370085b4fd92465adbeb0731b72ed585444b 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 14d4eb54782853846ddbbc393dbe011c0677a449..24a3a280fab5f1d23da2205593d7eccfe0f2b0eb 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 479b3d7ca376917aff1ad98e335280d52b05360f..e9b11dcc307dbf78766bf54d2cec9eb4880f671c 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 e5d8a3d328faca398bae62f7679ab007b73ed12e..97228220f6dc0436323f5c2df3429e491af04320 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 87ce411e611fb5ac39c039db271a8875f9b6a642..24562e193a9f696ecb72f47ac0e7f708cda50394 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 259467ace4ab2849280b597ca04aedfe0b9aa393..5f2f2c514c61bf2e68f6ba9fbc6c61dab2e732f1 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 3edbd466339b0a182891c03d58631c74e7a7eb92..a40990ede3af2ca03739ae6fc4e01093058fdc20 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 51c03dbf9ca33779e2597e4de10e5debd69205eb..b9eeccee62c1e5a774908738e6c081f1fb24339c 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 5c30e1c5e7a55f2bd599291dcd79aa922bfbac80..f07265a320df61bf578bcf83ea809e15a5d295d8 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 d6d5d5bcb07f5336df2b7471aea6c7b0f0d23a12..6bde704f2e6d38a6a8d73ad4e5714c66bb56a71d 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 54c9f860fe9e71f6b7054717891b0bbd5a743ee5..45a19408d42518d5280a94ca55ef5c09e8893691 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 7b095bb1f257e4495b7828b54a011e368daa3ad0..5324063bfd08c5685e88161025ab1e89f23f3cc0 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 2e5c76c29ff61e0923b273b9e65aae61bd98ec52..db54aa949833dfc19b8ad941904cb1e7f6350b3c 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 7756179b3249a6e6efc1eff859cefbd7da51fbc6..55fbfd462b6a79e148d7856a800938a5ba0d65fd 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 ac31086a689b3c461247a0febfc25870d938d52a..f097909bd75b63875451a99940412452037862d5 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 f2052a6d66c36ab24e6eb4890d613a0bbcedb9fe..06282c57275bdc26b6b4da9717a0d385dc4f3272 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 b26cde5b3469ce858e7473638add5d95dca7a9f0..e7ef21222f9664dda3eb9e02fd6da0db0106cd84 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 f53998425555bc5c2d8b86c5f0887eb07000260f..4e79359a76a4ad195e1ed213dea9f4d854516c37 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 4ab7626cd80441c07178973ec29f37472771a83d..0513c11271cef2c8d4e23bc558f9340bbcec512f 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 8327cf20a4e2502e6f86d964b65adc1fcf31775f..887eed229864f258be51e18d9d88b431eb1a9e75 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 e56f7f76fc09bb7a5f579efeef94b2a5d4d47913..e14761694ab5424bc831e38af60b6400d9483924 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 fc89d9efeeec5076e942edd1891eb2c3c65b8530..6d9a678aa9b38c66aff6334e52fdb1174c675eaf 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 c7cfa317402776713b30faba67df40ec5218bf86..1a19d76993e9a79e37d87b865d9dc8d6e4b2a124 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 e282d8b688b6a56ed46ac9d2ff0c3c1572d82d35..122e27d7f4f91da4c9e6812cb57aa321ae819914 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 f8ea864ff547c324b05764c35432997b92e5279f..60ecb831104fe6c42b36e77e7b9c93cea798c155 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 7d398c2eb43a154d121cf736f7ba2395310f873f..153235838bb445fb7ac0c32be661bb71298493ef 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 fcdc2a97173d97d600feb72296015f5b7bf0ae3c..65eb4b88e30f4923aee44cb6252b524d0d6a3bc1 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 7d75985cadc7c945be6dee044b8f11d25c8e1d04..39c7d5a9ae53efaca796d87457c752e57b2d8e76 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 8d8daf0b03b33ab4d44a980bdd2f238d3cbd94e8..1e68f9675ceb62cb8d330c695d0c48513df54118 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 095e2b313f4789d715fbb698c4c9dcd6b8dda178..0fa51d8cdfc017a05d63493ca20bcdfefd5bff1a 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 05d5302fdffec75cbe32d9c1a67381b9f6caef39..8ced30b87a0a709a66fd8594e542ea9db34f5056 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 8a1c230491864689ef70f8c84b0965666f754cf4..cbebce8b2399daaa17e063cf153887f32d7c42a3 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 d061d70ec3d81efb2331227ed7bc016b92ae788e..30765329d17a7b73c8f824d5084f702cd37da753 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 2eac55f190c23cd2067693835181d205d55262fb..2d40ec0e5671de8ea0770c3e751653560e959484 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 df7f8b33a548f6eaf4ca60d3cab1bdb9b6b9249e..7af9c1060089b55dcd3599ea497a9b2aacfad7b2 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 16d47f8ba7a53f63fd1a2c887fa2dd003bfedf77..5311aed268ee537d3669d940459dd4606032a959 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 9860b0ebd7f39dc2319628cacb0ea4d653becc6c..12b9cc5cee28e1efb8906aa381d86c55312e62e6 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 2cbd7f09c91c340f7f1d8eeb33f505270e351535..012333524a0862cdfa21dac79a424fdc928e311c 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 4cdc2fdca79292f4ca2e926649a39bc57b2c4829..34558c755cb56b87771a0413ae01acc62475d562 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 1ef5117c782709cd01735772f6b7d1fcff74f82d..4f96959c1fb4e7a06cdc852d1e06232bdf65e797 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 1e76720ecdfffef2d0dd92a25e850402774cf198..dc7d0918b5b005706f59cee64cd80873cb60e439 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 9d21297b04f324873bed7eca7b1da04cdf52b128..59b59e69dbedfda4a94719adf1456c49c29025db 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 9d1528dde9e3d6ea4707a90e0e078275f5549a11..bebcee11ec3407fce28e7ca1aab815f56979b110 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 330e711e68fe7d11d3a4bc3f1704aef20acf3957..5a1c5f8e24b121fe46d76e2a221ba87f381a2e10 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 534e434ecfe2f7fa7a5e452c493841054061b6d9..6298e88960bfa51457c227e6392c4bc5b2bd266c 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 e239de29bbacb50a70d4623d802da5b088695317..0f8b540f051f6202dfd04fb9a330b2aad270067f 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 fd7cf9f7bb35ccad473892736b53bf41baed917f..bf8aebb969236a07b4b641aad1c85121a94fd72e 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 e410881341d4d136d2fcfb4bf9cbfdd963b7dd1b..1f501cad11cee608933cb0f5a59f4af4c16e6ff4 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 59c07f8deaeada688fb1a66c8bbebe534bc0397d..acabb65bbed4f85d70db7cc2aad319125d75b582 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 7f16cecf4fb8783c6ae85a8dc096c4972b92da84..6274fb2ef8066f5fcabd2dfc0d7209abb8ceac28 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 c7a711fe3b8b18282374a112c5043dea49f16e04..ff64bc15c54602d078313ee46272e8fe1fdfd32a 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 1f10a0166bd0ba88792fb886e5a4f6a4d138d7c5..5dda1017760566ccacdde6c5fc2e9ab45095b9f6 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 35387df90ead673c8790db4243aa7516896ff4e7..2f7336fe25ec337f044578188030a71955ae8c34 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 2d7148a4dd5d0260559f20f4ffc3460ae1a4e833..f81290eaedaeadfc4524f30259cb9fc8c60f97d6 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 fc74544af57e7821621b1c12975c4621356e48f3..7da98f2cf04dddb4b57f54738c9b3c5524a045bd 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 12c9a1e99eb88173679a8696b80249c2657e3989..6c5c14d507dab8ebddc760624e70b3493512964c 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 e0e468c3c961cc63a742a1008397eb684b7a9326..db9f1a2a2e34bcb5613bfdb92db358632e503a8e 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 648475383427dc72c367384cc71cd9f09b7e3b95..9297fb3c057a5336e51603003ed00b9e2b73bc5a 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 814234cc301b88737cff6963f679b41725028497..eaadbb6475eb8f06cfb3ef8fed03d1b119f2c9d8 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 13fd684cbd17d62b4af470aec5738252d4381e98..7dadd1473f71f3bd7401744067762d3c1da629a0 100644
--- a/tests/test_bucket.c
+++ b/tests/test_bucket.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/stat.h>
 
diff --git a/tests/test_callerid.c b/tests/test_callerid.c
index d0788a4006fb621699cef97fa6968a3ed6ab1cde..5f7af2b6c831380582a9dcf71a52877943398f3c 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 7e1dcb00c860be97a355edbbc1bf32cb87f52292..9c982e28a061189dc6312347ff381a511b3c9001 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 7f77a1beeacc983bc3e8bc9d4ee7fbbb7f357760..71fc636fdf5fff1b6d04a710a39295815960708d 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 478cf36cf9564d79e57549c02037319f92432407..8faaf9fb244157ceee07f99fe916a2b61a8daa77 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 df618f9f77b69a91759de3bae7f062d242dee067..ad7ddcae514e9a05503a833903801c96ea9db254 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 499e633df7b18e83a4c629164d32338f9ded83aa..7e5677022c6e9b6b721aeabfdda5c91e4e00119e 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 a6614d6a30d4addfb215a3f27271e3f0fec5cf97..12e44d2d64e033576176d38e7c548fbdd2514c82 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 9e1b5cb606a19e1ec2632f3bbed76e8eb5ecf555..f4ce515847af2a06bf9e9e4fbb2ed20d28d94b28 100644
--- a/tests/test_db.c
+++ b/tests/test_db.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_devicestate.c b/tests/test_devicestate.c
index f7075b4269003e00f14052a2b7fe7141c315938c..531bf7a7bdadc749061f9b706edf6cd452041365 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 cba367f4cd98a87f1252525bde356eab4468ba06..a4495088aaa4adf74c8144de508d5ab419aa59a7 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 444786131a1bf4b7d8f39e5055dc79af593e7feb..b7a2efd57b7be4218545888453d8fb1c20ed2b61 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 ab6eab1cb1616f72caaa68241b1273c50360311c..0290a269761f60f753eeb4cea230fac4bfb51143 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 e29a6a5cf3fd16eff94b302614701591aaba731c..c215559f0d4b1297a33292497adfdceea984b2af 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 cc1696b70ad1786814d10a5d08be7ed8cbfb0bec..b01b0da1c701d2a6957973ecee28613112ff5f9d 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 38320e635c3db7f7111a6da24fe48944dab6338e..76b15495fd0d859e3c947bdf80c209bd4806e275 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 834907578a01e66ad331c8f2a2b11e325531501e..a1e71b2707d72ecb368da81449e94cbd9ab9f3f2 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 604d8e3011f77c18435d8d375342cc5a4d61eae3..c4b071ee29cdbe2638a5bf700bf6feb6c77e8da6 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 7379b956faf2babf5eec44de4ab0834e6f767a8a..2f043c7b2b6d8759fd34502408e16a4ef46192ae 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 cf1a914b00bd4bded5fba0f3f95146443f19ada2..76a6ecf3459433200265d4aa3c3a7662ce747e27 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 58dd46d610be173ef743939dfb1bdf16e4eb52a4..9f538ee09b6e5d14d52a7403d4e111c4e360c49b 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 9d624cdc6c10e9456ae1725aff7ebab5b6bd3c82..b8489947506a46fbe354b6ffb004194246441818 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 9edab942c67cb3f9a2873708a89d144a81909c9a..4a17e6730c1c7b235539c8ac8196509321a7b989 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 de14a08305188508b0d0147168b8a7f40d87a312..a39e2a981a8df74ba4e7096fe96a2040f6c80554 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 b0df4c606c361116038cbe2c22006bd7130205d8..1f7000a17f3a2a356bef8e696391a3b4eef6ea05 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 13e24a842831ef44171c7b2257897e72224cf414..7140b5f172ee191a8b087ed0a3466edfcdf27fb3 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 e182b0a75909fb4cc34740acfe73e1b269202036..638ff37ccb651e74dada7ae7545090387cfed0f1 100644
--- a/tests/test_netsock2.c
+++ b/tests/test_netsock2.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index 6a7d394c52a7ea52e32d51d555f3d790837c2baf..3867a557965f9aa5041ec59ceb2b5dd94e484c31 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 5e2e232edf8e5a5f7393b4b012a3eef5293b6944..388baa3f5b0f217487a8cbe8909674ad417a7750 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 755bb0f9e338ff8d63d4b26a17202ea278f8034b..e71913c93b7531c3a131ca6e3ec789e813e86aeb 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 5865f0951dd88179d254d99577bcb8181a8fd111..45e8f5ddd2b9097366d8322d6b66c0e9d16a4187 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 5ad2f5dde533c98af79e9fec77b0536a7d97ce3d..ec53ce888619207db62a6fdb668f8a9800477a44 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 72d6fb5d8b1f32584010fc8c41d355c5fd715886..bdca9b15705a1276b085d0732b096c123a0d101f 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 122003da353ac694b63c2a571de8d4f8a319c560..b5063d255e0835821a94e08e7506c50e917f2e57 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 9d32e3b8d9260b27ccb4710495e4319b383b782a..ce04c62cb038f9a6a1685e184525485e6f25e550 100644
--- a/tests/test_sorcery.c
+++ b/tests/test_sorcery.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_astdb.c b/tests/test_sorcery_astdb.c
index b87ed74f8686a60bce9c25ab91a381c97d0e3d8c..ce978342339b8351e34b2baacdbb9ad160a11f40 100644
--- a/tests/test_sorcery_astdb.c
+++ b/tests/test_sorcery_astdb.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_sorcery_realtime.c b/tests/test_sorcery_realtime.c
index ab9c1881489fa8448a3eb969964da2f7157f02b1..fe7ea52451e56f779f3f0159bb6d50795bba98cf 100644
--- a/tests/test_sorcery_realtime.c
+++ b/tests/test_sorcery_realtime.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 86b69cc329de34db45d7c803f9239571de45cdd9..f5d74a806e338c5c2756150c78187c39f5f15bf9 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 2a36c4f287497f5ea7c6b4adfa009b90d88c8fb0..91dfe09c6f3b74726421b860e94a27a3b1e651a2 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 7ac52917a80d1f214f790196ed70646162e424e5..2059c60b1cbaf425ead81a3ee3dd4dd294c14af2 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 4321d4a0392541a792ffd237c85af85c122682a7..31fb11abcbd9acdcd2e92c2e1362ae7e481dd046 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 46e8ce920ddf413a0760ddfb3cafb9c3f78bd5cd..c22f5e603d2a96b6290e05691859c3640101530b 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 ef6e95447bb0b967babb7bb7eb2dd95d3f8e2aaa..fcba960b9fdd8ed1a2516bd30a52ef60cd8c7768 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 92bbb70b0baf3ea6372e1b9e2da49793315e4a88..8a78644eaa2c4e4b13c89491cba6a35dfca5d764 100644
--- a/tests/test_uri.c
+++ b/tests/test_uri.c
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_utils.c b/tests/test_utils.c
index e4f6e0a52435a8a854fb0d3f3212676d89b21aea..abb0c3395b8b356321476229f2a6f566ba119efe 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 4e0eb0878d419fd91093a35446b654ae12685531..e13b304d4c222adedf4c8e598b5a85cd28feb4cc 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 dcf1a1773c81ce03e920b89ef025d57b4b13879e..ca8cb85ac89ace2e563908d44ea64af3f9ff31df 100644
--- a/tests/test_websocket_client.c
+++ b/tests/test_websocket_client.c
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/test.h"
 #include "asterisk/module.h"
diff --git a/tests/test_xml_escape.c b/tests/test_xml_escape.c
index e4c36de912891982c46e6a134303f7aa8fd69f13..5e6abc72ee989ff3dfbf2325a48d835bed05c871 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 86588ee4b0bd5951b54f7b4151751a4a2fc33272..2237625970fc1d54daee97e52e06d5cb3f5c8ded 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -18,7 +18,7 @@
 #include <regex.h>
 #include <limits.h>
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/backtrace.h"
 #include "asterisk/channel.h"
@@ -33,8 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 int option_debug = 0;
 int option_verbose = 0;
 #if !defined(LOW_MEMORY)
-void ast_register_file_version(const char *file, const char *version) { }
-void ast_unregister_file_version(const char *file) { }
+void __ast_register_file(const char *file) { }
+void __ast_unregister_file(const char *file) { }
 #endif
 
 /*** MODULEINFO
diff --git a/utils/astdb2sqlite3.c b/utils/astdb2sqlite3.c
index ba35f9360cce6a2eed2ae14df150f9d7f4e3d101..38080e84d27f016412fa2a3eb458b2159361de6d 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 315b3b065ba2978eb898071f09a1fc1f1fea3838..0099a13f63d2f7233fddbf387d17f4c83919ca3d 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -27,8 +27,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk.h"
+ASTERISK_REGISTER_FILE()
 
 #include <newt.h>
 #include <stdio.h>
@@ -89,13 +88,13 @@ struct ast_chan {
 static AST_LIST_HEAD_NOLOCK_STATIC(chans, ast_chan);
 
 /* dummy functions to be compatible with the Asterisk core for md5.c */
-void ast_register_file_version(const char *file, const char *version);
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file)
 {
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 
diff --git a/utils/check_expr.c b/utils/check_expr.c
index 6cd535df25f49212602d73fe6a8b6d79c03c7061..de668f6917e9d99ebae20553edeb8f25bf5ded00 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -21,7 +21,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/ast_expr.h"
 
@@ -152,8 +152,6 @@ void ast_log(int level, const char *file, int line, const char *function, const
 	fflush(stdout);
 	va_end(vars);
 }
-//void ast_register_file_version(const char *file, const char *version);
-//void ast_unregister_file_version(const char *file);
 
 char *find_var(const char *varname);
 void set_var(const char *varname, const char *varval);
@@ -161,8 +159,8 @@ unsigned int check_expr(char* buffer, char* error_report);
 int check_eval(char *buffer, char *error_report);
 void parse_file(const char *fname);
 
-void ast_register_file_version(const char *file, const char *version);  
-void ast_register_file_version(const char *file, const char *version) { }
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file) { }
 #if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale) { return 0;} 
 #endif
@@ -174,8 +172,8 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
         return ret;
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 5d36f4231abbe07537bc633c88d38565719d75ef..99304b2f5abe1de92e5125f3f656b3c8b47c290d 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -28,7 +28,7 @@
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/paths.h"	/* CONFIG_DIR */
 #include <locale.h>
@@ -79,13 +79,13 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void ast_register_file_version(const char *file, const char *version);
-void ast_register_file_version(const char *file, const char *version)
+void __ast_register_file(const char *file);
+void __ast_register_file(const char *file)
 {
 }
 
-void ast_unregister_file_version(const char *file);
-void ast_unregister_file_version(const char *file)
+void __ast_unregister_file(const char *file);
+void __ast_unregister_file(const char *file)
 {
 }
 #if !defined(LOW_MEMORY)