Minor #include header cleanups