updated includes for integrated singularity