remove some macro definitions in header files
Merge pull request #1561 from ruil2/cleanup

remove some macro definitions in header files