[RDY] Move defines from vim.h to other header files

Might as well rebase. Will merge right after. Thanks!