Bug 854517: Fixes for hard VEX includes in some files