diff --git a/configure.in b/configure.in
index e6431164..5248b522 100644
--- a/configure.in
+++ b/configure.in
@@ -333,8 +333,6 @@ if test x$have_ffmpeg = xyes; then
 else
    AC_MSG_RESULT(not found)
 fi
-dnl most recent ffmpeg header mess workaround
-FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/ffmpeg/libavutil/ -I/usr/include/ffmpeg/libavformat/ -I/usr/include/ffmpeg/libavcodec/ -I/usr/include/ffmpeg/libswscale -I/usr/include/ffmpeg/"
 AC_SUBST(FFMPEG_LIBS)
 AC_SUBST(FFMPEG_CFLAGS)
 AC_SUBST(SWSCALE_LIBS)
diff --git a/src/include/ffmpeg_encoder.h b/src/include/ffmpeg_encoder.h
index 857c12a2..f48ba613 100644
--- a/src/include/ffmpeg_encoder.h
+++ b/src/include/ffmpeg_encoder.h
@@ -8,8 +8,8 @@
 #include <video_encoder.h>
 
 #ifdef WITH_AVCODEC
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 
 #define STREAM_IS_RAW(avformat_context) \
     (avformat_context->oformat->flags & AVFMT_RAWPICTURE)
diff --git a/src/include/oggtheora_encoder.h b/src/include/oggtheora_encoder.h
index d5332d06..d0507a42 100644
--- a/src/include/oggtheora_encoder.h
+++ b/src/include/oggtheora_encoder.h
@@ -33,8 +33,8 @@
 
 /*
 extern "C" {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 }
 */
 
diff --git a/src/include/video_layer.h b/src/include/video_layer.h
index 34595b9f..0a25668e 100644
--- a/src/include/video_layer.h
+++ b/src/include/video_layer.h
@@ -22,10 +22,10 @@
 #include <config.h>
 
 extern "C" {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #ifdef WITH_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
 #endif
 }
 #include <layer.h>