diff --git a/TODO b/TODO
index 3bed70c..9468021 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,10 @@
         to indicate the actual depth. That way PIXMAN_x4c4 and PIXMAN_c8
 	won't collide.
 
+  - Maybe bite the bullet and make configure.ac generate a pixman-types.h
+    file that can be included from pixman.h to avoid the #ifdef magic
+    in pixman.h
+
   - Make pixman_region_point_in() survive a NULL box, then fix up
     pixman-compose.c
 
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 977c0a6..36d91a9 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -74,7 +74,7 @@ SOFTWARE.
 /*
  * Standard integers
  */
-#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi)
+#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun)
 #  include <inttypes.h>
 #elif defined (_MSC_VER)
 typedef __int8 int8_t;