small cleanups #include