fixed conditional targets for windows-builds
fixed includes