From 8aec2ac03033d1c2b402cd979d8678262241b43d Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Fri, 2 Feb 2018 09:42:05 -0800
Subject: [PATCH] Fix lwm2m header inclusions

---
 os/services/lwm2m/lwm2m-engine.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/os/services/lwm2m/lwm2m-engine.c b/os/services/lwm2m/lwm2m-engine.c
index 3a1682e95..cdd82af89 100644
--- a/os/services/lwm2m/lwm2m-engine.c
+++ b/os/services/lwm2m/lwm2m-engine.c
@@ -53,12 +53,14 @@
 #include "lwm2m-tlv-writer.h"
 #include "lib/list.h"
 #include "sys/cc.h"
-#include "net/ipv6/uip-ds6.h"
-#include "net/routing/routing.h"
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 
+#ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_NAME
+#include "net/ipv6/uip-ds6.h"
+#endif /* LWM2M_ENGINE_CLIENT_ENDPOINT_NAME */
+
 /* Log configuration */
 #include "coap-log.h"
 #define LOG_MODULE "lwm2m-engine"