extraneous #include cleanup