Update to include needed headers, increment release to -2