Added includes to fix compiler errors