--- include/xattr.h.orig	2013-03-01 20:24:44.620880695 +0100
+++ include/xattr.h	2013-03-01 20:26:28.802885344 +0100
@@ -31,33 +31,37 @@
 #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
 
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 extern int setxattr (const char *__path, const char *__name,
-		      const void *__value, size_t __size, int __flags) __THROW;
+		      const void *__value, size_t __size, int __flags);
 extern int lsetxattr (const char *__path, const char *__name,
-		      const void *__value, size_t __size, int __flags) __THROW;
+		      const void *__value, size_t __size, int __flags);
 extern int fsetxattr (int __filedes, const char *__name,
-		      const void *__value, size_t __size, int __flags) __THROW;
+		      const void *__value, size_t __size, int __flags);
 
 extern ssize_t getxattr (const char *__path, const char *__name,
-				void *__value, size_t __size) __THROW;
+				void *__value, size_t __size);
 extern ssize_t lgetxattr (const char *__path, const char *__name,
-				void *__value, size_t __size) __THROW;
+				void *__value, size_t __size);
 extern ssize_t fgetxattr (int __filedes, const char *__name,
-				void *__value, size_t __size) __THROW;
+				void *__value, size_t __size);
 
 extern ssize_t listxattr (const char *__path, char *__list,
-				size_t __size) __THROW;
+				size_t __size);
 extern ssize_t llistxattr (const char *__path, char *__list,
-				size_t __size) __THROW;
+				size_t __size);
 extern ssize_t flistxattr (int __filedes, char *__list,
-				size_t __size) __THROW;
+				size_t __size);
 
-extern int removexattr (const char *__path, const char *__name) __THROW;
-extern int lremovexattr (const char *__path, const char *__name) __THROW;
-extern int fremovexattr (int __filedes,   const char *__name) __THROW;
-
-__END_DECLS
+extern int removexattr (const char *__path, const char *__name);
+extern int lremovexattr (const char *__path, const char *__name);
+extern int fremovexattr (int __filedes,   const char *__name);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif	/* __XATTR_H__ */
