diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 78fabbb5..dd61da3d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,7 +32,7 @@ repos:
                 types_or: [file]
                 args: ['-fallback-style=none', '-style=file', '-i']
       - repo: https://github.com/cpplint/cpplint
-        rev: 1.6.1
+        rev: 2.0.0
         hooks:
               - id: cpplint
                 name: cpplint
diff --git a/cpp/python/src/exception.cpp b/cpp/python/src/exception.cpp
index f5a8c513..aba183c6 100644
--- a/cpp/python/src/exception.cpp
+++ b/cpp/python/src/exception.cpp
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include <cstdio>
 #include <ios>
 #include <stdexcept>
 
diff --git a/cpp/python/src/worker.cpp b/cpp/python/src/worker.cpp
index b248c73d..772be8e8 100644
--- a/cpp/python/src/worker.cpp
+++ b/cpp/python/src/worker.cpp
@@ -7,6 +7,7 @@
 #include <memory>
 #include <mutex>
 #include <sstream>
+#include <utility>
 
 #include <Python.h>
 
diff --git a/cpp/src/config.cpp b/cpp/src/config.cpp
index ee2e2fa8..25b13598 100644
--- a/cpp/src/config.cpp
+++ b/cpp/src/config.cpp
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include <cstdio>
 #include <sstream>
 #include <string>
 
diff --git a/cpp/src/context.cpp b/cpp/src/context.cpp
index 9482591b..f7cdf8d6 100644
--- a/cpp/src/context.cpp
+++ b/cpp/src/context.cpp
@@ -2,10 +2,12 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include <cstdio>
 #include <cstring>
 #include <iostream>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include <ucxx/context.h>
 #include <ucxx/log.h>
diff --git a/cpp/src/delayed_submission.cpp b/cpp/src/delayed_submission.cpp
index ff7f1ed0..f94c1e2b 100644
--- a/cpp/src/delayed_submission.cpp
+++ b/cpp/src/delayed_submission.cpp
@@ -4,6 +4,7 @@
  */
 #include <memory>
 #include <mutex>
+#include <string>
 #include <utility>
 
 #include <ucp/api/ucp.h>
diff --git a/cpp/src/internal/request_am.cpp b/cpp/src/internal/request_am.cpp
index c08b5f84..d9cb937f 100644
--- a/cpp/src/internal/request_am.cpp
+++ b/cpp/src/internal/request_am.cpp
@@ -8,6 +8,8 @@
 #include <ucxx/request_am.h>
 #include <ucxx/typedefs.h>
 
