Fix build broken at 506df426d5d6.

Move header file includes when usage moved.
Windows-only section missing a ")".

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1349783003 .
3 files changed