diff --git a/configure.ac b/configure.ac
index 5d4bc0a58..77060b915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,10 +231,10 @@ if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/zapit/include/private'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "apollo"; then
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/zapit/include/private'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
 fi
diff --git a/lib/sectionsdclient/Makefile.am b/lib/sectionsdclient/Makefile.am
index 6128e7ad2..df4484b01 100644
--- a/lib/sectionsdclient/Makefile.am
+++ b/lib/sectionsdclient/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/lib/timerdclient/Makefile.am b/lib/timerdclient/Makefile.am
index 26c088853..3eddb0fa4 100644
--- a/lib/timerdclient/Makefile.am
+++ b/lib/timerdclient/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index 4d608b624..7b201f550 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
 AM_CPPFLAGS = -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
@@ -24,4 +25,4 @@ libnhttpd_a_SOURCES = yhttpd.cpp
 
 libnhttpd_adir = @CONFIGDIR@
 libnhttpd_a_DATA = nhttpd.conf
-EXTRA_DIST = nhttpd.conf nhttpd.conf.in
\ No newline at end of file
+EXTRA_DIST = nhttpd.conf nhttpd.conf.in
diff --git a/src/timerd/Makefile.am b/src/timerd/Makefile.am
index c3b397da7..f97ba11dd 100644
--- a/src/timerd/Makefile.am
+++ b/src/timerd/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
diff --git a/src/zapit/lib/Makefile.am b/src/zapit/lib/Makefile.am
index 2d884b259..e62c50637 100644
--- a/src/zapit/lib/Makefile.am
+++ b/src/zapit/lib/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 AM_CPPFLAGS += \
+	@HWLIB_CFLAGS@ \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/zapit/include \