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

I will move the macro to screen.c.  Should I modify the two commits with a rebase, or make a new commit for this change?