--- old/src/java.desktop/unix/native/common/awt/awt_p.h	2016-04-14 12:54:33.632584745 -0700
+++ new/src/java.desktop/unix/native/common/awt/awt_p.h	2016-04-14 12:54:33.528584747 -0700
@@ -41,13 +41,6 @@
 #include <string.h>
 #include <unistd.h>
 #ifndef HEADLESS
-#include <X11/Intrinsic.h>
-#include <X11/IntrinsicP.h>
-#include <X11/Shell.h>
-#include <X11/StringDefs.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/keysymdef.h>
 #include <X11/extensions/Xrender.h>
 #endif /* !HEADLESS */
 #include "awt.h"