diff --git a/src/Mod/Material/App/MaterialConfigLoader.cpp b/src/Mod/Material/App/MaterialConfigLoader.cpp
index fe2090f009..b16b14daa8 100644
--- a/src/Mod/Material/App/MaterialConfigLoader.cpp
+++ b/src/Mod/Material/App/MaterialConfigLoader.cpp
@@ -24,18 +24,17 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QString>
-#endif
-
-#include <memory>
-
 #include <QFile>
 #include <QIODevice>
 #include <QTextStream>
 #include <QUuid>
+#include <memory>
+#include <fstream>
+#endif
+
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
-#include <fstream>
 
 
 #include "Exceptions.h"
diff --git a/src/Mod/Material/App/MaterialLibrary.cpp b/src/Mod/Material/App/MaterialLibrary.cpp
index d1c30730f8..1a1573e388 100644
--- a/src/Mod/Material/App/MaterialLibrary.cpp
+++ b/src/Mod/Material/App/MaterialLibrary.cpp
@@ -22,10 +22,10 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QVector>
-#endif
-
 #include <QDirIterator>
 #include <QFileInfo>
+#endif
+
 
 #include <App/Application.h>
 
diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp
index a1d7592125..106bf43bdf 100644
--- a/src/Mod/Material/App/Materials.cpp
+++ b/src/Mod/Material/App/Materials.cpp
@@ -21,10 +21,10 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#endif
-
 #include <QMetaType>
 #include <QUuid>
+#endif
+
 
 #include <App/Application.h>
 #include <Gui/MetaTypes.h>
diff --git a/src/Mod/Material/App/Model.cpp b/src/Mod/Material/App/Model.cpp
index 2d30bdadc3..19a4ebb832 100644
--- a/src/Mod/Material/App/Model.cpp
+++ b/src/Mod/Material/App/Model.cpp
@@ -21,9 +21,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#endif
-
 #include <string>
+#endif
 
 #include <App/Application.h>
 
diff --git a/src/Mod/Material/App/ModelLibrary.cpp b/src/Mod/Material/App/ModelLibrary.cpp
index 63d06f2d06..87a4387263 100644
--- a/src/Mod/Material/App/ModelLibrary.cpp
+++ b/src/Mod/Material/App/ModelLibrary.cpp
@@ -21,9 +21,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#endif
-
 #include <string>
+#endif
 
 #include <App/Application.h>
 
diff --git a/src/Mod/Material/App/ModelLoader.cpp b/src/Mod/Material/App/ModelLoader.cpp
index 3976f2a28c..a24bea113a 100644
--- a/src/Mod/Material/App/ModelLoader.cpp
+++ b/src/Mod/Material/App/ModelLoader.cpp
@@ -22,13 +22,13 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QString>
+#include <QDirIterator>
+#include <QFileInfo>
 #endif
 
 #include <App/Application.h>
 #include <Base/Interpreter.h>
 
-#include <QDirIterator>
-#include <QFileInfo>
 
 #include "Model.h"
 #include "ModelLoader.h"
diff --git a/src/Mod/Material/App/PreCompiled.h b/src/Mod/Material/App/PreCompiled.h
index c2ca3cd36e..e991f90cda 100644
--- a/src/Mod/Material/App/PreCompiled.h
+++ b/src/Mod/Material/App/PreCompiled.h
@@ -47,14 +47,26 @@
 
 // STL
 #include <algorithm>
+#include <fstream>
 #include <map>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
 
 // Qt
 #include <QtGlobal>
+#include <QDirIterator>
+#include <QFileInfo>
+#include <QIODevice>
+#include <QList>
+#include <QMetaType>
+#include <QMetaType>
 #include <QRegularExpression>
+#include <QString>
+#include <QTextStream>
+#include <QUuid>
+#include <QVector>
 
 #endif  //_PreComp_