Further include cleanup