Bugfix to avoid conflicts with macro definitions on windows platform