#10: Fixed headers with module names.