Some header #include fixes