Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk

63 files changed, 125 insertions, 101 deletions

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 1949fcf542..0961b0fac3 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define ADTS_HEADER_SIZE 7
 
diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 78ae6f4cb9..92329520b3 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -18,10 +18,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "raw.h"
 #include "riff.h"
-#include "intfloat_readwrite.h"
 
 static const AVCodecTag codec_aiff_tags[] = {
     { CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') },
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 66b5638601..20fe917900 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -18,11 +18,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/common.h"
+#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
 #include "riff.h"
-#include "mpegaudio.h"
 #include "asf.h"
-#include "common.h"
 #include "asfcrypt.h"
 
 extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c
index 10cc934b45..74a3dcc431 100644
--- a/libavformat/asfcrypt.c
+++ b/libavformat/asfcrypt.c
@@ -19,11 +19,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "common.h"
-#include "intreadwrite.h"
-#include "bswap.h"
-#include "des.h"
-#include "rc4.h"
+
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/bswap.h"
+#include "libavutil/des.h"
+#include "libavutil/rc4.h"
 #include "asfcrypt.h"
 
 /**
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 27a6a7f6b1..743cc88e98 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
+#include "libavcodec/opt.h"
 #include "avformat.h"
-#include "avstring.h"
-#include "opt.h"
 
 #if LIBAVFORMAT_VERSION_MAJOR >= 53
 /** @name Logging context. */
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 3917270b1d..6206c66909 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
 #include "avio.h"
-#include "crc.h"
 #include <stdarg.h>
 
 #define IO_BUFFER_SIZE 32768
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index 9b04d3fbe0..a69b880453 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -28,7 +28,7 @@
  */
 
 #include "avformat.h"
-#include "bethsoftvideo.h"
+#include "libavcodec/bethsoftvideo.h"
 
 typedef struct BVID_DemuxContext
 {
diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c
index dd88031618..3ed0cdb450 100644
--- a/libavformat/crcenc.c
+++ b/libavformat/crcenc.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 typedef struct CRCState {
     uint32_t crcval;
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 0f4c5cf0b4..c9b9546ec0 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -29,7 +29,7 @@
  */
 #include <time.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
 
 struct DVDemuxContext {
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 0d60028182..af6856f44a 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -30,9 +30,9 @@
 #include <time.h>
 #include <stdarg.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
 
 struct DVMuxContext {
     const DVprofile*  sys;    /* Current DV profile. E.g.: 525/60, 625/50 */
diff --git a/libavformat/file.c b/libavformat/file.c
index 6285c1bba2..758c050212 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index c0133017c2..0b537158c4 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index 5568c138e7..ce068d78d0 100644
--- a/libavformat/framehook.h
+++ b/libavformat/framehook.h
@@ -28,7 +28,7 @@
  * Prototypes for interface to .so that implement a video processing hook
  */
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 /* Function must be called 'Configure' */
 typedef int (FrameHookConfigure)(void **ctxp, int argc, char *argv[]);
diff --git a/libavformat/gif.c b/libavformat/gif.c
index b952fbe697..dab39a2afb 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -40,7 +40,7 @@
  */
 
 #include "avformat.h"
-#include "bitstream.h"
+#include "libavcodec/bitstream.h"
 
 /* bitstream minipacket size */
 #define GIF_CHUNKS 100
diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index d4bf6f43be..a0c98b2238 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/common.h"
 #include "avformat.h"
-#include "common.h"
 #include "gxf.h"
 
 typedef struct {
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 469105de5f..e47f45eeb6 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/fifo.h"
 #include "avformat.h"
 #include "gxf.h"
 #include "riff.h"
-#include "fifo.h"
 
 #define GXF_AUDIO_PACKET_SIZE 65536
 
diff --git a/libavformat/http.c b/libavformat/http.c
index 1d542061bd..fc9cac442d 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -18,14 +18,14 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
 #include "avformat.h"
 #include <unistd.h>
 #include "network.h"
 #include "os_support.h"
 
-#include "base64.h"
-#include "avstring.h"
-
 /* XXX: POST protocol is not completely implemented because ffmpeg uses
    only a subset of it. */
 
diff --git a/libavformat/img2.c b/libavformat/img2.c
index ca4da723c9..0523bc7d81 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 typedef struct {
     int img_first;
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 025eefb3e2..6f48f04723 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATROSKA_H
 #define FFMPEG_MATROSKA_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 /* EBML version supported */
 #define EBML_VERSION 1
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 10fd958f5f..6a9d1abb5e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -31,9 +31,9 @@
 #include "avformat.h"
 /* For codec_get_id(). */
 #include "riff.h"
-#include "intfloat_readwrite.h"
 #include "matroska.h"
 #include "libavcodec/mpeg4audio.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/lzo.h"
 
 typedef struct Track {
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 380ed32685..f799182c60 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -20,11 +20,11 @@
  */
 
 #include "avformat.h"
-#include "md5.h"
 #include "riff.h"
-#include "xiph.h"
 #include "matroska.h"
 #include "avc.h"
+#include "libavutil/md5.h"
+#include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
 
 typedef struct ebml_master {
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 611d547734..75d4216d8b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -27,8 +27,8 @@
 #include "riff.h"
 #include "isom.h"
 #include "dv.h"
-#include "mpeg4audio.h"
-#include "mpegaudiodata.h"
+#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/mpegaudiodata.h"
 
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 1b3ff011f6..59cd5f50af 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -18,10 +18,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
+#include "libavcodec/mpegaudio.h"
+#include "libavcodec/mpegaudiodecheader.h"
 #include "avformat.h"
-#include "mpegaudio.h"
-#include "avstring.h"
-#include "mpegaudiodecheader.h"
 
 #define ID3v2_HEADER_SIZE 10
 #define ID3v1_TAG_SIZE 128
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 8e6c573dff..24ff7aad40 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define MPC_FRAMESIZE  1152
 #define DELAY_FRAMES   32
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 879c7d2367..f6cc098954 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
+#include "libavcodec/unary.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "unary.h"
 
 /// Two-byte MPC tag
 #define MKMPCTAG(a, b) (a | (b << 8))
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index bdd70254d6..c1675ee442 100644
--- a/libavformat/mpeg.h
+++ b/libavformat/mpeg.h
@@ -23,7 +23,7 @@
 #define FFMPEG_MPEG_H
 
 #include <stdint.h>
-#include "intreadwrite.h"
+#include "libavutil/intreadwrite.h"
 
 #define PACK_START_CODE             ((unsigned int)0x000001ba)
 #define SYSTEM_HEADER_START_CODE    ((unsigned int)0x000001bb)
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 0558226b82..05c72cd1e7 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/fifo.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "fifo.h"
 #include "mpeg.h"
 
 #define MAX_PAYLOAD_SIZE 4096
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 6cb4bcab4f..e5ae4d6441 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 //#define DEBUG_SI
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 49d29aa2b9..b5ba32d2ff 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 /* write DVB SI sections */
diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c
index 05e44b27c0..df79c0187d 100644
--- a/libavformat/msnwc_tcp.c
+++ b/libavformat/msnwc_tcp.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bytestream.h"
 
 #define HEADER_SIZE         24
 
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 6db0d67bbb..d8fa198edf 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -24,8 +24,8 @@
  * MTV demuxer.
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 #define MTV_ASUBCHUNK_DATA_SIZE 500
 #define MTV_HEADER_SIZE 512
diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 4d4bcbb35d..df3a890305 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -45,9 +45,9 @@
 
 //#define DEBUG
 
+#include "libavutil/aes.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "aes.h"
-#include "bytestream.h"
 
 typedef uint8_t UID[16];
 
diff --git a/libavformat/nut.c b/libavformat/nut.c
index e790691fc8..7a978a5f11 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/tree.h"
 #include "nut.h"
-#include "tree.h"
 
 const AVCodecTag ff_nut_subtitle_tags[] = {
     { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 2df58fbf85..6acebc34b7 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -23,10 +23,10 @@
 #define FFMPEG_NUT_H
 
 //#include <limits.h>
+//#include "libavutil/adler32.h"
+//#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
-//#include "mpegaudio.h"
 #include "riff.h"
-//#include "adler32.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
 #define    STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 03c684da9b..772a527f8e 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "tree.h"
+#include "libavutil/avstring.h"
+#include "libavutil/tree.h"
 #include "nut.h"
-#include "avstring.h"
 
 #undef NDEBUG
 #include <assert.h>
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index ae1bbb59a8..58debcb25e 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/tree.h"
+#include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
-#include "tree.h"
-#include "mpegaudiodata.h"
 
 static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
     int sample_rate= c->sample_rate;
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 16b6b22255..fe05fba919 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/crc.h"
+#include "libavcodec/xiph.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "crc.h"
-#include "xiph.h"
-#include "bytestream.h"
 
 typedef struct {
     int64_t duration;
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 611a8c5a1b..386a70ebd4 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -19,8 +19,8 @@
  */
 
 #include <stdlib.h>
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "oggdec.h"
 
 #define FLAC_STREAMINFO_SIZE 0x22
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 70e53948fb..6067f95d11 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -23,10 +23,10 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "intreadwrite.h"
 #include "oggdec.h"
 #include "riff.h"
 
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index a6c44271eb..ad2f0b7db4 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -23,12 +23,12 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
 #include "oggdec.h"
-#include "avstring.h"
 
 static int speex_header(AVFormatContext *s, int idx) {
     ogg_t *ogg = s->priv_data;
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index b976dcb701..36848b1588 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -23,9 +23,9 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
 #include "oggdec.h"
 
 typedef struct theora_params {
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index cc914ce394..29e6d91b68 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -23,12 +23,12 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
 #include "oggdec.h"
-#include "avstring.h"
 
 extern int
 vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
diff --git a/libavformat/raw.c b/libavformat/raw.c
index 05b77af1b8..f37758c09d 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -19,12 +19,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
+#include "libavcodec/ac3_parser.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "ac3_parser.h"
 #include "raw.h"
-#include "crc.h"
-#include "bitstream.h"
-#include "bytestream.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 2575ebf441..322e8131ff 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/avcodec.h"
 #include "avformat.h"
-#include "avcodec.h"
 #include "riff.h"
 
 /* Note: when encoding, the first matching tag is used, so order is
diff --git a/libavformat/riff.h b/libavformat/riff.h
index dc970f619d..9d36715888 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_RIFF_H
 #define FFMPEG_RIFF_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avio.h"
 
 offset_t start_tag(ByteIOContext *pb, const char *tag);
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index f81462102d..c4bda1fa63 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
 #include "rm.h"
-#include "avstring.h"
 
 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
 {
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index a095af90b8..fa284c14e9 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <stdlib.h>
 
 #define RPL_SIGNATURE "ARMovie\x0A"
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index adb7cc8401..4627abc4e2 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 21cfdb4cf1..36affed420 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -21,7 +21,7 @@
 #ifndef FFMPEG_RTP_H
 #define FFMPEG_RTP_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avformat.h"
 
 #define RTP_MIN_PACKET_LENGTH 12
diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c
index 3e0fc3add4..009774e8ad 100644
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtp_h264.c
@@ -36,9 +36,11 @@
  *
  */
 
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
@@ -46,8 +48,6 @@
 
 #include "rtp_internal.h"
 #include "rtp_h264.h"
-#include "base64.h"
-#include "avstring.h"
 
 /**
     RTP/H264 specific private data.
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index e9d6cb3905..c34212dc16 100644
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -24,7 +24,7 @@
 #define FFMPEG_RTP_INTERNAL_H
 
 #include <stdint.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "rtp.h"
 
 // these statistics are used for rtcp receiver reports...
diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index c8bf81f9a6..d42f2e770c 100644
--- a/libavformat/rtp_mpv.c
+++ b/libavformat/rtp_mpv.c
@@ -19,11 +19,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/mpegvideo.h"
 #include "avformat.h"
 #include "rtp_internal.h"
 
-#include "mpegvideo.h"
-
 /* NOTE: a single frame must be passed with sequence header if
    needed. XXX: use slices. */
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 20e162e948..dc9e044227 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 19e4f19fe4..c6cd3cc350 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 80231bfe25..99fae3a9a0 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -24,8 +24,8 @@
  * RTP protocol
  */
 
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 #include <unistd.h>
 #include <stdarg.h>
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d5c694ac77..8819d02b25 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -18,12 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
 
 #include <sys/time.h>
 #include <unistd.h> /* for select() prototype */
 #include "network.h"
-#include "avstring.h"
 #include "rtsp.h"
 
 #include "rtp_internal.h"
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 7592aec3be..c1075c329b 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavutil/base64.h"
 #include "avformat.h"
 #include "avc.h"
-#include "base64.h"
 #include "rtp.h"
 
 #ifdef CONFIG_RTP_MUXER
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 562a416164..8066c26f01 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -23,9 +23,9 @@
  * Based on http://wiki.multimedia.cx/index.php?title=Smacker
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
 #include "riff.h"
-#include "bswap.h"
 
 #define SMACKER_PAL 0x01
 #define SMACKER_FLAG_RING_FRAME 0x01
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 97ebfdb5eb..0896c0aca8 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -23,10 +23,10 @@
  * Based on documents from Game Audio Player and own research
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
 #include "raw.h"
 #include "riff.h"
-#include "bswap.h"
 
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
diff --git a/libavformat/swf.c b/libavformat/swf.c
index 387a96c5f7..9d7d0f27e0 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */
diff --git a/libavformat/tta.c b/libavformat/tta.c
index 2cd0101f15..bfdc39b1a6 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 typedef struct {
     int totalframes, currentframe;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5d164c5d5a..5b6fd55381 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "opt.h"
-#include "avstring.h"
+#include "libavcodec/opt.h"
+#include "libavutil/avstring.h"
 #include "riff.h"
 #include <sys/time.h>
 #include <time.h>
diff --git a/libavformat/wv.c b/libavformat/wv.c
index 2240dfde2d..3b6fcae09c 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 // specs say that maximum block size is 1Mb
 #define WV_BLOCK_LIMIT 1047576