One of the problems you may be having is the src files you have are out of date. Always check http://repository.maemo.org/pool/ for the latest versions of files as project pages in maemo.org can sometimes be confusing as they can be fairly old.

As far as im aware http://repository.maemo.org/pool/dia...0x-module-src/ should be the latest copies of the files(for diablo at least, go up the tree for other os versions) you need. Please let us know how you get on.

Craig