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.