Remove extraneous #ifdef's
Automatically figure out which modules need enabling