Add updated Activator headers
Improve compatibility with SDK 7.0 and clang