diff --git a/src/.cvsignore b/src/.cvsignore
index 21f3640716f6bd604eb8a29f24d56ef1ba7265a2..052a12327b9cb318aae4d16a08687e8bbad361f3 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,9 +1,18 @@
+Makefile
+config.cache
 config.h.in
+config.log
+config.status
 configure
+conftest.h
 dependencies
 language.c
 language.h
 lib
+machine.h
 machine.h.in
 peep_engine.c
+pike
+stamp-h
 stamp-h.in
+testsuite
diff --git a/src/.gitignore b/src/.gitignore
index bf794c9e8ad469d35cbf1825c5b69fe7f54ad2d1..48b552bef05757a3756b88d9e6c299ae669bcced 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,9 +1,18 @@
+/Makefile
+/config.cache
 /config.h.in
+/config.log
+/config.status
 /configure
+/conftest.h
 /dependencies
 /language.c
 /language.h
 /lib
+/machine.h
 /machine.h.in
 /peep_engine.c
+/pike
+/stamp-h
 /stamp-h.in
+/testsuite
diff --git a/src/modules/.cvsignore b/src/modules/.cvsignore
index 16be8479de9e74b2975264951df0d22860c6ed27..6eb32af830e0237938d792b3e948f30ade81af74 100644
--- a/src/modules/.cvsignore
+++ b/src/modules/.cvsignore
@@ -1,8 +1,12 @@
-configure
-dependencies
 Makefile
 config.log
 config.status
+configure
+dependencies
+dynamic_module_makefile
 lib_dirs
 linker_options
 master_lib_dirs
+modlist.h
+modlist_headers.h
+static_module_makefile
diff --git a/src/modules/.gitignore b/src/modules/.gitignore
index be1b438b9c07b418beb999431042c622434cc654..b5b99d53dcc6bf2160f692fa0c7493d928d443d6 100644
--- a/src/modules/.gitignore
+++ b/src/modules/.gitignore
@@ -1,8 +1,12 @@
-/configure
-/dependencies
 /Makefile
 /config.log
 /config.status
+/configure
+/dependencies
+/dynamic_module_makefile
 /lib_dirs
 /linker_options
 /master_lib_dirs
+/modlist.h
+/modlist_headers.h
+/static_module_makefile
diff --git a/src/modules/Gdbm/.cvsignore b/src/modules/Gdbm/.cvsignore
index c4809fbc2c0ce2a08fca89df0c5167d67d68a102..336777f65a9af6abf39d4d6b8774286c72525a42 100644
--- a/src/modules/Gdbm/.cvsignore
+++ b/src/modules/Gdbm/.cvsignore
@@ -6,7 +6,10 @@ config.status
 configure
 dependencies
 gdbm_machine.h
+gdbm_machine.h.in
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
-gdbm_machine.h.in
diff --git a/src/modules/Gdbm/.gitignore b/src/modules/Gdbm/.gitignore
index d62d255c66138e63fe34b4ff45c2f7658955eb31..fb7e52e8ab1757944337143fc47a0a43b78f26f2 100644
--- a/src/modules/Gdbm/.gitignore
+++ b/src/modules/Gdbm/.gitignore
@@ -6,7 +6,10 @@
 /configure
 /dependencies
 /gdbm_machine.h
+/gdbm_machine.h.in
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
-/gdbm_machine.h.in
diff --git a/src/modules/Gmp/.cvsignore b/src/modules/Gmp/.cvsignore
index 86d2c454d78b5f6cb892b8b8d412dd73b1a01e3e..f9287fe274367d441fe3abdc26e1c543f53f5f02 100644
--- a/src/modules/Gmp/.cvsignore
+++ b/src/modules/Gmp/.cvsignore
@@ -6,4 +6,9 @@ configure
 dependencies
 gmp_machine.h
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
+prime_table
+prime_table.out
 stamp-h
