diff --git a/src/Mod/Drawing/App/FeatureView.h b/src/Mod/Drawing/App/FeatureView.h
index 6a9ffb9bb7..6ccd9efa3f 100644
--- a/src/Mod/Drawing/App/FeatureView.h
+++ b/src/Mod/Drawing/App/FeatureView.h
@@ -67,7 +67,7 @@ protected:
     //@}
 };
 
-typedef App::FeaturePythonT<FeatureView> FeatureViewPython;
+using FeatureViewPython = App::FeaturePythonT<FeatureView>;
 
 } //namespace Drawing
 
diff --git a/src/Mod/Drawing/App/FeatureViewAnnotation.h b/src/Mod/Drawing/App/FeatureViewAnnotation.h
index 4dafe17de8..9641e90d37 100644
--- a/src/Mod/Drawing/App/FeatureViewAnnotation.h
+++ b/src/Mod/Drawing/App/FeatureViewAnnotation.h
@@ -64,7 +64,7 @@ public:
     }
 };
 
-typedef App::FeaturePythonT<FeatureViewAnnotation> FeatureViewAnnotationPython;
+using FeatureViewAnnotationPython = App::FeaturePythonT<FeatureViewAnnotation>;
 
 
 } //namespace Drawing
diff --git a/src/Mod/Drawing/App/FeatureViewPart.h b/src/Mod/Drawing/App/FeatureViewPart.h
index 3c02a1286e..5ec6c959ab 100644
--- a/src/Mod/Drawing/App/FeatureViewPart.h
+++ b/src/Mod/Drawing/App/FeatureViewPart.h
@@ -72,7 +72,7 @@ private:
     static App::PropertyFloatConstraint::Constraints floatRange;
 };
 
-typedef App::FeaturePythonT<FeatureViewPart> FeatureViewPartPython;
+using FeatureViewPartPython = App::FeaturePythonT<FeatureViewPart>;
 
 
 } //namespace Drawing
diff --git a/src/Mod/Drawing/App/FeatureViewSymbol.h b/src/Mod/Drawing/App/FeatureViewSymbol.h
index 2a576bfae4..44dad78cf6 100644
--- a/src/Mod/Drawing/App/FeatureViewSymbol.h
+++ b/src/Mod/Drawing/App/FeatureViewSymbol.h
@@ -66,7 +66,7 @@ protected:
     void onChanged(const App::Property* prop);
 };
 
-typedef App::FeaturePythonT<FeatureViewSymbol> FeatureViewSymbolPython;
+using FeatureViewSymbolPython = App::FeaturePythonT<FeatureViewSymbol>;
 
 
 } //namespace Drawing
diff --git a/src/Mod/Drawing/App/ProjectionAlgos.h b/src/Mod/Drawing/App/ProjectionAlgos.h
index c6f4fd5e46..66ae7d2e8d 100644
--- a/src/Mod/Drawing/App/ProjectionAlgos.h
+++ b/src/Mod/Drawing/App/ProjectionAlgos.h
@@ -50,7 +50,7 @@ public:
         WithHidden = 1,
         WithSmooth = 2
     };
