Reapply the fix and update the build targets and make the header files public for the copy phase to ease library integration in Xcode workspaces.