diff --git a/sys/arch/alpha/include/alpha_cpu.h b/sys/arch/alpha/include/alpha_cpu.h
index b985954748c7..68bd30162be3 100644
--- a/sys/arch/alpha/include/alpha_cpu.h
+++ b/sys/arch/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_cpu.h,v 1.39 2000/04/03 01:10:17 thorpej Exp $ */
+/* $NetBSD: alpha_cpu.h,v 1.40 2000/06/08 02:53:47 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -320,14 +320,11 @@ const char	*alpha_dsr_sysname __P((void));
 /*
  * Stubs for Alpha instructions normally inaccessible from C.
  */
-unsigned long	alpha_amask __P((unsigned long));
-unsigned long	alpha_implver __P((void));
-
-static __inline unsigned long alpha_rpcc __P((void))
-	__attribute__((__unused__));
+unsigned long	alpha_amask(unsigned long);
+unsigned long	alpha_implver(void);
 
 static __inline unsigned long
-alpha_rpcc()
+alpha_rpcc(void)
 {
 	unsigned long v0;
 
@@ -343,38 +340,11 @@ alpha_rpcc()
  */
 #include <machine/pal.h>
 
-void		alpha_pal_cflush __P((unsigned long));
-void		alpha_pal_halt __P((void)) __attribute__((__noreturn__));
-unsigned long	_alpha_pal_swpipl __P((unsigned long));	/* for profiling */
-void		alpha_pal_wrent __P((void *, unsigned long));
-void		alpha_pal_wrvptptr __P((unsigned long));
-
-static __inline unsigned long alpha_pal_rdmces __P((void))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_rdps __P((void))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_rdusp __P((void))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_rdval __P((void))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_swpctx __P((unsigned long))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_swpipl __P((unsigned long))
-	__attribute__((__unused__));
-static __inline void alpha_pal_tbi __P((unsigned long, vaddr_t))
-	__attribute__((__unused__));
-static __inline unsigned long alpha_pal_whami __P((void))
-	__attribute__((__unused__));
-static __inline void alpha_pal_wrfen __P((unsigned long))
-	__attribute__((__unused__));
-static __inline void alpha_pal_wripir __P((unsigned long))
-	__attribute__((__unused__));
-static __inline void alpha_pal_wrusp __P((unsigned long))
-	__attribute__((__unused__));
-static __inline void alpha_pal_wrmces __P((unsigned long))
-	__attribute__((__unused__));
-static __inline void alpha_pal_wrval __P((unsigned long))
-	__attribute__((__unused__));
+void		alpha_pal_cflush(unsigned long);
+void		alpha_pal_halt(void) __attribute__((__noreturn__));
+unsigned long	_alpha_pal_swpipl(unsigned long);	/* for profiling */
+void		alpha_pal_wrent(void *, unsigned long);
+void		alpha_pal_wrvptptr(unsigned long);
 
 #define	alpha_pal_draina() __asm __volatile("call_pal %0 # PAL_draina"	\
 				: : "i" (PAL_draina) : "memory")
@@ -383,7 +353,7 @@ static __inline void alpha_pal_wrval __P((unsigned long))
 				: : "i" (PAL_imb) : "memory")
 
 static __inline unsigned long
-alpha_pal_rdmces()
+alpha_pal_rdmces(void)
 {
 	register unsigned long v0 __asm("$0");
 
@@ -397,7 +367,7 @@ alpha_pal_rdmces()
 }
 
 static __inline unsigned long
-alpha_pal_rdps()
+alpha_pal_rdps(void)
 {
 	register unsigned long v0 __asm("$0");
 
@@ -411,7 +381,7 @@ alpha_pal_rdps()
 }
 
 static __inline unsigned long
-alpha_pal_rdusp()
+alpha_pal_rdusp(void)
 {
 	register unsigned long v0 __asm("$0");
 
@@ -425,7 +395,7 @@ alpha_pal_rdusp()
 }
 
 static __inline unsigned long
-alpha_pal_rdval()
+alpha_pal_rdval(void)
 {
 	register unsigned long v0 __asm("$0");
 
@@ -482,7 +452,7 @@ alpha_pal_tbi(unsigned long op, vaddr_t va)
 }
 
 static __inline unsigned long
