Merge "avoid redefining DECLSPEC_DEPRECATED"