Made ch05 modules (almost) compilable.