diff --git a/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx b/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
index 9fbff1d81051e0ddfb3da4e1a7a455d76bb5d7cb..7206c60577941d2945bfeeff464d912bc12341a3 100644
--- a/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
+++ b/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
@@ -9,7 +9,6 @@
 #include <QCursor>
 #include <QDrag>
 #include <QMenu>
-#include <QMouseEvent>
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QApplication>
diff --git a/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx b/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
index 8bbc68ca0a75800a10f22e758c23f1d97ae36044..05c5e264d4ca4892d17acc13aee6a803501e0171 100644
--- a/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
+++ b/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
@@ -31,7 +31,6 @@
 #include <QShortcut>
 #include <QCloseEvent>
 #include <QScrollBar>
-#include <QAction>
 
 #include <iostream>
 
diff --git a/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx b/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
index 3ad0dd37918f415893ac03386271591bdf885670..9036eec4b192117b52ab60201b3ac71f79a70003 100644
--- a/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
+++ b/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
@@ -17,8 +17,6 @@
 #include "VP1Base/VP1ExaminerViewer.h"
 #include "VP1Base/VP1Msg.h"
 
-
-//#include "Inventor/nodes/SoNode.h"
 #include "Inventor/nodes/SoMaterial.h"
 #include <Inventor/nodes/SoPerspectiveCamera.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
@@ -1512,8 +1510,6 @@ void VP1QtInventorUtils::getPointSizeRanges(double& min, double& max, double& gr
 	granularity = Imp::allowedPointSizeGranularity;
 }
 
