[PATCH] MsWin merge, chunk 1 (of about 3)

Hi,
  here's the first part of the merge proposal for the mswin branch.
What I'm doing is simply to examine and try to validate the output of
a "bzr send" from the mswin branch.
These changes should be quite local and windows-specific; when they're
not, they're mostly about adding guards to
existing includes.

-- 
    /kinkie