diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 6dd5d2295a..27a5f31c59 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -20,119 +20,18 @@
 #ifndef AVCODEC_H263_H
 #define AVCODEC_H263_H
 
-#include <stdint.h>
 #include "libavutil/rational.h"
 #include "mpegvideo.h"
-#include "h263data.h"
 
 #define FF_ASPECT_EXTENDED 15
 
 #define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4)
 
 av_const int ff_h263_aspect_to_info(AVRational aspect);
-void ff_h263_encode_mb(MpegEncContext *s,
-                       int16_t block[6][64],
-                       int motion_x, int motion_y);
-void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number);
-void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line);
 int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
                              int *px, int *py);
-void ff_h263_encode_init(MpegEncContext *s);
 void ff_h263_init_rl_inter(void);
 void ff_h263_update_motion_val(MpegEncContext * s);
 void ff_h263_loop_filter(MpegEncContext * s);
-void ff_h263_encode_mba(MpegEncContext *s);
-void ff_init_qscale_tab(MpegEncContext *s);
-
-
-void ff_clean_h263_qscales(MpegEncContext *s);
-void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
-
-
-static inline int h263_get_motion_length(int val, int f_code){
-    int bit_size, code, sign;
-
-    if (val == 0) {
-        return 1; /* ff_mvtab[0][1] */
-    } else {
-        bit_size = f_code - 1;
-        /* modulo encoding */
-        val  = sign_extend(val, 6 + bit_size);
-        sign = val >> 31;
-        val  = (val ^ sign) - sign; /* val = FFABS(val) */
-        val--;
-        code = (val >> bit_size) + 1;
-
-        return ff_mvtab[code][1] + 1 + bit_size;
-    }
-}
-
-static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){
-    if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) {
-        skip_put_bits(&s->pb,
-            h263_get_motion_length(x, f_code)
-           +h263_get_motion_length(y, f_code));
-    }else{
-        ff_h263_encode_motion(&s->pb, x, f_code);
-        ff_h263_encode_motion(&s->pb, y, f_code);
-    }
-}
-
-static inline int get_p_cbp(MpegEncContext * s,
-                      int16_t block[6][64],
-                      int motion_x, int motion_y){
-    int cbp, i;
-
-    if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) {
-        int best_cbpy_score= INT_MAX;
-        int best_cbpc_score= INT_MAX;
-        int cbpc = (-1), cbpy= (-1);
-        const int offset= (s->mv_type==MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0);
-        const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
-
-        for(i=0; i<4; i++){
-            int score= ff_h263_inter_MCBPC_bits[i + offset] * lambda;
-            if(i&1) score += s->coded_score[5];
-            if(i&2) score += s->coded_score[4];
-
-            if(score < best_cbpc_score){
-                best_cbpc_score= score;
-                cbpc= i;
-            }
-        }
-
-        for(i=0; i<16; i++){
-            int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda;
-            if(i&1) score += s->coded_score[3];
-            if(i&2) score += s->coded_score[2];
-            if(i&4) score += s->coded_score[1];
-            if(i&8) score += s->coded_score[0];
-
-            if(score < best_cbpy_score){
-                best_cbpy_score= score;
-                cbpy= i;
-            }
-        }
-        cbp= cbpc + 4*cbpy;
-        if ((motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16){
-            if(best_cbpy_score + best_cbpc_score + 2*lambda >= 0)
-                cbp= 0;
-        }
-
-        for (i = 0; i < 6; i++) {
-            if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){
-                s->block_last_index[i]= -1;
-                s->bdsp.clear_block(s->block[i]);
-            }
-        }
-    }else{
-        cbp= 0;
-        for (i = 0; i < 6; i++) {
-            if (s->block_last_index[i] >= 0)
-                cbp |= 1 << (5 - i);
-        }
-    }
-    return cbp;
-}
 
 #endif /* AVCODEC_H263_H */
