--- a/jdk/make/sun/awt/FILES_c_unix.gmk	Wed Nov 30 12:06:49 2011 -0800
+++ b/jdk/make/sun/awt/FILES_c_unix.gmk	Mon Dec 05 17:11:57 2011 +0400
@@ -146,6 +146,7 @@
 
 FILES_NO_MOTIF_c = \
 	awt_Font.c \
+	HeadlessToolkit.c \
 	fontpath.c \
 	VDrawingArea.c \
 	X11Color.c \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/native/sun/awt/HeadlessToolkit.c	Mon Dec 05 17:11:57 2011 +0400
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2011, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include <jni_util.h>
+
+#ifdef HEADLESS
+
+extern JavaVM *jvm;
+
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void *reserved)
+{
+    jvm = vm;
+    return JNI_VERSION_1_2;
+}
+
+JNIEXPORT jboolean JNICALL AWTIsHeadless() {
+    return JNI_TRUE;
+}
+
+#endif

--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	Wed Nov 30 12:06:49 2011 -0800
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h	Mon Dec 05 17:11:57 2011 +0400
@@ -30,6 +30,10 @@
 
 #include <jdga.h>
 
+#ifdef HEADLESS
+#include "GLXGraphicsConfig.h"
+#endif
+
 #include <X11/extensions/Xrender.h>
 
 /**