diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 8142178963312c100c517ece21a2bd6292ffe4fa..11541f5895172ab0f95edbaefac97929133fc0f3 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -28,12 +28,9 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/alaw.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/utils.h"
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 17605cd14669123d8680031ca144a32ca254c933..b375136b9abad34f52c129ff643844c6205780a1 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -32,15 +32,12 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 /* define NOT_BLI to use a faster but not bit-level identical version */
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 2b4ff37315780cf627d9211801fe281ee837546a..c6934cd89f222e8bec8ff0c50ad42f0efd7294a3 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -28,14 +28,10 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/alaw.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 00cb55a6f527d4b3f274bb7d5d11fb4c056d7906..bd15fee9e59e89e1ad9b17e5090b97524efe7e35 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -31,15 +31,11 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 #define BUFFER_SAMPLES   8096	/* size for the translation buffers */
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 6423a718702b47b5e7ec446f581b40cf637601c7..e80a859afae69f4378a0e56194fa0ee83966da33 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -32,15 +32,12 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 #define WANT_ASM
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 817cb3bcbdc9ac32154841df89c109e00263a342..9c3494402fd468ed31ebce91d2a1081f6ffb7c83 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -35,14 +35,10 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 #ifdef HAVE_GSM_HEADER
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 3354dde0033a873af3a383f34b4a4a3a26e17434..5414e4725d801cf9230401cf74b5484782fa2702 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -30,12 +30,9 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 #include "ilbc/iLBC_encode.h"
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 9048957a1c4eb49d519b72fa854e0a7db5acd66c..81f763e08820ba78bb79b44ce1d71de73b50750d 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -32,14 +32,10 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 #include "lpc10/lpc10.h"
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 2113b9b8863d2e76557954554afa00f5616ba165..7b342e02066585f64b093e4a2dbbb4e06763fbc7 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -39,7 +39,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 #include <speex/speex.h>
 
 /* We require a post 1.1.8 version of Speex to enable preprocessing
@@ -48,12 +47,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <speex/speex_preprocess.h>
 #endif
 
-#include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
-#include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
 /* Sample frame data */
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 5c5206fbb2169a32a7d1625d127f7dd7425e119e..b01c48f87cc81566a4c6c2680e7374e3e4ada709 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -28,14 +28,10 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <fcntl.h>
-#include <netinet/in.h>
 
-#include "asterisk/lock.h"
 #include "asterisk/module.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
-#include "asterisk/channel.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/utils.h"
 
diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index e3994cd58ceed4e9ebd947582980061cd7ca570b..222b95a518790d8dcf4f71ba9edfecab21f308d7 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/translate.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/channel.h"