diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f096a747035dd1509cfb45f75999623c47ffe99c..32c85ecf9ea25b23861796e49b5bd2c6fbb8c80c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -4,7 +4,7 @@
 #
 include ../config.mak
 
-CFLAGS+=-I$(SRC_PATH)/libswscale
+CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
 
 OBJS= bitstream.o \
       utils.o \
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c
index c98d6f7ff8c3805f85ca4ab0fc3b0df6049055df..36357356ed9c7196b749f44902fe8fc7a3d650e9 100644
--- a/libavcodec/alpha/dsputil_alpha.c
+++ b/libavcodec/alpha/dsputil_alpha.c
@@ -20,7 +20,7 @@
  */
 
 #include "asm.h"
-#include "../dsputil.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 337ffb38e27fb11e57b40457aec8c27d3101a316..b23338c09a36d0a89cb790b348994b92ec1f9bed 100644
--- a/libavcodec/alpha/motion_est_alpha.c
+++ b/libavcodec/alpha/motion_est_alpha.c
@@ -20,7 +20,7 @@
  */
 
 #include "asm.h"
-#include "../dsputil.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 8ad264b06f560080e5dcb0b970dd43a2c045a78f..9aa20f420bf928b220577d7cf64df326f5206c1c 100644
--- a/libavcodec/alpha/mpegvideo_alpha.c
+++ b/libavcodec/alpha/mpegvideo_alpha.c
@@ -20,8 +20,8 @@
  */
 
 #include "asm.h"
-#include "../dsputil.h"
-#include "../mpegvideo.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 adadd3ab0ceca7ecf3d089c3146384471fec17ae..7c4a0d578e24bfdc65778853584a6fda381dd226 100644
--- a/libavcodec/alpha/simple_idct_alpha.c
+++ b/libavcodec/alpha/simple_idct_alpha.c
@@ -27,7 +27,7 @@
  */
 
 #include "asm.h"
-#include "../dsputil.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 61b5fdacc45c08176bb5d06ec02aec8ea971ca93..ac4dab211a8f40d92279abbc486f54ecf586aee0 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 "dsputil.h"
 #ifdef HAVE_IPP
 #include "ipp.h"
 #endif
diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c
index 7b28db5bb5d2249aaca84f0b75f21b34c05820d5..62dcfab0c11e2b52566d5872c9f6191c11a5c656 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 "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 22d40d8bcfe075438712d4d2c90df3c856b9b4a2..3371ed7ce5888df647523c80d1c7be4ea787a656 100644
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@@ -19,9 +19,9 @@
  *
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-#include "../avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+#include "avcodec.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 5e83c8a43890985eaae603875a7f9f15eac81246..9f9f6ed473234205190fa25f2c9617c8665d9ce1 100644
--- a/libavcodec/armv4l/mpegvideo_armv5te.c
+++ b/libavcodec/armv4l/mpegvideo_armv5te.c
@@ -25,9 +25,9 @@
  * Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-#include "../avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+#include "avcodec.h"
 
 
 #ifdef ENABLE_ARM_TESTS
diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c
index 1336ac5f8d03498227ed412c22b3028f77988a65..9e112139139df08b3d5aa46552b2c5d152039f75 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 "dsputil.h"
+#include "mpegvideo.h"
+#include "avcodec.h"
 
 static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
                                              DCTELEM *block, int n, int qscale)
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c
index 2aebc2016e488a542c687caec290594ef8dd2892..312c06c3a8f55ac81fdd22d7bf9674dcb757b526 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@@ -23,8 +23,8 @@
 
 #include <unistd.h>
 #include <bits/bfin_sram.h>
-#include "../avcodec.h"
-#include "../dsputil.h"
+#include "avcodec.h"
+#include "dsputil.h"
 
 #define USE_L1CODE
 
diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c
index 51d519a5ca7fbad254c49c052665e2b811556570..30bab38c025e42291c876228c9f3fe05a1dc9762 100644
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/i386/cavsdsp_mmx.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "../dsputil.h"
+#include "dsputil.h"
 #include "common.h"
 
 DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL;
diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c
index 0705ab3e5480ad2d483cb777ff6ed15ee15db443..fe751fb5b84405ceb70f5faf8320bdcd125f3eb6 100644
--- a/libavcodec/i386/cputest.c
+++ b/libavcodec/i386/cputest.c
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #undef printf
 
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 9b81b2d6107a457614faa241d1d21545413205d6..063d0237b0700bffa40d3e3c966d041c54b718aa 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -22,9 +22,9 @@
  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
  */
 
-#include "../dsputil.h"
-#include "../simple_idct.h"
-#include "../mpegvideo.h"
+#include "dsputil.h"
+#include "simple_idct.h"
+#include "mpegvideo.h"
 #include "x86_cpu.h"
 #include "mmx.h"
 
