diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 75cb3ae09..d2e288d47 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -35,10 +35,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 6c7a0a41f..3da502709 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -39,7 +39,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/module.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 040925738..11d699d03 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -29,11 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 2cf79138d..4a8b9bf28 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -31,12 +31,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/ioctl.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index c446d277b..a092690b5 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 4061ac91d..37cb3e5fd 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/features.h"
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index dc3e112fc..626d6b5fc 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -31,7 +31,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/app.h"
diff --git a/apps/app_db.c b/apps/app_db.c
index 811390829..faf28c0d2 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/options.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 00fe86bc3..dfaa6822d 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -29,7 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
@@ -37,7 +36,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/options.h"
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index db518788f..a5e27c7eb 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/stat.h>
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 390e5b01a..b823f5816 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_directory.c b/apps/app_directory.c
index d316f1a6a..df8f83c6c 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -33,7 +33,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/module.h"
diff --git a/apps/app_disa.c b/apps/app_disa.c
index cffca0ff0..9ca3ae867 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/app.h"
 #include "asterisk/indications.h"
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 768f3e2db..1f5425ebb 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -33,7 +33,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 44e6f0981..cebd468c6 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 3513b3b2a..69eb458e0 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -31,7 +31,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/apps/app_externalivr.c b/apps/app_externalivr.c
index 3774c8ad8..c28432be8 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -40,7 +40,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/module.h"
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 5b2f85cd0..9e1edbdb8 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_flash.c b/apps/app_flash.c
index d1d33ebf3..37965fe50 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -33,12 +33,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index dee42c2be..57f440b31 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -36,7 +36,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/options.h"
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index cc1872c7a..c74de67b7 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 7cbf986f6..1eaf17a90 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_ices.c b/apps/app_ices.c
index a015b0d5b..6f6c54b39 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -34,11 +34,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_image.c b/apps/app_image.c
index 875f2a617..28598f5d1 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 2e7cb05c4..6dbbe7191 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -34,7 +34,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 37b7a0aea..f35e9e51e 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0587d7379..cb16bbf66 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -43,7 +43,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/module.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 63ce6f9f6..ee5bfda46 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -33,7 +33,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/module.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index d2c2abe6d..a33415fe8 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -145,7 +145,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -158,7 +157,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astobj.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index c30a737cd..775c4fc68 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -38,7 +38,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 08a4ec844..e9b7aab22 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.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/apps/app_mp3.c b/apps/app_mp3.c
index 3243713a7..6404276b9 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index e076dea84..4c212564f 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 13e43ea95..39027f493 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -37,7 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <osp/osp.h>
 #include <osp/osputils.h>
 
@@ -51,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
 #include "asterisk/cli.h"
-#include "asterisk/logger.h"
 #include "asterisk/astosp.h"
 
 /* OSP Buffer Sizes */
diff --git a/apps/app_page.c b/apps/app_page.c
index e2e7472a1..5702735b3 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -34,10 +34,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 9ae1f2e90..fc63772a7 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -34,7 +34,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index fd4b4d585..a970e6c05 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 02bae7302..ecae9c15d 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3ceecb72f..2f83f7050 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -60,14 +60,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/apps/app_read.c b/apps/app_read.c
index 32e9202be..81eb95ba9 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -31,7 +31,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/app.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index fbff8833a..eda674b33 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -31,7 +31,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/app.h"
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 2ea9fb592..82ffb3118 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -30,7 +30,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/apps/app_record.c b/apps/app_record.c
index 273b702b4..0b698be5a 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index e9c9d734b..ad4b15006 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -211,7 +211,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <search.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <sys/time.h>
@@ -225,7 +224,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/callerid.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 006782496..2d084fc99 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -30,7 +30,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/apps/app_senddtmf.c b/apps/app_senddtmf.c
index a1626853d..7fd13f9c7 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 01a2dea29..46660e4e4 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -33,7 +33,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/module.h"
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 3b542fb3e..c76b80eef 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 518da5073..8365b506a 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -35,7 +35,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 5e9c7c00c..8a986a2e9 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -38,14 +38,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <sys/stat.h>
 
 #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/apps/app_softhangup.c b/apps/app_softhangup.c
