diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 9251df8d12787d8eec702ccf96083d780c3ed0a5..db52455c9f4d2f6d517a3b03d53b345c3554ac0d 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -41,7 +41,7 @@
 #include "libavutil/imgutils.h"
 
 #if HAVE_MMX_EXTERNAL
-#include "x86/dsputil_mmx.h"
+#include "x86/dsputil_x86.h"
 #endif
 
 #define FF_COLOR_NA      -1
diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c
index 1bc5163316acb8b421aa0c64f8567c66386974f6..db1505e014e5905f7a1a72b9ebfcfba52ecca8d1 100644
--- a/libavcodec/x86/ac3dsp_init.c
+++ b/libavcodec/x86/ac3dsp_init.c
@@ -22,7 +22,7 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "libavcodec/ac3.h"
 #include "libavcodec/ac3dsp.h"
 
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index a3b4dc67919c0a15bfb1aa64a96c2432d4e51d61..0354333382a624e964a20fc2fdbe511f49818027 100644
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -29,7 +29,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/cavsdsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "config.h"
 
 #if HAVE_MMX_INLINE
diff --git a/libavcodec/x86/dirac_dwt.c b/libavcodec/x86/dirac_dwt.c
index fbb25a417c265920fdbb93e9799eb221b420b4ec..04c514f4fd7db5ee157d8f0056ae82ee03b18e98 100644
--- a/libavcodec/x86/dirac_dwt.c
+++ b/libavcodec/x86/dirac_dwt.c
@@ -21,7 +21,7 @@
  */
 
 #include "libavutil/x86/asm.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "dirac_dwt.h"
 
 #define COMPOSE_VERTICAL(ext, align) \
diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_mmx.c
index cb6465f950e4701e68ac0b0f65b57bf7152681c9..a28bb82060983b256a13785eeb4b4f6e1c8a36b1 100644
--- a/libavcodec/x86/diracdsp_mmx.c
+++ b/libavcodec/x86/diracdsp_mmx.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "diracdsp_mmx.h"
 
 void ff_put_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index 31713c5e5bf4ee13c618449415ee5735c5b6c2d5..7b49fd623d65463929222cadac9416e1209a0fc7 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -25,7 +25,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/simple_idct.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "idct_xvid.h"
 
 void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index defae4ad5191442f66cbfe579ed168dc19ec2186..421a6c20908a080398cb6b512dca68d8a3281889 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -28,7 +28,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/videodsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "diracdsp_mmx.h"
 
 #if HAVE_INLINE_ASM
diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_x86.h
similarity index 100%
rename from libavcodec/x86/dsputil_mmx.h
rename to libavcodec/x86/dsputil_x86.h
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index 49e30194ec52076e24b21775cd5ae193829cb57a..51026d10e27b5734d2c20e571c45dbf507ab9242 100644
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@ -30,7 +30,7 @@
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/mathops.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size);
 void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size);
diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c
index 9884c7d93aeaa9d5a0d36213edc355731ae31b7a..384ab89d9c50010ec19aa9b832a14464135a56f7 100644
--- a/libavcodec/x86/fpel_mmx.c
+++ b/libavcodec/x86/fpel_mmx.c
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_MMX_INLINE
 
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 181436a7d9bad6aaa66bcee921cd510c91ddb7ae..c4fdf5b692a54a5ed456894e9ed8cc2a771eef25 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -25,7 +25,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264qpel.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
 void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
index a3d7e09fc900333fd7fcc29d69dfb7dd40df08c7..0255c0354f566eab8e77694c5867871d82494067 100644
--- a/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@ -23,7 +23,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264dsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 /***********************************/
 /* IDCT */
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 243f7247eeb3dc07d5b08348e6e821ad1236cc99..b3e0d11a50c5a7fb9b979597c50acb1405839b9a 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -25,7 +25,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/hpeldsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);
diff --git a/libavcodec/x86/hpeldsp_mmx.c b/libavcodec/x86/hpeldsp_mmx.c
index 309f9993e173062faf0489aa1e501143fa746bf9..50db36dc1b1e93955a90b8c98cd91917d6ba99ba 100644
--- a/libavcodec/x86/hpeldsp_mmx.c
+++ b/libavcodec/x86/hpeldsp_mmx.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_MMX_INLINE
 
