diff --git a/examples/Makefile.am b/examples/Makefile.am
index 087aef4b..e3218e7e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@
 if BUILD_EXAMPLES
 
 # picking up the default warning CFLAGS into AM_CFLAGS
-AM_CFLAGS = -isystem$(top_builddir)/include/coap -I$(top_srcdir)/include/coap $(WARNING_CFLAGS) -std=c99
+AM_CFLAGS = -isystem$(top_builddir)/include -I$(top_srcdir)/include $(WARNING_CFLAGS) -std=c99
 
 # etsi_iot_01 and tiny are missing
 bin_PROGRAMS = coap-client coap-server coap-rd
diff --git a/examples/client.c b/examples/client.c
index 86902c7b..c93f2dce 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -23,7 +23,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "coap.h"
+#include <coap/coap.h>
 #include "coap_list.h"
 
 int flags = 0;
diff --git a/examples/coap-rd.c b/examples/coap-rd.c
index 64f156f2..fca8362b 100644
--- a/examples/coap-rd.c
+++ b/examples/coap-rd.c
@@ -34,9 +34,9 @@
 #include <signal.h>
 
 #include "coap_config.h"
-#include "utlist.h"
-#include "resource.h"
-#include "coap.h"
+#include <coap/utlist.h>
+#include <coap/resource.h>
+#include <coap/coap.h>
 
 #define COAP_RESOURCE_CHECK_TIME 2
 
diff --git a/examples/coap-server.c b/examples/coap-server.c
index e5ee36f2..3996ea89 100644
--- a/examples/coap-server.c
+++ b/examples/coap-server.c
@@ -26,8 +26,8 @@
 #include <signal.h>
 
 #include "coap_config.h"
-#include "resource.h"
-#include "coap.h"
+#include <coap/resource.h>
+#include <coap/coap.h>
 
 #define COAP_RESOURCE_CHECK_TIME 2
 
diff --git a/examples/coap_list.c b/examples/coap_list.c
index 06e59168..8fd9970e 100644
--- a/examples/coap_list.c
+++ b/examples/coap_list.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "debug.h"
-#include "mem.h"
+#include <coap/debug.h>
+#include <coap/mem.h>
 #include "coap_list.h"
 
 
diff --git a/examples/coap_list.h b/examples/coap_list.h
index 14a68a30..032007d1 100644
--- a/examples/coap_list.h
+++ b/examples/coap_list.h
@@ -11,7 +11,7 @@
 #ifndef _COAP_LIST_H_
 #define _COAP_LIST_H_
 
-#include "utlist.h"
+#include <coap/utlist.h>
 
 typedef struct coap_list_t {
   struct coap_list_t *next;
diff --git a/libcoap-1.pc.in b/libcoap-1.pc.in
index 8d1f3134..f8c960c1 100644
--- a/libcoap-1.pc.in
+++ b/libcoap-1.pc.in
@@ -8,4 +8,4 @@ Description: C-Implementation of CoAP.
 Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
 Libs: -L${libdir} -lcoap-@LIBCOAP_API_VERSION@
-Cflags: -I${includedir}/coap
+Cflags: -I${includedir}