added back a couple of missing headers