Added missong includes, removed unnecessary ones