Add appropriate class inclusions