More include cleanup, hopefully buildfix Symbian