diff --git a/contrib/btree_gist/.gitignore b/contrib/btree_gist/.gitignore
index 95b6332299..46318eaa7b 100644
--- a/contrib/btree_gist/.gitignore
+++ b/contrib/btree_gist/.gitignore
@@ -1 +1,3 @@
 /btree_gist.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/cube/.gitignore b/contrib/cube/.gitignore
index bb28b9327c..862c18f653 100644
--- a/contrib/cube/.gitignore
+++ b/contrib/cube/.gitignore
@@ -1,3 +1,6 @@
 /cubeparse.c
+/cubeparse.h
 /cubescan.c
 /cube.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/dbase/.gitignore b/contrib/dbase/.gitignore
new file mode 100644
index 0000000000..5e5eae5161
--- /dev/null
+++ b/contrib/dbase/.gitignore
@@ -0,0 +1 @@
+/dbf2pg
diff --git a/contrib/dblink/.gitignore b/contrib/dblink/.gitignore
index 985b73d394..fb7e8728bc 100644
--- a/contrib/dblink/.gitignore
+++ b/contrib/dblink/.gitignore
@@ -1 +1,3 @@
 /dblink.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/dbsize/.gitignore b/contrib/dbsize/.gitignore
new file mode 100644
index 0000000000..54613bcb85
--- /dev/null
+++ b/contrib/dbsize/.gitignore
@@ -0,0 +1 @@
+/dbsize.sql
diff --git a/contrib/earthdistance/.gitignore b/contrib/earthdistance/.gitignore
index 86caae7daa..366a0a399e 100644
--- a/contrib/earthdistance/.gitignore
+++ b/contrib/earthdistance/.gitignore
@@ -1 +1,3 @@
 /earthdistance.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/findoidjoins/.gitignore b/contrib/findoidjoins/.gitignore
new file mode 100644
index 0000000000..21ec074fd9
--- /dev/null
+++ b/contrib/findoidjoins/.gitignore
@@ -0,0 +1 @@
+/findoidjoins
diff --git a/contrib/fulltextindex/.gitignore b/contrib/fulltextindex/.gitignore
new file mode 100644
index 0000000000..4feca7e151
--- /dev/null
+++ b/contrib/fulltextindex/.gitignore
@@ -0,0 +1 @@
+/fti.sql
diff --git a/contrib/intagg/.gitignore b/contrib/intagg/.gitignore
new file mode 100644
index 0000000000..d8e2c40431
--- /dev/null
+++ b/contrib/intagg/.gitignore
@@ -0,0 +1 @@
+/int_aggregate.sql
diff --git a/contrib/intarray/.gitignore b/contrib/intarray/.gitignore
index e9985910a3..761a9b2607 100644
--- a/contrib/intarray/.gitignore
+++ b/contrib/intarray/.gitignore
@@ -1 +1,3 @@
 /_int.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/isbn_issn/.gitignore b/contrib/isbn_issn/.gitignore
new file mode 100644
index 0000000000..ceea0e26e0
--- /dev/null
+++ b/contrib/isbn_issn/.gitignore
@@ -0,0 +1 @@
+/isbn_issn.sql
diff --git a/contrib/ltree/.gitignore b/contrib/ltree/.gitignore
index 85d1e298b4..49883e82a3 100644
--- a/contrib/ltree/.gitignore
+++ b/contrib/ltree/.gitignore
@@ -1 +1,3 @@
 /ltree.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/miscutil/.gitignore b/contrib/miscutil/.gitignore
