Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.40
diff -u -r1.40 acl.c
--- acl.c	21 Apr 2005 06:02:43 -0000	1.40
+++ acl.c	22 Apr 2005 03:34:47 -0000
@@ -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,15 +25,26 @@
 #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 {
Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.56
diff -u -r1.56 app.c
--- app.c	21 Apr 2005 06:02:43 -0000	1.56
+++ app.c	22 Apr 2005 03:34:47 -0000
@@ -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"
Index: ast_expr.y
===================================================================
RCS file: /usr/cvsroot/asterisk/ast_expr.y,v
retrieving revision 1.15
diff -u -r1.15 ast_expr.y
--- ast_expr.y	21 Apr 2005 06:02:43 -0000	1.15
+++ ast_expr.y	22 Apr 2005 03:34:47 -0000
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <regex.h>
 #include <limits.h>
+
 #include "asterisk/ast_expr.h"
 #include "asterisk/logger.h"
 
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.149
diff -u -r1.149 asterisk.c
--- asterisk.c	21 Apr 2005 06:02:43 -0000	1.149
+++ asterisk.c	22 Apr 2005 03:34:48 -0000
@@ -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
Index: astmm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.13
diff -u -r1.13 astmm.c
--- astmm.c	21 Apr 2005 06:02:43 -0000	1.13
+++ astmm.c	22 Apr 2005 03:34:48 -0000
@@ -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"
Index: autoservice.c
===================================================================
RCS file: /usr/cvsroot/asterisk/autoservice.c,v
retrieving revision 1.10
diff -u -r1.10 autoservice.c
--- autoservice.c	21 Apr 2005 06:02:43 -0000	1.10
+++ autoservice.c	22 Apr 2005 03:34:48 -0000
@@ -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"
Index: callerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/callerid.c,v
retrieving revision 1.30
diff -u -r1.30 callerid.c
--- callerid.c	21 Apr 2005 06:02:43 -0000	1.30
+++ callerid.c	22 Apr 2005 03:34:48 -0000
@@ -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"
Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.34
diff -u -r1.34 cdr.c
--- cdr.c	21 Apr 2005 06:02:43 -0000	1.34
+++ cdr.c	22 Apr 2005 03:34:48 -0000
@@ -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] = "";
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.190
diff -u -r1.190 channel.c
--- channel.c	22 Apr 2005 01:40:23 -0000	1.190
+++ channel.c	22 Apr 2005 03:34:50 -0000
@@ -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 */
Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.77
diff -u -r1.77 cli.c
--- cli.c	21 Apr 2005 06:02:43 -0000	1.77
+++ cli.c	22 Apr 2005 03:34:50 -0000
@@ -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 */
Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.60
diff -u -r1.60 config.c
--- config.c	21 Apr 2005 06:02:43 -0000	1.60
+++ config.c	22 Apr 2005 03:34:50 -0000
@@ -24,6 +24,7 @@
 #endif
 # include <glob.h>
 #endif
+
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
Index: config_old.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config_old.c,v
retrieving revision 1.2
diff -u -r1.2 config_old.c
--- config_old.c	21 Apr 2005 06:02:43 -0000	1.2
+++ config_old.c	22 Apr 2005 03:34:50 -0000
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
 #include "asterisk/config.h"
 #include "asterisk/logger.h"
 
Index: db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/db.c,v
retrieving revision 1.15
diff -u -r1.15 db.c
--- db.c	21 Apr 2005 06:02:43 -0000	1.15
+++ db.c	22 Apr 2005 03:34:50 -0000
@@ -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"
Index: dlfcn.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dlfcn.c,v
retrieving revision 1.3
diff -u -r1.3 dlfcn.c
--- dlfcn.c	21 Apr 2005 06:02:43 -0000	1.3
+++ dlfcn.c	22 Apr 2005 03:34:51 -0000
@@ -47,6 +47,7 @@
 #ifndef __BSD_VISIBLE
 #define __BSD_VISIBLE 1
 #endif
+
 #include "asterisk/dlfcn-compat.h"
 
 #ifndef dl_restrict
Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.39
diff -u -r1.39 dsp.c
--- dsp.c	21 Apr 2005 06:02:43 -0000	1.39
+++ dsp.c	22 Apr 2005 03:34:51 -0000
@@ -29,18 +29,19 @@
 */
 
 #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>
 #include <math.h>
 #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 */
Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.61
diff -u -r1.61 file.c
--- file.c	21 Apr 2005 06:02:43 -0000	1.61
+++ file.c	22 Apr 2005 03:34:52 -0000
@@ -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"
 
Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.51
diff -u -r1.51 frame.c
--- frame.c	21 Apr 2005 06:02:43 -0000	1.51
+++ frame.c	22 Apr 2005 03:34:52 -0000
@@ -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
Index: fskmodem.c
===================================================================
RCS file: /usr/cvsroot/asterisk/fskmodem.c,v
retrieving revision 1.4
diff -u -r1.4 fskmodem.c
--- fskmodem.c	21 Apr 2005 06:02:43 -0000	1.4
+++ fskmodem.c	22 Apr 2005 03:34:52 -0000
@@ -14,9 +14,9 @@
  *
  */
 
