Add required and remove unnecessary includes