diff --git a/src/Mod/Material/App/trim.h b/src/Mod/Material/App/trim.h
index c4b038567a..a8b4a94d84 100644
--- a/src/Mod/Material/App/trim.h
+++ b/src/Mod/Material/App/trim.h
@@ -22,6 +22,7 @@
 #ifndef MATERIAL_TRIM_H
 #define MATERIAL_TRIM_H
 
+#include <algorithm>
 #include <string>
 
 namespace Materials
diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp
index 58f6299d7e..fb047809eb 100644
--- a/src/Mod/Material/Gui/Array3D.cpp
+++ b/src/Mod/Material/Gui/Array3D.cpp
@@ -30,7 +30,6 @@
 #include <Gui/MainWindow.h>
 
 #include <Mod/Material/App/Exceptions.h>
-#include <Mod/Material/App/Materials.h>
 
 #include "Array3D.h"
 #include "ArrayDelegate.h"
diff --git a/src/Mod/Material/Gui/Array3D.h b/src/Mod/Material/Gui/Array3D.h
index e0c376e654..3ea9ccf216 100644
--- a/src/Mod/Material/Gui/Array3D.h
+++ b/src/Mod/Material/Gui/Array3D.h
@@ -26,6 +26,8 @@
 #include <QDialog>
 #include <QStandardItem>
 #include <QTableView>
+#include <Mod/Material/App/Materials.h>
+
 namespace MatGui
 {
 
diff --git a/src/Mod/Material/Gui/ModelSelect.cpp b/src/Mod/Material/Gui/ModelSelect.cpp
index 55fc1a95e2..ffd0e60502 100644
--- a/src/Mod/Material/Gui/ModelSelect.cpp
+++ b/src/Mod/Material/Gui/ModelSelect.cpp
@@ -33,8 +33,6 @@
 #include <Gui/Command.h>
 #include <Gui/WaitCursor.h>
 
-#include <Mod/Material/App/ModelManager.h>
-
 #include "ModelSelect.h"
 #include "ui_ModelSelect.h"
 
diff --git a/src/Mod/Material/Gui/ModelSelect.h b/src/Mod/Material/Gui/ModelSelect.h
index 57c3737411..758bdda304 100644
--- a/src/Mod/Material/Gui/ModelSelect.h
+++ b/src/Mod/Material/Gui/ModelSelect.h
@@ -32,6 +32,7 @@
 
 #include <Mod/Material/App/Materials.h>
 #include <Mod/Material/App/Model.h>
+#include <Mod/Material/App/ModelManager.h>
 
 namespace MatGui
 {