Fixing bugs with modules and headers