I've just merged them.
But you can probably work around this by fixing your local copyof the header file.
Kurt