diff --git a/src/CraneCtld/AccountManager.cpp b/src/CraneCtld/AccountManager.cpp
index 32c78f09d..0f5c3ceaa 100644
--- a/src/CraneCtld/AccountManager.cpp
+++ b/src/CraneCtld/AccountManager.cpp
@@ -18,8 +18,6 @@
 
 #include "AccountManager.h"
 
-#include "crane/Jwt.h"
-#include "crane/PasswordEntry.h"
 #include "protos/PublicDefs.pb.h"
 #include "range/v3/algorithm/contains.hpp"
 
diff --git a/src/CraneCtld/CraneCtld.cpp b/src/CraneCtld/CraneCtld.cpp
index 5d821780a..9f79f6382 100644
--- a/src/CraneCtld/CraneCtld.cpp
+++ b/src/CraneCtld/CraneCtld.cpp
@@ -24,12 +24,11 @@
 #include <yaml-cpp/yaml.h>
 
 #include <cxxopts.hpp>
+#include <filesystem>
 
 #include "AccountManager.h"
 #include "CranedKeeper.h"
 #include "CranedMetaContainer.h"
-#include "CtldForCforedServer.h"
-#include "CtldForCranedServer.h"
 #include "CtldGrpcServer.h"
 #include "CtldPublicDefs.h"
 #include "DbClient.h"
diff --git a/src/CraneCtld/CtldPublicDefs.h b/src/CraneCtld/CtldPublicDefs.h
index d5fd207f4..37d26a3cc 100644
--- a/src/CraneCtld/CtldPublicDefs.h
+++ b/src/CraneCtld/CtldPublicDefs.h
@@ -21,8 +21,6 @@
 #include "CtldPreCompiledHeader.h"
 // Precompiled header come first!
 
-#include "crane/GrpcHelper.h"
-
 namespace Ctld {
 
 using moodycamel::ConcurrentQueue;
diff --git a/src/CraneCtld/RpcService/CMakeLists.txt b/src/CraneCtld/RpcService/CMakeLists.txt
index 57f30e599..c0616db85 100644
--- a/src/CraneCtld/RpcService/CMakeLists.txt
+++ b/src/CraneCtld/RpcService/CMakeLists.txt
@@ -21,8 +21,6 @@ target_link_libraries(RpcService PUBLIC
         Utility_PublicHeader
         Utility_PluginClient
 
-        dev_event_core
-        dev_event_pthreads
         uvw
 
         cxxopts
diff --git a/src/CraneCtld/RpcService/CranedKeeper.cpp b/src/CraneCtld/RpcService/CranedKeeper.cpp
index 69d0a8761..db90aaa67 100644
--- a/src/CraneCtld/RpcService/CranedKeeper.cpp
+++ b/src/CraneCtld/RpcService/CranedKeeper.cpp
@@ -18,8 +18,6 @@
 
 #include "CranedKeeper.h"
 
-#include <google/protobuf/util/time_util.h>
-
 namespace Ctld {
 
 using grpc::ClientContext;
diff --git a/src/Craned/Craned.cpp b/src/Craned/Craned.cpp
index fd767b1b2..dc1b85154 100644
--- a/src/Craned/Craned.cpp
+++ b/src/Craned/Craned.cpp
@@ -29,8 +29,7 @@
 #include "CforedClient.h"
 #include "CranedServer.h"
 #include "CtldClient.h"
-#include "crane/Network.h"
-#include "crane/OS.h"
+#include "DeviceManager.h"
 #include "crane/PluginClient.h"
 #include "crane/String.h"
 
diff --git a/src/Craned/CranedServer.cpp b/src/Craned/CranedServer.cpp
index a9785defb..9c26eaa6a 100644
--- a/src/Craned/CranedServer.cpp
+++ b/src/Craned/CranedServer.cpp
@@ -20,8 +20,7 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include "CranedPublicDefs.h"
-#include "CtldClient.h"
+#include "TaskManager.h"
 
 namespace Craned {