r7037: Add enough pointers in the header file as well