diff -Nru mlt-0.3.8/src/modules/avformat/consumer_avformat.c mlt-0.3.8.patched/src/modules/avformat/consumer_avformat.c
--- mlt-0.3.8/src/modules/avformat/consumer_avformat.c	2009-04-10 09:18:41.000000000 +0200
+++ mlt-0.3.8.patched/src/modules/avformat/consumer_avformat.c	2009-05-30 22:37:20.000000000 +0200
@@ -35,11 +35,11 @@
 #include <unistd.h>
 
 // avformat header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
 #ifdef SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
 #endif
-#include <opt.h>
+#include <opt.h>
 
 #if LIBAVUTIL_VERSION_INT < (50<<16)
 #define PIX_FMT_RGB32 PIX_FMT_RGBA32
diff -Nru mlt-0.3.8/src/modules/avformat/factory.c mlt-0.3.8.patched/src/modules/avformat/factory.c
--- mlt-0.3.8/src/modules/avformat/factory.c	2009-04-10 09:18:41.000000000 +0200
+++ mlt-0.3.8.patched/src/modules/avformat/factory.c	2009-05-30 22:37:53.000000000 +0200
@@ -32,7 +32,7 @@
 extern mlt_producer producer_avformat_init( mlt_profile profile, char *file );
 
 // ffmpeg Header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
 
 // A static flag used to determine if avformat has been initialised
 static int avformat_initialised = 0;
diff -Nru mlt-0.3.8/src/modules/avformat/filter_avcolour_space.c mlt-0.3.8.patched/src/modules/avformat/filter_avcolour_space.c
--- mlt-0.3.8/src/modules/avformat/filter_avcolour_space.c	2009-03-10 06:55:27.000000000 +0100
+++ mlt-0.3.8.patched/src/modules/avformat/filter_avcolour_space.c	2009-05-30 22:38:14.000000000 +0200
@@ -22,9 +22,9 @@
 #include <framework/mlt_frame.h>
 
 // ffmpeg Header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
 #ifdef SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
 #endif
 
 #if LIBAVUTIL_VERSION_INT < (50<<16)
diff -Nru mlt-0.3.8/src/modules/avformat/filter_avresample.c mlt-0.3.8.patched/src/modules/avformat/filter_avresample.c
--- mlt-0.3.8/src/modules/avformat/filter_avresample.c	2008-02-02 07:07:30.000000000 +0100
+++ mlt-0.3.8.patched/src/modules/avformat/filter_avresample.c	2009-05-30 22:38:31.000000000 +0200
@@ -26,7 +26,7 @@
 #include <string.h>
 
 // ffmpeg Header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
 
 /** Get the audio.
 */
diff -Nru mlt-0.3.8/src/modules/avformat/producer_avformat.c mlt-0.3.8.patched/src/modules/avformat/producer_avformat.c
--- mlt-0.3.8/src/modules/avformat/producer_avformat.c	2009-04-09 09:17:17.000000000 +0200
+++ mlt-0.3.8.patched/src/modules/avformat/producer_avformat.c	2009-05-30 22:39:05.000000000 +0200
@@ -25,8 +25,8 @@
 #include <framework/mlt_profile.h>
 
 // ffmpeg Header files
-#include <avformat.h>
-#include <opt.h>
+#include <libavformat/avformat.h>
+#include <opt.h>
 #ifdef SWSCALE
 #  include <swscale.h>
 #endif