Index: arch/ia64/include/atomic.h
===================================================================
--- arch/ia64/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ arch/ia64/include/atomic.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
@@ -30,8 +30,4 @@
 #define __ia64_ATOMIC_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-
-
 /** Atomic addition.
  *
Index: arch/mips32/include/atomic.h
===================================================================
--- arch/mips32/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ arch/mips32/include/atomic.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
@@ -29,7 +29,4 @@
 #ifndef __mips32_ATOMIC_H__
 #define __mips32_ATOMIC_H__
-
-#include <arch/types.h>
-#include <typedefs.h>
 
 #define atomic_inc(x)	((void) atomic_add(x, 1))
Index: arch/ppc32/include/atomic.h
===================================================================
--- arch/ppc32/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ arch/ppc32/include/atomic.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
@@ -30,10 +30,7 @@
 #define __ppc32_ATOMIC_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-
 static inline void atomic_inc(atomic_t *val)
 {
-	__u32 tmp;
+	long tmp;
 
 	asm __volatile__ (
@@ -50,5 +47,5 @@
 static inline void atomic_dec(atomic_t *val)
 {
-	__u32 tmp;
+	long tmp;
 
 	asm __volatile__(
Index: generic/include/atomic.h
===================================================================
--- generic/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ generic/include/atomic.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
@@ -30,10 +30,9 @@
 #define __ATOMIC_H__
 
-struct atomic {
+typedef struct atomic {
 	volatile long count;
-};
+} atomic_t;
 
 #include <arch/atomic.h>
-#include <typedefs.h>
 
 static inline void atomic_set(atomic_t *val, long i)
Index: generic/include/typedefs.h
===================================================================
--- generic/include/typedefs.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ generic/include/typedefs.h	(revision d2ab461b1422bde30deed4d303ce1d7c83e434e8)
@@ -62,4 +62,5 @@
 typedef struct condvar condvar_t;
 typedef struct waitq waitq_t;
+typedef struct futex futex_t;
 
 typedef struct chunk chunk_t;
@@ -93,5 +94,3 @@
 typedef struct btree btree_t;
 
-typedef struct atomic atomic_t;
-
 #endif