3 files changed, 20 insertions, 3 deletions

diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in
index 690254bd28c..21e4ca7cfa1 100644
--- a/src/emacs-module.h.in
+++ b/src/emacs-module.h.in
@@ -198,6 +198,23 @@ struct emacs_env_30
 @module_env_snippet_30@
 };
 
+struct emacs_env_31
+{
+@module_env_snippet_25@
+
+@module_env_snippet_26@
+
+@module_env_snippet_27@
+
+@module_env_snippet_28@
+
+@module_env_snippet_29@
+
+@module_env_snippet_30@
+
+@module_env_snippet_31@
+};
+
 /* Every module should define a function as follows.  */
 extern int emacs_module_init (struct emacs_runtime *runtime)
   EMACS_NOEXCEPT
diff --git a/src/module-env-30.h b/src/module-env-30.h
index e75210c7f8e..e69de29bb2d 100644
--- a/src/module-env-30.h
+++ b/src/module-env-30.h
@@ -1,3 +0,0 @@
-  /* Add module environment functions newly added in Emacs 30 here.
-     Before Emacs 30 is released, remove this comment and start
-     module-env-31.h on the master branch.  */
diff --git a/src/module-env-31.h b/src/module-env-31.h
new file mode 100644
index 00000000000..e9827b18382
--- /dev/null
+++ b/src/module-env-31.h
@@ -0,0 +1,3 @@
+  /* Add module environment functions newly added in Emacs 31 here.
+     Before Emacs 31 is released, remove this comment and start
+     module-env-32.h on the master branch.  */