diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
index 5f61045cc1f..8a770ebe792 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/config.hpp
@@ -108,13 +108,19 @@
 #elif defined(WINVER)
 #define BOOST_USE_WINAPI_VERSION WINVER
 #else
-// By default use Windows 7 API on compilers that support it and Vista or XP on the others
+// By default use Windows 10 API on compilers that support it and latest versions on the others
 #if (defined(_MSC_VER) && _MSC_VER < 1500) || defined(BOOST_WINAPI_IS_MINGW)
 #define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WINXP
 #elif (defined(_MSC_VER) && _MSC_VER < 1600)
 #define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN6
-#else
+#elif (defined(_MSC_VER) && _MSC_VER < 1700)
 #define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN7
+#elif (defined(_MSC_VER) && _MSC_VER < 1800)
+#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN8
+#elif (defined(_MSC_VER) && _MSC_VER < 1900)
+#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WINBLUE
+#else
+#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WIN10
 #endif
 #endif
 #endif
diff --git a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
index d3db4f7339f..0f19658d4ad 100644
--- a/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
+++ b/contrib/restricted/boost/winapi/include/boost/winapi/handles.hpp
@@ -31,7 +31,7 @@ DuplicateHandle(
     boost::winapi::BOOL_ bInheritHandle,
     boost::winapi::DWORD_ dwOptions);
 
-#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10
+#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM)
 BOOST_WINAPI_IMPORT boost::winapi::BOOL_ BOOST_WINAPI_WINAPI_CC
 CompareObjectHandles(
     boost::winapi::HANDLE_ hFirstObjectHandle,
@@ -46,7 +46,7 @@ namespace winapi {
 using ::CloseHandle;
 using ::DuplicateHandle;
 
-#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10
+#if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN10 && (BOOST_WINAPI_PARTITION_APP || BOOST_WINAPI_PARTITION_SYSTEM)
 using ::CompareObjectHandles;
 #endif
 
diff --git a/contrib/restricted/boost/winapi/ya.make b/contrib/restricted/boost/winapi/ya.make
index 1e588dda36a..24616a4ce99 100644
--- a/contrib/restricted/boost/winapi/ya.make
+++ b/contrib/restricted/boost/winapi/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.83.0)
+VERSION(1.84.0)
 
-ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.83.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/winapi/archive/boost-1.84.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/boost/config