diff --git a/bbfdmd/ubus/CMakeLists.txt b/bbfdmd/ubus/CMakeLists.txt
index 6f1fe784..c8b571b8 100644
--- a/bbfdmd/ubus/CMakeLists.txt
+++ b/bbfdmd/ubus/CMakeLists.txt
@@ -5,7 +5,7 @@ PROJECT(bbfdmd)
 ADD_DEFINITIONS(-fstrict-aliasing -Wall -Wextra -Werror -Wformat -Wformat-signedness -fPIC -D_GNU_SOURCE)
 ADD_DEFINITIONS(-DBBF_VENDOR_PREFIX="${BBF_VENDOR_PREFIX}")
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/libbbfdm-api/")
 
 IF(${BBFDMD_MAX_MSG_LEN})
 	ADD_DEFINITIONS(-DBBFDM_MAX_MSG_LEN=${BBFDMD_MAX_MSG_LEN})
diff --git a/bbfdmd/ubus/bbfdmd.h b/bbfdmd/ubus/bbfdmd.h
index 7a0f12c6..57f1d4bb 100644
--- a/bbfdmd/ubus/bbfdmd.h
+++ b/bbfdmd/ubus/bbfdmd.h
@@ -5,7 +5,7 @@
 #include <libubox/blobmsg.h>
 #include <libubox/list.h>
 
-#include "libbbfdm-api/dmbbf.h"
+#include "dmbbf.h"
 
 struct bbfdm_async_req {
 	struct ubus_context *ctx;
diff --git a/bbfdmd/ubus/common.h b/bbfdmd/ubus/common.h
index 8177ecc6..e06bf856 100644
--- a/bbfdmd/ubus/common.h
+++ b/bbfdmd/ubus/common.h
@@ -14,7 +14,7 @@
 #include <libubox/utils.h>
 #include <libubox/list.h>
 
-#include "libbbfdm-api/dmcommon.h"
+#include "dmcommon.h"
 
 #include "bbfdmd.h"
 
diff --git a/bbfdmd/ubus/plugin.c b/bbfdmd/ubus/plugin.c
index 86dc7fda..8f4e031f 100644
--- a/bbfdmd/ubus/plugin.c
+++ b/bbfdmd/ubus/plugin.c
@@ -14,7 +14,7 @@
 
 #include "common.h"
 
-#include "libbbfdm-api/plugin/json_plugin.h"
+#include "plugin/json_plugin.h"
 
 extern struct list_head global_memhead;
 
diff --git a/libbbfdm-api/plugin/vendor_plugin.c b/libbbfdm-api/plugin/vendor_plugin.c
index 25555ef5..9e102526 100644
--- a/libbbfdm-api/plugin/vendor_plugin.c
+++ b/libbbfdm-api/plugin/vendor_plugin.c
@@ -12,6 +12,10 @@
 #include "vendor_plugin.h"
 #include "../dmplugin.h"
 
+#ifndef BBF_VENDOR_LIST
+#define BBF_VENDOR_LIST ""
+#endif
+
 static void overwrite_param(DMOBJ *entryobj, DMLEAF *leaf)
 {
 	if (entryobj->leaf) {
diff --git a/tools/tools_input.json b/tools/tools_input.json
index 75a73590..927123b7 100644
--- a/tools/tools_input.json
+++ b/tools/tools_input.json
@@ -108,26 +108,6 @@
       "dm_files": [
         "src/times.c"
       ]
-    },
-    {
-      "repo": "https://dev.iopsys.eu/voice/tr104.git",
-      "proto": "git",
-      "version": "devel",
-      "dm_files": [
-        "libdm/dmtree/servicesvoiceservice.c",
-        "libdm/dmtree/servicesvoiceservicecallcontrol.c",
-        "libdm/dmtree/servicesvoiceservicecalllog.c",
-        "libdm/dmtree/servicesvoiceservicecapabilities.c",
-        "libdm/dmtree/servicesvoiceservicecodecprofile.c",
-        "libdm/dmtree/servicesvoiceservicedect.c",
-        "libdm/dmtree/servicesvoiceservicepots.c",
-        "libdm/dmtree/servicesvoiceservicereservedports.c",
-        "libdm/dmtree/servicesvoiceservicesip.c",
-        "libdm/dmtree/servicesvoiceservicevoipprofile.c",
-        "libdm/dmtree/vendor_ext/servicesvoiceservicecallcontrol.c",
-        "libdm/dmtree/vendor_ext/servicesvoiceservicecalllog.c",
-        "libdm/dmtree/vendor_ext/servicesvoiceservicedect.c"
-      ]
     }
   ],
   "output": {