Fix nova helpers (remove unneeded headers)

Change-Id: Idc81d9e837d596c58e75940880bf67ecd974f344