diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index d270ce565ab0..e506f6a68907 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: xdr.h,v 1.24 2005/12/26 19:01:47 perry Exp $	*/
+/*	$NetBSD: xdr.h,v 1.25 2005/12/28 15:26:06 yamt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -154,7 +154,7 @@ typedef	bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
 #define xdr_putlong(xdrs, longp)			\
 	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
 
-static inline int
+static __inline int
 xdr_getint32(XDR *xdrs, int32_t *ip)
 {
 	long l;
@@ -165,7 +165,7 @@ xdr_getint32(XDR *xdrs, int32_t *ip)
 	return 1;
 }
 
-static inline int
+static __inline int
 xdr_putint32(XDR *xdrs, int32_t *ip)
 {
 	long l;
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 52fabd448dd3..cb225b40f8e3 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.h,v 1.11 2005/12/24 19:01:28 perry Exp $	*/
+/*	$NetBSD: tree.h,v 1.12 2005/12/28 15:33:47 yamt Exp $	*/
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -119,7 +119,7 @@ struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
 struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
 									\
 /* Finds the node with the same key as elm */				\
-static inline struct type *						\
+static __inline struct type *						\
 name##_SPLAY_FIND(struct name *head, struct type *elm)			\
 {									\
 	if (SPLAY_EMPTY(head))						\
@@ -130,7 +130,7 @@ name##_SPLAY_FIND(struct name *head, struct type *elm)			\
 	return (NULL);							\
 }									\
 									\
-static inline struct type *						\
+static __inline struct type *						\
 name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
 {									\
 	name##_SPLAY(head, elm);					\
@@ -144,7 +144,7 @@ name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
 	return (elm);							\
 }									\
 									\
-static inline struct type *						\
+static __inline struct type *						\
 name##_SPLAY_MIN_MAX(struct name *head, int val)			\
 {									\
 	name##_SPLAY_MINMAX(head, val);					\