Lightly reworked include system.