diff --git a/apps/aqhome-tool/0BUILD b/apps/aqhome-tool/0BUILD
index 63659d7..6b8b695 100644
--- a/apps/aqhome-tool/0BUILD
+++ b/apps/aqhome-tool/0BUILD
@@ -34,6 +34,8 @@
 
     <headers dist="true" >
       utils.h
+      client.h
+      client_p.h
     </headers>
   
     <sources>
@@ -41,6 +43,7 @@
 
       main.c
       utils.c
+      client.c
     </sources>
 
     <useTargets>
diff --git a/apps/aqhome-tool/data/client.c b/apps/aqhome-tool/client.c
similarity index 99%
rename from apps/aqhome-tool/data/client.c
rename to apps/aqhome-tool/client.c
index d366408..6a89c01 100644
--- a/apps/aqhome-tool/data/client.c
+++ b/apps/aqhome-tool/client.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./client_p.h"
-#include "../utils.h"
+#include "./utils.h"
 
 #include "aqhome/aqhome.h"
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/client.h b/apps/aqhome-tool/client.h
similarity index 100%
rename from apps/aqhome-tool/data/client.h
rename to apps/aqhome-tool/client.h
diff --git a/apps/aqhome-tool/data/client_p.h b/apps/aqhome-tool/client_p.h
similarity index 100%
rename from apps/aqhome-tool/data/client_p.h
rename to apps/aqhome-tool/client_p.h
diff --git a/apps/aqhome-tool/data/0BUILD b/apps/aqhome-tool/data/0BUILD
index fc821bc..4af2354 100644
--- a/apps/aqhome-tool/data/0BUILD
+++ b/apps/aqhome-tool/data/0BUILD
@@ -33,8 +33,6 @@
     </setVar>
 
     <headers dist="true" >
-      client.h
-      client_p.h
       getvalues.h
       getdevices.h
       adddata.h
@@ -47,7 +45,6 @@
     <sources>
       $(local/typefiles)
 
-      client.c
       getvalues.c
       getdevices.c
       adddata.c
diff --git a/apps/aqhome-tool/data/adddata.c b/apps/aqhome-tool/data/adddata.c
index 27eceb5..cea8394 100644
--- a/apps/aqhome-tool/data/adddata.c
+++ b/apps/aqhome-tool/data/adddata.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./adddata.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/getdatapoints.c b/apps/aqhome-tool/data/getdatapoints.c
index 4d8c58f..b7fc7af 100644
--- a/apps/aqhome-tool/data/getdatapoints.c
+++ b/apps/aqhome-tool/data/getdatapoints.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./getvalues.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/getdevices.c b/apps/aqhome-tool/data/getdevices.c
index e3b9d49..b1e7000 100644
--- a/apps/aqhome-tool/data/getdevices.c
+++ b/apps/aqhome-tool/data/getdevices.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./getvalues.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/getvalues.c b/apps/aqhome-tool/data/getvalues.c
index 4fb6ae0..0b036ec 100644
--- a/apps/aqhome-tool/data/getvalues.c
+++ b/apps/aqhome-tool/data/getvalues.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./getvalues.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/moddevice.c b/apps/aqhome-tool/data/moddevice.c
index d3baa15..d6b124e 100644
--- a/apps/aqhome-tool/data/moddevice.c
+++ b/apps/aqhome-tool/data/moddevice.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./moddevice.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/setdata.c b/apps/aqhome-tool/data/setdata.c
index 8047cce..4ef1008 100644
--- a/apps/aqhome-tool/data/setdata.c
+++ b/apps/aqhome-tool/data/setdata.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./setdata.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/msg/ipc/m_ipc.h"
diff --git a/apps/aqhome-tool/data/watch.c b/apps/aqhome-tool/data/watch.c
index 45d1b08..42b994d 100644
--- a/apps/aqhome-tool/data/watch.c
+++ b/apps/aqhome-tool/data/watch.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "./watch.h"
-#include "./client.h"
+#include "../client.h"
 #include "../utils.h"
 
 #include "aqhome/ipc2/endpoint.h"
diff --git a/apps/aqhome-tool/utils.c b/apps/aqhome-tool/utils.c
index 313a47b..872091f 100644
--- a/apps/aqhome-tool/utils.c
+++ b/apps/aqhome-tool/utils.c
@@ -45,7 +45,6 @@ AQH_OBJECT *Utils2_SetupBrokerClientEndpoint(AQH_EVENT_LOOP *eventLoop, GWEN_DB_
 {
   const char *brokerAddress;
   int brokerPort;
-  const char *brokerClientId;
 
   brokerAddress=GWEN_DB_GetCharValue(dbArgs, "brokerAddress", 0, NULL);
   if (!(brokerAddress && *brokerAddress))
@@ -55,8 +54,6 @@ AQH_OBJECT *Utils2_SetupBrokerClientEndpoint(AQH_EVENT_LOOP *eventLoop, GWEN_DB_
   if (brokerPort<0)
     brokerPort=GWEN_DB_GetIntValue(dbArgs, "ConfigFile/brokerPort", 0, 45456);
 
-  brokerClientId=GWEN_DB_GetCharValue(dbArgs, "brokerClientId", 0, "aqhome-tool");
-
   if (brokerAddress && *brokerAddress && brokerPort) {
     AQH_OBJECT *ep;
     int fd;