Add more missing headers for stand alone version.