6 files changed, 18 insertions, 1 deletions
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 */