Merge pull request #1 from BugFreeSoftware/master

Added missing include files for Windows
Inserted space to remove VS2013 warning C4138: '*/' found outside of comment