From 9335ace850459f02e49ee1427f6b675d613b7403 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Mon, 19 Nov 2007 19:09:03 +0000
Subject: [PATCH] another bunch of include removals (errno.h and
 asterisk/logger.h)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 cdr/cdr_adaptive_odbc.c  | 1 -
 cdr/cdr_csv.c            | 2 --
 cdr/cdr_custom.c         | 2 --
 cdr/cdr_manager.c        | 1 -
 cdr/cdr_odbc.c           | 1 -
 cdr/cdr_pgsql.c          | 1 -
 cdr/cdr_radius.c         | 2 --
 cdr/cdr_sqlite.c         | 1 -
 cdr/cdr_sqlite3_custom.c | 2 --
 cdr/cdr_tds.c            | 1 -
 funcs/func_base64.c      | 1 -
 funcs/func_blacklist.c   | 1 -
 funcs/func_callerid.c    | 1 -
 funcs/func_cdr.c         | 1 -
 funcs/func_channel.c     | 1 -
 funcs/func_curl.c        | 1 -
 funcs/func_cut.c         | 1 -
 funcs/func_db.c          | 1 -
 funcs/func_enum.c        | 1 -
 funcs/func_env.c         | 1 -
 funcs/func_groupcount.c  | 1 -
 funcs/func_iconv.c       | 2 --
 funcs/func_lock.c        | 1 -
 funcs/func_logic.c       | 1 -
 funcs/func_math.c        | 1 -
 funcs/func_md5.c         | 1 -
 funcs/func_module.c      | 1 -
 funcs/func_odbc.c        | 3 ---
 funcs/func_rand.c        | 1 -
 funcs/func_realtime.c    | 1 -
 funcs/func_sha1.c        | 1 -
 funcs/func_shell.c       | 1 -
 funcs/func_strings.c     | 1 -
 funcs/func_sysinfo.c     | 1 -
 funcs/func_timeout.c     | 1 -
 funcs/func_uri.c         | 1 -
 funcs/func_version.c     | 1 -
 main/abstract_jb.c       | 1 -
 main/acl.c               | 2 --
 main/adsistub.c          | 1 -
 main/alaw.c              | 1 -
 main/app.c               | 2 --
 main/asterisk.c          | 2 --
 main/astmm.c             | 1 -
 main/audiohook.c         | 2 --
 main/autoservice.c       | 2 --
 main/callerid.c          | 1 -
 main/cdr.c               | 1 -
 main/channel.c           | 2 --
 main/chanvars.c          | 1 -
 main/cli.c               | 1 -
 main/config.c            | 2 --
 main/cryptostub.c        | 1 -
 main/db.c                | 2 --
 main/devicestate.c       | 1 -
 main/dial.c              | 2 --
 main/dns.c               | 1 -
 main/dnsmgr.c            | 1 -
 main/dsp.c               | 1 -
 main/enum.c              | 2 --
 main/file.c              | 2 --
 main/frame.c             | 3 ---
 main/hashtab.c           | 2 --
 main/http.c              | 1 -
 main/image.c             | 2 --
 main/indications.c       | 1 -
 main/io.c                | 1 -
 main/loader.c            | 2 --
 main/logger.c            | 1 -
 main/manager.c           | 2 --
 main/netsock.c           | 2 --
 main/pbx.c               | 2 --
 main/privacy.c           | 2 --
 main/rtp.c               | 2 --
 main/say.c               | 1 -
 main/sched.c             | 1 -
 main/slinfactory.c       | 1 -
 main/srv.c               | 1 -
 main/tdd.c               | 1 -
 main/term.c              | 1 -
 main/threadstorage.c     | 1 -
 main/translate.c         | 1 -
 main/udptl.c             | 2 --
 main/ulaw.c              | 1 -
 main/utils.c             | 2 --
 85 files changed, 115 deletions(-)

diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index b5b83cd02d..f0f85b9429 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/res_odbc.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 
 #define	CONFIG	"cdr_adaptive_odbc.conf"
 
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 2db2221b06..06e03c9722 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -32,7 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <time.h>
 
 #include "asterisk/config.h"
@@ -40,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index d84746eb5e..dab0a1b9f0 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -34,7 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <time.h>
 
 #include "asterisk/channel.h"
