diff -Naur 2.0.2.3/CLHEP/HepMC/HepMC/GenEvent.h clhep-2.0.2.3/CLHEP/HepMC/HepMC/GenEvent.h
--- 2.0.2.3/CLHEP/HepMC/HepMC/GenEvent.h	2018-10-11 19:57:33.785153363 +0300
+++ clhep-2.0.2.3/CLHEP/HepMC/HepMC/GenEvent.h	2018-10-11 19:58:49.861428543 +0300
@@ -141,8 +141,8 @@
         typedef std::forward_iterator<GenVertex*,ptrdiff_t> forwardVertexIterType;
         typedef std::forward_iterator<GenParticle*,ptrdiff_t> forwardParticleIterType;
 #else
-        typedef std::iterator<std::forward_iterator_tag,GenVertex*,ptrdiff_t> forwardVertexIterType;
-        typedef std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t> forwardParticleIterType;
+        typedef std::iterator<std::forward_iterator_tag,GenVertex*,std::ptrdiff_t> forwardVertexIterType;
+        typedef std::iterator<std::forward_iterator_tag,GenParticle*,std::ptrdiff_t> forwardParticleIterType;
 #endif
 
 	GenEvent( int signal_process_id = 0, int event_number = 0,
diff -Naur 2.0.2.3/CLHEP/HepMC/HepMC/GenVertex.h clhep-2.0.2.3/CLHEP/HepMC/HepMC/GenVertex.h
--- 2.0.2.3/CLHEP/HepMC/HepMC/GenVertex.h	2018-10-11 19:57:36.969332299 +0300
+++ clhep-2.0.2.3/CLHEP/HepMC/HepMC/GenVertex.h	2018-10-11 19:58:30.316330180 +0300
@@ -49,7 +49,7 @@
 #if defined __GNUG__ && ( __GNUG__ < 3 )
         typedef std::forward_iterator<GenVertex*,ptrdiff_t> forwardVertexIterType;
 #else
-        typedef std::iterator<std::forward_iterator_tag,GenVertex*,ptrdiff_t> forwardVertexIterType;
+        typedef std::iterator<std::forward_iterator_tag,GenVertex*,std::ptrdiff_t> forwardVertexIterType;
 #endif
 
 	GenVertex( const CLHEP::HepLorentzVector& position =CLHEP::HepLorentzVector(0,0,0,0),
diff -Naur 2.0.2.3/CLHEP/HepPDT/test/listParticleNames.cc clhep-2.0.2.3/CLHEP/HepPDT/test/listParticleNames.cc
--- 2.0.2.3/CLHEP/HepPDT/test/listParticleNames.cc	2005-04-08 22:48:55.000000000 +0300
+++ clhep-2.0.2.3/CLHEP/HepPDT/test/listParticleNames.cc	2018-10-11 18:22:36.205196960 +0300
@@ -10,6 +10,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <stdlib.h>
 
 #include "CLHEP/HepPDT/ParticleName.hh"
 
diff -Naur 2.0.2.3/CLHEP/HepPDT/test/listPDGNames.cc.in clhep-2.0.2.3/CLHEP/HepPDT/test/listPDGNames.cc.in
--- 2.0.2.3/CLHEP/HepPDT/test/listPDGNames.cc.in	2005-04-08 22:48:55.000000000 +0300
+++ clhep-2.0.2.3/CLHEP/HepPDT/test/listPDGNames.cc.in	2018-10-11 20:12:46.888466281 +0300
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <stdlib.h>
 
 #include "CLHEP/HepPDT/TranslationList.hh"
 
diff -Naur 2.0.2.3/CLHEP/HepPDT/test/listPythiaNames.cc.in clhep-2.0.2.3/CLHEP/HepPDT/test/listPythiaNames.cc.in
--- 2.0.2.3/CLHEP/HepPDT/test/listPythiaNames.cc.in	2005-04-08 22:48:55.000000000 +0300
+++ clhep-2.0.2.3/CLHEP/HepPDT/test/listPythiaNames.cc.in	2018-10-11 20:12:23.871172795 +0300
@@ -8,6 +8,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <stdlib.h>
 
 #include "CLHEP/HepPDT/TranslationList.hh"
 
diff -Naur 2.0.2.3/CLHEP/HepPDT/test/listQQTranslation.cc.in clhep-2.0.2.3/CLHEP/HepPDT/test/listQQTranslation.cc.in
--- 2.0.2.3/CLHEP/HepPDT/test/listQQTranslation.cc.in	2005-04-08 22:48:55.000000000 +0300
+++ clhep-2.0.2.3/CLHEP/HepPDT/test/listQQTranslation.cc.in	2018-10-11 20:13:10.941817989 +0300
@@ -11,6 +11,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <stdlib.h>
 
 #include "CLHEP/HepPDT/defs.h"
 #include "CLHEP/HepPDT/QQDecayTable.hh"
diff -Naur 2.0.2.3/CLHEP/StdHep/test/SimpleRand.hh clhep-2.0.2.3/CLHEP/StdHep/test/SimpleRand.hh
--- 2.0.2.3/CLHEP/StdHep/test/SimpleRand.hh	2005-04-08 23:13:54.000000000 +0300
+++ clhep-2.0.2.3/CLHEP/StdHep/test/SimpleRand.hh	2018-10-11 18:30:51.845056319 +0300
@@ -9,6 +9,8 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
+#include <stdlib.h>
+#include <string.h>
 
 class SimpleRand {