revert to clang 3.4 compatible headers/shims