@@ -42,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 
 #define CUSTOM_LOG_DIR "/cdr_custom"
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index e204337d57..b6f5deb6a4 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/manager.h"
 #include "asterisk/config.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index effa615123..b146856d96 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/res_odbc.h"
 
 #define DATE_FORMAT "%Y-%m-%d %T"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 5f279960f9..4517c70b80 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 
 #define DATE_FORMAT "%Y-%m-%d %T"
 
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index cc77090166..962acc9c73 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -34,14 +34,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
 
-#include <errno.h>
 #include <time.h>
 #include <radiusclient-ng.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
 
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index b08ce164d3..c8c0690361 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 
 #define LOG_UNIQUEID	0
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 8f87620ed8..780b252fff 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -40,7 +40,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <time.h>
 #include <sqlite3.h>
 
@@ -49,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/options.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 64faef59c3..ef0cce0961 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -75,7 +75,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 
 #ifdef FREETDS_PRE_0_62
 #warning "You have older TDS, you should upgrade!"
diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 2d86d90e8c..4d582a3b4f 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index 331af81755..f66f5e61ec 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 2c7a3fcdd2..4be41d14d0 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 5f8cf0febf..63d49fd428 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/cdr.h"
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 7236095a9d..d920ac21f7 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/indications.h"
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 107b607a05..01b13ce8de 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cli.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 2840fceb93..9228fd61a9 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -29,7 +29,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_db.c b/funcs/func_db.c
index c1da3870a1..0fa17fd615 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index bb06c15603..fbe51def8c 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/enum.h"
 #include "asterisk/app.h"
diff --git a/funcs/func_env.c b/funcs/func_env.c
index 102414b162..362e9db504 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index c136743574..89d92d8a57 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index 72d62b227d..19cd2e54cc 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -32,13 +32,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <iconv.h>
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 4ed1131377..3cef46a193 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index bcee8ba321..7fca070aa8 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_math.c b/funcs/func_math.c
index fe9a078f71..45036d5ad7 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/config.h"
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 8c3f55f515..8d4cf7e873 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_module.c b/funcs/func_module.c
index a745212998..3f64a4941c 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 5a0fc334c4..2928ba31cf 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -36,11 +36,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/module.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 716c803203..443a028fda 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index c31d0e0422..08950dad83 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index c6d7912a0e..96a8c771b5 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_shell.c b/funcs/func_shell.c
index 5d2626d1c1..57a9819cd3 100644
--- a/funcs/func_shell.c
+++ b/funcs/func_shell.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 39b402211d..8d678fc578 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/localtime.h"
diff --git a/funcs/func_sysinfo.c b/funcs/func_sysinfo.c
index 467c574034..a9760fc512 100644
--- a/funcs/func_sysinfo.c
+++ b/funcs/func_sysinfo.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 87233 $")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 2baea1e21f..d90281a70d 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index c8ecb7bb32..94ae220b61 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 
diff --git a/funcs/func_version.c b/funcs/func_version.c
index a42462e7e4..4de7131c32 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index fe2f07aeb8..8bdc825414 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/term.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/acl.c b/main/acl.c
index a03978aded..ae3aa63065 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
@@ -43,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #endif
 
 #include "asterisk/acl.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/adsistub.c b/main/adsistub.c
index e24b68c91d..c9d8824363 100644
--- a/main/adsistub.c
+++ b/main/adsistub.c
@@ -23,7 +23,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/adsi.h"
-#include "asterisk/logger.h"
 
 #ifdef SKREP
 #define build_stub(func_name,...) \
diff --git a/main/alaw.c b/main/alaw.c
index 8baa6a7a35..8d35952068 100644
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/alaw.h"
-#include "asterisk/logger.h"
 
 #ifndef G711_NEW_ALGORITHM
 #define AMI_MASK 0x55
diff --git a/main/app.c b/main/app.c
index 07b442c47e..2326cba07d 100644
--- a/main/app.c
+++ b/main/app.c
@@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/file.h>
@@ -41,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/asterisk.c b/main/asterisk.c
index 905fb2f458..dc01337581 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -69,7 +69,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sched.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <errno.h>
 #include <ctype.h>
 #include <sys/resource.h>
 #include <grp.h>
@@ -92,7 +91,6 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #endif
 
 #include "asterisk/network.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/channel.h"
diff --git a/main/astmm.c b/main/astmm.c
index 7f112c007a..298300968f 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <time.h>
 
 #include "asterisk/cli.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/lock.h"
 #include "asterisk/strings.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index 67c77423ab..f9e93220cd 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -28,9 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <signal.h>
