Added __BEGIN_DECLS and __END_DECLS to the files that didn't have

it and that I could see needed it.

Should be pretty low impact as these are only defined when using C++.

58 files changed, 206 insertions, 5 deletions

diff --git a/include/cfgfile.h b/include/cfgfile.h
index 1eae1bc94..3e26f9c4c 100644
--- a/include/cfgfile.h
+++ b/include/cfgfile.h
@@ -2,7 +2,10 @@
 #define __CFGFILE_H__
 
 #include <stdio.h>
+
+__BEGIN_DECLS
 char ** cfgread(FILE *fp);
 char ** cfgfind(FILE *fp, char *var);
+__END_DECLS
 
 #endif /* __CFGFILE_H__ */
diff --git a/include/crypt.h b/include/crypt.h
index fd5d0f67f..6c7f6c85d 100644
--- a/include/crypt.h
+++ b/include/crypt.h
@@ -27,6 +27,8 @@
 
 #include <features.h>
 
+__BEGIN_DECLS
+
 /* Encrypt characters from KEY using salt to perturb the encryption method.
  * If salt begins with "$1$", md5 hashing is used instead of DES. */
 extern char *crypt (const char *__key, const char *__salt);
@@ -65,4 +67,7 @@ extern void setkey_r (const char *__key,
 
 extern void encrypt_r (char *__block, int __edflag,
 		       struct crypt_data * __data);
+
+__END_DECLS
+
 #endif	/* crypt.h */
diff --git a/include/ctype.h b/include/ctype.h
index 9ed73879c..477fac9b8 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -6,6 +6,8 @@
 
 #include <features.h>
 
+__BEGIN_DECLS
+
 /* For now, just always use the functions instead of the macros...*/
 #define __USE_CTYPE_C_FUNCTIONS
 
@@ -58,4 +60,6 @@ extern int toupper(int c);
 
 #endif
 
+__END_DECLS
+
 #endif /* __CTYPE_H */
diff --git a/include/errno.h b/include/errno.h
index da7f7a0e4..aa7e6bcae 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -4,6 +4,8 @@
 #include <features.h>
 #include <bits/errno.h>
 
+__BEGIN_DECLS
+
 extern int sys_nerr;
 extern const char *const sys_errlist[];
 
@@ -16,5 +18,6 @@ extern int	errno;
 extern void	perror __P ((__const char* __s));
 extern char*	strerror __P ((int __errno));
 
+__END_DECLS
 
 #endif
diff --git a/include/grp.h b/include/grp.h
index 4ecef44f0..c0db17e44 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -5,6 +5,8 @@
 #include <features.h>
 #include <stdio.h>
 
+__BEGIN_DECLS
+
 /* The group structure */
 struct group
 {
@@ -31,6 +33,8 @@ extern int initgroups __P ((__const char * user, gid_t gid));
 extern struct group * __getgrent __P ((int grp_fd));
 #endif
 
+__END_DECLS
+
 #endif /* _GRP_H */
 
 
diff --git a/include/locale.h b/include/locale.h
index 937c0f0d1..00e75d5b5 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -70,9 +70,13 @@ struct lconv
   char n_sign_posn;
 };
 
+__BEGIN_DECLS
+
 extern char *setlocale(int __category, __const char *__locale);
 
 /* Return the numeric/monetary information for the current locale.  */
 extern struct lconv *localeconv __P ((void));
 
+__END_DECLS
+
 #endif /* locale.h  */
diff --git a/include/malloc.h b/include/malloc.h
index c35ffe459..7ef63d8c7 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -4,6 +4,8 @@
 #include <features.h>
 #include <sys/types.h>
 
+__BEGIN_DECLS
+
 extern void free __P((void *));
 extern void *malloc __P((size_t));
 extern void *realloc __P((void *, size_t));
@@ -11,4 +13,6 @@ extern void *alloca __P((size_t));
 
 extern void *(*__alloca_alloc) __P((size_t));
 
+__END_DECLS
+
 #endif
diff --git a/include/math.h b/include/math.h
index 9aada8e42..752b12bdf 100644
--- a/include/math.h
+++ b/include/math.h
@@ -184,8 +184,10 @@ typedef struct
 
 
 /* Variable for error reporting.  See mtherr.c.  */
+__BEGIN_DECLS
 extern int mtherr(char *name, int code);
 extern int merror;
+__END_DECLS
 
 
 /* If you define UNK, then be sure to set BIGENDIAN properly. */
@@ -197,6 +199,7 @@ extern int merror;
 #endif
 
 
+
 #define __USE_ISOC9X
 /* Get general and ISO C 9X specific information.  */
 #include <bits/mathdef.h>
@@ -265,6 +268,7 @@ enum
      (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
 #endif
 
+__BEGIN_DECLS
 
 #ifdef __UCLIBC_HAS_LIBM_DOUBLE__
 /* Return nonzero value if sign of X is negative.  */
@@ -610,5 +614,6 @@ extern long double fmal(long double x, long double y, long double z);
       fpclassify (__u) == FP_NAN || fpclassify (__v) == FP_NAN; }))
 # endif
 
