Fix "include module" issues - part 2