diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
index 9b3850b6f0..0421877e01 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
@@ -299,6 +299,6 @@ private:
   FS_VARStatuses myStatusList;
 };
 
-#endif // _BRepBuilderAPI_FastSewing_HeaderFile
-
 DEFINE_STANDARD_HANDLE(BRepBuilderAPI_FastSewing, Standard_Transient)
+
+#endif // _BRepBuilderAPI_FastSewing_HeaderFile
diff --git a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
index 68e9b0d7e3..0bb423ee20 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
@@ -777,8 +777,8 @@ void BuildSplitsOfFaces(const TopTools_ListOfShape& theLF,
       //
       // additionally check if newly created faces are not the same
       Standard_Boolean bAllInv = Standard_True;
-      TopTools_ListIteratorOfListOfShape aItLFIm(aLFImages1);
-      for (; aItLFIm.More();) {
+      for (TopTools_ListIteratorOfListOfShape aItLFIm(aLFImages1); aItLFIm.More();)
+      {
         const TopoDS_Shape& aFIm = aItLFIm.Value();
         TopExp_Explorer aExpE(aFIm, TopAbs_EDGE);
         for (; aExpE.More(); aExpE.Next()) {
@@ -1677,15 +1677,15 @@ void FindInvalidFaces(TopTools_ListOfShape& theLFImages,
   //
   // neutral edges
   TopTools_MapOfShape aMEN;
-  TopTools_ListIteratorOfListOfShape aItLE(theLENeutral);
-  for (; aItLE.More(); aItLE.Next()) {
+  for (TopTools_ListIteratorOfListOfShape aItLE(theLENeutral); aItLE.More(); aItLE.Next())
+  {
     aMEN.Add(aItLE.Value());
   }
   //
   // valid inverted edges
   TopTools_MapOfShape aMEValInverted;
-  aItLE.Initialize(theLEValInverted);
-  for (; aItLE.More(); aItLE.Next()) {
+  for (TopTools_ListIteratorOfListOfShape aItLE(theLEValInverted); aItLE.More(); aItLE.Next())
+  {
     aMEValInverted.Add(aItLE.Value());
   }
   //
@@ -2511,8 +2511,8 @@ void RemoveInsideFaces(TopTools_IndexedDataMapOfShapeListOfShape& theFImages,
     //
     Standard_Boolean bAllInv(Standard_True), bAllRemoved(Standard_True);
 
-    TopExp_Explorer aExpF(aSol, TopAbs_FACE);
-    for (; aExpF.More(); aExpF.Next()) {
+    for (TopExp_Explorer aExpF(aSol, TopAbs_FACE); aExpF.More(); aExpF.Next())
+    {
       const TopoDS_Shape& aFS = aExpF.Current();
       //
       if (aFS.Orientation() == TopAbs_INTERNAL) {
@@ -2561,8 +2561,8 @@ void ShapesConnections(const TopTools_IndexedDataMapOfShapeListOfShape& theInvFa
 {
   // update invalid edges with images and keep connection to original edge
   TopTools_DataMapOfShapeListOfShape aDMEOr;
-  Standard_Integer i, aNb = theInvEdges.Extent();
-  for (i = 1; i <= aNb; ++i) {
+  Standard_Integer aNb = theInvEdges.Extent();
+  for (Standard_Integer i = 1; i <= aNb; ++i) {
     const TopoDS_Shape& aEInv = theInvEdges(i);
     const TopTools_ListOfShape& aLEIm = theBuilder.Modified(aEInv);
     if (aLEIm.IsEmpty()) {
@@ -3269,7 +3269,6 @@ void IntersectFaces(const TopTools_IndexedDataMapOfShapeListOfShape& theFToRebui
   //
   Standard_Integer i, j, k, aNbInv;
   TopTools_ListIteratorOfListOfShape aItLF, aItLE;
-  TopExp_Explorer aExp;
   //
   // get vertices from invalid edges
   TopTools_MapOfShape aMVInv, aMVInvAll;
@@ -3277,8 +3276,7 @@ void IntersectFaces(const TopTools_IndexedDataMapOfShapeListOfShape& theFToRebui
   for (i = 1; i <= aNbInv; ++i) {
     const TopoDS_Shape& aEInv = theInvEdges(i);
     Standard_Boolean bValid = theValidEdges.Contains(aEInv);
-    aExp.Init(aEInv, TopAbs_VERTEX);
-    for (; aExp.More(); aExp.Next()) {
+    for (TopExp_Explorer aExp (aEInv, TopAbs_VERTEX); aExp.More(); aExp.Next()) {
       const TopoDS_Shape& aV = aExp.Current();
       aMVInvAll.Add(aV);
       if (!bValid) {
@@ -3324,8 +3322,8 @@ void IntersectFaces(const TopTools_IndexedDataMapOfShapeListOfShape& theFToRebui
     aItLF.Initialize(aLFInv);
     for (; aItLF.More(); aItLF.Next()) {
       const TopoDS_Shape& aFInv = aItLF.Value();
-      aExp.Init(aFInv, TopAbs_EDGE);
-      for (; aExp.More(); aExp.Next()) {
+      for (TopExp_Explorer aExp(aFInv, TopAbs_EDGE); aExp.More(); aExp.Next())
+      {
         const TopoDS_Shape& aE = aExp.Current();
         if (!theInvEdges.Contains(aE) && aMFence.Add(aE)) {
           TopExp::MapShapesAndAncestors(aE, TopAbs_VERTEX, TopAbs_EDGE, aDMVEVal);
@@ -4957,8 +4955,8 @@ void GetInvalidEdgesByBounds(const TopoDS_Shape& theSplits,
   TopExp::MapShapes(aSecR, aMSSec);
   //
   const BOPCol_DataMapOfShapeListOfShape& anIm = aSec.Images();
-  TopExp_Explorer aExp(theSplits, TopAbs_EDGE);
-  for (; aExp.More(); aExp.Next()) {
+  for (TopExp_Explorer aExp(theSplits, TopAbs_EDGE); aExp.More(); aExp.Next())
+  {
     const TopoDS_Shape& aE = aExp.Current();
     if (aSec.IsDeleted(aE)) {
       // no common blocks for this edge
diff --git a/src/IntWalk/IntWalk_PWalking.cxx b/src/IntWalk/IntWalk_PWalking.cxx
index d11d1f164e..41f40d7e46 100644
--- a/src/IntWalk/IntWalk_PWalking.cxx
+++ b/src/IntWalk/IntWalk_PWalking.cxx
@@ -2303,8 +2303,8 @@ SeekPointOnBoundary(const Handle(Adaptor3d_HSurface)& theASurf1,
     return isOK;
   }
 
-  const gp_Pnt  aP1 = theASurf1->Value(aPnt(1), aPnt(2)),
-                aP2 = theASurf2->Value(aPnt(3), aPnt(4));
+  gp_Pnt aP1 = theASurf1->Value(aPnt(1), aPnt(2));
+  gp_Pnt aP2 = theASurf2->Value(aPnt(3), aPnt(4));
   const gp_Pnt aPInt(0.5*(aP1.XYZ() + aP2.XYZ()));
 
   const Standard_Real aSQDist = aPInt.SquareDistance(aP1);
@@ -2348,7 +2348,6 @@ SeekPointOnBoundary(const Handle(Adaptor3d_HSurface)& theASurf1,
     {
       const Standard_Integer aNbPnts = line->NbPoints();
 
-      gp_Pnt aP1, aP2;
       Standard_Integer aPInd = 1;
       for (; aPInd <= aNbPnts; aPInd++)
       {
diff --git a/src/Select3D/Select3D_SensitiveBox.hxx b/src/Select3D/Select3D_SensitiveBox.hxx
index 27e15458e0..fd359ddf06 100644
--- a/src/Select3D/Select3D_SensitiveBox.hxx
+++ b/src/Select3D/Select3D_SensitiveBox.hxx
@@ -64,7 +64,7 @@ public:
   Standard_EXPORT virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
                                                     SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
 
-  Bnd_Box Box() const;
+  Standard_EXPORT Bnd_Box Box() const;
 
   //! Returns center of the box. If location
   //! transformation is set, it will be applied