the last round of file version tags

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5867 f38db490-d61c-443f-a65b-d21fe96a405b

81 files changed, 733 insertions, 366 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index fbd6c927e..2dee63fdd 100755
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -12,15 +12,6 @@
  */
 
 #include <sys/types.h>
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/adsi.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -32,6 +23,18 @@
 
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/adsi.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+
 static char *tdesc = "Asterisk ADSI Programming Application";
 
 static char *app = "ADSIProg";
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 59486972f..324d656ce 100755
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -18,6 +18,18 @@
  *
  */ 
  
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -33,13 +45,6 @@
 #include "asterisk/localtime.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <sys/time.h>
 
 #define ALMRCV_CONFIG "alarmreceiver.conf"
 #define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index e64b5147b..d1383eb85 100755
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,12 +30,6 @@
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 static char *tdesc = "Authentication Application";
 
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 8e6752ac6..9d9bfdef8 100755
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -12,10 +12,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include <stdlib.h>
 
 
 static char *tdesc = "Make sure asterisk doesn't save CDR for a certain call";
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 4047f6ba9..1fe374108 100755
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -13,6 +13,17 @@
  *
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,12 +31,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
 
 static char *tdesc = "Check if channel is available";
 
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 656b76947..7ed00cd31 100755
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -17,6 +17,9 @@
 #include <ctype.h>
 
 #include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 02a1cd384..30b5c9042 100755
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Control Playback Application";
 
diff --git a/apps/app_curl.c b/apps/app_curl.c
index f81071aa8..572622bae 100755
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -12,6 +12,14 @@
  * redistribution.
  */
  
+#include <stdlib.h>
+#include <string.h>
+#include <curl/curl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,9 +28,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <string.h>
-#include <curl/curl.h>
 
 static char *tdesc = "Load external URL";
 
diff --git a/apps/app_cut.c b/apps/app_cut.c
index 359c286ac..b5d9e932c 100755
--- a/apps/app_cut.c
+++ b/apps/app_cut.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_datetime.c b/apps/app_datetime.c
index 470a4fbee..994102c9f 100755
--- a/apps/app_datetime.c
+++ b/apps/app_datetime.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,10 +26,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/say.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Date and Time";
 
diff --git a/apps/app_db.c b/apps/app_db.c
index d1677b858..1cbbd9dc8 100755
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -17,6 +17,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 12794ef76..e9976375a 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -11,6 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/signal.h>
+#include <netinet/in.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -28,15 +42,6 @@
 #include "asterisk/app.h"
 #include "asterisk/causes.h"
 #include "asterisk/manager.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <netinet/in.h>
 
 static char *tdesc = "Dialing Application";
 
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 531efaa60..76ee092c7 100755
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -17,6 +17,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>	/* for mkdir */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -25,7 +30,6 @@
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include "asterisk.h"
 
 static char *tdesc = "Virtual Dictation Machine";
 static char *app = "Dictate";
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 870fd5a69..1e451ee2e 100755
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -11,6 +11,15 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,11 +29,6 @@
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "asterisk.h"
 
 static char *tdesc = "Extension Directory";
 static char *app = "Directory";
diff --git a/apps/app_disa.c b/apps/app_disa.c
index ee5985649..200764478 100755
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -13,6 +13,16 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -24,12 +34,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/callerid.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <sys/time.h>
-
 
 static char *tdesc = "DISA (Direct Inward System Access) Application";
 
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 82c573dde..6b43bfa5d 100755
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -11,6 +11,14 @@
  * the GNU General Public License (and disclaimed to Digium)
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -20,9 +28,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "Dump Info About The Calling Channel";
 static char *app = "DumpChan";
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 425e0e596..b3ba0eb71 100755
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -11,16 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Simple Echo Application";
 
diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c
index 717e3f3fe..f0feaeab8 100755
--- a/apps/app_enumlookup.c
+++ b/apps/app_enumlookup.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,11 +31,6 @@
 #include "asterisk/module.h"
 #include "asterisk/enum.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "ENUM Lookup";
 
diff --git a/apps/app_eval.c b/apps/app_eval.c
index 73b99c085..c1f646b0f 100755
--- a/apps/app_eval.c
+++ b/apps/app_eval.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index d07b00709..49ce3e41d 100755
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 44dbd9ca4..cbe17866c 100755
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -12,15 +12,6 @@
  */
 
 #include <sys/types.h>
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/md5.h"
-#include "asterisk/config.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -37,6 +28,19 @@
 #include <fcntl.h>
 #include <ctype.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/md5.h"
