diff --git a/configure.ac b/configure.ac
index d2352b20f..f3869371a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ AC_ARG_ENABLE(cleanup,
 	[  --enable-cleanup                  enable cleanup on exit],
 	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
 
-if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
+if test "$BOXTYPE" = "coolstream" -a -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
 
diff --git a/lib/libcoolstream/Makefile.am b/lib/libcoolstream/Makefile.am
index 6709b6dc6..5ec578329 100644
--- a/lib/libcoolstream/Makefile.am
+++ b/lib/libcoolstream/Makefile.am
@@ -2,5 +2,7 @@ noinst_LIBRARIES = libhwcaps.a
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
+INCLUDES = -I$(top_srcdir)/lib/libcoolstream
+
 libhwcaps_a_SOURCES = \
 	hardware_caps.cpp