* SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software were developed by Konstantin Belousov <kib@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ */
+
+#ifndef _SYS__UEXTERROR_H_
+#define	_SYS__UEXTERROR_H_
+
+#include <sys/_types.h>
+
+struct uexterror {
+	__uint32_t ver;
+	__uint32_t error;
+	__uint32_t cat;
+	__uint32_t src_line;
+	__uint64_t p1;
+	__uint64_t p2;
+	__uint64_t rsrv1[4];
+	char msg[128];
+};
+
+#endif
diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h
index 3fe2c7446ed1..2fb4c494d158 100644
--- a/sys/sys/exterrvar.h
+++ b/sys/sys/exterrvar.h
@@ -12,19 +12,8 @@
 #define	_SYS_EXTERRVAR_H_
 
 #include <sys/_exterr.h>
+#include <sys/_uexterror.h>
 #include <sys/exterr_cat.h>
-#include <sys/types.h>
-
-struct uexterror {
-	uint32_t ver;
-	uint32_t error;
-	uint32_t cat;
-	uint32_t src_line;
-	uint64_t p1;
-	uint64_t p2;
-	uint64_t rsrv1[4];
-	char msg[128];
-};
 
 #define	UEXTERROR_MAXLEN	256
 
@@ -66,6 +55,8 @@ int exterr_to_ue(struct thread *td, struct uexterror *ue);
 
 #else	/* _KERNEL */
 
+#include <sys/types.h>
+
 __BEGIN_DECLS
 int exterrctl(u_int op, u_int flags, void *ptr);
 __END_DECLS