lib: fix up cpp includes of native types