Slightly adjusted entry_point macro formatting
More adjustment for includes on Windows
Fixed a couple of issues with build system found during testing