diff --git a/modules/platforms/cpp/ignite/common/detail/bytes.h b/modules/platforms/cpp/ignite/common/detail/bytes.h
index 0a479f0..d35ef77 100644
--- a/modules/platforms/cpp/ignite/common/detail/bytes.h
+++ b/modules/platforms/cpp/ignite/common/detail/bytes.h
@@ -66,6 +66,10 @@
 #  define IGNITE_BYTESWAP_32(x) ignite::bytes::swap32(x)
 #  define IGNITE_BYTESWAP_64(x) ignite::bytes::swap64(x)
 # endif
+#else
+# define IGNITE_BYTESWAP_16(x) std::byteswap<std::uint16_t>(x)
+# define IGNITE_BYTESWAP_32(x) std::byteswap<std::uint32_t>(x)
+# define IGNITE_BYTESWAP_64(x) std::byteswap<std::uint64_t>(x)
 #endif
 
 #ifndef IGNITE_BYTESWAP_SPECIFIER
@@ -74,14 +78,20 @@
 
 namespace ignite::detail {
 
+#if IGNITE_STD_ENDIAN
+using endian_underlying_t = std::underlying_type_t<std::endian>;
+#else
+using endian_underlying_t = int;
+#endif
+
 /**
  * Byte order enum.
  */
-enum class endian {
+enum class endian : endian_underlying_t {
 #if IGNITE_STD_ENDIAN
-    LITTLE = std::endian::little,
-    BIG = std::endian::big,
-    NATIVE = std::endian::native,
+    LITTLE = static_cast<endian_underlying_t>(std::endian::little),
+    BIG = static_cast<endian_underlying_t>(std::endian::big),
+    NATIVE = static_cast<endian_underlying_t>(std::endian::native),
 #else
     LITTLE,
     BIG,
diff --git a/modules/platforms/cpp/ignite/common/detail/string_utils.h b/modules/platforms/cpp/ignite/common/detail/string_utils.h
index b0a9394..06a87cd 100644
--- a/modules/platforms/cpp/ignite/common/detail/string_utils.h
+++ b/modules/platforms/cpp/ignite/common/detail/string_utils.h
@@ -25,6 +25,7 @@
 #include <sstream>
 #include <string_view>
 #include <optional>
+#include <limits>
 
 #include <cctype>
 
diff --git a/modules/platforms/cpp/tests/client-test/ignite_client_test.cpp b/modules/platforms/cpp/tests/client-test/ignite_client_test.cpp
index c98e242..2095827 100644
--- a/modules/platforms/cpp/tests/client-test/ignite_client_test.cpp
+++ b/modules/platforms/cpp/tests/client-test/ignite_client_test.cpp
@@ -25,6 +25,7 @@
 #include <gmock/gmock-matchers.h>
 
 #include <chrono>
+#include <thread>
 
 using namespace ignite;
 
diff --git a/modules/platforms/cpp/tests/client-test/transactions_test.cpp b/modules/platforms/cpp/tests/client-test/transactions_test.cpp
index c7fe621..77b0e78 100644
--- a/modules/platforms/cpp/tests/client-test/transactions_test.cpp
+++ b/modules/platforms/cpp/tests/client-test/transactions_test.cpp
@@ -24,6 +24,7 @@
 #include <gtest/gtest.h>
 
 #include <chrono>
+#include <thread>
 
 using namespace ignite;