diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 9c97a8b0dff2..3a4ae1ec1431 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-28  Steve Ellcey  <sje@cup.hp.com>
+
+	* inclhack.def (hpux_imaginary_i): Remove spaces.
+	* fixincl.x: Regenerate.
+	* tests/base/stdint.h: Update AIX fixes. 
+	* tests/base/complex.h: Change HPUX_IMAGINARY_I_CHECK fix.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac (AC_PREREQ): Bump to 2.64.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 1ee1dc061069..0beb33b5af54 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Sunday August 16, 2009 at 08:59:30 AM EDT
+ * It has been AutoGen-ed  Friday August 28, 2009 at 10:41:05 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Aug 16 08:59:30 EDT 2009
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 28 10:41:05 PDT 2009
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -4216,7 +4216,7 @@ static tTestDesc aHpux_Imaginary_ITests[] = {
  */
 static const char* apzHpux_Imaginary_IPatch[] = {
     "format",
-    "#  define _Complex_I (__extension__ 1.0iF)",
+    "#define _Complex_I (__extension__ 1.0iF)",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 96ed41c73378..c43ac852c478 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2235,8 +2235,8 @@ fix = {
     files     = complex.h;
     select    = "^[ \t]*#[ \t]*define[ \t]*_Complex_I.*";
     c_fix     = format;
-    c_fix_arg = "#  define _Complex_I (__extension__ 1.0iF)";
-    test_text = "#  define _Complex_I (0.f+_Imaginary_I)\n";
+    c_fix_arg = "#define _Complex_I (__extension__ 1.0iF)";
+    test_text = "#define _Complex_I (0.f+_Imaginary_I)\n";
 };
 
 /*
diff --git a/fixincludes/tests/base/complex.h b/fixincludes/tests/base/complex.h
index d7f2c3120f3f..d20310d346d4 100644
--- a/fixincludes/tests/base/complex.h
+++ b/fixincludes/tests/base/complex.h
@@ -16,6 +16,6 @@
 
 
 #if defined( HPUX_IMAGINARY_I_CHECK )
-#  define _Complex_I (__extension__ 1.0iF)
+#define _Complex_I (__extension__ 1.0iF)
 
 #endif  /* HPUX_IMAGINARY_I_CHECK */
diff --git a/fixincludes/tests/base/stdint.h b/fixincludes/tests/base/stdint.h
index ae7b12e46d39..8be61a9718de 100644
--- a/fixincludes/tests/base/stdint.h
+++ b/fixincludes/tests/base/stdint.h
@@ -10,41 +10,41 @@
 
 
 #if defined( AIX_STDINT_1_CHECK )
-#define UINT8_MAX	(255U)
-#define UINT16_MAX	(65535U)
+#define UINT8_MAX	(255)
+#define UINT16_MAX	(65535)
 #endif  /* AIX_STDINT_1_CHECK */
 
 
 #if defined( AIX_STDINT_2_CHECK )
-#define INTPTR_MIN	INT64_MIN
-#define INTPTR_MAX	INT64_MAX
-#define UINTPTR_MAX	UINT64_MAX
+#define INTPTR_MIN	(-INTPTR_MAX-1)
+#define INTPTR_MAX	9223372036854775807L
+#define UINTPTR_MAX	18446744073709551615UL
 #else
-#define INTPTR_MIN	INT32_MIN
-#define INTPTR_MAX	INT32_MAX
-#define UINTPTR_MAX	UINT32_MAX
+#define INTPTR_MIN	(-INTPTR_MAX-1)
+#define INTPTR_MAX	2147483647L
+#define UINTPTR_MAX	4294967295UL
 #endif  /* AIX_STDINT_2_CHECK */
 
 
 #if defined( AIX_STDINT_3_CHECK )
-#define PTRDIFF_MIN	INT64_MIN
-#define PTRDIFF_MAX	INT64_MAX
+#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)
+#define PTRDIFF_MAX __PTRDIFF_MAX__
 #else
-#define PTRDIFF_MIN     INT32_MIN
-#define PTRDIFF_MAX	INT32_MAX
+#define PTRDIFF_MIN (-PTRDIFF_MAX - 1)
+#define PTRDIFF_MAX __PTRDIFF_MAX__
 #endif  /* AIX_STDINT_3_CHECK */
 
 
 #if defined( AIX_STDINT_4_CHECK )
-#define SIZE_MAX	UINT64_MAX
+#define SIZE_MAX __SIZE_MAX__
 #else
-#define SIZE_MAX        UINT32_MAX
+#define SIZE_MAX __SIZE_MAX__
 #endif  /* AIX_STDINT_4_CHECK */
 
 
 #if defined( AIX_STDINT_5_CHECK )
-#define UINT8_C(c)	__CONCAT__(c,U)
-#define UINT16_C(c)	__CONCAT__(c,U)
+#define UINT8_C(c) __UINT8_C(c)
+#define UINT16_C(c) __UINT16_C(c)
 #endif  /* AIX_STDINT_5_CHECK */