Fixing MSVC12 build

Adding some #includes that were missing.