+__END_DECLS
 
 #endif /* math.h  */
diff --git a/include/net/slcompress.h b/include/net/slcompress.h
index 658edb7f8..fc3b000a9 100644
--- a/include/net/slcompress.h
+++ b/include/net/slcompress.h
@@ -1,7 +1,7 @@
 /*
  * Definitions for tcp compression routines.
  *
- * $Id: slcompress.h,v 1.1 2001/01/16 10:03:48 andersen Exp $
+ * $Id: slcompress.h,v 1.2 2001/07/11 13:47:42 davidm Exp $
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -137,6 +137,8 @@ struct slcompress {
 /* flag values */
 #define SLF_TOSS 1		/* tossing rcvd frames because of input err */
 
+__BEGIN_DECLS
+
 void	sl_compress_init __P((struct slcompress *));
 void	sl_compress_setup __P((struct slcompress *, int));
 u_int	sl_compress_tcp __P((struct mbuf *,
@@ -145,4 +147,6 @@ int	sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *));
 int	sl_uncompress_tcp_core __P((u_char *, int, int, u_int,
 	    struct slcompress *, u_char **, u_int *));
 
+__END_DECLS
+
 #endif /* _SLCOMPRESS_H_ */
diff --git a/include/net/vjcompress.h b/include/net/vjcompress.h
index 83785b277..c792fe5e7 100644
--- a/include/net/vjcompress.h
+++ b/include/net/vjcompress.h
@@ -1,7 +1,7 @@
 /*
  * Definitions for tcp compression routines.
  *
- * $Id: vjcompress.h,v 1.1 2001/01/16 10:03:48 andersen Exp $
+ * $Id: vjcompress.h,v 1.2 2001/07/11 13:47:42 davidm Exp $
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -130,6 +130,8 @@ struct vjcompress {
 /* flag values */
 #define VJF_TOSS 1		/* tossing rcvd frames because of input err */
 