diff --git a/src/modules/Gmp/.gitignore b/src/modules/Gmp/.gitignore
index f201fb660d58c7c381b72ff86872dc61a7ae44dc..f315ab0790942f450c3689648cdf125c6f18ba9c 100644
--- a/src/modules/Gmp/.gitignore
+++ b/src/modules/Gmp/.gitignore
@@ -6,4 +6,9 @@
 /dependencies
 /gmp_machine.h
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
+/prime_table
+/prime_table.out
 /stamp-h
diff --git a/src/modules/Gz/.cvsignore b/src/modules/Gz/.cvsignore
index 796fbfa54d847e0b7e3cfec462f7ea27287a7abf..74d2b84c04da8871ce906855e791ceaf696432ff 100644
--- a/src/modules/Gz/.cvsignore
+++ b/src/modules/Gz/.cvsignore
@@ -5,7 +5,10 @@ config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
-zlib_machine.h
 stamp-h.in
+zlib_machine.h
 zlib_machine.h.in 
diff --git a/src/modules/Gz/.gitignore b/src/modules/Gz/.gitignore
index 375eb67f6bc5fc8c2aeb825c68cd7486a32e27a2..8858fb05ed4a0c301389804575e9c6ba9b0d2f20 100644
--- a/src/modules/Gz/.gitignore
+++ b/src/modules/Gz/.gitignore
@@ -5,7 +5,10 @@
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
-/zlib_machine.h
 /stamp-h.in
+/zlib_machine.h
 /zlib_machine.h.in
diff --git a/src/modules/Image/.cvsignore b/src/modules/Image/.cvsignore
index 2092bb66577ddfc2772e921f3a9c9b2e1db2a10c..4daaced033e2261fb015fe17697e0caa48fef2a6 100644
--- a/src/modules/Image/.cvsignore
+++ b/src/modules/Image/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
 config.h
+config.h.in 
 config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
-config.h.in 
diff --git a/src/modules/Image/.gitignore b/src/modules/Image/.gitignore
index 7291e4ea6d3112fee5447c48b162613ab47bf35e..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Image/.gitignore
+++ b/src/modules/Image/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
 /config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h.in
diff --git a/src/modules/MIME/.cvsignore b/src/modules/MIME/.cvsignore
index 66d35f0a032e2d62628e6095389746641e62dec2..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/MIME/.cvsignore
+++ b/src/modules/MIME/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
+config.h.in
 config.log
 config.status
-config.h.in
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/MIME/.gitignore b/src/modules/MIME/.gitignore
index 74cf2e941ed8a052aef5431084df6d70853912f8..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/MIME/.gitignore
+++ b/src/modules/MIME/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
-/config.h.in
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/Mysql/.cvsignore b/src/modules/Mysql/.cvsignore
index 3a5fcc9b7b5e80cc57e0cb8f16c49204a7e0abb6..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Mysql/.cvsignore
+++ b/src/modules/Mysql/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
 config.h.in
 config.log
 config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/Mysql/.gitignore b/src/modules/Mysql/.gitignore
index a5317fbd105b018042f2a89481eceaf676a128c1..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Mysql/.gitignore
+++ b/src/modules/Mysql/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
 /config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/Odbc/.cvsignore b/src/modules/Odbc/.cvsignore
index 3a5fcc9b7b5e80cc57e0cb8f16c49204a7e0abb6..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Odbc/.cvsignore
+++ b/src/modules/Odbc/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
 config.h.in
 config.log
 config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/Odbc/.gitignore b/src/modules/Odbc/.gitignore
index a5317fbd105b018042f2a89481eceaf676a128c1..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Odbc/.gitignore
+++ b/src/modules/Odbc/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
 /config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/Oracle/.cvsignore b/src/modules/Oracle/.cvsignore
index 3a5fcc9b7b5e80cc57e0cb8f16c49204a7e0abb6..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Oracle/.cvsignore
+++ b/src/modules/Oracle/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
 config.h.in
 config.log
 config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/Oracle/.gitignore b/src/modules/Oracle/.gitignore
index a5317fbd105b018042f2a89481eceaf676a128c1..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Oracle/.gitignore
+++ b/src/modules/Oracle/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
 /config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/Pipe/.cvsignore b/src/modules/Pipe/.cvsignore
