simplify autoconfig include mechanism (make tholo happy he can use lint again :-)

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

74 files changed, 293 insertions, 297 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index ff3817032..e8ab87802 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <stdlib.h>
@@ -35,10 +39,6 @@
 #include <stdio.h>
 #include <errno.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_alarmreceiver.c b/apps/app_alarmreceiver.c
index 988ec9664..c69417aa4 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -22,13 +22,17 @@
  * 
  * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** 
  *
- * Use at your own risk. Please consult the GNU GPL license document included with Asterisk details. *
+ * Use at your own risk. Please consult the GNU GPL license document included with Asterisk.         *
  *
  * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
  *
  * \ingroup applications
  */ 
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -37,10 +41,6 @@
 #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"
diff --git a/apps/app_amd.c b/apps/app_amd.c
index b79f823d9..245f842c0 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -18,13 +18,13 @@
  * at the top of the source tree.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "asterisk.h"
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index bb67fb194..0e6b8eb2c 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index ebf44bfe5..8d20fb012 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -25,13 +25,13 @@
  * \ingroup applications
  */
 
-#include <sys/types.h>
-#include <stdlib.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <sys/types.h>
+#include <stdlib.h>
+
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 3cba77c4a..c23aa6edc 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,10 +38,6 @@
 #include <errno.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"
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index a6de0c324..ada623018 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -23,15 +23,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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/channel.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 20512f4db..5494b89b9 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -26,16 +26,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #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 4d47b3e88..a2e3929da 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_db.c b/apps/app_db.c
index 55fe25dcc..fc8c52b1a 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -28,16 +28,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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 2edf3b30e..56855337b 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
@@ -35,10 +39,6 @@
 #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"
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 769121dc7..b77a389ae 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -27,15 +27,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>	/* for mkdir */
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include <sys/stat.h>
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index dcb792443..55001abcb 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_directory.c b/apps/app_directory.c
index f9dbbc412..6cbafc3ad 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 65a1e07c8..c8301f678 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -26,16 +26,16 @@
  * \ingroup applications
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index b5cebcf7f..2ee698c40 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -27,15 +27,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_echo.c b/apps/app_echo.c
index eba15f8e9..85df130f1 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.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"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index e9564b19d..d0c2591df 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -26,15 +26,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index e29a3655e..787cc369c 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -31,16 +31,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
 
-
 static const char *app = "ExternalIVR";
 
 static const char *synopsis = "Interfaces with an external IVR application";
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 5a4bb053e..e7cbd47bf 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -42,10 +46,6 @@
 #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"
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 5e4f76044..f1e652a6a 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -29,6 +29,10 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -40,10 +44,6 @@
 #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"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index edddab09e..942f0529b 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -26,6 +26,9 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$revision$")
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,10 +36,6 @@
 #include <string.h>
 #include <signal.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 68951b038..a8461e259 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -26,15 +26,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_getcpeid.c b/apps/app_getcpeid.c
index 5baab8676..be0e0657d 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.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"
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index a40a4874c..22a5d3f30 100644
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -32,6 +32,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -39,10 +43,6 @@
 #include <dirent.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"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 9558f021b..195607ab6 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -34,10 +38,6 @@
 #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"
diff --git a/apps/app_image.c b/apps/app_image.c
index 51389a676..b6308f0be 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 8adccd323..d3dd2e9a0 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -29,15 +29,15 @@
 	<defaultenabled>no</defaultenabled>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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/channel.h"
diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index 72228f038..b0f3a419f 100644
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -26,14 +26,14 @@
  * 
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index 9fdd81a67..711ca5b76 100644
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index b09df9528..2410d47f5 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b0fe05acb..62d14994d 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -29,6 +29,10 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,10 +45,6 @@
 #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"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 215fcb6bf..8c7fbe4c0 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 324c3a3cf..5dec42f07 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -33,15 +33,15 @@
  * Anthony Minessale II <anthmct@yahoo.com>
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_morsecode.c b/apps/app_morsecode.c
index b8568dcd0..9bb02479e 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -24,15 +24,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index b5a313807..3a48e7ef8 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -33,10 +37,6 @@
 #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"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 05fb4e442..188aa3c97 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -34,10 +38,6 @@
 #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"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 649798380..14cfdcb59 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -30,16 +30,16 @@
 	<depend>ssl</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #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"