+__BEGIN_DECLS
+
 extern void  vj_compress_init __P((struct vjcompress *comp, int max_state));
 extern u_int vj_compress_tcp __P((struct ip *ip, u_int mlen,
 				struct vjcompress *comp, int compress_cid_flag,
@@ -141,4 +143,6 @@ extern int   vj_uncompress_tcp __P((u_char *buf, int buflen, int total_len,
 				struct vjcompress *comp, u_char **hdrp,
 				u_int *hlenp));
 
+__END_DECLS
+
 #endif /* _VJCOMPRESS_H_ */
diff --git a/include/pty.h b/include/pty.h
index d8550840e..7c64359d2 100644
--- a/include/pty.h
+++ b/include/pty.h
@@ -25,6 +25,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
+__BEGIN_DECLS
 
 /* Create pseudo tty master slave pair with NAME and set terminal
    attributes according to TERMP and WINP and return handles for both
@@ -37,4 +38,6 @@ extern int openpty (int *__amaster, int *__aslave, char *__name,
 extern int forkpty (int *__amaster, char *__name,
 		    struct termios *__termp, struct winsize *__winp);
 
+__END_DECLS
+
 #endif	/* pty.h */
diff --git a/include/pwd.h b/include/pwd.h
index 64d8bc6ef..3377afd88 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -5,6 +5,8 @@
 #include <features.h>
 #include <stdio.h>
 
+__BEGIN_DECLS
+
 /* The passwd structure.  */
 struct passwd
 {
@@ -53,6 +55,7 @@ extern int __getpwent_r(struct passwd * passwd, char * line_buff,
 	size_t buflen, int pwd_fd);
 #endif
 
+__END_DECLS
 
 #endif /* pwd.h  */
 
diff --git a/include/resolv.h b/include/resolv.h
index e988347ad..9ac45959a 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <netinet/in.h>
 
+__BEGIN_DECLS
+
 struct resolv_header {
 	int id;
 	int qr,opcode,aa,tc,rd,ra,rcode;
@@ -83,4 +85,6 @@ extern int res_init(void);
 extern int res_query(const char *dname, int class, int type,
 	unsigned char *answer, int anslen);
 
+__END_DECLS
+
 #endif /*_RESOLV_H_*/
diff --git a/include/stdlib.h b/include/stdlib.h
index cdb3e8fee..e5588cb3b 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -6,6 +6,8 @@
 #include <sys/types.h>
 #include <limits.h>
 
+__BEGIN_DECLS
+
 /* Don't overwrite user definitions of NULL */
 #ifndef NULL
 #define NULL ((void *) 0)
@@ -121,5 +123,6 @@ extern ldiv_t ldiv __P ((long int __numer, long int __denom)) __attribute__ ((__
 extern char *mktemp __P ((char *__template));
 extern int mkstemp __P ((char *__template));
 
+__END_DECLS
 
 #endif /* __STDLIB_H */
diff --git a/include/string.h b/include/string.h
index 939b1a4b5..7122b7959 100644
--- a/include/string.h
+++ b/include/string.h
@@ -5,6 +5,7 @@
 #include <sys/types.h>
 #include <stddef.h>
 
+__BEGIN_DECLS
 /* Basic string functions */
 
 /* Return the length of S.  */
@@ -117,7 +118,7 @@ extern size_t strspn __P ((__const char *__s, __const char *__accept));
 extern char *strsignal __P ((int __sig));
 
 /* More BSD compatabilty */
-int bcmp(const void *s1, const void *s2, size_t n);
+extern int bcmp(const void *s1, const void *s2, size_t n);
 
 /* Linux silly hour */
 char *strfry __P ((char *));
@@ -147,4 +148,6 @@ extern size_t strnlen __P ((__const char *__string, size_t __maxlen));
       (char *) memcpy (__new, __old, __len);				      \
     }))
 
+__END_DECLS
+
 #endif
diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index 0cbc37f2a..7625a5b6b 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -13,6 +13,8 @@ struct utsname {
 	char domainname[65];
 };
 
+__BEGIN_DECLS
 extern int uname __P ((struct utsname * __utsbuf));
+__END_DECLS
 
 #endif
diff --git a/include/termcap.h b/include/termcap.h
index a7ae37b72..97624192c 100644
--- a/include/termcap.h
+++ b/include/termcap.h
@@ -5,6 +5,8 @@
 #include <features.h>
 #include <sys/types.h>
 
+__BEGIN_DECLS
+
 extern char PC;
 extern char *UP;
 extern char *BC;
@@ -18,4 +20,6 @@ extern char *tgetstr __P((const char *, char **));
 extern int tputs __P((const char *, int, int (*)(int)));
 extern char *tgoto __P((const char *, int, int));
 
+__END_DECLS
+
 #endif /* _TERMCAP_H */
diff --git a/include/utime.h b/include/utime.h
index 687e1348e..d2e42b275 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -4,6 +4,8 @@
 #include <features.h>
 #include <sys/types.h>
 
+__BEGIN_DECLS
+
 struct utimbuf {
 	time_t actime;
 	time_t modtime;
@@ -11,5 +13,7 @@ struct utimbuf {
 
 extern int utime __P ((const char *__filename, struct utimbuf *__utimebuf));
 
+__END_DECLS
+
 #endif
 
diff --git a/include/utmp.h b/include/utmp.h
index e362181aa..a9d5f53eb 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -23,6 +23,8 @@
 #define USER_PROCESS 7
 #define DEAD_PROCESS 8
 
+__BEGIN_DECLS
+
 struct utmp
 {
   short   ut_type;                 /* type of login */
@@ -52,5 +54,7 @@ extern void logwtmp (const char *line, const char *name, const char *host);
 struct utmp *           __getutent __P ((int));
 #endif
 
+__END_DECLS
+
 #endif /* __UTMP_H */
 
diff --git a/libc/sysdeps/linux/arm/bits/dlfcn.h b/libc/sysdeps/linux/arm/bits/dlfcn.h
index 0039eda14..f724d0fdf 100644
--- a/libc/sysdeps/linux/arm/bits/dlfcn.h
+++ b/libc/sysdeps/linux/arm/bits/dlfcn.h
@@ -55,5 +55,7 @@
   (_dl_mcount_wrapper_check (fctp), (*(fctp)) args)
 
 /* This function calls the profiling functions.  */
+__BEGIN_DECLS
 extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW;
+__END_DECLS
 #endif
diff --git a/libc/sysdeps/linux/arm/bits/errno.h b/libc/sysdeps/linux/arm/bits/errno.h
index 0c33c9c0a..ba3049599 100644
--- a/libc/sysdeps/linux/arm/bits/errno.h
+++ b/libc/sysdeps/linux/arm/bits/errno.h
@@ -32,6 +32,7 @@
 # define ECANCELED	125
 
 # ifndef __ASSEMBLER__
+   __BEGIN_DECLS
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
@@ -47,6 +48,7 @@ extern int *__errno_location (void) __attribute__ ((__const__));
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
 #  endif
+   __END_DECLS
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
diff --git a/libc/sysdeps/linux/arm/bits/mathcalls.h b/libc/sysdeps/linux/arm/bits/mathcalls.h
index 9334e7fa4..a3ab88785 100644
--- a/libc/sysdeps/linux/arm/bits/mathcalls.h
+++ b/libc/sysdeps/linux/arm/bits/mathcalls.h
@@ -48,6 +48,7 @@
 #endif
 
 
+__BEGIN_DECLS
 /* Trigonometric functions.  */
 
 /* Arc cosine of X.  */
@@ -338,4 +339,7 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
 
 /* Multiply-add function computed as a ternary operation.  */
 __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
+
 #endif /* Use ISO C99.  */
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/arm/bits/sigset.h b/libc/sysdeps/linux/arm/bits/sigset.h
index 66a9c51c5..0c751af50 100644
--- a/libc/sysdeps/linux/arm/bits/sigset.h
+++ b/libc/sysdeps/linux/arm/bits/sigset.h
@@ -32,7 +32,6 @@ typedef struct
 
 #endif
 
-
 /* We only want to define these functions if <signal.h> was actually
    included; otherwise we were included just to define the types.  Since we
    are namespace-clean, it wouldn't hurt to define extra macros.  But
@@ -97,6 +96,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +122,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/arm/bits/sigthread.h b/libc/sysdeps/linux/arm/bits/sigthread.h
index c9b1dcf1b..c213614be 100644
--- a/libc/sysdeps/linux/arm/bits/sigthread.h
+++ b/libc/sysdeps/linux/arm/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/arm/bits/sockaddr.h b/libc/sysdeps/linux/arm/bits/sockaddr.h
index 1c523444b..8078963a8 100644
--- a/libc/sysdeps/linux/arm/bits/sockaddr.h
+++ b/libc/sysdeps/linux/arm/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -41,4 +42,6 @@ typedef unsigned short int sa_family_t;
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
+
 #endif	/* bits/sockaddr.h */
diff --git a/libc/sysdeps/linux/i386/bits/cmathcalls.h b/libc/sysdeps/linux/i386/bits/cmathcalls.h
index f063042b0..c1b0781b0 100644
--- a/libc/sysdeps/linux/i386/bits/cmathcalls.h
+++ b/libc/sysdeps/linux/i386/bits/cmathcalls.h
@@ -47,6 +47,7 @@
 
 #define _Mdouble_complex_ _Mdouble_ _Complex
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -155,3 +156,5 @@ __MATH_PRECNAME(conj) (_Mdouble_complex_ __z)
 }
 
 #endif
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/i386/bits/errno.h b/libc/sysdeps/linux/i386/bits/errno.h
index 35bd61109..992358eb7 100644
--- a/libc/sysdeps/linux/i386/bits/errno.h
+++ b/libc/sysdeps/linux/i386/bits/errno.h
@@ -24,6 +24,8 @@
 # undef ERANGE
 # include <linux/errno.h>
 
+__BEGIN_DECLS
+
 /* Linux has no ENOTSUP error code.  */
 # define ENOTSUP EOPNOTSUPP
 
@@ -50,6 +52,8 @@ extern int *__errno_location __P ((void)) __attribute__ ((__const__));
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
+__END_DECLS
+
 #if !defined _ERRNO_H && defined __need_Emath
 /* This is ugly but the kernel header is not clean enough.  We must
    define only the values EDOM and ERANGE in case __need_Emath is
diff --git a/libc/sysdeps/linux/i386/bits/mathcalls.h b/libc/sysdeps/linux/i386/bits/mathcalls.h
index 97bda451a..f261ace0f 100644
--- a/libc/sysdeps/linux/i386/bits/mathcalls.h
+++ b/libc/sysdeps/linux/i386/bits/mathcalls.h
@@ -47,6 +47,7 @@
  #error "Never include <bits/mathcalls.h> directly; include <math.h> instead."
 #endif
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -334,3 +335,5 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
 /* Multiply-add function computed as a ternary operation.  */
 __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
 #endif /* Use ISO C 9X.  */
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/i386/bits/sigset.h b/libc/sysdeps/linux/i386/bits/sigset.h
index 66a9c51c5..de852a8a0 100644
--- a/libc/sysdeps/linux/i386/bits/sigset.h
+++ b/libc/sysdeps/linux/i386/bits/sigset.h
@@ -97,6 +97,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +123,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/i386/bits/sigthread.h b/libc/sysdeps/linux/i386/bits/sigthread.h
index c9b1dcf1b..a63319c52 100644
--- a/libc/sysdeps/linux/i386/bits/sigthread.h
+++ b/libc/sysdeps/linux/i386/bits/sigthread.h
@@ -26,6 +26,8 @@
 
 /* Functions for handling signals. */
 
+__BEGIN_DECLS
+
 /* Modify the signal mask for the calling thread.  The arguments have
    the same meaning as for sigprocmask(2). */
 extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/i386/bits/sockaddr.h b/libc/sysdeps/linux/i386/bits/sockaddr.h
index 1c523444b..1cddab4d8 100644
--- a/libc/sysdeps/linux/i386/bits/sockaddr.h
+++ b/libc/sysdeps/linux/i386/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -39,6 +40,8 @@ typedef unsigned short int sa_family_t;
 
 /* Return the length of a `sockaddr' structure.  */
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
+
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
 #endif	/* bits/sockaddr.h */
diff --git a/libc/sysdeps/linux/m68k/bits/cmathcalls.h b/libc/sysdeps/linux/m68k/bits/cmathcalls.h
index f063042b0..842d2c135 100644
--- a/libc/sysdeps/linux/m68k/bits/cmathcalls.h
+++ b/libc/sysdeps/linux/m68k/bits/cmathcalls.h
@@ -47,6 +47,7 @@
 
 #define _Mdouble_complex_ _Mdouble_ _Complex
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -153,5 +154,6 @@ __MATH_PRECNAME(conj) (_Mdouble_complex_ __z)
 {
   return ~__z;
 }
-
 #endif
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/m68k/bits/errno.h b/libc/sysdeps/linux/m68k/bits/errno.h
index 35bd61109..7a0bd8150 100644
--- a/libc/sysdeps/linux/m68k/bits/errno.h
+++ b/libc/sysdeps/linux/m68k/bits/errno.h
@@ -24,6 +24,8 @@
 # undef ERANGE
 # include <linux/errno.h>
 
+__BEGIN_DECLS
+
 /* Linux has no ENOTSUP error code.  */
 # define ENOTSUP EOPNOTSUPP
 
@@ -58,3 +60,5 @@ extern int *__errno_location __P ((void)) __attribute__ ((__const__));
 # define EILSEQ	84	/* Illegal byte sequence.  */
 # define ERANGE	34	/* Math result not representable.  */
 #endif /* !_ERRNO_H && __need_Emath */
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/m68k/bits/setjmp.h b/libc/sysdeps/linux/m68k/bits/setjmp.h
index 5680ffe04..08b2d2500 100644
--- a/libc/sysdeps/linux/m68k/bits/setjmp.h
+++ b/libc/sysdeps/linux/m68k/bits/setjmp.h
@@ -49,8 +49,10 @@ typedef struct
 
 /* Simple version of sigsetjmp and siglongjmp */
 
+__BEGIN_DECLS
 extern int __setjmp(__jmp_buf __buf);
 extern int __longjmp(__jmp_buf __buf, int __val);
+__END_DECLS
 
 #define longjmp(buf, val) __longjmp(buf, val)
 
diff --git a/libc/sysdeps/linux/m68k/bits/sigthread.h b/libc/sysdeps/linux/m68k/bits/sigthread.h
index c9b1dcf1b..c213614be 100644
--- a/libc/sysdeps/linux/m68k/bits/sigthread.h
+++ b/libc/sysdeps/linux/m68k/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/m68k/bits/sockaddr.h b/libc/sysdeps/linux/m68k/bits/sockaddr.h
index 1c523444b..8078963a8 100644
--- a/libc/sysdeps/linux/m68k/bits/sockaddr.h
+++ b/libc/sysdeps/linux/m68k/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -41,4 +42,6 @@ typedef unsigned short int sa_family_t;
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
+
 #endif	/* bits/sockaddr.h */
diff --git a/libc/sysdeps/linux/m68k/bits/socket.h b/libc/sysdeps/linux/m68k/bits/socket.h
index dc2d58cfc..a4b090e2b 100644
--- a/libc/sysdeps/linux/m68k/bits/socket.h
+++ b/libc/sysdeps/linux/m68k/bits/socket.h
@@ -244,8 +244,10 @@ struct cmsghdr
 			 + CMSG_ALIGN (sizeof (struct cmsghdr)))
 #define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
 
+__BEGIN_DECLS
 extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
 					   struct cmsghdr *__cmsg));
+__END_DECLS
 #ifdef __USE_EXTERN_INLINES
 # ifndef _EXTERN_INLINE
 #  define _EXTERN_INLINE extern __inline
diff --git a/libc/sysdeps/linux/mips/bits/cmathcalls.h b/libc/sysdeps/linux/mips/bits/cmathcalls.h
index 2d186c41e..6679500be 100644
--- a/libc/sysdeps/linux/mips/bits/cmathcalls.h
+++ b/libc/sysdeps/linux/mips/bits/cmathcalls.h
@@ -47,6 +47,7 @@
 
 #define _Mdouble_complex_ _Mdouble_ _Complex
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -156,3 +157,5 @@ __MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW
 }
 
 #endif
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/mips/bits/dlfcn.h b/libc/sysdeps/linux/mips/bits/dlfcn.h
index 006eeb683..21aac6542 100644
--- a/libc/sysdeps/linux/mips/bits/dlfcn.h
+++ b/libc/sysdeps/linux/mips/bits/dlfcn.h
@@ -54,6 +54,8 @@
 # define DL_CALL_FCT(fctp, args) \
   (_dl_mcount_wrapper_check (fctp), (*(fctp)) args)
 
+__BEGIN_DECLS
 /* This function calls the profiling functions.  */
 extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW;
+__END_DECLS
 #endif
diff --git a/libc/sysdeps/linux/mips/bits/errno.h b/libc/sysdeps/linux/mips/bits/errno.h
index e0c1dc5c6..53db5dd7b 100644
--- a/libc/sysdeps/linux/mips/bits/errno.h
+++ b/libc/sysdeps/linux/mips/bits/errno.h
@@ -28,6 +28,9 @@
 # define ENOTSUP EOPNOTSUPP
 
 # ifndef __ASSEMBLER__
+
+__BEGIN_DECLS
+
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
@@ -43,6 +46,9 @@ extern int *__errno_location (void);
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
 #  endif
+
+__END_DECLS
+
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
diff --git a/libc/sysdeps/linux/mips/bits/libc-lock.h b/libc/sysdeps/linux/mips/bits/libc-lock.h
index dbd9cc14f..fa43d4839 100644
--- a/libc/sysdeps/linux/mips/bits/libc-lock.h
+++ b/libc/sysdeps/linux/mips/bits/libc-lock.h
@@ -200,6 +200,8 @@ typedef pthread_key_t __libc_key_t;
 /* Functions that are used by this file and are internal to the GNU C
    library.  */
 
+__BEGIN_DECLS
+
 extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
 				 __const pthread_mutexattr_t *__mutex_attr);
 