-alpha_pal_whami()
+alpha_pal_whami(void)
 {
 	register unsigned long v0 __asm("$0");
 
diff --git a/sys/arch/alpha/include/atomic.h b/sys/arch/alpha/include/atomic.h
index a9a0bf69326a..d2a9d0602ed3 100644
--- a/sys/arch/alpha/include/atomic.h
+++ b/sys/arch/alpha/include/atomic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.4 2000/05/23 05:12:55 thorpej Exp $ */
+/* $NetBSD: atomic.h,v 1.5 2000/06/08 02:54:55 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -44,24 +44,6 @@
 #ifndef _ALPHA_ATOMIC_H_
 #define	_ALPHA_ATOMIC_H_
 
-static __inline void atomic_setbits_ulong
-	__P((__volatile unsigned long *, unsigned long))
-	__attribute__((__unused__));
-static __inline void atomic_clearbits_ulong
-	__P((__volatile unsigned long *, unsigned long))
-	__attribute__((__unused__));
-
-static __inline void atomic_add_ulong
-	__P((__volatile unsigned long *, unsigned long))
-	__attribute__((__unused__));
-static __inline void atomic_sub_ulong
-	__P((__volatile unsigned long *, unsigned long))
-	__attribute__((__unused__));
-
-static __inline unsigned long atomic_loadlatch_ulong
-	__P((__volatile unsigned long *, unsigned long))
-	__attribute__((__unused__));
-
 /*
  * atomic_setbits_ulong:
  *
diff --git a/sys/arch/alpha/include/bwx.h b/sys/arch/alpha/include/bwx.h
index af9c2a6339eb..c24cb1f03fd3 100644
--- a/sys/arch/alpha/include/bwx.h
+++ b/sys/arch/alpha/include/bwx.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwx.h,v 1.2 2000/03/05 18:46:15 thorpej Exp $ */
+/* $NetBSD: bwx.h,v 1.3 2000/06/08 02:55:37 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,19 +48,6 @@
  * See "Alpha Architecture Handbook, Version 3", DEC order number EC-QD2KB-TE.
  */
 
-static __inline u_int8_t alpha_ldbu __P((__volatile u_int8_t *))
-	__attribute__((__unused__));
-static __inline u_int16_t alpha_ldwu __P((__volatile u_int16_t *))
-	__attribute__((__unused__));
-static __inline void alpha_stb __P((__volatile u_int8_t *, u_int8_t))
-	__attribute__((__unused__));
-static __inline void alpha_stw __P((__volatile u_int16_t *, u_int16_t))
-	__attribute__((__unused__));
-static __inline u_int8_t alpha_sextb __P((u_int8_t))
-	__attribute__((__unused__));
-static __inline u_int16_t alpha_sextw __P((u_int16_t))
-	__attribute__((__unused__));
-
 static __inline u_int8_t
 alpha_ldbu(__volatile u_int8_t *a0)
 {
diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 8e80e2bbe1ee..ec96d9213667 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.9 1999/04/20 21:30:15 thorpej Exp $ */
+/* $NetBSD: db_machdep.h,v 1.10 2000/06/08 02:57:36 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -63,14 +63,14 @@ db_regs_t		ddb_regs;	/* register state */
  * Functions needed for software single-stepping.
  */
 
-boolean_t	db_inst_trap_return __P((int inst));
-boolean_t	db_inst_return __P((int inst));
-boolean_t	db_inst_call __P((int inst));
-boolean_t	db_inst_branch __P((int inst));
-boolean_t	db_inst_load __P((int inst));
-boolean_t	db_inst_store __P((int inst));
-boolean_t	db_inst_unconditional_flow_transfer __P((int inst));
-db_addr_t	db_branch_taken __P((int inst, db_addr_t pc, db_regs_t *regs));
+boolean_t	db_inst_trap_return(int inst);
+boolean_t	db_inst_return(int inst);
+boolean_t	db_inst_call(int inst);
+boolean_t	db_inst_branch(int inst);
+boolean_t	db_inst_load(int inst);
+boolean_t	db_inst_store(int inst);
+boolean_t	db_inst_unconditional_flow_transfer(int inst);
+db_addr_t	db_branch_taken(int inst, db_addr_t pc, db_regs_t *regs);
 
 #define	inst_trap_return(ins)	db_inst_trap_return(ins)
 #define	inst_return(ins)	db_inst_return(ins)
@@ -86,12 +86,12 @@ db_addr_t	db_branch_taken __P((int inst, db_addr_t pc, db_regs_t *regs));
 /* No delay slots on Alpha. */
 #define	next_instr_address(v, b) ((db_addr_t) ((b) ? (v) : ((v) + 4)))
 
-u_long	db_register_value __P((db_regs_t *, int));
-int	ddb_trap __P((unsigned long, unsigned long, unsigned long,
-	    unsigned long, struct trapframe *));
+u_long	db_register_value(db_regs_t *, int);
+int	ddb_trap(unsigned long, unsigned long, unsigned long,
+	    unsigned long, struct trapframe *);
 
-int	alpha_debug __P((unsigned long, unsigned long, unsigned long,
-	    unsigned long, struct trapframe *));
+int	alpha_debug(unsigned long, unsigned long, unsigned long,
+	    unsigned long, struct trapframe *);
 
 /*
  * We define some of our own commands.