diff --git a/libavcodec/x86/idct_mmx_xvid.c b/libavcodec/x86/idct_mmx_xvid.c
index 5e9f40545238cf7e073c4aae477cc764adec2d50..f66519b64290330e4efabd05a4bece853ecff490 100644
--- a/libavcodec/x86/idct_mmx_xvid.c
+++ b/libavcodec/x86/idct_mmx_xvid.c
@@ -44,7 +44,7 @@
 #include "config.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/mem.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "idct_xvid.h"
 
 #if HAVE_INLINE_ASM
diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c
index b51466cba0951ae00b8dccbe700ad0102970b0d0..ee2a08d73ab282f8d8cdf5f9d0ca9804e1eb846c 100644
--- a/libavcodec/x86/idct_sse2_xvid.c
+++ b/libavcodec/x86/idct_sse2_xvid.c
@@ -41,7 +41,7 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "idct_xvid.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 3ffb00296e603fe9d47364676643dd3ff6fed2c1..416cbb07191af9af107eef6fb43a3a4760262d62 100644
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@ -26,7 +26,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index 49e9fd3f74f8d45d790786de4dfabd59976c9695..f6db8c85d9dec8212af0679553a6b6cc043fe5e8 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -24,7 +24,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index eda0b769577be86440e91ac0227ca270001a4abf..c841bccc863962442ad524ea2f7b3061f967371f 100644
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@ -26,7 +26,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dct.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 extern uint16_t ff_inv_zigzag_direct16[64];
 
diff --git a/libavcodec/x86/rnd_mmx.c b/libavcodec/x86/rnd_mmx.c
index db14135f524aea435da8d11b681c6ca39510e9db..326e2f395b6e9bdb7a5caabe4f47266c4e3edb82 100644
--- a/libavcodec/x86/rnd_mmx.c
+++ b/libavcodec/x86/rnd_mmx.c
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
index ac15f885c6e84ea1c7c05db768844010f1311642..6e0f69e4527d288f4ce968c852eaff8a94ae656e 100644
--- a/libavcodec/x86/rv40dsp_init.c
+++ b/libavcodec/x86/rv40dsp_init.c
@@ -30,7 +30,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
 void ff_put_rv40_chroma_mc8_mmx  (uint8_t *dst, uint8_t *src,
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c
index f27d2b90ba088d6c4caa936e4e9817bab49e2b36..c790ef57e9a0a81d668eb0fb87495e9431c3e9a9 100644
--- a/libavcodec/x86/simple_idct.c
+++ b/libavcodec/x86/simple_idct.c
@@ -21,7 +21,7 @@
  */
 #include "libavcodec/simple_idct.h"
 #include "libavutil/mem.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c
index 5505ee8bfd3d23ba782884384067a9d893914c92..735e7905a0f8ab56b39d89cbc6fe557bea1cae61 100644
--- a/libavcodec/x86/snowdsp.c
+++ b/libavcodec/x86/snowdsp.c
@@ -24,7 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/snow.h"
 #include "libavcodec/snow_dwt.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c
index 228f4dc03e2a4e1cb9580d7e36c506e096aeaef5..345ebf68c557f7d97b731d328a367ac10e3f30ab 100644
--- a/libavcodec/x86/vc1dsp_init.c
+++ b/libavcodec/x86/vc1dsp_init.c
@@ -27,7 +27,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 #include "config.h"
 
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index c50f779984b263658b08ee703b77d12b90e90892..5ceacd348e29c366e92fe3941dcefb4b9a683390 100644
--- a/libavcodec/x86/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
@@ -30,7 +30,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 
 #if HAVE_INLINE_ASM