@@ -250,6 +252,7 @@ extern int __pthread_atfork (void (*__prepare) (void),
 			     void (*__parent) (void),
 			     void (*__child) (void));
 
+__END_DECLS
 
 
 /* Make the pthread functions weak so that we can elide them from
diff --git a/libc/sysdeps/linux/mips/bits/sigset.h b/libc/sysdeps/linux/mips/bits/sigset.h
index 66a9c51c5..de852a8a0 100644
--- a/libc/sysdeps/linux/mips/bits/sigset.h
+++ b/libc/sysdeps/linux/mips/bits/sigset.h
@@ -97,6 +97,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +123,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/mips/bits/sigthread.h b/libc/sysdeps/linux/mips/bits/sigthread.h
index b86e75f20..8ca688c59 100644
--- a/libc/sysdeps/linux/mips/bits/sigthread.h
+++ b/libc/sysdeps/linux/mips/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -35,4 +37,6 @@ extern int pthread_sigmask (int __how,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill (pthread_t __thread, int __signo) __THROW;
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/powerpc/bits/dlfcn.h b/libc/sysdeps/linux/powerpc/bits/dlfcn.h
index 0039eda14..f724d0fdf 100644
--- a/libc/sysdeps/linux/powerpc/bits/dlfcn.h
+++ b/libc/sysdeps/linux/powerpc/bits/dlfcn.h
@@ -55,5 +55,7 @@
   (_dl_mcount_wrapper_check (fctp), (*(fctp)) args)
 
 /* This function calls the profiling functions.  */
