diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7282cf8f3439..1aae3d719a7b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -625,6 +625,10 @@ $(eval $(call gb_Library_add_libs,vcl,\
     -lX11 \
     -lXext \
 ))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+	vcl/opengl/x11/X11DeviceInfo \
+))
+endif
 endif
 
 ifeq ($(OS),ANDROID)
@@ -720,13 +724,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
 $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
 endif
 
-ifneq ($(ENABLE_HEADLESS),TRUE)
-$(eval $(call gb_Library_add_exception_objects,vcl,\
-	vcl/opengl/x11/X11DeviceInfo \
-))
-endif
-endif
-
 # Runtime dependency for unit-tests
 $(eval $(call gb_Library_use_restarget,vcl,vcl))