diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 81d84e6fd44..8e5822f5cd8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-11  Tom Tromey  <tromey@adacore.com>
+
+	* archive.c (getuid, getgid): Move...
+	* sysdep.h (getuid, getgid): ...here.
+
 2020-11-09  Alan Modra  <amodra@gmail.com>
 
 	* vms-alpha.c (alpha_vms_write_exec): Write 16 bits to eihd.alias.
diff --git a/bfd/archive.c b/bfd/archive.c
index 1836b9b47e2..0250d6f5f4e 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -1842,14 +1842,6 @@ hpux_uid_gid_encode (char str[6], long int id)
 }
 #endif	/* HPUX_LARGE_AR_IDS */
 
-#ifndef HAVE_GETUID
-#define getuid() 0
-#endif
-
-#ifndef HAVE_GETGID
-#define getgid() 0
-#endif
-
 /* Takes a filename, returns an arelt_data for it, or NULL if it can't
    make one.  The filename must refer to a filename in the filesystem.
    The filename field of the ar_hdr will NOT be initialized.  If member
diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index 652857153d3..3891f971e8e 100644
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -223,4 +223,12 @@ size_t strnlen (const char *, size_t);
 # define N_(String) (String)
 #endif
 
+#ifndef HAVE_GETUID
+#define getuid() 0
+#endif
+
+#ifndef HAVE_GETGID
+#define getgid() 0
+#endif
+
 #endif /* ! defined (BFD_SYSDEP_H) */