+__BEGIN_DECLS
 extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW;
+__END_DECLS
 #endif
diff --git a/libc/sysdeps/linux/powerpc/bits/errno.h b/libc/sysdeps/linux/powerpc/bits/errno.h
index 7da7daf79..a5365caba 100644
--- a/libc/sysdeps/linux/powerpc/bits/errno.h
+++ b/libc/sysdeps/linux/powerpc/bits/errno.h
@@ -32,6 +32,9 @@
 # define ECANCELED	125
 
 # ifndef __ASSEMBLER__
+
+__BEGIN_DECLS
+
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
@@ -47,6 +50,9 @@ extern int *__errno_location (void);
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
 #  endif
+
+__END_DECLS
+
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
diff --git a/libc/sysdeps/linux/powerpc/bits/sigset.h b/libc/sysdeps/linux/powerpc/bits/sigset.h
index 66a9c51c5..de852a8a0 100644
--- a/libc/sysdeps/linux/powerpc/bits/sigset.h
+++ b/libc/sysdeps/linux/powerpc/bits/sigset.h
@@ -97,6 +97,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +123,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/powerpc/bits/sigthread.h b/libc/sysdeps/linux/powerpc/bits/sigthread.h
index c9b1dcf1b..c213614be 100644
--- a/libc/sysdeps/linux/powerpc/bits/sigthread.h
+++ b/libc/sysdeps/linux/powerpc/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/powerpc/bits/sockaddr.h b/libc/sysdeps/linux/powerpc/bits/sockaddr.h
index 1c523444b..8078963a8 100644
--- a/libc/sysdeps/linux/powerpc/bits/sockaddr.h
+++ b/libc/sysdeps/linux/powerpc/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -41,4 +42,6 @@ typedef unsigned short int sa_family_t;
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
+
 #endif	/* bits/sockaddr.h */
