ChickenUse: better handling of includes, some cleanup