diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 961e46215ee65ca083c7535e49f677b865974dcf..e914a0d96254b3e34c093f854981e03ac7f8628c 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index f720f3eddb4091290d93e474e17481b26d7c8a32..2670c8d975e6648363d4f362b6d1c3d475788e28 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/beosthread.c b/libavcodec/beosthread.c
index 3d059912b2f924727583bbac9eb9a0b75bd67985..b1c65ddc1c845dab446f3b5606200558c3197703 100644
--- a/libavcodec/beosthread.c
+++ b/libavcodec/beosthread.c
@@ -21,7 +21,6 @@
 //#define DEBUG
 
 #include "avcodec.h"
-#include "common.h"
 
 #include <OS.h>
 
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 012986bdf1f403bde97c4602dd1260f0890d9d44..c67bea5c26944f769ce601b598ebd1c6ef188715 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 33a43e1e59dcb565fa5c8b59c2e236a4f0752289..72645d35f2e877367a9e1d83ca5a4286f71d9caa 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -50,7 +50,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "common.h"
 #include "bytestream.h"
 #include "random.h"
 
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 6177cbd4290f3897a07e7143f25c19c8c27bcc5e..36005a17b8c94e15cfe8a90c33b1217f93a31836 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #ifdef CONFIG_ZLIB
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index 4d625e08fb23c417ecd58e0c5470bc39046b98bd..b607da0a2953a18188802294c5518ae07093026e 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 30027b1d921cdeeff2c2efd6ffaf3b16ad5feac8..7b4349b703dab5c137cdd94987d3b7f9ae57ad2f 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 
 
 typedef enum CinVideoBitmapIndex {
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 800669ea7be7b77c495dccb9e8a73085edbfc0fe..c860eb50ef6b76dd31b90d9baa21117355a65b0b 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -30,7 +30,6 @@
 #ifndef DSPUTIL_H
 #define DSPUTIL_H
 
-#include "common.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 7675e719546838d09d73059d894eb7a64319338d..b4b6f9379a6d5360cf9a0c42bfa5cc61c6809f19 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #include <zlib.h>
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 175ccf73adbadd0e439db789fede13fd560b789a..7aaaf85ec257f83c9e5d4d0d0a6dc576d2cc9095 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -30,7 +30,6 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
-#include "common.h"
 
 static void decode_mb(MpegEncContext *s){
     s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* s->linesize  ) + s->mb_x * 16;
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 45f408c8765be7190471548bc32e5dfdb6e0ea93..ee5419cd3f8a13865fd54caa46552664014a02ee 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -26,9 +26,8 @@
  * FF Video Codec 1 (an experimental lossless codec)
  */
 
-#include "common.h"
-#include "bitstream.h"
 #include "avcodec.h"
+#include "bitstream.h"
 #include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 41baf10717af7baf714764f4c33be51cf713b989..0be0e464f508a2aab5de292b3b2e3966bf1fd621 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -50,7 +50,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "bitstream.h"
 
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c
index b975ed254b051bf7a7216264052e0ec6af1b67ec..ff3c85e01c49ce3319c40d7da8db6dcf926a5ec2 100644
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@@ -58,7 +58,6 @@
 #include <stdlib.h>
 #include <zlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "bytestream.h"
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index bb0577352ce6168859ad19570348c543fd94a279..b2e5316f028d9dfacaec9f233dbbb06852862d56 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -41,7 +41,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "bswap.h"
 
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 07af3312265b2a640a3fe09488a55cfd81d81052..01d1cec6f516359f7c24cee553283dded509782a 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -23,7 +23,6 @@
  */
 #include <limits.h>
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 
 /**
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 80dde7acd26f14cc549ac995759cfd376278979b..042e683f90bf63ab16342e48f1cbc8830f9ce6be 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -25,7 +25,6 @@
  * h261codec.
  */
 
-#include "common.h"
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index f68d8e7efdacfb642af0aa993ea38fd9c269a095..fc3d94a97870c9da85ac7d799f0a77d104426a55 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -28,9 +28,8 @@
  * huffyuv codec for libavcodec.
  */
 
-#include "common.h"
-#include "bitstream.h"
 #include "avcodec.h"
+#include "bitstream.h"
 #include "dsputil.h"
 
 #define VLC_BITS 11
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 38f330c2e38034ba75e0c7a0281a25529f1c1acd..354a8844434b5e4ecf3a682a0915ca5b9dd67a42 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -50,7 +50,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index bd33d6da940724fb99c17d267018a87e542bfb7d..52fe2b849f6b9b300e07c1fc1f005710e2624f77 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index a79e32383b4779ac0b2b732f061a10fc0122ccca..32406f76d757f4c30c8088e1c0d2506a2dd03bce 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index 8a190cb1762cde6c02e2ecab62077d682aed6e97..573f10c80d020b7e887a993f9c8382564bdb46f0 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #define KMVC_KEYFRAME 0x80
diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index f214b0a8b2574ca2d71715ac5cbc2c4b7cbe6cfd..6f187f8734f28b12193f5d72325394c35eb31f7e 100644
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -42,9 +42,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
-#include "bitstream.h"
 #include "avcodec.h"
+#include "bitstream.h"
 
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 760699d4510507c9ea87b86ff61f3fc45875e73f..8b261cabc6924326e2dd887976a80f07a59260bd 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -26,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 #include "golomb.h"
 
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 5cb206170b1f60d6cebb003481922dc8ab198840..4b9dc0ce5bae4078d89e92a291b3674db9879889 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 459a6c5c9352586e77e0164a56656a5cebe049b5..2e8a4e959bdb4b8c070bf1cc7fc2d11e5364098d 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index e83927c99fc9755dfb55864ff065ac29f40e557c..93637112a0a22547bca66347f60ac5c5fe84bda0 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #include "bswap.h"
diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c
index c52b7ae02e38840659eaeaf745e122061b0ca286..82fd22e8a0ee94dece2ae82c3a6302ac287d2c26 100644
--- a/libavcodec/os2thread.c
+++ b/libavcodec/os2thread.c
@@ -23,7 +23,6 @@
 // Ported by Vlad Stelmahovsky
 
 #include "avcodec.h"
-#include "common.h"
 
 #define INCL_DOS
 #define INCL_DOSERRORS
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index f2c636bbe9d59fb545900d0a70461642ad7f8800..d82753b9c811144e8c92b70ac96f9153fa2d5f52 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -25,7 +25,6 @@
 #include <pthread.h>
 
 #include "avcodec.h"
-#include "common.h"
 
 typedef int (action_t)(AVCodecContext *c, void *arg);
 
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 5c6ccb4fb1e2e00e86019879f78957e695a6b0be..002dfcb345b52b6bdeb801d741bf776d571d9dac 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index fcd564ace047dac3508bed299fc8127d546e4b0f..4e15ce3096140dc51c40e4468034ed289faf95a6 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "common.h"
 #include "rangecoder.h"
 
 
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index d5e24fdfcdc2a003bc68e9f61dec9b993c7a54a1..f3d02169f5059981d52aa9dcabc70c065944f210 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -27,7 +27,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "dsputil.h"
 
 #ifndef CONFIG_RESAMPLE_HP
diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c
index 0ac97b297c0dfc7600a90a621f287994db43ce7e..c7db30301c973d8d4d0b602ea418cba5692e6530 100644
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index 2a59109ac883e1e79b4c99727e1d599a3b86df21..df79a23c8682679c1f4f59b7ee3342345c139800 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index a079522eb43ab485ed82246812dfb88fb11a1a7c..78ee923001ffbba71957cbe5e89d72c50d733369 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #define ALT_BITSTREAM_READER_LE
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 7a617ec7d84ad18ce90bd2958a40fad488add101..0875fd59b313212527ac9effd680fdb2c6261ca1 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index dc50941fac5655113451e0f7db2e74a2c72d0b60..df32d1263206348c60276a071a3b368f6dfc8d39 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -19,7 +19,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "dsputil.h"
 #include "snow.h"
 
diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c
index 5087ba8cc94920478bf726bee487bf3bea34a8c5..42fc6be196946783c96ca602998b66f7be33eec0 100644
--- a/libavcodec/svq1.c
+++ b/libavcodec/svq1.c
@@ -41,7 +41,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index c9229e5ccee331011cfbc37ae7a706630cf71f46..85d585ea8f11122e29d353c7c724b0ab38078e8e 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #define ALT_BITSTREAM_READER_LE
 #include "bitstream.h"
 
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index c1326ac21379296376cf317db04f21f352ce9e05..281ae83d534f436c58ebf92e1d2ef4ad5b7e4988 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index b282c967be4dd5be76571265826c30ed01d30664..221766506164d6db64555857e909d7d43031f3d9 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -26,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index cc284088a596d080378e1e288b7b748bb5b4de1f..fae3fa3daba818211dc14880e7cf128bcbd7c834 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #ifdef CONFIG_ZLIB
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c
index d84a88dad96d73223538aae4509ce914cf2e3917..5c6ba00114c85a1173f839697539a55eaa743c7b 100644
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #include "ulti_cb.h"
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 40becae80039c925bf0a078cecb79e0c7f5cfc4d..648c33e899f92f13d341d4435bb1672d7d3668be 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -26,7 +26,6 @@
  * VC-1 and WMV3 decoder
  *
  */
-#include "common.h"
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index f10d57b3d7e582d9108f79a1ab8e44e848cd7521..e1a5c4715cbe55abe40366566880b841b1742cf2 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -45,7 +45,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index e805ea0806c030c6c9b60ba400d81f34a5f8b61b..d432782d9ed1983ca4892c70e9b6f2a85c57a04d 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 enum EncTypes {
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index efe7017accc3cbcae16f5433d9b8ebe07664d559..7975a21076a4a39ac646c8237e1e8e146210313f 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
index bb9fed091f5656e6199f10a9662aa24639066b59..fc8f54d8d632158238feb67b2ed20699f701762a 100644
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@ -24,7 +24,6 @@
  * source code.
  */
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index f266daf9f6ac923e4b74af3a21d6cf3a1c6ac2bb..b13865dfe1a4e10e37c6865bb4fd8d837d00d848 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -69,7 +69,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index e749a64aff424e7865066db46fee574e38eb6cec..58533a74c447e45f26e6ce7c8eac6b240211f931 100644
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -21,7 +21,6 @@
 //#define DEBUG
 
 #include "avcodec.h"
-#include "common.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index 46b31a5c5f1d3f5e489ab8ec374398b6e5e8d1fb..fa427b524de5fb2c7d9e6d9b723616865c293ab7 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -26,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 
 
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index c0e2db784f494b39f8af78c713fc9d46f667f0fe..b9e28cb3a2599b839ed19c33b4e2bbd06c18ca8a 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 typedef struct XanContext {
diff --git a/libavcodec/xvidff.c b/libavcodec/xvidff.c
index 590fe4b308ca343c499912bf71f3a39d1b79ad34..5b0698e7940142d5daaeca6be3b35617f30653fd 100644
--- a/libavcodec/xvidff.c
+++ b/libavcodec/xvidff.c
@@ -27,7 +27,6 @@
 
 #include <xvid.h>
 #include <unistd.h>
-#include "common.h"
 #include "avcodec.h"
 #include "xvid_internal.h"
 
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index a37fdd869a6664b1a82dc717ac1922f3ac73c0fe..6f7597380d148033608f4d6228d129c2b3424f52 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #ifdef CONFIG_ZLIB
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 04e86235ac64a5de214b09a982e2454052366417..c4c934e2faa2466a92af3c8762cce7bbf214f7d4 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
 #include "avcodec.h"
 
 #include <zlib.h>