index 2092bb66577ddfc2772e921f3a9c9b2e1db2a10c..4daaced033e2261fb015fe17697e0caa48fef2a6 100644
--- a/src/modules/Pipe/.cvsignore
+++ b/src/modules/Pipe/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
 config.h
+config.h.in 
 config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
-config.h.in 
diff --git a/src/modules/Pipe/.gitignore b/src/modules/Pipe/.gitignore
index 7291e4ea6d3112fee5447c48b162613ab47bf35e..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Pipe/.gitignore
+++ b/src/modules/Pipe/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
 /config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h.in
diff --git a/src/modules/Regexp/.cvsignore b/src/modules/Regexp/.cvsignore
index 7eb8c03b4370d40a3510ee807907844570b46949..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Regexp/.cvsignore
+++ b/src/modules/Regexp/.cvsignore
@@ -1,9 +1,14 @@
 .pure
 Makefile
+config.h
+config.h.in
 config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
-config.h.in
 stamp-h.in
diff --git a/src/modules/Regexp/.gitignore b/src/modules/Regexp/.gitignore
index 731fbbc89441c204c07bad3c0c0a8f0fd91b6f31..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Regexp/.gitignore
+++ b/src/modules/Regexp/.gitignore
@@ -1,9 +1,14 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
-/config.h.in
 /stamp-h.in
diff --git a/src/modules/Ssleay/.cvsignore b/src/modules/Ssleay/.cvsignore
index 50906cffcfa51ee76ad087c98ad2e49850f50ab3..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Ssleay/.cvsignore
+++ b/src/modules/Ssleay/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
+config.h.in
 config.log
 config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
-config.h.in
diff --git a/src/modules/Ssleay/.gitignore b/src/modules/Ssleay/.gitignore
index bf11e0aa0638896304ac9b89133f57f8334d9c60..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Ssleay/.gitignore
+++ b/src/modules/Ssleay/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
-/config.h.in
diff --git a/src/modules/Yp/.cvsignore b/src/modules/Yp/.cvsignore
index 66d35f0a032e2d62628e6095389746641e62dec2..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/Yp/.cvsignore
+++ b/src/modules/Yp/.cvsignore
@@ -1,10 +1,14 @@
 .pure
 Makefile
+config.h
+config.h.in
 config.log
 config.status
-config.h.in
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/Yp/.gitignore b/src/modules/Yp/.gitignore
index 74cf2e941ed8a052aef5431084df6d70853912f8..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/Yp/.gitignore
+++ b/src/modules/Yp/.gitignore
@@ -1,10 +1,14 @@
 /.pure
 /Makefile
+/config.h
+/config.h.in
 /config.log
 /config.status
-/config.h.in
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/_Crypto/.cvsignore b/src/modules/_Crypto/.cvsignore
index c0bdcf80041cb0f78811b96239afcd83ff815c06..9b21632dac574882ee50614562c19c46f0b8db1d 100644
--- a/src/modules/_Crypto/.cvsignore
+++ b/src/modules/_Crypto/.cvsignore
@@ -5,4 +5,7 @@ config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
diff --git a/src/modules/_Crypto/.gitignore b/src/modules/_Crypto/.gitignore
index 7ed24cbd425f9796f4d1a7b2a62674aa61cf4353..3bbebf26966fb9f3a9b7f7f65d201c8388eeb5f7 100644
--- a/src/modules/_Crypto/.gitignore
+++ b/src/modules/_Crypto/.gitignore
@@ -5,4 +5,7 @@
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
diff --git a/src/modules/_Crypto/lib/.cvsignore b/src/modules/_Crypto/lib/.cvsignore
index 1947b071ccecc1cbe891354f71311f144fdc2b09..8d540df7d3d4be019445f4d7d3b8ea6c52cc4525 100644
--- a/src/modules/_Crypto/lib/.cvsignore
+++ b/src/modules/_Crypto/lib/.cvsignore
@@ -4,3 +4,11 @@ config.log
 config.status
 configure
 dependencies
