diff --git a/ChangeLog b/ChangeLog
index de362265f0..f586960adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module sys_types to sys_types-h.
+	* modules/sys_types-h: Renamed from modules/sys_types.
+	* modules/sys_types-h-tests: Renamed from modules/sys_types-tests.
+	* modules/sys_types-h-c++-tests: Renamed from
+	modules/sys_types-c++-tests.
+	* tests/test-sys_types-h.c: Renamed from tests/test-sys_types.c.
+	* tests/test-sys_types-h-c++.cc: Renamed from
+	tests/test-sys_types-c++.cc.
+	* doc/posix-headers/sys_types.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/sys_types: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module sys_times to sys_times-h.
diff --git a/doc/posix-headers/sys_types.texi b/doc/posix-headers/sys_types.texi
index d1cf71b1f1..2684e23a58 100644
--- a/doc/posix-headers/sys_types.texi
+++ b/doc/posix-headers/sys_types.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/sys_types.h.html}
 
-Gnulib module: sys_types
-@mindex sys_types
+Gnulib module: sys_types-h
+@mindex sys_types-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/fcntl-h b/modules/fcntl-h
index a6346a5077..9ea889dfd9 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -14,7 +14,7 @@ include_next
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
-sys_types
+sys_types-h
 unistd
 
 configure.ac:
diff --git a/modules/fseeko b/modules/fseeko
index 58f50d6abe..3857d7befa 100644
--- a/modules/fseeko
+++ b/modules/fseeko
@@ -11,7 +11,7 @@ extensions
 largefile
 lseek
 stdio-h
-sys_types
+sys_types-h
 # Just to guarantee consistency between fseek() and fseeko().
 fseek
 
diff --git a/modules/ftello b/modules/ftello
index 24f765d9a2..60d5f86771 100644
--- a/modules/ftello
+++ b/modules/ftello
@@ -12,7 +12,7 @@ Depends-on:
 stdio-h
 extensions
 largefile
