fix of issues https://hypernews.cern.ch/HyperNews/CMS/get/swReleases/3982.html
previous fix refined
move to statis conts insted of #define
Merge pull request #1970 from abdoulline/fragile_headers_fix70X

ROOT6 fix -- fix of issues https://hypernews.cern.ch/HyperNews/CMS/get/swReleases/3982.html