@@ -31,12 +31,14 @@

 #include <stdint.h>

 #include "libavutil/float_dsp.h"

+

 #include "ac3.h"

 #include "ac3dsp.h"

 #include "avcodec.h"

 #include "dsputil.h"

-#include "put_bits.h"

 #include "fft.h"

+#include "mathops.h"

+#include "put_bits.h"

 #ifndef CONFIG_AC3ENC_FLOAT

 #define CONFIG_AC3ENC_FLOAT 0

@@ -21,8 +21,10 @@

 #include <stdint.h>

 #include <string.h>

-#include "put_bits.h"

+#include "libavutil/error.h"

+

 #include "dca.h"

+#include "put_bits.h"

 const uint32_t avpriv_dca_sample_rates[16] =

 {

@@ -26,8 +26,9 @@

  */

 #include "avcodec.h"

-#include "put_bits.h"

 #include "lzw.h"

+#include "mathops.h"

+#include "put_bits.h"

 #define LZW_MAXBITS 12

 #define LZW_SIZTABLE (1<<LZW_MAXBITS)

@@ -33,10 +33,11 @@

 #ifndef AVCODEC_MJPEG_H

 #define AVCODEC_MJPEG_H

+#include "libavutil/internal.h"

+

 #include "avcodec.h"

 #include "put_bits.h"

-

 /* JPEG marker codes */

 typedef enum {

     /* start of frame */

@@ -35,13 +35,15 @@

  * http://wiki.multimedia.cx/index.php?title=Nellymoser

  */

+#include "libavutil/common.h"

 #include "libavutil/float_dsp.h"

 #include "libavutil/mathematics.h"

-#include "nellymoser.h"

-#include "avcodec.h"

+

 #include "audio_frame_queue.h"

+#include "avcodec.h"

 #include "fft.h"

 #include "internal.h"

+#include "nellymoser.h"

 #include "sinewin.h"

 #define BITSTREAM_WRITER_LE

@@ -27,15 +27,10 @@

 #define AVCODEC_PUT_BITS_H

 #include <stdint.h>

-#include <stdlib.h>

+#include <stddef.h>

 #include <assert.h>

-#include "libavutil/bswap.h"

-#include "libavutil/common.h"

 #include "libavutil/intreadwrite.h"

-#include "libavutil/log.h"

-#include "mathops.h"

-#include "config.h"

 typedef struct PutBitContext {

     uint32_t bit_buf;

@@ -29,9 +29,10 @@

 #include "avcodec.h"

 #include "audio_frame_queue.h"

+#include "celp_filters.h"

 #include "internal.h"

+#include "mathops.h"

 #include "put_bits.h"

-#include "celp_filters.h"

 #include "ra144.h"

@@ -25,9 +25,11 @@

  */

 #include <float.h>

+

 #include "avcodec.h"

 #include "internal.h"

 #include "fft.h"

+#include "mathops.h"

 #include "vorbis.h"

 #include "vorbis_enc_data.h"