diff --git a/libavfilter/libmpcodecs/libvo/video_out.h b/libavfilter/libmpcodecs/libvo/video_out.h
index cbbea66445..77b0229991 100644
--- a/libavfilter/libmpcodecs/libvo/video_out.h
+++ b/libavfilter/libmpcodecs/libvo/video_out.h
@@ -27,7 +27,7 @@
 #include <stdarg.h>
 
 //#include "sub/font_load.h"
-#include "libmpcodecs/img_format.h"
+#include "../img_format.h"
 //#include "vidix/vidix.h"
 
 #define VO_EVENT_EXPOSE 1
diff --git a/libavfilter/libmpcodecs/mp_image.c b/libavfilter/libmpcodecs/mp_image.c
index 397bebfa00..bd6d33fe0a 100644
--- a/libavfilter/libmpcodecs/mp_image.c
+++ b/libavfilter/libmpcodecs/mp_image.c
@@ -26,11 +26,11 @@
 #include <malloc.h>
 #endif
 
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/mp_image.h"
+#include "img_format.h"
+#include "mp_image.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/mem.h"
+//#include "libavutil/mem.h"
 
 void mp_image_alloc_planes(mp_image_t *mpi) {
   // IF09 - allocate space for 4. plane delta info - unused
diff --git a/libavfilter/libmpcodecs/mp_image.h b/libavfilter/libmpcodecs/mp_image.h
index 7c56880bb6..02c78482a2 100644
--- a/libavfilter/libmpcodecs/mp_image.h
+++ b/libavfilter/libmpcodecs/mp_image.h
@@ -22,7 +22,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#undef printf //FIXME
+#undef fprintf //FIXME
 #include "mp_msg.h"
+#include "libavutil/avutil.h"
+#include "libavutil/avassert.h"
+#undef realloc
+#undef malloc
+#undef free
+#undef rand
+#undef srand
+#undef printf
 
 //--------- codec's requirements (filled by the codec/vf) ---------
 
diff --git a/libavfilter/libmpcodecs/vf.h b/libavfilter/libmpcodecs/vf.h
index 3619e699f1..9119b6209d 100644
--- a/libavfilter/libmpcodecs/vf.h
+++ b/libavfilter/libmpcodecs/vf.h
@@ -19,11 +19,11 @@
 #ifndef MPLAYER_VF_H
 #define MPLAYER_VF_H
 
-#include "m_option.h"
+//#include "m_option.h"
 #include "mp_image.h"
 
-extern m_obj_settings_t* vf_settings;
-extern const m_obj_list_t vf_obj_list;
+//extern m_obj_settings_t* vf_settings;
+//extern const m_obj_list_t vf_obj_list;
 
 struct vf_instance;
 struct vf_priv_s;