Cleanup some includes