Disentangle include file mess