Upgraded include paths in modules