Added missing headers on new classes