diff --git a/formats/format_g723.c b/formats/format_g723.c
index 211f6d4f09eaf17ace2658978fec73fa4f118fa9..b9be03039e9c35f2db405ea911e338d38fb17747 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -29,14 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/sched.h"
 #include "asterisk/module.h"
 
 #define G723_MAX_SIZE 1024
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 259662531c93a5871faa43e5df271b80586a73c4..7005864d6e30c67427c56ac39f77e8197ab2a8df 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -32,15 +32,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
 #include "asterisk/options.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 5f8cb60b752e2d2aaa72e7fab8563a8610cf092a..143b2b26f3c501498c3933c76d36f33f12e50084 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -30,15 +30,7 @@
 
 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/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
 
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index b2559054a6776eb548c14b5346cff38bf628e651..bab20e217d5d64cd5af656a7b9dceb7329ccb8dd 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -27,14 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 d233a03706d3d431a692e3f6e82cb69cbb73e594..3d1766f7e7c7245ecf7605e69b6d5adcf94e3a47 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -28,14 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 e4feaf41af2ff9ea8447a0c56911f53a27e80c4a..ceafadf142058e9f79a566abef46c4beeeb1de71 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -28,14 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 f54b64cd292cad47b417f836cd6608a26aa163f6..b55e16c29db42ba18b7cb640baf49b1004951c03 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -29,14 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 dd875d66f502e6ad1742f239de0775d51354be8c..9bbb9172462414b5faf3c57cd67d0afc0f25071a 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -28,16 +28,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/image.h"
-#include "asterisk/lock.h"
 #include "asterisk/endian.h"
 
 static struct ast_frame *jpeg_read_image(int fd, int len)
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index b34421ccbfbbefa7d9958d38827e6d7107b32d58..21b511de64e7a6b939580cb764942abb5aa05118 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -34,10 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
 
@@ -46,8 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #endif
 
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index df5b41506782966cc7ace7b56ac729ded47e97d2..0ec158ef6befc318ea821f8af9be672fdbcf6fd1 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -28,13 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
 #include "asterisk/ulaw.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 609520a08983ea6ea5fa0c93558531817d778742..18a4dea9635fc9bf7f8d4b12d23a1378ab7f263c 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -26,14 +26,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 ffbf2409026278a4d2491215f3476fe07dc8907e..601df8df421fb4587383f26a0520c2341cc0d694 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -28,14 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 7d8ccc30c5c6ed6db267d5ffc7573e615a71533c..46ba4c76a9735ac77132e27357820e3baf06e065 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -28,14 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.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 727e377c80d4469da1e2189cd776e773e0009369..7b7a0e37f2f6ed8351e203f62eeb84b12fbb2fc2 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -31,14 +31,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-#include "asterisk/lock.h"
-#include "asterisk/channel.h"
 #include "asterisk/file.h"
-#include "asterisk/sched.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"