libdbusmenu-gtk3-dev include path seems inconsistent

I am attempting to port an indicator to gtk3 in oneiric and am noticing some inconsistencies between libindicator and libdbusmenu and include paths. Already filed lp:803136 for libindicator, but I am asking a question about libdbusmenu because I am not sure if this is actually a bug or not.

In libdbusmenu-gtk/Makefile.am, the include path is given as:

libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/

however in libindicator/Makefile.am it is:

libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator

This has the benefit of not having to change the includes when building for gtk2 or gtk3, as indicator-datetime does. indicator-datetime will build successfully for both, but it build-deps on both libdbusmenu-gtk-dev and libdbusmenu-gtk3-dev. So it seems to only succeed because of a side effect of building for both (otherwise, it seems like the build would fail).

Anyway, the question is, should libdbusmenu-gtk have a similar include path to libindicator or should I update my source files to use libdbusmenu-gtk3 as the base source directory instead, and break the gtk2 build (or guard it with #ifdef etc)?