BANNING, California (CNN) -- Cooler temperatures and lull in gusty Santa Ana winds helped firefighters make headway Wednesday in battling two major wildfires in Riverside County.

Fire officials now say they expect the largest blaze, which has charred nearly 25,000 acres near Mount Edna, will be fully contained by Friday and under control by Saturday. A smaller fire a few miles north, which has consumed about 2,000 acres, is expected to be fully contained Thursday and under control by early Friday.

About 2,000 firefighters were brought in to battle the blazes, and two of them have died. The first was killed Monday when his air tanker crashed while dropping fire retardant on the flames. The second died after suffering a heart attack while trying to save a house threatened by fire.

The fires, which began Monday morning, have destroyed at least five structures. But all evacuation orders issued in Riverside County have been lifted, according to county fire department spokesman Will Donaldson.

Two other wildfires farther to the south near San Diego also resulted in property damage on Tuesday.

In Rancho Bernardo, six homes under construction and three cars were destroyed by fire, with damage estimated at $940,000. And in San Marcos, firefighters contained a small blaze that destroyed two outbuildings on the campus of California State University.

"Fighting Fire: A Personal Story" by Caroline Paul "Young Men and Fire" by Norman MacLean "Fire on the Rim: A Firefighter's Season at the Grand Canyon" by Stephen J. Pyne "Lookouts: Firewatchers of the Cascades & Olympics" by Ira Spring "Fire in America: A Cultural History of Wildland & Rural Fire" by Stephen J. Pyne Click here for additional reading on Forest Fire