More include file disentanglement