diff --git a/lib/libc/include/generic-netbsd/riscv/wchar_limits.h b/lib/libc/include/generic-netbsd/riscv/wchar_limits.h
index 9ba1fa62988cf3fcf8371d1b1834ae891a90484f..2059bfd9b56bcc962463cec52936995b083939ad 100644
--- a/lib/libc/include/generic-netbsd/riscv/wchar_limits.h
+++ b/lib/libc/include/generic-netbsd/riscv/wchar_limits.h
@@ -1,13 +1,3 @@
 /* $NetBSD: wchar_limits.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
 
-// zig patch: https://github.com/llvm/llvm-project/issues/199678
-#ifndef _RISCV_WCHAR_LIMITS_H_
-#define _RISCV_WCHAR_LIMITS_H_
-
-#define	WCHAR_MIN	(-0x7fffffff-1)			/* wchar_t	  */
-#define	WCHAR_MAX	0x7fffffff			/* wchar_t	  */
-
-#define	WINT_MIN	(-0x7fffffff-1)			/* wint_t	  */
-#define	WINT_MAX	0x7fffffff			/* wint_t	  */
-
-#endif /* !_RISCV_WCHAR_LIMITS_H_ */
+#include <sys/common_wchar_limits.h>
diff --git a/lib/libc/include/riscv32-netbsd-none/machine/wchar_limits.h b/lib/libc/include/riscv32-netbsd-none/machine/wchar_limits.h
deleted file mode 100644
index 189dc45e9569fc0d42174cd1259f32700bf112bc..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv32-netbsd-none/machine/wchar_limits.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:12 christos Exp $	*/
-
-// zig patch: https://github.com/llvm/llvm-project/issues/199678
-#include <riscv/wchar_limits.h>
diff --git a/lib/libc/include/riscv64-netbsd-none/machine/wchar_limits.h b/lib/libc/include/riscv64-netbsd-none/machine/wchar_limits.h
deleted file mode 100644
index 189dc45e9569fc0d42174cd1259f32700bf112bc..0000000000000000000000000000000000000000
--- a/lib/libc/include/riscv64-netbsd-none/machine/wchar_limits.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:12 christos Exp $	*/
-
-// zig patch: https://github.com/llvm/llvm-project/issues/199678
-#include <riscv/wchar_limits.h>