diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index e37963c1df4da6ee5c586b455b22efdb919e035e..8b8cf9412989d2c8e1ec3cd2c7aa16351b3e6b51 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -15,6 +15,8 @@
 #ifndef __ASM_GENERIC_ATOMIC_H
 #define __ASM_GENERIC_ATOMIC_H
 
+#include <asm/cmpxchg.h>
+
 #ifdef CONFIG_SMP
 /* Force people to define core atomics */
 # if !defined(atomic_add_return) || !defined(atomic_sub_return) || \
diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h
index 213ac6e8fe392b536480898e626ad3ff523a1e5d..e0449af91f607207738907419482c29838aed56c 100644
--- a/include/asm-generic/cmpxchg.h
+++ b/include/asm-generic/cmpxchg.h
@@ -10,6 +10,8 @@
 #error "Cannot use generic cmpxchg on SMP"
 #endif
 
+#include <asm-generic/cmpxchg-local.h>
+
 /*
  * Atomic compare and exchange.
  *
diff --git a/include/asm-generic/system.h b/include/asm-generic/system.h
index 215efa74f5a2b539494ad1a42f62b52199a9715e..82cb53abb9f69575e1f9760f3f5f71ac8291d0c2 100644
--- a/include/asm-generic/system.h
+++ b/include/asm-generic/system.h
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/irqflags.h>
 
-#include <asm/cmpxchg-local.h>
 #include <asm/cmpxchg.h>
 
 struct task_struct;