diff --git a/core/libcutils/include/cutils/trace.h b/core/libcutils/include/cutils/trace.h
index fcbdc9b..4281375 100644
--- a/core/libcutils/include/cutils/trace.h
+++ b/core/libcutils/include/cutils/trace.h
@@ -18,7 +18,12 @@
 #define _LIBS_CUTILS_TRACE_H
 
 #include <inttypes.h>
+#ifdef __cplusplus
+#include <atomic>
+using namespace std;
+#else
 #include <stdatomic.h>
+#endif
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>