diff --git a/include/Waveform.h b/include/Waveform.h
index 8dbbabe177cfa94cd2f8bdd446ce0ea5f05aa7d6..b11057a00765a251b7cb45044c7092b827a43d72 100644
--- a/include/Waveform.h
+++ b/include/Waveform.h
@@ -14,7 +14,7 @@
 #ifndef _WaveForm_data_H
 #define _WaveForm_data_H
 
-#include <string>
+#include <cstring>
 #include "WaveformException.h"
 #include <Xstring.h>
 
diff --git a/src/Waveform.cpp b/src/Waveform.cpp
index 5764ddc004421b6e04f81f14f8367f6b1551cd77..6bfb95602b119826ee878ea1ebd0bf06dd24a541 100644
--- a/src/Waveform.cpp
+++ b/src/Waveform.cpp
@@ -98,8 +98,8 @@ short	OFFSET_STRUCT = 0;
 	//- prepare the cmd to get the waveform data
 	cmd = ch_name + ":WF? ALL";
 	cmdStr = new char[cmd.size()+1];
-	std::strcpy(cmdStr, cmd.c_str());
-	int length = std::strlen(cmdStr);
+	std:strcpy(cmdStr, cmd.c_str());
+	int length = strlen(cmdStr);
 
 	//- send the request
 	SocketLecroy::get_instance( )->TCP_WriteDevice(cmdStr,length,true);