diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index b5b83cd02ddbdedac616e1466818fea333570791..f0f85b94294b86fac4a122353992a815c51f13d1 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 2db2221b06b603ddd115ba42b23da9c373847507..06e03c9722ba85b55f9c869226c75237808a40ba 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 d84746eb5e8b8acaba8261b6570c1b3dd8addec8..dab0a1b9f05ea27177b2ffe9246a8868b2bc3b26 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 e204337d571f7a0b521897d09ab485a8ea548793..b6f5deb6a4ebacd8bb2d477f6e8f21f2e3613df1 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 effa6151230eb7458dea64e6907269e6e382f26b..b146856d9676b76d970ee29d0b1284b8e777577b 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 5f279960f98a00857588943d7708e832eaa20bce..4517c70b8089e6a5254d5343159f1c284be3cab4 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 cc7709016610fb07864e705af103f1872ff36a1a..962acc9c73649349e2f0879e3478a74aa5f215ca 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 b08ce164d3b2222594557d58f9fbdce896f09b51..c8c0690361220a8db72f93434e40e7b97cb5589c 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 8f87620ed8cca434049905d9db344e2b96dd4c1b..780b252fffabb35b1adf3971d91ce4230dee573f 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 64faef59c3c816ad546a13c1a897a886583a5e93..ef0cce0961b6d9050ecf9ec0880ee610b3dca09e 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 2d86d90e8cd942fc80932570adcf2f083497e8e4..4d582a3b4f91c1d6f69ff5ad64a6317f229f275c 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 331af817552559f2540ec6f31e944946355062d1..f66f5e61ec153ac622ffcb8b4f9d152409cadaa0 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 2c7a3fcdd29d6eb80490c517417c7bf10dddaa1a..4be41d14d0e4b1ef3057a33156415f0c266ac17a 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 5f8cf0febfbbf665f48c0ab69f268fcce2967e39..63d49fd428e14fa2097576b3a20c345887980284 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 7236095a9d8bdfbf878755364994b40b931e6d39..d920ac21f7c25d8f27890cf9bd7090a70e552957 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 107b607a05f36464178788ca01b687df43431410..01b13ce8de36966d7303671943df6b3c50a20865 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 2840fceb93d0b5b7b92992939834e0d81f7b587c..9228fd61a90588478e3047be162ab4d8fe8c09cf 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 c1da3870a1f9f74cf1db893b36f5c91632b09269..0fa17fd6152d11becef3822171161c07858793c2 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 bb06c1560332affb99468dd8d7c0b4a360af6060..fbe51def8c25c0a58204184c4ed523e62a10d792 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 102414b162a57b1d39d065c66f9dbd3784014c3f..362e9db504583007d32bc6ff6329765ca685d8f7 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 c13674357453f1a2f4c93a5759a3cb4edb5245b7..89d92d8a5708e00bd32ceed492629e64f1bcd260 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 72d62b227dd9d60850cd378fda47c106f8588ff2..19cd2e54cce531374225f027800589b3f72777a7 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 4ed1131377484b70bcd61f0eab41bf53b0ecd98d..3cef46a193e8264d4fe115e77853edd26222fd0d 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 bcee8ba321c5094bf528d995dfa04dcb576dea40..7fca070aa828ee462a884c36f1a6667f2462828c 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 fe9a078f7136ea9ba9a8b924b5407a157f38e301..45036d5ad76dae7e855809252aaf5a40d6e049a2 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 8c3f55f5159a3decaa020848ad75412f63d90950..8d4cf7e87387afafb4e91c2ba64fe3ef88094c81 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 a745212998cbac156cbd14e499d59e25e1457e9c..3f64a4941cfd2ae03d87273e8edead3437b00439 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 5a0fc334c4d685a69ab465f4f866f90548108f31..2928ba31cfe9b16791e8e5d11abce4ef04d37660 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 716c803203c168cd15d8e6510ad426cad80b227f..443a028fdaa47f5a177fd9403f47ee9e544557fb 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 c31d0e042263c27d235f9228a965f87e51ad1b66..08950dad837b76527a5721fcc0c3263b5f30e746 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 c6d7912a0eefaf9f9a2ff382e1aef2169f1b3310..96a8c771b5151f7bdccbd1d0d79596cb25a2ee2b 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 5d2626d1c1a07f19add0d4c3225fc650fcee3634..57a9819cd3e1b0d26e5fcb1ca4f8ba2d5345e881 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 39b402211d8877b157712ee5f262c120e9fb9610..8d678fc578fa46bae9d9e9f173165e6b8162e846 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 467c574034abfd2a50a0f8533552044215f4fd6b..a9760fc512c71382ca32e609e1ad467076ff9ea4 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 2baea1e21f3067798b5b366de970be31f81341c0..d90281a70d934691dd77bfb7bfd120e54c81de2b 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 c8ecb7bb3221fefac52e31103267832dae58ec1a..94ae220b6195de264391ad856d9086511ed7d481 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 a42462e7e47693bb6915ee022218eb10cd4c5c93..4de7131c320437d4f9646ca5af4c5f68205e33c8 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 fe2f07aeb8b9b2397be126f8d5acdc31b50938c7..8bdc8254146d9fcb48e31ac694f6a30b370cd994 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 a03978aded62ca20b6dca40f972841f435e6ae49..ae3aa630652bc52923f1bba86716047e8d7c5637 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 e24b68c91d86f3c58686a8a431dca88820cb9838..c9d8824363ccc803ac2c53764446b8d75097bdf1 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 8baa6a7a3576b9358760a0a9b43277f3405720a1..8d35952068e7bee671f304e1d6ff269b5cb54047 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 07b442c47e6b3ee20589169876696f21d1ffc70e..2326cba07d2e78391afac5f1841512fb96b53e9e 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 905fb2f4581c62eb926a0da8a99bf6e9340ca46a..dc013375816fca2fbaf2b7900adacab1b3a72cc6 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 7f112c007a080d4e4d924f5c934716564c90ad11..298300968f2242e7011f2b4257af9fd9528a93e7 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 67c77423ab2b2873ff0deb27c14c24e0eef67628..f9e93220cd15d3b6f4a09bb0b8c27cd774863a4f 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 137b7f22eb3f1a633f19991c130974e882a2b525..9e5c173ea6a2edaebb981c14212d944a528bf7d6 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 2b1329f3ca8f1f3873b927f430b4d3bd79e02d30..4662915aefc4b7aa9c91e2609ad63a84d6abcb64 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 77e6c865d448f08732cc5959e0d0474dfd5f8a96..62f2ee677757b6db13912813b260e7360bcbcde8 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 524a8ac4392730af5a9aae1ddf7a6df9f59f4f9a..94814e45003cbe9a409fec79446e9fe9d3050ac4 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 ad92072f0f21fb3e8cf420f1aaeb95d05ae5df4c..14a89f7678bc0f29286c51ed0111ee35242b0a5b 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 a9f9fc37cf0e35224f367397963a5cb2fcf06c0c..aae8dfc046b66578e4007c1876017d429cf95f9c 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 cb4e9cabccaffef8b8727605241f4677f5a464bd..a0c15dce2426cdd9864697c41f58bb33631f1415 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 05fb39d299dba4ec3f065fb3293fac41f8441e1c..c3b59c7b3b454040b47834aac1dc6b4eac4fd3a7 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 ab9821d469fc8ba6f793b43d1669b6d45d1402fd..ea22f5674a9cce4efe9cdf78a68314de6ed26e49 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 c1ea18c5a0339df7dc5d9a5614abf0259064d54b..91ef8ee5d02bd65dae7dd4fd34c09ce693c77f10 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 252aa3c03458d1eba49e825218ba80e592663a27..e6f926905f51d9291e0f8bd09948a90b4b440434 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 229122ac465787b6bffa14a0213baee98646b5f9..21a8e967aa96213ebb49ed392fe1560df30ee8e0 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 acf618fac2a34000da6bb991255fc1b703f900be..d5ab8e0cec1181e3c44890c0723558c4deb8ebbb 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 8f806a4286044d3270fa6bd1677babaa4857d4f7..80fdf95eb0ea4ff3ed4eabe48fc13138f335cca5 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 29a32126cef025920389592e5c2b03eee01b8e01..011dfa56102bdcb98db1f261a33e065a2a326c70 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 a01fc5829a87782757cbaeef235eeda84f706a2a..ddedf8aee4009c98e16c6fc3b776c201d9fd79a8 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 f756ee23c82cdc2f1d3224f99e8d930bb1261996..85fa6a96a4c9f5bf550192571896a7eb91168cda 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 789438d206f3572451f5abe0759226e09c1c7fed..0be0d21cdc93ff0d47d7571412349f79b36db149 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 ee5fad2d1ecf30f90352330abc536cad625c299b..d9d670e7ab0db80dd9a395df0fe617ff0d244777 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 f677aadfa4618862c3bd926c9725ab1a43995ecd..539f1f8ec6b5b286b2f615e70e9e942d039893f1 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 0733a7d6cef19c5d1fe67044df890185bcfb066e..e2e13d17d3f8ee353f10b8e03d0f523451b50ba0 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 df06502f8080573e6550abf38fa0a8f6b2c0f4f1..3f35b5feea299959fdcab3c13a1c791ff5eee87f 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 e492538e04237648c59872c6ea1fbb03e8863198..372af6eb5382cd58d027a6d996d05054d0ee576e 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 d1c5b476af337cb1587486ee7e7a0bb543f2539a..41501976179d0cf92731043f42c0b5fdf0d66a40 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 9edc02ad1ba73652e444ccb4bad8da05ded20fff..f7f818c79cabaf68ccd611dd6a2a239d12b2139b 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 5eedb324f116636b2698eb2c914ee3c074b27819..1ff433bf07fe0215b8b4b4462a095f1b4b2d985f 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 7c35d5eebb64f6f6bc961307fae057ebbe86d822..2c12f794cc363122139c88ee902904ba77d944ee 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 e52327fc34b3d01f44019b8d7d25b48c9859ff8b..40e5b3bf6b08004541d2912b5913306b659185d5 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 03765eb6103f49a8fa45d60858600644658799e7..f52d5751ad05dab08db36f16aca21a8cb00cd9d3 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 70537c3c2f377f0b5af90c5fc159800f535af846..f63a941b1c41482e52392c7a35b49db7bb1b29b0 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 4e7e55423dd52362d89091001099eea7646c99bd..ad32a1d1e51fcc00db0035d6a8db2a7523e9a61c 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 73ef6280e03288203984f0a27451b2a04f06a39b..25d232a377cf33665df2b5fdac0a66f3337c9203 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 262be8079d9ef1cd183f5dc856f895cce1635f1d..4394b3903443502f6ca75f07b7d84aca3238c892 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 cb3e2f1d727c08c465b9204531d6f99e29e0f594..13dda7e116bd4b51353b0e266e182fab323c6018 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 2f679d89871b18e8e1ab9e0a63345062c643c6cf..d79c83c10606a4aea007287023c45a7b6deab222 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 541671496619db02cd20ccf5afcf0e8ca32416bf..5a6f4b3e86fd1bbd833b0bef9f63bc7889d1b541 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 29e438afe2173c3afbf57e3e2c91573568d8bc03..1375e588b3a30c6d8596582c909208e4fc5a20e7 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 33671802d0bd7da7e47c15ea87e0e805c50b41d2..0e0e98d3da67d3ea76fc40e90bb624ed60dd24c7 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 8e47d8a771bc5266892ea43c7d05709b629a7833..18a118f60db07343d245af1a9c1bc08edba003a5 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 ebec01e3831eeff939abc69bb750da9596d978ff..8b3448f02994930dc9ed0be95463a86974472798 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"