Sync to trunk's Makefile.win; mostly whitespace and

formatting changes, picking up a few missing headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@667137 13f79535-47bb-0310-9956-ffa450edef68