Cleanup.
Added missing headers to library target.