Updates for use in shared libraries. 

Reviewer: trivial