Minor #include cleanup.