A bit of #include cleanup. (dm)