Workaround for ROOT 6 problem with forward declarations
Merge pull request #4590 from wmtan/WorkaroundForROOT6FwdDeclProblem

Workaround for ROOT 6 problem with forward declarations