diff --git a/src/fec/fec_decoder.h b/src/fec/fec_decoder.h
index 97e09f0..9f9614b 100644
--- a/src/fec/fec_decoder.h
+++ b/src/fec/fec_decoder.h
@@ -7,8 +7,8 @@
 #ifndef _FEC_DECODER_H_
 #define _FEC_DECODER_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/fec/fec_encoder.h b/src/fec/fec_encoder.h
index cfdf665..d502efc 100644
--- a/src/fec/fec_encoder.h
+++ b/src/fec/fec_encoder.h
@@ -7,8 +7,8 @@
 #ifndef _FEC_ENCODER_H_
 #define _FEC_ENCODER_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/frame/audio_frame.cpp b/src/frame/audio_frame.cpp
index ac9b7c3..87124d5 100644
--- a/src/frame/audio_frame.cpp
+++ b/src/frame/audio_frame.cpp
@@ -1,8 +1,7 @@
 #include "audio_frame.h"
 
-#include <string.h>
-
-#include <string>
+#include <cstring>
+#include <utility>
 
 AudioFrame::AudioFrame() {}
 
diff --git a/src/frame/audio_frame.h b/src/frame/audio_frame.h
index dc5cc8e..ea7b406 100644
--- a/src/frame/audio_frame.h
+++ b/src/frame/audio_frame.h
@@ -7,8 +7,8 @@
 #ifndef _AUDIO_FRAME_H_
 #define _AUDIO_FRAME_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 class AudioFrame {
  public:
diff --git a/src/frame/video_frame.cpp b/src/frame/video_frame.cpp
index 1a201af..c18e65b 100644
--- a/src/frame/video_frame.cpp
+++ b/src/frame/video_frame.cpp
@@ -1,8 +1,7 @@
 #include "video_frame.h"
 
-#include <string.h>
-
-#include <string>
+#include <cstring>
+#include <utility>
 
 VideoFrame::VideoFrame() {}
 
diff --git a/src/frame/video_frame.h b/src/frame/video_frame.h
index c4a1ffd..39f1e17 100644
--- a/src/frame/video_frame.h
+++ b/src/frame/video_frame.h
@@ -7,8 +7,8 @@
 #ifndef _VIDEO_FRAME_H_
 #define _VIDEO_FRAME_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 class VideoFrame {
  public:
diff --git a/src/ice/ice_agent.cpp b/src/ice/ice_agent.cpp
index ff4d7bd..72e1179 100644
--- a/src/ice/ice_agent.cpp
+++ b/src/ice/ice_agent.cpp
@@ -1,7 +1,6 @@
 #include "ice_agent.h"
 
-#include <string.h>
-
+#include <cstring>
 #include <iostream>
 
 #include "log.h"
