diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 60f406c1a011..9461a18774e5 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -126,16 +126,16 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long			  __int64_t;
-typedef	unsigned long		 __uint64_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
+typedef	long			__int64_t;
+typedef	unsigned long		__uint64_t;
 
-typedef	long			 __intptr_t;
+typedef	long			__intptr_t;
 typedef	unsigned long		__uintptr_t;
 
 /*
diff --git a/sys/arm/include/ansi.h b/sys/arm/include/ansi.h
index eb16c37a298b..a2a128ff16dd 100644
--- a/sys/arm/include/ansi.h
+++ b/sys/arm/include/ansi.h
@@ -121,14 +121,14 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long long		  __int64_t;
-typedef	unsigned long long	 __uint64_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
+typedef	long long		__int64_t;
+typedef	unsigned long long	__uint64_t;
 
 typedef	int			__intptr_t;
 typedef	unsigned int		__uintptr_t;
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index ff2186b7f571..64ea12b218ab 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -125,11 +125,11 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * least <stdio.h>.
  */
 #ifdef __GNUC__
-typedef	int __attribute__((__mode__(__DI__)))		 __int64_t;
+typedef	int __attribute__((__mode__(__DI__)))		__int64_t;
 typedef	unsigned int __attribute__((__mode__(__DI__)))	__uint64_t;
 #else
 /* LONGLONG */
-typedef	long long					 __int64_t;
+typedef	long long					__int64_t;
 /* LONGLONG */
 typedef	unsigned long long				__uint64_t;
 #endif
@@ -137,14 +137,14 @@ typedef	unsigned long long				__uint64_t;
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
 
-typedef	int			 __intptr_t;
+typedef	int			__intptr_t;
 typedef	unsigned int		__uintptr_t;
 
 /*
diff --git a/sys/ia64/include/ansi.h b/sys/ia64/include/ansi.h
index 5027ebe2bf45..7927d70f14fd 100644
--- a/sys/ia64/include/ansi.h
+++ b/sys/ia64/include/ansi.h
@@ -119,16 +119,16 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long			  __int64_t;
-typedef	unsigned long		 __uint64_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
+typedef	long			__int64_t;
+typedef	unsigned long		__uint64_t;
 
-typedef	long			 __intptr_t;
+typedef	long			__intptr_t;
 typedef	unsigned long		__uintptr_t;
 
 /*
diff --git a/sys/powerpc/include/ansi.h b/sys/powerpc/include/ansi.h
index 9dea29454b2b..173c04594bff 100644
--- a/sys/powerpc/include/ansi.h
+++ b/sys/powerpc/include/ansi.h
@@ -127,14 +127,14 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long long		  __int64_t;
-typedef	unsigned long long	 __uint64_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
+typedef	long long		__int64_t;
+typedef	unsigned long long	__uint64_t;
 
 typedef	int			__intptr_t;
 typedef	unsigned int		__uintptr_t;
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h
index dfa6d4bc4733..c170a7b275f8 100644
--- a/sys/sparc64/include/ansi.h
+++ b/sys/sparc64/include/ansi.h
@@ -121,16 +121,16 @@ typedef _BSD_VA_LIST_ __gnuc_va_list;		/* compatibility w/GNU headers*/
  * Internal names for basic integral types.  Omit the typedef if
  * not possible for a machine/compiler combination.
  */
-typedef	__signed char		   __int8_t;
-typedef	unsigned char		  __uint8_t;
-typedef	short			  __int16_t;
-typedef	unsigned short		 __uint16_t;
-typedef	int			  __int32_t;
-typedef	unsigned int		 __uint32_t;
-typedef	long			  __int64_t;
-typedef	unsigned long		 __uint64_t;
+typedef	__signed char		__int8_t;
+typedef	unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef	int			__int32_t;
+typedef	unsigned int		__uint32_t;
+typedef	long			__int64_t;
+typedef	unsigned long		__uint64_t;
 
-typedef	long			 __intptr_t;
+typedef	long			__intptr_t;
 typedef	unsigned long		__uintptr_t;
 
 /*