--- java/openjdk25/Makefile	2026-04-09 04:44:06.895840000 +0000
+++ java/openjdk25/Makefile	2026-04-09 12:38:24.977553000 +0000
@@ -52,15 +52,29 @@
 RUN_DEPENDS+=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 .endif
 
+.if ${FLAVOR:M*headless} == ""
 USES=		autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig xorg
+.else
+USES=		autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig
+.endif
 
 CPE_VENDOR=	oracle
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
-USE_XORG=	x11 xext xi xrandr xrender xt xtst
+.if ${FLAVOR:M*headless} == ""
+USE_XORG=       x11 xext xi xrandr xrender xt xtst
+.endif
 
+.if ${FLAVOR:M*headless}
+BUILD_DEPENDS+=       ${LOCALBASE}/include/X11/extensions/Xrender.h:x11/libXrender
+BUILD_DEPENDS+=       ${LOCALBASE}/include/X11/extensions/Xrandr.h:x11/libXrandr
+BUILD_DEPENDS+=       ${LOCALBASE}/include/X11/extensions/XTest.h:x11/libXtst
+BUILD_DEPENDS+=       ${LOCALBASE}/include/X11/extensions/shape.h:x11/libXext
+BUILD_DEPENDS+=       ${LOCALBASE}/include/X11/Intrinsic.h:x11-toolkits/libXt
+.endif
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-ccache \
 			--disable-javac-server \