diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index bf4eb66a3..4b9bb9247 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
index 2d05e02a5..5ef7b4a96 100644
--- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am
+++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \
diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp
index 17997aaf5..a7039798b 100644
--- a/src/nhttpd/yhttpd.cpp
+++ b/src/nhttpd/yhttpd.cpp
@@ -14,12 +14,12 @@
 
 // yhttpd
 #include "yconfig.h"
-#include "ylogging.h"
-#include "ylanguage.h"
-#include "yhook.h"
+#include <ylogging.h>
+#include <ylanguage.h>
+#include <yhook.h>
 
 #ifdef Y_CONFIG_USE_YPARSER
-#include "mod_yparser.h"
+#include <mod_yparser.h>
 static CyParser yParser;
 #endif
 
diff --git a/src/nhttpd/yhttpd.h b/src/nhttpd/yhttpd.h
index 9d4de4f86..eff8a9ac8 100644
--- a/src/nhttpd/yhttpd.h
+++ b/src/nhttpd/yhttpd.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 // yhttpd
 #include "yconfig.h"
-#include "ytypes_globals.h"
-#include "ywebserver.h"
+//#include <ytypes_globals.h>
+#include <ywebserver.h>
 
 //-----------------------------------------------------------------------------
 class Cyhttpd {
diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am
index 3655b0394..ec562ae50 100644
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \
diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp
index 533f0ef36..80bde852b 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -9,8 +9,8 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
-#include "yhttpd.h"
+#include <yconfig.h>
+#include <yhttpd.h>
 #include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"
diff --git a/src/nhttpd/yhttpd_core/ylogging.cpp b/src/nhttpd/yhttpd_core/ylogging.cpp
index fcdac1481..2d93bc9e3 100644
--- a/src/nhttpd/yhttpd_core/ylogging.cpp
+++ b/src/nhttpd/yhttpd_core/ylogging.cpp
@@ -9,7 +9,7 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ylogging.h"
 #include "yconnection.h"
diff --git a/src/nhttpd/yhttpd_core/ylogging.h b/src/nhttpd/yhttpd_core/ylogging.h
index d5a461bfd..b2cf01519 100644
--- a/src/nhttpd/yhttpd_core/ylogging.h
+++ b/src/nhttpd/yhttpd_core/ylogging.h
@@ -8,7 +8,7 @@
 // system
 #include <pthread.h>
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 
 // forward declaration
 class CWebserverConnection;
diff --git a/src/nhttpd/yhttpd_core/yrequest.h b/src/nhttpd/yhttpd_core/yrequest.h
index 65b670ab3..ff1d0e572 100644
--- a/src/nhttpd/yhttpd_core/yrequest.h
+++ b/src/nhttpd/yhttpd_core/yrequest.h
@@ -11,7 +11,7 @@
 #include <map>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 // forward declaration
diff --git a/src/nhttpd/yhttpd_core/ysocket.h b/src/nhttpd/yhttpd_core/ysocket.h
index e6c924709..84fe6f59b 100644
--- a/src/nhttpd/yhttpd_core/ysocket.h
+++ b/src/nhttpd/yhttpd_core/ysocket.h
@@ -13,7 +13,7 @@
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 #ifdef Y_CONFIG_USE_OPEN_SSL
diff --git a/src/nhttpd/yhttpd_core/ywebserver.h b/src/nhttpd/yhttpd_core/ywebserver.h
index 73c5c8b9f..7cb8abbb8 100644
--- a/src/nhttpd/yhttpd_core/ywebserver.h
+++ b/src/nhttpd/yhttpd_core/ywebserver.h
@@ -20,7 +20,7 @@
 #include <arpa/inet.h>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ysocket.h"