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