diff --git a/libc/sysdeps/linux/sh/bits/cmathcalls.h b/libc/sysdeps/linux/sh/bits/cmathcalls.h
index f063042b0..c1b0781b0 100644
--- a/libc/sysdeps/linux/sh/bits/cmathcalls.h
+++ b/libc/sysdeps/linux/sh/bits/cmathcalls.h
@@ -47,6 +47,7 @@
 
 #define _Mdouble_complex_ _Mdouble_ _Complex
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -155,3 +156,5 @@ __MATH_PRECNAME(conj) (_Mdouble_complex_ __z)
 }
 
 #endif
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/sh/bits/errno.h b/libc/sysdeps/linux/sh/bits/errno.h
index 35bd61109..968e178ea 100644
--- a/libc/sysdeps/linux/sh/bits/errno.h
+++ b/libc/sysdeps/linux/sh/bits/errno.h
@@ -32,6 +32,9 @@
 # define ECANCELED	125
 
 # ifndef __ASSEMBLER__
+
+__BEGIN_DECLS
+
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
@@ -47,6 +50,9 @@ extern int *__errno_location __P ((void)) __attribute__ ((__const__));
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
 #  endif
+
+__END_DECLS
+
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
diff --git a/libc/sysdeps/linux/sh/bits/sigset.h b/libc/sysdeps/linux/sh/bits/sigset.h
index 66a9c51c5..de852a8a0 100644
--- a/libc/sysdeps/linux/sh/bits/sigset.h
+++ b/libc/sysdeps/linux/sh/bits/sigset.h
@@ -97,6 +97,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +123,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/sh/bits/sigthread.h b/libc/sysdeps/linux/sh/bits/sigthread.h
index c9b1dcf1b..c213614be 100644
--- a/libc/sysdeps/linux/sh/bits/sigthread.h
+++ b/libc/sysdeps/linux/sh/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/sh/bits/sockaddr.h b/libc/sysdeps/linux/sh/bits/sockaddr.h
index 1c523444b..8078963a8 100644
--- a/libc/sysdeps/linux/sh/bits/sockaddr.h
+++ b/libc/sysdeps/linux/sh/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -41,4 +42,6 @@ typedef unsigned short int sa_family_t;
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
+
 #endif	/* bits/sockaddr.h */
