diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java
index 224b9a68df..6181975431 100644
--- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java
+++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java
@@ -28,6 +28,9 @@
 import org.eclipse.californium.core.network.config.NetworkConfig;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.scandium.DTLSConnector;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.Startable;
+import org.eclipse.leshan.core.Stoppable;
 import org.eclipse.leshan.core.californium.CoapResponseCallback;
 import org.eclipse.leshan.core.node.codec.CodecException;
 import org.eclipse.leshan.core.node.codec.LwM2mNodeDecoder;
@@ -44,9 +47,6 @@
 import org.eclipse.leshan.core.response.LwM2mResponse;
 import org.eclipse.leshan.core.response.ResponseCallback;
 import org.eclipse.leshan.core.util.Validate;
-import org.eclipse.leshan.server.Destroyable;
-import org.eclipse.leshan.server.Startable;
-import org.eclipse.leshan.server.Stoppable;
 import org.eclipse.leshan.server.californium.observation.ObservationServiceImpl;
 import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
 import org.eclipse.leshan.server.californium.registration.RegisterResource;
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java
index fa6b21fcbe..69eb9e5551 100644
--- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java
+++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java
@@ -23,13 +23,13 @@
 import org.eclipse.californium.core.network.Endpoint;
 import org.eclipse.californium.core.network.config.NetworkConfig;
 import org.eclipse.californium.core.server.resources.Resource;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.Startable;
+import org.eclipse.leshan.core.Stoppable;
 import org.eclipse.leshan.core.model.LwM2mModel;
 import org.eclipse.leshan.core.node.codec.LwM2mNodeDecoder;
 import org.eclipse.leshan.core.node.codec.LwM2mNodeEncoder;
 import org.eclipse.leshan.core.util.Validate;
-import org.eclipse.leshan.server.Destroyable;
-import org.eclipse.leshan.server.Startable;
-import org.eclipse.leshan.server.Stoppable;
 import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore;
 import org.eclipse.leshan.server.bootstrap.BootstrapHandler;
 import org.eclipse.leshan.server.bootstrap.BootstrapHandlerFactory;
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java
index eb88e18638..d847a1fb92 100644
--- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java
+++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java
@@ -133,8 +133,8 @@ public void onError(Exception e) {
 
     @Override
     public void destroy() {
-        if (delegatedSender instanceof Destroyable) {
-            ((Destroyable) delegatedSender).destroy();
+        if (delegatedSender instanceof org.eclipse.leshan.core.Destroyable) {
+            ((org.eclipse.leshan.core.Destroyable) delegatedSender).destroy();
         }
     }
 }
\ No newline at end of file
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java
index 9f6f5923e7..3366ac9ca7 100644
--- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java
+++ b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java
@@ -15,9 +15,14 @@
  *******************************************************************************/
 package org.eclipse.leshan.server;
 
-public interface Destroyable {
+/**
+ * @deprecated please consider to use {@link org.eclipse.leshan.core.Destroyable} instead. This interface is going to be removed at version 2.0.
+ */
+@Deprecated
+public interface Destroyable extends org.eclipse.leshan.core.Destroyable {
 
     /** Destroy the instances and frees all system resources. */
+    @Override
     void destroy();
 
 }
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java
index fb41866754..a70856ebee 100644
--- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java
+++ b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java
@@ -15,8 +15,13 @@
  *******************************************************************************/
 package org.eclipse.leshan.server;
 
-public interface Startable {
+/**
+ * @deprecated please consider to use {@link org.eclipse.leshan.core.Startable} instead. This interface is going to be removed at version 2.0.
+ */
+@Deprecated
+public interface Startable extends org.eclipse.leshan.core.Startable {
 
+    @Override
     void start();
 
 }
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java
index c4fb7bb779..fc1ca75505 100644
--- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java
+++ b/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java
@@ -15,8 +15,13 @@
  *******************************************************************************/
 package org.eclipse.leshan.server;
 
-public interface Stoppable {
+/**
+ * @deprecated please consider to use {@link org.eclipse.leshan.core.Stoppable} instead. This interface is going to be removed at version 2.0.
+ */
+@Deprecated
+public interface Stoppable extends org.eclipse.leshan.core.Stoppable {
 
+    @Override
     void stop();
 
 }