Can't build current git status.

When I try to build the current git status (trying to do so in preparation for submitting a Win32 patch), I get lots of errors on both Windows and Linux. They are all related to PHash, and on quick investigation it seems that there are two copies of the PHash code, one in PHash_inline.h and one in IoObject_inline.h

Paul