Fixed the errors from merge

had to add in some more includes