diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilder.cxx
index 3d474b5ad6da00f6d52443dcfcbc4e572e15f9be..6a2f4bead1302f51f0807b94ba67005c59638c12 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilder.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilder.cxx
@@ -592,7 +592,7 @@ const Trk::TrackingVolume* InDet::StagedTrackingGeometryBuilder::createTrackingV
             if (!ringSet.size() || zPos>ringSet.back()->surfaceRepresentation().center().z()) ringSet.push_back(ring);
             else {
               std::vector<const Trk::Layer*>::iterator lit = ringSet.begin();
-              while (lit!=ringSet.end() && zPos>(*lit)->surfaceRepresentation().center().z()) lit++;
+              while (lit!=ringSet.end() && zPos>(*lit)->surfaceRepresentation().center().z()) ++lit;
               ringSet.insert(lit,ring);  
             }   
           }
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx
index 0a59e59857f850f93943682eede477e9a62a3e42..c80a6a4507d479105bf5d74318121e08c6e4a4ee 100644
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx
+++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/GetDetectorPositions.cxx
@@ -32,8 +32,8 @@
 
 #include "StoreGate/ReadCondHandle.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <string>
 #include <vector>
 
 /** Constructor */
@@ -255,7 +255,7 @@ void GetDetectorPositions::writeSimpleTRTPositions(){
   std::vector<Identifier>::const_iterator trtStrawLayIt = m_TRTHelper->straw_layer_begin();
   std::vector<Identifier>::const_iterator trtStrawLayItE = m_TRTHelper->straw_layer_end();
 
-  for(; trtStrawLayIt != trtStrawLayItE; trtStrawLayIt++  ) {
+  for(; trtStrawLayIt != trtStrawLayItE; ++trtStrawLayIt  ) {
     writeTRTPositions(*trtStrawLayIt);
   }