* Added two missing includes