diff --git a/GeoLib/QuadTree.h b/GeoLib/QuadTree.h
index 6259cb301f7d53309dbc37b87f0e496701af5bfc..58a9eb75b92a796ac8078472066f794a69fb0d28 100644
--- a/GeoLib/QuadTree.h
+++ b/GeoLib/QuadTree.h
@@ -16,9 +16,9 @@
 
 #include <cassert>
 #include <limits>
-#include <utility>
-
+#include <list>
 #include <logog/include/logog.hpp>
+#include <utility>
 
 namespace GeoLib
 {
diff --git a/MaterialLib/MPL/CreateMedium.cpp b/MaterialLib/MPL/CreateMedium.cpp
index a52bb4e8c57475dc2d762806043ef1eaecbe5e3f..d19fc7be76ee38206696d0e3b03d69bee4b4c5b8 100644
--- a/MaterialLib/MPL/CreateMedium.cpp
+++ b/MaterialLib/MPL/CreateMedium.cpp
@@ -12,7 +12,6 @@
 
 #include "Medium.h"
 
-#include <string>
 #include "BaseLib/ConfigTree.h"
 #include "ParameterLib/Parameter.h"
 
diff --git a/MaterialLib/MPL/CreateMedium.h b/MaterialLib/MPL/CreateMedium.h
index 6603fac069b806c1c13ca389350c8763b87a1362..eddf71b67a5a3a21bc413578480da15d9283fbb7 100644
--- a/MaterialLib/MPL/CreateMedium.h
+++ b/MaterialLib/MPL/CreateMedium.h
@@ -10,7 +10,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace BaseLib