diff --git a/atomic.h b/atomic.h
index b793fdf2f4f..de454ff8653 100644
--- a/atomic.h
+++ b/atomic.h
@@ -211,12 +211,6 @@ static __inline__ void atomic_dec(atomic_t *v)
 
 #undef NO_ATOMIC_OPS
 
-/************************* other ARCH ****************************/
-
-#else
-
-#define NO_ATOMIC_OPS
-
 /* C11 stdatomics wrappers */
 #define atomic_init(a, v) atomic_set(a, v)
 #define atomic_store(a, v) atomic_set(a, v)
@@ -226,6 +220,13 @@ static __inline__ void atomic_dec(atomic_t *v)
 		atomic_add(v, a);\
 	else \
 		atomic_sub(-(v), a);
+
+/************************* other ARCH ****************************/
+
+#else
+
+#define NO_ATOMIC_OPS
+
 #endif
 #endif /* HAVE_STDATOMIC */
 
diff --git a/mem/module_info.c b/mem/module_info.c
index 4f44c69d4f2..0172b458503 100644
--- a/mem/module_info.c
+++ b/mem/module_info.c
@@ -25,11 +25,7 @@
 #ifdef SHM_EXTRA_STATS
 
 #include <dlfcn.h>
-#ifdef HAVE_STDATOMIC
-#include <stdatomic.h>
-#else
 #include "../atomic.h"
-#endif
 #include <string.h>
 
 #include "module_info.h"