diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index b419bfa268f108b9126203aefb0f7279246de32c..4a9a14a79b954a9c1a9446169932c41ccb44b92c 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -36,6 +36,7 @@
 #include "bswapdsp.h"
 #include "bytestream.h"
 #include "internal.h"
+#include "vlc.h"
 
 #define BLOCK_TYPE_VLC_BITS 5
 #define ACDC_VLC_BITS 9
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 2a703ca46ef0db1f54a0b52b97961f7ffcd651d1..d0661c83fcdb0a071a030b69528586d5f87afa13 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -44,6 +44,7 @@
 #include "bytestream.h"
 #include "fft.h"
 #include "internal.h"
+#include "vlc.h"
 
 #include "atrac.h"
 #include "atrac3data.h"
diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c
index e3c2504178ac29312bec0f6dda75c764786ee1fe..9b7b28bb9b0d54c47031bf100c108b804cdbca73 100644
--- a/libavcodec/atrac3plus.c
+++ b/libavcodec/atrac3plus.c
@@ -29,6 +29,7 @@
 
 #include "avcodec.h"
 #include "bitstream.h"
+#include "vlc.h"
 #include "atrac3plus.h"
 #include "atrac3plus_data.h"
 
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index 84388b86aa7fc80a4c713382a3a27472849af2a7..011d2d8e2282ce60ff7854e9abb44b4f48bf86c2 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -33,6 +33,7 @@
 #include "hpeldsp.h"
 #include "internal.h"
 #include "mathops.h"
+#include "vlc.h"
 
 #define BINK_FLAG_ALPHA 0x00100000
 #define BINK_FLAG_GRAY  0x00020000
diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
index c5da0b6ec7ff3698dd6490fdfe0806b7a8b41a75..27f047d3e8f71424b7993894900a7dafe5ecb534 100644
--- a/libavcodec/cfhd.h
+++ b/libavcodec/cfhd.h
@@ -25,6 +25,7 @@
 
 #include "avcodec.h"
 #include "bitstream.h"
+#include "vlc.h"
 
 #define VLC_BITS       9
 #define SUBBAND_COUNT 10
diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c
index 08bf2cb6dae0a1d7f175110200392d4848ef5575..7c5143937fcb9ce41aac5ded46919cc0538ec78e 100644
--- a/libavcodec/clearvideo.c
+++ b/libavcodec/clearvideo.c
@@ -29,6 +29,7 @@
 #include "bytestream.h"
 #include "idctdsp.h"
 #include "internal.h"
+#include "vlc.h"
 
 #define NUM_DC_CODES 127
 #define NUM_AC_CODES 103
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index c3304eae2e3dc83917713d671ec62858f11c2605..bd8ad1d1da62f3caee98a4b6c5537d1454253fe7 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -52,6 +52,7 @@
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
+#include "vlc.h"
 
 #include "cookdata.h"
 
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 9eb4e379999c0ada7561c6e8f09db19e9f6a922d..0a079fc9925e3f10243abebc52cb666e9f15085b 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "put_bits.h"
+#include "vlc.h"
 #include "faxcompr.h"
 
 #define CCITT_SYMS 104
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index d7dc97615360f29d62dccef728834c037fdcdeb8..93befb48093df2008848c6f692f6a46b77df1f0e 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -39,6 +39,7 @@
 #include "internal.h"
 #include "jpegtables.h"
 #include "mjpeg.h"
+#include "vlc.h"
 
 #define EPIC_PIX_STACK_SIZE 1024
 #define EPIC_PIX_STACK_MAX  (EPIC_PIX_STACK_SIZE - 1)
diff --git a/libavcodec/hqx.h b/libavcodec/hqx.h
index e8f7c627fb70ac587eea966ce60af538b90aa99a..f35721a06cd30837c1e75f7d448577be54e7a061 100644
--- a/libavcodec/hqx.h
+++ b/libavcodec/hqx.h
@@ -28,6 +28,7 @@
 
 #include "bitstream.h"
 #include "hqxdsp.h"
