--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h	Fri Jul 24 13:58:44 2015 -0500
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h	Tue Jul 28 18:14:57 2015 +0300
@@ -58,7 +58,7 @@
 
 #ifndef _HPKEYSYM_H
 
-#define _HPKEYSYM
+#define _HPKEYSYM_H
 
 #define hpXK_ClearLine          0x1000FF6F
 #define hpXK_InsertLine         0x1000FF70

--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h	Fri Jul 24 13:58:44 2015 -0500
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h	Tue Jul 28 18:14:57 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  ***
  ***/
 #ifndef _AWT_EVENT_H_
-#define _AWT_EVENT_H
+#define _AWT_EVENT_H_
 
 #include "jni_util.h"