+#include "asterisk/config.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 #define FESTIVAL_CONFIG "festival.conf"
 
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 7514ef0bf..dda5bcca6 100755
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -14,6 +14,17 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -23,12 +34,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/options.h"
-#include <sys/ioctl.h>
-#ifdef __linux__
-#include <linux/zaptel.h>
-#else
-#include <zaptel.h>
-#endif /* __linux__ */
 
 static char *tdesc = "Flash zap trunk application";
 
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index a398333ce..1452b0e4b 100755
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -9,16 +9,21 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
 
 static char *tdesc = "Fork The CDR into 2 separate entities.";
 static char *app = "ForkCDR";
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 2095498e6..1c0277489 100755
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,10 +27,6 @@
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
 #include "asterisk/options.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Get ADSI CPE ID";
 
diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index d17521001..d9a841f5d 100755
--- a/apps/app_groupcount.c
+++ b/apps/app_groupcount.c
@@ -18,6 +18,10 @@
 #include <sys/types.h>
 #include <regex.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index 7dc3980a4..08bcc7ac7 100755
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -32,6 +32,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -39,13 +48,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dirent.h>
-
-#include "asterisk.h"
 
 static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder.";
 static char *app_hasvoicemail = "HasVoicemail";
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 6e1629d41..ae9e23869 100755
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -27,8 +19,20 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <errno.h>
+
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #define ICES "/usr/bin/ices"
 #define LOCAL_ICES "/usr/local/bin/ices"
 
diff --git a/apps/app_image.c b/apps/app_image.c
index 44ed0b85a..9c0d05c55 100755
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Image Transmission Application";
 
diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 53a6ec45d..e1199979a 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/frame.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
@@ -35,6 +27,19 @@
 #include <soundcard.h>
 #endif
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/frame.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #ifdef __OpenBSD__
 #define DEV_DSP "/dev/audio"
 #else
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 420225a32..fb16d406b 100755
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -18,9 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "IVR Demo Application";
 static char *app = "IVRDemo";
diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index 42bc18e1a..278f27452 100755
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Look up Caller*ID name/number from blacklist database";
 
diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index f41411ae0..beaf02aed 100755
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Look up CallerID Name from local database";
 
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 43ad36836..25d2aa864 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -12,6 +12,14 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -21,10 +29,6 @@
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 #define MAX_ARGS 80
 
diff --git a/apps/app_math.c b/apps/app_math.c
index 9d040ff5e..fad0ad7e6 100755
--- a/apps/app_math.c
+++ b/apps/app_math.c
@@ -9,6 +9,24 @@
  *
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <sys/file.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -23,22 +41,8 @@
 #include "asterisk/localtime.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <dirent.h>
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <ctype.h>
-#include <sys/file.h>
-#include "asterisk.h"
 
 static char *tdesc = "Basic Math Functions";
 
diff --git a/apps/app_md5.c b/apps/app_md5.c
index 369e683b2..0e92c1c99 100755
--- a/apps/app_md5.c
+++ b/apps/app_md5.c
@@ -9,6 +9,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/utils.h"
@@ -17,9 +25,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc_md5 = "MD5 checksum applications";
 static char *app_md5 = "MD5";
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c7b1c920d..ab33c0590 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -11,6 +11,22 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -26,19 +42,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include "asterisk.h"
-
-#ifdef __linux__
-#include <linux/zaptel.h>
-#else
-#include <zaptel.h>
-#endif /* __linux__ */
 
 static char *tdesc = "MeetMe conference bridge";
 
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 4f729cd9f..d7e5c0e5f 100755
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -11,17 +11,22 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 static char *tdesc = "Digital Milliwatt (mu-law) Test Application";
 
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 4a4bcf0b5..1b21d333f 100755
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -11,6 +11,18 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,13 +31,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 13f3e7ae9..aa5e44d8e 100755
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -28,6 +20,19 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
 #define NBSCAT "/usr/bin/nbscat8k"
 
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index de08e4469..72eded69e 100755
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -11,6 +11,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,11 +31,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astosp.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "OSP Lookup";
 
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 0c8e71945..37227b8fd 100755
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -15,6 +15,14 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -26,11 +34,6 @@
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
 static char *tdesc = "Call Parking and Announce Application";
 
 static char *app = "ParkAndAnnounce";
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 26b204605..7e7cabe5b 100755
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Sound File Playback Application";
 
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 7eab0dd39..cb2bb01f7 100755
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
@@ -24,8 +31,6 @@
 #include "asterisk/callerid.h"
 #include "asterisk/app.h"
 #include "asterisk/config.h"
