--- old/src/java.desktop/unix/native/common/awt/awt.h	2016-04-14 12:54:33.212584752 -0700
+++ new/src/java.desktop/unix/native/common/awt/awt.h	2016-04-14 12:54:33.104584754 -0700
@@ -35,7 +35,10 @@
 #include "debug_util.h"
 
 #if !defined(HEADLESS) && !defined(MACOSX)
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+typedef char Boolean;
+typedef unsigned long Pixel;
 #endif /* !HEADLESS && !MACOSX */