Fixup: Module header includes