- Fix some redefinition warnings caused by our headers' suckyness