--- a/jdk/src/share/native/sun/awt/medialib/mlib_types.h	Sat Nov 05 14:27:47 2011 -0700
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_types.h	Thu Nov 17 10:32:05 2011 -0800
@@ -59,13 +59,8 @@
 
 #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
 
-#if defined(__linux__)
-#include <stdint.h>                     /* for uintptr_t */
-#include <malloc.h>                     /* for ptrdiff_t */
-#else
-#include <link.h>                       /* for uintptr_t */
-#include <stddef.h>                     /* for ptrdiff_t */
-#endif  /* __linux__ */
+#include <stdint.h>
+#include <stddef.h>
 
 #ifdef MLIB_OS64BIT