diff --git a/aos/libc/aos_strerror.cc b/aos/libc/aos_strerror.cc
index b045f24..8c087a8 100644
--- a/aos/libc/aos_strerror.cc
+++ b/aos/libc/aos_strerror.cc
@@ -1,10 +1,11 @@
 #include "aos/libc/aos_strerror.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 
+#include <cassert>
+#include <cstdio>
+#include <cstring>
+
 #include "aos/thread_local.h"
 
 // This code uses an overloaded function to handle the result from either
diff --git a/aos/libc/aos_strerror_test.cc b/aos/libc/aos_strerror_test.cc
index 65781bc..abd867e 100644
--- a/aos/libc/aos_strerror_test.cc
+++ b/aos/libc/aos_strerror_test.cc
@@ -1,6 +1,6 @@
 #include "aos/libc/aos_strerror.h"
 
-#include <errno.h>
+#include <cerrno>
 
 #include "gtest/gtest.h"
 
diff --git a/aos/libc/aos_strsignal.cc b/aos/libc/aos_strsignal.cc
index 91c2211..0f9b065 100644
--- a/aos/libc/aos_strsignal.cc
+++ b/aos/libc/aos_strsignal.cc
@@ -1,10 +1,9 @@
 #include "aos/libc/aos_strsignal.h"
 
-#include <signal.h>
-
-#include "glog/logging.h"
+#include <csignal>
 
 #include "aos/thread_local.h"
+#include "glog/logging.h"
 
 const char *aos_strsignal(int signal) {
   AOS_THREAD_LOCAL char buffer[512];
diff --git a/aos/libc/aos_strsignal_test.cc b/aos/libc/aos_strsignal_test.cc
index 7520985..51389af 100644
--- a/aos/libc/aos_strsignal_test.cc
+++ b/aos/libc/aos_strsignal_test.cc
@@ -1,6 +1,6 @@
 #include "aos/libc/aos_strsignal.h"
 
-#include <signal.h>
+#include <csignal>
 #include <thread>
 
 #include "gtest/gtest.h"