diff --git a/include/mscclpp/poll.hpp b/include/mscclpp/poll.hpp
index d7e52f0d..fa7bd18c 100644
--- a/include/mscclpp/poll.hpp
+++ b/include/mscclpp/poll.hpp
@@ -6,6 +6,8 @@
 
 #ifdef __CUDACC__
 
+#include <cstdint>
+
 extern "C" __device__ void __assert_fail(const char *__assertion, const char *__file, unsigned int __line,
                                          const char *__function) __THROW;
 
diff --git a/python/test/common.hpp b/python/test/common.hpp
deleted file mode 100644
index 1045073b..00000000
--- a/python/test/common.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-typedef unsigned long long uint64_t;
-typedef unsigned long long uintptr_t;
-typedef unsigned int uint32_t;
-typedef unsigned short uint16_t;
diff --git a/python/test/d2d_semaphore_test.cu b/python/test/d2d_semaphore_test.cu
index e6d8e942..04b945e3 100644
--- a/python/test/d2d_semaphore_test.cu
+++ b/python/test/d2d_semaphore_test.cu
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
 #include <mscclpp/semaphore_device.hpp>
 
 // be careful about using semaphore[my_rank] as it is an invalid semaphore and it is there just for simplicity of
diff --git a/python/test/fifo_test.cu b/python/test/fifo_test.cu
index 31c8ae3b..defee7b1 100644
--- a/python/test/fifo_test.cu
+++ b/python/test/fifo_test.cu
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
-#include "mscclpp/fifo_device.hpp"
+#include <mscclpp/fifo_device.hpp>
 
 extern "C" __global__ void __launch_bounds__(1024, 1) fifo(mscclpp::FifoDeviceHandle fifo) {
   mscclpp::ProxyTrigger trigger;
diff --git a/python/test/h2d_semaphore_test.cu b/python/test/h2d_semaphore_test.cu
index 5bda9cf5..b68d6d76 100644
--- a/python/test/h2d_semaphore_test.cu
+++ b/python/test/h2d_semaphore_test.cu
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
 #include <mscclpp/semaphore_device.hpp>
 
 // be careful about using semaphore[my_rank] as it is an invalid semaphore and it is there just for simplicity of
diff --git a/python/test/proxy_test.cu b/python/test/proxy_test.cu
index 96b70840..78b932c9 100644
--- a/python/test/proxy_test.cu
+++ b/python/test/proxy_test.cu
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
 #include <mscclpp/fifo_device.hpp>
 #include <mscclpp/semaphore_device.hpp>
 
diff --git a/python/test/simple_proxy_channel_test.cu b/python/test/simple_proxy_channel_test.cu
index b8cd51d2..bfe59623 100644
--- a/python/test/simple_proxy_channel_test.cu
+++ b/python/test/simple_proxy_channel_test.cu
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
 #include <mscclpp/packet.hpp>
 #include <mscclpp/proxy_channel_device.hpp>
 
diff --git a/python/test/sm_channel_test.cu b/python/test/sm_channel_test.cu
index a9721752..93b5c99a 100644
--- a/python/test/sm_channel_test.cu
+++ b/python/test/sm_channel_test.cu
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include "common.hpp"
-// other headers
 #include <mscclpp/sm_channel_device.hpp>
 
 // be careful about using channels[my_rank] as it is inavlie and it is there just for simplicity of indexing