diff --git a/src/Mod/Material/App/ModelUuids.h b/src/Mod/Material/App/ModelUuids.h
index d6648252e3..d160f13ac4 100644
--- a/src/Mod/Material/App/ModelUuids.h
+++ b/src/Mod/Material/App/ModelUuids.h
@@ -22,6 +22,8 @@
 #ifndef MATERIAL_MODELUUIDS_H
 #define MATERIAL_MODELUUIDS_H
 
+#include <QString>
+
 namespace Materials
 {
 
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 99bf3d546a..956a033204 100644
--- a/src/Mod/Material/Gui/Array3D.cpp
+++ b/src/Mod/Material/Gui/Array3D.cpp
@@ -28,7 +28,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 307a1b669a..63cdb4cf46 100644
--- a/src/Mod/Material/Gui/Array3D.h
+++ b/src/Mod/Material/Gui/Array3D.h
@@ -25,6 +25,7 @@
 #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 2294cc4f8e..9b2d19ab38 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 8d74ed7a71..a80e98fe65 100644
--- a/src/Mod/Material/Gui/ModelSelect.h
+++ b/src/Mod/Material/Gui/ModelSelect.h
@@ -31,6 +31,7 @@
 #include <QTreeView>
 
 #include <Mod/Material/App/Materials.h>
+#include <Mod/Material/App/ModelManager.h>
 
 namespace fs = boost::filesystem;