index 4c22cc27e..7af852560 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 1a4cf23ba..327e7922f 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index dac03125d..a175438a1 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index 2e22b3753..fd4138e68 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -33,7 +33,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/module.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 48ac4dd8d..d80af7d87 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_test.c b/apps/app_test.c
index b2a840647..3853bc322 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 1309d9d62..b808eb415 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -33,7 +33,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/module.h"
diff --git a/apps/app_url.c b/apps/app_url.c
index 1d505cddd..7d0eb00d7 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 44bf2e0bf..851641f45 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -27,7 +27,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/module.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 80af80284..d3719e901 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -29,7 +29,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c140a635d..0287b6657 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -65,7 +65,6 @@ c-client (http://www.washington.edu/imap/
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -89,7 +88,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/options.h"
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index e66a94182..76717444c 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 265d4639e..1984a5aba 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -37,7 +37,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/dsp.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index bb3956a1f..ed6c0615a 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 #include "asterisk/config.h"
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index c3467e1c7..74c458c55 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -31,7 +31,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/module.h"
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 2c321b692..663c7b110 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -44,7 +44,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/module.h"
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index a15f0c2b2..4af24231e 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -41,14 +41,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #endif /* __linux__ */
 
-#include <errno.h>
 #include <fcntl.h>
 
 #include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 95721b871..27f3a3ec7 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -38,13 +38,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index cc202a585..b5e195c98 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -35,7 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <netdb.h>
@@ -46,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 282dd0cf4..484270ec7 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -36,7 +36,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
@@ -45,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <alsa/asoundlib.h>
 
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 4545b1b62..f16c87a8f 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -34,14 +34,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 5ebc5853c..e28684e1b 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -36,7 +36,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -48,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 7e1bb0677..ad3b4e504 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -60,7 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netdb.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #ifdef __cplusplus
@@ -68,7 +67,6 @@ extern "C" {
 #endif
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c50ac1396..42b899714 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/signal.h>
 #include <signal.h>
 #include <strings.h>
-#include <errno.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -59,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/frame.h" 
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/sched.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 6f52731eb..f8072fd54 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -38,7 +38,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -50,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 789cf54b3..c6b5638ff 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -29,14 +29,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 7bc1c26d5..be9b2f046 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
@@ -49,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 75b9a2e1a..36cf5beba 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <pthread.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -51,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 1712942d4..86a042c0e 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -44,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index cc65f4738..8f3e084bb 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #ifdef __linux
 #include <linux/soundcard.h>
@@ -57,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index faec92c4d..f468a9868 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -52,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 106368caf..28f23d64a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -89,7 +89,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -100,7 +99,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index d8d269416..4014d742a 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -46,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index c39bcd22b..7cd9aab46 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <net/if.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
@@ -54,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 47952c560..6c9da9660 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <usb.h>
 #include <alsa/asoundlib.h>
 
@@ -101,7 +100,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/logger.h"
 #include "asterisk/callerid.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index bf4ef0ff7..e6f808cdb 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 9b9f7e92b..633d7b9bd 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #else
 #include <sys/signal.h>
 #endif
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <math.h>
 #include <ctype.h>
@@ -73,7 +72,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 5c0f93240..5a06a8f9b 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 2bd7ef9a8..b6a01ec06 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/lock.h"
 #include "asterisk/pbx.h"
 #include "asterisk/strings.h"
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 8cf89b68a..814217896 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/channel.h"
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index c63544b77..17605cd14 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index c7a85feb2..2b4ff3731 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 38014dabe..00cb55a6f 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 9ef79add7..6423a7187 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 99b5322d0..817cb3bcb 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 5caec75f5..3354dde00 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index bee74ddf9..9048957a1 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 205349056..2113b9b88 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 47c0b8a93..5c5206fbb 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index 31c84438a..e3994cd58 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <sys/mman.h>
 #include <zaptel/zaptel.h>
 
@@ -48,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 9a9f1af30..211f6d4f0 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <errno.h>
 #include <sys/time.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 93e3dc873..259662531 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -35,13 +35,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 003d93473..5f8cb60b7 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 55c65b11b..b2559054a 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -30,12 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 09e4d3c4e..d233a0370 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 05b2624e7..e4feaf41a 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 35278e0b6..f54b64cd2 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -32,12 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index 8c4c4e337..dd875d66f 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -31,11 +31,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/image.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index da0ec0ea0..b34421ccb 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
@@ -50,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 05fd02fe6..df5b41506 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -30,13 +30,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-// #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 3fe406da3..609520a08 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -29,12 +29,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 4460b21ea..ffbf24090 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 2abddc219..7d8ccc30c 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -31,12 +31,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 36a6d4b63..727e377c8 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -34,12 +34,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/include/asterisk.h b/include/asterisk.h
index 9881711e1..d4b2f0391 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -30,6 +30,7 @@
 #include "asterisk/compat.h"
 
 #include "asterisk/paths.h"
+#include "asterisk/logger.h"
 
 /* Default to allowing the umask or filesystem ACLs to determine actual file
  * creation permissions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index 25476bc47..d918cd707 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -117,6 +117,8 @@ size_t strlcat(char *dst, const char *src, size_t siz);
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
+#include <errno.h>
+
 #ifdef SOLARIS
 #define __BEGIN_DECLS
 #define __END_DECLS
diff --git a/main/logger.c b/main/logger.c
index 457c2bd07..d1c5b476a 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,6 +25,10 @@
  * \author Mark Spencer <markster@digium.com>
  */
 
+/* Prevent inclusion of logger.h - it redefines LOG_* which we need
+ * to define syslog_level_map. Later, we force its inclusion again.
+ */
+#define _ASTERISK_LOGGER_H
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -55,6 +59,7 @@ static int syslog_level_map[] = {
 
 #define SYSLOG_NLEVELS sizeof(syslog_level_map) / sizeof(int)
 
+#undef _ASTERISK_LOGGER_H	/* now include logger.h */
 #include "asterisk/logger.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 5eabbd15f..5a1cf14db 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -36,13 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <time.h>
 #include <math.h>
-#include <errno.h>
 
 #include "asterisk/adsi.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/alaw.h"
 #include "asterisk/callerid.h"
-#include "asterisk/logger.h"
 #include "asterisk/fskmodem.h"
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index e1fd46718..92d2d5d4f 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_agi.c b/res/res_agi.c
index 55659f3cf..d8df0791b 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -31,13 +31,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
 #include "asterisk/network.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 5ecf0f782..3d20e3ca3 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 86c071cdc..129c3cbe9 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -39,7 +39,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 233fc6a69..f40d34186 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <libpq-fe.h>			/* PostgreSQL */
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index ed0172631..69db445c8 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -91,7 +91,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
 #include "asterisk/config.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/linkedlists.h"
diff --git a/res/res_convert.c b/res/res_convert.c
index c4fc4a630..0b4d664ff 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/file.h"
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 0b3b16ed2..a5782f9f0 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -37,12 +37,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
diff --git a/res/res_features.c b/res/res_features.c
index 9d6356ae7..14550b80f 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -28,14 +28,12 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <pthread.h>
-#include <errno.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
diff --git a/res/res_indications.c b/res/res_indications.c
index 49121084b..a957b7828 100644
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -29,13 +29,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <sys/stat.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/cli.h"
-#include "asterisk/logger.h"
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_jabber.c b/res/res_jabber.c
index b9bfa6c47..57f3a25ab 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -43,7 +43,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/res/res_limit.c b/res/res_limit.c
index b8cc175d0..28a5e1323 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <errno.h>
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 
diff --git a/res/res_monitor.c b/res/res_monitor.c
index e3698167e..4a401a411 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -27,13 +27,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <sys/stat.h>
 #include <libgen.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
-#include "asterisk/logger.h"
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index dc42b6790..d82a65770 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -34,7 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <ctype.h>
 #include <signal.h>
 #include <sys/time.h>
@@ -51,7 +50,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/options.h"
diff --git a/res/res_odbc.c b/res/res_odbc.c
index b458d602d..fcde0f7cf 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -39,7 +39,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
 #include "asterisk/options.h"
diff --git a/res/res_realtime.c b/res/res_realtime.c
index 057657999..7d42dda2f 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -32,7 +32,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index c785f2339..376ccc052 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -26,7 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <termios.h>
 #include <sys/time.h>
 #include <time.h>
@@ -39,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/astobj.h"
 #include "asterisk/io.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 
 /* Message expiry time in milliseconds */
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 1fac2c31e..eafc53c91 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -27,7 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/logger.h"
 #include "asterisk/options.h"
 
 #include "snmp/agent.h"