diff --git a/apps/app_directory.c b/apps/app_directory.c
index df8f83c6c6bb460f2888cbf45ff59df7132cea96..41252692c34564660c410657252aa468dc2ab109 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 
 #ifdef ODBC_STORAGE
-#include <errno.h>
 #include <sys/mman.h>
 #include "asterisk/res_odbc.h"
 
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index c28432be800010cf3034705e33bf38ae6117ee1d..8ebb60c5f9ff02d6d979d7953ce98b91bfa60830 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -35,7 +35,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include <signal.h>
 
 #include "asterisk/lock.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index cb16bbf6651d924a5068265820f834fe3edc0079..e5a17bdef07690e7601a1377a75f0afbe8180d29 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -37,8 +37,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index ee5bfda469997d6eb43c2e06ea7b2adaecbe0a60..50b14dbec9db3f3c3b9bd6d5048695cf8b11eb05 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -29,8 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index fd4138e689bad37a5d2d7c7991069a821ea9dc1f..e260baa31b93e747dacb1b03cd59cef06ce70fd5 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -29,8 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 663c7b11038ce642a5c1393d22eb6782dfe5d4c1..3732545fa39cb4eea905c198004a5b5c2d0ea38e 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -39,7 +39,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
 #include "asterisk/zapata.h"
 
 #include "asterisk/lock.h"
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 95e6a1693631ce9b576a2a3fe988c5e68a5ee33f..cffa65f40361333d0e625933bc25a230caaa7071 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <regex.h>
 #include <sys/stat.h>
 
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 24fa13ee4c21a0444d714436b83e21b2da0e873f..42e60af7702bd9bbc2eb37364a198d6c47ba13c0 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -28,7 +28,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <errno.h>
 
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index fb673c78fd58339588465945202a34ef1214ab57..3fbc6691e390171efe8d946f98ef4c95152da782 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/network.h"
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <zlib.h>
 #include <sys/signal.h>
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index 404b456b300473a724bc87caa5cc07075790cd0d..febadc1b1a7ed07a70b9efc95fbf6b649843495e 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -26,8 +26,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 8433102610be509b7eea1c85711839fb082566dd..598d38624a7e6a0bf10c2640ee4b9ec4704d14ee 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -32,8 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 12bd08b421195523fc404c7ee4a3ad9309c815af..5516162bfdc2cfa2e90754b06cbfbc996a35e125 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -27,8 +27,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <errno.h>
-
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 46cc44c9b9356b6e2efa0e8a485b679766d46c4d..31726526add6254576f66596dbe2b24b6c99a43d 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -27,7 +27,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/stat.h>
-#include <errno.h>
 #include <time.h>
 #include <utime.h>
 #include <dirent.h>