intermediate changes

ref:ef90b2b7f42604225d9ae8f4f0af73614761b65f

48 files changed, 56 insertions, 43 deletions

diff --git a/library/cpp/actors/core/actor_ut.cpp b/library/cpp/actors/core/actor_ut.cpp
index 6259c79919..a6752f7d4f 100644
--- a/library/cpp/actors/core/actor_ut.cpp
+++ b/library/cpp/actors/core/actor_ut.cpp
@@ -10,7 +10,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <util/generic/algorithm.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/rwlock.h>
 #include <util/system/hp_timer.h>
 
diff --git a/library/cpp/actors/interconnect/ut_fat/main.cpp b/library/cpp/actors/interconnect/ut_fat/main.cpp
index 5d19bc3003..c9c77300bb 100644
--- a/library/cpp/actors/interconnect/ut_fat/main.cpp
+++ b/library/cpp/actors/interconnect/ut_fat/main.cpp
@@ -12,7 +12,7 @@
 
 #include <util/network/sock.h>
 #include <util/network/poller.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/set.h>
 
 Y_UNIT_TEST_SUITE(InterconnectUnstableConnection) {
diff --git a/library/cpp/actors/memory_log/memlog.cpp b/library/cpp/actors/memory_log/memlog.cpp
index 8e6b46727d..17a52847d7 100644
--- a/library/cpp/actors/memory_log/memlog.cpp
+++ b/library/cpp/actors/memory_log/memlog.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/actors/util/datetime.h>
 
 #include <util/system/info.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/align.h>
 
 #include <contrib/libs/linuxvdso/interface.h>
diff --git a/library/cpp/actors/memory_log/memlog.h b/library/cpp/actors/memory_log/memlog.h
index 2aa27272a6..bf4e115c49 100644
--- a/library/cpp/actors/memory_log/memlog.h
+++ b/library/cpp/actors/memory_log/memlog.h
@@ -6,7 +6,7 @@
 #include <util/system/datetime.h>
 #include <util/system/thread.h>
 #include <util/system/types.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/align.h>
 #include <util/system/tls.h>
 
diff --git a/library/cpp/actors/util/defs.h b/library/cpp/actors/util/defs.h
index 5c3b57665b..70f969753e 100644
--- a/library/cpp/actors/util/defs.h
+++ b/library/cpp/actors/util/defs.h
@@ -8,7 +8,7 @@
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
 #include <util/generic/yexception.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/align.h>
 #include <util/generic/vector.h>
 #include <util/datetime/base.h>
diff --git a/library/cpp/actors/util/funnel_queue.h b/library/cpp/actors/util/funnel_queue.h
index 0e21e2617c..15af57b121 100644
--- a/library/cpp/actors/util/funnel_queue.h
+++ b/library/cpp/actors/util/funnel_queue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/noncopyable.h>
 
 template <typename ElementType>
diff --git a/library/cpp/actors/util/intrinsics.h b/library/cpp/actors/util/intrinsics.h
index df07e36896..c02b633b70 100644
--- a/library/cpp/actors/util/intrinsics.h
+++ b/library/cpp/actors/util/intrinsics.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/system/defaults.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/spinlock.h>
 
 #include <library/cpp/sse/sse.h> // The header chooses appropriate SSE support
diff --git a/library/cpp/deprecated/atomic/Readme.md b/library/cpp/deprecated/atomic/Readme.md
new file mode 100644
index 0000000000..41ae8f7662
--- /dev/null
+++ b/library/cpp/deprecated/atomic/Readme.md
@@ -0,0 +1 @@
+Just use std::atomic please.
diff --git a/library/cpp/deprecated/atomic/atomic.h b/library/cpp/deprecated/atomic/atomic.h
new file mode 100644
index 0000000000..d104ff834d
--- /dev/null
+++ b/library/cpp/deprecated/atomic/atomic.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <util/system/atomic.h>
diff --git a/library/cpp/deprecated/atomic/atomic_gcc.h b/library/cpp/deprecated/atomic/atomic_gcc.h
new file mode 100644
index 0000000000..db332d2584
--- /dev/null
+++ b/library/cpp/deprecated/atomic/atomic_gcc.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <util/system/atomic_gcc.h>
diff --git a/library/cpp/deprecated/atomic/atomic_ops.h b/library/cpp/deprecated/atomic/atomic_ops.h
new file mode 100644
index 0000000000..20df90003b
--- /dev/null
+++ b/library/cpp/deprecated/atomic/atomic_ops.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <util/system/atomic_ops.h>
diff --git a/library/cpp/deprecated/atomic/atomic_win.h b/library/cpp/deprecated/atomic/atomic_win.h
new file mode 100644
index 0000000000..0b787a0014
--- /dev/null
+++ b/library/cpp/deprecated/atomic/atomic_win.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <util/system/atomic_win.h>
diff --git a/library/cpp/http/server/http.cpp b/library/cpp/http/server/http.cpp
index 128583bdd7..05daf90054 100644
--- a/library/cpp/http/server/http.cpp
+++ b/library/cpp/http/server/http.cpp
@@ -10,7 +10,7 @@
 #include <util/network/address.h>
 #include <util/network/socket.h>
 #include <util/network/poller.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/compat.h> // stricmp, strnicmp, strlwr, strupr, stpcpy
 #include <util/system/defaults.h>
 #include <util/system/event.h>
diff --git a/library/cpp/http/server/http.h b/library/cpp/http/server/http.h
index b292d38f27..1271232cf5 100644
--- a/library/cpp/http/server/http.h
+++ b/library/cpp/http/server/http.h
@@ -8,7 +8,7 @@
 #include <util/memory/blob.h>
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 class IThreadFactory;
 class TClientRequest;
diff --git a/library/cpp/lfalloc/lf_allocX64.h b/library/cpp/lfalloc/lf_allocX64.h
index c9150b99ba..b962fdf30b 100644
--- a/library/cpp/lfalloc/lf_allocX64.h
+++ b/library/cpp/lfalloc/lf_allocX64.h
@@ -59,7 +59,7 @@ static inline long AtomicSub(TAtomic& a, long b) {
 #else
 
 #include <util/system/defaults.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/yassert.h>
 
 #if !defined(NDEBUG) && !defined(__GCCXML__)
diff --git a/library/cpp/logger/rotating_file.cpp b/library/cpp/logger/rotating_file.cpp
index a62f48f25d..4fe1daf4b7 100644
--- a/library/cpp/logger/rotating_file.cpp
+++ b/library/cpp/logger/rotating_file.cpp
@@ -6,7 +6,7 @@
 #include <util/system/fstat.h>
 #include <util/system/rwlock.h>
 #include <util/system/fs.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/string.h>
 
 /*
diff --git a/library/cpp/lwtrace/log.h b/library/cpp/lwtrace/log.h
index 56981a97f8..ddf85d9916 100644
--- a/library/cpp/lwtrace/log.h
+++ b/library/cpp/lwtrace/log.h
@@ -8,7 +8,7 @@
 #include <util/generic/noncopyable.h>
 #include <util/generic/vector.h>
 #include <util/string/printf.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/hp_timer.h>
 #include <util/system/mutex.h>
 #include <util/system/spinlock.h>
diff --git a/library/cpp/lwtrace/probe.h b/library/cpp/lwtrace/probe.h
index 31fa282da3..9117ab00b4 100644
--- a/library/cpp/lwtrace/probe.h
+++ b/library/cpp/lwtrace/probe.h
@@ -8,7 +8,7 @@
 #include <util/datetime/cputimer.h>
 #include <util/generic/hide_ptr.h>
 #include <util/generic/scope.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace NLWTrace {
     // Represents a chain (linked list) of steps for execution of a trace query block
diff --git a/library/cpp/messagebus/actor/tasks.h b/library/cpp/messagebus/actor/tasks.h
index 31d35931d2..5e1fd5f212 100644
--- a/library/cpp/messagebus/actor/tasks.h
+++ b/library/cpp/messagebus/actor/tasks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/yassert.h>
 
 namespace NActor {
diff --git a/library/cpp/messagebus/cc_semaphore_ut.cpp b/library/cpp/messagebus/cc_semaphore_ut.cpp
index 206bb7c96a..24c6ec0400 100644
--- a/library/cpp/messagebus/cc_semaphore_ut.cpp
+++ b/library/cpp/messagebus/cc_semaphore_ut.cpp
@@ -2,7 +2,7 @@
 
 #include "cc_semaphore.h"
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace {
     struct TTestSemaphore: public TComplexConditionSemaphore<TTestSemaphore> {
diff --git a/library/cpp/messagebus/local_tasks.h b/library/cpp/messagebus/local_tasks.h
index d8e801a457..6259aa477f 100644
--- a/library/cpp/messagebus/local_tasks.h
+++ b/library/cpp/messagebus/local_tasks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 class TLocalTasks {
 private:
diff --git a/library/cpp/messagebus/message.cpp b/library/cpp/messagebus/message.cpp
index bfa7ed8e9b..20784860f3 100644
--- a/library/cpp/messagebus/message.cpp
+++ b/library/cpp/messagebus/message.cpp
@@ -3,7 +3,7 @@
 
 #include <util/random/random.h>
 #include <util/string/printf.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 #include <string.h>
 
diff --git a/library/cpp/messagebus/misc/atomic_box.h b/library/cpp/messagebus/misc/atomic_box.h
index 401621f933..6eb55da54e 100644
--- a/library/cpp/messagebus/misc/atomic_box.h
+++ b/library/cpp/messagebus/misc/atomic_box.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 // TAtomic with human interface
 template <typename T>
diff --git a/library/cpp/messagebus/misc/tokenquota.h b/library/cpp/messagebus/misc/tokenquota.h
index 190547fa54..f4ca8873c1 100644
--- a/library/cpp/messagebus/misc/tokenquota.h
+++ b/library/cpp/messagebus/misc/tokenquota.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace NBus {
     /* Consumer and feeder quota model impl.
diff --git a/library/cpp/messagebus/remote_client_session_semaphore.h b/library/cpp/messagebus/remote_client_session_semaphore.h
index 286ca3c86f..b25e5e6aab 100644
--- a/library/cpp/messagebus/remote_client_session_semaphore.h
+++ b/library/cpp/messagebus/remote_client_session_semaphore.h
@@ -3,7 +3,7 @@
 #include "cc_semaphore.h"
 
 #include <util/generic/noncopyable.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
diff --git a/library/cpp/messagebus/remote_connection.cpp b/library/cpp/messagebus/remote_connection.cpp
index 22932569db..740a7f6f8e 100644
--- a/library/cpp/messagebus/remote_connection.cpp
+++ b/library/cpp/messagebus/remote_connection.cpp
@@ -12,7 +12,7 @@
 
 #include <util/generic/cast.h>
 #include <util/network/init.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 LWTRACE_USING(LWTRACE_MESSAGEBUS_PROVIDER)
 
diff --git a/library/cpp/messagebus/remote_connection.h b/library/cpp/messagebus/remote_connection.h
index 4538947368..ec74ed2b76 100644
--- a/library/cpp/messagebus/remote_connection.h
+++ b/library/cpp/messagebus/remote_connection.h
@@ -22,7 +22,7 @@
 #include <library/cpp/messagebus/actor/queue_in_actor.h>
 #include <library/cpp/messagebus/scheduler/scheduler.h>
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/event.h>
 #include <util/thread/lfstack.h>
 
diff --git a/library/cpp/messagebus/scheduler/scheduler.h b/library/cpp/messagebus/scheduler/scheduler.h
index afcc0de55d..d30b174725 100644
--- a/library/cpp/messagebus/scheduler/scheduler.h
+++ b/library/cpp/messagebus/scheduler/scheduler.h
@@ -6,7 +6,7 @@
 #include <util/generic/object_counter.h>
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/mutex.h>
 #include <util/system/thread.h>
diff --git a/library/cpp/messagebus/session_job_count.h b/library/cpp/messagebus/session_job_count.h
index 23aca618b1..8163ad8a38 100644
--- a/library/cpp/messagebus/session_job_count.h
+++ b/library/cpp/messagebus/session_job_count.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/mutex.h>
 
diff --git a/library/cpp/messagebus/test/helper/alloc_counter.h b/library/cpp/messagebus/test/helper/alloc_counter.h
index ec9041cb15..7c4010714f 100644
--- a/library/cpp/messagebus/test/helper/alloc_counter.h
+++ b/library/cpp/messagebus/test/helper/alloc_counter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/generic/noncopyable.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/yassert.h>
 
 class TAllocCounter : TNonCopyable {
diff --git a/library/cpp/messagebus/test/ut/count_down_latch.h b/library/cpp/messagebus/test/ut/count_down_latch.h
index 5117db5731..c0f15256b7 100644
--- a/library/cpp/messagebus/test/ut/count_down_latch.h
+++ b/library/cpp/messagebus/test/ut/count_down_latch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/event.h>
 
 class TCountDownLatch {
diff --git a/library/cpp/messagebus/ybus.h b/library/cpp/messagebus/ybus.h
index de21ad8521..a1e6137a5e 100644
--- a/library/cpp/messagebus/ybus.h
+++ b/library/cpp/messagebus/ybus.h
@@ -28,7 +28,7 @@
 #include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
 #include <util/stream/input.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/type_name.h>
 #include <util/system/event.h>
diff --git a/library/cpp/monlib/counters/counters.h b/library/cpp/monlib/counters/counters.h
index 038b55f0c8..4f5eba4fc3 100644
--- a/library/cpp/monlib/counters/counters.h
+++ b/library/cpp/monlib/counters/counters.h
@@ -10,7 +10,7 @@
 #include <util/str_stl.h>
 #include <util/stream/output.h>
 #include <util/string/util.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/defaults.h>
 #include <util/system/guard.h>
 #include <util/system/sem.h>
diff --git a/library/cpp/monlib/counters/meter.h b/library/cpp/monlib/counters/meter.h
index 1219f95c4d..12c10b4ca6 100644
--- a/library/cpp/monlib/counters/meter.h
+++ b/library/cpp/monlib/counters/meter.h
@@ -2,7 +2,7 @@
 
 #include <util/system/types.h>
 #include <util/generic/noncopyable.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 #include <chrono>
 #include <cstdlib>
diff --git a/library/cpp/sighandler/async_signals_handler.cpp b/library/cpp/sighandler/async_signals_handler.cpp
index 13f9931e74..73c66a14dd 100644
--- a/library/cpp/sighandler/async_signals_handler.cpp
+++ b/library/cpp/sighandler/async_signals_handler.cpp
@@ -15,7 +15,7 @@
 #include <dlfcn.h>
 #endif
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/defaults.h>
 #include <util/system/event.h>
 #include <util/system/rwlock.h>
diff --git a/library/cpp/threading/atomic/bool.h b/library/cpp/threading/atomic/bool.h
index d52544e762..6e336280ed 100644
--- a/library/cpp/threading/atomic/bool.h
+++ b/library/cpp/threading/atomic/bool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace NAtomic {
     class TBool {
diff --git a/library/cpp/threading/chunk_queue/queue.h b/library/cpp/threading/chunk_queue/queue.h
index 55859601a1..feee776b87 100644
--- a/library/cpp/threading/chunk_queue/queue.h
+++ b/library/cpp/threading/chunk_queue/queue.h
@@ -6,7 +6,7 @@
 #include <util/generic/typetraits.h>
 #include <util/generic/vector.h>
 #include <util/generic/ylimits.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/guard.h>
 #include <util/system/spinlock.h>
 #include <util/system/yassert.h>
diff --git a/library/cpp/threading/equeue/equeue.h b/library/cpp/threading/equeue/equeue.h
index 40dd342585..c61b9f7b85 100644
--- a/library/cpp/threading/equeue/equeue.h
+++ b/library/cpp/threading/equeue/equeue.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <util/thread/pool.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/ptr.h>
 
 //actual queue limit will be (maxQueueSize - numBusyThreads) or 0
diff --git a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
index e82063d959..84ac04599d 100644
--- a/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
+++ b/library/cpp/threading/light_rw_lock/ut/rwlock_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/threading/light_rw_lock/lightrwlock.h>
 #include <library/cpp/testing/unittest/registar.h>
 #include <util/random/random.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/thread/pool.h>
 
 class TRWMutexTest: public TTestBase {
diff --git a/library/cpp/threading/local_executor/local_executor.cpp b/library/cpp/threading/local_executor/local_executor.cpp
index 1d3fbb4bf4..1440a3a67a 100644
--- a/library/cpp/threading/local_executor/local_executor.cpp
+++ b/library/cpp/threading/local_executor/local_executor.cpp
@@ -3,7 +3,7 @@
 #include <library/cpp/threading/future/future.h>
 
 #include <util/generic/utility.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/event.h>
 #include <util/system/thread.h>
 #include <util/system/tls.h>
diff --git a/library/cpp/threading/poor_man_openmp/thread_helper.h b/library/cpp/threading/poor_man_openmp/thread_helper.h
index 0ecee0590b..bd5c428a14 100644
--- a/library/cpp/threading/poor_man_openmp/thread_helper.h
+++ b/library/cpp/threading/poor_man_openmp/thread_helper.h
@@ -4,7 +4,7 @@
 #include <util/generic/utility.h>
 #include <util/generic/yexception.h>
 #include <util/system/info.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/condvar.h>
 #include <util/system/mutex.h>
 #include <util/stream/output.h>
diff --git a/library/cpp/threading/queue/mpmc_unordered_ring.h b/library/cpp/threading/queue/mpmc_unordered_ring.h
index 5042f7528e..d776240efc 100644
--- a/library/cpp/threading/queue/mpmc_unordered_ring.h
+++ b/library/cpp/threading/queue/mpmc_unordered_ring.h
@@ -8,7 +8,7 @@
   Almost wait-free for producers and consumers.
  */
 
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/ptr.h>
 
 namespace NThreading {
diff --git a/library/cpp/threading/queue/mpsc_htswap.h b/library/cpp/threading/queue/mpsc_htswap.h
index c42caa7ac0..cd9ede903d 100644
--- a/library/cpp/threading/queue/mpsc_htswap.h
+++ b/library/cpp/threading/queue/mpsc_htswap.h
@@ -20,7 +20,7 @@
 
 #include <util/generic/noncopyable.h>
 #include <util/system/types.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 #include "tune.h"
 
diff --git a/library/cpp/threading/queue/mpsc_intrusive_unordered.cpp b/library/cpp/threading/queue/mpsc_intrusive_unordered.cpp
index 3bb1a04f7e..4f49bf4c4a 100644
--- a/library/cpp/threading/queue/mpsc_intrusive_unordered.cpp
+++ b/library/cpp/threading/queue/mpsc_intrusive_unordered.cpp
@@ -1,5 +1,5 @@
 #include "mpsc_intrusive_unordered.h"
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace NThreading {
     void TMPSCIntrusiveUnordered::Push(TIntrusiveNode* node) noexcept {
diff --git a/library/cpp/threading/queue/mpsc_read_as_filled.h b/library/cpp/threading/queue/mpsc_read_as_filled.h
index be33ba5a58..e2fcc5a4ad 100644
--- a/library/cpp/threading/queue/mpsc_read_as_filled.h
+++ b/library/cpp/threading/queue/mpsc_read_as_filled.h
@@ -40,7 +40,7 @@
 
 #include <util/generic/deque.h>
 #include <util/generic/ptr.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/spinlock.h>
 
 #include "tune.h"
diff --git a/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h b/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h
index 5f91f1b5a8..69b2680e82 100644
--- a/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h
+++ b/library/cpp/threading/queue/mpsc_vinfarr_obstructive.h
@@ -39,7 +39,7 @@
 
 #include <util/generic/noncopyable.h>
 #include <util/generic/ptr.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/system/spinlock.h>
 
 #include "tune.h"
diff --git a/library/cpp/threading/skip_list/skiplist.h b/library/cpp/threading/skip_list/skiplist.h
index 914a7c6ee7..f60c7cc97c 100644
--- a/library/cpp/threading/skip_list/skiplist.h
+++ b/library/cpp/threading/skip_list/skiplist.h
@@ -7,7 +7,7 @@
 #include <util/generic/typetraits.h>
 #include <util/memory/pool.h>
 #include <util/random/random.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 
 namespace NThreading {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
index 3b5203194a..637f5d6285 100644
--- a/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
+++ b/library/cpp/threading/task_scheduler/task_scheduler_ut.cpp
@@ -2,7 +2,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <util/stream/output.h>
-#include <util/system/atomic.h>
+#include <library/cpp/deprecated/atomic/atomic.h>
 #include <util/generic/vector.h>
 
 #include "task_scheduler.h"