+#include "vlc.h"
 
 enum HQXACMode {
     HQX_AC_Q0 = 0,
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 145b2d56fc865e75dee7fe09f014fff75775b659..100e6f89412d71c297d2c2199e416db4b5e4fe1f 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -44,6 +44,7 @@
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
+#include "vlc.h"
 
 #include "imcdata.h"
 
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 811056dbfc36510248f78c0bc4e2a5b78b7f794f..64e92d760f930456d38a3970744a2d21342e5a91 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -32,6 +32,7 @@
 #include "indeo2data.h"
 #include "internal.h"
 #include "mathops.h"
+#include "vlc.h"
 
 typedef struct Ir2Context{
     AVCodecContext *avctx;
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 4b3f903e3b67ee6cc43a2eff68276cb1df5b13e6..37b5da85081df67008debf00b0d1312d05defe3c 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -34,6 +34,7 @@
 #include "internal.h"
 #include "ivi.h"
 #include "ivi_dsp.h"
+#include "vlc.h"
 
 #define IVI4_PIC_SIZE_ESC   7
 
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 70ae1d324b506dcd2b470c2c36983b46772551fe..38907eb056b3e9fa1d33ffb5a9922ea29a574ab4 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -33,6 +33,7 @@
 #include "ivi.h"
 #include "ivi_dsp.h"
 #include "indeo5data.h"
+#include "vlc.h"
 
 /**
  *  Indeo5 frame types.
diff --git a/libavcodec/ivi.h b/libavcodec/ivi.h
index bbc88423409c39bcb1f23eb1e05708e73b3c683e..6fde8a671aaade0db2c8bb0ae7503d122750eb84 100644
--- a/libavcodec/ivi.h
+++ b/libavcodec/ivi.h
@@ -33,6 +33,7 @@
 
 #include "avcodec.h"
 #include "bitstream.h"
+#include "vlc.h"
 
 /**
  *  Indeo 4 frame types.
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 31d07ecd5024af234ec976a615a64c06a07f0837..da8289e4111cf11dd8dd0e166c361affb044cd28 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -32,6 +32,7 @@
 #include "hpeldsp.h"
 #include "idctdsp.h"
 #include "thread.h"
+#include "vlc.h"
 
 #define MIMIC_HEADER_SIZE   20
 
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 4f6675a3cad066e804a8796004114e243e359d1c..b377fd7e2b1ad572dba8efa390e595266c0b5feb 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -39,6 +39,7 @@
 #include "mlpdsp.h"
 #include "mlp.h"
 #include "config.h"
+#include "vlc.h"
 
 /** number of bits used for VLC lookup - longest Huffman code is 9 */
 #if ARCH_ARM
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index da4c141db6d7ed37d3b9e1c7a3e7175b91c4d65b..66ec5f50097e329effc9460855138f3eb9e9920f 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -23,6 +23,7 @@
 #include "bitstream.h"
 #include "bswapdsp.h"
 #include "internal.h"
+#include "vlc.h"
 
 #define MAX_HUFF_CODES 16
 
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 66a6162ec5d5fd325c7315512b9b41cd78ecbf54..ebc3f5293b2fb3720476f839953515a82c82353a 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -33,6 +33,7 @@
 #include "bitstream.h"
 #include "internal.h"
 #include "mpegaudiodsp.h"
+#include "vlc.h"
 
 #include "mpc.h"
 #include "mpc7data.h"
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index f55fd5782400bf2b24160ab30dbb0f61fb6964d9..649eb02e2efc5d577dbd92a3c9dfc672a442bb3b 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -32,6 +32,7 @@
 #include "bitstream.h"
 #include "internal.h"
 #include "mpegaudiodsp.h"
+#include "vlc.h"
 
 #include "mpc.h"
 #include "mpc8data.h"
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 00c952d51a27994023470ace8579a069ec592e6e..668e513a661fb1c782852b6b48d58abfa17f6db8 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -44,6 +44,7 @@
 #include "mpegaudio.h"
 #include "mpegaudiodsp.h"
 #include "rdft.h"
+#include "vlc.h"
 
 #include "qdm2data.h"
 #include "qdm2_tablegen.h"
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 2abf7c1c5af4fdec65331ba6a1606257577996d2..c4b4bc735d2eacede710ed4726969e7b575e43be 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -39,6 +39,7 @@
 #include "bytestream.h"
 #include "internal.h"
 #include "mathops.h"
+#include "vlc.h"
 
 #define SMKTREE_BITS 9
 #define SMK_NODE 0x80000000
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 333451cb7c91c8fc2fc3502bce0b7a3dc5ffce23..cc3b0b76e0149fb3e7d7dbda8c06d377cb52467d 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -31,6 +31,7 @@
 #include "bswapdsp.h"
 #include "bytestream.h"
 #include "internal.h"
+#include "vlc.h"
 
 #define TM2_ESCAPE 0x80000000
 #define TM2_DELTAS 64
diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c
index 6081c72c301c8d45d78de4de323e1a563e8ca915..28d6464258354da278c05168594c180d3778b8ed 100644
--- a/libavcodec/tscc2.c
+++ b/libavcodec/tscc2.c
@@ -33,6 +33,7 @@
 #include "internal.h"
 #include "mathops.h"
 #include "tscc2data.h"
+#include "vlc.h"
 
 typedef struct TSCC2Context {
     AVCodecContext *avctx;
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index ed6368e4cd8211f9633ec27e5c7547fdf1472fb5..26b991ca7b56d626be2908da19d48adb0264d142 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -36,6 +36,7 @@
 #include "internal.h"
 #include "thread.h"
 #include "utvideo.h"
+#include "vlc.h"
 
 static int build_huff10(const uint8_t *src, VLC *vlc, int *fsym)
 {
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 9289c82cf449ab5cf7d85497e4c021127345b108..cc0f6f4a3ec0d5b4ae13d51012a57283627d3f1e 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -32,6 +32,7 @@
 #include "fft.h"
 #include "get_bits.h"
 #include "internal.h"
+#include "vlc.h"
 #include "vorbis.h"
 #include "vorbisdsp.h"
 #include "xiph.h"
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 6d14fc66c6d3b101f6a7bdada1d9d6f575f9dfd3..80b82867a5641ac865236fa6df021b73b1b7ed73 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -28,6 +28,7 @@
 #include "bitstream.h"
 #include "fft.h"
 #include "put_bits.h"
+#include "vlc.h"
 
 /* size of blocks */
 #define BLOCK_MIN_BITS 7
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index cf9884108c1152d424a115b94a724f91082d93fc..8c7ec7b3d6e469e7d0edec169377a9188f498932 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -43,6 +43,7 @@
 #include "dct.h"
 #include "rdft.h"
 #include "sinewin.h"
+#include "vlc.h"
 
 #define MAX_BLOCKS           8   ///< maximum number of blocks per frame
 #define MAX_LSPS             16  ///< maximum filter order
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index e973f7ecc5314722d20b7e057e816b01a573385b..f498c20b47fc57641f032933e2ac95d09d667401 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -28,6 +28,7 @@
 #include "bitstream.h"
 #include "internal.h"
 #include "mathops.h"
+#include "vlc.h"
 
 
 typedef struct WNV1Context {