diff --git a/Makefile b/Makefile
index c47af5a2e4584361db9442201c43305073cf658c..be5c8af4c710d3b69a8b2aa0c303ca870600ed65 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME_SRV = ionpump-srv
 CXXFLAGS =
 LDFLAGS =
 
-include ../Make.in
+include ../makefiles/Make-9.3.3.in
 
 test: bin/${NAME_SRV}
 	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SDKTARGETSYSROOT)/usr/lib $(LOADER) bin/${NAME_SRV} test -v4
diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp
index 027f14f29ead5669c5a461f9f9471e6f4a928fa4..58097962d9f64164e3b01f61359a8e0d9e51aada 100644
--- a/src/ClassFactory.cpp
+++ b/src/ClassFactory.cpp
@@ -1,5 +1,4 @@
 /*----- PROTECTED REGION ID(Ionpump::ClassFactory.cpp) ENABLED START -----*/
-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/fermi/servers/ionpump/src/ClassFactory.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
 //+=============================================================================
 //
 // file :        ClassFactory.cpp
diff --git a/src/IonpumpClass.cpp b/src/IonpumpClass.cpp
index 5911732482e927f1f2174ec7ec755cb306ae4b7d..6b72426301345449ff1f25bec7b87a418b7e6a8c 100644
--- a/src/IonpumpClass.cpp
+++ b/src/IonpumpClass.cpp
@@ -1,6 +1,6 @@
 /*----- PROTECTED REGION ID(IonpumpClass.cpp) ENABLED START -----*/
-static const char *RcsId      = "$Id: IonpumpClass.cpp,v 1.4 2017-06-14 11:48:04 alessio Exp $";
-static const char *TagName    = "Ionpump $Name:  $";
+//static const char *RcsId      = "$Id: IonpumpClass.cpp,v 1.4 2017-06-14 11:48:04 alessio Exp $";
+static const char *TagName    = "1.0.1";
 static const char *CvsPath    = "$Source: /home/cvsadm/cvsroot/fermi/servers/ionpump/src/IonpumpClass.cpp,v $";
 static const char *SvnPath    = "$HeadURL:  $";
 static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc/ds_doc/";
diff --git a/src/IonpumpStateMachine.cpp b/src/IonpumpStateMachine.cpp
index 952d9b5726b77acb778a7e9d99b530cf60191ae5..db2334bda400bde012b309c8474cfc33cfb5dcd4 100644
--- a/src/IonpumpStateMachine.cpp
+++ b/src/IonpumpStateMachine.cpp
@@ -1,5 +1,4 @@
 /*----- PROTECTED REGION ID(IonpumpStateMachine.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: IonpumpStateMachine.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
 //=============================================================================
 //
 // file :        IonpumpStateMachine.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 3b195391341b50a3daa0783d4052b31130e72f9a..7e2e4c33f42dd3238c8c66ea3c4800bf857d10ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,4 @@
 /*----- PROTECTED REGION ID(Ionpump::main.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: main.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
 //=============================================================================
 //
 // file :        main.cpp