--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c	Sat Apr 30 16:08:48 2016 -0700
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c	Mon May 02 12:44:31 2016 -0700
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
+#include <X11/keysym.h>
 #include <sys/time.h>
 
 #include "awt.h"

--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	Sat Apr 30 16:08:48 2016 -0700
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	Mon May 02 12:44:31 2016 -0700
@@ -2547,14 +2547,14 @@
 
 static jobject get_integer_property(JNIEnv *env, GtkSettings* settings,
                                                              const gchar* key) {
-    gint intval = NULL;
+    gint intval = 0;
     (*fp_g_object_get)(settings, key, &intval, NULL);
     return create_Integer(env, intval);
 }
 
 static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings,
                                                              const gchar* key) {
-    gint intval = NULL;
+    gint intval = 0;
     (*fp_g_object_get)(settings, key, &intval, NULL);
     return create_Boolean(env, intval);
 }