Update include files to match code refactoring for two modules.