diff --git a/core/atomic_c11.c b/core/atomic_c11.c
index a0d70c83ce4f..740b3b36fd54 100644
--- a/core/atomic_c11.c
+++ b/core/atomic_c11.c
@@ -41,6 +41,11 @@
 #include <string.h>
 #include "irq.h"
 
+/*
+ * uncrustify mis-formats the macros in this file, so disable it for them.
+ * begin{code-style-ignore}
+ */
+
 /* GCC documentation refers to the types as I1, I2, I4, I8, I16 */
 typedef uint8_t  I1;
 typedef uint16_t I2;
@@ -245,6 +250,8 @@ TEMPLATE_ATOMIC_OP_FETCH_N(nand, &, 2, ~) /* __atomic_nand_fetch_2 */
 TEMPLATE_ATOMIC_OP_FETCH_N(nand, &, 4, ~) /* __atomic_nand_fetch_4 */
 TEMPLATE_ATOMIC_OP_FETCH_N(nand, &, 8, ~) /* __atomic_nand_fetch_8 */
 
+/* end{code-style-ignore} */
+
 /* ***** Generic versions below ***** */
 
 /* Clang objects if you redefine a builtin.  This little hack allows us to
diff --git a/core/atomic_sync.c b/core/atomic_sync.c
index c098231945d1..cee20005a3d3 100644
--- a/core/atomic_sync.c
+++ b/core/atomic_sync.c
@@ -29,6 +29,11 @@
 #include <string.h>
 #include "irq.h"
 
+/*
+ * uncrustify mis-formats the macros in this file, so disable it globally.
+ * begin{code-style-ignore}
+ */
+
 /* use gcc/clang implementation if available */
 #if defined(__GNUC__) \
     && (__GNUC__ > 4 || \
@@ -234,4 +239,5 @@ TEMPLATE_SYNC_OP_AND_FETCH_N(nand, &, 2, ~) /* __sync_nand_and_fetch_2 */
 TEMPLATE_SYNC_OP_AND_FETCH_N(nand, &, 4, ~) /* __sync_nand_and_fetch_4 */
 TEMPLATE_SYNC_OP_AND_FETCH_N(nand, &, 8, ~) /* __sync_nand_and_fetch_8 */
 #endif
+/* end{code-style-ignore} */
 /** @} */