+#include <memory>
+
 namespace ucxx {
 
 namespace internal {
diff --git a/cpp/src/listener.cpp b/cpp/src/listener.cpp
index 5fbd6292..e2c6fbe0 100644
--- a/cpp/src/listener.cpp
+++ b/cpp/src/listener.cpp
@@ -4,6 +4,7 @@
  */
 #include <memory>
 #include <netinet/in.h>
+#include <string>
 #include <utility>
 
 #include <ucp/api/ucp.h>
@@ -42,7 +43,7 @@ Listener::Listener(std::shared_ptr<Worker> worker,
   ucxx::utils::sockaddr_get_ip_port_str(&attr.sockaddr, ipString, portString, INET6_ADDRSTRLEN);
 
   _ip   = std::string(ipString);
-  _port = (uint16_t)atoi(portString);
+  _port = static_cast<uint16_t>(atoi(portString));
 
   setParent(worker);
 }
diff --git a/cpp/src/memory_handle.cpp b/cpp/src/memory_handle.cpp
index d7376e5c..a57d5b68 100644
--- a/cpp/src/memory_handle.cpp
+++ b/cpp/src/memory_handle.cpp
@@ -45,7 +45,7 @@ MemoryHandle::MemoryHandle(std::shared_ptr<Context> context,
 
   utils::ucsErrorThrow(ucp_mem_query(_handle, &attr));
 
-  _baseAddress = (uint64_t)attr.address;
+  _baseAddress = reinterpret_cast<uint64_t>(attr.address);
   _size        = attr.length;
   _memoryType  = attr.mem_type;
 
diff --git a/cpp/src/remote_key.cpp b/cpp/src/remote_key.cpp
index 768f49fc..72830792 100644
--- a/cpp/src/remote_key.cpp
+++ b/cpp/src/remote_key.cpp
@@ -6,6 +6,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <vector>
 
 #include <ucp/api/ucp.h>
 
@@ -84,7 +85,7 @@ std::shared_ptr<RemoteKey> createRemoteKeyFromSerialized(std::shared_ptr<Endpoin
 
 size_t RemoteKey::getSize() const { return _memorySize; }
 
-uint64_t RemoteKey::getBaseAddress() { return (uint64_t)_memoryBaseAddress; }
+uint64_t RemoteKey::getBaseAddress() { return _memoryBaseAddress; }
 
 ucp_rkey_h RemoteKey::getHandle() { return _remoteKey; }
 
diff --git a/cpp/src/request_am.cpp b/cpp/src/request_am.cpp
index de29de0d..b636d8c6 100644
--- a/cpp/src/request_am.cpp
+++ b/cpp/src/request_am.cpp
@@ -4,9 +4,11 @@
  */
 #include <cstdio>
 #include <memory>
+#include <queue>
 #include <sstream>
 #include <stdexcept>
 #include <string>
+#include <vector>
 
 #include <ucp/api/ucp.h>
 
diff --git a/cpp/src/request_data.cpp b/cpp/src/request_data.cpp
index 9df896bd..8ac18a23 100644
--- a/cpp/src/request_data.cpp
+++ b/cpp/src/request_data.cpp
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <stdexcept>
+#include <vector>
 
 #include <ucp/api/ucp.h>
 
diff --git a/cpp/src/request_stream.cpp b/cpp/src/request_stream.cpp
index 0293c51c..34e2d234 100644
--- a/cpp/src/request_stream.cpp
+++ b/cpp/src/request_stream.cpp
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include <cstdio>
 #include <memory>
 #include <string>
 
diff --git a/cpp/src/request_tag_multi.cpp b/cpp/src/request_tag_multi.cpp
index d0338e9f..fe419fd7 100644
--- a/cpp/src/request_tag_multi.cpp
+++ b/cpp/src/request_tag_multi.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <ucxx/buffer.h>
diff --git a/cpp/src/utils/sockaddr.cpp b/cpp/src/utils/sockaddr.cpp
index fd3d7528..091c6911 100644
--- a/cpp/src/utils/sockaddr.cpp
+++ b/cpp/src/utils/sockaddr.cpp
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <arpa/inet.h>
+#include <cstdio>
+#include <cstring>
 #include <memory>
 #include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <sys/socket.h>
 
 #include <ucxx/exception.h>
diff --git a/cpp/src/worker.cpp b/cpp/src/worker.cpp
index a266493b..ccf612d6 100644
--- a/cpp/src/worker.cpp
+++ b/cpp/src/worker.cpp
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
+#include <cstdio>
 #include <functional>
 #include <ios>
 #include <memory>
diff --git a/cpp/tests/buffer.cpp b/cpp/tests/buffer.cpp
index 7fc50562..abe1473e 100644
--- a/cpp/tests/buffer.cpp
+++ b/cpp/tests/buffer.cpp
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <algorithm>
+#include <memory>
 #include <numeric>
 #include <utility>
 
diff --git a/cpp/tests/context.cpp b/cpp/tests/context.cpp
index ee71ce4b..a9ae8a97 100644
--- a/cpp/tests/context.cpp
+++ b/cpp/tests/context.cpp
@@ -4,6 +4,7 @@
  */
 #include <cstdlib>
 #include <string>
+#include <vector>
 
 #include <gtest/gtest.h>