Added two missing headers