33 files changed, 134 insertions, 99 deletions
diff --git a/acl.c b/acl.c
index 5e697bdf7..47edeb0f2 100755
--- a/acl.c
+++ b/acl.c
@@ -18,13 +18,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
-#include "asterisk/acl.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
-#include "asterisk/srv.h"
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -32,17 +25,28 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
+
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
 #include <net/route.h>
-
-AST_MUTEX_DEFINE_STATIC(routeseq_lock);
 #endif
 
 #if defined (SOLARIS)
 #include <sys/sockio.h>
 #endif
 
+#include "asterisk/acl.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+#include "asterisk/srv.h"
+
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
+AST_MUTEX_DEFINE_STATIC(routeseq_lock);
+#endif
+
 struct ast_netsock {
 	ASTOBJ_COMPONENTS(struct ast_netsock);
 	struct sockaddr_in bindaddr;
diff --git a/app.c b/app.c
index 6920b967b..f119f990a 100755
--- a/app.c
+++ b/app.c
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <regex.h>
+
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/file.h"
diff --git a/ast_expr.y b/ast_expr.y
index de07a0c9d..e11791462 100755
--- a/ast_expr.y
+++ b/ast_expr.y
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <regex.h>
 #include <limits.h>
+
 #include "asterisk/ast_expr.h"
 #include "asterisk/logger.h"
 
diff --git a/asterisk.c b/asterisk.c
index 589ec447f..f7d9b5625 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -13,6 +13,26 @@
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/resource.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <signal.h>
+#include <sched.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <sys/resource.h>
+#include <grp.h>
+#include <pwd.h>
+#include <sys/stat.h>
+
+#if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
+#include <netdb.h>
+#endif
+
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
@@ -32,30 +52,11 @@
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/file.h"
-#include <sys/resource.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sched.h>
 #include "asterisk/io.h"
 #include "asterisk/lock.h"
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
 #include "editline/histedit.h"
 #include "asterisk.h"
 #include "asterisk/config.h"
-#include <sys/resource.h>
-#include <grp.h>
-#include <pwd.h>
-#include <sys/stat.h>
-
-#if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
-#include <netdb.h>
-#endif
 
 #ifndef AF_LOCAL
 #define AF_LOCAL AF_UNIX
diff --git a/astmm.c b/astmm.c
index e2e3fb4de..be165ebf7 100755
--- a/astmm.c
+++ b/astmm.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+
 #include "asterisk/cli.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
diff --git a/autoservice.c b/autoservice.c
index 0d9d1b2f5..25c9ae887 100755
--- a/autoservice.c
+++ b/autoservice.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <math.h>			/* For PI */
+
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
diff --git a/callerid.c b/callerid.c
index 9e5c78731..430f3cedc 100755
--- a/callerid.c
+++ b/callerid.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <ctype.h>
+
 #include "asterisk/ulaw.h"
 #include "asterisk/alaw.h"
 #include "asterisk/frame.h"
diff --git a/cdr.c b/cdr.c
index beffcb3b7..51c40dbb9 100755
--- a/cdr.c
+++ b/cdr.c
@@ -14,6 +14,10 @@
  *
  */
 
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
@@ -22,9 +26,6 @@
 #include "asterisk/causes.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;
 char ast_default_accountcode[20] = "";
diff --git a/channel.c b/channel.c
index 519281176..9d6007c64 100755
--- a/channel.c
+++ b/channel.c
@@ -19,6 +19,19 @@
 #include <errno.h>
 #include <unistd.h>
 #include <math.h>			/* For PI */
+
+#ifdef ZAPTEL_OPTIMIZATIONS
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+#ifndef ZT_TIMERPING
+#error "You need newer zaptel!  Please cvs update zaptel"
+#endif
+#endif
+
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
@@ -40,17 +53,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/transcap.h"
-#ifdef ZAPTEL_OPTIMIZATIONS
-#include <sys/ioctl.h>
-#ifdef __linux__
-#include <linux/zaptel.h>
-#else
-#include <zaptel.h>
-#endif /* __linux__ */
-#ifndef ZT_TIMERPING
-#error "You need newer zaptel!  Please cvs update zaptel"
-#endif
-#endif
 #include "asterisk.h"
 
 /* uncomment if you have problems with 'monitoring' synchronized files */
diff --git a/cli.c b/cli.c
index e11e0fa59..eceef43c1 100755
--- a/cli.c
+++ b/cli.c
@@ -13,6 +13,12 @@
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/signal.h>
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <ctype.h>
+
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
@@ -22,11 +28,6 @@
 #include "asterisk/manager.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include <sys/signal.h>
-#include <stdio.h>
-#include <signal.h>
-#include <string.h>
-#include <ctype.h>
 /* For rl_filename_completion */
 #include "editline/readline/readline.h"
 /* For module directory */
diff --git a/config.c b/config.c
index a4673cbac..b38dc54e0 100755
--- a/config.c
+++ b/config.c
@@ -24,6 +24,7 @@
 #endif
 # include <glob.h>
 #endif
+
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
diff --git a/config_old.c b/config_old.c
index c2d8cdf3b..1c8a91290 100755
--- a/config_old.c
+++ b/config_old.c
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
 #include "asterisk/config.h"
 #include "asterisk/logger.h"
 
diff --git a/db.c b/db.c
index aa3fd045f..063d298ee 100755
--- a/db.c
+++ b/db.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
+
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/app.h"
diff --git a/dlfcn.c b/dlfcn.c
index 0fae63514..cc6fe40f9 100755
--- a/dlfcn.c
+++ b/dlfcn.c
@@ -47,6 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __BSD_VISIBLE
 #define __BSD_VISIBLE 1
 #endif
+
 #include "asterisk/dlfcn-compat.h"
 
 #ifndef dl_restrict
diff --git a/dsp.c b/dsp.c
index 0395865ba..33917e5d0 100755
--- a/dsp.c
+++ b/dsp.c
@@ -29,12 +29,6 @@
 */
 
 #include <sys/types.h>
-#include "asterisk/frame.h"
-#include "asterisk/channel.h"
-#include "asterisk/logger.h"
-#include "asterisk/dsp.h"
-#include "asterisk/ulaw.h"
-#include "asterisk/alaw.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -42,6 +36,13 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include "asterisk/frame.h"
+#include "asterisk/channel.h"
+#include "asterisk/logger.h"
+#include "asterisk/dsp.h"
+#include "asterisk/ulaw.h"
+#include "asterisk/alaw.h"
+
 /* Number of goertzels for progress detect */
 #define GSAMP_SIZE_NA 183			/* North America - 350, 440, 480, 620, 950, 1400, 1800 Hz */
 #define GSAMP_SIZE_CR 188			/* Costa Rica, Brazil - Only care about 425 Hz */
diff --git a/file.c b/file.c
index 6b85b99cd..876177a94 100755
--- a/file.c
+++ b/file.c
@@ -12,6 +12,16 @@
  */
 
 #include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include "asterisk/frame.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
@@ -23,15 +33,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "asterisk.h"
 #include "astconf.h"
 
diff --git a/frame.c b/frame.c
index 75179c1a9..41932f880 100755
--- a/frame.c
+++ b/frame.c
@@ -11,6 +11,12 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
 #include "asterisk/logger.h"
@@ -19,11 +25,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
 #include "asterisk.h"
 
 #ifdef TRACE_FRAMES
diff --git a/fskmodem.c b/fskmodem.c
index 76cc7b141..3086edc46 100755
--- a/fskmodem.c
+++ b/fskmodem.c
@@ -14,10 +14,10 @@
  *
  */
 
-#include "asterisk/fskmodem.h"
-
 #include <stdio.h>
 
+#include "asterisk/fskmodem.h"
+
 #define NBW	2
 #define BWLIST	{75,800}
 #define	NF	6
diff --git a/image.c b/image.c
index a169f74d8..7fa2141f1 100755
--- a/image.c
+++ b/image.c
@@ -19,6 +19,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
+
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
diff --git a/indications.c b/indications.c
index 0f93e458c..4867fd4bd 100755
--- a/indications.c
+++ b/indications.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>			/* For PI */
+
 #include "asterisk/indications.h"
 #include "asterisk/frame.h"
 #include "asterisk/options.h"
diff --git a/io.c b/io.c
index 8b915d229..f04277c39 100755
--- a/io.c
+++ b/io.c
@@ -17,6 +17,7 @@
 #include <termios.h>
 #include <string.h> /* for memset */
 #include <sys/ioctl.h>
+
 #include "asterisk/io.h"
 #include "asterisk/logger.h"
 
diff --git a/jitterbuf.c b/jitterbuf.c
index a7668e17e..365ec44f0 100755
--- a/jitterbuf.c
+++ b/jitterbuf.c
@@ -13,11 +13,12 @@
  * Copyright on this file is disclaimed to Digium for inclusion in Asterisk
  */
 
-#include "jitterbuf.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "jitterbuf.h"
+
 /* define these here, just for ancient compiler systems */
 #define JB_LONGMAX 2147483647L
 #define JB_LONGMIN (-JB_LONGMAX - 1L)
diff --git a/loader.c b/loader.c
index 44945e73e..5799374b9 100755
--- a/loader.c
+++ b/loader.c
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/config.h"
diff --git a/logger.c b/logger.c
index 15d60d95b..b1c7b0acf 100755
--- a/logger.c
+++ b/logger.c
@@ -16,6 +16,15 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#define SYSLOG_NAMES /* so we can map syslog facilities names to their numeric values,
+		        from <syslog.h> which is included by logger.h */
+#include <syslog.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
@@ -24,16 +33,9 @@
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
 #include "asterisk/manager.h"
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/stat.h>
 #include "asterisk.h"
 #include "astconf.h"
 
-#define SYSLOG_NAMES /* so we can map syslog facilities names to their numeric values,
-		        from <syslog.h> which is included by logger.h */
-#include <syslog.h>
 static int syslog_level_map[] = {
 	LOG_DEBUG,
 	LOG_INFO,    /* arbitrary equivalent of LOG_EVENT */
diff --git a/md5.c b/md5.c
index a20697121..b0b5d39d1 100755
--- a/md5.c
+++ b/md5.c
@@ -18,6 +18,7 @@
  * will fill a supplied 16-byte array with the digest.
  */
 #include <string.h>		/* for memcpy() */
+
 #include "asterisk/endian.h"
 #include "asterisk/md5.h"
 
diff --git a/muted.c b/muted.c
index 28f3e0442..b04f77a76 100755
--- a/muted.c
+++ b/muted.c
@@ -10,6 +10,7 @@
  * Distributed under the terms of the GNU General Public License version 2.0 
  *
  */
+
 #include <linux/soundcard.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/pbx.c b/pbx.c
index 2d1c42951..9a358de3f 100755
--- a/pbx.c
+++ b/pbx.c
@@ -13,6 +13,16 @@
 
 #include <sys/types.h>
 #include <regex.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <setjmp.h>
+#include <ctype.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
 #include "asterisk/pbx.h"
@@ -32,15 +42,6 @@
 #include "asterisk/causes.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/app.h"
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <setjmp.h>
-#include <ctype.h>
-#include <errno.h>
-#include <time.h>
-#include <sys/time.h>
 #include "asterisk.h"
 
 /*
diff --git a/say.c b/say.c
index 916095231..59d4344fe 100755
--- a/say.c
+++ b/say.c
@@ -21,6 +21,11 @@
 #include <time.h>
 #include <ctype.h>
 #include <math.h>
+
+#ifdef SOLARIS
+#include <iso/limits_iso.h>
+#endif
+
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
@@ -31,11 +36,6 @@
 #include "asterisk.h"
 #include <stdio.h>
 
-#ifdef SOLARIS
-#include <iso/limits_iso.h>
-#endif
-
-
 /* Forward declaration */
 static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang);
 
diff --git a/strcompat.c b/strcompat.c
index b8f9f0e49..1814dcd12 100755
--- a/strcompat.c
+++ b/strcompat.c
@@ -2,8 +2,9 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+
 #ifdef SOLARIS
-#include <solaris-compat/compat.h>
+#include "solaris-compat/compat.h"
 #endif
 
 char* strsep(char** str, const char* delims)
diff --git a/tdd.c b/tdd.c
index e7c64ac07..fb2da9e32 100755
--- a/tdd.c
+++ b/tdd.c
@@ -21,13 +21,13 @@
 #include <unistd.h>
 #include <math.h>
 #include <ctype.h>
+
 #include "asterisk/ulaw.h"
 #include "asterisk/tdd.h"
 #include "asterisk/logger.h"
 #include "asterisk/fskmodem.h"
 #include "ecdisa.h"
 
-
 struct tdd_state {
 	fsk_data fskd;
 	char rawdata[256];
diff --git a/term.c b/term.c
index 0cef17ec3..5bdfe2839 100755
--- a/term.c
+++ b/term.c
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+
 #include "asterisk/term.h"
 #include "asterisk/options.h"
 #include "asterisk/lock.h"
diff --git a/translate.c b/translate.c
index 97ece832a..492ebb8e1 100755
--- a/translate.c
+++ b/translate.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/logger.h"
@@ -20,12 +27,6 @@
 #include "asterisk/sched.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #define MAX_RECALC 200 /* max sample recalc */
 
diff --git a/utils.c b/utils.c
index 4ae07f836..742b4872e 100755
--- a/utils.c
+++ b/utils.c
@@ -22,6 +22,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/io.h"