Reshuffle the include/exclude handling
Dual licence under BSD and AGPL