diff -r 2e4b18e1ebff -r bee72dd4067b common/autoconf/libraries.m4
--- a/common/autoconf/libraries.m4	Thu Sep 22 18:31:10 2016 +0000
+++ b/common/autoconf/libraries.m4	Mon Sep 26 14:57:00 2016 +0200
@@ -42,13 +42,9 @@
     # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
   else
-    if test "x$SUPPORT_HEADFUL" = xno; then
-      # No X11 support if building headless-only
-      NEEDS_LIB_X11=false
-    else
-      # All other instances need X11
-      NEEDS_LIB_X11=true
-    fi
+    # All other instances need X11, even if building headless only, libawt still
+    # needs X11 headers.
+    NEEDS_LIB_X11=true
   fi
 
   # Check if cups is needed