diff --git a/srcpkgs/hikari/patches/restack_xwayland_windows.patch b/srcpkgs/hikari/patches/restack_xwayland_windows.patch
deleted file mode 100644
index 91fc5f47fae..00000000000
--- a/srcpkgs/hikari/patches/restack_xwayland_windows.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/xwayland_view.c	2023-10-02 23:25:53.794255011 -0400
-+++ b/src/xwayland_view.c	2023-10-02 23:26:17.173265450 -0400
-@@ -304,6 +304,7 @@
-   struct wlr_xwayland_surface *xwayland_surface = xwayland_view->surface;
- 
-   wlr_xwayland_surface_activate(xwayland_surface, active);
-+  wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_ABOVE);
-   wlr_xwayland_set_seat(hikari_server.xwayland, hikari_server.seat);
- }
- 
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
deleted file mode 100644
index 5ccc9a293fd..00000000000
--- a/srcpkgs/hikari/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'hikari'
-pkgname=hikari
-version=2.3.3
-revision=3
-build_style=gnu-makefile
-make_cmd=bmake
-make_use_env=yes
-make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
- WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
-make_install_args="ETC_PREFIX= WITHOUT_SUID=YES"
-hostmakedepends="bmake pkg-config wayland-devel"
-makedepends="wlroots0.15-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
-short_desc="Stacking Wayland compositor with tiling features"
-maintainer="yosh <yosh-git@riseup.net>"
-license="BSD-2-Clause"
-homepage="https://hikari.acmelabs.space"
-changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=40736ff326e11a51128c1739051a692ad2c79173fc4b695c8be5ec7a614b4de2
-conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
-# bmake's -q flag seems to differ in behavior from gnu make which causes the
-# build style's handling of the check target not existing to fail.
-make_check=no
-
-pre_build() {
-	# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
-	# bmake ignores these appends altogether when passing variables on the
-	# command line (i.e., when make_use_env is undefined), but it ignores
-	# the values in the environment when make_use_env=yes. The _EXTRA
-	# variables provided in the Makefile allow us to force the right flags.
-	export CFLAGS_EXTRA="${CFLAGS} -Wno-error"
-	export LDFLAGS_EXTRA="${LDFLAGS}"
-
-	# bmake tends to ignore CC in the environment
-	make_build_args+=" CC=$CC"
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6aae4e4b2e2..d49aa7d571a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -208,6 +208,7 @@ replaces="
  gx<=0.14.3_1
  hangups<=0.4.18_2
  hardinfo<=0.5.1_14
+ hikari<=2.3.3_3
  httperf<=0.9.0_9
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1