COMP: compilation failures encountered with Visual Studio 2013

  trivial changes (mostly header includes) to allow compilation

Change-Id: I13b26b2922a5aecba13f7db3cf0589cf660312c5
Merge topic 'VS12-build-issues_partb'

5b8e521 COMP: compilation failures encountered with Visual Studio 2013