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
@@ -34,7 +34,7 @@
 #define	_MACHINE_UCONTEXT_H_
 
 #if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-struct mcontext4 {
+struct freebsd4_mcontext {
 	__register_t	mc_onstack;	/* XXX - sigcontext compat. */
 	__register_t	mc_gs;		/* machine state (struct trapframe) */
 	__register_t	mc_fs;
diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -43,7 +43,7 @@
 #if defined(__i386__)
 struct freebsd4_ucontext {
 	sigset_t	uc_sigmask;
-	struct mcontext4 uc_mcontext;
+	struct freebsd4_mcontext uc_mcontext;
 	struct freebsd4_ucontext *uc_link;
 	stack_t		uc_stack;
 	int		__spare__[8];