header files to go bad. Include vapi.h after our headers to solve the issue. This commit was SVN r9258.