diff --git a/src/AlarmHandler.h b/src/AlarmHandler.h
index 5a3eb35e37f56d1e91d5e99415837a16435db51d..1d96b0879f9b5cb02609e4f30dc2a5fa823b3c71 100644
--- a/src/AlarmHandler.h
+++ b/src/AlarmHandler.h
@@ -61,7 +61,15 @@ class update_thread;
 #	define	ELAPSED(before, after)	\
 		1000.0*(after.tv_sec-before.tv_sec) + \
 		((double)after.tv_usec-before.tv_usec) / 1000
-
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+#ifndef TANGO_LOG_INFO
+#define TANGO_LOG_INFO cout2
+#endif
+#ifndef TANGO_LOG_DEBUG
+#define TANGO_LOG_DEBUG cout4
+#endif
 
 
 /*----- PROTECTED REGION END -----*/	//	AlarmHandler.h
diff --git a/src/SubscribeThread.h b/src/SubscribeThread.h
index a6ec96093204754912da246e285cf815b445c261..2bb1caf6b3a6fec2c9d30c19c9e57cc08b169dae 100644
--- a/src/SubscribeThread.h
+++ b/src/SubscribeThread.h
@@ -2,7 +2,6 @@
 #define _SUBSCRIBE_THREAD_H
 
 #include <tango/tango.h>
-#include <tango/client/eventconsumer.h>
 #include <stdint.h>
 #include "event_table.h"
 
diff --git a/src/event_table.cpp b/src/event_table.cpp
index 1b8f46dd69da93771639f7b7a657b3f8554b447e..5de976d01cae246dea15484f36f7f70152cc5702 100644
--- a/src/event_table.cpp
+++ b/src/event_table.cpp
@@ -12,8 +12,6 @@
 #include "AlarmHandler.h"
 #include "alarm_grammar.h"
 
-//for get_event_system_for_event_id, to know if ZMQ
-#include <tango/client/eventconsumer.h>
 #include <regex>
 
 static const char __FILE__rev[] = __FILE__ " $Revision: 1.5 $";
diff --git a/src/main.cpp b/src/main.cpp
index adb9bdd4cdc6639ac213c24585b4876a8a08a578..7ac168763dcd90523074f5ec89aa88079eb1acda 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,6 +43,11 @@
 
 DECLARE_CRASH_HANDLER;
 
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+
+
 int main(int argc,char *argv[])
 {
     using std::endl;