diff --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/i386/fdct_mmx.c
index 69e75b23cf1c1f7fd4dc77767e262ce0764a265f..a034c9f9493a4b812620c9b2c68891d61ff8511a 100644
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/i386/fdct_mmx.c
@@ -30,7 +30,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "common.h"
-#include "../dsputil.h"
+#include "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 8087f1932cb3c504b79a8fa4ace7ba1fcf4a4bd0..4231d855afdd3513270f3dc6bd1979ec145cba4f 100644
--- a/libavcodec/i386/fft_3dn.c
+++ b/libavcodec/i386/fft_3dn.c
@@ -19,7 +19,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 "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 a4fe5f0b68f481951475b8a76b4e51d88d7a8b87..6d063321d7b87879b678f0edf1ad6373af354d6a 100644
--- a/libavcodec/i386/fft_3dn2.c
+++ b/libavcodec/i386/fft_3dn2.c
@@ -19,7 +19,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 "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 a5ae9c8c4af5e09e62e85d9165048f579ab5c117..966b8a93f58cc60bc5cb401c4a00d4dd3a1f4d64 100644
--- a/libavcodec/i386/fft_sse.c
+++ b/libavcodec/i386/fft_sse.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 "../dsputil.h"
+#include "dsputil.h"
 
 static const int p1p1p1m1[4] __attribute__((aligned(16))) =
     { 0, 0, 0, 1 << 31 };
diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c
index 4c548fdcee533675cd97d296ac7adb32efc7d440..b3a5267f42777e0ef949d61aba8c7b1e1b511653 100644
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@@ -20,7 +20,7 @@
  */
 
 #include "common.h"
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "mmx.h"
 
diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/i386/idct_mmx_xvid.c
index 65ece6de9c882297ea799e3ff277af2d64a7f9e6..1e7ea3e7faeceef627a6265315a80eee22706c10 100644
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/i386/idct_mmx_xvid.c
@@ -50,7 +50,7 @@
 
 
 #include <inttypes.h>
-#include "../avcodec.h"
+#include "avcodec.h"
 
 //=============================================================================
 // Macros and other preprocessor constants
diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index e280b34d70cfe6d62883a640ce968e9daa525826..e43cacdcc2f44abeefd29ff393241aa73227e976 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -21,7 +21,7 @@
  *
  * mostly by Michael Niedermayer <michaelni@gmx.at>
  */
-#include "../dsputil.h"
+#include "dsputil.h"
 #include "x86_cpu.h"
 
 static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c
index f8bdcc6e50354389fe255ed81626c365583280d3..d5316877bef424a51467817820faa1cb3d6307bb 100644
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@@ -22,9 +22,9 @@
  * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-#include "../avcodec.h"
+#include "dsputil.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 525ef34f7cff3039fbd36fd7c93f00f57dfad9b2..dd22ee8aa32bccd4d4181b66d9412df3fd32fcac 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 "dsputil.h"
+#include "simple_idct.h"
 
 /*
 23170.475006
diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/i386/snowdsp_mmx.c
index 8f182303d5422103fdfeaf53ad19e03098854fe9..1d5a4f4ff7444ac42cc15f6d8601a0d986569aa0 100644
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/i386/snowdsp_mmx.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../avcodec.h"
-#include "../snow.h"
+#include "avcodec.h"
+#include "snow.h"
 #include "x86_cpu.h"
 
 void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){
diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/i386/vp3dsp_mmx.c
index f715dc803d04d79018eb3bee3eb457a0b76bece4..363ea02e3b48930002ecff5bc9266357dce6a07d 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 "dsputil.h"
 #include "mmx.h"
 
 #define IdctAdjustBeforeShift 8
diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c
index bd2911d599b0626d521f4c33e5fea3dd4e1c4fb7..8da2e68653258c88e4ed6af2d3b5bf777384aa97 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 "dsputil.h"
 #include "mmx.h"
 
 static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
diff --git a/libavcodec/mlib/dsputil_mlib.c b/libavcodec/mlib/dsputil_mlib.c
index b78a54e0e57b6aede7e040b7650515e25c3bfd5a..1b1b5345a80422b7a06ec930654ac6904dd23f63 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 "dsputil.h"
+#include "mpegvideo.h"
 
 #include <mlib_types.h>
 #include <mlib_status.h>
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index bbc53d76196a8229b14cfce26cdf58dc920b686b..78d736171f5fd9681f3d11de099d9054a26c717b 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 "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c
index 4d5e28996bdf50ade4caf445112acde4ac59fccf..ae08368f420f496dec55d4004fe5748f7533bcea 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 "dsputil.h"
 
 #include "dsputil_ppc.h"
 
diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c
index 2418c32bb6c53d97e4bc160990201f6f99be4ee4..cb9446d391e2874534b78fa9865e19ee15611d80 100644
--- a/libavcodec/ppc/fdct_altivec.c
+++ b/libavcodec/ppc/fdct_altivec.c
@@ -21,7 +21,7 @@
 
 
 #include "common.h"
-#include "../dsputil.h"
+#include "dsputil.h"
 #include "dsputil_altivec.h"
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_altivec.c
index 384a774ff1e5657ca9554807e926ac2c848d910a..62de81f5d819efa2ba675735055012f7cc576fa2 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 "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c
index 22c2de61a7fa34a7971d635663e6cd87416a2f72..750e6d7f902f1c7f3db104a75553ad2185d2bd71 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 "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c
index 42c936bb331ff1f9869001e2086bc5023a648465..4b74284471b83824a65b177bab1ace619f7573ed 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 "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c
index bac620e82aa6b431ad9f94e5f89723735287b595..963c6083ae0505dcb4de26ac6963b47fe4fd87d9 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 "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c
index 66c8082f76cc6e07fdbdde7872471a8741d3c51d..c4e0cfd0a284ca3246558ec1e092ed4673a8a5e5 100644
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@@ -39,7 +39,7 @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c
index 8ce1f1de2541a56346963d6c306739fbe14e280b..c1246ead2bb1ec7707c0b4b69d35be8ebde80b7e 100644
--- a/libavcodec/ppc/int_altivec.c
+++ b/libavcodec/ppc/int_altivec.c
@@ -23,7 +23,7 @@
  ** integer misc ops.
  **/
 
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 0a789d16de85f70ccbc1c8ee7f5c88d673e54988..f564aa3c37f40c9f1b8ef53ecd168789019b5919 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 "dsputil.h"
+#include "mpegvideo.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ppc/mpegvideo_ppc.c b/libavcodec/ppc/mpegvideo_ppc.c
index c5e822f772f9c16fe853a6e9d0a234d712aa5606..1499814ff8bc2154744313bf504e1f1bc8d4295d 100644
--- a/libavcodec/ppc/mpegvideo_ppc.c
+++ b/libavcodec/ppc/mpegvideo_ppc.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
 #include <time.h>
 
 #ifdef HAVE_ALTIVEC
diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c
index b15672ffe125528d0974c5e5299508490a58cd85..66ab86553acc51a3580f0ddce0672780ee11e008 100644
--- a/libavcodec/ppc/snow_altivec.c
+++ b/libavcodec/ppc/snow_altivec.c
@@ -21,11 +21,11 @@
  *
  */
 
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "gcc_fixes.h"
 #include "dsputil_altivec.h"
-#include "../snow.h"
+#include "snow.h"
 
 #undef NDEBUG
 #include <assert.h>
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index 114c9d41f3ba5fe331fe86e55dd1849f49fd2f1a..dc6883cbe38b681c51655c73ca867440c4f6a196 100644
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "gcc_fixes.h"
 
diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/ps2/dsputil_mmi.c
index 0d72ae88c6eb9400dbd2a931f50e9d6c8e56b492..22ee5cea86a088792fd469dc5524cdfc085ce054 100644
--- a/libavcodec/ps2/dsputil_mmi.c
+++ b/libavcodec/ps2/dsputil_mmi.c
@@ -22,7 +22,7 @@
  * clear_blocks_mmi() by BroadQ
  */
 
-#include "../dsputil.h"
+#include "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 dfe9b372688b048bd8305c4368aad7fac0305916..6aaf8b355acbe7c4935af82f7e1fe17d9aafc104 100644
--- a/libavcodec/ps2/idct_mmi.c
+++ b/libavcodec/ps2/idct_mmi.c
@@ -26,8 +26,8 @@
  *
 */
 
-#include "../common.h"
-#include "../dsputil.h"
+#include "common.h"
+#include "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 c21fe7d1434666ffc93c01334aa33986f1bc0705..dff8be7fd0079da5424b00caf62293ff0a322984 100644
--- a/libavcodec/ps2/mpegvideo_mmi.c
+++ b/libavcodec/ps2/mpegvideo_mmi.c
@@ -20,9 +20,9 @@
  * MMI optimization by Leon van Stuivenberg
  */
 
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-#include "../avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+#include "avcodec.h"
 
 static void dct_unquantize_h263_mmi(MpegEncContext *s,
                                   DCTELEM *block, int n, int qscale)
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c
index 7e7e3304b72259c108a472d5577667ca6f449f0a..15b0350f2d26724006a689de4f6cef21dcf0c554 100644
--- a/libavcodec/sh4/dsputil_align.c
+++ b/libavcodec/sh4/dsputil_align.c
@@ -21,8 +21,8 @@
  */
 
 
-#include "../avcodec.h"
-#include "../dsputil.h"
+#include "avcodec.h"
+#include "dsputil.h"
 
 
 #define         LP(p)           *(uint32_t*)(p)
diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c
index b38eb255164e944f999968f5d5a5e168c8be62b9..18b19b1c3ae2703351765b1d7628c417ead2f9af 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 "avcodec.h"
+#include "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 3b8428c3cd80284c2f5615e3043eaace9be37ed5..8259c0075ded86a17b08a87fc0db2575e0e6af61 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 "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 5e59ce776579a424d53d4d38e19e7eac21860c01..74232ead167778f3fe74f31d006defc18ebc7ae9 100644
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@@ -31,7 +31,7 @@
 #include <signal.h>
 #include <setjmp.h>
 
-#include "../dsputil.h"
+#include "dsputil.h"
 
 #include "vis.h"