diff --git a/ChangeLog b/ChangeLog
index ae834cf77d..99e668929e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@
 	* hurd/path-lookup.c (hurd_file_name_path_lookup): Likewise.
 	* sysdeps/mach/hurd/check_native.c: New file.
 	* sysdeps/mach/hurd/check_pf.c: New file.
+	* nscd/gai.c (__getifaddrs): Define macro to getifaddrs.
+	(__freeifaddrs): Define macro to freeifaddrs.
 	* sysdeps/mach/hurd/libhurduser.abilist: New file.
 	* sysdeps/mach/libmachuser.abilist: New file.
 	* libio/tst-memstream3.c (FWRITE): Rename to _FWRITE.
diff --git a/nscd/gai.c b/nscd/gai.c
index d00a184c46..d081747797 100644
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -31,6 +31,8 @@
 #define __qsort_r qsort_r
 /* nscd uses 1MB or 2MB thread stacks.  */
 #define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
+#define __getifaddrs getifaddrs
+#define __freeifaddrs freeifaddrs
 
 /* We are nscd, so we don't want to be talking to ourselves.  */
 #undef  USE_NSCD
diff --git a/sysdeps/mach/hurd/check_pf.c b/sysdeps/mach/hurd/check_pf.c
index 32cc28340b..edd99a7278 100644
--- a/sysdeps/mach/hurd/check_pf.c
+++ b/sysdeps/mach/hurd/check_pf.c
@@ -1,3 +1 @@
-#define __getifaddrs getifaddrs
-#define __freeifaddrs freeifaddrs
 #include <inet/check_pf.c>