resolve symbols bound by define-syntax
remove unneeded include