diff --git a/common/transport.hpp b/common/transport.hpp
index 0601488..e9e1808 100644
--- a/common/transport.hpp
+++ b/common/transport.hpp
@@ -3,7 +3,8 @@
 #include <libpldm/base.h>
 #include <libpldm/pldm.h>
 #include <poll.h>
-#include <stddef.h>
+
+#include <cstddef>
 
 struct pldm_transport_mctp_demux;
 struct pldm_transport_af_mctp;
diff --git a/common/types.hpp b/common/types.hpp
index 2a911c6..a1c1c51 100644
--- a/common/types.hpp
+++ b/common/types.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <stdint.h>
-
 #include <sdbusplus/message/types.hpp>
 
 #include <bitset>
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
diff --git a/common/utils.hpp b/common/utils.hpp
index 6c17191..7df5f81 100644
--- a/common/utils.hpp
+++ b/common/utils.hpp
@@ -8,7 +8,6 @@
 #include <libpldm/pdr.h>
 #include <libpldm/platform.h>
 #include <libpldm/utils.h>
-#include <stdint.h>
 #include <systemd/sd-bus.h>
 #include <unistd.h>
 
@@ -18,6 +17,7 @@
 #include <xyz/openbmc_project/Logging/Entry/server.hpp>
 #include <xyz/openbmc_project/ObjectMapper/client.hpp>
 
+#include <cstdint>
 #include <deque>
 #include <exception>
 #include <filesystem>