add modules, fix include syntax