Exporting correct headers?

Making a change to insure the package headers are
correctly exported.  Don't know if this is right though...