diff --git a/pom.xml b/pom.xml
index 93b5ab4775305b546928dac98e7b9ebfcb5781d4..b7be57999508eb0e6073173295ff1d0a645b92bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.5.25-SNAPSHOT</version>
+   <version>2.5.25</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 1ae451bcc4fe1f84fedd0c2e9eac9a12899494c6..5cd851f7a3b19078f72d2e6b94e2819644c39f1c 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -136,7 +136,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "AbstractElectrometerClass.h"
 #include "ElectrometerException.h"
 
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index 564ab93f5a9212eea0de2e6413b51cf1abe35d46..ab3dd233cf3e912f5ff45293c4101f9b418c2094 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #ifndef WIN32
 # include <unistd.h>
 #endif
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index e29153022e9948a1887be502bcf51a1b7075bf8e..c5540036fcdc13bc10e452e460ba4de9450920e5 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "KeithleyDDCProtocol.h"
 #include "Keithley_485.h"
 
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index a781d94d2daf07a8f31ca18a4559275eead89c27..add4177b9c8b6dae3b0533574f76b1f2fcad6dc9 100644
--- a/src/Keithley_486.cpp
+++ b/src/Keithley_486.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_486.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 8b3436cfed2da0de0081386317332a90509da221..231cffa55e763d2411832c674c6be96136e292c0 100644
--- a/src/Keithley_487.cpp
+++ b/src/Keithley_487.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_487.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index 3c0026b9986486c1d87e9a06cef1646045b1dbc0..01d5749d8c1bae7d43d4507d1b0f12a1815cacac 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_617.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index 72f3b56740643f734ad0f73a56fd21206bb54f54..fda7b0e5a2f20d148e71c7a2249d12832159f9ff 100644
--- a/src/Keithley_6485.cpp
+++ b/src/Keithley_6485.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_6485.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index 420d317ffc2f88eeb47fccfcb8be6b6b68980270..10c84a766857dd5bc28e4bac75475869eb6bf264 100644
--- a/src/Keithley_6487.cpp
+++ b/src/Keithley_6487.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_6487.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index 0a4d73dee1c93f42276979c138910dfdf1c170fe..fabb24550d91cf3c40bcea8074228e8182b2495c 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_6512.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index f3318daa5c7e3ec6976b13960850c3db356cc888..1086df254c5c851a109f1b4fb5642c579d158ca2 100644
--- a/src/Keithley_6514.cpp
+++ b/src/Keithley_6514.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include <tango.h>  //- Tango exceptions
 #include "Keithley_6514.h"
 #include "KeithleySCPIProtocol.h"
diff --git a/src/Keithley_6517.cpp b/src/Keithley_6517.cpp
index 7ef123cd5ae1b9e84249085bdec2cd69b2a1836e..62da72afbdca2be70e6c3f5935c9d3a2c55c0d4b 100644
--- a/src/Keithley_6517.cpp
+++ b/src/Keithley_6517.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/XString.h>
+#include <XString.h>
 #include "Keithley_6517.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index d97cc1e85978332d2938e5ded586df960bcd3e5a..9c3ff0e0f3f8d20a23cf903daf70817b6a5fe651 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "N_PhotoConducteur.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index a78a09ad3ab7caf772b415cddea8d4e4f5dfead2..6b078d026345ff1e529adcee09dac428a61d090c 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "N_PhotoVoltaique.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index e2ab5226f34af6efc852f0bad55b17d91e53afa5..cf173e62ca6040414f563863fa32688a9fcbbd18 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "NovelecProtocol.h"
 
 //- commands numbers
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 903c6a6d66e6388dfe270cccf3583376fd5fb411..433ecf1dcd2dee5f1a0117a89b2ae47008bd337c 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <XString.h>
 #include "NovelecProtocol.h"
 #include "Novelec_MCCE2.h"