diff --git a/cmake/common.cmake b/cmake/common.cmake
index edb3449361..4a1537306a 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -215,6 +215,11 @@ function(_ydb_sdk_validate_public_headers)
     )
   endforeach()
 
+  list(REMOVE_ITEM allHeaders
+    library/cpp/threading/future/core/future-inl.h
+    library/cpp/threading/future/wait/wait-inl.h
+    library/cpp/yt/misc/guid-inl.h
+  )
   list(TRANSFORM allHeaders PREPEND "#include <")
   list(TRANSFORM allHeaders APPEND ">")
   list(JOIN allHeaders "\n" fileContent)
diff --git a/cmake/public_headers.txt b/cmake/public_headers.txt
index a76055b478..8ad6b1b488 100644
--- a/cmake/public_headers.txt
+++ b/cmake/public_headers.txt
@@ -1,3 +1,4 @@
+contrib/libs/libc_compat/string.h
 library/cpp/cgiparam/cgiparam.h
 library/cpp/containers/stack_vector/stack_vec.h
 library/cpp/coroutine/listener/listen.h
@@ -22,11 +23,18 @@ library/cpp/json/writer/json.h
 library/cpp/json/writer/json_value.h
 library/cpp/json/json_reader.h
 library/cpp/json/json_value.h
+library/cpp/logger/all.h
 library/cpp/logger/backend.h
 library/cpp/logger/element.h
+library/cpp/logger/file.h
 library/cpp/logger/log.h
+library/cpp/logger/null.h
 library/cpp/logger/priority.h
 library/cpp/logger/record.h
+library/cpp/logger/reopen.h
+library/cpp/logger/stream.h
+library/cpp/logger/sync_page_cache_file.h
+library/cpp/logger/system.h
 library/cpp/logger/thread.h
 library/cpp/mime/types/mime.h
 library/cpp/monlib/counters/counters.h
@@ -54,49 +62,79 @@ library/cpp/resource/resource.h
 library/cpp/threading/future/core/future-inl.h
 library/cpp/threading/future/core/future.h
 library/cpp/threading/future/core/fwd.h
+library/cpp/threading/future/wait/fwd.h
 library/cpp/threading/future/wait/wait-inl.h
 library/cpp/threading/future/wait/wait.h
 library/cpp/threading/future/wait/wait_group-inl.h
 library/cpp/threading/future/wait/wait_group.h
+library/cpp/threading/future/wait/wait_policy.h
 library/cpp/threading/future/future.h
 library/cpp/threading/future/fwd.h
+library/cpp/threading/light_rw_lock/lightrwlock.h
 library/cpp/yson/consumer.h
 library/cpp/yson/public.h
 library/cpp/yson/token.h
 library/cpp/yson/writer.h
+library/cpp/yt/exception/attributes.h
 library/cpp/yt/exception/exception.h
 library/cpp/yt/misc/enum-inl.h
 library/cpp/yt/misc/enum.h
+library/cpp/yt/misc/guid-inl.h
+library/cpp/yt/misc/guid.h
 library/cpp/yt/misc/preprocessor-gen.h
 library/cpp/yt/misc/preprocessor.h
 library/cpp/yt/yson/consumer.h
 library/cpp/yt/yson/public.h
 library/cpp/yt/yson_string/public.h
+util/charset/unidata.h
+util/charset/unicode_table.h
 util/datetime/base.h
 util/datetime/systime.h
 util/digest/multi.h
 util/digest/numeric.h
 util/digest/sequence.h
+util/folder/fwd.h
+util/folder/path.h
+util/folder/pathsplit.h
 util/generic/algorithm.h
 util/generic/array_size.h
+util/generic/array_ref.h
+util/generic/bitops.h
 util/generic/bt_exception.h
 util/generic/cast.h
+util/generic/deque.h
+util/generic/explicit_type.h
 util/generic/flags.h
 util/generic/function.h
 util/generic/fwd.h
+util/generic/hash_primes.h
+util/generic/hash_table.h
+util/generic/hash.h
+util/generic/intrlist.h
 util/generic/is_in.h
 util/generic/iterator_range.h
+util/generic/list.h
+util/generic/map.h
+util/generic/mapfindptr.h
+util/generic/maybe_traits.h
+util/generic/maybe.h
+util/generic/mem_copy.h
 util/generic/noncopyable.h
 util/generic/ptr.h
 util/generic/refcount.h
+util/generic/reserve.h
 util/generic/singleton.h
 util/generic/size_literals.h
 util/generic/store_policy.h
+util/generic/strbase.h
+util/generic/strbuf.h
 util/generic/string_hash.h
+util/generic/string.h
 util/generic/typelist.h
 util/generic/typetraits.h
 util/generic/utility.h
 util/generic/va_args.h
+util/generic/vector.h
 util/generic/xrange.h
 util/generic/yexception.h
 util/generic/ylimits.h
@@ -113,6 +151,7 @@ util/random/random.h
 util/stream/debug.h
 util/stream/fwd.h
 util/stream/input.h
+util/stream/labeled.h
 util/stream/mem.h
 util/stream/output.h
 util/stream/str.h
@@ -123,24 +162,32 @@ util/string/ascii.h
 util/string/builder.h
 util/string/cast.h
 util/string/escape.h
+util/string/printf.h
 util/string/strip.h
 util/string/subst.h
+util/string/util.h
+util/system/align.h
 util/system/atexit.h
 util/system/backtrace.h
 util/system/byteorder.h
 util/system/compat.h
 util/system/compiler.h
+util/system/datetime.h
 util/system/defaults.h
 util/system/error.h
 util/system/event.h
 util/system/fhandle.h
 util/system/file.h
 util/system/flock.h
+util/system/fstat.h
 util/system/guard.h
 util/system/maxlen.h
+util/system/mutex.h
 util/system/platform.h
 util/system/progname.h
 util/system/rwlock.h
+util/system/sanitizers.h
+util/system/sem.h
 util/system/spin_wait.h
 util/system/spinlock.h
 util/system/src_location.h
@@ -153,6 +200,7 @@ util/system/win_undef.h
 util/system/winint.h
 util/system/yassert.h
 util/thread/factory.h
+util/thread/fwd.h
 util/thread/pool.h
 util/str_stl.h
 util/ysaveload.h
\ No newline at end of file
diff --git a/library/cpp/monlib/service/pages/index_mon_page.h b/library/cpp/monlib/service/pages/index_mon_page.h
index 0aaf826d46..59e1caf068 100644
--- a/library/cpp/monlib/service/pages/index_mon_page.h
+++ b/library/cpp/monlib/service/pages/index_mon_page.h
@@ -4,6 +4,9 @@
 
 #include <list>
 
+#include <util/generic/hash.h>
+#include <util/system/mutex.h>
+
 namespace NMonitoring {
     struct TIndexMonPage: public IMonPage {
         TMutex Mtx;
diff --git a/library/cpp/monlib/service/service.h b/library/cpp/monlib/service/service.h
index 977b5c14c6..dae66cad8a 100644
--- a/library/cpp/monlib/service/service.h
+++ b/library/cpp/monlib/service/service.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <library/cpp/coroutine/engine/impl.h>
 #include <library/cpp/coroutine/listener/listen.h>
 #include <library/cpp/http/fetch/httpheader.h>
 #include <library/cpp/http/server/http.h>