diff --git a/libfakeroot.c b/libfakeroot.c
index c5164e9..048d9e8 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -144,9 +144,11 @@
    id_t is used everywhere, just happens to be int on some OSes */
 #ifndef _ID_T
 #define _ID_T
+#ifndef __DEFINED_id_t
 typedef int id_t;
 #endif
 #endif
+#endif
 
 #include <sys/types.h>
 #include <stdlib.h>
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -81,12 +81,14 @@
 #define SEND_STAT64(a,b,c) send_stat64(a,b,c)
 #define SEND_GET_STAT(a,b) send_get_stat(a,b)
 #define SEND_GET_STAT64(a,b) send_get_stat64(a,b)
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c)
 #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c)
 #else
 #define SEND_STAT(a,b,c) send_stat(a,b)
 #define SEND_STAT64(a,b,c) send_stat64(a,b)
 #define SEND_GET_STAT(a,b) send_get_stat(a)
 #define SEND_GET_STAT64(a,b) send_get_stat64(a)
+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b)
 #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
 #endif