Reorganizing includes