diff --git a/Apps/Examples/clipping.h b/Apps/Examples/clipping.h
index 8bd8406d8bb49c1a6eda0dca56b1e6803d2865be..227589329eed82d0007ea7cf8c29987fabdd7d21 100644
--- a/Apps/Examples/clipping.h
+++ b/Apps/Examples/clipping.h
@@ -28,11 +28,11 @@
 #include <iostream>
 
 #include "Utils/Qt/qtSimple.h"
-#include "Utils/Qt/qtInputs.h"
+#include "Utils/qtInputs.h"
 
 #include "ui_clipping.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/embeddedMap3.h"
diff --git a/Apps/Examples/mcmesh.h b/Apps/Examples/mcmesh.h
index 16a393592224ca8335f69e4892bd5e4e213131c8..adf504798dfc187eaa7166395aaa1abf2a64fba5 100644
--- a/Apps/Examples/mcmesh.h
+++ b/Apps/Examples/mcmesh.h
@@ -17,7 +17,7 @@
 * along with this library; if not, write to the Free Software Foundation,      *
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
 *                                                                              *
-* Web site: https://iggservis.u-strasbg.fr/CGoGN/                              *
+* Web site: http://cgogn.unistra.fr                                            *
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
@@ -26,7 +26,7 @@
 
 #include "Utils/Qt/qtSimple.h"
 #include "ui_mcmesh.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/map2.h"
diff --git a/Apps/Examples/viewer.h b/Apps/Examples/viewer.h
index 0fe0c93f6554d04df109a2b8bf381eb4c829dfa6..b60cff20bb99ab34377720b46b46c738cc452f90 100644
--- a/Apps/Examples/viewer.h
+++ b/Apps/Examples/viewer.h
@@ -17,7 +17,7 @@
 * along with this library; if not, write to the Free Software Foundation,      *
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
 *                                                                              *
-* Web site: http://cgogn.unistra.fr/                                  *
+* Web site: http://cgogn.unistra.fr/                                           *
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
@@ -26,7 +26,7 @@
 
 #include "Utils/Qt/qtSimple.h"
 #include "ui_viewer.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 #include "Topology/generic/parameters.h"
 #include "Topology/map/embeddedMap2.h"
diff --git a/Apps/Examples/volumeExplorer.h b/Apps/Examples/volumeExplorer.h
index 952a818aa2279b48cdbfdb9ad87eef624e5281c1..036b2972a2f6b1446007bba6112e3f3ee8546a67 100644
--- a/Apps/Examples/volumeExplorer.h
+++ b/Apps/Examples/volumeExplorer.h
@@ -46,7 +46,7 @@
 #include "Utils/frameManipulator.h"
 
 #include "ui_volumeExplorer.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;
diff --git a/Apps/Tuto/show_traversors.h b/Apps/Tuto/show_traversors.h
index 3ee65e1d064cdd101083317f2d69e70d555091c1..bedbbb7851d285bff1007f00454686e5a6e287fc 100644
--- a/Apps/Tuto/show_traversors.h
+++ b/Apps/Tuto/show_traversors.h
@@ -56,7 +56,7 @@
 
 #include "ui_show_traversors.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;
diff --git a/Apps/Tuto/tuto5.h b/Apps/Tuto/tuto5.h
index 31487002753ebddc80aef69e37a9d3c6ff0949ba..02c65b8682491c69f346a9ecf9e8899bfe75b467 100644
--- a/Apps/Tuto/tuto5.h
+++ b/Apps/Tuto/tuto5.h
@@ -57,7 +57,7 @@
 
 #include "ui_tuto5.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;
diff --git a/Apps/Tuto/tuto_mt.cpp b/Apps/Tuto/tuto_mt.cpp
index f6e3a488c5c0a6a17df3132af2663fcdc0ed5548..cb72f9ec167d1d8fff27c3a07fc913d291e11b45 100644
--- a/Apps/Tuto/tuto_mt.cpp
+++ b/Apps/Tuto/tuto_mt.cpp
@@ -42,7 +42,7 @@
 #include "Algo/Parallel/parallel_foreach.h"
 
 // for file input
- #include "Utils/Qt/qtInputs.h"
+#include "Utils/qtInputs.h"
 
 using namespace CGoGN ;
 
diff --git a/Apps/Tuto/tuto_oper2.h b/Apps/Tuto/tuto_oper2.h
index 50b0838a8c88c736e8338b8aa025458e2836bbfb..8eba6643e63f92f20e53595606665807c0b3d6f4 100644
--- a/Apps/Tuto/tuto_oper2.h
+++ b/Apps/Tuto/tuto_oper2.h
@@ -40,7 +40,7 @@
 
 
 #include "ui_tuto_oper2.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 #include "Utils/Qt/qtSimple.h"
 #include "Utils/cgognStream.h"
 
