diff --git a/Makefile b/Makefile
index bea9ecea9ea9..920d4773d5ea 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ override CFLAGS += -I$(SERVLIB_DIR)/libService/
 NANOSTACK_DIR := ../nanostack
 override CFLAGS += -I$(NANOSTACK_DIR)/nanostack/
 
-COAP_DIR := ../libcoap
-override CFLAGS += -I$(COAP_DIR)/libcoap
+COAP_DIR := ../mbed-coap
+override CFLAGS += -I$(COAP_DIR)/
 
 
 EVENTLOOP_DIR := ../event-loop
diff --git a/coap-service/coap_service_api.h b/coap-service/coap_service_api.h
index 9924d1f31184..8a9a1fd754cc 100644
--- a/coap-service/coap_service_api.h
+++ b/coap-service/coap_service_api.h
@@ -26,7 +26,7 @@ extern "C" {
 #include <string.h>
 
 #include "ns_types.h"
-#include "sn_coap_header.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "ns_address.h"
 
 /**
diff --git a/source/coap_message_handler.c b/source/coap_message_handler.c
index c4162b8fb110..72c9e86af5b8 100644
--- a/source/coap_message_handler.c
+++ b/source/coap_message_handler.c
@@ -6,7 +6,7 @@
 #include "nsdynmemLIB.h"
 #include "coap_service_api_internal.h"
 #include "coap_message_handler.h"
-#include "sn_coap_protocol.h"
+#include "mbed-coap/sn_coap_protocol.h"
 #include "socket_api.h"
 #include "ns_types.h"
 #include "ns_list.h"
diff --git a/source/coap_service_api.c b/source/coap_service_api.c
index 31b4157c3405..33416151310c 100644
--- a/source/coap_service_api.c
+++ b/source/coap_service_api.c
@@ -10,7 +10,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "sn_coap_header.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "coap_service_api.h"
 #include "coap_message_handler.h"
 #include "eventOS_event.h"
diff --git a/source/include/coap_message_handler.h b/source/include/coap_message_handler.h
index 2ce82bdff4e8..6cd4d8f7d6a9 100644
--- a/source/include/coap_message_handler.h
+++ b/source/include/coap_message_handler.h
@@ -20,7 +20,7 @@
 #define __COAP_MESSAGE_HANDLER_H__
 
 #include <inttypes.h>
-#include "sn_coap_header.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "ns_list.h"
 
 #define TRANSACTION_LIFETIME 180
diff --git a/test/coap-service/unittest/makefile_defines.txt b/test/coap-service/unittest/makefile_defines.txt
index 9f49bf4ba3cd..3e0bc1b91ba9 100755
--- a/test/coap-service/unittest/makefile_defines.txt
+++ b/test/coap-service/unittest/makefile_defines.txt
@@ -15,15 +15,16 @@ INCLUDE_DIRS =\
   ../../../../yotta_modules/nanostack-randlib/mbed-client-randlib/ \
   ../../../../yotta_modules/nanostack-libservice/ \
   ../../../../yotta_modules/nanostack-libservice/mbed-client-libservice/ \
-  ../../../../yotta_modules/libcoap/libcoap/ \
-  ../../../../yotta_modules/libcoap/source/include/ \
+  ../../../../yotta_modules/mbed-coap/ \
+  ../../../../yotta_modules/mbed-coap/source/include/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/nanostack-event-loop/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/source/ \
   ../../../../yotta_modules/mbed-trace/ \
   ../../../../../nanostack/nanostack/\
   ../../../../../libService/libService/\
-  ../../../../../libcoap/libcoap/\
-  ../../../../../libcoap/source/include/\
+  ../../../../../mbed-coap/\
+  ../../../../../mbed-coap/mbed-coap\
+  ../../../../../mbed-coap/source/include/\
   ../../../../../event-loop/nanostack-event-loop/\
   ../../../../../event-loop/source/ \
   ../../../../../mbedtls/include/ \