Fix some includes and TODOs