diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 4ba989f0b25ec9ebeaf2e05ceaff5cff21f0172c..d586e271daccde0eae59f767d737b2fc8de6ba7f 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -32,7 +32,6 @@
 
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "mpeg4audio.h"
 #include "sbr.h"
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 9b5a4094ca23507ce421bd4bf8eda0dc5bf891af..7a871c40227fb6e34f4142b767c6cf3148618058 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -84,7 +84,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "lpc.h"
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 709604492c684077eaeac9d86e420a390430595a..5711d013efed36791e1444bc7aedf5a3f3fa317a 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -34,7 +34,6 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mpeg4audio.h"
 #include "kbdwin.h"
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index a2fd351e63d80d6f0d16ec4c8abb4c1dd226a26a..386c72f582ec20bac221d504e254b10d58d45e53 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -25,7 +25,6 @@
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 
 #include "aac.h"
 #include "audio_frame_queue.h"
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 1ddf2d9ca89e53bf932c00a665695c39d18e8600..308edd064773d9e21add426d11ce1de61f8da8ff 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "msrledec.h"
 
 typedef struct AascContext {
diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index 71e2a748224493e9cdd1ab61a9e26a715d53abe0..61bb65a4d36ad0a927ab8c08bea261edfd56c291 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -21,7 +21,6 @@
 
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "lpc.h"
 #include "mathops.h"
diff --git a/libavcodec/alpha/motion_est_alpha.c b/libavcodec/alpha/motion_est_alpha.c
index 9883feea852b61965605cb85082364c18616ee46..a7c33e4900770cea02f9fb709dbde154568986ba 100644
--- a/libavcodec/alpha/motion_est_alpha.c
+++ b/libavcodec/alpha/motion_est_alpha.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/dsputil.h"
 #include "dsputil_alpha.h"
 #include "asm.h"
 
diff --git a/libavcodec/alpha/mpegvideo_alpha.c b/libavcodec/alpha/mpegvideo_alpha.c
index d465ee33436165da0949c499e6b7304ee7b6ad0c..7ba0f2e68f14730171448eaad9cb8b2cf6990654 100644
--- a/libavcodec/alpha/mpegvideo_alpha.c
+++ b/libavcodec/alpha/mpegvideo_alpha.c
@@ -20,7 +20,6 @@
  */
 
 #include "libavutil/attributes.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "asm.h"
 
diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c
index 1a272bddafccb12f488753eb34fc280122fd7252..3bd1b336fe758554b9b946c9e9b5ff3d5a18d1f3 100644
--- a/libavcodec/alpha/simple_idct_alpha.c
+++ b/libavcodec/alpha/simple_idct_alpha.c
@@ -26,7 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/dsputil.h"
 #include "dsputil_alpha.h"
 #include "asm.h"
 
diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c
index 216cd2b573a53d8a0492900deafdd7362bfff867..a6725f370cac71bce821a3b4ff1bcad81cef928b 100644
--- a/libavcodec/arm/dsputil_init_arm.c
+++ b/libavcodec/arm/dsputil_init_arm.c
@@ -21,7 +21,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
 void ff_j_rev_dct_arm(int16_t *data);
diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c
index 33d7970e689d1ccb3571330094d910e545b11fe7..841fbfadcdf9615205908f02712c51e9d9a3a5f4 100644
--- a/libavcodec/arm/dsputil_init_armv5te.c
+++ b/libavcodec/arm/dsputil_init_armv5te.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
 void ff_simple_idct_armv5te(int16_t *data);
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c
index 9fd33f935b5b5f5a6689540bf61f83867416e598..3e7aa37b9d0fc79cb90002b59369abd4bf446ef5 100644
--- a/libavcodec/arm/dsputil_init_armv6.c
+++ b/libavcodec/arm/dsputil_init_armv6.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
 void ff_simple_idct_armv6(int16_t *data);
diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c
index 4e44034e0693b355e70d72e355bcccc5dbdf9f2c..5555bc8e746dca5f0711a5cf88ecdd82cbc6fc71 100644
--- a/libavcodec/arm/dsputil_init_neon.c
+++ b/libavcodec/arm/dsputil_init_neon.c
@@ -23,7 +23,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
 void ff_simple_idct_neon(int16_t *data);
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c
index e08e87e125e388ea5773331669660c70c713d85a..785b6047495b6073a22236e424e7c21f0677a907 100644
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -22,7 +22,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/h264dsp.h"
 
 void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c
index 47d4f1826a2cb0abe9117d2deb0a9c50f1726432..656679809b0aa4ea56fabd90292720b60ed63a2b 100644
--- a/libavcodec/arm/mpegvideo_arm.c
+++ b/libavcodec/arm/mpegvideo_arm.c
@@ -20,7 +20,6 @@
 
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "mpegvideo_arm.h"
 #include "asm-offsets.h"
diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c
index 1765a65a6b1973fa325e792b52ed670ea3de852c..a5722900a824b972db32e30d32a7c52512ccf080 100644
--- a/libavcodec/arm/mpegvideo_armv5te.c
+++ b/libavcodec/arm/mpegvideo_armv5te.c
@@ -22,7 +22,6 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "mpegvideo_arm.h"
 
diff --git a/libavcodec/asv.c b/libavcodec/asv.c
index 34622b4e7208dd3d5a23833d95893edd6f4bc4f3..21f179bb778f106f1d9b52fdad2fd7df018f0fb1 100644
--- a/libavcodec/asv.c
+++ b/libavcodec/asv.c
@@ -27,7 +27,6 @@
 
 #include "asv.h"
 #include "avcodec.h"
-#include "dsputil.h"
 
 const uint8_t ff_asv_scantab[64] = {
     0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19,
diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index b8a1f2102601cc8b24ae0c20b826a3969fb03866..e7a04cdd9372ad6be9287e1ebacc250651248c29 100644
--- a/libavcodec/asvdec.c
+++ b/libavcodec/asvdec.c
@@ -29,7 +29,6 @@
 #include "asv.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mathops.h"
 #include "mpeg12data.h"
diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c
index cb2f7ba736b5fc64882b904178db0737dded0122..ea342a0438708260a3d15006d80330ee02ff94c0 100644
--- a/libavcodec/atrac.c
+++ b/libavcodec/atrac.c
@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "atrac.h"
 
 float ff_atrac_sf_table[64];
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index d48fd60349ab499095b3ac6e0d61cdcdd849ff19..72c1b508e78b5dee3b64d640071b2058d3669d54 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -35,7 +35,6 @@
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index 04243ed33aede799101d94a78dd6000df6cec522..2a03f1adbe0c50b3d21f37146a7b90dfd49c2718 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -28,7 +28,7 @@
  */
 
 #include "libavutil/common.h"
-#include "dsputil.h"
+#include "avcodec.h"
 #include "bethsoftvideo.h"
 #include "bytestream.h"
 
diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c
index 2b57ee2e4fea224b95ff7c0014b4c2b09525dfcb..458e7dcdbae5da77e1b6a6691d9467133efd4955 100644
--- a/libavcodec/bfin/mpegvideo_bfin.c
+++ b/libavcodec/bfin/mpegvideo_bfin.c
@@ -22,7 +22,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_bfin.h"
 
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index fdcf5c8091f04df99c08ee7a302f7b39aefb767c..5ba77a68f098a1ca0aa92f9f9760d88780d5aed9 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -32,7 +32,6 @@
 #include "avcodec.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
-#include "dsputil.h"
 #include "dct.h"
 #include "rdft.h"
 #include "fmtconvert.h"
diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h
index d105f717e903145d7c429342b906144ab730038f..4968413bee9bb253e74487b551b4a72d935bcb36 100644
--- a/libavcodec/binkdsp.h
+++ b/libavcodec/binkdsp.h
@@ -27,7 +27,7 @@
 #ifndef AVCODEC_BINKDSP_H
 #define AVCODEC_BINKDSP_H
 
-#include "dsputil.h"
+#include <stdint.h>
 
 typedef struct BinkDSPContext {
     void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index 9648799f09cd5d0407fe531cd7624b84d835a55f..b3bf4f2b09a7891c073019440be405eb6255c205 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 2a7fbe6672dbb2f1aedcf326cf228785a505b214..0812dbbacfb5073165a669f6bf264108b14d269d 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -41,7 +41,6 @@
 #include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "internal.h"
 #include "put_bits.h"
diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 5274fd65e7b80a759b954071523f897357845f2a..d15c89150f8f3f8eaa547f1fa9cf52e5afc6fa2d 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 
 /* Parser (mostly) copied from dvdsub.c */
diff --git a/libavcodec/eaidct.c b/libavcodec/eaidct.c
index 6ba1faf61464cc0604fdc4ce92997465cc43c938..e4840f26535c2514a199663c78c7f149324a0409 100644
--- a/libavcodec/eaidct.c
+++ b/libavcodec/eaidct.c
@@ -25,7 +25,6 @@
  * @author Peter Ross <pross@xvid.org>
  */
 
-#include "dsputil.h"
 #include "eaidct.h"
 #include "libavutil/common.h"
 
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 75285dccec1934003cace9fa3606300312232599..b9679bca8612638a2ea047090bcccb6a17a255c7 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -30,7 +30,6 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "internal.h"
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 6f535efa7aef1b0e7184089661c7fd001b4d476a..5513848a8e4f4109034e9396253bc7a2f0881707 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -28,7 +28,6 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "internal.h"
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index fff94ab50db1b801d9b13a5f348f40498a9eac11..d5fbcbd668992f2efb50fb2eaf0ceff96f9a412c 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -28,7 +28,6 @@
 #include <limits.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "error_resilience.h"
 #include "mpegvideo.h"
 #include "rectangle.h"
diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c
index 0219e20eab98d81b99658beacc6ccc23e85ba8a9..b1d7a145f4fc0b9a6db0570f7aae65580a4c8eff 100644
--- a/libavcodec/faandct.c
+++ b/libavcodec/faandct.c
@@ -25,7 +25,6 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "dsputil.h"
 #include "faandct.h"
 #include "libavutil/internal.h"
 #include "libavutil/libm.h"
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 29d76ed62e98f8b40fc11408869311b2cd56f423..c75f2aa619ab5cefa0c1e8683ad57d4f1b7af675 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -33,7 +33,6 @@
 #include "libavutil/timer.h"
 #include "avcodec.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index a1da544697bbf0e36c1af82102bfc6894c3d59d8..cb72203468523dd335f84028c2efaa9b67f8c856 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -35,7 +35,6 @@
 #include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 2fe51c3f7759bc6c1bfd6f33a76b311757ed05b2..70fcd65852ac19a5f9bbcda69763f63826d8742d 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -34,7 +34,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 951997d65e7456b12e88fdddc62aece4edeff84d..f89d5c7741ba55813fafe03d25d8341437e159a0 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -25,7 +25,6 @@
  * h261codec.
  */
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h261.h"
 
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index a376116fa2ff4acf767449c1866cc75da3886563..eebfd02737103cf57de0c0825d61d26772f5fa60 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -26,7 +26,6 @@
  */
 
 #include "libavutil/avassert.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index edf01f99b52dde082e4d0b15bc0ace6767afa6ba..c22100cf8c6807f35e2106d437ecf88f05295d3d 100644
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -26,7 +26,6 @@
  */
 
 #include "libavutil/avassert.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 2390e0d945b02769a692dab4e7700c02ca61bb64..a7e60eac2c9df95110cab6f40080bd62dd81c773 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -30,7 +30,6 @@
 //#define DEBUG
 #include <limits.h>
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 393fd5362de262e98d6f659dba02dea3444b706a..e231b08548443dede2c8c0a761b1144fe4aae55d 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -30,7 +30,6 @@
 #include "libavutil/cpu.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h263_parser.h"
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 7709c17a672e5d6de408c95801272d9e13b5474c..435343c989111a76d83e1ef95e019ec1ad176e85 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -32,7 +32,6 @@
 #include "cabac.h"
 #include "cabac_functions.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h"
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 9ae46dce633b3928cdcc83fc313aebfe1c9a2b3e..c6be4557667e87076b18143a50ad28bbb87e9525 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -26,7 +26,6 @@
  */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 257529328f1faed531430d3a6c0a11b2e5cbecb5..8638ce267d698d9e7587103c122c17282b1ed8c9 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -27,7 +27,6 @@
 
 #include "libavutil/imgutils.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 5736e15b1ff6da7a06f0d0398111d020333c6b8c..d87106e7cb4bfd02cd07b73b427834de6f95d6a2 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -27,7 +27,6 @@
 
 #include "libavutil/avassert.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "golomb.h"
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 1339b2a00103df4742b4e01777bcd1bbbc067ff0..e5f1f5ae61e935484aa223fe19dd389ca9b062f7 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -26,8 +26,8 @@
  */
 
 #include "libavutil/avassert.h"
+#include "dsputil.h"
 #include "h264pred.h"
-#include "dsputil.h" // for ff_cropTbl
 #include "avcodec.h" // for AV_CODEC_ID_*
 
 #define BIT_DEPTH 8
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index f67a04a9c3cc7c54fedeae19f22823a20718d868..b4ef76f1983cfd155d341ea8bb03452ec93a829c 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -33,7 +33,6 @@
 #include "libavutil/mem.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "huffyuv.h"
 
 int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table)
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 2c56bfa49361866ada55222633ba494f3a87b234..159a517c982ce6b906903e466d6f87ef86ae30e3 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -29,7 +29,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "huffyuv.h"
 #include "thread.h"
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index b713261fa9adb9369e804b47b2d25267702d3fa9..e810003ace6abbfbc0db40fe03ef246ebb7622e3 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -30,7 +30,6 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "ivi_dsp.h"
 #include "ivi_common.h"
 #include "indeo4data.h"
diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c
index 447ad21846c3f0e7437a589c8ca1b7d626140012..1b34f899d60f574481bcf9dfd0ed9b59850652cc 100644
--- a/libavcodec/intrax8dsp.c
+++ b/libavcodec/intrax8dsp.c
@@ -21,7 +21,6 @@
  *@brief IntraX8 frame subdecoder image manipulation routines
  */
 
-#include "dsputil.h"
 #include "intrax8dsp.h"
 #include "libavutil/common.h"
 
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 4672e085bc807ededb9877b3f041f80d4c829d69..d43ed399727856626e109b4590893596fe740033 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -34,7 +34,6 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 2c0f6dbc7453ca8d6a2bec50fcc6af5776e9974d..bdcc4159104d0d1c4edd0e10116b3db8804d2bd0 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -30,7 +30,6 @@
 //#define DEBUG
 #include <limits.h>
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c
index 4411c090c4e853a4f5909b94356c842c6513c95d..84e2436446f2d809e426d62fb711e5562b5841ab 100644
--- a/libavcodec/ivi_dsp.c
+++ b/libavcodec/ivi_dsp.c
@@ -27,7 +27,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "ivi_common.h"
 #include "ivi_dsp.h"
 
diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c
index ef3576ecd96978839b61c13e0809b3583a3efb8b..be979aa3716dd3ef2a1e6bda6aa90323c74a848a 100644
--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@@ -31,7 +31,6 @@
 #include "golomb.h"
 #include "internal.h"
 #include "mathops.h"
-#include "dsputil.h"
 #include "mjpeg.h"
 #include "jpegls.h"
 
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 93aeb7199b83175db74eb4060da2310ed2d2ecec..4a5842f9730a45014d187cdee4d56c795d95e1d3 100644
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -26,7 +26,6 @@
 #include "libavutil/file.h"
 #include "avcodec.h"
 #include "libxvid.h"
-//#include "dsputil.h"
 #include "mpegvideo.h"
 
 #undef NDEBUG
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 0ab4985c1059ed7a4bf7e02c3a855f56d2167130..064b9114b9b1e8c830da43f78749736f3085974c 100644
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -31,7 +31,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mpegvideo.h"
 #include "mjpeg.h"
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
index 24f776a244faf098779b3d5133940b9a60a852a0..8fa56adbedff7b76e51bbd5e6e0c79f0d9512eea 100644
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 #include "libavutil/avassert.h"
-#include "dsputil.h"
 
 #define ORDER_METHOD_EST     0
 #define ORDER_METHOD_2LEVEL  1
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index cd96fa4d8273b02019f1ffcbe95260595246019c..7e59c3437c061c7e723d62fd2c972be1b35f93fb 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -28,7 +28,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "mpeg12.h"
 #include "thread.h"
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 4fd0ad9d9c4e0197611c543c93bd828bbadee677..ba5753b3cee01404add761aa8a5506864959fdc3 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -35,7 +35,6 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "copy_block.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mjpeg.h"
 #include "mjpegdec.h"
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 2a92dbdf73ae638129c7d9ac1477c570745fded5..80a4022c7e8a4297654466dd2dc6fad56bf5d8be 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -31,7 +31,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "mjpeg.h"
 #include "mjpegenc.h"
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 664c6f7708f2efe4517d6ec179657c45e206365b..d9d6a1fd9d00d7374b77ccaf5bfd56a6e7e4a862 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -32,7 +32,6 @@
 #include <limits.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "mpegvideo.h"
 
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index d064924b910ea507aa588032218129dc078c7d22..3bd2d357880587d5758218876c39802c1d40372e 100644
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -28,7 +28,6 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "mpegaudiodsp.h"
 #include "mpegaudio.h"
 
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 4a54ed58ec47ad62ff2733d226981a3b087eb5dc..c8e7b45287d7bb3fff6c79770f58d34aa9ad1793 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -26,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "mpegvideo.h"
 
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 97708abc137b58f39fc74d12615e16f04141844d..0266afeb74a22d04c5e39b61fb5ec304b7c9c1c8 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -33,7 +33,6 @@
 #include "internal.h"
 #include "mathops.h"
 #include "mpegaudiodsp.h"
-#include "dsputil.h"
 
 /*
  * TODO:
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index 00264ec44cb4401342bf04473b2c7fa68c1c6e84..f30124cf44b115d56272901bc0d0b0959cb8f7e9 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -23,7 +23,6 @@
 #include <X11/extensions/XvMC.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 
 #undef NDEBUG
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index 5c1fb5c32a023725d04797fbec26151167a2d80c..7187d1a5e1927544f15ee276fad002142cb478d5 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "msrledec.h"
 
 typedef struct MsrleContext {
diff --git a/libavcodec/mss2dsp.h b/libavcodec/mss2dsp.h
index 4d2966778bbce45b6658195dabb12b952e7019ae..7368abb581a510bc644846c8445a43c6ab3db027 100644
--- a/libavcodec/mss2dsp.h
+++ b/libavcodec/mss2dsp.h
@@ -26,7 +26,7 @@
 #ifndef AVCODEC_MSS2DSP_H
 #define AVCODEC_MSS2DSP_H
 
-#include "dsputil.h"
+#include <stdint.h>
 
 typedef struct MSS2DSPContext {
     void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride,
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 195e2e80ae98aeb086354bc1c2272292d3a9abdc..0740c75a0f09873690a4c047e1ef6ea2b72cae70 100644
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -33,7 +33,6 @@
 
 #include "nellymoser.h"
 #include "avcodec.h"
-#include "dsputil.h"
 
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index b57df30f0c035f3bb683fac06721a8b71f27a661..4b4b61c4721a3f802e5ebfa7e9312c7479b4c41d 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -36,7 +36,6 @@
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "internal.h"
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 0a588d4f0199dbc6be0c1426b2aed34048fae9d6..121bd38e38fa2ba5e56570fffdf03a583d5051ff 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -40,7 +40,6 @@
 #include "nellymoser.h"
 #include "avcodec.h"
 #include "audio_frame_queue.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index b8796d229e5bcf87de9b73383e6e4a61c0abf5ec..dffe339ca3d02a7f826af948e5be433a9c456e87 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -28,7 +28,6 @@
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "rtjpeg.h"
 
 typedef struct {
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c
index 6fce90438b1217b2c28e3bb2a823dca735ea6f6d..4b2bd60858eb17c58a93f9704f8570d4b28d9bda 100644
--- a/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@@ -25,7 +25,6 @@
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"
 
 /* ***** WARNING ***** WARNING ***** WARNING ***** */
diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c
index 608dac429567e1a98f34baf4d2c8af5269a7e11c..acab127314d7f8e5cc9389764b0cc91a0cbaaf4a 100644
--- a/libavcodec/ppc/fdct_altivec.c
+++ b/libavcodec/ppc/fdct_altivec.c
@@ -23,7 +23,6 @@
 #include <altivec.h>
 #endif
 #include "libavutil/common.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"
 
 #define vs16(v) ((vector signed short)(v))
diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c
index 4e361214d0238c59534c14ad8aac9794e66f9d6e..4db761de448c9997779cac024b5b3acd491b3f00 100644
--- a/libavcodec/ppc/gmc_altivec.c
+++ b/libavcodec/ppc/gmc_altivec.c
@@ -23,7 +23,6 @@
 #include "libavutil/mem.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"
 
 /*
diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c
index 9a8b91740e4a19f6c8a07cef3ec3b23d6507edbd..c6f2cd8b8aa92a9fbf8983ae91b399d9099fb121 100644
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@@ -42,7 +42,6 @@
 #include <altivec.h>
 #endif
 #include "libavutil/ppc/types_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"
 
 #define IDCT_HALF                                       \
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 249f565af558399153df33f1f77ef0d292345ec4..bf490b04ea72db84892411584e88787f7803828e 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -28,7 +28,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 
 #include "dsputil_altivec.h"
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index 1a0d7c08dd812205fd0cd7e37b7bd99755a971b8..9c2ad70b62a82a5055ae4e8932593692870d650f 100644
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@@ -22,7 +22,6 @@
 #include "libavutil/attributes.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/vc1dsp.h"
 
 // main steps of 8x8 transform
diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c
index 54e291e483c2bda4107c0d29f63d69a6305bfe68..42ae00b8bad0ea23b18ad22cff5ab88523a34e03 100644
--- a/libavcodec/ppc/vp3dsp_altivec.c
+++ b/libavcodec/ppc/vp3dsp_altivec.c
@@ -29,7 +29,6 @@
 
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"
 
 static const vec_s16 constants =
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index c0c80a1fe7b32dcff8ee3bd9134d0316fc05d149..283d8e6b0e350aca96301e1b8f8f26e5b6099f88 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -39,7 +39,6 @@
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "rdft.h"
 #include "mpegaudiodsp.h"
diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h
index 0432bed4858d3587bea5829ab149fad384110328..7323eea8b28fe2cf9bb84315d8e1a6e13fbe80d0 100644
--- a/libavcodec/ra288.h
+++ b/libavcodec/ra288.h
@@ -23,7 +23,6 @@
 #define AVCODEC_RA288_H
 
 #include <stdint.h>
-#include "dsputil.h"
 #include "libavutil/common.h"
 
 static const float amptable[8]={
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 9f2bcb27c266b9c786017107badadf939467802b..586042377101c527592e27c7fd9902d9410b0fdd 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -26,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "ratecontrol.h"
 #include "mpegvideo.h"
 #include "libavutil/eval.h"
diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index 2ce80e16082d93ed967c3d3738a82c8810e94750..594a7608012fc304d90e763502b8f78b8d945049 100644
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -31,7 +31,6 @@
 #include "config.h"
 #include "libavutil/common.h"
 #include "libavutil/avassert.h"
-#include "dsputil.h"
 
 /**
  * fill a rectangle.
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 4cdb0e5095348d6afcb04d86237d4fe775f0f119..9b63b53c8685f8e806b6f3ff3c6b4d7f0655edb7 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -27,7 +27,6 @@
 
 #include "libavutil/avassert.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "libavutil/common.h"
 
 #if FF_API_AVCODEC_RESAMPLE
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 2f9493d3b6c0f5cca477e2b254562ab7d112020d..3834897252c4cd8e6b82c94094fd5ab4bbec9e3e 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -25,7 +25,6 @@
 #include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "bytestream.h"
-#include "dsputil.h"
 
 typedef struct roq_cell {
     unsigned char y[4];
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 2bd4416fdf4aae5b9392b82b88a81366c4de4e4b..fe781ce25ee76fd7f3a7235964df4659f79f6f4a 100644
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -20,7 +20,6 @@
  */
 #include "libavutil/common.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "rtjpeg.h"
 
 #define PUT_COEFF(c) \
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index a766258286e45ea94a8c6d7c5d6f0728856e34d8..1528780a378a8d497730ae915eaafe78caed8ddc 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -27,7 +27,6 @@
 
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "h263.h"
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 17f1e997268c910846acc649c2583813a55e813a..7f8f8cbc7f4c1c089033f969543a3bc8e69522e8 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 
diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c
index 2a667e31f43725362fe72fb8c0cd396de95cb619..d13a2d8d3072d742f3920a85b50c66e7e04c7c96 100644
--- a/libavcodec/rv30dsp.c
+++ b/libavcodec/rv30dsp.c
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "h264chroma.h"
 #include "h264qpel.h"
 #include "rv34dsp.h"
diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h
index bb18b45d221ee6d7fe2b2b329282c41c6c234d53..475f17a496e90681fbbace28829a3727e03417c4 100644
--- a/libavcodec/rv34.h
+++ b/libavcodec/rv34.h
@@ -28,7 +28,6 @@
 #define AVCODEC_RV34_H
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 
 #include "h264pred.h"
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index ff0ef91a5c4a1a9e3b6999f6c4fa02e8eb2fb061..fe3608e3a2798d16357d9dbb11b63fa4aa23062e 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -27,7 +27,6 @@
 #include "libavutil/imgutils.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 
diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c
index 654a167710648c1d9e317a739bebe9c93acdc8f3..d4e871109712d556b59aa481bbfabcdf9721f878 100644
--- a/libavcodec/sh4/idct_sh4.c
+++ b/libavcodec/sh4/idct_sh4.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/dsputil.h"
 #include "dsputil_sh4.h"
 #include "sh4.h"
 
diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
index 83bb0b340b79e546e4c127b78a17eeff4c3f978a..34f7f994cdee074f8eada0592a6f7c6d1dfa38d8 100644
--- a/libavcodec/sipr.h
+++ b/libavcodec/sipr.h
@@ -25,7 +25,6 @@
 #define AVCODEC_SIPR_H
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "acelp_pitch_delay.h"
 #include "libavutil/mem.h"
 
diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c
index 46345a6b25726c7469051f52bd0173c287f133d4..c9923e09251e831a8171258d34f39905470ac368 100644
--- a/libavcodec/sparc/simple_idct_vis.c
+++ b/libavcodec/sparc/simple_idct_vis.c
@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 
-#include "libavcodec/dsputil.h"
 #include "dsputil_vis.h"
 #include "libavutil/mem.h"
 
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 1b32bbc533ba95f32f97857c58f4b2219eb565c8..d12dfcdb01fc492d030e3e35751ad03fa387a055 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -27,7 +27,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "internal.h"
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 8f910b588f553efcebd069e187e8acaaea576baa..0481c807aba4917bc2f1667ff179ae8b02ecbf2d 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -40,7 +40,6 @@
  *  http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
  */
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index eba48ac630def7c9f48f56fab51afade06a22128..ed6b5d95cf512c04d45e6df4fa3543203a586ecf 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -34,9 +34,9 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
 #include "truemotion1data.h"
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index 51a44788255cd397a686da0f818f34d4d7853d59..e9d206e2902b253bfe63e2b297d5c33bfec93219 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -23,7 +23,6 @@
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "lsp.h"
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index dbdc5f4498091958b36bd899d8538d9d576908d5..d626f242e5d98316c435af63c62c0adcc059b529 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -21,7 +21,6 @@
  */
 
 #include "vaapi_internal.h"
-#include "dsputil.h"
 
 /** Reconstruct bitstream f_code */
 static inline int mpeg2_get_f_code(MpegEncContext *s)
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index fa0b916898a1fc92fbc0dfd844e9c38271149562..a6a7bac2396b2925624bfc75b46a75a8b3c39d3b 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -28,7 +28,6 @@
  */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "vc1.h"
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index ada8375b4b3e2f8aa5c994a21ae14586a1be9aa4..585918cd7b42e700f3475e278627b5dfcb8df9d0 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -27,7 +27,6 @@
  */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 2dc12c88ce40e4266e6a54db454bbfc476d21de7..e9b1a7b7951307572ddb756dafa58834d23bdd41 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 
diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index 8aa8015df5e3a62f96f685c01f2a8fd6dc1cccee..063a075ce05f54ac92a22cf6198aa400ebc3d81e 100644
--- a/libavcodec/vorbis_data.c
+++ b/libavcodec/vorbis_data.c
@@ -20,7 +20,6 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/mem.h"
-#include "dsputil.h"
 #include "vorbis.h"
 
 const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 50780dd717c4b379935ce7c813a23e94e98d9cad..22b6681a0c6998e98014912cfafaafb4a0d366b4 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -26,7 +26,6 @@
 
 #include <float.h>
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "fft.h"
 #include "vorbis.h"
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 46c7fd85f237ed2555630e85a3ac7814e08385c6..10dab39e4c97b7593c85570c170d417b375b359e 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 
 #include "vp56.h"
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 04afdf8236ec2eecf035053ce66f11fae7ace8ff..f761aa7f29f514bdbf6fd8a5cdb788972820a09a 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "huffman.h"
 
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index f865ccab4d65893a5cbb057e810cd63253dfdd3b..c4056ecef1eaf737972da97136f7d9cc3b0316e2 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -25,7 +25,6 @@
 #include "libavutil/float_dsp.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 396b90f564eef3683e326fa66f9dd66e043dabbe..a772e7371a8ff99ee67bb15edbdfce5e8e24129c 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -94,7 +94,6 @@
 #include "get_bits.h"
 #include "put_bits.h"
 #include "wmaprodata.h"
-#include "dsputil.h"
 #include "sinewin.h"
 #include "wma.h"
 #include "wma_common.h"
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 5ebfae714171908a1f19561ebacdc85d5f579bd8..52739c1f9c2ad8a7e484b0d763d7f08a9ac5894e 100644
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -22,7 +22,6 @@
 #define AVCODEC_WMV2_H
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "intrax8.h"
 #include "wmv2dsp.h"
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 5c2df48d14480d8a938f1aee036dde247edac2e9..fc7a1b3ede6b75995ba1bdfe8f5996612a93532c 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -19,7 +19,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "mathops.h"
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 851d715e390af00152f209bdb129949853cedf8a..23b64a76a2285c69427fe2f1d7ccb5dfa109b866 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -19,7 +19,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index 470fd53f2e780a64771944f5cd5b3b3ff2e1e0e6..dd7558439e5a1c35e06aa8279f00e57a98e120b8 100644
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -27,7 +27,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/cavsdsp.h"
 #include "dsputil_mmx.h"
 #include "config.h"
diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c
index a9d95799babab829edc516609685689a354ed439..bfa794743b9c4b4c5ef837d93c17d15f28800dd2 100644
--- a/libavcodec/x86/fft_init.c
+++ b/libavcodec/x86/fft_init.c
@@ -18,7 +18,6 @@
 
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/dct.h"
 #include "fft.h"
 
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c
index 7a4bbdb2c011e1450913f7d1c203bcb9c57730ae..4a4c0170b723b91bf78a9ea37de56e9e7408254c 100644
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@ -27,7 +27,6 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/fmtconvert.h"
-#include "libavcodec/dsputil.h"
 
 #if HAVE_YASM
 
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 382e509e07b04c6e13e60f85d60a8de45b191291..a467878918b5cbc40fe31299092b110f69f9b50f 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -23,7 +23,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/h264qpel.h"
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c
index 09b9e40364f4b81faf0ff94b252a5cf5ffb43a63..b51466cba0951ae00b8dccbe700ad0102970b0d0 100644
--- a/libavcodec/x86/idct_sse2_xvid.c
+++ b/libavcodec/x86/idct_sse2_xvid.c
@@ -38,7 +38,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/dsputil.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "idct_xvid.h"
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 670659312f9d745b58e77e2f148ab807989b4725..3ffb00296e603fe9d47364676643dd3ff6fed2c1 100644
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@ -26,7 +26,6 @@
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
 
 #if HAVE_INLINE_ASM
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index 697d28ba1d3df88138e1b42774451e46dff84b74..903ad62dd5ad770c4778711ba62e0819e20db991 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -23,7 +23,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
 
diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c
index 70f86299bb90fe1d5add0ea22eea3e61dc44ec1d..a2dea74220dd9d3108cff3b5f42b5b3f59cd0b64 100644
--- a/libavcodec/x86/rv34dsp_init.c
+++ b/libavcodec/x86/rv34dsp_init.c
@@ -22,7 +22,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/rv34dsp.h"
 
 void ff_rv34_idct_dc_mmxext(int16_t *block);
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c
index f9fd7dc3c943e3f4fc20be6018eef48d2a302cf2..f27d2b90ba088d6c4caa936e4e9817bab49e2b36 100644
--- a/libavcodec/x86/simple_idct.c
+++ b/libavcodec/x86/simple_idct.c
@@ -19,7 +19,6 @@
  * 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/dsputil.h"
 #include "libavcodec/simple_idct.h"
 #include "libavutil/mem.h"
 #include "dsputil_mmx.h"
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index 863726eeb775673f6fb32d16527dfc9b64b8fe3a..1c735eb9cb1b9e314915680a96e836ae06fd458a 100644
--- a/libavcodec/x86/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
@@ -28,7 +28,6 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
 #include "libavcodec/vc1dsp.h"
 #include "vc1dsp.h"
diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c
index b699f793caf8a134c826df11ea3edf644d5018fb..defc63b0eac773028a6b5cf2405ccf0721bce7e2 100644
--- a/libavcodec/x86/vp56dsp_init.c
+++ b/libavcodec/x86/vp56dsp_init.c
@@ -23,7 +23,6 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/vp56dsp.h"
 
 void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,