Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.