+desQuickCore.c
+desQuickFips.c
+desSmallCore.c
+desSmallFips.c
+desdata
+keymap.h
+parity.h
+rotors.h
diff --git a/src/modules/_Crypto/lib/.gitignore b/src/modules/_Crypto/lib/.gitignore
index 353e3a7cb7edbda7f48f1ca8dfd7a05369efa7f9..067cdda10fb81030fc0b33959e39e254eed60875 100644
--- a/src/modules/_Crypto/lib/.gitignore
+++ b/src/modules/_Crypto/lib/.gitignore
@@ -4,3 +4,11 @@
 /config.status
 /configure
 /dependencies
+/desQuickCore.c
+/desQuickFips.c
+/desSmallCore.c
+/desSmallFips.c
+/desdata
+/keymap.h
+/parity.h
+/rotors.h
diff --git a/src/modules/call_out/.cvsignore b/src/modules/call_out/.cvsignore
index ed13e79dafb075dba9bee95ed9608b991ad17397..c3fbaf395e1a4213f52d17651f156c083fa48230 100644
--- a/src/modules/call_out/.cvsignore
+++ b/src/modules/call_out/.cvsignore
@@ -4,4 +4,9 @@ config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module.pmod
+module_testsuite
 stamp-h
diff --git a/src/modules/call_out/.gitignore b/src/modules/call_out/.gitignore
index 2d448ae74bf4fb36f7a1db409d228c656ce05d72..32475052c0c1a24c1cbc741ba98063d961996971 100644
--- a/src/modules/call_out/.gitignore
+++ b/src/modules/call_out/.gitignore
@@ -4,4 +4,9 @@
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module.pmod
+/module_testsuite
 /stamp-h
diff --git a/src/modules/files/.cvsignore b/src/modules/files/.cvsignore
index 77d299a6e06ca51cc6fe7bf7f4ce9fb6ef054b0c..a5908ad49c7b5d8935ca8a8913c99dbd44c0c953 100644
--- a/src/modules/files/.cvsignore
+++ b/src/modules/files/.cvsignore
@@ -5,7 +5,11 @@ config.status
 configure
 dependencies
 file_machine.h
+file_machine.h.in
 linker_options
+modlist_headers
+modlist_segment
+module.pmod
+module_testsuite
 stamp-h
 stamp-h.in
-file_machine.h.in
diff --git a/src/modules/files/.gitignore b/src/modules/files/.gitignore
index 317875f2b986e67cfc18c196e337b5d522458a01..24404cbc9bc752db05324edaeda849727ef3cb43 100644
--- a/src/modules/files/.gitignore
+++ b/src/modules/files/.gitignore
@@ -5,7 +5,11 @@
 /configure
 /dependencies
 /file_machine.h
+/file_machine.h.in
 /linker_options
+/modlist_headers
+/modlist_segment
+/module.pmod
+/module_testsuite
 /stamp-h
 /stamp-h.in
-/file_machine.h.in
diff --git a/src/modules/math/.cvsignore b/src/modules/math/.cvsignore
index c0bdcf80041cb0f78811b96239afcd83ff815c06..c3fbaf395e1a4213f52d17651f156c083fa48230 100644
--- a/src/modules/math/.cvsignore
+++ b/src/modules/math/.cvsignore
@@ -5,4 +5,8 @@ config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module.pmod
+module_testsuite
 stamp-h
diff --git a/src/modules/math/.gitignore b/src/modules/math/.gitignore
index 7ed24cbd425f9796f4d1a7b2a62674aa61cf4353..32475052c0c1a24c1cbc741ba98063d961996971 100644
--- a/src/modules/math/.gitignore
+++ b/src/modules/math/.gitignore
@@ -5,4 +5,8 @@
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module.pmod
+/module_testsuite
 /stamp-h
