There is no way round the #define for tuple as long as we want to

 support both versions. Sorry!

Maybe  we can remove it soon if everybody moves to the new naming
scheme.

Code works again and inclusion should, too.

[[Imported from SVN: r5356]]