--- old/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c	2020-03-02 01:42:18.500090700 -0800
+++ new/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c	2020-03-02 01:42:18.077987700 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, 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
@@ -23,6 +23,10 @@
  * questions.
  */
 
+#ifdef HEADLESS
+    #error This file should not be included in headless library
+#endif
+
 #include "X11SurfaceData.h"
 #include <jni.h>
 #include <math.h>
@@ -308,7 +312,6 @@
 Java_sun_awt_X11GraphicsEnvironment_initXRender
 (JNIEnv *env, jclass x11ge, jboolean verbose, jboolean ignoreLinuxVersion)
 {
-#ifndef HEADLESS
     static jboolean xrenderAvailable = JNI_FALSE;
     static jboolean firstTime = JNI_TRUE;
 
@@ -326,12 +329,8 @@
         firstTime = JNI_FALSE;
     }
     return xrenderAvailable;
-#else
-    return JNI_FALSE;
-#endif /* !HEADLESS */
 }
 
-
 JNIEXPORT void JNICALL
 Java_sun_java2d_xr_XRBackendNative_initIDs(JNIEnv *env, jclass cls) {
     char *maskData;