diff --git a/src/modules/readline/.cvsignore b/src/modules/readline/.cvsignore
index 0f014b098c91ff9e60d95190585599ef78fd836a..3bd0261926f398802de307677deff1c59cfa9bab 100644
--- a/src/modules/readline/.cvsignore
+++ b/src/modules/readline/.cvsignore
@@ -6,7 +6,10 @@ configure
 dependencies
 lib_dirs
 linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 readline_machine.h
+readline_machine.h.in 
 stamp-h
 stamp-h.in
-readline_machine.h.in 
diff --git a/src/modules/readline/.gitignore b/src/modules/readline/.gitignore
index 1eb749705853ffbb8f93384f66fa8b88bc830f80..c1df15f88531a56d1ec0db585a880f3177f160d5 100644
--- a/src/modules/readline/.gitignore
+++ b/src/modules/readline/.gitignore
@@ -6,7 +6,10 @@
 /dependencies
 /lib_dirs
 /linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /readline_machine.h
+/readline_machine.h.in
 /stamp-h
 /stamp-h.in
-/readline_machine.h.in
diff --git a/src/modules/spider/.cvsignore b/src/modules/spider/.cvsignore
index 3ee8502a8f1b7343e3903da59378f67ebf4adee0..c03762d717653c9df416281efa7e6ae71b1e97ae 100644
--- a/src/modules/spider/.cvsignore
+++ b/src/modules/spider/.cvsignore
@@ -6,5 +6,9 @@ config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module_testsuite
 stamp-h
 stamp-h.in
diff --git a/src/modules/spider/.gitignore b/src/modules/spider/.gitignore
index 53a031c36e8bccd73b6545e3df5466bd4e3c4c1e..a5518ba7a2885a895e1d26ee9978ea4a44703cff 100644
--- a/src/modules/spider/.gitignore
+++ b/src/modules/spider/.gitignore
@@ -6,5 +6,9 @@
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
 /stamp-h
 /stamp-h.in
diff --git a/src/modules/sprintf/.cvsignore b/src/modules/sprintf/.cvsignore
index ed13e79dafb075dba9bee95ed9608b991ad17397..c3fbaf395e1a4213f52d17651f156c083fa48230 100644
--- a/src/modules/sprintf/.cvsignore
+++ b/src/modules/sprintf/.cvsignore
@@ -4,4 +4,9 @@ config.log
 config.status
 configure
 dependencies
+linker_options
+modlist_headers
+modlist_segment
+module.pmod
+module_testsuite
 stamp-h
diff --git a/src/modules/sprintf/.gitignore b/src/modules/sprintf/.gitignore
index 2d448ae74bf4fb36f7a1db409d228c656ce05d72..32475052c0c1a24c1cbc741ba98063d961996971 100644
--- a/src/modules/sprintf/.gitignore
+++ b/src/modules/sprintf/.gitignore
@@ -4,4 +4,9 @@
 /config.status
 /configure
 /dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module.pmod
+/module_testsuite
 /stamp-h
diff --git a/src/modules/system/.cvsignore b/src/modules/system/.cvsignore
index 70cd2abe443886e6df7504ce37031cecd7b0468a..6a4a24169a3d21bb662e4f9492bcbe2786749593 100644
--- a/src/modules/system/.cvsignore
+++ b/src/modules/system/.cvsignore
@@ -5,7 +5,11 @@ config.status
 configure
 dependencies
 linker_options
+modlist_headers
+modlist_segment
+module.pmod
+module_testsuite
 stamp-h
+stamp-h.in
 system_machine.h
 system_machine.h.in
-stamp-h.in
diff --git a/src/modules/system/.gitignore b/src/modules/system/.gitignore
index 8990e0fd27ea89491292a1f796c26e507d89a8e8..f01c50ae53302c161da5f8a96797dd179fd938bd 100644
--- a/src/modules/system/.gitignore
+++ b/src/modules/system/.gitignore
@@ -5,7 +5,11 @@
 /configure
 /dependencies
 /linker_options
+/modlist_headers
+/modlist_segment
+/module.pmod
+/module_testsuite
 /stamp-h
+/stamp-h.in
 /system_machine.h
 /system_machine.h.in
-/stamp-h.in