Yes, the forward declaration and encapsulation is a much better design. I will do that instead of installing the generated header files.

Thanks for your help.