Patch: C++ command generation scripts

[Mats Forslöf]

I have tweaked the C++ command generation scripts a bit to make them generate 
more precise types and includes, see attached files.

Regards,
Mats