diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 1ab4ca28ab..d029689c87 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -618,10 +618,6 @@ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
 
 extern int mm_flags;
 
-void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-
 static inline void emms(void)
 {
     __asm__ volatile ("emms;":::"memory");
@@ -634,8 +630,6 @@ static inline void emms(void)
         emms();\
 }
 
-void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
-
 #elif ARCH_ARM
 
 extern int mm_flags;
diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h
index 52c5f8dd09..c0ef49b306 100644
--- a/libavcodec/x86/dsputil_mmx.h
+++ b/libavcodec/x86/dsputil_mmx.h
@@ -150,5 +150,10 @@ extern const double ff_pd_2[2];
     "psrlw $15, %%" #regd ::)
 
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
+void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
+
+void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
+void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
+void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
 
 #endif /* AVCODEC_X86_DSPUTIL_MMX_H */
diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c
index 4b83a44d18..81f617b117 100644
--- a/libavcodec/x86/idct_sse2_xvid.c
+++ b/libavcodec/x86/idct_sse2_xvid.c
@@ -40,6 +40,7 @@
 
 #include "libavcodec/dsputil.h"
 #include "idct_xvid.h"
+#include "dsputil_mmx.h"
 
 /*!
  * @file libavcodec/x86/idct_sse2_xvid.c
diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c
index 4673ebc853..079d604cb5 100644
--- a/libavcodec/x86/motion_est_mmx.c
+++ b/libavcodec/x86/motion_est_mmx.c
@@ -24,6 +24,7 @@
 
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
+#include "dsputil_mmx.h"
 
 DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
 0x0000000000000000ULL,
diff --git a/libavcodec/x86/simple_idct_mmx.c b/libavcodec/x86/simple_idct_mmx.c
index 578674451a..5cc1e74692 100644
--- a/libavcodec/x86/simple_idct_mmx.c
+++ b/libavcodec/x86/simple_idct_mmx.c
@@ -21,6 +21,7 @@
  */
 #include "libavcodec/dsputil.h"
 #include "libavcodec/simple_idct.h"
+#include "dsputil_mmx.h"
 
 /*
 23170.475006