diff --git a/configure.ac b/configure.ac
index d1d0378da..f5e82089c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,9 @@ AC_ARG_ENABLE(cleanup,
 	[  --enable-cleanup                  enable cleanup on exit],
 	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
 
-AC_CHECK_HEADERS(coolstream/nevis_ir.h)
+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
 
 #
 # Check for libtdservicedb - the new one - for testing only
diff --git a/lib/libcoolstream/cs_api.h b/lib/libcoolstream/cs_api.h
index 294b08c26..98c7430c0 100644
--- a/lib/libcoolstream/cs_api.h
+++ b/lib/libcoolstream/cs_api.h
@@ -9,7 +9,7 @@
 #ifndef __CS_API_H_
 #define __CS_API_H_
 
-#include <coolstream/control.h>
+#include <control.h>
 #include <sys/types.h>
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
diff --git a/lib/libcoolstream/video_cs.h b/lib/libcoolstream/video_cs.h
index a80d59051..251ec4058 100644
--- a/lib/libcoolstream/video_cs.h
+++ b/lib/libcoolstream/video_cs.h
@@ -9,8 +9,8 @@
 #ifndef __VIDEO_CS_H_
 #define __VIDEO_CS_H_
 
-#include <coolstream/cs_vfd.h>
-#include <coolstream/control.h>
+#include <cs_vfd.h>
+#include <control.h>
 
 #include "cs_types.h"
 
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index ce2150e28..6cb043be5 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -39,7 +39,7 @@
 #include <string>
 #include <vector>
 #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
-#include <coolstream/nevis_ir.h>
+#include <nevis_ir.h>
 #endif
 
 #ifndef KEY_OK
diff --git a/src/driver/vfd.h b/src/driver/vfd.h
index 1519021d3..8f0680e6e 100644
--- a/src/driver/vfd.h
+++ b/src/driver/vfd.h
@@ -42,7 +42,7 @@
 
 #include <pthread.h>
 #include <string>
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 
 class CVFD
 {
diff --git a/src/drivertool.c b/src/drivertool.c
index 62f9ad991..f9fdc7f50 100644
--- a/src/drivertool.c
+++ b/src/drivertool.c
@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 
 #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
-#include <coolstream/nevis_ir.h>
+#include <nevis_ir.h>
 #endif
 
 #ifndef IOC_IR_SET_PRI_PROTOCOL
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 466566897..ec32d4e63 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1696,7 +1696,7 @@ void CNeutrinoApp::InitSectiondClient()
 }
 
 #if HAVE_COOL_HARDWARE
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 #endif
 
 void wake_up( bool &wakeup)
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index d362132c5..81d1418f8 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -47,10 +47,6 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 
-#if HAVE_COOL_HARDWARE
-#include <coolstream/control.h>
-#endif
-
 #include <config.h>
 
 #include <global.h>