move jsapi-util include into cpp file
Add more missing compartment calls