new file mode 100644
index 0000000000..4580fa284f
--- /dev/null
+++ b/contrib/miscutil/.gitignore
@@ -0,0 +1 @@
+/misc_utils.sql
diff --git a/contrib/noupdate/.gitignore b/contrib/noupdate/.gitignore
new file mode 100644
index 0000000000..fb37536d13
--- /dev/null
+++ b/contrib/noupdate/.gitignore
@@ -0,0 +1 @@
+/noup.sql
diff --git a/contrib/pg_autovacuum/.gitignore b/contrib/pg_autovacuum/.gitignore
new file mode 100644
index 0000000000..a8be2e4341
--- /dev/null
+++ b/contrib/pg_autovacuum/.gitignore
@@ -0,0 +1,2 @@
+/dllist.c
+/pg_autovacuum
diff --git a/contrib/pg_dumplo/.gitignore b/contrib/pg_dumplo/.gitignore
new file mode 100644
index 0000000000..023dcb21bf
--- /dev/null
+++ b/contrib/pg_dumplo/.gitignore
@@ -0,0 +1 @@
+/pg_dumplo
diff --git a/contrib/pg_trgm/.gitignore b/contrib/pg_trgm/.gitignore
index 3272f08f53..9cda826ca4 100644
--- a/contrib/pg_trgm/.gitignore
+++ b/contrib/pg_trgm/.gitignore
@@ -1 +1,3 @@
 /pg_trgm.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/pgcrypto/.gitignore b/contrib/pgcrypto/.gitignore
index 3cdb7a6396..07b24d98f0 100644
--- a/contrib/pgcrypto/.gitignore
+++ b/contrib/pgcrypto/.gitignore
@@ -1 +1,3 @@
 /pgcrypto.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/rtree_gist/.gitignore b/contrib/rtree_gist/.gitignore
new file mode 100644
index 0000000000..677ffae531
--- /dev/null
+++ b/contrib/rtree_gist/.gitignore
@@ -0,0 +1,3 @@
+/rtree_gist.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/seg/.gitignore b/contrib/seg/.gitignore
index d2a71ec0dd..7331698e77 100644
--- a/contrib/seg/.gitignore
+++ b/contrib/seg/.gitignore
@@ -1,3 +1,6 @@
 /segparse.c
+/segparse.h
 /segscan.c
 /seg.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/string/.gitignore b/contrib/string/.gitignore
new file mode 100644
index 0000000000..2fe1edfce4
--- /dev/null
+++ b/contrib/string/.gitignore
@@ -0,0 +1 @@
+/string_io.sql
diff --git a/contrib/tablefunc/.gitignore b/contrib/tablefunc/.gitignore
index 3477af4d4b..b28639637b 100644
--- a/contrib/tablefunc/.gitignore
+++ b/contrib/tablefunc/.gitignore
@@ -1 +1,3 @@
 /tablefunc.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/tsearch/.gitignore b/contrib/tsearch/.gitignore
new file mode 100644
index 0000000000..e85d3eaa06
--- /dev/null
+++ b/contrib/tsearch/.gitignore
@@ -0,0 +1,4 @@
+/parser.c
+/tsearch.sql
+# Generated subdirectories
+/results/
diff --git a/contrib/tsearch2/.gitignore b/contrib/tsearch2/.gitignore
index b5da0e9f7d..3a5eee515a 100644
--- a/contrib/tsearch2/.gitignore
+++ b/contrib/tsearch2/.gitignore
@@ -1 +1,5 @@
 /tsearch2.sql
+/untsearch2.sql
+/wordparser/parser.c
+# Generated subdirectories
+/results/
diff --git a/contrib/userlock/.gitignore b/contrib/userlock/.gitignore
new file mode 100644
index 0000000000..2b76267227
--- /dev/null
+++ b/contrib/userlock/.gitignore
@@ -0,0 +1 @@
+/user_locks.sql
diff --git a/contrib/xml2/.gitignore b/contrib/xml2/.gitignore
new file mode 100644
index 0000000000..19b6c5ba42
--- /dev/null
+++ b/contrib/xml2/.gitignore
@@ -0,0 +1,2 @@
+# Generated subdirectories
+/results/
diff --git a/src/backend/bootstrap/.gitignore b/src/backend/bootstrap/.gitignore
index 1ffe8ca39e..42a8dc85c4 100644
--- a/src/backend/bootstrap/.gitignore
+++ b/src/backend/bootstrap/.gitignore
@@ -1,2 +1,3 @@
 /bootparse.c
 /bootscanner.c
