diff --git a/src/Makefile.am b/src/Makefile.am
index 3f3d13361..08e0db89c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions
 SUBDIRS = zapit gui daemonc driver system sectionsd timerd nhttpd
 
 INCLUDES = \
+	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemons \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/global.h b/src/global.h
index a5daecbd6..8c9b1d5a7 100644
--- a/src/global.h
+++ b/src/global.h
@@ -40,25 +40,25 @@
 #include <sectionsdclient/sectionsdclient.h>
 #include <timerdclient/timerdclient.h>
 
-#include "driver/fontrenderer.h"
-#include "driver/rcinput.h"
-#include "driver/radiotext.h"
+#include <driver/fontrenderer.h>
+#include <driver/rcinput.h>
+#include <driver/radiotext.h>
 #if HAVE_COOL_HARDWARE
-#include "driver/vfd.h"
-#include "driver/rfmod.h"
+#include <driver/vfd.h>
+#include <driver/rfmod.h>
 #endif
 #if HAVE_TRIPLEDRAGON
-#include "driver/lcdd.h"
+#include <driver/lcdd.h>
 #define CVFD CLCD
 #endif
 
-#include "system/localize.h"
-#include "system/settings.h"
+#include <system/localize.h>
+#include <system/settings.h>
 
-#include "gui/epgview.h"
-#include "gui/infoviewer.h"
-#include "gui/eventlist.h"
-#include "gui/videosettings.h"
+#include <gui/epgview.h>
+#include <gui/infoviewer.h>
+#include <gui/eventlist.h>
+#include <gui/videosettings.h>
 
 
 #ifndef NEUTRINO_CPP
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 4899bec4f..38a96f83e 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,6 +1,7 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \