include: Move more utility code in C++ space