Addressed two issues dealing with missing header includes and typedef accessibility of multilevel class.