E34 Windshield Interior Leak

My windshield has had a 1 foot or so crack in it, so it needs to be replaced.

There also happens to be a couple rust spots on the body metal above the windshield. What is involved in fixing these, does it need to be done with the window out?

I'm not sure if the water leak is from the rust or the window not being sealed, I think it's from the window not being sealed. It is a pretty major leak I would say, little bit of garden hose water on the general area above the windshield and there is enough water to start going down into the dash.eek.

What are the windshield clips that people have mentioned in other threads, are they really neccesary if not using bmw glass?

I plan on using safelite, they replaced the rear stock tinted window in my Jeep Cherokee, and it was done perfectly. I don't mind not having the stock bmw windshield trim so long as my leak is gone and there isn't much more wind noise than I have now.

Largest Rust Spot:
http://img70.imageshack.us/img70/911...69smalldq8.jpg

Smaller Rust Spot:
http://img225.imageshack.us/img225/1...71smallwa8.jpg

View of leak area from behind console lights(You can see a droplet of water in the center of the picture):
http://img75.imageshack.us/img75/424...73smallmh9.jpg
note: The leak doesn't actually drip down at the rust spots, but at the point off center of the windshield, seen in the last picture