Fix include_class deprecation warnings