Minor include cleanup