Fix some more include directives