-    typedef std::map<std::string,std::string> XmlAttributes;
+    using XmlAttributes = std::map<std::string,std::string>;
 
     std::string getSVG(ExtractionType type, double tolerance=0.05,
                        XmlAttributes V_style=XmlAttributes(),
diff --git a/src/Mod/Drawing/Gui/ViewProviderView.h b/src/Mod/Drawing/Gui/ViewProviderView.h
index 4a4c99d67b..5b86df4b2a 100644
--- a/src/Mod/Drawing/Gui/ViewProviderView.h
+++ b/src/Mod/Drawing/Gui/ViewProviderView.h
@@ -61,7 +61,7 @@ public:
     //@}
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderDrawingView> ViewProviderDrawingViewPython;
+using ViewProviderDrawingViewPython = Gui::ViewProviderPythonFeatureT<ViewProviderDrawingView>;
 
 class DrawingGuiExport ViewProviderDrawingClip : public Gui::ViewProviderDocumentObjectGroup
 {
diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h
index 36418bede7..222da40828 100644
--- a/src/Mod/Fem/App/FemAnalysis.h
+++ b/src/Mod/Fem/App/FemAnalysis.h
@@ -91,8 +91,8 @@ class FemExport DocumentObject : public App::DocumentObject
     PROPERTY_HEADER_WITH_OVERRIDE(Fem::DocumentObject);
 };
 
-typedef App::FeaturePythonT<FemAnalysis> FemAnalysisPython;
-typedef App::FeaturePythonT<DocumentObject> FeaturePython;
+using FemAnalysisPython = App::FeaturePythonT<FemAnalysis>;
+using FeaturePython = App::FeaturePythonT<DocumentObject>;
 
 
 } //namespace Fem
diff --git a/src/Mod/Fem/App/FemConstraint.h b/src/Mod/Fem/App/FemConstraint.h
index c0903a65f2..b5780d2a84 100644
--- a/src/Mod/Fem/App/FemConstraint.h
+++ b/src/Mod/Fem/App/FemConstraint.h
@@ -243,7 +243,7 @@ protected:
     const Base::Vector3d getDirection(const App::PropertyLinkSub &direction);
 };
 
-typedef App::FeaturePythonT<Constraint> ConstraintPython;
+using ConstraintPython = App::FeaturePythonT<Constraint>;
 
 
 } //namespace Fem
diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
index 3614d3cd1e..0e94c0e73e 100644
--- a/src/Mod/Fem/App/FemMesh.cpp
+++ b/src/Mod/Fem/App/FemMesh.cpp
@@ -1166,7 +1166,7 @@ protected:
     std::vector<int> elements;
 };
 
-typedef std::shared_ptr<NastranElement> NastranElementPtr;
+using NastranElementPtr = std::shared_ptr<NastranElement>;
 
 class GRIDElement : public NastranElement {
     void addToMesh(SMESHDS_Mesh* meshds) override {
@@ -2018,9 +2018,9 @@ void FemMesh::writeABAQUS(const std::string &Filename, int elemParam, bool group
     }
 
     // get all data --> Extract Nodes and Elements of the current SMESH datastructure
-    typedef std::map<int, Base::Vector3d> VertexMap;
-    typedef std::map<int, std::vector<int> > NodesMap;
-    typedef std::map<std::string, NodesMap> ElementsMap;
+    using VertexMap = std::map<int, Base::Vector3d>;
+    using NodesMap = std::map<int, std::vector<int> >;
+    using ElementsMap = std::map<std::string, NodesMap>;
 
     // get nodes
     VertexMap vertexMap;  // empty nodes map
@@ -2660,7 +2660,7 @@ int FemMesh::addGroup(const std::string TypeString, const std::string Name, cons
 {
     // define mapping between typestring and ElementType
     // TODO: remove code doubling by providing mappings for all FemMesh functions
-    typedef std::map<std::string, SMDSAbs_ElementType> string_eltype_map;
+    using string_eltype_map = std::map<std::string, SMDSAbs_ElementType>;
     string_eltype_map mapping;
     mapping["All"] = SMDSAbs_All;
     mapping["Node"] = SMDSAbs_Node;
diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h
index c430e9cf25..e5fc207d58 100644
--- a/src/Mod/Fem/App/FemMesh.h
+++ b/src/Mod/Fem/App/FemMesh.h
@@ -45,7 +45,7 @@ class TopoDS_Solid;
 namespace Fem
 {
 
-typedef std::shared_ptr<SMESH_Hypothesis> SMESH_HypothesisPtr;
+using SMESH_HypothesisPtr = std::shared_ptr<SMESH_Hypothesis>;
 
 /** The representation of a FemMesh
  */
diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h
index 1850c7a2a4..2ef63eeeaf 100644
--- a/src/Mod/Fem/App/FemMeshObject.h
+++ b/src/Mod/Fem/App/FemMeshObject.h
@@ -59,7 +59,7 @@ protected:
     void onChanged (const App::Property* prop) override;
 };
 
-typedef App::FeaturePythonT<FemMeshObject> FemMeshObjectPython;
+using FemMeshObjectPython = App::FeaturePythonT<FemMeshObject>;
 
 
 } //namespace Fem
diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h
index 707d78668b..6297796498 100644
--- a/src/Mod/Fem/App/FemResultObject.h
+++ b/src/Mod/Fem/App/FemResultObject.h
@@ -61,7 +61,7 @@ public:
     PyObject *getPyObject() override;
 };
 
-typedef App::FeaturePythonT<FemResultObject> FemResultObjectPython;
+using FemResultObjectPython = App::FeaturePythonT<FemResultObject>;
 
 
 } //namespace Fem
diff --git a/src/Mod/Fem/App/FemSolverObject.h b/src/Mod/Fem/App/FemSolverObject.h
index 1f66432509..ab5a7b0e13 100644
--- a/src/Mod/Fem/App/FemSolverObject.h
+++ b/src/Mod/Fem/App/FemSolverObject.h
@@ -54,7 +54,7 @@ public:
 
 };
 