diff --git a/libavcodec/h263enc.h b/libavcodec/h263enc.h
new file mode 100644
index 0000000000..31f00665ce
--- /dev/null
+++ b/libavcodec/h263enc.h
@@ -0,0 +1,130 @@
+/*
+ * H.263 encoder header
+ *
+ * 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_H263ENC_H
+#define AVCODEC_H263ENC_H
+
+#include <stdint.h>
+#include "h263data.h"
+#include "mpegvideo.h"
+
+void ff_h263_encode_init(MpegEncContext *s);
+void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number);
+void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line);
+void ff_h263_encode_mb(MpegEncContext *s,
+                       int16_t block[6][64],
+                       int motion_x, int motion_y);
+void ff_h263_encode_mba(MpegEncContext *s);
+
+void ff_init_qscale_tab(MpegEncContext *s);
+void ff_clean_h263_qscales(MpegEncContext *s);
+
+void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
+
+
+static inline int h263_get_motion_length(int val, int f_code)
+{
+    int bit_size, code, sign;
+
+    if (val == 0) {
+        return 1; /* ff_mvtab[0][1] */
+    } else {
+        bit_size = f_code - 1;
+        /* modulo encoding */
+        val  = sign_extend(val, 6 + bit_size);
+        sign = val >> 31;
+        val  = (val ^ sign) - sign; /* val = FFABS(val) */
+        val--;
+        code = (val >> bit_size) + 1;
+
+        return ff_mvtab[code][1] + 1 + bit_size;
+    }
+}
+
+static inline void ff_h263_encode_motion_vector(MpegEncContext * s,
+                                                int x, int y, int f_code)
+{
+    if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) {
+        skip_put_bits(&s->pb,
+                      h263_get_motion_length(x, f_code) +
+                      h263_get_motion_length(y, f_code));
+    } else {
+        ff_h263_encode_motion(&s->pb, x, f_code);
+        ff_h263_encode_motion(&s->pb, y, f_code);
+    }
+}
+
+static inline int get_p_cbp(MpegEncContext * s,
+                      int16_t block[6][64],
+                      int motion_x, int motion_y){
+    int cbp;
+
+    if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) {
+        int best_cbpy_score = INT_MAX;
+        int best_cbpc_score = INT_MAX;
+        int cbpc = (-1), cbpy = (-1);
+        const int offset = (s->mv_type == MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0);
+        const int lambda = s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
+
+        for (int i = 0; i < 4; i++) {
+            int score = ff_h263_inter_MCBPC_bits[i + offset] * lambda;
+            if (i & 1) score += s->coded_score[5];
+            if (i & 2) score += s->coded_score[4];
+
+            if (score < best_cbpc_score) {
+                best_cbpc_score = score;
+                cbpc = i;
+            }
+        }
+
+        for (int i = 0; i < 16; i++) {
+            int score= ff_h263_cbpy_tab[i ^ 0xF][1] * lambda;
+            if (i & 1) score += s->coded_score[3];
+            if (i & 2) score += s->coded_score[2];
+            if (i & 4) score += s->coded_score[1];
+            if (i & 8) score += s->coded_score[0];
+
+            if (score < best_cbpy_score) {
+                best_cbpy_score = score;
+                cbpy = i;
+            }
+        }
+        cbp = cbpc + 4 * cbpy;
+        if (!(motion_x | motion_y | s->dquant) && s->mv_type == MV_TYPE_16X16) {
+            if (best_cbpy_score + best_cbpc_score + 2 * lambda >= 0)
+                cbp= 0;
+        }
+
+        for (int i = 0; i < 6; i++) {
+            if (s->block_last_index[i] >= 0 && !((cbp >> (5 - i)) & 1)) {
+                s->block_last_index[i] = -1;
+                s->bdsp.clear_block(s->block[i]);
+            }
+        }
+    } else {
+        cbp = 0;
+        for (int i = 0; i < 6; i++) {
+            if (s->block_last_index[i] >= 0)
+                cbp |= 1 << (5 - i);
+        }
+    }
+    return cbp;
+}
+
+#endif
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 9253d60a16..70ac1f643b 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -35,6 +35,7 @@
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
 #include "h263.h"
+#include "h263enc.h"
 #include "h263data.h"
 #include "mathops.h"
 #include "mpegutils.h"
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 655be5697d..ce0ea8d9f6 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -24,7 +24,6 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
-#include "libavutil/pixdesc.h"
 #include "libavutil/thread.h"
 #include "error_resilience.h"
 #include "hwconfig.h"
@@ -36,6 +35,7 @@
 #include "mpeg4video.h"
 #include "mpeg4videodata.h"
 #include "h263.h"
+#include "h263data.h"
 #include "h263dec.h"
 #include "profiles.h"
 #include "threadframe.h"
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 27e16c3b72..8a1a6cbcc8 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -27,6 +27,7 @@
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "h263.h"
+#include "h263enc.h"
 #include "mpeg4video.h"
 #include "mpeg4videodata.h"
 #include "profiles.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 39fa9caf4a..b642dc61b9 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -51,6 +51,7 @@
 #include "h261enc.h"
 #include "h263.h"
 #include "h263data.h"
+#include "h263enc.h"
 #include "mjpegenc_common.h"
 #include "mathops.h"
 #include "mpegutils.h"
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index 8099872509..a490da1aa6 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -30,6 +30,7 @@
 #include "msmpeg4dec.h"
 #include "libavutil/imgutils.h"
 #include "h263.h"
+#include "h263data.h"
 #include "h263dec.h"
 #include "mpeg4video.h"
 #include "msmpeg4data.h"
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index c436f78f9d..80bfbbe84b 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -35,6 +35,7 @@
 #include "libavutil/thread.h"
 #include "mpegvideo.h"
 #include "h263.h"
+#include "h263data.h"
 #include "internal.h"
 #include "mpeg4video.h"
 #include "msmpeg4.h"
@@ -42,7 +43,6 @@
 #include "msmpeg4enc.h"
 #include "put_bits.h"
 #include "rl.h"
-#include "vc1data.h"
 
 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
 
diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index 19b6aab278..204cd03a24 100644
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -27,8 +27,8 @@
 
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
-#include "h263.h"
 #include "h263data.h"
+#include "h263enc.h"
 #include "put_bits.h"
 #include "rv10.h"
 
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index df31eb8132..e169ae601d 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -34,7 +34,7 @@
 #include "mathops.h"
 
 #include "mpegvideo.h"
-#include "h263.h"
+#include "h263enc.h"
 
 static av_cold int encode_init(AVCodecContext *avctx)
 {
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 11cbd97185..9cef3d8ef6 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -32,6 +32,7 @@
 #include "me_cmp.h"
 #include "mpegvideo.h"
 #include "h263.h"
+#include "h263enc.h"
 #include "internal.h"
 #include "mpegutils.h"
 #include "packet_internal.h"