diff --git a/common/utils/ds/spsc_q.h b/common/utils/ds/spsc_q.h
index 7fd968b2f0..1149a80f7d 100644
--- a/common/utils/ds/spsc_q.h
+++ b/common/utils/ds/spsc_q.h
@@ -7,11 +7,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdatomic.h>
 
 #if defined(__cplusplus)
+#include <atomic>
 // use atomic_size_t to help interworking with C++
 using std::atomic_size_t;
+#else
+#include <stdatomic.h>
 #endif
 
 typedef struct spsc_q {