diff --git a/src/interface/x.h b/src/interface/x.h
index 925cb1f..568a055 100644
--- a/src/interface/x.h
+++ b/src/interface/x.h
@@ -9,8 +9,8 @@
 #define DLLAPI
 #endif
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdint>
 
 enum DATA_TYPE { VIDEO = 0, AUDIO, DATA };
 enum ConnectionStatus {
diff --git a/src/media/audio/encode/audio_encoder.cpp b/src/media/audio/encode/audio_encoder.cpp
index 4638009..4f807ac 100644
--- a/src/media/audio/encode/audio_encoder.cpp
+++ b/src/media/audio/encode/audio_encoder.cpp
@@ -1,8 +1,7 @@
 #include "audio_encoder.h"
 
-#include <stdlib.h>
-
 #include <chrono>
+#include <cstdlib>
 #include <cstring>
 
 #include "log.h"
diff --git a/src/media/video/decode/video_decoder.h b/src/media/video/decode/video_decoder.h
index 05b7aec..8acfee0 100644
--- a/src/media/video/decode/video_decoder.h
+++ b/src/media/video/decode/video_decoder.h
@@ -7,6 +7,9 @@
 #ifndef _VIDEO_DECODER_H_
 #define _VIDEO_DECODER_H_
 
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
 #include <functional>
 
 #include "video_frame.h"
diff --git a/src/media/video/encode/video_encoder.h b/src/media/video/encode/video_encoder.h
index 9fc8d87..c5edfdb 100644
--- a/src/media/video/encode/video_encoder.h
+++ b/src/media/video/encode/video_encoder.h
@@ -1,6 +1,9 @@
 #ifndef _VIDEO_ENCODER_H_
 #define _VIDEO_ENCODER_H_
 
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
 #include <functional>
 
 class VideoEncoder {
diff --git a/src/ringbuffer/ringbuffer.h b/src/ringbuffer/ringbuffer.h
index 4d94323..b46e954 100644
--- a/src/ringbuffer/ringbuffer.h
+++ b/src/ringbuffer/ringbuffer.h
@@ -1,7 +1,7 @@
 #ifndef _RINGBUFFER_H_
 #define _RINGBUFFER_H_
 
-#include <string.h>
+#include <cstring>
 
 int RingBufferDummy();
 
diff --git a/src/rtcp/rtcp_header.h b/src/rtcp/rtcp_header.h
index ba1545e..e741db4 100644
--- a/src/rtcp/rtcp_header.h
+++ b/src/rtcp/rtcp_header.h
@@ -1,7 +1,8 @@
 #ifndef _RTCP_HEADER_H_
 #define _RTCP_HEADER_H_
 
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 #include "log.h"
 
diff --git a/src/rtcp/rtcp_typedef.h b/src/rtcp/rtcp_typedef.h
index 49af995..f80740b 100644
--- a/src/rtcp/rtcp_typedef.h
+++ b/src/rtcp/rtcp_typedef.h
@@ -1,7 +1,8 @@
 #ifndef _RTCP_TYPEDEF_H_
 #define _RTCP_TYPEDEF_H_
 
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 #define DEFAULT_RTCP_VERSION 2
 #define DEFAULT_RTCP_HEADER_SIZE 4
diff --git a/src/rtp/byte_buffer.cpp b/src/rtp/byte_buffer.cpp
index 037c8ca..2bc2e34 100644
--- a/src/rtp/byte_buffer.cpp
+++ b/src/rtp/byte_buffer.cpp
@@ -1,6 +1,6 @@
 #include "byte_buffer.h"
 
-#include <string.h>
+#include <cstring>
 
 ByteBufferReader::ByteBufferReader(const char* bytes, size_t len) {
   Construct(bytes, len);
diff --git a/src/rtp/byte_buffer.h b/src/rtp/byte_buffer.h
index fcfa13e..dca6b8f 100644
--- a/src/rtp/byte_buffer.h
+++ b/src/rtp/byte_buffer.h
@@ -7,8 +7,8 @@
 #ifndef _BYTE_BUFFER_H_
 #define _BYTE_BUFFER_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 class ByteBufferReader {
  public:
diff --git a/src/rtp/obu.h b/src/rtp/obu.h
index 0b15894..bfd582a 100644
--- a/src/rtp/obu.h
+++ b/src/rtp/obu.h
@@ -7,8 +7,8 @@
 #ifndef _OBU_H_
 #define _OBU_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 #include "aom/aom_codec.h"
 
diff --git a/src/rtp/obu_parser.h b/src/rtp/obu_parser.h
index 79514a7..8e0620d 100644
--- a/src/rtp/obu_parser.h
+++ b/src/rtp/obu_parser.h
@@ -7,9 +7,8 @@
 #ifndef _OBU_PARSER_H_
 #define _OBU_PARSER_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 #include "obu.h"
diff --git a/src/rtp/rtp_codec.h b/src/rtp/rtp_codec.h
index a6921e8..68971c3 100644
--- a/src/rtp/rtp_codec.h
+++ b/src/rtp/rtp_codec.h
@@ -1,8 +1,8 @@
 #ifndef _RTP_CODEC_H_
 #define _RTP_CODEC_H_
 
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 #include "fec_encoder.h"
diff --git a/src/rtp/rtp_packet.h b/src/rtp/rtp_packet.h
index 6c3829b..7b25037 100644
--- a/src/rtp/rtp_packet.h
+++ b/src/rtp/rtp_packet.h
@@ -1,10 +1,9 @@
 #ifndef _RTP_PACKET_H_
 #define _RTP_PACKET_H_
 
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <vector>
 
 #include "log.h"
diff --git a/src/rtp/rtp_transceiver.h b/src/rtp/rtp_transceiver.h
index ce007a9..154644d 100644
--- a/src/rtp/rtp_transceiver.h
+++ b/src/rtp/rtp_transceiver.h
@@ -1,6 +1,7 @@
 #ifndef _RTP_TRANSCEIVER_H_
 #define _RTP_TRANSCEIVER_H_
 
+#include <cstddef>
 #include <functional>
 
 class RtpTransceiver {