diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp
index 89209825aa..3e3686c7f7 100644
--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp
+++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp
@@ -191,7 +191,7 @@ void StdMeshers_CartesianParameters3D::SetGrid(std::vector<double>& coords, int
 //purpose  : Set grid spacing along the three axes
 //=======================================================================
 
-void StdMeshers_CartesianParameters3D::SetGridSpacing(std::vector<string>& xSpaceFuns,
+void StdMeshers_CartesianParameters3D::SetGridSpacing(std::vector<std::string>& xSpaceFuns,
                                                       std::vector<double>& xInternalPoints,
                                                       const int            axis)
 {
diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
index 8bfb72f2d4..c782e59aef 100644
--- a/src/App/PropertyLinks.cpp
+++ b/src/App/PropertyLinks.cpp
@@ -1743,7 +1743,7 @@ void PropertyLinkSubList::setValues(std::vector<DocumentObject*>&& lValue,
     hasSetValue();
 }
 
-void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<string> &SubList)
+void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<std::string> &SubList)
 {
     auto parent = dynamic_cast<App::DocumentObject*>(getContainer());
     verifyObject(lValue, parent);
@@ -3919,7 +3919,7 @@ void PropertyXLinkSubList::addValue(App::DocumentObject *obj,
     guard.tryInvoke();
 }
 
-void PropertyXLinkSubList::setValue(DocumentObject* lValue, const std::vector<string> &SubList)
+void PropertyXLinkSubList::setValue(DocumentObject *lValue, const std::vector<std::string> &SubList)
 {
     std::map<DocumentObject *, std::vector<std::string> > values;
     if(lValue)
diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
index efd2ec2bc6..039504c613 100644
--- a/src/Mod/Fem/App/FemMesh.cpp
+++ b/src/Mod/Fem/App/FemMesh.cpp
@@ -1171,7 +1171,7 @@ class GRIDFreeFieldElement : public GRIDElement {
     void read(const std::string& str, const std::string&) override {
         char_separator<char> sep(",");
         tokenizer<char_separator<char> > tokens(str, sep);
-        std::vector<string> token_results;
+        std::vector<std::string> token_results;
         token_results.assign(tokens.begin(),tokens.end());
         if (token_results.size() < 6)
             return;//Line does not include Nodal coordinates
@@ -1225,7 +1225,7 @@ public:
     void read(const std::string& str, const std::string&) override {
         char_separator<char> sep(",");
         tokenizer<char_separator<char> > tokens(str, sep);
-        std::vector<string> token_results;
+        std::vector<std::string> token_results;
         token_results.assign(tokens.begin(),tokens.end());
         if (token_results.size() < 6)
             return;//Line does not include enough nodal IDs
@@ -1295,7 +1295,7 @@ public:
     void read(const std::string& str, const std::string&) override {
         char_separator<char> sep(",");
         tokenizer<char_separator<char> > tokens(str, sep);
-        std::vector<string> token_results;
+        std::vector<std::string> token_results;
         token_results.assign(tokens.begin(),tokens.end());
         if (token_results.size() < 14)
             return;//Line does not include enough nodal IDs
diff --git a/src/Mod/Fem/App/FemMeshShapeObject.cpp b/src/Mod/Fem/App/FemMeshShapeObject.cpp
index cb92fade63..627aab1c51 100644
--- a/src/Mod/Fem/App/FemMeshShapeObject.cpp
+++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp
@@ -28,6 +28,7 @@
 # include <BRepBuilderAPI_Copy.hxx>
 # include <BRepTools.hxx>
 # include <SMESH_Gen.hxx>
+# include <SMESH_Mesh.hxx>
 # include <StdMeshers_MaxLength.hxx>
 # include <StdMeshers_LocalLength.hxx>
 # include <StdMeshers_MaxElementArea.hxx>
@@ -60,7 +61,9 @@ PROPERTY_SOURCE(Fem::FemMeshShapeObject, Fem::FemMeshObject)
 
 FemMeshShapeObject::FemMeshShapeObject()
 {
-    ADD_PROPERTY_TYPE(Shape,(nullptr), "FEM Mesh",Prop_None,"Geometry object, the mesh is made from. The geometry object has to have a Shape.");
+    ADD_PROPERTY_TYPE(
+        Shape, (nullptr), "FEM Mesh", Prop_None,
+        "Geometry object, the mesh is made from. The geometry object has to have a Shape.");
 }
 
 FemMeshShapeObject::~FemMeshShapeObject()
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index b3fcda7f22..caa64898e3 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -981,7 +981,7 @@ unsigned validateSketches(std::vector<App::DocumentObject*>& sketches,
 void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const std::string& which,
                          std::function<void (Part::Feature*, App::DocumentObject*)> func)
 {
-    auto base_worker = [=](App::DocumentObject* feature, const std::vector<string> &subs) {
+    auto base_worker = [=](App::DocumentObject *feature, const std::vector<std::string> &subs) {
 
         if (!feature || !feature->isDerivedFrom(Part::Feature::getClassTypeId()))
             return;