diff --git a/aos/logging/context.cc b/aos/logging/context.cc
index 0aa3e71..b0fd32e 100644
--- a/aos/logging/context.cc
+++ b/aos/logging/context.cc
@@ -7,23 +7,22 @@
 #if __has_feature(memory_sanitizer)
 #include <sanitizer/msan_interface.h>
 #endif
-#include <string.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
 
+#include <cerrno>
+#include <cstring>
 #include <string>
 
 extern char *program_invocation_name;
 extern char *program_invocation_short_name;
 
-#include "glog/logging.h"
-
 #include "aos/complex_thread_local.h"
 #include "aos/die.h"
 #include "aos/logging/implementations.h"
 #include "aos/thread_local.h"
+#include "glog/logging.h"
 
 namespace aos {
 namespace logging {