diff --git a/libavcodec/common.h b/libavcodec/common.h
index 48db261155..c1b1d47485 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -25,6 +25,7 @@
 #    include <stdlib.h>
 #    include <stdio.h>
 #    include <string.h>
+#    include <ctype.h>
 #    ifndef __BEOS__
 #        include <errno.h>
 #    else
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ffd71a69be..b5949e60ed 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -24,7 +24,6 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */ 
  
-#include <ctype.h>
 #include <limits.h>
 #include "avcodec.h"
 #include "dsputil.h"
@@ -3510,6 +3509,8 @@ static void encode_picture(MpegEncContext *s, int picture_number)
     case FMT_MPEG1:
         mpeg1_encode_picture_header(s, picture_number);
         break;
+    case FMT_H264:
+        break;
     }
     bits= get_bit_count(&s->pb);
     s->header_bits= bits - s->last_bits;
diff --git a/libavcodec/xvmcvideo.c b/libavcodec/xvmcvideo.c
index 6346b50d46..9c432020ba 100644
--- a/libavcodec/xvmcvideo.c
+++ b/libavcodec/xvmcvideo.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
 #include <limits.h>
 
 //avcodec include