diff --git a/sys/i386/include/ucontext.h b/sys/i386/include/ucontext.h
--- a/sys/i386/include/ucontext.h
+++ b/sys/i386/include/ucontext.h
@@ -58,6 +58,14 @@
 	__register_t	mc_fpregs[28];	/* env87 + fpacc87 + u_long */
 	__register_t	__spare__[17];
 };
+
+struct freebsd4_ucontext {
+	sigset_t	uc_sigmask;
+	struct freebsd4_mcontext uc_mcontext;
+	struct freebsd4_ucontext *uc_link;
+	stack_t		uc_stack;
+	int		__spare__[8];
+};
 #endif
 
 #include <x86/ucontext.h>
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -39,20 +39,6 @@
 
 #define	UCF_SWAPPED	0x00000001	/* Used by swapcontext(3). */
 
-#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-#if defined(__i386__)
-struct freebsd4_ucontext {
-	sigset_t	uc_sigmask;
-	struct freebsd4_mcontext uc_mcontext;
-	struct freebsd4_ucontext *uc_link;
-	stack_t		uc_stack;
-	int		__spare__[8];
-};
-#else	/* __i386__ */
-#define freebsd4_ucontext ucontext
-#endif	/* __i386__ */
-#endif	/* _KERNEL */
-
 #ifndef _KERNEL
 
 __BEGIN_DECLS