diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
index 10eeb2869d..7a8d269b0c 100644
--- a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
+++ b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
@@ -46,7 +46,9 @@
 #include "NwGtpv1uLog.h"
 
 #include "gtpv1u.h"
+#if defined(ENB_MODE)
 #include "UTIL/LOG/log.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -377,7 +379,7 @@ nwGtpv1uDestroyTunnelEndPoint( NwGtpv1uStackT *thiz,
     NwGtpv1uTunnelEndPointT *pRemovedTeid;
 
     if(pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle) {
-        LOG_D(GTPU,  "Destroying Tunnel end-point '%x'",
+        GTPU_DEBUG(  "Destroying Tunnel end-point '%x'",
                pUlpReq->apiInfo.destroyTunnelEndPointInfo.hStackSessionHandle);
         pRemovedTeid = RB_REMOVE(NwGtpv1uTunnelEndPointIdentifierMap, &(thiz->teidMap),
                                  (NwGtpv1uTunnelEndPointT *)(
diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
index cc7c723325..a5e8bff3ef 100644
--- a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
+++ b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
@@ -44,7 +44,9 @@
 #include "NwGtpv1uMsg.h"
 
 #include "gtpv1u.h"
+#if defined(ENB_MODE)
 #include "UTIL/LOG/log.h"
+#endif
 
 #define NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE                             (12)   /**< Size of GTPv1u EPC specific header */
 #define NW_GTPV1U_EPC_MIN_HEADER_SIZE                                  (8)