Fixed introduced include errors in last commit.