diff --git a/apps/app_page.c b/apps/app_page.c
index cbc9b23c0..0d8965976 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -29,16 +29,16 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.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_parkandannounce.c b/apps/app_parkandannounce.c
index 26f661464..1b30a4902 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -29,16 +29,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 6ad3e5dd5..6b9fb6870 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
-
 #include "asterisk/cli.h"
 #include "asterisk/localtime.h"
 #include "asterisk/say.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index c1a0ea8e2..45c80ac16 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e7a5ef93a..5115de239 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -56,6 +56,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
@@ -66,10 +70,6 @@
 #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"
diff --git a/apps/app_random.c b/apps/app_random.c
index 9b9fac884..60ac2c141 100644
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -23,15 +23,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_read.c b/apps/app_read.c
index 5bd20be3a..f9c1f486f 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 5eedce2bf..8c5c4b1b5 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_realtime.c b/apps/app_realtime.c
index a1bd140a8..3a974b629 100644
--- a/apps/app_realtime.c
+++ b/apps/app_realtime.c
@@ -27,15 +27,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_record.c b/apps/app_record.c
index 1f02bcbf4..d30a3a791 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 86a1fb990..31b69f9f9 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index fba595e0a..5ee4ecb01 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index e9bdfe571..5be7726de 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -27,14 +27,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 11d7e9f87..b8b079a39 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c
index cfdcd7b59..363532fe6 100644
--- a/apps/app_setcdruserfield.c
+++ b/apps/app_setcdruserfield.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c
index be5894e59..6aff25c3b 100644
--- a/apps/app_settransfercapability.c
+++ b/apps/app_settransfercapability.c
@@ -25,13 +25,13 @@
  * \ingroup applications
  */
  
-#include <string.h>
-#include <stdlib.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 640d62422..33cc28a94 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -30,15 +30,15 @@
 	<defaultenabled>no</defaultenabled>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #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/channel.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 105bbe387..b11653d79 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -22,6 +22,10 @@
  * \author Adrian Kennard
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -32,10 +36,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index a987f317a..5f2666561 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index b759d5f55..2987b48df 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
+
 #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/channel.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index e3783d66b..af1967799 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+ 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #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_system.c b/apps/app_system.c
index 6a13f6b49..31585ab94 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index c08f929a0..84368ec72 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index db822b6c6..df7b1a47e 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -35,10 +39,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 81d8f2cad..ff3182702 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -27,15 +27,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index c46d8f0db..f02b1d072 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 78cc22775..9e7c3b107 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -21,16 +21,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index e4ee8f068..33f666025 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -24,15 +24,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #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 cb5d6d7d8..3b6796871 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -41,6 +41,10 @@
  *				 Bartosz Supczinski <Bartosz.Supczinski@dir.pl>
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
@@ -54,10 +58,6 @@
 #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"
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 466061f7f..9da5d0702 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -25,16 +25,16 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 013d67c3f..3352aa4b9 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -31,15 +31,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_while.c b/apps/app_while.c
index 04b0a5c8f..2aec886bc 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -25,15 +25,15 @@
  * \ingroup applications
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.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_zapateller.c b/apps/app_zapateller.c
index 39c9f701b..21f6e2fa4 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -25,14 +25,14 @@
  * \ingroup applications
  */
  
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 7dc12f661..618488220 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -35,6 +35,10 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -48,10 +52,6 @@
 #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"
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index ce1e3828b..95e69ac66 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -29,6 +29,10 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef __linux__
@@ -52,10 +56,6 @@
 #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"
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 17af23bb3..64a4f8981 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -34,6 +34,10 @@
 	<depend>zaptel</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -47,10 +51,6 @@
 #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"