-#include "asterisk/fskmodem.h"
-
 #include <stdio.h>
+
+#include "asterisk/fskmodem.h"
 
 #define NBW	2
 #define BWLIST	{75,800}
Index: image.c
===================================================================
RCS file: /usr/cvsroot/asterisk/image.c,v
retrieving revision 1.12
diff -u -r1.12 image.c
--- image.c	21 Apr 2005 06:02:43 -0000	1.12
+++ image.c	22 Apr 2005 03:34:52 -0000
@@ -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"
Index: indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/indications.c,v
retrieving revision 1.23
diff -u -r1.23 indications.c
--- indications.c	21 Apr 2005 06:02:43 -0000	1.23
+++ indications.c	22 Apr 2005 03:34:52 -0000
@@ -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"
Index: io.c
===================================================================
RCS file: /usr/cvsroot/asterisk/io.c,v
retrieving revision 1.8
diff -u -r1.8 io.c
--- io.c	21 Apr 2005 06:02:43 -0000	1.8
+++ io.c	22 Apr 2005 03:34:52 -0000
@@ -17,6 +17,7 @@
 #include <termios.h>
 #include <string.h> /* for memset */
 #include <sys/ioctl.h>
+
 #include "asterisk/io.h"
 #include "asterisk/logger.h"
 
Index: jitterbuf.c
===================================================================
RCS file: /usr/cvsroot/asterisk/jitterbuf.c,v
retrieving revision 1.5
diff -u -r1.5 jitterbuf.c
--- jitterbuf.c	21 Apr 2005 06:30:23 -0000	1.5
+++ jitterbuf.c	22 Apr 2005 03:34:52 -0000
@@ -13,10 +13,11 @@
  * 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
Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.39
diff -u -r1.39 loader.c
--- loader.c	21 Apr 2005 06:02:43 -0000	1.39
+++ loader.c	22 Apr 2005 03:34:53 -0000
@@ -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"
Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.65
diff -u -r1.65 logger.c
--- logger.c	21 Apr 2005 06:02:43 -0000	1.65
+++ logger.c	22 Apr 2005 03:34:53 -0000
@@ -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 */
Index: md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/md5.c,v
retrieving revision 1.12
diff -u -r1.12 md5.c
--- md5.c	21 Apr 2005 06:02:43 -0000	1.12
+++ md5.c	22 Apr 2005 03:34:53 -0000
@@ -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"
 
Index: muted.c
===================================================================
RCS file: /usr/cvsroot/asterisk/muted.c,v
retrieving revision 1.6
diff -u -r1.6 muted.c
--- muted.c	21 Jan 2005 07:06:24 -0000	1.6
+++ muted.c	22 Apr 2005 03:34:53 -0000
@@ -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>
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.228
diff -u -r1.228 pbx.c
--- pbx.c	21 Apr 2005 06:02:43 -0000	1.228
+++ pbx.c	22 Apr 2005 03:34:55 -0000
@@ -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"
 
 /*
Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.56
diff -u -r1.56 say.c
--- say.c	21 Apr 2005 06:02:43 -0000	1.56
+++ say.c	22 Apr 2005 03:34:57 -0000
@@ -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"
@@ -30,11 +35,6 @@
 #include "asterisk/utils.h"
 #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);
Index: strcompat.c
===================================================================
RCS file: /usr/cvsroot/asterisk/strcompat.c,v
retrieving revision 1.2
diff -u -r1.2 strcompat.c
--- strcompat.c	17 Mar 2005 23:12:15 -0000	1.2
+++ strcompat.c	22 Apr 2005 03:34:57 -0000
@@ -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)
Index: tdd.c
===================================================================
RCS file: /usr/cvsroot/asterisk/tdd.c,v
retrieving revision 1.4
diff -u -r1.4 tdd.c
--- tdd.c	21 Apr 2005 06:02:43 -0000	1.4
+++ tdd.c	22 Apr 2005 03:34:57 -0000
@@ -21,12 +21,12 @@
 #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;
Index: term.c
===================================================================
RCS file: /usr/cvsroot/asterisk/term.c,v
retrieving revision 1.8
diff -u -r1.8 term.c
--- term.c	21 Apr 2005 06:02:43 -0000	1.8
+++ term.c	22 Apr 2005 03:34:57 -0000
@@ -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"
Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.34
diff -u -r1.34 translate.c
--- translate.c	21 Apr 2005 06:02:43 -0000	1.34
+++ translate.c	22 Apr 2005 03:34:57 -0000
@@ -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 */
 
Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.38
diff -u -r1.38 utils.c
--- utils.c	21 Apr 2005 06:02:43 -0000	1.38
+++ utils.c	22 Apr 2005 03:34:57 -0000
@@ -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"