Bug fixes: two missing includes added, one incorrect include deleted