If you build from GIT you need to build and install each component in
sequence.  Trying to mix and match non-GIT modules with GIT modules will
not work.

Of course. But that's _exactly_ what I've done, a number of times and on
wheezy and squeeze. I've followed the build order on the wiki, as I've
always done.

What mixing and matching do you think I've done? I'm using the latest
source from git (unless there is more than one git repository).

I just did a rebuild from GIT on Ubuntu and Debian a few days ago with no
problems.  Given the nature of the problem you encountered (having to
rename things that were already renamed in GIT some time ago) it seems as
if some old header files or similar are present somewhere on your system.

If this is not the case then I really have no idea why it won't compile
for you--it works 100% here.

Tim