More module include fixes