Added two missing headers
merge