Fixed unbalanced include of abi headers

- resulting in more pops than pushes in MSVC.
Merge branch 'develop'