aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-16 20:04:58 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-16 20:04:58 +0000
commit883346d64a852193fb4119d4399aa0f5a54d8ae8 (patch)
treec012d8f76915d410cf7446b1efc51e3c2e3f5e95 /main
parent4948a0f37cad4e682bdd7860e0c2f01c6cb38ef7 (diff)
Start untangling header inclusion in a way that does not affect
build times - tested, there is no measureable difference before and after this commit. In this change: use asterisk/compat.h to include a small set of system headers: inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h, stdlib.h, alloca.h, stdio.h Where available, the inclusion is conditional on HAVE_FOO_H as determined by autoconf. Normally, source files should not include any of the above system headers, and instead use either "asterisk.h" or "asterisk/compat.h" which does it better. For the time being I have left alone second-level directories (main/db1-ast, etc.). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89333 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/abstract_jb.c3
-rw-r--r--main/acl.c3
-rw-r--r--main/adsistub.c3
-rw-r--r--main/app.c5
-rw-r--r--main/asterisk.c3
-rw-r--r--main/astmm.c2
-rw-r--r--main/audiohook.c4
-rw-r--r--main/autoservice.c4
-rw-r--r--main/callerid.c4
-rw-r--r--main/cdr.c4
-rw-r--r--main/channel.c5
-rw-r--r--main/chanvars.c4
-rw-r--r--main/cli.c4
-rw-r--r--main/config.c4
-rw-r--r--main/cryptostub.c3
-rw-r--r--main/db.c4
-rw-r--r--main/devicestate.c6
-rw-r--r--main/dial.c4
-rw-r--r--main/dlfcn.c5
-rw-r--r--main/dns.c2
-rw-r--r--main/dnsmgr.c5
-rw-r--r--main/dsp.c5
-rw-r--r--main/enum.c4
-rw-r--r--main/event.c3
-rw-r--r--main/file.c6
-rw-r--r--main/fixedjitterbuf.c4
-rw-r--r--main/frame.c4
-rw-r--r--main/fskmodem.c2
-rw-r--r--main/hashtab.c5
-rw-r--r--main/http.c5
-rw-r--r--main/image.c4
-rw-r--r--main/indications.c3
-rw-r--r--main/io.c4
-rw-r--r--main/jitterbuf.c5
-rw-r--r--main/loader.c4
-rw-r--r--main/logger.c6
-rw-r--r--main/manager.c5
-rw-r--r--main/md5.c2
-rw-r--r--main/netsock.c4
-rw-r--r--main/pbx.c5
-rw-r--r--main/plc.c3
-rw-r--r--main/privacy.c4
-rw-r--r--main/rtp.c4
-rw-r--r--main/say.c4
-rw-r--r--main/sched.c4
-rw-r--r--main/sha1.c2
-rw-r--r--main/slinfactory.c2
-rw-r--r--main/srv.c4
-rw-r--r--main/stdtime/localtime.c13
-rw-r--r--main/strcompat.c9
-rw-r--r--main/tdd.c4
-rw-r--r--main/term.c5
-rw-r--r--main/threadstorage.c4
-rw-r--r--main/translate.c5
-rw-r--r--main/udptl.c4
-rw-r--r--main/utils.c6
56 files changed, 6 insertions, 232 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index b8ccfbd93..fe2f07aeb 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -31,9 +31,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-
#include "asterisk/frame.h"
#include "asterisk/channel.h"
#include "asterisk/logger.h"
diff --git a/main/acl.c b/main/acl.c
index 110bb51f8..d803290e6 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -27,9 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
diff --git a/main/adsistub.c b/main/adsistub.c
index 38eaa0efc..e24b68c91 100644
--- a/main/adsistub.c
+++ b/main/adsistub.c
@@ -16,9 +16,6 @@
* at the top of the source tree.
*/
-#include <unistd.h>
-#include <stdlib.h>
-
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/app.c b/main/app.c
index defad777a..07b442c47 100644
--- a/main/app.c
+++ b/main/app.c
@@ -27,15 +27,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <dirent.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <regex.h>
diff --git a/main/asterisk.c b/main/asterisk.c
index 7ba306233..a94972cc5 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -63,11 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#undef sched_setscheduler
#undef setpriority
-#include <unistd.h>
-#include <stdlib.h>
#include <sys/time.h>
#include <fcntl.h>
-#include <stdio.h>
#include <signal.h>
#include <sched.h>
#include <sys/socket.h>
diff --git a/main/astmm.c b/main/astmm.c
index fd0b3d6fa..7f112c007 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -29,8 +29,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <string.h>
#include <time.h>
#include "asterisk/cli.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index 06396b3a8..67c77423a 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -27,12 +27,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include "asterisk/logger.h"
#include "asterisk/channel.h"
diff --git a/main/autoservice.c b/main/autoservice.c
index 7ef5c0a9b..137b7f22e 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -27,13 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include "asterisk/pbx.h"
#include "asterisk/frame.h"
diff --git a/main/callerid.c b/main/callerid.c
index 4777f1728..2b1329f3c 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -28,10 +28,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <time.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <math.h>
#include <ctype.h>
diff --git a/main/cdr.c b/main/cdr.c
index 166cfaeda..77e6c865d 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -35,10 +35,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
#include <signal.h>
#include "asterisk/lock.h"
diff --git a/main/channel.c b/main/channel.c
index aac3ad0b8..524a8ac43 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -27,14 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <math.h>
#include "asterisk/zapata.h"
diff --git a/main/chanvars.c b/main/chanvars.c
index 858933c92..ad92072f0 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -27,10 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "asterisk/chanvars.h"
#include "asterisk/logger.h"
#include "asterisk/strings.h"
diff --git a/main/cli.c b/main/cli.c
index 2cb85e474..a9f9fc37c 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -27,12 +27,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <unistd.h>
-#include <stdlib.h>
#include <sys/signal.h>
-#include <stdio.h>
#include <signal.h>
-#include <string.h>
#include <ctype.h>
#include <regex.h>
diff --git a/main/config.c b/main/config.c
index 27c34ec15..da499acdd 100644
--- a/main/config.c
+++ b/main/config.c
@@ -30,10 +30,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#include <time.h>
#include <sys/stat.h>
diff --git a/main/cryptostub.c b/main/cryptostub.c
index fde6bfead..05fb39d29 100644
--- a/main/cryptostub.c
+++ b/main/cryptostub.c
@@ -27,9 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <unistd.h>
-#include <stdlib.h>
-
#include "asterisk/crypto.h"
#include "asterisk/logger.h"
diff --git a/main/db.c b/main/db.c
index 50cba13d4..ab9821d46 100644
--- a/main/db.c
+++ b/main/db.c
@@ -31,13 +31,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <dirent.h>
#include "asterisk/channel.h"
diff --git a/main/devicestate.c b/main/devicestate.c
index c36fa694c..c1ea18c5a 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -112,12 +112,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
#include "asterisk/channel.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
diff --git a/main/dial.c b/main/dial.c
index 3d4d3d739..252aa3c03 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -27,13 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include "asterisk/logger.h"
#include "asterisk/channel.h"
diff --git a/main/dlfcn.c b/main/dlfcn.c
index 9a68b5c19..802e7942f 100644
--- a/main/dlfcn.c
+++ b/main/dlfcn.c
@@ -30,12 +30,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <stdarg.h>
#include <limits.h>
#include <mach-o/dyld.h>
#include <mach-o/nlist.h>
diff --git a/main/dns.c b/main/dns.c
index 05a64c469..a325796c0 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -33,12 +33,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include <unistd.h>
#include "asterisk/logger.h"
#include "asterisk/channel.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index b4c8e6307..34dc2ebc6 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -27,15 +27,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <regex.h>
#include <signal.h>
diff --git a/main/dsp.c b/main/dsp.c
index 4235affa8..8f806a428 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -44,13 +44,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.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"
diff --git a/main/enum.c b/main/enum.c
index 9397f0f78..29a32126c 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -44,7 +44,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
@@ -54,11 +53,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif
#endif
#include <resolv.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include <regex.h>
-#include <unistd.h>
#include <errno.h>
#include "asterisk/logger.h"
diff --git a/main/event.c b/main/event.c
index 23b16e52c..f9d9b657c 100644
--- a/main/event.c
+++ b/main/event.c
@@ -27,9 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdlib.h>
-#include <stdio.h>
-
#include "asterisk/event.h"
#include "asterisk/linkedlists.h"
#include "asterisk/lock.h"
diff --git a/main/file.c b/main/file.c
index de69ab087..a01fc5829 100644
--- a/main/file.c
+++ b/main/file.c
@@ -27,15 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#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"
diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c
index a9d0f8707..8a885b8e6 100644
--- a/main/fixedjitterbuf.c
+++ b/main/fixedjitterbuf.c
@@ -29,11 +29,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
#include <assert.h>
-#include <string.h>
-#include <unistd.h>
#include "asterisk/utils.h"
#include "fixedjitterbuf.h"
diff --git a/main/frame.c b/main/frame.c
index 50e9dabbc..f756ee23c 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -27,11 +27,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include <errno.h>
-#include <stdio.h>
#include "asterisk/lock.h"
#include "asterisk/frame.h"
diff --git a/main/fskmodem.c b/main/fskmodem.c
index 00ae1c80f..e59024834 100644
--- a/main/fskmodem.c
+++ b/main/fskmodem.c
@@ -32,8 +32,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-
#include "asterisk/fskmodem.h"
#define NBW 2
diff --git a/main/hashtab.c b/main/hashtab.c
index 19d642ebe..789438d20 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -26,13 +26,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision")
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include <ctype.h>
#include <errno.h>
-#include <stddef.h>
#include "asterisk/lock.h"
#include "asterisk/frame.h"
diff --git a/main/http.c b/main/http.c
index d4e692ea6..7271e8523 100644
--- a/main/http.c
+++ b/main/http.c
@@ -32,12 +32,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <time.h>
-#include <string.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/main/image.c b/main/image.c
index f160cebff..f677aadfa 100644
--- a/main/image.c
+++ b/main/image.c
@@ -27,14 +27,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include "asterisk/sched.h"
#include "asterisk/options.h"
diff --git a/main/indications.c b/main/indications.c
index ebebc682b..0733a7d6c 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -32,9 +32,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <math.h>
#include "asterisk/lock.h"
diff --git a/main/io.c b/main/io.c
index c4ba3cffb..df06502f8 100644
--- a/main/io.c
+++ b/main/io.c
@@ -27,11 +27,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <termios.h>
-#include <string.h>
#include <sys/ioctl.h>
#include "asterisk/io.h"
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 127488696..81e60cc8a 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -31,11 +31,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
#include "jitterbuf.h"
#include "asterisk/utils.h"
#include "asterisk/options.h"
diff --git a/main/loader.c b/main/loader.c
index b51888dbe..1ac5f9c56 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -31,12 +31,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
#include <dirent.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <errno.h>
-#include <string.h>
#include "asterisk/linkedlists.h"
#include "asterisk/module.h"
diff --git a/main/logger.c b/main/logger.c
index a5c7dd93a..83cdef36a 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -30,14 +30,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
#include <time.h>
-#include <string.h>
-#include <stdlib.h>
#include <errno.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#if ((defined(AST_DEVMODE)) && (defined(linux)))
diff --git a/main/manager.c b/main/manager.c
index 37885d48d..7708d324f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -45,12 +45,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include <sys/time.h>
-#include <sys/types.h>
#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -58,7 +54,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <arpa/inet.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <sys/mman.h>
#include "asterisk/channel.h"
diff --git a/main/md5.c b/main/md5.c
index 949c408e2..594c5eff5 100644
--- a/main/md5.c
+++ b/main/md5.c
@@ -24,8 +24,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <string.h> /* for memcpy() */
-
#include "asterisk/endian.h"
#include "asterisk/md5.h"
diff --git a/main/netsock.c b/main/netsock.c
index e57c376ee..b391fc4ee 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -29,13 +29,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/main/pbx.c b/main/pbx.c
index 6f6ef0de3..5c6bb394c 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -27,11 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#include <time.h>
diff --git a/main/plc.c b/main/plc.c
index 336a99030..ef549ca2c 100644
--- a/main/plc.c
+++ b/main/plc.c
@@ -34,9 +34,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <math.h>
#include "asterisk/plc.h"
diff --git a/main/privacy.c b/main/privacy.c
index b27bb5046..e52327fc3 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -27,13 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <dirent.h>
#include "asterisk/channel.h"
diff --git a/main/rtp.c b/main/rtp.c
index 5ab4eb658..a6d9c7362 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -30,13 +30,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/main/say.c b/main/say.c
index 6daabdcf3..70537c3c2 100644
--- a/main/say.c
+++ b/main/say.c
@@ -35,14 +35,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
#include <netinet/in.h>
#include <time.h>
#include <ctype.h>
#include <math.h>
-#include <stdio.h>
#ifdef SOLARIS
#include <iso/limits_iso.h>
diff --git a/main/sched.c b/main/sched.c
index 986badd16..4e7e55423 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -36,11 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define DEBUG(a)
#endif
-#include <stdio.h>
-#include <stdlib.h>
#include <sys/time.h>
-#include <unistd.h>
-#include <string.h>
#include "asterisk/sched.h"
#include "asterisk/logger.h"
diff --git a/main/sha1.c b/main/sha1.c
index a58a71385..3a6f7cc6b 100644
--- a/main/sha1.c
+++ b/main/sha1.c
@@ -60,7 +60,7 @@
*
*/
-
+#include "asterisk/compat.h"
#include "asterisk/sha1.h"
/*! Define the SHA1 circular left shift macro */
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 038fa0d7b..73ef6280e 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -28,8 +28,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <string.h>
-
#include "asterisk/frame.h"
#include "asterisk/slinfactory.h"
#include "asterisk/logger.h"
diff --git a/main/srv.c b/main/srv.c
index 55a13e852..262be8079 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -33,7 +33,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#ifdef __APPLE__
@@ -42,9 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif
#endif
#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
#include "asterisk/channel.h"
#include "asterisk/logger.h"
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 44607c921..c132e901c 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -44,20 +44,17 @@
/*LINTLIBRARY*/
-#include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef DEBUG
-#include <stdio.h>
-#endif
#include <float.h>
-
#include "private.h"
#include "tzfile.h"
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/localtime.h"
diff --git a/main/strcompat.c b/main/strcompat.c
index 243ef76cb..37ee407cd 100644
--- a/main/strcompat.c
+++ b/main/strcompat.c
@@ -21,16 +21,7 @@
#include "asterisk.h"
-#include <sys/types.h>
#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
#ifndef HAVE_STRSEP
char *strsep(char **str, const char *delims)
diff --git a/main/tdd.c b/main/tdd.c
index 0d1f7fdce..cb3e2f1d7 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -32,10 +32,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <time.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <math.h>
#include <ctype.h>
diff --git a/main/term.c b/main/term.c
index d051338d8..2f679d898 100644
--- a/main/term.c
+++ b/main/term.c
@@ -27,16 +27,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
#include "asterisk/term.h"
#include "asterisk/options.h"
diff --git a/main/threadstorage.c b/main/threadstorage.c
index a03f3c98b..541671496 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -29,10 +29,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "asterisk/logger.h"
#include "asterisk/strings.h"
#include "asterisk/utils.h"
diff --git a/main/translate.c b/main/translate.c
index aa096436d..734f369d4 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -27,14 +27,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
#include "asterisk/lock.h"
#include "asterisk/channel.h"
diff --git a/main/udptl.c b/main/udptl.c
index beb76a988..4b67dc221 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -50,13 +50,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <unistd.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/main/utils.c b/main/utils.c
index d94889188..d7a04e9b2 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -28,14 +28,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>