diff --git a/libc/sysdeps/linux/sparc/bits/cmathcalls.h b/libc/sysdeps/linux/sparc/bits/cmathcalls.h
index f063042b0..c1b0781b0 100644
--- a/libc/sysdeps/linux/sparc/bits/cmathcalls.h
+++ b/libc/sysdeps/linux/sparc/bits/cmathcalls.h
@@ -47,6 +47,7 @@
 
 #define _Mdouble_complex_ _Mdouble_ _Complex
 
+__BEGIN_DECLS
 
 /* Trigonometric functions.  */
 
@@ -155,3 +156,5 @@ __MATH_PRECNAME(conj) (_Mdouble_complex_ __z)
 }
 
 #endif
+
+__END_DECLS
diff --git a/libc/sysdeps/linux/sparc/bits/errno.h b/libc/sysdeps/linux/sparc/bits/errno.h
index 35bd61109..968e178ea 100644
--- a/libc/sysdeps/linux/sparc/bits/errno.h
+++ b/libc/sysdeps/linux/sparc/bits/errno.h
@@ -32,6 +32,9 @@
 # define ECANCELED	125
 
 # ifndef __ASSEMBLER__
+
+__BEGIN_DECLS
+
 /* We now need a declaration of the `errno' variable.  */
 extern int errno;
 
