diff --git a/modules/access/jack.c b/modules/access/jack.c
index a8fcec5c9e..963bbb72fa 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -41,7 +41,6 @@
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
-#include <vlc_codecs.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
 
diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 19ed2693bc..1d2e2721d2 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -34,8 +34,6 @@
 #include <vlc_network.h>
 #include <vlc_plugin.h>
 
-#include <vlc_codecs.h>
-
 #include "rtp.h"
 #ifdef HAVE_SRTP
 # include <srtp.h>
diff --git a/modules/access/rtp/xiph.c b/modules/access/rtp/xiph.c
index 83b3eb592c..c99280a21c 100644
--- a/modules/access/rtp/xiph.c
+++ b/modules/access/rtp/xiph.c
@@ -35,7 +35,6 @@
 #endif
 #include <vlc_plugin.h>
 
-#include <vlc_codecs.h>
 #include "../../demux/xiph.h"
 
 #include "rtp.h"
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index e3a87dc3e1..9f552baa6b 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
-#include <vlc_codecs.h>                               /* BITMAPINFOHEADER */
 #include <vlc_avcodec.h>
 #include <assert.h>
 
diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 803c849b18..386c7a004c 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -31,7 +31,6 @@
 
 #include <vlc_demux.h>
 
-#include <vlc_codecs.h>                   /* BITMAPINFOHEADER, WAVEFORMATEX */
 #include "libasf.h"
 
 #define ASF_DEBUG 1
diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index 6cc401fc57..9d9c0454de 100644
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -33,8 +33,6 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
-#include <vlc_codecs.h>
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 9867a4bd29..31a00e5ce2 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -36,8 +36,6 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
-#include <vlc_codecs.h>
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index e09bcb461c..76407db2c1 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -49,7 +49,6 @@
 #   include <time.h>                                               /* time() */
 #endif
 
-#include <vlc_codecs.h>               /* BITMAPINFOHEADER, WAVEFORMATEX */
 #include <vlc_iso_lang.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>
diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index f421916847..4389b74d1a 100644
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -27,7 +27,6 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_aout.h>
-#include <vlc_codecs.h>
 #include <vlc_charset.h>
 #include <limits.h>
 
diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index 3cf8887d44..aa9ca8cb83 100644
--- a/modules/demux/voc.c
+++ b/modules/demux/voc.c
@@ -34,8 +34,6 @@
 #include <vlc_demux.h>
 #include <vlc_aout.h>
 
-#include <vlc_codecs.h>
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index 65b0c97a3d..a70f45a7c3 100644
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -33,8 +33,6 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
-#include <vlc_codecs.h>
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index 60b4aebb9e..adeab13cb1 100644
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -35,7 +35,6 @@
 #include <vlc_block.h>
 #include <assert.h>
 
-#include <vlc_codecs.h>
 #include "pes.h"
 #include "bits.h"
 
diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index b80c287349..4f84074180 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -35,7 +35,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
-#include <vlc_codecs.h>
 #include <vlc_block.h>
 
 #include "bits.h"
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 34e4e3e902..6ec79da83e 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -37,7 +37,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
-#include <vlc_codecs.h>
 #include <vlc_block.h>
 #include <vlc_rand.h>