Ensure that modules are correctly included