-#include <string.h>
-#include <stdlib.h>
 
 #define PRIV_CONFIG "privacy.conf"
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0e759aa24..c4f2de1f9 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -39,6 +39,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/signal.h>
+#include <netinet/in.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -57,17 +71,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astdb.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <netinet/in.h>
-
-#include "asterisk.h"
 
 #define QUEUE_STRATEGY_RINGALL		0
 #define QUEUE_STRATEGY_ROUNDROBIN	1
diff --git a/apps/app_random.c b/apps/app_random.c
index d49af9fdd..70f77998c 100755
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -11,17 +11,21 @@
  *
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 
 static char *tdesc = "Random goto";
 
diff --git a/apps/app_read.c b/apps/app_read.c
index 6f63d2dac..0f0ab3752 100755
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Read Variable Application";
 
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 5e09efce4..733dd108c 100755
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -16,6 +16,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_realtime.c b/apps/app_realtime.c
index 6ae64f5c4..d4ded9c20 100755
--- a/apps/app_realtime.c
+++ b/apps/app_realtime.c
@@ -12,6 +12,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -21,9 +29,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #define next_one(var) var = var->next
 #define crop_data(str) { *(str) = '\0' ; (str)++; }
diff --git a/apps/app_record.c b/apps/app_record.c
index 41088182d..c5da8f910 100755
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/dsp.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Trivial Record Application";
 
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 44f6a802d..f04ce56cc 100755
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -120,20 +120,6 @@ enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT};
 
 enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
 
-#include <asterisk/utils.h>
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/callerid.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/options.h>
-#include <asterisk/cli.h>
-#include <asterisk/config.h>
-#include <asterisk/say.h>
-#include <asterisk/localtime.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -154,6 +140,25 @@ enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
 #include <tonezone.h>
 #include <linux/zaptel.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/callerid.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/options.h"
+#include "asterisk/cli.h"
+#include "asterisk/config.h"
+#include "asterisk/say.h"
+#include "asterisk/localtime.h"
+
 static  char *tdesc = "Radio Repeater / Remote Base  version 0.24  05/15/2005";
 
 static char *app = "Rpt";
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 05b08597f..a641779d4 100755
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -15,6 +15,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index d74a8b4ad..c707d82b6 100755
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send DTMF digits Application";
 
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 391b2b2a2..3f935b821 100755
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send Text Applications";
 
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 86cf9bd03..68e9653bd 100755
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *app2 = "SetCallerPres";
 
diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c
index 7e820db12..39c17de39 100755
--- a/apps/app_setcdruserfield.c
+++ b/apps/app_setcdruserfield.c
@@ -12,6 +12,13 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
@@ -20,8 +27,6 @@
 #include "asterisk/config.h"
 #include "asterisk/manager.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <string.h>
 
 
 static char *tdesc = "CDR user field apps";
diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c
index 9a8dc2baa..20cb23e3f 100755
--- a/apps/app_setcidname.c
+++ b/apps/app_setcidname.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set CallerID Name";
 
diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c
index 481c1dc5d..516997943 100755
--- a/apps/app_setcidnum.c
+++ b/apps/app_setcidnum.c
@@ -12,6 +12,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set CallerID Number";
 
diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c
index 0192973cb..542f03998 100755
--- a/apps/app_setrdnis.c
+++ b/apps/app_setrdnis.c
@@ -12,6 +12,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set RDNIS Number";
 
diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c
index 6a57c590f..d9c6dc5f8 100755
--- a/apps/app_settransfercapability.c
+++ b/apps/app_settransfercapability.c
@@ -11,15 +11,19 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/transcap.h"
-#include <string.h>
-#include <stdlib.h>
-#include "asterisk/transcap.h"
 
 
 static char *app = "SetTransferCapability";
diff --git a/apps/app_skel.c b/apps/app_skel.c
index f1910a573..ecd54aea5 100755
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -18,9 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "Trivial skeleton Application";
 static char *app = "skel";
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 93b7d15c2..d677ffb24 100755
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -9,26 +9,29 @@
  * the GNU General Public License
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/options.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/alaw.h"
-#include "asterisk/callerid.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <ctype.h>
+
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/alaw.h"
+#include "asterisk/callerid.h"
+
 /* output using Alaw rather than linear */
 /* #define OUTALAW */
 
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 124f270c6..14b711d5b 100755
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -12,16 +12,20 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *synopsis = "Soft Hangup Application";
 
diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c
index 3185dad50..e891cd3c7 100755
--- a/apps/app_sql_postgres.c
+++ b/apps/app_sql_postgres.c
@@ -11,6 +11,17 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,13 +30,7 @@
 #include "asterisk/linkedlists.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
+
 #include "libpq-fe.h"
 
 #define EXTRA_LOG 0
diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c
index cc23309ab..0e94e56c6 100755
--- a/apps/app_striplsd.c
+++ b/apps/app_striplsd.c
@@ -11,17 +11,21 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Strip trailing digits";
 
diff --git a/apps/app_substring.c b/apps/app_substring.c
index 5f0609ef5..a92f37573 100755
--- a/apps/app_substring.c
+++ b/apps/app_substring.c
@@ -12,6 +12,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,10 +28,6 @@
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "(Deprecated) Save substring digits in a given variable";
 
diff --git a/apps/app_system.c b/apps/app_system.c
index ace307333..d1ec12082 100755
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,11 +28,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 static char *tdesc = "Generic System() application";
 
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 4d4d2662d..52aaa7839 100755
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/dsp.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Playback with Talk Detection";
 
diff --git a/apps/app_test.c b/apps/app_test.c
index 2d9a075a2..bbb54c192 100755
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -14,6 +14,15 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
@@ -22,12 +31,6 @@
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include "asterisk.h"
-
 
 static char *tdesc = "Interface Test Application";
 
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 517a2c4b9..c56385beb 100755
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -11,16 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Transfer";
 
diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c
index dc39106de..e357e9a3b 100755
--- a/apps/app_txtcidname.c
+++ b/apps/app_txtcidname.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,11 +31,6 @@
 #include "asterisk/module.h"
 #include "asterisk/enum.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "TXTCIDName";
 
diff --git a/apps/app_url.c b/apps/app_url.c
index df63a0803..4066b8dfd 100755
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send URL Applications";
 
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 71890be73..6830750f5 100755
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -8,6 +8,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -15,10 +24,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/manager.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Custom User Event Application";
 
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 5d767b9b0..2ab50b635 100755
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -15,6 +15,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 57f06e1df..084dc61e1 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -15,6 +15,23 @@
  * 05-10 - 2005 : Support for Swedish and Norwegian added by Daniel Nylander, http://www.danielnylander.se/
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <time.h>
+#include <dirent.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -34,20 +51,6 @@
 #ifdef USE_ODBC_STORAGE
 #include "asterisk/res_odbc.h"
 #endif
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <dirent.h>
-
-#include "asterisk.h"
 
 #define COMMAND_TIMEOUT 5000
 
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 93dec96d7..038defd66 100755
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -11,7 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,10 +28,6 @@
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *synopsis = "Wait for Ring Application";
 
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index b1294c179..327201799 100755
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -17,6 +17,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -24,10 +33,6 @@
 #include "asterisk/dsp.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
 
 static char *tdesc = "Wait For Silence";
 static char *app = "WaitForSilence";
diff --git a/apps/app_while.c b/apps/app_while.c
index 71e821adc..5eb5999ad 100755
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,9 +27,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #define ALL_DONE(u,ret) {LOCAL_USER_REMOVE(u); return ret;}
 
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 38ec03fe5..53c79ca8e 100755
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,8 +25,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Block Telemarketers with Special Information Tone";
 
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index dc02f8a12..88b246618 100755
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -14,18 +14,6 @@
  * GPL application.
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/config.h"
-#include "asterisk/app.h"
-#include "asterisk/options.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
-#include "asterisk/utils.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -39,6 +27,23 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/app.h"
+#include "asterisk/options.h"
+#include "asterisk/cli.h"
+#include "asterisk/say.h"
+#include "asterisk/utils.h"
+
 static char *tdesc = "Barge in on Zap channel application";
 
 static char *app = "ZapBarge";
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 517bbb50e..69900ea44 100755
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -11,13 +11,6 @@
  * the GNU General Public License
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/options.h"
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef __linux__
@@ -41,6 +34,18 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+
 static char *tdesc = "Zap RAS Application";
 
 static char *app = "ZapRAS";
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 9b153ed26..a6480cb9a 100755
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -16,18 +16,6 @@
  * GPL application.
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/config.h"
-#include "asterisk/app.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -41,6 +29,23 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/app.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/cli.h"
+#include "asterisk/say.h"
+
 static char *tdesc = "Scan Zap channels application";
 
 static char *app = "ZapScan";