diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeGenericTrap.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeGenericTrap.cxx
index 5f9e1723c5692ebe05ac568093b6bb1f9866a5c0..d916c1f7defee402b921f5e45fba98cfaf652ff6 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeGenericTrap.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeGenericTrap.cxx
@@ -13,6 +13,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 
 using namespace xercesc;
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeRotation.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeRotation.cxx
index 5473cbfafb7a70dc23f0ba2c4c907f6f3139ade8..40d530e08aecabb26aa7f81d8b817ec8692eefaf 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeRotation.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeRotation.cxx
@@ -10,6 +10,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 MakeRotation::MakeRotation() {}
 
 using namespace xercesc;
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeSimplePolygonBrep.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeSimplePolygonBrep.cxx
index 4c6f22bc7acef03353e01ac7c0caf1aaaaf1a697..db7c8b9b3be6be79ef34df4b81d0e1f45724ab8c 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeSimplePolygonBrep.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeSimplePolygonBrep.cxx
@@ -5,6 +5,7 @@
 #include <vector>
 #include <sstream>
 #include <stdexcept>
+#include <array>
 
 #include "GeoModelXml/shape/MakeSimplePolygonBrep.h"
 #include "GeoModelKernel/GeoSimplePolygonBrep.h"
@@ -12,6 +13,8 @@
 #include "GeoModelHelpers/throwExcept.h"
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
+
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTorus.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTorus.cxx
index 99bfa5dd63fbc6355f0b56f983277da8ee9d91a3..923c040e38da2a0a6cbcf4c440eed6edeec5d498 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTorus.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTorus.cxx
@@ -11,6 +11,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTranslation.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTranslation.cxx
index 3d73786d4b44f4f2cc499ea6666a9d072ca089ee..5ca10a7ba7520133a8f2d708cd4ef2a0d05fbe68 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTranslation.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTranslation.cxx
@@ -9,6 +9,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 #include "GeoModelKernel/GeoDefinitions.h"
 
 MakeTranslation::MakeTranslation() {}
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrap.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrap.cxx
index 577f729d5cd5c86795dc117d164e0d2c55a5e4c3..1f586182848dc68b28c2d43c38d24e01bc47539e 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrap.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrap.cxx
@@ -9,6 +9,9 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 #include "GeoModelKernel/GeoTrap.h"
+
+#include <array>
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrd.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrd.cxx
index 5d8d64ff155a41e1f713bf54420acdb6c4cc32cb..322c02c9e052bcac5dc31272956daedb46a3885d 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrd.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTrd.cxx
@@ -10,6 +10,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTube.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTube.cxx
index 00806d89af43b0b401cb220fedf377ec04481ad0..459f5ed8a00b9e7b60718bbdef2e72fed07ceeea 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTube.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTube.cxx
@@ -10,6 +10,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTubs.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTubs.cxx
index c8fe9cad93ae7a211fa9075e3e569d081927e9bc..9fa63a26a1e76264fdae6383a91af9563c194206 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTubs.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTubs.cxx
@@ -10,6 +10,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 using namespace xercesc;
 
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTwistedTrap.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTwistedTrap.cxx
index ef1b479762bef17c40a48f2d2acf9978e5e50f00..775662058f6e0afaa374c3c3350db22f4f03aa11 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTwistedTrap.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MakeTwistedTrap.cxx
@@ -29,6 +29,8 @@
 #include "xercesc/util/XMLString.hpp"
 #include "GeoModelXml/GmxUtil.h"
 
+#include <array>
+
 using namespace xercesc;