+/bootstrap_tokens.h
diff --git a/src/backend/parser/.gitignore b/src/backend/parser/.gitignore
index 16ac68d257..6d38a095e6 100644
--- a/src/backend/parser/.gitignore
+++ b/src/backend/parser/.gitignore
@@ -1,3 +1,4 @@
 /gram.h
 /gram.c
 /scan.c
+/parse.h
diff --git a/src/bin/ipcclean/.gitignore b/src/bin/ipcclean/.gitignore
new file mode 100644
index 0000000000..599d20811d
--- /dev/null
+++ b/src/bin/ipcclean/.gitignore
@@ -0,0 +1 @@
+/ipcclean
diff --git a/src/include/parser/.gitignore b/src/include/parser/.gitignore
index 19ea9554a0..2500284488 100644
--- a/src/include/parser/.gitignore
+++ b/src/include/parser/.gitignore
@@ -1 +1 @@
-/gram.h
+/parse.h
diff --git a/src/interfaces/ecpg/ecpglib/.gitignore b/src/interfaces/ecpg/ecpglib/.gitignore
index e6c60b16fc..37aeb456c8 100644
--- a/src/interfaces/ecpg/ecpglib/.gitignore
+++ b/src/interfaces/ecpg/ecpglib/.gitignore
@@ -1,9 +1,2 @@
-/libecpgdll.def
-/libecpgddll.def
-/blibecpgdll.def
-/exports.list
-
+/exec.c
 /path.c
-/pgstrcasecmp.c
-/strlcpy.c
-/thread.c
diff --git a/src/interfaces/libpq/.gitignore b/src/interfaces/libpq/.gitignore
index 66be28c464..d305239d6b 100644
--- a/src/interfaces/libpq/.gitignore
+++ b/src/interfaces/libpq/.gitignore
@@ -7,3 +7,7 @@
 /strlcpy.c
 /thread.c
 /wchar.c
+/libpq.rc
+/blibpqdll.def
+/libpqddll.def
+/libpqdll.def
diff --git a/src/pl/plperl/.gitignore b/src/pl/plperl/.gitignore
index 4ee7d6095b..c04f42ba07 100644
--- a/src/pl/plperl/.gitignore
+++ b/src/pl/plperl/.gitignore
@@ -2,3 +2,6 @@
 /Util.c
 /perlchunks.h
 /plperl_opmask.h
+
+# Generated subdirectories
+/results/
diff --git a/src/pl/plpgsql/src/.gitignore b/src/pl/plpgsql/src/.gitignore
index 2eecb0f20d..226e7aff9f 100644
--- a/src/pl/plpgsql/src/.gitignore
+++ b/src/pl/plpgsql/src/.gitignore
@@ -1,2 +1,4 @@
 /pl_gram.c
 /pl_gram.h
+/pl.tab.h
+/pl_scan.c
diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore
new file mode 100644
index 0000000000..19b6c5ba42
--- /dev/null
+++ b/src/pl/plpython/.gitignore
@@ -0,0 +1,2 @@
+# Generated subdirectories
+/results/
diff --git a/src/pl/tcl/.gitignore b/src/pl/tcl/.gitignore
new file mode 100644
index 0000000000..19b6c5ba42
--- /dev/null
+++ b/src/pl/tcl/.gitignore
@@ -0,0 +1,2 @@
+# Generated subdirectories
+/results/
diff --git a/src/pl/tcl/modules/.gitignore b/src/pl/tcl/modules/.gitignore
new file mode 100644
index 0000000000..89581887c4
--- /dev/null
+++ b/src/pl/tcl/modules/.gitignore
@@ -0,0 +1,3 @@
+/pltcl_delmod
+/pltcl_listmod
+/pltcl_loadmod