diff --git a/cmdutils.c b/cmdutils.c
index 86b4a9ef21..54085fb7ec 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 874418bad6..27374a7fce 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 87aff3d204..6dea8763ca 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 6742e58354..7f87eb8410 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 8517bb239d..257687ec12 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 9694639fbe..e85d86c901 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 9e7728f9eb..1a98129e62 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 36357356ed..6b80731bc9 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 b23338c09a..df74d07c5c 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 9aa20f420b..3c32af157d 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 f664801f97..8c63f1f3ec 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 a3b8ec78f4..072a755013 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 63976f4c05..6d824e2a14 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 0aca43557b..1a11d7a0fb 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 52cb8733c7..721dee5152 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 42bddc495c..108631f649 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 2113631aa9..08808c4b35 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 411378baad..c3f2300004 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 a72459948c..4737b15218 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 9dd121bafd..70604c92b5 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 fce5668d07..62990f65b1 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 0a6f7de53e..68b9cf6e3d 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 3a94e719ca..61fb36a76d 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 fc17bb6ac4..4ed6e028eb 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 0cc44190ee..b748237ad3 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 a923e9bae5..37d1dffaa2 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 13ca05a1c7..39f4bd4b37 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 50ea537ef5..7d8f19df83 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 cd5b5ed4fe..130f5f634c 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 1b2e45c4ec..84ec8657ef 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 a5aaa69fb4..0a590370d4 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 9e5036bee3..9b798d1ab1 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 ea1d8c4261..46aa3fc030 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 0ac7c9514c..79dc0a71cb 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 5108bf1fad..237e3f8709 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 542c373248..17a2ec8b18 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 111e5b369a..4e3fcdfab4 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 618c60dce6..7489630eeb 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 a07749d1d3..230ff26c0b 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 b8beddded9..53cfe9d848 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 81fe54e234..142854684b 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 733234a1f1..94e189cb6f 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 f93c3c9375..9e017a656a 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 700a1e4bae..8bd7b89d01 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 c5337b8c2a..32c4be369b 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 3a0f2d7427..83cbd87088 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 2096e3305b..ad248ff944 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 b2dc5e8ee1..80468f68c9 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 005a42dedb..d860c7e381 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 15e5290e7b..9f90b5d8fd 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 9029af183f..95bdc05772 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 df75b6e153..0e111f9f97 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 4b2e4d68af..b7ed74d270 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 059f473a0c..04b28f50c1 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 c9671f0c1e..2fb76cf0d4 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 0e543e4fde..c3df9415ea 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 d71a2b4141..00a6d27207 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 1950407eee..e888bcfd69 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 d02918f459..a421abc9ae 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 a9dcfab825..f952ac9df5 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 250312467f..dbd7464ae9 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 f055cc1ac3..d9612ebd82 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 21f9abddb0..b08b387a74 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 65918ad96c..71a026f99b 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 233d6070a7..9337a5a0d7 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 96dbc5943f..a2cd6469e6 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 96e1a20b0c..35ccbf6ba9 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 ce438e3af9..0c1548992f 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 5ac93cf0f3..4c598e9a70 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 e98b24822a..756e7f4df0 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 e23ec83188..d15bf4baa9 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 d513645b57..08e7570e6b 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 21e8cf016d..60f0365484 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 9bfb1ba99c..6293917695 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 7e8c365262..876a44f022 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 b87e4bd8c1..5953121027 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 3d79c3ab5d..bab8a0503f 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 13dea06a16..168f8d8b6d 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 6b9a35ba80..be6e4dabb4 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 e0b77807f8..f5608556cb 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 750e6d7f90..fd4b12b941 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 8151410d44..0113a9aa97 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 c716b1e33e..09a739bdb8 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 37b2f62c37..2d09ac79c3 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 95497c99a7..1983fe15ae 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 0c56cfb9b7..14cc6ce856 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 8770f05f5b..ea228b0daa 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 87bef808e6..ea5700536e 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 6a0582fe44..3b7aba2889 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 d886479612..8fac74f47b 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 7f62e6e6d2..da764a2142 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 4726afb56e..7d23b252d0 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 e138862982..b2452abb2d 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 3345635ee8..e7af474da8 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 7ab808dacf..218c7dd4c2 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 15b0350f2d..7c49a06ea9 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 18b19b1c3a..6b8d9fe7c2 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 3f95cf0561..b31943fc7d 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 4372603119..a01eea31bb 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 716d3de487..720b66472b 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 349634f7b1..3fd5eb3319 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 5d995d754f..0c8b1fa8af 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 0dd79b06b1..6dfb8ebf81 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 7e75750107..0a6b33530e 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 41a40df67c..6dfd350264 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 bb76f0c0d1..6be3ce1037 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 d942d7e45d..535f75be57 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 0ea8dfb02c..364e296658 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 fdf8428b5e..8562652e93 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 36257f083c..7be079e937 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 cc31c27115..20dd53bc32 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 565fa5253f..319983b8fa 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 cfd49b600e..5963e6242e 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 3e3ce31dba..f1375f6deb 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 61bcfaf616..420e7c262b 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 2f0e6abdb4..b660be74f4 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 ab184973ad..da635456c7 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 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
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 21113ea78d..a74a64718a 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 47135e803f..0842cdb629 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 edb82ea12c..d3d2d6515e 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 1f00661e4e..b03386e5cf 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 36b0921d20..57588b3b59 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 6bf134602d..088bbc8302 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 d3ca767fe5..8638d60e07 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 be23dc644a..f0cd0085cc 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 7df4c0acad..e5b7de8a6b 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 c933089060..6f310371c0 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 db76998b5a..6ebfe47524 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 a8f7d5728e..74f5095313 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;