Fixed Linux/Windows headers problem
Merge conflicted headers problem in master