diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile
index 15898e9519e5..17f337e03842 100644
--- a/devel/include-what-you-use/Makefile
+++ b/devel/include-what-you-use/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	include-what-you-use
-PORTVERSION=	0.24
+DISTVERSION=	0.25
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for use with clang to analyze \#includes in C and C++ source files
 WWW=		https://include-what-you-use.org
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		cmake llvm:${LLVM_VER},build,run ncurses python:run shebangfix
 USE_GITHUB=	yes
 
 SHEBANG_FILES=	fix_includes.py \
 		iwyu_tool.py
 
 CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm \
 		-DClang_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang
 
-LLVM_VER=	20
+LLVM_VER=	21
 
 .include <bsd.port.mk>
diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo
index 618d3e1f5a04..c29f9f30c677 100644
--- a/devel/include-what-you-use/distinfo
+++ b/devel/include-what-you-use/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748524522
-SHA256 (include-what-you-use-include-what-you-use-0.24_GH0.tar.gz) = 897b4c864a983f493c8efef4a1a9a2d429fd7ead1011f7a41743ed7b6dbe8c2e
-SIZE (include-what-you-use-include-what-you-use-0.24_GH0.tar.gz) = 821159
+TIMESTAMP = 1758482669
+SHA256 (include-what-you-use-include-what-you-use-0.25_GH0.tar.gz) = 2e8381368ec0a6ecb770834bce00fc62efa09a2b2f9710ed569acbb823ead9cc
+SIZE (include-what-you-use-include-what-you-use-0.25_GH0.tar.gz) = 847859
diff --git a/devel/include-what-you-use/pkg-plist b/devel/include-what-you-use/pkg-plist
index eb97e180f0ef..46d07ef95705 100644
--- a/devel/include-what-you-use/pkg-plist
+++ b/devel/include-what-you-use/pkg-plist
@@ -1,24 +1,17 @@
 bin/fix_includes.py
 bin/include-what-you-use
 bin/iwyu_tool.py
 share/man/man1/include-what-you-use.1.gz
 %%DATADIR%%/boost-1.64-all-private.imp
 %%DATADIR%%/boost-1.64-all.imp
 %%DATADIR%%/boost-1.75-all-private.imp
 %%DATADIR%%/boost-1.75-all.imp
 %%DATADIR%%/boost-all-private.imp
 %%DATADIR%%/boost-all.imp
 %%DATADIR%%/clang-6.intrinsics.imp
 %%DATADIR%%/gcc-8.intrinsics.imp
-%%DATADIR%%/gcc.libc.imp
-%%DATADIR%%/gcc.stl.headers.imp
-%%DATADIR%%/gcc.symbols.imp
-%%DATADIR%%/iwyu.gcc.imp
-%%DATADIR%%/libcxx.imp
 %%DATADIR%%/python2.7.imp
 %%DATADIR%%/python3.8.imp
 %%DATADIR%%/qt4.imp
 %%DATADIR%%/qt5_11.imp
 %%DATADIR%%/qt5_4.imp
-%%DATADIR%%/stl.c.headers.imp
-%%DATADIR%%/stl.public.imp