diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index fbd6c927ee4414bc540ef31eeb582a73e587565b..2dee63fdd1ab157fe1120d095dbac4720b944a41 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 59486972f349f4ab04fa80219f517c65cf3ae3b6..324d656ce913ae517e1b7852fc453dc02fd57ffd 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 e64b5147b362cf29b533fe03dcd575693129fa8f..d1383eb857df5d00a3687e08e5ffb683f9adf6c0 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 8e6752ac6d0ce4f575b26d31ae7e1cfa599b9835..9d9bfdef859cd258e3af9a99ff9b6c9a5dc68f70 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 4047f6ba9b62e2b77e6ef73f31bd349150250316..1fe374108cbfc4999afcd7c8ddb0389b4b8cedef 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 656b76947aacd79ac543e185c87d3c28bd0cc249..7ed00cd3133bcbeac603e88b5a5a7ce5256891c2 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 02a1cd384e37c36fe75c4f70af4e075661660db5..30b5c9042e065838cfbb5ec61737061113acfcc7 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 f81071aa8489549567ef06714cfb31970e48c21e..572622bae1bf4fd04fb807f5c6d943c5f0d3af4c 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 359c286ac7b207e72a8503d09171a96e5a9d7e56..b5d9e932cf9ddce159438609f786d42431b3785c 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 470a4fbeec2e35f5939edbee603acfb341e9c2b9..994102c9fc148caf1704a2348b5dac442c82b2ff 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 d1677b858e057946d3ed4e8bec51bb73dbc48a2d..1cbbd9dc82a0034a5e9c1adea00b8f0bbda46dcf 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 12794ef76ca0758a40c65fa5e290050cfd133dc5..e9976375a002d76ee0f989d6f3a473027ff86680 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 531efaa601705cfd3fb6516d48a3b177fed7b920..76ee092c73180fe0ea5a4806e8adcb07c77e4f3b 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 870fd5a690deb4f8fe22e1e8ae18db2dde09816e..1e451ee2eaaa1a16885b4fd4cb5d7c9f8fe91917 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 ee5985649e4e433a8b6eaf72fd8f3bd637922df9..200764478d4989d4fa89f7fa502042873f039346 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 82c573ddefabfc170fdabdc074f5af2245a91971..6b43bfa5d05b05ecdd7d0e01afad28695a85413d 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 425e0e596b297091bdb9ffb6bcfd263f0ee2ff9e..b3ba0eb7127cd9142ecd2f8d23fc6bcf7bfcafba 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 717e3f3fe6e843a459fd7515dee85fdbb841258e..f0feaeab8de4e15cf77c21134d11b60b3d21867f 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 73b99c085ff6e4eadf5588e0ae21ebeb3bf2eb6c..c1f646b0fac7274c34fe66e27ac57701a9111864 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 d07b0070919ffe3ca11d0324919a9bdb3858f134..49ce3e41d47a39e902ab2fd540d23166981d78b7 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 44dbd9ca4504f92571b009f5a0cda5dbfbb24637..cbe17866c5381d7b94ebaefd60c71fbb4f7c47d6 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 7514ef0bf7b1ad73e4239450e0d2057a4bc43be4..dda5bcca654627fb1e32cb576b56dfde36a0d063 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 a398333ce65689acb7cdfcab31a4cb75777dd5b6..1452b0e4b0e72efd52c24319d50f2220aacef725 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 2095498e69a1597fc9e40cd66f41a1424e4b3849..1c0277489b6a7056aed73bc637abefcdd267666e 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 d17521001deee5eee0fb9d4b547571cdb70f20e6..d9a841f5d8102bcbb81b6a99a7faeefdd84936f8 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 7dc3980a49fa47d56d6506ca1d92a4494459ff70..08bcc7ac7b422afdeeae2c004cd00f2b62b2680c 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 6e1629d4102cc56cf8c2346fa3f4e23dd518f38a..ae9e238696dc688448d52d6976aff862901d9d32 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 44ed0b85a02596679e892d25efd3ef766d85f0e4..9c0d05c55fee2d182e08cc5501e73afc68af2b88 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 53a6ec45d2f259710b818034110682ba9cc89316..e1199979adb26b4df410a6b011e2fd7945e29dac 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 420225a32fe7d3382442df16e4a0e3be9365b849..fb16d406b910cfb5f87671bf4dd14923ed5d19f9 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 42bc18e1a58469f95940a55c5c890fbe7a4a4c66..278f27452ba8c931e591d1ebac449a875bfc807b 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 f41411ae04ee051477576b1f4951ab333de02516..beaf02aedb44d147df85135cfbea8afc42350e82 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 43ad3683661f085b87fef4d3cd53ddf1dc0d4369..25d2aa8642d9ed2fa28b3778c68a766c8240a0ab 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 9d040ff5e70647f7dbbc39ca0c5fbcf16d0421f0..fad0ad7e652169b03389b05c093ad2da2e91ee84 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 369e683b2fee7badbeea008b0834f4158dd50ddc..0e92c1c9914fd87ba7e211fd015662928d14e90f 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 c7b1c920d9b5dd9b57f22c29ffae8ace6b49c10a..ab33c0590033f44841d3148c222d70edcf5f3440 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 4f729cd9ff37139743fa794e6deb8a3083b1a38b..d7e5c0e5fabda2a564ae4ff7c7c924e679ce9808 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 4a4bcf0b5a7195d52f7c2b6f597ea3ce511d281a..1b21d333fccc27395de62698a3505f7f7fce44b1 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 13f3e7ae908cb740dabac3b79f3e8f3d40bb09d7..aa5e44d8ecf07990c0c06d35ce5a14535366550a 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 de08e44694ef5cd0be8247fc353b48f16b5bee16..72eded69ec7032990eda8ccd9883800177c6b428 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 0c8e71945ad8285d59665ed761593b1b2301adbf..37227b8fdb939bc6fe844c54dabc8e1ae00e68d0 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 26b204605dc3bac1b05b22e806d0df8f892e304d..7e7cabe5be560cb002d534d0ca099be07eb3b298 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 7eab0dd392c40493faeecff810028e660b6be173..cb2bb01f7e2828fa4203c48d2604600cee76a547 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 0e759aa24a004988cd41064a3b02a544cf7f8ab1..c4f2de1f98951097e655909f0dae31bddb05c008 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 d49af9fdd9f52d8f2087b96cc58b144dd2a8187f..70f77998c7af2a819f40b1ef0615fc3f7967f0d4 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 6f63d2dacece53213fb427e6ac21d8595f2f7ad4..0f0ab3752e59727e33dbb5e256983a2180c6206a 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 5e09efce4237bd3850040a6e45f19975ce7f431a..733dd108ce027f3f9b5e985fe6a1b6dc7142dc7f 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 6ae64f5c4d15b0b658ea9afd2b9726ea01f75ea3..d4ded9c2084cdc57f1fa6c6a14dde338256c5c55 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 41088182d547becef9933944b185b23a4ed34cf5..c5da8f91027d7bfcd2f3446ed700b664a4506473 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 44f6a802d5a58429ff9d88841915f74633c38840..f04ce56cc111786fbb2a189897db9fa07ce9f626 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 05b08597f85d559aa97c20aedab203ec4eac2763..a641779d422c93547587f18b25bb439f0685ba30 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 d74a8b4ad002b99fd30a18cabe6847b0b91f0d68..c707d82b62c7e20806c9820308109bf8571726ee 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 391b2b2a2d1e52fd5ef56778e32a065483831971..3f935b8218d08105d5e4278af59c6fb5e9e1f40a 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 86cf9bd031598f0e08a3a3a86e6186767ce66751..68e9653bd9e0341c24ce2ddc583166ec5326ad8f 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 7e820db12f2ceafc07c478c955c34a6be07d9abf..39c17de39b2c3b2e52749b1e6dfbb7e1b962fe69 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 9a8dc2baa9d4c4512d962bc857be0e2572bfa8ae..20cb23e3f9673cbb11140706906d0f36f657f2ba 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 481c1dc5d777c90059c75147f25a1bc3ab0c30fe..51699794331627992a35917573303d51ace784ab 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 0192973cbcd3f546504d145d8a5a3bf7db8abd41..542f039983cd495fa001a5cc4f3a2d03cc874c6c 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 6a57c590ffa1711842c375b1a3bf301afdbd0c83..d9c6dc5f81d18f341a7d30e57b1fc3a688f0812c 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 f1910a573b9d224c776551af3065ac1b267dcb99..ecd54aea5270ad988ebaadc83c266b4a065a8ade 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 93b7d15c2e10ed2b580d855dbbd906836e97cfd7..d677ffb244dd1b11c24e83dcc6b5a5703f44b6bb 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 124f270c6c9fa08230f5e5eeba7d1b26036a9a75..14b711d5b6274ea440306ca02a0e910185ddabe0 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 3185dad50501f5e9c240259ca274f40ff1030b13..e891cd3c7f66d2ec0d64852d9099818e548264a6 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 cc23309ab3a576429326674e4d7ad92f197391db..0e94e56c641186408e7dd6ac34ff6ae5dcf39b87 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 5f0609ef550b9f6dc2ed090a6f7e81f04dff3dbb..a92f375738a4c62da5de910193583e13dae64559 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 ace3073330f26e281b6ae82a0f98891245106966..d1ec12082d15a5dc2d5ae29cd2a172e259e8dffe 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 4d4d2662d35d0688b2431be6f9cdca01461744d8..52aaa783983e0cc4515a60fe2faf1411aa08f8c2 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 2d9a075a2415172ba5e8b191a8f198f04f6c6038..bbb54c192e104201f27ae38848d6ef385d0d3ff4 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 517a2c4b971a73743f0fcf73b869fc3b24643756..c56385beb6651acbd60ae1d5147845486fc7cbd5 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 dc39106de533c0f31c44abd5b793b138975f5715..e357e9a3b2c20a8c4b51f72fee76a2ff8bc35f1b 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 df63a0803d0c5e8fa5c81916f3e4795cfeb46d46..4066b8dfd608d82931a7aea73f975ab2acc6e376 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 71890be733f6f8dda361a81465c5dc66ac34fd6c..6830750f555e1ed257938dd8358fdcc9b22fab07 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 5d767b9b0b748ab6955230669dab5d96bdd3e103..2ab50b6358c11f9f8628517ff861081ba61a9817 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 57f06e1dfe9ccf196f813b1ec7ec471c16bb9fba..084dc61e1de9f02b26813490b764976d0a0f359d 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 93dec96d70e07b37aa135ce6223863b7f644f868..038defd66e9836d91aa79789cbe410301dc6b4f9 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 b1294c1791932c22c3689561e7e050b2a06da192..32720179964e3f7c75fc32e7f9954acb67de0a16 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 71e821adc1879a87d13d37930f8d37952c920277..5eb5999ad12a1067b14c23dd55416eaf5b0d01b3 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 38ec03fe598f1b21719179321c635029f6c2dc20..53c79ca8e804402b3f289aaa65878bbda5a28f93 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 dc02f8a12f9edfc17d6d5ca1891f570201448fa2..88b246618119eb827de5ea92de902586838c5186 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 517bbb50ecf367c481af55b19ca0d8a17a8c3dd9..69900ea442b69b90beec4666b9acad317678c2ab 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 9b153ed26ddd46ced7e594d13b568d18936e8e7f..a6480cb9a07c371f38bc5bb5d77bb8f4d2eed619 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";
diff --git a/asterisk.c b/asterisk.c
index 19534eaed3312cd71cb87f5c14f328189c1ce001..52992fc7cff2f2298d6eacc73ab598bb8fb301b9 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -210,6 +210,7 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
 	struct file_version *iterator;
 	regex_t regexbuf;
 	int havepattern = 0;
+	int havename = 0;
 
 	switch (argc) {
 	case 5:
@@ -220,6 +221,9 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
 		} else
 			return RESULT_SHOWUSAGE;
 		break;
+	case 4:
+		havename = 1;
+		break;
 	case 3:
 		break;
 	default:
@@ -230,10 +234,16 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
 	ast_cli(fd, FORMAT, "----", "--------");
 	AST_LIST_LOCK(&file_versions);
 	AST_LIST_TRAVERSE(&file_versions, iterator, list) {
+		if (havename && strcasecmp(iterator->file, argv[3]))
+			continue;
+
 		if (havepattern && regexec(&regexbuf, iterator->file, 0, NULL, 0))
 			continue;
 
 		ast_cli(fd, FORMAT, iterator->file, iterator->version);
+
+		if (havename)
+			break;
 	}
 	AST_LIST_UNLOCK(&file_versions);