diff --git a/include/dsn/tool-api/http_server.h b/include/dsn/http/http_server.h
similarity index 100%
rename from include/dsn/tool-api/http_server.h
rename to include/dsn/http/http_server.h
diff --git a/src/http/http_message_parser.cpp b/src/http/http_message_parser.cpp
index c8f0eb69be..3f8b1d863e 100644
--- a/src/http/http_message_parser.cpp
+++ b/src/http/http_message_parser.cpp
@@ -31,7 +31,7 @@
 #include <dsn/tool-api/rpc_message.h>
 #include <dsn/cpp/serialization.h>
 #include <dsn/c/api_layer1.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <iomanip>
 
 namespace dsn {
diff --git a/src/http/http_server.cpp b/src/http/http_server.cpp
index 208be25af6..ed8cf9027d 100644
--- a/src/http/http_server.cpp
+++ b/src/http/http_server.cpp
@@ -2,7 +2,7 @@
 // This source code is licensed under the Apache License Version 2.0, which
 // can be found in the LICENSE file in the root directory of this source tree.
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <dsn/tool_api.h>
 #include <boost/algorithm/string.hpp>
 #include <fmt/ostream.h>
diff --git a/src/http/perf_counter_http_service.h b/src/http/perf_counter_http_service.h
index c8107f6b92..691925a898 100644
--- a/src/http/perf_counter_http_service.h
+++ b/src/http/perf_counter_http_service.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 namespace dsn {
 
diff --git a/src/http/pprof_http_service.h b/src/http/pprof_http_service.h
index 0ebd73c6b2..e881a69fd2 100644
--- a/src/http/pprof_http_service.h
+++ b/src/http/pprof_http_service.h
@@ -6,7 +6,7 @@
 
 #ifdef DSN_ENABLE_GPERF
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 namespace dsn {
 
diff --git a/src/http/root_http_service.h b/src/http/root_http_service.h
index 9b15361616..c7895e0a74 100644
--- a/src/http/root_http_service.h
+++ b/src/http/root_http_service.h
@@ -2,7 +2,7 @@
 // This source code is licensed under the Apache License Version 2.0, which
 // can be found in the LICENSE file in the root directory of this source tree.
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <dsn/utility/output_utils.h>
 #include <string>
 
diff --git a/src/http/server_info_http_services.h b/src/http/server_info_http_services.h
index fc5969d2ba..04e7eede92 100644
--- a/src/http/server_info_http_services.h
+++ b/src/http/server_info_http_services.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 namespace dsn {
 
diff --git a/src/http/test/http_server_test.cpp b/src/http/test/http_server_test.cpp
index 44572a79d5..1d56a338fa 100644
--- a/src/http/test/http_server_test.cpp
+++ b/src/http/test/http_server_test.cpp
@@ -2,7 +2,7 @@
 // This source code is licensed under the Apache License Version 2.0, which
 // can be found in the LICENSE file in the root directory of this source tree.
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <gtest/gtest.h>
 
 #include "http/http_message_parser.h"
diff --git a/src/http/test/perf_counter_http_service_test.cpp b/src/http/test/perf_counter_http_service_test.cpp
index 297da3908b..6dbb788a5e 100644
--- a/src/http/test/perf_counter_http_service_test.cpp
+++ b/src/http/test/perf_counter_http_service_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <dsn/perf_counter/perf_counters.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <http/perf_counter_http_service.h>
 
 namespace dsn {
diff --git a/src/meta/meta_backup_service.cpp b/src/meta/meta_backup_service.cpp
index 45f3112a79..34e5f375bd 100644
--- a/src/meta/meta_backup_service.cpp
+++ b/src/meta/meta_backup_service.cpp
@@ -1,7 +1,7 @@
 #include <dsn/utility/filesystem.h>
 #include <dsn/utility/time_utils.h>
 #include <dsn/utility/output_utils.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 #include "meta_backup_service.h"
 #include "meta_service.h"
diff --git a/src/meta/meta_backup_service.h b/src/meta/meta_backup_service.h
index 0e1bf2e524..c2662a0c12 100644
--- a/src/meta/meta_backup_service.h
+++ b/src/meta/meta_backup_service.h
@@ -6,7 +6,7 @@
 #include <functional>
 
 #include <dsn/dist/block_service.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 
 #include "meta_data.h"
diff --git a/src/meta/meta_http_service.h b/src/meta/meta_http_service.h
index 494f4c976e..209eba147b 100644
--- a/src/meta/meta_http_service.h
+++ b/src/meta/meta_http_service.h
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 namespace dsn {
 namespace replication {
diff --git a/src/meta/meta_service_app.cpp b/src/meta/meta_service_app.cpp
index ae50f7af8a..cb1313dd4d 100644
--- a/src/meta/meta_service_app.cpp
+++ b/src/meta/meta_service_app.cpp
@@ -27,7 +27,7 @@
 #include <dsn/dist/replication.h>
 #include <dsn/utility/factory_store.h>
 #include <dsn/dist/replication/meta_service_app.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 #include "distributed_lock_service_simple.h"
 #include "meta_state_service_simple.h"
diff --git a/src/meta/test/meta_http_service_test.cpp b/src/meta/test/meta_http_service_test.cpp
index 49ecac4129..55fa410cf1 100644
--- a/src/meta/test/meta_http_service_test.cpp
+++ b/src/meta/test/meta_http_service_test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <dsn/dist/fmt_logging.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 #include "meta/meta_http_service.h"
 #include "meta/meta_service.h"
diff --git a/src/replica/replica_http_service.h b/src/replica/replica_http_service.h
index 9c0d5f91d7..8f191e6e0b 100644
--- a/src/replica/replica_http_service.h
+++ b/src/replica/replica_http_service.h
@@ -2,7 +2,7 @@
 // This source code is licensed under the Apache License Version 2.0, which
 // can be found in the LICENSE file in the root directory of this source tree.
 
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 #include "replica_stub.h"
 
diff --git a/src/replica/replication_service_app.cpp b/src/replica/replication_service_app.cpp
index 3858945ecc..90781e6bef 100644
--- a/src/replica/replication_service_app.cpp
+++ b/src/replica/replication_service_app.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <dsn/dist/replication/replication_service_app.h>
-#include <dsn/tool-api/http_server.h>
+#include <dsn/http/http_server.h>
 
 #include "common/replication_common.h"
 #include "http/server_info_http_services.h"