Bootstrap: include non-generic modules