diff --git a/bits/struct_lastlog.h b/bits/struct_lastlog.h
index 122a44abd0..6882015d7c 100644
--- a/bits/struct_lastlog.h
+++ b/bits/struct_lastlog.h
@@ -24,8 +24,8 @@
previous logins. */
struct lastlog
{
-#if __WORDSIZE_TIME64_COMPAT32
- int32_t ll_time;
+#if __TIMESIZE != 64
+ int64_t ll_time;
#else
__time_t ll_time;
#endif
diff --git a/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h b/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h
deleted file mode 100644
index 2fa409aeec..0000000000
--- a/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* The 'struct lastlog' type.
- Copyright (C) 2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- . */
-
-#ifndef _UTMP_H
-# error "Never include directly; use instead."
-#endif
-
-/* The structure describing an entry in the database of
- previous logins. */
-struct lastlog
- {
-#if __WORDSIZE == 32
- int64_t ll_time;
-#else
- __time_t ll_time;
-#endif
- char ll_line[UT_LINESIZE];
- char ll_host[UT_HOSTSIZE];
- };
-