Your new header should all not be public. The existing ones should be fine unless I screwed up. ;)