diff --git a/Apps/Tuto/tuto_oper3.h b/Apps/Tuto/tuto_oper3.h
index 5d491a5d430ebab33897c12482e6a4125b1fb1f2..6d4440ff5621973c0246dbf77533b0de3f595e37 100644
--- a/Apps/Tuto/tuto_oper3.h
+++ b/Apps/Tuto/tuto_oper3.h
@@ -40,7 +40,7 @@
 
 
 #include "ui_tuto_oper3.h"
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 #include "Utils/Qt/qtSimple.h"
 #include "Utils/cgognStream.h"
 
diff --git a/Apps/Tuto/tuto_orbits.h b/Apps/Tuto/tuto_orbits.h
index 87d9ac6456f5a040ebb7efc639c8adc64eed3591..66c3ad0d5ecad61337f64fd2d91462f5a2cf0af5 100644
--- a/Apps/Tuto/tuto_orbits.h
+++ b/Apps/Tuto/tuto_orbits.h
@@ -57,7 +57,7 @@
 
 #include "ui_tuto_orbits.h"
 // inclure qtui.h juste après le ui_xxx.h
-#include "Utils/Qt/qtui.h"
+#include "Utils/qtui.h"
 
 
 using namespace CGoGN ;
diff --git a/include/Algo/Parallel/parallel_foreach.hpp b/include/Algo/Parallel/parallel_foreach.hpp
index d98a687b8df99b85132efad6c5d679e8f9fc423b..b09333541b686d4b345a98f325c315d769455181 100644
--- a/include/Algo/Parallel/parallel_foreach.hpp
+++ b/include/Algo/Parallel/parallel_foreach.hpp
@@ -326,8 +326,8 @@ void foreach_cell(typename PFP::MAP& map, unsigned int cell, FunctorMapThreaded<
 template <typename PFP>
 void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>& func,  unsigned int nbth, unsigned int szbuff, bool needMarkers, const FunctorSelect& good)
 {
-	std::vector<Dart> vd[nbth];
-	boost::thread* threads[nbth];
+	std::vector<Dart>* vd = new std::vector<Dart>[nbth];
+	boost::thread** threads = new boost::thread*[nbth];
 
 	Dart d=map.begin();
 
@@ -370,7 +370,7 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>&
 			threads[i] = new boost::thread(ThreadFunction<typename PFP::MAP>(func, vd[i],sync1,sync2, finished,0));
 	}
 	// and continue to traverse the map
-	std::vector<Dart> tempo[nbth];
+	std::vector<Dart>* tempo = new std::vector<Dart>[nbth];
 	for (unsigned int i=0; i<nbth; ++i)
 		tempo[i].reserve(szbuff);
 
@@ -406,6 +406,10 @@ void foreach_dart(typename PFP::MAP& map, FunctorMapThreaded<typename PFP::MAP>&
 		threads[i]->join();
 		delete threads[i];
 	}
+	
+	delete vd;
+	delete threads;
+	delete tempo;
 }
 
 
diff --git a/include/Utils/Qt/qtInputs.h b/include/Utils/qtInputs.h
similarity index 100%
rename from include/Utils/Qt/qtInputs.h
rename to include/Utils/qtInputs.h
diff --git a/include/Utils/Qt/qtui.h b/include/Utils/qtui.h
similarity index 100%
rename from include/Utils/Qt/qtui.h
rename to include/Utils/qtui.h
diff --git a/include/Utils/textures.hpp b/include/Utils/textures.hpp
index f028bd18870b6db7fb14bf7e2773e42f4750e8e8..a4f18dd3037f7dcc5397ca318ade8d9c9ed96a60 100644
--- a/include/Utils/textures.hpp
+++ b/include/Utils/textures.hpp
@@ -587,7 +587,7 @@ template <typename TYPEDOUBLE>
 void Image<DIM,TYPE>::subSample2()
 {
 	Image<DIM,TYPE>* newImg = subSampleToNewImage2<TYPEDOUBLE>();
-	swap(*newImg);
+	this->swap(*newImg);
 	delete newImg;
 }
 
@@ -720,7 +720,7 @@ template < unsigned int DIM, typename TYPE >
 void Image<DIM,TYPE>::rotate90(int axis)
 {
 	Image<DIM,TYPE>* newImg = rotate90ToNewImage(axis);
-	swap(*newImg);
+	this->swap(*newImg);
 	delete newImg;
 }
 
diff --git a/src/Utils/Qt/qtinputs.cpp b/src/Utils/qtinputs.cpp
similarity index 99%
rename from src/Utils/Qt/qtinputs.cpp
rename to src/Utils/qtinputs.cpp
index 6b0b0fa66c61feadfe0bbd8808503f6bb42db519..db64cb875cf09af1d2a3bb3b7ecffc80c3d3b0fc 100644
--- a/src/Utils/Qt/qtinputs.cpp
+++ b/src/Utils/qtinputs.cpp
@@ -21,7 +21,8 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
-#include "Utils/Qt/qtInputs.h"
+
+#include "Utils/qtInputs.h"
 #include <iostream>
 
 namespace CGoGN