Fix build with 4.7+ toolchains