diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 0812912f17..5a54d57bbc 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -46,7 +46,7 @@
 #endif
 #include "mpegutils.h"
 #include "mpegvideo.h"
-#include "msmpeg4.h"
+#include "msmpeg4dec.h"
 #include "qpeldsp.h"
 #include "thread.h"
 #include "wmv2dec.h"
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index dbe650cbbc..b918028fe1 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -24,42 +24,18 @@
 
 #include <stdint.h>
 
-#include "config.h"
-#include "avcodec.h"
 #include "mpegvideo.h"
-#include "msmpeg4data.h"
-
-#define INTER_INTRA_VLC_BITS 3
-#define MB_NON_INTRA_VLC_BITS 9
-#define MB_INTRA_VLC_BITS 9
 
 #define II_BITRATE 128*1024
 #define MBAC_BITRATE 50*1024
 
 #define DC_MAX 119
 
-extern VLC ff_mb_non_intra_vlc[4];
-extern VLC ff_inter_intra_vlc;
-
 void ff_msmpeg4_common_init(MpegEncContext *s);
 int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n,
                                 uint8_t **coded_block_ptr);
 
-int ff_msmpeg4_decode_init(AVCodecContext *avctx);
-int ff_msmpeg4_decode_picture_header(MpegEncContext *s);
-int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size);
-void ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr);
-int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
-                            int n, int coded, const uint8_t *scan_table);
 int ff_msmpeg4_pred_dc(MpegEncContext *s, int n,
                        int16_t **dc_val_ptr, int *dir_ptr);
 
-
-#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
-                                CONFIG_MSMPEG4V2_DECODER || \
-                                CONFIG_MSMPEG4V3_DECODER || \
-                                CONFIG_WMV1_DECODER      || \
-                                CONFIG_WMV2_DECODER      || \
-                                CONFIG_VC1_DECODER)
-
 #endif /* AVCODEC_MSMPEG4_H */
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index e1d2c342bc..8099872509 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -27,12 +27,12 @@
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
+#include "msmpeg4dec.h"
 #include "libavutil/imgutils.h"
 #include "h263.h"
 #include "h263dec.h"
 #include "mpeg4video.h"
 #include "msmpeg4data.h"
-#include "vc1data.h"
 #include "wmv2dec.h"
 
 #define DC_VLC_BITS 9
diff --git a/libavcodec/msmpeg4dec.h b/libavcodec/msmpeg4dec.h
new file mode 100644
index 0000000000..af2591caf5
--- /dev/null
+++ b/libavcodec/msmpeg4dec.h
@@ -0,0 +1,50 @@
+/*
+ * MSMPEG4 decoder header
+ * copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_MSMPEG4DEC_H
+#define AVCODEC_MSMPEG4DEC_H
+
+#include "config.h"
+#include "avcodec.h"
+#include "mpegvideo.h"
+
+#define INTER_INTRA_VLC_BITS 3
+#define MB_NON_INTRA_VLC_BITS 9
+#define MB_INTRA_VLC_BITS 9
+
+extern VLC ff_mb_non_intra_vlc[4];
+extern VLC ff_inter_intra_vlc;
+
+int ff_msmpeg4_decode_init(AVCodecContext *avctx);
+int ff_msmpeg4_decode_picture_header(MpegEncContext *s);
+int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size);
+void ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr);
+int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
+                            int n, int coded, const uint8_t *scan_table);
+
+#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
+                                CONFIG_MSMPEG4V2_DECODER || \
+                                CONFIG_MSMPEG4V3_DECODER || \
+                                CONFIG_WMV1_DECODER      || \
+                                CONFIG_WMV2_DECODER      || \
+                                CONFIG_VC1_DECODER)
+
+#endif
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index d7a19f6ad2..dcf91f9828 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -27,7 +27,7 @@
 #include "error_resilience.h"
 #include "internal.h"
 #include "mpeg_er.h"
-#include "msmpeg4.h"
+#include "msmpeg4dec.h"
 #include "qpeldsp.h"
 #include "vc1.h"
 #include "wmv2data.h"
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 7ed5133cfa..89cccc1929 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -33,8 +33,8 @@
 #include "internal.h"
 #include "mpeg_er.h"
 #include "mpegvideo.h"
-#include "msmpeg4.h"
 #include "msmpeg4data.h"
+#include "msmpeg4dec.h"
 #include "profiles.h"
 #include "vc1.h"
 #include "vc1data.h"
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index ddf68545fc..7121468ae9 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -29,6 +29,7 @@
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"
+#include "msmpeg4dec.h"
 #include "simple_idct.h"
 #include "wmv2.h"
 #include "wmv2data.h"