code style
Fix import errors in new capp compiler