2 files changed, 10 insertions, 3 deletions

diff --git a/sys/alpha/include/sigframe.h b/sys/alpha/include/sigframe.h
index 4ed62f4d75cb..eb8039b8532a 100644
--- a/sys/alpha/include/sigframe.h
+++ b/sys/alpha/include/sigframe.h
@@ -31,15 +31,17 @@
 #ifndef _MACHINE_SIGFRAME_H_
 #define _MACHINE_SIGFRAME_H_ 1
 
+#ifdef _KERNEL
 struct osigframe {
 	struct osigcontext	sf_sc;
 	osiginfo_t		sf_si;
 };
+#endif
 
 struct sigframe {
-	unsigned long	__spare__;
-	ucontext_t	sf_uc;
-	siginfo_t	sf_si;
+	unsigned long		__spare__;
+	struct __ucontext	sf_uc;
+	siginfo_t		sf_si;
 };
 
 #endif /* _MACHINE_SIGFRAME_H_ */
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 4bc7b29a0c7f..4b20eac2df1c 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -42,6 +42,10 @@ typedef long	sig_atomic_t;
 #define	MINSIGSTKSZ	(1024 * 4)
 
 /*
+ * Only the kernel should need these old type definitions.
+ */
+#ifdef _KERNEL
+/*
  * Information pushed on stack when a signal is delivered.
  * This is used by the kernel to restore state following
  * execution of the signal handler.  It is also made available
@@ -70,6 +74,7 @@ struct  osigcontext {
 	unsigned long sc_traparg_a2;	/* a2 argument to trap at exception */
 	long	sc_xxx2[3];		/* sc_fp_trap_pc, sc_fp_trigger_sum, sc_fp_trigger_inst */
 };
+#endif
 
 /*
  * The sequence of the fields should match those in