-#include <errno.h>
 
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/autoservice.c b/main/autoservice.c
index 137b7f22eb..9e5c173ea6 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -29,14 +29,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/file.h"
 #include "asterisk/translate.h"
 #include "asterisk/manager.h"
diff --git a/main/callerid.c b/main/callerid.c
index 2b1329f3ca..4662915aef 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
 #include "asterisk/callerid.h"
-#include "asterisk/logger.h"
 #include "asterisk/fskmodem.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/cdr.c b/main/cdr.c
index 77e6c865d4..62f2ee6777 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
-#include "asterisk/logger.h"
 #include "asterisk/callerid.h"
 #include "asterisk/causes.h"
 #include "asterisk/options.h"
diff --git a/main/channel.c b/main/channel.c
index 524a8ac439..94814e4500 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <math.h>
 
 #include "asterisk/zapata.h"
@@ -40,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/musiconhold.h"
-#include "asterisk/logger.h"
 #include "asterisk/say.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
diff --git a/main/chanvars.c b/main/chanvars.c
index ad92072f0f..14a89f7678 100644
--- a/main/chanvars.c
+++ b/main/chanvars.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/chanvars.h"
-#include "asterisk/logger.h"
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
 
diff --git a/main/cli.c b/main/cli.c
index a9f9fc37cf..aae8dfc046 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <regex.h>
 
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/config.c b/main/config.c
index cb4e9cabcc..a0c15dce24 100644
--- a/main/config.c
+++ b/main/config.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/network.h"	/* we do some sockaddr manipulation here */
-#include <errno.h>
 #include <time.h>
 #include <sys/stat.h>
 #define AST_INCLUDE_GLOB 1