-typedef App::FeaturePythonT<FemSolverObject> FemSolverObjectPython;
+using FemSolverObjectPython = App::FeaturePythonT<FemSolverObject>;
 
 } //namespace Fem
 
diff --git a/src/Mod/Fem/App/HypothesisPy.cpp b/src/Mod/Fem/App/HypothesisPy.cpp
index 04b19c6268..dd0a60e001 100755
--- a/src/Mod/Fem/App/HypothesisPy.cpp
+++ b/src/Mod/Fem/App/HypothesisPy.cpp
@@ -318,8 +318,8 @@ Py::Object StdMeshers_AutomaticLengthPy::getFineness(const Py::Tuple& args)
 }
 
 namespace Py {
-    typedef ExtensionObject<Fem::FemMeshPy>         FemMesh;
-    typedef ExtensionObject<Part::TopoShapePy>      TopoShape;
+    using FemMesh = ExtensionObject<Fem::FemMeshPy>;
+    using TopoShape = ExtensionObject<Part::TopoShapePy>;
     template<> bool FemMesh::accepts (PyObject *pyob) const
     {
         return (pyob && PyObject_TypeCheck(pyob, &(Fem::FemMeshPy::Type)));
diff --git a/src/Mod/Fem/App/HypothesisPy.h b/src/Mod/Fem/App/HypothesisPy.h
index ea810ce371..95076512d2 100755
--- a/src/Mod/Fem/App/HypothesisPy.h
+++ b/src/Mod/Fem/App/HypothesisPy.h
@@ -35,7 +35,7 @@ namespace Fem {
 class HypothesisPy : public Py::PythonExtension<HypothesisPy>
 {
 public:
-    typedef Py::PythonExtension<HypothesisPy> HypothesisPyBase;
+    using HypothesisPyBase = Py::PythonExtension<HypothesisPy>;
     explicit HypothesisPy(std::shared_ptr<SMESH_Hypothesis>);
     ~HypothesisPy() override;
     std::shared_ptr<SMESH_Hypothesis> getHypothesis() const
@@ -45,13 +45,13 @@ private:
     std::shared_ptr<SMESH_Hypothesis> hyp;
 };
 
-typedef Py::ExtensionObject<HypothesisPy> Hypothesis;
+using Hypothesis = Py::ExtensionObject<HypothesisPy>;
 
 template <class T>
 class SMESH_HypothesisPy : public Py::PythonExtension<T>
 {
 public:
-    typedef SMESH_HypothesisPy<T> SMESH_HypothesisPyBase;
+    using SMESH_HypothesisPyBase = SMESH_HypothesisPy<T>;
     static void init_type(PyObject*);    // announce properties and methods
 
     explicit SMESH_HypothesisPy(SMESH_Hypothesis*);
diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
index 80a99110a9..e993a8b2dc 100644
--- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h
+++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h
@@ -108,7 +108,7 @@ private:
     ViewProviderFemHighlighter extension;
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderFemAnalysis> ViewProviderFemAnalysisPython;
+using ViewProviderFemAnalysisPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemAnalysis>;
 
 } //namespace FemGui
 
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
index 03cb068eef..aa24f428b2 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h
@@ -125,7 +125,7 @@ protected:
     static QObject* findChildByName(const QObject* parent, const QString& name);
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderFemConstraint> ViewProviderFemConstraintPython;
+using ViewProviderFemConstraintPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemConstraint>;
 
 
 } //namespace FemGui
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
index 96232fbcdb..4aaac55d0f 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h
@@ -166,7 +166,7 @@ private:
     class Private;
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderFemMesh> ViewProviderFemMeshPython;
+using ViewProviderFemMeshPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemMesh>;
 
 
 } //namespace FemGui
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
index 527b4db993..5c1c54d136 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -115,7 +115,7 @@ private:
 
 private:
     std::set<ViewProviderFemPostObject*> views;
-    typedef boost::signals2::scoped_connection Connection;
+    using Connection = boost::signals2::scoped_connection;
     Connection connectSelection;
 };
 
diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h
index 6d8d371d81..e9479635e8 100644
--- a/src/Mod/Fem/Gui/ViewProviderResult.h
+++ b/src/Mod/Fem/Gui/ViewProviderResult.h
@@ -47,7 +47,7 @@ public:
     { return true; }
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderResult> ViewProviderResultPython;
+using ViewProviderResultPython = Gui::ViewProviderPythonFeatureT<ViewProviderResult>;
 
 } //namespace FemGui
 
diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h
index f75361670f..a88305ac83 100644
--- a/src/Mod/Fem/Gui/ViewProviderSolver.h
+++ b/src/Mod/Fem/Gui/ViewProviderSolver.h
@@ -64,7 +64,7 @@ public:
     bool canDelete(App::DocumentObject* obj) const override;
 };
 
-typedef Gui::ViewProviderPythonFeatureT<ViewProviderSolver> ViewProviderSolverPython;
+using ViewProviderSolverPython = Gui::ViewProviderPythonFeatureT<ViewProviderSolver>;
 
 } //namespace FemGui
 
diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h
index a2bc23150b..d98dcd1890 100644
--- a/src/Mod/Import/App/ImportOCAF2.h
+++ b/src/Mod/Import/App/ImportOCAF2.h
@@ -170,8 +170,8 @@ private:
 class ImportExport ExportOCAF2
 {
 public:
-    typedef std::function<std::map<std::string,App::Color>(
-            App::DocumentObject*, const char*)> GetShapeColorsFunc;
+    using GetShapeColorsFunc = std::function<std::map<std::string,App::Color>(
+            App::DocumentObject*, const char*)>;
     explicit ExportOCAF2(Handle(TDocStd_Document) h, GetShapeColorsFunc func=GetShapeColorsFunc());
 
     void setExportHiddenObject(bool enable) {exportHidden=enable;}
diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.h b/src/Mod/Inspection/Gui/ViewProviderInspection.h
index 3d98313326..61d2fe1c87 100644
--- a/src/Mod/Inspection/Gui/ViewProviderInspection.h
+++ b/src/Mod/Inspection/Gui/ViewProviderInspection.h
@@ -47,7 +47,7 @@ namespace InspectionGui {
  */
 class ViewProviderInspection : public Gui::ViewProviderDocumentObject,
                                public Base::Observer<int>{
-    typedef ViewProviderDocumentObject inherited;
+    using inherited = ViewProviderDocumentObject;
 
     PROPERTY_HEADER_WITH_OVERRIDE(InspectionGui::ViewProviderInspection);