A tiny bit of include cleanup