-#include "VP1Base/VP1ExaminerViewer.h"
-
 //_____________________________________________________________________________________
 void VP1QtInventorUtils::ensureInitLineWidthAndPointSize(  SoQtRenderArea * ra )
 {
diff --git a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
index 632ee96b095bef25add2132c9bc92e42f4eda41f..c4e15299b49b09d443bd52aa78019f19026cd9bf 100644
--- a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
@@ -49,7 +49,6 @@
 
 #include "VP1Base/VP1QtUtils.h"
 #include "VP1Base/IVP1System.h"
-#include "VP1Base/VP1QtUtils.h"
 #include "VP1Base/IVP1ChannelWidget.h"
 #include "VP1Base/VP1Msg.h"
 #include "VP1Base/VP1HelperClassBase.h"
@@ -113,7 +112,6 @@ std::vector<std::string> qstringlistToVecString(QStringList list)
 	#include <QDebug>
 	#include "xAODRootAccessInterfaces/TActiveEvent.h"
 	#include "xAODRootAccessInterfaces/TVirtualEvent.h"
-	#include <TTree.h>
 	#include <regex>
 	#include <QString>
 
diff --git a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx
index 7ff375982e1679e01a19c25edada5b09f5715d85..3b0ca973284ae2ce37adf5e195521aa4937fa727 100644
--- a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx
@@ -65,7 +65,6 @@
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QtGui>
-#include <QSettings>
 #include <QScrollBar>
 
 
diff --git a/graphics/VP1/VP1HEPVis/src/VP1HEPVisUtils.cxx b/graphics/VP1/VP1HEPVis/src/VP1HEPVisUtils.cxx
index d8cdf1297a0bd3a32ee2b7d59b0c4ae0cddf23ab..14e44db51a8854618fb011e4902143b17703e993 100644
--- a/graphics/VP1/VP1HEPVis/src/VP1HEPVisUtils.cxx
+++ b/graphics/VP1/VP1HEPVis/src/VP1HEPVisUtils.cxx
@@ -32,7 +32,6 @@
 #include "VP1HEPVis/nodes/SoTubs.h"
 #include "VP1HEPVis/nodes/SoTessellated.h"
 
-#include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoIndexedFaceSet.h>
 #include <Inventor/nodes/SoVertexProperty.h>
 #include <VP1HEPVis/SbPolyhedron.h>
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
index c8ead88e7301fbf9648a0ceec9bd424b93439d67..0929f586de01e76f3f8a029da1c6c467510f78ce 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/AODCollHandleBase.cxx
@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////
 
 //Local includes
-//#include "AODCollHandleBase.h"
 #include "AODHandleBase.h"
 #include "AODCollHandleBase.h"
 
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/CaloClusterCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/CaloClusterCollectionSettingsButton.cxx
index a7c10c3b0a8284ccb91e15b6edcde72ffbba5ff8..52124088af16b42960b897083b309f37c80b6220 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/CaloClusterCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/CaloClusterCollectionSettingsButton.cxx
@@ -7,16 +7,13 @@
 #include "VP1AODSystems/CaloClusterCollectionSettingsButton.h"
 #include "IParticleCollHandle_CaloCluster.h"
 // UIs
-//#include "ui_perjetcollectionsettings_form.h"
 #include "ui_periparticlecollectionsettings_form.h"
 #include "ui_percaloclustercollectionsettings_form.h"
-//#include "ui_jet_settings_display_form.h"
 
 //VP1
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Msg.h"
 
 //Coin3D
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/ElectronCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/ElectronCollectionSettingsButton.cxx
index bb7a2f724097f82221bdc5a921d98c9bc9ee8d6c..f75a8c295af6691ee90af3f3c41a959c0d001453 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/ElectronCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/ElectronCollectionSettingsButton.cxx
@@ -12,7 +12,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 
 //SoCoin
 
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/JetCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/JetCollectionSettingsButton.cxx
index 6af326e5b3486dc50ceddcc1c98fc050dcbddb20..efd31bb03b29fbbfffa657c16a1704d79a4163e0 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/JetCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/JetCollectionSettingsButton.cxx
@@ -6,7 +6,6 @@
 #include "VP1Base/VP1ColorSelectButton.h"
 #include "VP1AODSystems/JetCollectionSettingsButton.h"
 // UIs
-//#include "ui_perjetcollectionsettings_form.h"
 #include "ui_periparticlecollectionsettings_form.h"
 #include "ui_jet_settings_display_form.h"
 
@@ -14,7 +13,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Msg.h"
 
 //Coin3D
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollectionSettingsButton.cxx
index e02d9089fefd1b33aad5fd47bd20870c07e69c9b..c17338ef6510b09904793b56c77003029412f94f 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/MissingEtCollectionSettingsButton.cxx
@@ -12,7 +12,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Interval.h"
 
 //SoCoin
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/MuonCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/MuonCollectionSettingsButton.cxx
index 9b6538b3f96cf77dcd475e579e022d876b0386a4..048ad1510120e3bc13d447b951a66a28f6b2073d 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/MuonCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/MuonCollectionSettingsButton.cxx
@@ -13,7 +13,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 
 //SoCoin
 
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/TrackParticleCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/TrackParticleCollectionSettingsButton.cxx
index e0ed3d2f26df19653e9b73940e6e59ccf9e51bf7..c7b47b1499b94d423e680cef0cb6f0501c698753 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/TrackParticleCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/TrackParticleCollectionSettingsButton.cxx
@@ -12,7 +12,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 
 //SoCoin
 
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollectionSettingsButton.cxx
index 468a4a0eb1af93055f0e555260db861f2fb32dee..366558f4d9bbac4bccbecbc81e260dec73200aeb 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollectionSettingsButton.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollectionSettingsButton.cxx
@@ -11,7 +11,6 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-#include "VP1Base/VP1QtInventorUtils.h"
 #include "VP1Base/VP1Interval.h"
 
 //SoCoin
diff --git a/graphics/VP1/VP1Systems/VP1BPhysSystems/src/VP1BPhysSystem.cxx b/graphics/VP1/VP1Systems/VP1BPhysSystems/src/VP1BPhysSystem.cxx
index 1b33858d438dedb5324c23f7ce39469d8afec241..b14968761879ffa577cb22307a529a672c4ec35c 100644
--- a/graphics/VP1/VP1Systems/VP1BPhysSystems/src/VP1BPhysSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1BPhysSystems/src/VP1BPhysSystem.cxx
@@ -40,15 +40,11 @@
 #include "TrkTrack/Track.h"
 #include "TrkTrack/TrackCollection.h"
 #include "TrkParameters/TrackParameters.h"
-//#include "TrkParameters/MeasuredPerigee.h"
-#include "TrkParameters/TrackParameters.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 
 #include "Particle/TrackParticle.h"
 #include "Particle/TrackParticleContainer.h"
 
-//#include "CLHEP/Units/SystemOfUnits.h"
-
 #include "GeoPrimitives/GeoPrimitives.h"
 
 #include "TFile.h"
diff --git a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VisAttributes.cxx b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VisAttributes.cxx
index 566983cb26e0e6caaa92bb17ddf5fdf8c42986c8..71407856e5be574bf9b0b06d078fee657d7feb03 100644
--- a/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VisAttributes.cxx
+++ b/graphics/VP1/VP1Systems/VP1GeometrySystems/src/VisAttributes.cxx
@@ -7,13 +7,11 @@
 #include "VP1Base/VP1QtInventorUtils.h"
 #include <Inventor/nodes/SoMaterial.h>
 #include <iostream>
+#include <map>
 #include <QBuffer>
 
 /////////////////////////////////////// Base class ///////////////////////////////////////
 
-#include <map>
-#include <iostream>
-
 class VisAttributes::Imp {
 public:
   // The material map is here:
diff --git a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloHitLegoSystem.cxx b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloHitLegoSystem.cxx
index 4fe99f80900bc234efa04ff6aa876e5901d82375..ec29f35aa4264c6982a62801b9ee381de7fc5bd4 100755
--- a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloHitLegoSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloHitLegoSystem.cxx
@@ -18,8 +18,6 @@
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoCube.h>
-#include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoSeparator.h>
 
 #include <QMap>
 
diff --git a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloLegoSystem.cxx b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloLegoSystem.cxx
index 98904a59c32523030100de02dcb3c2ae83ce6d80..0dfff2521b82a44f5865e2174dc2db4e2ee26386 100755
--- a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloLegoSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1CaloLegoSystem.cxx
@@ -15,13 +15,9 @@
 #include <Inventor/nodes/SoLineSet.h>
 #include <Inventor/nodes/SoLightModel.h>
 #include <Inventor/nodes/SoDrawStyle.h>
-#include <Inventor/nodes/SoSwitch.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoMaterial.h>
 
 #include "LArReadoutGeometry/FCALDetectorManager.h"
 #include "LArReadoutGeometry/FCALModule.h"
-//#include "LArReadoutGeometry/FCALTile.h"
 
 #include "LArReadoutGeometry/HECDetectorManager.h"
 #include "LArReadoutGeometry/HECDetectorRegion.h"
diff --git a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1HVLegoSystem.cxx b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1HVLegoSystem.cxx
index 0fab337f43dfb2bbda3138b7016d10ad515d64ae..0ed5feca4cb1f4c593043d6ee0cb95f2e084caa4 100755
--- a/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1HVLegoSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1LegoSystems/src/VP1HVLegoSystem.cxx
@@ -10,10 +10,6 @@
 #include <Inventor/nodes/SoSwitch.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoSwitch.h>
-#include <Inventor/nodes/SoSeparator.h>
-
-//#include "LArReadoutGeometry/FCALTile.h"
 
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
diff --git a/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDCollHandleBase.cxx b/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDCollHandleBase.cxx
index 390d56ecd54398fe48eca6defeba0e4e8c0eecfc..c3c5aec211a6ad6dd9e400b44f65b641458d7213 100644
--- a/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDCollHandleBase.cxx
+++ b/graphics/VP1/VP1Systems/VP1PRDSystems/src/PRDCollHandleBase.cxx
@@ -13,7 +13,6 @@
 #include "VP1Base/VP1ExtraSepLayerHelper.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1QtInventorUtils.h"
-#include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
 #include "VP1Base/VP1Msg.h"
 
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_ForwardHit.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_ForwardHit.cxx
index 7215207018d64cbd56604694c46730867426e994..a691cd7efd6d81992d5e61c0e1dd97d99dbe034a 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_ForwardHit.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/SimHitHandle_ForwardHit.cxx
@@ -21,8 +21,6 @@
 #include "ForwardRegion_SimEv/SimulationHit.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetIdentifier/SCT_ID.h"
-// #include "TrkSurfaces/PlaneSurface.h"
-// #include "TrkSurfaces/Surface.h"
 #include "TrkSurfaces/StraightLineSurface.h"
 #include "TrkSurfaces/Surface.h"
 
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TrkTrack.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TrkTrack.cxx
index 512e2561097e6c3d5e131e9de61ef66700bea802..03e0a5c47be4d447a7666fdeecdf5911a1dbe420 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TrkTrack.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TrkTrack.cxx
@@ -16,7 +16,6 @@
 #include "VP1TrackSystems/TrackHandle_TrkTrack.h"
 #include "VP1Base/IVP1System.h"
 #include "VP1TrackSystems/TrackSystemController.h"
-#include "VP1Base/IVP1System.h"
 #include "VP1Base/VP1QtUtils.h"
 #include "VP1Utils/VP1JobConfigInfo.h"
 #include "VP1Utils/VP1SGContentsHelper.h"
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_SimulationTrack.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_SimulationTrack.cxx
index 9569c6286af869d01032b2c95ba0d4d1b63ec61e..57c90ac377ac381b38e4a5a6f038ce40cb528541 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_SimulationTrack.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_SimulationTrack.cxx
@@ -16,7 +16,6 @@
 #include "VP1TrackSystems/AscObj_TruthPoint.h"
 #include "VP1Base/VP1Msg.h"
 
-#include "TrkTrack/Track.h"
 #include "AtlasHepMC/GenParticle.h"
 #include "AtlasHepMC/GenVertex.h"
 #include "CLHEP/Vector/LorentzVector.h"
@@ -24,7 +23,6 @@
 #include "AthContainers/DataVector.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSurfaces/PlaneSurface.h"
-#include "AtlasHepMC/GenParticle.h"
 
 //____________________________________________________________________
 class TrackHandle_SimulationTrack::Imp {
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx
index 96225bc4670aebef4cf17f4793756fb837119815..0bc60e70f4c0bb717ff974fa707de3498b113e22 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TrkTrack.cxx
@@ -28,7 +28,6 @@
 #include "VP1Base/VP1Msg.h"//fixme
 #include "VP1TrackSystems/VP1TrackSummary.h"
 #include "VP1TrackSystems/AscObj_TSOS.h"
-#include "VP1TrackSystems/TrkObjToString.h"
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoNode.h>
 
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TruthTrack.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TruthTrack.cxx
index 361191f6e9cd36d323882a9fdece265ac58a4355..1416ea225bfa6a2666bdbfa46b18d5c0e4cc0b3d 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TruthTrack.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandle_TruthTrack.cxx
@@ -16,8 +16,6 @@
 #include "VP1TrackSystems/AscObj_TruthPoint.h"
 #include "VP1Base/VP1Msg.h"
 
-#include "TrkTrack/Track.h"
-#include "AtlasHepMC/GenParticle.h"
 #include "AtlasHepMC/GenVertex.h"
 #include "CLHEP/Vector/LorentzVector.h"
 #include "TrkTrack/Track.h"
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
index 91eb346e5955ad32f9aab87c82883e21732189c2..5c40646166fda6ff0c7a869deca87177dd15b911 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
@@ -79,7 +79,6 @@
 #include "MuonReadoutGeometry/CscReadoutElement.h"
 #include "MuonReadoutGeometry/MdtReadoutElement.h"
 #include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
-#include "MuonReadoutGeometry/MdtReadoutElement.h"
 #include "StoreGate/StoreGateSvc.h"
 
 ////////////////////////////////////////////////////////
diff --git a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/src/TrackingVolumeToSoNode.cxx b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/src/TrackingVolumeToSoNode.cxx
index 559a76663a6f9f492d62dd82103c5993669a321f..b82a54655c8671d2ac45180dc7ce8c34c2675d8f 100755
--- a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/src/TrackingVolumeToSoNode.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/src/TrackingVolumeToSoNode.cxx
@@ -45,8 +45,6 @@
 #include "GeoModelKernel/GeoSimplePolygonBrep.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 
-#include "GeoPrimitives/GeoPrimitives.h"
-
 #include "GaudiKernel/SystemOfUnits.h"
 
 
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
index 33e501e8e99241e9ce118fcf904a86002e925727..1fcf7aed4818777ad21bd6e807939c7ef5acbb29 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
@@ -21,7 +21,6 @@
 #include "TrigMuonEvent/TrigMuonEFTrack.h"
 #include "TrigMuonEvent/TrigMuonEFCbTrack.h"
 #include "TrigMuonEvent/MuonFeature.h"
-#include "TrigMuonEvent/TrigMuonEFInfoContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrackContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrack.h"
 #include "TrigMuonEvent/TrigMuonEFIsolationContainer.h"
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleL2.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleL2.cxx
index 50904833684468f26c09b611306e81cadc94e4e2..64e6027f654fa02ecda14b3959b5ec2c4b7ea7cd 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleL2.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleL2.cxx
@@ -22,7 +22,6 @@
 #include "TrigMuonEvent/TrigMuonEFTrack.h"
 #include "TrigMuonEvent/TrigMuonEFCbTrack.h"
 #include "TrigMuonEvent/MuonFeature.h"
-#include "TrigMuonEvent/TrigMuonEFInfoContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrackContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrack.h"
 #include "TrigMuonEvent/TrigMuonEFIsolationContainer.h"
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerSystem.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerSystem.cxx
index cc0a324ea1c34d47e7edd4fa6a5c5d98c50958b4..3ebba4c4de258ce584646151b8c6539e34be8b7a 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerSystem.cxx
@@ -17,7 +17,6 @@
 //L1 includes
 
 // check the include of the Chain.h file here below, maybe it's obsolete because it seems it's not used
-//#include "TrigSteering/Chain.h" // OLD include
 #include "TrigSteeringEvent/Chain.h" // NEW include - Requested by Francesca Pastore, 13 Sep 2013
 
 #include "TrigDecisionTool/TrigDecisionTool.h"
@@ -34,7 +33,6 @@
 #include "TrigMuonEvent/TrigMuonEFTrack.h"
 #include "TrigMuonEvent/TrigMuonEFCbTrack.h"
 #include "TrigMuonEvent/MuonFeature.h"
-#include "TrigMuonEvent/TrigMuonEFInfoContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrackContainer.h"
 #include "TrigMuonEvent/TrigMuonEFInfoTrack.h"
 #include "TrigMuonEvent/TrigMuonEFIsolationContainer.h"
diff --git a/graphics/VP1/VP1Utils/src/VP1ErrorUtils.cxx b/graphics/VP1/VP1Utils/src/VP1ErrorUtils.cxx
index d3911f41a0aa795c97d759cfeb8e907c67bda505..1aba50f75482f5358facf1e7b2f9ededb7c8ab0c 100644
--- a/graphics/VP1/VP1Utils/src/VP1ErrorUtils.cxx
+++ b/graphics/VP1/VP1Utils/src/VP1ErrorUtils.cxx
@@ -33,14 +33,9 @@
 #include <Inventor/nodes/SoVertexProperty.h>
 #include <Inventor/nodes/SoCylinder.h>
 #include <Inventor/nodes/SoComplexity.h>
-#include <Inventor/nodes/SoVertexProperty.h>
-#include <Inventor/nodes/SoLineSet.h>
 #include <Inventor/nodes/SoDrawStyle.h>
 #include "VP1HEPVis/nodes/SoGenericBox.h"
 
-//#include "TrkParameters/AtaStraightLine.h"
-//#include "TrkParameters/Perigee.h"
-
 #include "TrkSurfaces/Surface.h"
 #include "TrkSurfaces/RectangleBounds.h"
 
diff --git a/graphics/VP1/VP1UtilsBase/src/VP1TimeUtilities.cxx b/graphics/VP1/VP1UtilsBase/src/VP1TimeUtilities.cxx
index ab983a1936fd7bc2fdad6e11a71459ee5b42e042..04396113a6c29ac09feb5cc49011815fef45accf 100644
--- a/graphics/VP1/VP1UtilsBase/src/VP1TimeUtilities.cxx
+++ b/graphics/VP1/VP1UtilsBase/src/VP1TimeUtilities.cxx
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <iomanip>
 #include <string>
-#include <iostream>
 #include <sstream> // for std::ostringstream