Bug fix: adding two missing includes, removing one incorrect include