diff --git a/cmdutils.c b/cmdutils.c
index 86b4a9ef21c5e6b295d0a5e6e9c8413c83a727ae..54085fb7ece1c1f1fcd4a513e3b285b8daa18f83 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -25,14 +25,14 @@
#include <math.h>
#include "config.h"
-#include "avformat.h"
-#include "avfilter.h"
-#include "avdevice.h"
+#include "libavformat/avformat.h"
+#include "libavfilter/avfilter.h"
+#include "libavdevice/avdevice.h"
+#include "libavutil/avstring.h"
#include "cmdutils.h"
-#include "avstring.h"
#include "version.h"
#ifdef CONFIG_NETWORK
-#include "network.h"
+#include "libavformat/network.h"
#endif
#undef exit
diff --git a/ffmpeg.c b/ffmpeg.c
index 874418bad6fc40512dbdfc045a833b8f179e51b3..27374a7fcec700f58051da7b01df2d63727af23a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -27,14 +27,14 @@
#include <errno.h>
#include <signal.h>
#include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "swscale.h"
-#include "framehook.h"
-#include "opt.h"
-#include "fifo.h"
-#include "avstring.h"
-#include "os_support.h"
+#include "libavformat/avformat.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/opt.h"
+#include "libavutil/fifo.h"
+#include "libavutil/avstring.h"
+#include "libavformat/os_support.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
diff --git a/ffplay.c b/ffplay.c
index 87aff3d204c70a91479465980a190eeaee9dfbb9..6dea8763ca387251ebdff5c56b1e73360d7a0a93 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -21,11 +21,11 @@
#include <math.h>
#include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "rtsp.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/rtsp.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
#include "version.h"
#include "cmdutils.h"
diff --git a/ffserver.c b/ffserver.c
index 6742e583543be05420c43198a10d4bcac3cc57d4..7f87eb841058c0db4c664bf0e030f5be555bccff 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -25,10 +25,13 @@
#endif
#include <string.h>
#include <stdlib.h>
-#include "avformat.h"
-#include "rtsp.h"
-#include "rtp.h"
-#include "os_support.h"
+#include "libavutil/random.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/network.h"
+#include "libavformat/os_support.h"
+#include "libavformat/rtp.h"
+#include "libavformat/rtsp.h"
#include <stdarg.h>
#include <unistd.h>
@@ -47,11 +50,8 @@
#include <dlfcn.h>
#endif
-#include "network.h"
#include "version.h"
#include "ffserver.h"
-#include "random.h"
-#include "avstring.h"
#include "cmdutils.h"
#undef exit
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 8517bb239dcc4af740d3f21fddc19ea56040aa01..257687ec128f0802016cf4fba40445264975f0e5 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -32,12 +32,12 @@
#include <math.h>
#include <string.h>
+#include "libavutil/crc.h"
+#include "libavutil/random.h"
#include "avcodec.h"
#include "ac3_parser.h"
#include "bitstream.h"
-#include "crc.h"
#include "dsputil.h"
-#include "random.h"
/** Maximum possible frame size when the specification limit is ignored */
#define AC3_MAX_FRAME_SIZE 21695
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 9694639fbeb300be8b2ac7a4a2d53a650ad63f4c..e85d86c9018eefaf29be4f6f4f7de26eb90a33e5 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -25,9 +25,9 @@
*/
//#define DEBUG
//#define DEBUG_BITALLOC
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
-#include "crc.h"
#include "ac3.h"
typedef struct AC3EncodeContext {
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index 9e7728f9eb1e112f3f6dfa4bd8e76308aff7f02d..1a98129e62aacae7a67973457511f3adb0d5dcd2 100644
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -22,7 +22,7 @@
#ifndef FFMPEG_AC3TAB_H
#define FFMPEG_AC3TAB_H
-#include "common.h"
+#include "libavutil/common.h"
extern const uint16_t ff_ac3_frame_size_tab[38][3];
extern const uint8_t ff_ac3_channels_tab[8];
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c
index 36357356ed9c7196b749f44902fe8fc7a3d650e9..6b80731bc9d505098cc4ee010468fda6fcb3fb4e 100644
--- a/libavcodec/alpha/dsputil_alpha.c
+++ b/libavcodec/alpha/dsputil_alpha.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
extern void simple_idct_axp(DCTELEM *block);
extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
diff --git a/libavcodec/alpha/motion_est_alpha.c b/libavcodec/alpha/motion_est_alpha.c
index b23338c09a36d0a89cb790b348994b92ec1f9bed..df74d07c5cd2dbcc75dd4e18c10f74c755e92fcb 100644
--- a/libavcodec/alpha/motion_est_alpha.c
+++ b/libavcodec/alpha/motion_est_alpha.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
void get_pixels_mvi(DCTELEM *restrict block,
const uint8_t *restrict pixels, int line_size)
diff --git a/libavcodec/alpha/mpegvideo_alpha.c b/libavcodec/alpha/mpegvideo_alpha.c
index 9aa20f420bf928b220577d7cf64df326f5206c1c..3c32af157de4a20afe1ec7252d54739fcefec59c 100644
--- a/libavcodec/alpha/mpegvideo_alpha.c
+++ b/libavcodec/alpha/mpegvideo_alpha.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "asm.h"
-#include "dsputil.h"
-#include "mpegvideo.h"
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale)
diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c
index f664801f97abe4942972bedba160ba49df6deabd..8c63f1f3ec55f41f163cef0a495e6a7025d29997 100644
--- a/libavcodec/alpha/simple_idct_alpha.c
+++ b/libavcodec/alpha/simple_idct_alpha.c
@@ -26,8 +26,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
#include "asm.h"
-#include "dsputil.h"
extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
int line_size);
diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c
index a3b8ec78f49eb0cfea616f36d47d445c21b64add..072a7550136560964aa881efd2950a98a13b17be 100644
--- a/libavcodec/armv4l/dsputil_arm.c
+++ b/libavcodec/armv4l/dsputil_arm.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#ifdef HAVE_IPP
#include <ipp.h>
#endif
diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c
index 63976f4c051f3c719a626ee21f6d894fa1562a0a..6d824e2a14d78afd2fcded43ed78b7a01bb4524e 100644
--- a/libavcodec/armv4l/dsputil_iwmmxt.c
+++ b/libavcodec/armv4l/dsputil_iwmmxt.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
#define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c
index 0aca43557b6a31473b9e8065910db445a2ceddcb..1a11d7a0fbf0000adf1cb10608cc03083bf6936c 100644
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
extern void MPV_common_init_iwmmxt(MpegEncContext *s);
extern void MPV_common_init_armv5te(MpegEncContext *s);
diff --git a/libavcodec/armv4l/mpegvideo_armv5te.c b/libavcodec/armv4l/mpegvideo_armv5te.c
index 52cb8733c73589df6efe7a201df20f15e4d9b643..721dee5152ce87862f4bb23af9d89f112722a93c 100644
--- a/libavcodec/armv4l/mpegvideo_armv5te.c
+++ b/libavcodec/armv4l/mpegvideo_armv5te.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#ifdef ENABLE_ARM_TESTS
diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c
index 42bddc495ce9656f206bcc2e18af56d1b64e7d4a..108631f6490a4e8b268efec402d267ba5a83f47a 100644
--- a/libavcodec/armv4l/mpegvideo_iwmmxt.c
+++ b/libavcodec/armv4l/mpegvideo_iwmmxt.c
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index 2113631aa9938678b10dd0a78406b7606d7d2f66..08808c4b35dadc1ed91ffec1e6ae673a889891f5 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -27,7 +27,7 @@
* @sa http://www.svatopluk.com/andux/docs/dfvid.html
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#include "bethsoftvideo.h"
#include "bytestream.h"
diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c
index 411378baad4d202a5eaf70172ae0784b66c30554..c3f23000045d82a0dec3331384af204aebd046a3 100644
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@@ -26,8 +26,8 @@
* @sa http://wiki.multimedia.cx/index.php?title=BFI
*/
+#include "libavutil/common.h"
#include "avcodec.h"
-#include "common.h"
#include "bytestream.h"
typedef struct BFIContext {
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c
index a72459948c851a17d92414d7da829f404663ec41..4737b15218b914be2e35a12e1182144fbbec5b26 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@@ -22,8 +22,8 @@
*/
#include <unistd.h>
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
int off;
diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c
index 9dd121bafdafc29f53d9961bf7e188fd306661ea..70604c92b53bf001feebf043ccc40ecb13a10abe 100644
--- a/libavcodec/bfin/mpegvideo_bfin.c
+++ b/libavcodec/bfin/mpegvideo_bfin.c
@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_bfin.h"
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c
index fce5668d0777c07eff757d3f736f8bb1fc6929e2..62990f65b1e4b7488c7714af356d7bb252cd6cbc 100644
--- a/libavcodec/bfin/vp3_bfin.c
+++ b/libavcodec/bfin/vp3_bfin.c
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text;
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 0a6f7de53e9ca67a0530a3362abdd98623e22467..68b9cf6e3dccef14be877bdb371e10d201138b43 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -29,10 +29,10 @@
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
-#include "common.h"
-#include "bswap.h"
-#include "intreadwrite.h"
-#include "log.h"
+#include "libavutil/bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/log.h"
#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
# define ALT_BITSTREAM_READER
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 3a94e719ca4ab46d2d2a4b4393198114693cfe52..61fb36a76d74dafc2ff32bc9db4ac6269cbfcf52 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -22,7 +22,7 @@
#ifndef FFMPEG_BYTESTREAM_H
#define FFMPEG_BYTESTREAM_H
-#include "common.h"
+#include "libavutil/common.h"
#define DEF_T(type, name, bytes, read, write) \
static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index fc17bb6ac4c578d41dc5dcb5474fd193b4d7880d..4ed6e028eb08b5e2b6ca816ec3000166c210914a 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -26,7 +26,7 @@
#include <string.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "cabac.h"
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 0cc44190ee300e605127dc0c421c882daa4f0094..b748237ad36850b00bb3fccdf6947e6a385e459b 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -32,7 +32,7 @@
//#undef NDEBUG
#include <assert.h>
#ifdef ARCH_X86
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
#endif
#define CABAC_BITS 16
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index a923e9bae57a5e0b0dc8472bef4da482f2ac84e7..37d1dffaa2cafa4ebba4acfbd14d4bcadb276194 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -46,11 +46,11 @@
#include <stddef.h>
#include <stdio.h>
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
#include "bytestream.h"
-#include "random.h"
#include "cookdata.h"
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 13ca05a1c77273220efde2a6c6dff85fdd5f4d91..39f4bd4b372621ecc947f07f9e95d850fa27e05a 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -26,7 +26,7 @@
#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
-#include "lzo.h"
+#include "libavutil/lzo.h"
typedef struct {
AVFrame pic;
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 50ea537ef5ac2cc8dfa0ea9405e2a888090e80d5..7d8f19df838618744df6e75380bbd71d759d2dea 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -27,8 +27,8 @@
#ifndef FFMPEG_DVDATA_H
#define FFMPEG_DVDATA_H
+#include "libavutil/rational.h"
#include "avcodec.h"
-#include "rational.h"
/*
* DVprofile is used to express the differences between various
diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c
index cd5b5ed4fecadc5b0301ec093025a3fd0f5e4fee..130f5f634cac3b6c8ce34ebf3f5a61556b24ce3b 100644
--- a/libavcodec/elbg.c
+++ b/libavcodec/elbg.c
@@ -25,9 +25,9 @@
#include <string.h>
+#include "libavutil/random.h"
#include "elbg.h"
#include "avcodec.h"
-#include "random.h"
#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentual error)
diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h
index 1b2e45c4ec62f2d6695e08ff9faecaacf749e461..84ec8657ef73cd53f5bf8fed3ceace293c6bb275 100644
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@@ -21,7 +21,7 @@
#ifndef FFMPEG_ELBG_H
#define FFMPEG_ELBG_H
-#include "random.h"
+#include "libavutil/random.h"
/**
* Implementation of the Enhanced LBG Algorithm
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index a5aaa69fb4e7c6e4fb6f8443888d612deca7a2ee..0a590370d484975b420d2621dac47e7302b40d1f 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -36,10 +36,10 @@
#include <limits.h>
#define ALT_BITSTREAM_READER
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
#include "golomb.h"
-#include "crc.h"
#include "flac.h"
#undef NDEBUG
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 9e5036bee30869ca3348c136b4b88d132b1695eb..9b798d1ab180d43b9fbe7be36c4e05beef7f61f9 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/crc.h"
+#include "libavutil/lls.h"
#include "avcodec.h"
#include "bitstream.h"
-#include "crc.h"
#include "dsputil.h"
#include "golomb.h"
-#include "lls.h"
#define FLAC_MAX_CH 8
#define FLAC_MIN_BLOCKSIZE 16
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index ea1d8c4261fd4938c140ebf7b6e2fca2dde7d937..46aa3fc030ac66242575ff0843d6880dcd1817f7 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -40,8 +40,8 @@
#include <string.h>
#include <unistd.h>
+#include "libavutil/bswap.h"
#include "avcodec.h"
-#include "bswap.h"
#define FLI_256_COLOR 4
#define FLI_DELTA 7
diff --git a/libavcodec/golomb.c b/libavcodec/golomb.c
index 0ac7c9514cd62bfa322c1c505a707882418b7ac3..79dc0a71cb104d367e00f09e2b600e32fdc03265 100644
--- a/libavcodec/golomb.c
+++ b/libavcodec/golomb.c
@@ -26,7 +26,7 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
-#include "common.h"
+#include "libavutil/common.h"
const uint8_t ff_golomb_vlc_len[512]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 5108bf1fad71847c539ddc605a7b931f43aeeb08..237e3f870916f85971435d33c7148e04ff243d5c 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -30,8 +30,8 @@
#define FFMPEG_H264DATA_H
#include <stdint.h>
+#include "libavutil/rational.h"
#include "mpegvideo.h"
-#include "rational.h"
#define EXTENDED_SAR 255
diff --git a/libavcodec/h264enc.c b/libavcodec/h264enc.c
index 542c3732489485a638077b1971c15475494745fd..17a2ec8b1869b7235a94cbafa988cd321c760ca4 100644
--- a/libavcodec/h264enc.c
+++ b/libavcodec/h264enc.c
@@ -17,7 +17,7 @@
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "mpegvideo.h"
#include "h264data.h"
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index 111e5b369ab8b72dea0fdcb39e13543301aa4431..4e3fcdfab4d81a9d83218a01f22b429baf7b8c39 100644
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -28,7 +28,7 @@
#ifndef FFMPEG_H264PRED_H
#define FFMPEG_H264PRED_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* Prediction types
diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c
index 618c60dce6e8e9846f1ba08b0929a38e3ccbcc83..7489630eeb9c772c69523ff8747c24b72babd7be 100644
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/i386/cavsdsp_mmx.c
@@ -22,10 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
-#include "common.h"
-#include "x86_cpu.h"
/*****************************************************************************
*
diff --git a/libavcodec/i386/cpuid.c b/libavcodec/i386/cpuid.c
index a07749d1d322256eabc1ade5fd4aa21161414ca3..230ff26c0bcaa951727aeee30b7da7dab7f503e4 100644
--- a/libavcodec/i386/cpuid.c
+++ b/libavcodec/i386/cpuid.c
@@ -21,8 +21,8 @@
*/
#include <stdlib.h>
-#include "dsputil.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#undef printf
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index b8beddded90d000ddc0b02e5220db5a3f4058da5..53cfe9d848f8e71f9ed6d73ef3ef14a34f341895 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -22,16 +22,16 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/h263.h"
+#include "libavcodec/mpegvideo.h"
+#include "libavcodec/simple_idct.h"
#include "dsputil_mmx.h"
-#include "simple_idct.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
#include "mmx.h"
#include "vp3dsp_mmx.h"
#include "vp3dsp_sse2.h"
#include "idct_xvid.h"
-#include "h263.h"
//#undef NDEBUG
//#include <assert.h>
diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/i386/dsputil_mmx.h
index 81fe54e23437f4f098951dfdd8a1cd5d64547ecc..142854684b81a9e59f314d5ba26efee81f4a08be 100644
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@@ -23,7 +23,7 @@
#define FFMPEG_DSPUTIL_MMX_H
#include <stdint.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
typedef struct { uint64_t a, b; } xmm_t;
diff --git a/libavcodec/i386/dsputilenc_mmx.c b/libavcodec/i386/dsputilenc_mmx.c
index 733234a1f161e24a45d119c23660f6999d34fc00..94e189cb6f2845620be546e74a00ca0d8c65c99b 100644
--- a/libavcodec/i386/dsputilenc_mmx.c
+++ b/libavcodec/i386/dsputilenc_mmx.c
@@ -22,10 +22,10 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
diff --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/i386/fdct_mmx.c
index f93c3c9375a44bca2ed9511e4e93316366877016..9e017a656a2a7ef52bfecaf72a0aa4d0593abe97 100644
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/i386/fdct_mmx.c
@@ -29,8 +29,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 "common.h"
-#include "dsputil.h"
+
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
diff --git a/libavcodec/i386/fft_3dn.c b/libavcodec/i386/fft_3dn.c
index 700a1e4bae59a13eaab510a8a7c130276c1e111d..8bd7b89d01d58dc3d798d2b2c192340ae8d0479a 100644
--- a/libavcodec/i386/fft_3dn.c
+++ b/libavcodec/i386/fft_3dn.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 "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
diff --git a/libavcodec/i386/fft_3dn2.c b/libavcodec/i386/fft_3dn2.c
index c5337b8c2a82330ad71c2f7fec6905b77dd534cd..32c4be369b71c8ad8ee826609766d219e4eefd38 100644
--- a/libavcodec/i386/fft_3dn2.c
+++ b/libavcodec/i386/fft_3dn2.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 "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
diff --git a/libavcodec/i386/fft_sse.c b/libavcodec/i386/fft_sse.c
index 3a0f2d742768d0a99ccce96cbfd209c37cffc23f..83cbd870888b59cfb647d216bd2476567f1df55a 100644
--- a/libavcodec/i386/fft_sse.c
+++ b/libavcodec/i386/fft_sse.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 "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
static const int p1p1p1m1[4] __attribute__((aligned(16))) =
{ 0, 0, 0, 1 << 31 };
diff --git a/libavcodec/i386/flacdsp_mmx.c b/libavcodec/i386/flacdsp_mmx.c
index 2096e3305b1c0e39f27145328c874cfbc803eb43..ad248ff94415b48edc0ac28590b6b1223f1e9ad6 100644
--- a/libavcodec/i386/flacdsp_mmx.c
+++ b/libavcodec/i386/flacdsp_mmx.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/x86_cpu.h"
#include "dsputil_mmx.h"
-#include "x86_cpu.h"
static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
{
diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/i386/h264_i386.h
index b2dc5e8ee1a424f5450096c9e740e8f7ee6cdcfd..80468f68c928b95040e2b3dc4d7f05523b581e00 100644
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@@ -29,8 +29,7 @@
#ifndef FFMPEG_H264_I386_H
#define FFMPEG_H264_I386_H
-
-#include "cabac.h"
+#include "libavcodec/cabac.h"
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
//as that would make optimization work hard)
diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c
index 005a42dedb6b3d5c2eb74ed9726731e09896545f..d860c7e381e3acaf7faf8e088b10d1023b84db72 100644
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/i386/idct_mmx_xvid.c
index 15e5290e7b51b63d52c17007880d8145d54dbdfa..9f90b5d8fd9eb949b60b7cc42924ce5c4b8ea118 100644
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/i386/idct_mmx_xvid.c
@@ -40,7 +40,7 @@
*/
#include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
//=============================================================================
// Macros and other preprocessor constants
diff --git a/libavcodec/i386/idct_sse2_xvid.c b/libavcodec/i386/idct_sse2_xvid.c
index 9029af183f4d3ed5b8872880ea55b7f1233c1a48..95bdc05772d270770654dc72ed4efbcb3a5610a6 100644
--- a/libavcodec/i386/idct_sse2_xvid.c
+++ b/libavcodec/i386/idct_sse2_xvid.c
@@ -38,7 +38,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
/*!
* @file idct_sse2_xvid.c
diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index df75b6e153c9114a649aef65c3bed9edcc219954..0e111f9f97d4f1de893a6408765eedc951552541 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -21,8 +21,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 "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
0x0000000000000000ULL,
diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c
index 4b2e4d68afb6b24575e9bdb306cd7995758d402f..b7ed74d27087ad6f69cdfbfefd71c486b93730b0 100644
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@@ -22,11 +22,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
-#include "x86_cpu.h"
extern uint16_t inv_zigzag_direct16[64];
diff --git a/libavcodec/i386/simple_idct_mmx.c b/libavcodec/i386/simple_idct_mmx.c
index 059f473a0c50fcab766552dac40d64c86def078a..04b28f50c15698b91c2b7b045430d3103eaa9099 100644
--- a/libavcodec/i386/simple_idct_mmx.c
+++ b/libavcodec/i386/simple_idct_mmx.c
@@ -19,8 +19,8 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "simple_idct.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/simple_idct.h"
/*
23170.475006
diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/i386/snowdsp_mmx.c
index c9671f0c1e67ea10b5e2b8f7c85740f6715d8acb..2fb76cf0d4caadfb335ed665376a59bcb1957354 100644
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/i386/snowdsp_mmx.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "snow.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/snow.h"
void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
const int w2= (width+1)>>1;
diff --git a/libavcodec/i386/vc1dsp_mmx.c b/libavcodec/i386/vc1dsp_mmx.c
index 0e543e4fdec939290853e02564c2187deb285500..c3df9415eafe5b7fc43759018f9f406275531685 100644
--- a/libavcodec/i386/vc1dsp_mmx.c
+++ b/libavcodec/i386/vc1dsp_mmx.c
@@ -24,9 +24,9 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
-#include "x86_cpu.h"
/** Add rounder from mm7 to mm3 and pack result at destination */
#define NORMALIZE_MMX(SHIFT) \
diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/i386/vp3dsp_mmx.c
index d71a2b4141f7c3ce2d4d6ad76e6fecdbddbd7df1..00a6d272078ae9ff0b149b6f6e0d0ee719fb4f13 100644
--- a/libavcodec/i386/vp3dsp_mmx.c
+++ b/libavcodec/i386/vp3dsp_mmx.c
@@ -23,7 +23,7 @@
* MMX-optimized functions cribbed from the original VP3 source code.
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
#define IdctAdjustBeforeShift 8
diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c
index 1950407eeea11f70d436658832d9fe433efa5d6b..e888bcfd69aaa9d1b8e16ef37c9cc7b983745205 100644
--- a/libavcodec/i386/vp3dsp_sse2.c
+++ b/libavcodec/i386/vp3dsp_sse2.c
@@ -23,7 +23,7 @@
* SSE2-optimized functions cribbed from the original VP3 source code.
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmx.h"
static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h
index d02918f45961c8f2d0b3606515415005c406bd32..a421abc9aec015ec8852bbbd8d791928b9e4047d 100644
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@@ -22,7 +22,7 @@
#ifndef FFMPEG_VP3DSP_SSE2_H
#define FFMPEG_VP3DSP_SSE2_H
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
void ff_vp3_idct_sse2(int16_t *input_data);
void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index a9dcfab8252d4087f1e683f4e0cef3779ea61c54..f952ac9df5d3faa73a052cd32327e9893910101d 100644
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -70,7 +70,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define DCTSIZE 8
diff --git a/libavcodec/jfdctint.c b/libavcodec/jfdctint.c
index 250312467f28fe5adf22ef2ed282788286aeb75d..dbd7464ae909420e5ac2a4cea1b6847ed8327808 100644
--- a/libavcodec/jfdctint.c
+++ b/libavcodec/jfdctint.c
@@ -63,7 +63,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define SHIFT_TEMPS
diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c
index f055cc1ac348ea46889eab9dfea367a6a97db6ff..d9612ebd8224b58e10d810b2f1f8b62fd05aaed8 100644
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@@ -64,7 +64,7 @@
* Independent JPEG Group's LLM idct.
*/
-#include "common.h"
+#include "libavutil/common.h"
#include "dsputil.h"
#define EIGHT_BIT_SAMPLES
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index 21f9abddb0372bcf87f41c4fa3d4cc06519f7d0c..b08b387a744ac19edf38fb9846cd4a18ddb067e6 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -31,8 +31,8 @@
*/
/* FFmpeg includes */
+#include "libavutil/log.h"
#include "avcodec.h"
-#include "log.h"
/* libtheora includes */
#include <theora/theora.h>
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 65918ad96ceb04d0622aeb67c016f9e6d1d3fee2..71a026f99b9b3200251d865fcee8f6826afac885 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -22,7 +22,7 @@
#ifndef FFMPEG_MATHOPS_H
#define FFMPEG_MATHOPS_H
-#include "common.h"
+#include "libavutil/common.h"
#ifdef ARCH_X86_32
diff --git a/libavcodec/mlib/dsputil_mlib.c b/libavcodec/mlib/dsputil_mlib.c
index 233d6070a79ab125e7f35fa727a2600ab8be7f74..9337a5a0d77f187e604229853b77bae5bb8046b3 100644
--- a/libavcodec/mlib/dsputil_mlib.c
+++ b/libavcodec/mlib/dsputil_mlib.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include <mlib_types.h>
#include <mlib_status.h>
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 96dbc5943f6276a5da324d197d1f8d32f213a248..a2cd6469e66b799f65cd9f7dadee433c4a162d8c 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -24,9 +24,9 @@
* MLP parser
*/
+#include "libavutil/crc.h"
#include "bitstream.h"
#include "parser.h"
-#include "crc.h"
#include "mlp_parser.h"
static const uint8_t mlp_quants[16] = {
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 96e1a20b0c9deab7b0c5d56bba8d6dbf275a391c..35ccbf6ba9191ff46910ae546b9779dad27c7c11 100644
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -25,10 +25,10 @@
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index ce438e3af955924bd0c21c3d6d757a30816fa437..0c1548992fb9771c954772a5af4427b4ca8bd33f 100644
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -28,10 +28,10 @@
#ifndef FFMPEG_MPC_H
#define FFMPEG_MPC_H
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 5ac93cf0f3bbcbc833fa7662a24c42fb4021b559..4c598e9a700c02fc57db0da74620e23b03bf468d 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -25,10 +25,10 @@
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index e98b24822a6fd8272bfc118f3a572ebdd75e8550..756e7f4df0b62bff58df7a6197d0a04c280ac088 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -25,10 +25,10 @@
* divided into 32 subbands.
*/
+#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
-#include "random.h"
#ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index e23ec83188b20b710c72fb383c4e7983b106c516..d15bf4baa9863f766d07e76a6e9d67d68f7b0a00 100644
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -29,7 +29,7 @@
#define FFMPEG_MPEG12DATA_H
#include <stdint.h>
-#include "rational.h"
+#include "libavutil/rational.h"
#include "rl.h"
extern const uint16_t ff_mpeg1_default_intra_matrix[64];
diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h
index d513645b574fb5b28e14792f13dadf5d65ac526f..08e7570e6ba821979f041cbad93dc4c522d5d84a 100644
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@@ -27,7 +27,7 @@
#ifndef FFMPEG_MPEGAUDIODATA_H
#define FFMPEG_MPEGAUDIODATA_H
-#include "common.h"
+#include "libavutil/common.h"
#define MODE_EXT_MS_STEREO 2
#define MODE_EXT_I_STEREO 1
diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h
index 21e8cf016da2ed3caf17a5f75f03a07b1f44e4ee..60f0365484151d35ea126eb510a74145fc49d8e4 100644
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@@ -27,7 +27,7 @@
#ifndef FFMPEG_MPEGAUDIODECHEADER_H
#define FFMPEG_MPEGAUDIODECHEADER_H
-#include "common.h"
+#include "libavutil/common.h"
#include "mpegaudio.h"
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 9bfb1ba99c2a8bd69db291e46e7ecbf165d8b6d0..62939176953e33d5eedf113190c71d488bd1b87a 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -30,7 +30,7 @@
#ifndef FFMPEG_MSMPEG4DATA_H
#define FFMPEG_MSMPEG4DATA_H
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "rl.h"
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 7e8c3652622b4134041424238141f8f41712e01d..876a44f02275889fb0937495e35a9ee847313b10 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -30,8 +30,9 @@
* The 3 alphanumeric copyright notices are md5summed they are from the original
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
*/
+
+#include "libavutil/random.h"
#include "avcodec.h"
-#include "random.h"
#include "dsputil.h"
#define ALT_BITSTREAM_READER_LE
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index b87e4bd8c1bd6052cce75d1d318ee56a6fdde39a..5953121027a7400f3ad3fa73c80324fbf0482548 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -21,11 +21,10 @@
#include <stdio.h>
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/lzo.h"
#include "avcodec.h"
-
-#include "bswap.h"
#include "dsputil.h"
-#include "lzo.h"
#include "rtjpeg.h"
typedef struct {
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index 3d79c3ab5d4f0f04e78d04c6a086a3b15aa60ea4..bab8a0503fcef3c3d1cdfbca7f80fb8de185f019 100644
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c
index 13dea06a16d5b4654f5eb8f0c9e01885059f6fad..168f8d8b6d0dd62284bf4c95a2119e2bb5c30307 100644
--- a/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_ppc.h"
diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c
index 6b9a35ba80eef3d558408c4adebef7baab1a845a..be6e4dabb46973196d2266fec907092bff887684 100644
--- a/libavcodec/ppc/fdct_altivec.c
+++ b/libavcodec/ppc/fdct_altivec.c
@@ -20,8 +20,8 @@
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "dsputil_ppc.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_altivec.c
index e0b77807f8dae3dfd72f3f99a6c1a9494ca34f61..f5608556cbdcf177eadfb83792d0d3aa6dd23865 100644
--- a/libavcodec/ppc/fft_altivec.c
+++ b/libavcodec/ppc/fft_altivec.c
@@ -20,7 +20,7 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c
index 750e6d7f902f1c7f3db104a75553ad2185d2bd71..fd4b12b941db435906bed01599e61c9dea724424 100644
--- a/libavcodec/ppc/float_altivec.c
+++ b/libavcodec/ppc/float_altivec.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c
index 8151410d44ef92e41910f088bec09a05eabcc5f7..0113a9aa9744c2f8039ab241f980850d8a9cfac2 100644
--- a/libavcodec/ppc/gmc_altivec.c
+++ b/libavcodec/ppc/gmc_altivec.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c
index c716b1e33ea4e66f69e2aa9d383a70d4ccef1433..09a739bdb8e8fffda5c22c40c3752ba4c15c9dbf 100644
--- a/libavcodec/ppc/h264_altivec.c
+++ b/libavcodec/ppc/h264_altivec.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c
index 37b2f62c3794d4706ef30d4f82d3653402657381..2d09ac79c312dd84ee6795f88932466d7b9bfb65 100644
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@@ -38,7 +38,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c
index 95497c99a7d3de7febf8647c5c694f606e1cbab8..1983fe15ae5fe76937a51d23852ad6cb4880c6da 100644
--- a/libavcodec/ppc/int_altivec.c
+++ b/libavcodec/ppc/int_altivec.c
@@ -23,7 +23,7 @@
** integer misc ops.
**/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 0c56cfb9b796a3deb55df3d2a930d3ad18d5b113..14cc6ce85621742c367c968705ba77581e49eb19 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c
index 8770f05f5bcef77c71452bcd93ece13ba4262f6a..ea228b0daa5342ff398b9d42c1928241dee1ce2b 100644
--- a/libavcodec/ppc/snow_altivec.c
+++ b/libavcodec/ppc/snow_altivec.c
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/snow.h"
#include "gcc_fixes.h"
#include "dsputil_altivec.h"
-#include "snow.h"
#undef NDEBUG
#include <assert.h>
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index 87bef808e685cea854bc28d31ff17e018c9f5c9f..ea5700536e19cbe74ff34e81f19cff8b127f03ed 100644
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "gcc_fixes.h"
diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/ps2/dsputil_mmi.c
index 6a0582fe4469b0359cf90702f8d8683187ddd3b3..3b7aba2889a9d1e46bb6681d4df31244558b6846 100644
--- a/libavcodec/ps2/dsputil_mmi.c
+++ b/libavcodec/ps2/dsputil_mmi.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "mmi.h"
void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
diff --git a/libavcodec/ps2/idct_mmi.c b/libavcodec/ps2/idct_mmi.c
index d88647961237a5391e2f0554da8a31992735a28c..8fac74f47bb6c28b180d2d0885e981c23f0ee386 100644
--- a/libavcodec/ps2/idct_mmi.c
+++ b/libavcodec/ps2/idct_mmi.c
@@ -25,8 +25,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
#include "mmi.h"
#define BITS_INV_ACC 5 // 4 or 5 for IEEE
diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/ps2/mpegvideo_mmi.c
index 7f62e6e6d2382cef18026c1728ade63729ed7fb4..da764a214247a6a59f318347f0a0cab546fdd7d1 100644
--- a/libavcodec/ps2/mpegvideo_mmi.c
+++ b/libavcodec/ps2/mpegvideo_mmi.c
@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
static void dct_unquantize_h263_mmi(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 4726afb56e4b49e9edc8b4ad9088d39570f04926..7d23b252d01afd761dcf5a772898bf39c9f6916f 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -29,7 +29,7 @@
#include <stdint.h>
#include <assert.h>
-#include "common.h"
+#include "libavutil/common.h"
typedef struct RangeCoder{
int low;
diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index e1388629825c6009b77422978aee0adba8bd3174..b2452abb2d8995c60c29a24cf1885336cb5515c7 100644
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -28,7 +28,7 @@
#ifndef FFMPEG_RECTANGLE_H
#define FFMPEG_RECTANGLE_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* fill a rectangle.
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 3345635ee86f28e804bceb87c004917efc9bf603..e7af474da8df6a4053c408f81d0b5c90ebe5c6a0 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -22,9 +22,9 @@
#ifndef FFMPEG_ROQVIDEO_H
#define FFMPEG_ROQVIDEO_H
+#include "libavutil/random.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "random.h"
typedef struct {
unsigned char y[4];
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 7ab808dacf6a91fe94796fe3a9377adb74708ada..218c7dd4c223cf787f87d70261df061a83686823 100644
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -18,7 +18,7 @@
* 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 "libavutil/common.h"
#include "bitstream.h"
#include "dsputil.h"
#include "rtjpeg.h"
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c
index 15b0350f2d26724006a689de4f6cef21dcf0c554..7c49a06ea915b514b39d74ea1e3275507021ec88 100644
--- a/libavcodec/sh4/dsputil_align.c
+++ b/libavcodec/sh4/dsputil_align.c
@@ -21,8 +21,8 @@
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
#define LP(p) *(uint32_t*)(p)
diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c
index 18b19b1c3ae2703351765b1d7628c417ead2f9af..6b8d9fe7c2d5f2c56dcf09fdc76b38a72eee4c3d 100644
--- a/libavcodec/sh4/dsputil_sh4.c
+++ b/libavcodec/sh4/dsputil_sh4.c
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
static void memzero_align8(void *dst,size_t size)
{
diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c
index 3f95cf056178bfbd147b5353929df2f9b3482ef1..b31943fc7d1bcdeee196f39ce104a0ff4afb8cce 100644
--- a/libavcodec/sh4/idct_sh4.c
+++ b/libavcodec/sh4/idct_sh4.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#define c1 1.38703984532214752434 /* sqrt(2)*cos(1*pi/16) */
#define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */
#define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */
diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c
index 43726031195649a5f34f06d7e37333a597c71f33..a01eea31bbe66251fb3bac041a73326a2c4b6526 100644
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@@ -27,7 +27,7 @@
#include <inttypes.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
#include "vis.h"
diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c
index 716d3de4877d57b2de8b862d2fee7a56ca18bfdf..720b66472bc39002e173a25f3de787b247d0508d 100644
--- a/libavcodec/sparc/simple_idct_vis.c
+++ b/libavcodec/sparc/simple_idct_vis.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
static const DECLARE_ALIGNED_8(int16_t, coeffs[28]) = {
- 1259,- 1259,- 1259,- 1259,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 349634f7b18583c7d2fa0bcf81a1887227b23ef7..3fd5eb33190419a63db6ea9a435db0c523edef20 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -25,11 +25,11 @@
* utils.
*/
+#include "libavutil/integer.h"
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "dsputil.h"
-#include "integer.h"
#include "opt.h"
-#include "crc.h"
#include "imgconvert.h"
#include <stdarg.h>
#include <limits.h>
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 5d995d754f18c8c15e05c10cb69c74666ea54f28..0c8b1fa8af125e091280c77625bf33c85e601719 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -29,8 +29,8 @@
#define FFMPEG_VC1DATA_H
#include <stdint.h>
+#include "libavutil/rational.h"
#include "bitstream.h"
-#include "rational.h"
/** Table for conversion between TTBLK and TTMB */
extern const int ff_vc1_ttblk_to_tt[3][8];
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index 0dd79b06b1fddb7ea393d20ca631c06ef282522e..6dfb8ebf81066998c74c8810f4d5733514cdca99 100644
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -24,7 +24,7 @@
#ifndef FFMPEG_VP56DATA_H
#define FFMPEG_VP56DATA_H
-#include "common.h"
+#include "libavutil/common.h"
typedef enum {
VP56_FRAME_CURRENT = 0,
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 7e75750107ee27d60848bbc4df62a2e7c56c4c09..0a6b33530e1e6d38921ecd20f59e87d81d6565fd 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -21,7 +21,7 @@
#ifndef FFMPEG_XIPH_H
#define FFMPEG_XIPH_H
-#include "common.h"
+#include "libavutil/common.h"
/**
* Splits a single extradata buffer into the three headers that most
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 41a40df67cf63440bbb396bd729335ca8e322713..6dfd350264b9ab719747d2eb976fc5661af99d60 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -17,8 +17,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 "avformat.h"
+
#include "config.h"
+#include "libavformat/avformat.h"
#define REGISTER_MUXER(X,x) { \
extern AVOutputFormat x##_muxer; \
diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index bb76f0c0d14e23f2a5475b250bee758f58b44677..6be3ce103729143cb01a48d144950ef82f8c445f 100644
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -35,9 +35,9 @@
#include <sys/ioctl.h>
#include <sys/time.h>
-#include "log.h"
-#include "avcodec.h"
-#include "avformat.h"
+#include "libavutil/log.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
#define AUDIO_BLOCK_SIZE 4096
diff --git a/libavdevice/beosaudio.cpp b/libavdevice/beosaudio.cpp
index d942d7e45d932be241a5357ed71b6951b237be32..535f75be57280b25e62aefb9a765ef877da812e1 100644
--- a/libavdevice/beosaudio.cpp
+++ b/libavdevice/beosaudio.cpp
@@ -30,7 +30,7 @@
#include <SoundPlayer.h>
extern "C" {
-#include "avformat.h"
+#include "libavformat/avformat.h"
}
#ifdef HAVE_BSOUNDRECORDER
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 0ea8dfb02c41034e7c3fa952c918acbbcccd1313..364e29665807e5a9e1f8cac5419e9bb465632ce0 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -23,7 +23,8 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+
+#include "libavformat/avformat.h"
#if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
# include <dev/bktr/ioctl_meteor.h>
# include <dev/bktr/ioctl_bt848.h>
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index fdf8428b5e8121f732929cc79d8d380ff6f37ba1..8562652e93826758690e63c165001e0958048995 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -29,12 +29,12 @@
#include <sys/time.h>
#include <time.h>
-#include "avformat.h"
+#include "libavformat/avformat.h"
#undef DV1394_DEBUG
+#include "libavformat/dv.h"
#include "dv1394.h"
-#include "dv.h"
struct dv1394_data {
int fd;
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 36257f083cd496f1714713df0c596dbb1a75589d..7be079e937636dd477f193ad86c3585c3891b7d3 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -21,7 +21,7 @@
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#if ENABLE_LIBDC1394_2
#include <dc1394/dc1394.h>
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index cc31c27115e3f44394649aea929178b646375e41..20dd53bc321e9d4b7c451af1005e1089b1e8aa8a 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -20,8 +20,8 @@
*/
#include "config.h"
-#include "avformat.h"
-#include "dsputil.h"
+#include "libavformat/avformat.h"
+#include "libavcodec/dsputil.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 565fa5253f6ced3220799fa550c4065cbf7d7a13..319983b8fa0b775b6f0b8c5e69575d33090a3edf 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -28,7 +28,7 @@
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index cfd49b600e9ea95e9675f0e722109423043ed0bd..5963e6242ea2d2dc32e3c03491e59ada17a6a1ce 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <vfw.h>
#include <windows.h>
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 3e3ce31dba3db5a81e0cc42830c022474534ccf0..f1375f6deb7814aa029285ec20f7fdd1b2536743 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -36,7 +36,7 @@
*/
#include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 61bcfaf616248f24b922fde6b4f8a283c99bccfe..420e7c262bf6924b7f8180ff4a6e6b0938cf1093 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/imgconvert.h"
#include "avfilter.h"
-#include "imgconvert.h"
/** list of registered filters */
struct FilterList
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 2f0e6abdb43d1793a2f97766436cbf030bceff59..b660be74f4777b0b34c62960654739ba9ce333d1 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -35,7 +35,7 @@
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT
#include <stddef.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
typedef struct AVFilterContext AVFilterContext;
typedef struct AVFilterLink AVFilterLink;
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index ab184973ad3704714ce64e2667ba7113e67df3b3..da635456c7b3b935c617061fae5f59310d99e148 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/imgconvert.h"
#include "avfilter.h"
-#include "imgconvert.h"
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
void avfilter_default_free_video_buffer(AVFilterPic *pic)
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 1949fcf5429ee0de213b033a978cc32e02a3eb10..0961b0fac3744709f8263c5f1674ec72e1345cf9 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 78ae6f4cb9e172a843d07c0df418a693eb263c06..92329520b36d541bf9ad9c06aa1b2f9673fbc9c2 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 66b5638601084d13fbf08b3bc84f63aab143f41e..20fe91790065c30df497617e397f039c9993da71 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 10cc934b4501b91959f8dde849d6280340a726d2..74a3dcc431910bcbf6ab30783201e85e164f3d98 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 27a6a7f6b12ffb62de2b423d0c78bbb5306f5b0b..743cc88e98a6ad82dc11570c4b76247831daf40f 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 3917270b1dcac79e062d06a8bfcca2a88a7f4a11..6206c66909c3ce2519a89a80d6e7a79b1e7d28d7 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 9b04d3fbe06c6641aafa1642f248c77cec763ee3..a69b8804533b4673bfe9631cb854b96a3d2db2a5 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 dd88031618e2fee27b403fddfe78eec57c5cd0ad..3ed0cdb45069f19e98c1f675817fad9cb5d5cc86 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 0f4c5cf0b4040b1903404d835b3e0d15c56211e3..c9b9546ec0a07bce0d3d7f4d06d8e559fb2ad4dc 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 0d60028182fd54c5dab6cf8a80cbe39c901f67f2..af6856f44ac76594fd24a0a2f595c9b5ab1384c9 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 6285c1bba2b322b3d15b4a73633b28e3bf47f59b..758c050212ebb90baa957b96e87e43b6e579a129 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 c0133017c204b459e86bd196dd3b95dfbd5c80e3..0b537158c4cd8e8a026d844d22b3867baab328bc 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 5568c138e7d85103de0686aec3c3a0e7bc97b126..ce068d78d0e6a6b2ad11552fb123cff865f24775 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 b952fbe69702a2d71ba2570b54433266dec3d9d9..dab39a2afb91edc0ec0f009b6ea679b553f8e15e 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 d4bf6f43be2e7273b6a9b095896f78bb22854aa4..a0c98b22382546afa1cb76668574d9b7cbd78f54 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 469105de5f5f00184c8dc430530c459b3da76e54..e47f45eeb64bc5a765eeea2535fe5796231b675e 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 1d542061bdc388ffe474afa500f289aa39df528d..fc9cac442d7ddffbe706b040c63c9e226be1138e 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 ca4da723c95433bd7f1629f43efa13496b7eb142..0523bc7d81bd6b82db2e7cfb951cb0bcd87a2aab 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 025eefb3e2c7f5ac2b639ce61ad421dc5bd76139..6f48f04723e475c4afa1c064e878b06cec7b995b 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 10fd958f5f2f24e9730598e74f2dcf0a36f877aa..6a9d1abb5e1a1bc2d3719727bae81e68991886e8 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 380ed32685a651e16a7ef01712aabe5d66421e9f..f799182c60c6d3efad005212929af107e9f515d2 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 611d547734f00e11915c38e4d9656939af224d88..75d4216d8b47b1e4a90a23766f3741a2fff805db 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 1b3ff011f682b00602d30f729b76c05cbd202007..59cd5f50af161a9a942acbb855e357dc46eda9e8 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 8e6c573dff4558e5a4cf9d30de29b3d0b345b86c..24ff7aad40d18d02f616111898515a130ce7b134 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 879c7d2367f6e35956c8ae0c0476db76e6162896..f6cc098954350133948442156580bdc05c041cce 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 bdd70254d60cecd94f7644e930b994b1a4951d24..c1675ee4428440f1ea16311bdca93971b034354a 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 0558226b82baac48118dfea8807837f8607bd7fa..05c72cd1e7c40f8d0f7bac12c7466363e4f7e311 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 6cb4bcab4f765af23a24b77d4e5119b2e03fbc91..e5ae4d64412e2172897753bbf6a8770fe0ceaa9e 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 49d29aa2b915f1397bfb4b42713d4c2eb261cd40..b5ba32d2ff2b7c2d8b6b8e32f6a85c2e655e9800 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 05e44b27c0450033eb0a9b85e8d7e91161a5d970..df79c0187d2194b1947c0617a67d32d6afcd8af6 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 6db0d67bbbbbe1c8e5bd1b2e5823dd21f88950b2..d8fa198edf78d0f6704fd3dd4fa84575e216c90d 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 4d4bcbb35d1a78948719faa87658fc38d213fe0d..df3a890305435e700c789337e77218b0e74f94c4 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 e790691fc8c0f8d60235205d6c243c1bf9b10dbf..7a978a5f11b5b4dc2e46ba47c11cf7f0441dad3a 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 2df58fbf85ae4da158523a0be88bfb240faa7255..6acebc34b7402531c91c7f1bc5cc033b0350dc05 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 03c684da9b0122a1efd330d4f33ecc54ae8c460d..772a527f8e455363c66ad62100b4cb215e97d96b 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 ae1bbb59a8ae5d55a838edd74710966a046b127a..58debcb25eadf3ec47eeb0904c56c6f93729fe3b 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 16b6b22255ecd2a5fc9f2257aef779f0e0f03570..fe05fba919664ac32482dcb61f673234c51a8fe3 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 611a8c5a1b1e34f2b1b4887ad8f438b7a43743eb..386a70ebd44cf3ff7228638604c174c718a95c81 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 70e53948fb2ddc645c6b729b3287c61a6f881097..6067f95d1147b89a5a2795542e7ed9b7957093d3 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 a6c44271eb8381723c00567543b91b4687949403..ad2f0b7db44fb37f4952efbae6a9c266612ae20c 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 b976dcb70148bb698523fb109f7ce3fc75c6d08a..36848b15883e3c439bfdde2ca63e3fa2d8a16ef6 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 cc914ce39448a309f3d479deabff6324c4668959..29e6d91b685cd72b7130568a1b154cca51ace952 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 05b77af1b824e577855fcf0155bcc502db19252d..f37758c09d18c3e7e7cc0eb8e651a82b69f29933 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 2575ebf44163eedd2d91a6533a580bef5b0fe214..322e8131ffda99b6e2705d65455779e348efd91c 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 dc970f619d62e60104f464d27ee2b75f61184c1f..9d36715888a89a992397ebe862cb87d3a808bfaa 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 f81462102d831c1b6dbd766acabeab1a315c8e89..c4bda1fa636b0ef80fcbda5c270ecb8f5b7e9936 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 a095af90b82afcdeb20cc1c7454be5b6885953bd..fa284c14e9cf8db8a71ef20c675568dd34793a5c 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 adb7cc84015076f4126c18aae79a4cb733ea1683..4627abc4e2a87b37361e5bba64f29b549df60914 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 21cfdb4cf18fc2a31f49ea217e0053748f84e88f..36affed42041f98aaf8f5578ecb4bbc815567527 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 3e0fc3add41e36e4c7ac37a0596571b0053bb492..009774e8ad1c7321171c76d850b268ba2c5a1f67 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 e9d6cb3905bba34489426b3fb2ab7245d40e4b8d..c34212dc16c7dda6804017ca8f181d15504bca7f 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 c8bf81f9a667d63dea78a4a03d3f82cba9c810a0..d42f2e770ccaf6df94880326f9eb1083bb942cd7 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 20e162e948106a9e3b2eef0028354b76898ea106..dc9e0442272a163422af74d842639768156c6aeb 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 19e4f19fe469c26f1e1b619cf3e85dbc7bcd3ab0..c6cd3cc350283d8d7e847cdcff6e4950e2707f07 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 80231bfe250bfa41c21873d0d0ca81c5ddf669db..99fae3a9a0e1ac91aca40334537f2e13bf8d9363 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 d5c694ac7766dae6f3ad041884eb5de9fe96ce33..8819d02b2527e9351e793ebeb543d15995633944 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 7592aec3beb698a96c806e63257922ed765bd815..c1075c329b52c7e22695fc58bf76445cb20f1b86 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 562a41616457645720ddbbb9bc1e8bd3cb4c74bb..8066c26f01096de6c0594b196437b13238fef406 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 97ebfdb5eb07d5955b8b8f7d32c9bd4957421319..0896c0aca850d7485a93e725edf80151c1845d45 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 387a96c5f77c913a23836ba680bcb2d0a645826e..9d7d0f27e0556b4d601a289feeeccc8a05e6a07c 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 2cd0101f1506e664b9668371311d0f1d74b4e463..bfdc39b1a6f693552e711567e82580da3fff8b0e 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 5d164c5d5a26948cccdabd32c64c5d01fb9ece0f..5b6fd55381bf90d541c519e77e41bb08bdd805f2 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 2240dfde2db0a52928a45c9e6ede514887503823..3b6fcae09c91875acace92229b7e1bdbf2ec0512 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
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 21113ea78ddcca792de1cd64b23b69688b7e38f7..a74a64718a7ccab6debee14446fa67cd4bbc2020 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -74,7 +74,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
//Changelog: use the Subversion log
#include "config.h"
-#include "avutil.h"
+#include "libavutil/avutil.h"
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c
index 47135e803fb4326e1c8ab50ec3afb3caab171cf6..0842cdb629c9f9e2594ad6c443b65e6f7b9d0996 100644
--- a/libpostproc/postprocess_altivec_template.c
+++ b/libpostproc/postprocess_altivec_template.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avutil.h"
+#include "libavutil/avutil.h"
#define ALTIVEC_TRANSPOSE_8x8_SHORT(src_a,src_b,src_c,src_d,src_e,src_f,src_g,src_h) \
do { \
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index edb82ea12c452bc7dd6b4a1444707240087c56bd..d3d2d6515e7986a43d0d9902d0a8540ebd664a12 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -26,7 +26,7 @@
#ifndef FFMPEG_POSTPROCESS_INTERNAL_H
#define FFMPEG_POSTPROCESS_INTERNAL_H
-#include "avutil.h"
+#include "libavutil/avutil.h"
#include "postprocess.h"
#define V_DEBLOCK 0x01
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index 1f00661e4e01d9784faa9880f8329718ee26f659..b03386e5cf2095e9744bd9d65c28d07c6cdad92b 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -23,7 +23,7 @@
* mmx/mmx2/3dnow postprocess code.
*/
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
#define ALIGN_MASK "$-8"
diff --git a/output_example.c b/output_example.c
index 36b0921d20469a01d03f58770e9382db2959ec3b..57588b3b59c9b4ec31ecee9ff58e202cf62270b0 100644
--- a/output_example.c
+++ b/output_example.c
@@ -31,10 +31,13 @@
#define M_PI 3.14159265358979323846
#endif
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
#undef exit
+#undef fprintf
+#undef printf
+#undef snprintf
/* 5 seconds stream duration */
#define STREAM_DURATION 5.0
diff --git a/tests/seek_test.c b/tests/seek_test.c
index 6bf134602dcf0ac7140b8dd9e50b5e8d9cf05da7..088bbc8302254ffca381ad9e9129e5e577932c4b 100644
--- a/tests/seek_test.c
+++ b/tests/seek_test.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "avformat.h"
+#include "libavformat/avformat.h"
#undef exit
diff --git a/vhook/drawtext.c b/vhook/drawtext.c
index d3ca767fe527aec3c2e7621dbe429f022ca31069..8638d60e0784c50902ba799064e271281e94cc43 100644
--- a/vhook/drawtext.c
+++ b/vhook/drawtext.c
@@ -45,7 +45,7 @@
#define MAXSIZE_TEXT 1024
-#include "framehook.h"
+#include "libavformat/framehook.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/vhook/fish.c b/vhook/fish.c
index be23dc644aaef61646e69e34406b22228f28e739..f0cd0085ccf15cf89548860697c809ccb69771a6 100644
--- a/vhook/fish.c
+++ b/vhook/fish.c
@@ -44,10 +44,10 @@
#include <stdio.h>
#include <dirent.h>
-#include "framehook.h"
-#include "dsputil.h"
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/dsputil.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 7df4c0acad3ba84b83b2c6563e405895b6d1bef3..e5b7de8a6b6712e7eca46f7ada217da66cf6d0d6 100644
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -45,8 +45,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/vhook/null.c b/vhook/null.c
index c933089060a70ba957209defd74f94a99fdcf554..6f310371c0a76a856fde51abd0ee2044889309c9 100644
--- a/vhook/null.c
+++ b/vhook/null.c
@@ -20,8 +20,8 @@
*/
#include <stdio.h>
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
diff --git a/vhook/ppm.c b/vhook/ppm.c
index db76998b5ad7c23547fb43a8b4670d9898b76068..6ebfe47524ebf1e0411438240d02012982858948 100644
--- a/vhook/ppm.c
+++ b/vhook/ppm.c
@@ -25,10 +25,10 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
-#include "framehook.h"
-#include "avformat.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/framehook.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
static int sws_flags = SWS_BICUBIC;
diff --git a/vhook/watermark.c b/vhook/watermark.c
index a8f7d5728e4fbc8c23a76852a41bc60bda5e0fc5..74f50953139094f3cda6a9b446820e5992544467 100644
--- a/vhook/watermark.c
+++ b/vhook/watermark.c
@@ -58,12 +58,11 @@
#include <unistd.h>
#include <stdarg.h>
-#include "common.h"
-#include "avformat.h"
-
-#include "framehook.h"
+#include "libavutil/common.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
#include "cmdutils.h"
-#include "swscale.h"
static int sws_flags = SWS_BICUBIC;