@@ -46,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/app.h"
diff --git a/main/cryptostub.c b/main/cryptostub.c
index 05fb39d299..c3b59c7b3b 100644
--- a/main/cryptostub.c
+++ b/main/cryptostub.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/crypto.h"
-#include "asterisk/logger.h"
 
 static struct ast_key *stub_ast_key_get(const char *kname, int ktype)
 {
diff --git a/main/db.c b/main/db.c
index ab9821d469..ea22f5674a 100644
--- a/main/db.c
+++ b/main/db.c
@@ -33,14 +33,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <dirent.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/astdb.h"
 #include "asterisk/cli.h"
diff --git a/main/devicestate.c b/main/devicestate.c
index c1ea18c5a0..91ef8ee5d0 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -116,7 +116,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
-#include "asterisk/logger.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
diff --git a/main/dial.c b/main/dial.c
index 252aa3c034..e6f926905f 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -29,9 +29,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/dns.c b/main/dns.c
index 229122ac46..21a8e967aa 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <arpa/nameser.h>	/* res_* functions */
 #include <resolv.h>
 
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/dns.h"
 #include "asterisk/endian.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index acf618fac2..d5ab8e0cec 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
diff --git a/main/dsp.c b/main/dsp.c
index 8f806a4286..80fdf95eb0 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/dsp.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/alaw.h"
diff --git a/main/enum.c b/main/enum.c
index 29a32126ce..011dfa5610 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -55,9 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <resolv.h>
 #include <ctype.h>
 #include <regex.h>
-#include <errno.h>
 
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/enum.h"
 #include "asterisk/dns.h"
diff --git a/main/file.c b/main/file.c
index a01fc5829a..ddedf8aee4 100644
--- a/main/file.c
+++ b/main/file.c
@@ -27,7 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <sys/stat.h>
@@ -35,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/frame.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
diff --git a/main/frame.c b/main/frame.c
index f756ee23c8..85fa6a96a4 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -27,11 +27,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cli.h"
diff --git a/main/hashtab.c b/main/hashtab.c
index 789438d206..0be0d21cdc 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -27,11 +27,9 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision")
 
 #include <ctype.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cli.h"
diff --git a/main/http.c b/main/http.c
index ee5fad2d1e..d9d670e7ab 100644
--- a/main/http.c
+++ b/main/http.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/signal.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 
diff --git a/main/image.c b/main/image.c
index f677aadfa4..539f1f8ec6 100644
--- a/main/image.c
+++ b/main/image.c
@@ -30,12 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <signal.h>
-#include <errno.h>
 
 #include "asterisk/sched.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/file.h"
 #include "asterisk/image.h"
 #include "asterisk/translate.h"
diff --git a/main/indications.c b/main/indications.c
index 0733a7d6ce..e2e13d17d3 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/frame.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 
 static int midi_tohz[128] = {
diff --git a/main/io.c b/main/io.c
index df06502f80..3f35b5feea 100644
--- a/main/io.c
+++ b/main/io.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 
 #include "asterisk/io.h"
-#include "asterisk/logger.h"
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
 
diff --git a/main/loader.c b/main/loader.c
index e492538e04..372af6eb53 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -32,13 +32,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <dirent.h>
-#include <errno.h>
 
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/term.h"
 #include "asterisk/manager.h"
diff --git a/main/logger.c b/main/logger.c
index d1c5b476af..4150197617 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <signal.h>
 #include <time.h>
-#include <errno.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 9edc02ad1b..f7f818c79c 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/mman.h>
 
 #include "asterisk/channel.h"
@@ -57,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/callerid.h"
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
diff --git a/main/netsock.c b/main/netsock.c
index 5eedb324f1..1ff433bf07 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
@@ -43,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #endif
 
 #include "asterisk/netsock.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
diff --git a/main/pbx.c b/main/pbx.c
index 7c35d5eebb..2c12f794cc 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <time.h>
 #include <sys/time.h>
 #include <limits.h>
@@ -44,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/file.h"
 #include "asterisk/callerid.h"
 #include "asterisk/cdr.h"
diff --git a/main/privacy.c b/main/privacy.c
index e52327fc34..40e5b3bf6b 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -29,14 +29,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <dirent.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/astdb.h"
 #include "asterisk/callerid.h"
diff --git a/main/rtp.c b/main/rtp.c
index 03765eb610..f52d5751ad 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -32,12 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #include "asterisk/rtp.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/acl.h"
diff --git a/main/say.c b/main/say.c
index 70537c3c2f..f63a941b1c 100644
--- a/main/say.c
+++ b/main/say.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
diff --git a/main/sched.c b/main/sched.c
index 4e7e55423d..ad32a1d1e5 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 
 #include "asterisk/sched.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
diff --git a/main/slinfactory.c b/main/slinfactory.c
index 73ef6280e0..25d232a377 100644
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/frame.h"
 #include "asterisk/slinfactory.h"
-#include "asterisk/logger.h"
 #include "asterisk/translate.h"
 
 void ast_slinfactory_init(struct ast_slinfactory *sf) 
diff --git a/main/srv.c b/main/srv.c
index 262be8079d..4394b39034 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <resolv.h>
 
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/srv.h"
 #include "asterisk/dns.h"
 #include "asterisk/options.h"
diff --git a/main/tdd.c b/main/tdd.c
index cb3e2f1d72..13dda7e116 100644
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/ulaw.h"
 #include "asterisk/tdd.h"
-#include "asterisk/logger.h"
 #include "asterisk/fskmodem.h"
 #include "ecdisa.h"
 
diff --git a/main/term.c b/main/term.c
index 2f679d8987..d79c83c106 100644
--- a/main/term.c
+++ b/main/term.c
@@ -29,7 +29,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 5416714966..5a6f4b3e86 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -29,7 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/logger.h"
 #include "asterisk/strings.h"
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
diff --git a/main/translate.c b/main/translate.c
index 29e438afe2..1375e588b3 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
diff --git a/main/udptl.c b/main/udptl.c
index 33671802d0..0e0e98d3da 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -52,12 +52,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
 #include <signal.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #include "asterisk/udptl.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/acl.h"
diff --git a/main/ulaw.c b/main/ulaw.c
index 8e47d8a771..18a118f60d 100644
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/ulaw.h"
-#include "asterisk/logger.h"
 
 #if 0
 /* ZEROTRAP is the military recommendation to improve the encryption
diff --git a/main/utils.c b/main/utils.c
index ebec01e383..8b3448f029 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <sys/stat.h>
 
 #ifdef HAVE_DEV_URANDOM
@@ -40,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #define AST_API_MODULE		/* ensure that inlinable API functions will be built in lock.h if required */
 #include "asterisk/lock.h"
 #include "asterisk/io.h"
-#include "asterisk/logger.h"
 #include "asterisk/md5.h"
 #include "asterisk/sha1.h"
 #include "asterisk/options.h"
-- 
GitLab