[C++] Make JointComposite part of the JointVariant. Reoganized some include to avoid circular dependencies