Index: head/.clang-format
===================================================================
--- head/.clang-format
+++ head/.clang-format
@@ -29,30 +29,53 @@
 DerivePointerAlignment: false
 DisableFormat: false
 ForEachMacros:
+  - ARB_ARRFOREACH
+  - ARB_ARRFOREACH_REVWCOND
+  - ARB_ARRFOREACH_REVERSE
+  - ARB_FOREACH
+  - ARB_FOREACH_FROM
+  - ARB_FOREACH_SAFE
+  - ARB_FOREACH_REVERSE
+  - ARB_FOREACH_REVERSE_FROM
+  - ARB_FOREACH_REVERSE_SAFE
+  - CPU_FOREACH
+  - FOREACH_THREAD_IN_PROC
+  - FOREACH_PROC_IN_SYSTEM
+  - FOREACH_PRISON_CHILD
+  - FOREACH_PRISON_DESCENDANT
+  - FOREACH_PRISON_DESCENDANT_LOCKED
+  - FOREACH_PRISON_DESCENDANT_LOCKED_LEVEL
+  - MNT_VNODE_FOREACH_ALL
+  - MNT_VNODE_FOREACH_ACTIVE
+  - RB_FOREACH
+  - RB_FOREACH_FROM
+  - RB_FOREACH_SAFE
+  - RB_FOREACH_REVERSE
+  - RB_FOREACH_REVERSE_FROM
+  - RB_FOREACH_REVERSE_SAFE
   - SLIST_FOREACH
+  - SLIST_FOREACH_FROM
+  - SLIST_FOREACH_FROM_SAFE
   - SLIST_FOREACH_SAFE
+  - SLIST_FOREACH_PREVPTR
+  - SPLAY_FOREACH
   - LIST_FOREACH
+  - LIST_FOREACH_FROM
+  - LIST_FOREACH_FROM_SAFE
   - LIST_FOREACH_SAFE
   - STAILQ_FOREACH
+  - STAILQ_FOREACH_FROM
+  - STAILQ_FOREACH_FROM_SAFE
   - STAILQ_FOREACH_SAFE
   - TAILQ_FOREACH
-  - TAILQ_FOREACH_SAFE
+  - TAILQ_FOREACH_FROM
+  - TAILQ_FOREACH_FROM_SAFE
   - TAILQ_FOREACH_REVERSE
+  - TAILQ_FOREACH_REVERSE_FROM
+  - TAILQ_FOREACH_REVERSE_FROM_SAFE
   - TAILQ_FOREACH_REVERSE_SAFE
-  - RB_FOREACH
-  - RB_FOREACH_SAFE
-  - RB_FOREACH_FROM
-  - RB_FOREACH_REVERSE
-  - RB_FOREACH_REVERSE_FROM
-  - RB_FOREACH_REVERSE_SAFE
-  - FOREACH_THREAD_IN_PROC
-  - FOREACH_PROC_IN_SYSTEM
-  - FOREACH_PRISON_CHILD
-  - FOREACH_PRISON_DESCENDANT
-  - FOREACH_PRISON_DESCENDANT_LOCKED
-  - FOREACH_PRISON_DESCENDANT_LOCKED_LEVEL
-  - MNT_VNODE_FOREACH_ALL
-  - MNT_VNODE_FOREACH_ACTIVE
+  - TAILQ_FOREACH_SAFE
+  - VM_MAP_ENTRY_FOREACH
 IndentCaseLabels: false
 IndentPPDirectives: None
 Language: Cpp
@@ -113,12 +136,35 @@
     SortPriority: 100
 SortIncludes: true
 KeepEmptyLinesAtTheStartOfBlocks: true
-# The options below will only be supported starting with clang 9.0:
-# TODO-CLANG-9: TypenameMacros:
-# TODO-CLANG-9:   - SLIST_HEAD
-# TODO-CLANG-9:   - SLIST_ENTRY
-# TODO-CLANG-9:   - TAILQ_ENTRY
-# TODO-CLANG-9:   - TAILQ_HEAD
-# TODO-CLANG-9:   - STAILQ_ENTRY
-# TODO-CLANG-9:   - STAILQ_HEAD
-...
+TypenameMacros:
+  - ARB_ELMTYPE
+  - ARB_HEAD
+  - ARB8_HEAD
+  - ARB16_HEAD
+  - ARB32_HEAD
+  - ARB_ENTRY
+  - ARB8_ENTRY
+  - ARB16_ENTRY
+  - ARB32_ENTRY
+  - LIST_CLASS_ENTRY
+  - LIST_CLASS_HEAD
+  - LIST_ENTRY
+  - LIST_HEAD
+  - QUEUE_TYPEOF
+  - RB_ENTRY
+  - RB_HEAD
+  - SLIST_CLASS_HEAD
+  - SLIST_CLASS_ENTRY
+  - SLIST_HEAD
+  - SLIST_ENTRY
+  - SMR_POINTER
+  - SPLAY_ENTRY
+  - SPLAY_HEAD
+  - STAILQ_CLASS_ENTRY
+  - STAILQ_CLASS_HEAD
+  - STAILQ_ENTRY
+  - STAILQ_HEAD
+  - TAILQ_CLASS_ENTRY
+  - TAILQ_CLASS_HEAD
+  - TAILQ_ENTRY
+  - TAILQ_HEAD