@@ -47,6 +50,9 @@ extern int *__errno_location __P ((void)) __attribute__ ((__const__));
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
 #  endif
+
+__END_DECLS
+
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
 
diff --git a/libc/sysdeps/linux/sparc/bits/sigset.h b/libc/sysdeps/linux/sparc/bits/sigset.h
index 66a9c51c5..de852a8a0 100644
--- a/libc/sysdeps/linux/sparc/bits/sigset.h
+++ b/libc/sysdeps/linux/sparc/bits/sigset.h
@@ -97,6 +97,8 @@ typedef struct
 #  endif
 # endif
 
+__BEGIN_DECLS
+
 /* These functions needn't check for a bogus signal number -- error
    checking is done in the non __ versions.  */
 
@@ -121,5 +123,6 @@ __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 #  undef __SIGSETFN
 # endif
 
+__END_DECLS
 
 #endif /* ! _SIGSET_H_fns.  */
diff --git a/libc/sysdeps/linux/sparc/bits/sigthread.h b/libc/sysdeps/linux/sparc/bits/sigthread.h
index c9b1dcf1b..c213614be 100644
--- a/libc/sysdeps/linux/sparc/bits/sigthread.h
+++ b/libc/sysdeps/linux/sparc/bits/sigthread.h
@@ -24,6 +24,8 @@
 # error "Never include this file directly.  Use <pthread.h> instead"
 #endif
 
+__BEGIN_DECLS
+
 /* Functions for handling signals. */
 
 /* Modify the signal mask for the calling thread.  The arguments have
@@ -34,4 +36,6 @@ extern int pthread_sigmask __P ((int __how, __const __sigset_t *__newmask,
 /* Send signal SIGNO to the given thread. */
 extern int pthread_kill __P ((pthread_t __thread, int __signo));
 
+__END_DECLS
+
 #endif	/* bits/sigthread.h */
diff --git a/libc/sysdeps/linux/sparc/bits/sockaddr.h b/libc/sysdeps/linux/sparc/bits/sockaddr.h
index 1c523444b..8078963a8 100644
--- a/libc/sysdeps/linux/sparc/bits/sockaddr.h
+++ b/libc/sysdeps/linux/sparc/bits/sockaddr.h
@@ -24,6 +24,7 @@
 #ifndef _BITS_SOCKADDR_H
 #define _BITS_SOCKADDR_H	1
 
+__BEGIN_DECLS
 
 /* POSIX.1g specifies this type name for the `sa_family' member.  */
 typedef unsigned short int sa_family_t;
@@ -41,4 +42,6 @@ typedef unsigned short int sa_family_t;
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len __P ((sa_family_t __af));
 
+__END_DECLS
+
 #endif	/* bits/sockaddr.h */