Moved includes, fixed compile warnings