7 files changed, 28 insertions, 15 deletions
diff --git a/.editorconfig b/.editorconfig
index 69fefd5..f907b33 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -36,7 +36,7 @@ _mode = sh
 [{build-aux/lint-h,build-aux/lint-bin,build-aux/get-dscname,build-aux/linux-errno.txt.gen,libusb/include/libusb/tusb_helpers.h.gen,lib9p/tests/runtest}]
 _mode = bash
 
-[{lib9p/idl.gen,lib9p/include/lib9p/linux-errno.h.gen,build-aux/stack.c.gen}]
+[{lib9p/proto.gen,lib9p/include/lib9p/linux-errno.h.gen,build-aux/stack.c.gen}]
 _mode = python3
 indent_style = space
 indent_size = 4
diff --git a/GNUmakefile b/GNUmakefile
index 339ae4b..2d11c8b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -42,7 +42,7 @@ lib9p/include/lib9p/linux-errno.h: %: %.gen 3rd-party/linux-errno.txt
 	$^ >$@
 
 generate/files += lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h
-lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h &: lib9p/idl.gen lib9p/idl/__init__.py lib9p/idl lib9p/idl/*.9p
+lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h &: lib9p/proto.gen lib9p/idl/__init__.py lib9p/protogen lib9p/protogen/*.py lib9p/idl lib9p/idl/*.9p
 	$< $(filter %.9p,$^)
 
 generate/files += lib9p/tests/test_compile.c
@@ -123,7 +123,7 @@ lint/python3: lint/%: build-aux/venv
 	./build-aux/venv/bin/black --check $(sources_$*)
 	./build-aux/venv/bin/isort --check $(sources_$*)
 	./build-aux/venv/bin/pylint $(sources_$*)
-	! grep -nh 'SPECIAL$$' -- lib9p/idl.gen
+	! grep -nh 'SPECIAL$$' -- lib9p/proto.gen lib9p/protogen/*.py
 lint/c: lint/%: build-aux/lint-h build-aux/get-dscname
 	./build-aux/lint-h $(filter %.h,$(sources_$*))
 lint/make lint/cmake lint/gitignore lint/ini lint/9p lint/markdown lint/pip lint/man-cat: lint/%:
diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 8d6c82f..af5200f 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -1,4 +1,4 @@
-/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
+/* Generated by `lib9p/proto.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
 
 #include <stdbool.h>
 #include <stddef.h>   /* for size_t */
diff --git a/lib9p/idl/0000-TODO.md b/lib9p/idl/0000-TODO.md
index d196ac9..81cafe5 100644
--- a/lib9p/idl/0000-TODO.md
+++ b/lib9p/idl/0000-TODO.md
@@ -1,6 +1,6 @@
 <!--
   lib9p/idl/0000-TODO.md - Changes I intend to make to idl/__init__.py
-  and idl.gen
+  and proto.gen
 
   Copyright (C) 2025  Luke T. Shumaker <lukeshu@lukeshu.com>
   SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index 725e781..7a50537 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -1,4 +1,4 @@
-/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
+/* Generated by `lib9p/proto.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
 
 #ifndef _LIB9P_9P_H_
 	#error Do not include <lib9p/9p.generated.h> directly; include <lib9p/9p.h> instead
diff --git a/lib9p/proto.gen b/lib9p/proto.gen
new file mode 100755
index 0000000..60f1347
--- /dev/null
+++ b/lib9p/proto.gen
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# lib9p/proto.gen - Generate C marshalers/unmarshalers for .9p files
+#                   defining 9P protocol variants.
+#
+# Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+import os.path
+import sys
+
+sys.path.insert(0, os.path.normpath(os.path.join(__file__, "..")))
+import protogen  # pylint: disable=wrong-import-position
+
+if __name__ == "__main__":
+    protogen.main()
diff --git a/lib9p/idl.gen b/lib9p/protogen/__init__.py
index eaeca49..21b5161 100755..100644
--- a/lib9p/idl.gen
+++ b/lib9p/protogen/__init__.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
-# lib9p/idl.gen - Generate C marshalers/unmarshalers for .9p files
-#                 defining 9P protocol variants.
+# lib9p/protogen/__init__.py - Generate C marshalers/unmarshalers for
+#                              .9p files defining 9P protocol
+#                              variants.
 #
 # Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
 # SPDX-License-Identifier: AGPL-3.0-or-later
@@ -11,14 +11,16 @@ import os.path
 import sys
 import typing
 
-sys.path.insert(0, os.path.normpath(os.path.join(__file__, "..")))
-import idl  # pylint: disable=wrong-import-position,import-self
+import idl
 
 # This strives to be "general-purpose" in that it just acts on the
 # *.9p inputs; but (unfortunately?) there are a few special-cases in
 # this script, marked with "SPECIAL".
 
 
+# pylint: disable=unused-variable
+__all__ = ["main"]
+
 # Utilities ####################################################################
 
 idprefix = "lib9p_"
@@ -1433,7 +1435,3 @@ def main() -> None:
         fh.write(gen_h(versions, typs))
     with open(os.path.join(outdir, "9p.generated.c"), "w", encoding="utf-8") as fh:
         fh.write(gen_c(versions, typs))
-
-
-if __name__ == "__main__":
-    main()