fixed redhat build. re #6611

Owen pointed that I had broken build and forward declaration in header
Merge branch 'feature/6611_muon_v1_to_v2' into develop