fixed problems with SIP 4.6 and cleaned up some includes
Authored by: knut 2007-05-10
Parent: [r515]
Child: [r517]
