diff --git a/devel/libinotify/Makefile b/devel/libinotify/Makefile
index a0bce906fb85..2e844386e02b 100644
--- a/devel/libinotify/Makefile
+++ b/devel/libinotify/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	libinotify
 PORTVERSION=	20240724
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libinotify-kqueue/libinotify-kqueue/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Kevent based inotify compatible library
 WWW=		https://github.com/libinotify-kqueue/libinotify-kqueue
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		libtool pathfix
 
 CONFIGURE_ARGS=	--enable-skip-subfiles=fusefs,smbfs
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .if exists(/usr/include/sys/inotify.h)
 post-install:
-	${INSTALL_DATA} /usr/include/sys/inotify.h ${STAGEDIR}${PREFIX}/include/sys/
+	${PRINTF} '#pragma GCC system_header\n#include_next <sys/inotify.h>\n' \
+		> ${STAGEDIR}${PREFIX}/include/sys/inotify.h
 	${SED} -e '/Libs:/d' -e '/Cflags:/d' ${WRKSRC}/libinotify.pc \
 		> ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libinotify.pc
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/way-displays/Makefile b/x11/way-displays/Makefile
index 09620637d470..8607b935ee34 100644
--- a/x11/way-displays/Makefile
+++ b/x11/way-displays/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	way-displays
 DISTVERSION=	1.14.1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Auto Manage Your Wayland Displays
 WWW=		https://github.com/alex-courtis/way-displays
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libinotify.so:devel/libinotify \
 		libudev.so:devel/libudev-devd \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libwayland-client.so:graphics/wayland \
 		libinput.so:x11/libinput
 TEST_DEPENDS=	cmocka>0:sysutils/cmocka
 
-USES=		compiler:c11 gmake localbase pkgconfig
+USES=		compiler:c11 gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	alex-courtis
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	VERSION="${DISTVERSIONFULL}"
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}" OFLAGS=
 TEST_TARGET=	test
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz \
 		"@sample ${ETCDIR}/cfg.yaml.sample"
 
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/src/cfg.c \
 		${WRKSRC}/tst/tst-cfg.c
 
 post-install:
 # Let @sample handle default files under etc/
 	@for f in ${STAGEDIR}${ETCDIR}/*; do \
 		${MV} $$f $$f.sample; \
 	done
 
 .include <bsd.port.mk>