-sys_types
+sys_types-h
 lseek           [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
 stdckdint-h     [test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1]
 # Just to guarantee consistency between ftell() and ftello().
diff --git a/modules/ftruncate b/modules/ftruncate
index c8e58ca940..be79ee513e 100644
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -7,7 +7,7 @@ m4/ftruncate.m4
 
 Depends-on:
 unistd
-sys_types
+sys_types-h
 largefile
 msvc-nothrow    [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1]
 msvc-inval      [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1]
diff --git a/modules/get_ppid_of b/modules/get_ppid_of
index 84e3d793b3..bc38b8c214 100644
--- a/modules/get_ppid_of
+++ b/modules/get_ppid_of
@@ -7,7 +7,7 @@ lib/get_ppid_of.c
 
 Depends-on:
 extensions
-sys_types
+sys_types-h
 unistd
 open
 
diff --git a/modules/largefile-tests b/modules/largefile-tests
index b94f02c4c5..4dcb5c243e 100644
--- a/modules/largefile-tests
+++ b/modules/largefile-tests
@@ -3,7 +3,7 @@ tests/test-largefile.c
 
 Depends-on:
 intprops
-sys_types
+sys_types-h
 sys_stat-h
 
 configure.ac:
diff --git a/modules/limits-h-tests b/modules/limits-h-tests
index 51919ad1a1..0856f4726e 100644
--- a/modules/limits-h-tests
+++ b/modules/limits-h-tests
@@ -4,7 +4,7 @@ tests/test-limits-h.c
 Depends-on:
 assert-h
 extensions
-sys_types
+sys_types-h
 limits-h-c++-tests
 
 configure.ac:
diff --git a/modules/lseek b/modules/lseek
index 711afeb2fa..a00d9beeb9 100644
--- a/modules/lseek
+++ b/modules/lseek
@@ -7,7 +7,7 @@ m4/lseek.m4
 
 Depends-on:
 unistd
-sys_types
+sys_types-h
 largefile
 msvc-nothrow    [test $REPLACE_LSEEK = 1]
 fstat           [test "$gl_cv_func_lseek_pipe" = no]
diff --git a/modules/same-inode b/modules/same-inode
index 57e5d282a6..2c92ab7985 100644
--- a/modules/same-inode
+++ b/modules/same-inode
@@ -8,7 +8,7 @@ lib/same-inode.h
 Depends-on:
 extern-inline
 stdbool-h
-sys_types
+sys_types-h
 
 configure.ac:
 
diff --git a/modules/stdint-h b/modules/stdint-h
index 3c37c0846b..d90cce2be9 100644
--- a/modules/stdint-h
+++ b/modules/stdint-h
@@ -17,7 +17,7 @@ gen-header
 include_next
 limits-h
 multiarch
-sys_types
+sys_types-h
 
 configure.ac:
 gl_STDINT_H
diff --git a/modules/stdio-h b/modules/stdio-h
index dfae001260..6190bb95aa 100644
--- a/modules/stdio-h
+++ b/modules/stdio-h
@@ -17,7 +17,7 @@ snippet/c++defs
 snippet/warn-on-use
 ssize_t
 stddef-h
-sys_types
+sys_types-h
 
 configure.ac-early:
 gl_STDIO_H_EARLY
diff --git a/modules/strings-h b/modules/strings-h
index 6e8ef48684..ad05ba3314 100644
--- a/modules/strings-h
+++ b/modules/strings-h
@@ -11,7 +11,7 @@ include_next
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
-sys_types
+sys_types-h
 
 configure.ac:
 gl_STRINGS_H
diff --git a/modules/sys_stat-h b/modules/sys_stat-h
index 233224e835..5552db8e00 100644
--- a/modules/sys_stat-h
+++ b/modules/sys_stat-h
@@ -13,7 +13,7 @@ include_next
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
-sys_types
+sys_types-h
 time-h
 
 configure.ac:
diff --git a/modules/sys_types b/modules/sys_types
index b878a03e1b..01a5c04248 100644
--- a/modules/sys_types
+++ b/modules/sys_types
@@ -1,46 +1,20 @@
 Description:
 A <sys/types.h> that conforms better to POSIX.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'sys_types-h' instead.
+
 Files:
-lib/sys_types.in.h
-m4/sys_types_h.m4
-m4/off_t.m4
-m4/off64_t.m4
-m4/pid_t.m4
 
 Depends-on:
-gen-header
-include_next
-ssize_t
-
-configure.ac-early:
-AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+sys_types-h
 
 configure.ac:
-gl_SYS_TYPES_H
-gl_SYS_TYPES_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += sys/types.h
-
-# We need the following in order to create <sys/types.h> when the system
-# doesn't have one that works with the given compiler.
-sys/types.h: sys_types.in.h $(top_builddir)/config.status
-	$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-	$(AM_V_at)$(SED_HEADER_STDOUT) \
-	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-	      -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
-	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
-	      $(srcdir)/sys_types.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += sys/types.h sys/types.h-t
-MOSTLYCLEANDIRS += sys
 
 Include:
 <sys/types.h>
@@ -49,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/sys_types-c++-tests b/modules/sys_types-c++-tests
deleted file mode 100644
index 68e21ae5a7..0000000000
--- a/modules/sys_types-c++-tests
+++ /dev/null
@@ -1,17 +0,0 @@
-Files:
-tests/test-sys_types-c++.cc
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-sys_types-c++
-check_PROGRAMS += test-sys_types-c++
-test_sys_types_c___SOURCES = test-sys_types-c++.cc
-endif
diff --git a/modules/sys_types-h b/modules/sys_types-h
new file mode 100644
index 0000000000..b878a03e1b
--- /dev/null
+++ b/modules/sys_types-h
@@ -0,0 +1,52 @@
+Description:
+A <sys/types.h> that conforms better to POSIX.
+
+Files:
+lib/sys_types.in.h
+m4/sys_types_h.m4
+m4/off_t.m4
+m4/off64_t.m4
+m4/pid_t.m4
+
+Depends-on:
+gen-header
+include_next
+ssize_t
+
+configure.ac-early:
+AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+configure.ac:
+gl_SYS_TYPES_H
+gl_SYS_TYPES_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += sys/types.h
+
+# We need the following in order to create <sys/types.h> when the system
+# doesn't have one that works with the given compiler.
+sys/types.h: sys_types.in.h $(top_builddir)/config.status
+	$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+	$(AM_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
+	      -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+	      -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
+	      -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
+	      $(srcdir)/sys_types.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sys/types.h sys/types.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+<sys/types.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/sys_types-h-c++-tests b/modules/sys_types-h-c++-tests
new file mode 100644
index 0000000000..f3a3827adf
--- /dev/null
+++ b/modules/sys_types-h-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-sys_types-h-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-sys_types-h-c++
+check_PROGRAMS += test-sys_types-h-c++
+test_sys_types_h_c___SOURCES = test-sys_types-h-c++.cc
+endif
diff --git a/modules/sys_types-h-tests b/modules/sys_types-h-tests
new file mode 100644
index 0000000000..4b42da3bb4
--- /dev/null
+++ b/modules/sys_types-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-sys_types-h.c
+
+Depends-on:
+sys_types-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sys_types-h
+check_PROGRAMS += test-sys_types-h
diff --git a/modules/sys_types-tests b/modules/sys_types-tests
deleted file mode 100644
index cd1a83f63b..0000000000
--- a/modules/sys_types-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-sys_types.c
-
-Depends-on:
-sys_types-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-sys_types
-check_PROGRAMS += test-sys_types
diff --git a/modules/sys_uio b/modules/sys_uio
index d7234ee355..391e232702 100644
--- a/modules/sys_uio
+++ b/modules/sys_uio
@@ -9,7 +9,7 @@ Depends-on:
 gen-header
 include_next
 ssize_t
-sys_types
+sys_types-h
 
 configure.ac:
 gl_SYS_UIO_H
diff --git a/modules/truncate b/modules/truncate
index 7aa986cf35..1baee02cda 100644
--- a/modules/truncate
+++ b/modules/truncate
@@ -7,7 +7,7 @@ m4/truncate.m4
 
 Depends-on:
 unistd
-sys_types
+sys_types-h
 largefile
 sys_stat-h
 stat            [test $REPLACE_TRUNCATE = 1]
diff --git a/modules/unistd b/modules/unistd
index b9cfa25072..af7fda5944 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -17,7 +17,7 @@ snippet/c++defs
 snippet/warn-on-use
 ssize_t
 stddef-h
-sys_types
+sys_types-h
 
 configure.ac:
 gl_UNISTD_H
diff --git a/tests/test-sys_types-c++.cc b/tests/test-sys_types-h-c++.cc
similarity index 100%
rename from tests/test-sys_types-c++.cc
rename to tests/test-sys_types-h-c++.cc
diff --git a/tests/test-sys_types.c b/tests/test-sys_types-h.c
similarity index 100%
rename from tests/test-sys_types.c
rename to tests/test-sys_types-h.c