diff --git a/src/Makefile.am b/src/Makefile.am
index 0dcf32edf..827b10b7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/libmd5sum \
 	-I$(top_srcdir)/lib/libupnpclient \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
+	@FREETYPE_CFLAGS@
+
+AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 if BOXTYPE_TRIPLE
diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am
index bffd7992b..4d7fcd185 100644
--- a/src/daemonc/Makefile.am
+++ b/src/daemonc/Makefile.am
@@ -11,7 +11,10 @@ AM_CPPFLAGS += \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/xmltree \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
+	@FREETYPE_CFLAGS@
+
+AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_daemonc.a
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 0c115ed16..8c166be61 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -13,7 +13,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/connection \
 	-I$(top_srcdir)/lib/libeventserver \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
+	@FREETYPE_CFLAGS@
+
+AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index 356a113ba..254f93493 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -9,7 +9,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
+	@FREETYPE_CFLAGS@
+
+AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_driver_audiodec.a
diff --git a/src/gui/lua/Makefile.am b/src/gui/lua/Makefile.am
index 8d3d4cabc..d2e78b13d 100644
--- a/src/gui/lua/Makefile.am
+++ b/src/gui/lua/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS += \
 	@LUA_CFLAGS@
 
 AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_gui_lua.a
diff --git a/src/nhttpd/tuxboxapi/Makefile.am b/src/nhttpd/tuxboxapi/Makefile.am
index affa42b40..10e046263 100644
--- a/src/nhttpd/tuxboxapi/Makefile.am
+++ b/src/nhttpd/tuxboxapi/Makefile.am
@@ -17,6 +17,7 @@ AM_CPPFLAGS += \
 	@FREETYPE_CFLAGS@
 
 AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libnhttpd_tuxboxapi.a
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index f6cd94b27..5ba18d47f 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -18,7 +18,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/xmltree \
 	-I$(top_srcdir)/lib/jsoncpp/include \
 	@SIGC_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
+	@FREETYPE_CFLAGS@
+
+AM_CPPFLAGS += \
+	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_system.a