... using prewin.h/postwin.h around ATL headers.  Also remove some other
cruft while at it.

Change-Id: I7d081dae88273dfd214ef078f5844ce266e388fb