replaced header import with  forward class declaration when possible