diff --git a/sys/sparc64/include/signal.h b/sys/sparc64/include/signal.h
index 63d7d750ade1..b13db13bb2b7 100644
--- a/sys/sparc64/include/signal.h
+++ b/sys/sparc64/include/signal.h
@@ -44,7 +44,7 @@ typedef	long sig_atomic_t;
 
 #define	MINSIGSTKSZ	(1024 * 4)
 
-typedef	u_int osigset_t;
+typedef	int osigset_t;
 
 struct osigcontext {
 };
diff --git a/sys/sparc64/include/ucontext.h b/sys/sparc64/include/ucontext.h
index efdca33e4866..e4382bc460c4 100644
--- a/sys/sparc64/include/ucontext.h
+++ b/sys/sparc64/include/ucontext.h
@@ -33,8 +33,8 @@
 #define	_MACHINE_UCONTEXT_H_
 
 typedef struct __mcontext {
-	u_long	mc_global[8];
-	u_long	mc_out[8];
+	long	mc_global[8];
+	long	mc_out[8];
 	long	mc_onstack;
 	long	mc_sp;
 	long	mc_tpc;