issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
Also added more deprecated constants.
issue #2430: Fixing conflicts.
Merge pull request #3283 from dumganhar/iss2430-more-deprecated-fix

issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.