Squashed 'include/avim/' content from commit d02f08c

git-subtree-dir: include/avim
git-subtree-split: d02f08cfacddd27afe88f143c62d676252601384
Merge commit 'bc336407853f586b46be598b5eb62ea8fed3d976' as 'include/avim'