--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c	Mon Sep 24 21:23:37 2018 +0200
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c	Tue Sep 25 14:38:35 2018 -0700
@@ -54,12 +54,17 @@
 #include <X11/Sunkeysym.h>  /* Sun vendor-specific */
 #include <X11/ap_keysym.h>  /* Apollo (HP) vendor-specific */
 /*
- * HPkeysym.h is used not only for the hp keysyms, but also to
+ * #include <X11/HPkeysym.h>    HP vendor-specific
+ * I checked HPkeysym.h into the workspace because although
+ * I think it will ship with X11R6.4.2 (and later) on Linux,
+ * it doesn't seem to be in Solaris 9 Update 2.
+ *
+ * This is done not only for the hp keysyms, but also to
  * give us the osf keysyms that are also defined in HPkeysym.h.
  * However, HPkeysym.h is missing a couple of osf keysyms,
  * so I have #defined them below.
  */
-#include <X11/HPkeysym.h>   /* HP vendor-specific */
+#include "HPkeysym.h"   /* HP vendor-specific */
 
 #include "java_awt_event_KeyEvent.h"
 #include "java_awt_event_InputEvent.h"