diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 2804e846b3..52cb466837 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -62,8 +62,10 @@ static void asf_descrambling(unsigned char **src,int len){
   *src = dst;
 }
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 914eda1a7d..f52d4d04bd 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -32,8 +32,10 @@ Video codecs: (supported by RealPlayer8 for Linux)
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index 910a724225..e31f558ee9 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -15,8 +15,10 @@
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index f03b246fe2..89415fe944 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -22,8 +22,10 @@
 /* sub_cc (closed captions)*/
 #include "sub_cc.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif