diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 99e5b50acbda8193e9f0dbc71a4ba0d9ea5f0884..1118b5230a53d02aa6a95096263403d26014d270 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -24,9 +24,10 @@
  * Common code between the AC-3 encoder and decoder.
  */
 
+#include "libavutil/common.h"
+
 #include "avcodec.h"
 #include "ac3.h"
-#include "get_bits.h"
 
 /**
  * Starting frequency coefficient bin for each critical band.
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 81d28d1fb3c08aedf6a4ad5980b191b25b18eab1..52a015eb3efb9d2b31b349ef38e644b65da791dc 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -44,7 +44,6 @@
 #include "avcodec.h"
 #include "dv.h"
 #include "dvdata.h"
-#include "get_bits.h"
 #include "internal.h"
 #include "put_bits.h"
 #include "simple_idct.h"
diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index d032405a26330c27c36ee16aa6f2f1f36dd9d333..1d1650c5858c53bf9fe0a3c5e969d813846fd441 100644
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -29,8 +29,8 @@
 
 #include "avcodec.h"
 #include "dv_profile.h"
-#include "get_bits.h"
 #include "me_cmp.h"
+#include "vlc.h"
 
 typedef struct DVwork_chunk {
     uint16_t buf_offset;
diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 2e7d8c2aee86abbf6c67577aae8a3a77cac78731..ba83a70cbb0589b183cabe61f132f81e3f945df9 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -18,8 +18,13 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include <inttypes.h>
+#include <string.h>
+
+#include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 /* Parser (mostly) copied from dvdsub.c */
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 85e274108222f983a703d1ad0ea08a2c8712fd51..e02f349fbc6fceb9d9cbe69a85d9c1b913aebcc7 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "libavutil/attributes.h"
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
@@ -35,6 +36,7 @@
 #include "dv_tablegen.h"
 #include "fdctdsp.h"
 #include "internal.h"
+#include "mathops.h"
 #include "me_cmp.h"
 #include "pixblockdsp.h"
 #include "put_bits.h"
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 21d35835a58c2c2833c68d7800cf69dd70639287..05d3ad10ec5ab5b508bba5b839c18f5f5e0a5d01 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -28,7 +28,6 @@
 #include "libavutil/attributes.h"
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "put_bits.h"
 #include "rangecoder.h"
 #include "golomb.h"
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index d05a0c673c239bec3324fda1510fed1d1393c955..67f899f712cb445b8cefea0b8be25e6e2149edb7 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -23,9 +23,9 @@
 #include "libavutil/intmath.h"
 #include "libavutil/md5.h"
 #include "libavutil/opt.h"
+
 #include "avcodec.h"
 #include "bswapdsp.h"
-#include "get_bits.h"
 #include "golomb.h"
 #include "internal.h"
 #include "lpc.h"
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index c63e5a8e5572dbeac6ba01787325903b8b503dd3..98bd596439a0c8296ab0b3ead52037107c6048fc 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -25,6 +25,7 @@
 
 #include "avcodec.h"
 #include "canopus.h"
+#include "get_bits.h"
 #include "internal.h"
 
 #include "hq_hqa.h"
diff --git a/libavcodec/hq_hqa.h b/libavcodec/hq_hqa.h
index 6bd858ddf20865936e7ad6f29a0e44f15e231fac..1fa99759b5393a8d6152c32ee7e64760da2baad7 100644
--- a/libavcodec/hq_hqa.h
+++ b/libavcodec/hq_hqa.h
@@ -24,9 +24,9 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "bytestream.h"
 #include "hq_hqadsp.h"
+#include "vlc.h"
 
 #define NUM_HQ_AC_ENTRIES 746
 #define NUM_HQ_PROFILES   22
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 763ea2c058e6b84bca7187c9e69f551986cf8eb1..88f722619be5f5e6f2fabd20211a9d775632d6c8 100644
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -28,7 +28,6 @@
 
 #include "libavutil/attributes.h"
 #include "avcodec.h"
-#include "get_bits.h"
 #include "mpegaudiodsp.h"
 #include "mpegaudio.h"
 
diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h
index bb854b0839622c6a5221b720e5ad9717ca21d863..90f813518b00cadca8a8c6495c14e7e59d1fab53 100644
--- a/libavcodec/mpeg12vlc.h
+++ b/libavcodec/mpeg12vlc.h
@@ -28,7 +28,7 @@
 #ifndef AVCODEC_MPEG12VLC_H
 #define AVCODEC_MPEG12VLC_H
 
-#include "get_bits.h"
+#include "vlc.h"
 
 #define DC_VLC_BITS 9
 #define MV_VLC_BITS 9
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 9d57d419a8c7fd0496dee289d4152f956be1f54d..2c2dfabc167cfaefff573c692e316b7b0a292b23 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -31,8 +31,9 @@
 #define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
-#include "get_bits.h"
+
 #include "rl.h"
+#include "vlc.h"
 
 /* motion vector table */
 typedef struct MVTable {
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 0740c75a0f09873690a4c047e1ef6ea2b72cae70..027726e0ba657b44662066ce849a38f6ebfa18ee 100644
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -31,11 +31,10 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#include "nellymoser.h"
-#include "avcodec.h"
+#include "libavutil/common.h"
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
+#include "nellymoser.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 66c569b797ecba41627ed2b266812365eaa4be11..79a434f06519b4be5ae1d3401910a716fe611af5 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -29,8 +29,10 @@
 #define AVCODEC_VC1DATA_H
 
 #include <stdint.h>
+
 #include "libavutil/rational.h"
-#include "get_bits.h"
+
+#include "vlc.h"
 
 /** Table for conversion between TTBLK and TTMB */
 extern const int ff_vc1_ttblk_to_tt[3][8];
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 81c725d96ef236a5121d0a2c95c875b1d56a45f0..3e14874ba44b2745b7f456b24f257de72870a2be 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 #include "vp56.h"
diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c
index a92c794ebf7fd3b423deda30c0d1147b88386f6d..f5f72564242de054b3db542d9e8bdc654c0f73bc 100644
--- a/libavcodec/vp9block.c
+++ b/libavcodec/vp9block.c
@@ -24,7 +24,6 @@
 #include "libavutil/avassert.h"
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 #include "videodsp.h"
 #include "vp56.h"
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 6369b7de8a8f7637000ee6e1b13d7da00f820a47..5495bec757788085072308d250a62062db6321bc 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -20,12 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+
+#include "avcodec.h"
 #include "bytestream.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
 #include "internal.h"
 
 typedef struct XanContext {
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 25122398802feacdabc0aaa8fab4be4d198a4559..4eae626ad7c5f28ec1a5ec2a95c62efa447d5618 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -21,8 +21,9 @@
 
 #include "libavutil/mathematics.h"
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/time.h"
-#include "libavcodec/get_bits.h"
+
 #include "avformat.h"
 #include "network.h"
 #include "srtp.h"