xmmsclient+ build error with nano's s4-test branch

gistfile1.txt

[ 36/379] cxx: src/clients/lib/xmmsclient++/client.cpp -> _build_/default/src/clients/lib/xmmsclient++/client_1.o
In file included from ../src/include/xmmsclient/xmmsclient++/result.h:23:0,
                 from ../src/include/xmmsclient/xmmsclient++/bindata.h:22,
                 from ../src/clients/lib/xmmsclient++/bindata.cpp:18:
../src/include/xmmsclient/xmmsclient++/coll.h:53:29: error: ‘XMMS_COLLECTION_TYPE_QUEUE’ was not declared in this scope
../src/include/xmmsclient/xmmsclient++/coll.h:54:29: error: ‘XMMS_COLLECTION_TYPE_PARTYSHUFFLE’ was not declared in this scope
In file included from ../src/include/xmmsclient/xmmsclient++/bindata.h:22:0,
                 from ../src/clients/lib/xmmsclient++/bindata.cpp:18:
../src/include/xmmsclient/xmmsclient++/result.h: In static member function ‘static Xmms::CollPtr Xmms::CollResult::createColl(xmmsv_coll_t*)’:
../src/include/xmmsclient/xmmsclient++/result.h:438:11: error: ‘XMMS_COLLECTION_TYPE_QUEUE’ was not declared in this scope
../src/include/xmmsclient/xmmsclient++/result.h:442:11: error: ‘XMMS_COLLECTION_TYPE_PARTYSHUFFLE’ was not declared in this scope
In file included from ../src/include/xmmsclient/xmmsclient++/result.h:23:0,
                 from ../src/include/xmmsclient/xmmsclient++/playback.h:24,
                 from ../src/include/xmmsclient/xmmsclient++/client.h:22,
                 from ../src/clients/lib/xmmsclient++/client.cpp:19:
../src/include/xmmsclient/xmmsclient++/coll.h:53:29: error: ‘XMMS_COLLECTION_TYPE_QUEUE’ was not declared in this scope
../src/include/xmmsclient/xmmsclient++/coll.h:54:29: error: ‘XMMS_COLLECTION_TYPE_PARTYSHUFFLE’ was not declared in this scope
In file included from ../src/include/xmmsclient/xmmsclient++/playback.h:24:0,
                 from ../src/include/xmmsclient/xmmsclient++/client.h:22,
                 from ../src/clients/lib/xmmsclient++/client.cpp:19:
../src/include/xmmsclient/xmmsclient++/result.h: In static member function ‘static Xmms::CollPtr Xmms::CollResult::createColl(xmmsv_coll_t*)’:
../src/include/xmmsclient/xmmsclient++/result.h:438:11: error: ‘XMMS_COLLECTION_TYPE_QUEUE’ was not declared in this scope
../src/include/xmmsclient/xmmsclient++/result.h:442:11: error: ‘XMMS_COLLECTION_TYPE_PARTYSHUFFLE’ was not declared in this scope
Waf: Leaving directory `/home/fdf/opt/anon-vc/xmms2/_build_'
Build failed:
 -> task failed (err #1): 
        {task: cxx bindata.cpp -> bindata_1.o}
 -> task failed (err #1): 
        {task: cxx client.cpp -> client_1.o}