diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b44a9024b98d7febee6fb2ebc19fe6436b21814c
--- /dev/null
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt
@@ -0,0 +1,55 @@
+################################################################################
+# Package: VP1TriggerSystems
+################################################################################
+
+# Declare the package name:
+atlas_subdir( VP1TriggerSystems )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/StoreGate
+                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+                          Trigger/TrigAnalysis/TrigDecisionTool
+                          Trigger/TrigAnalysis/TrigObjectMatching
+                          Trigger/TrigEvent/TrigMuonEvent
+                          Trigger/TrigEvent/TrigSteeringEvent
+                          graphics/VP1/VP1Base
+                          PRIVATE
+                          DetectorDescription/GeoPrimitives
+                          GaudiKernel
+                          Tracking/TrkEvent/TrkParameters
+                          Tracking/TrkEvent/TrkTrack )
+
+# External dependencies:
+find_package( Coin3D )
+find_package( Eigen )
+find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui )
+
+include_directories( /usr/X11R6/include )
+
+# Generate UI files automatically:
+set( CMAKE_AUTOUIC TRUE )
+# Generate MOC files automatically:
+set( CMAKE_AUTOMOC TRUE )
+set( CMAKE_AUTOMOC_MOC_OPTIONS "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED") 
+# ### NOTE! ###
+# "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED" is needed when using Qt < 5.0 together with BOOST > 1.52. 
+# Details: 
+# - https://its.cern.ch/jira/browse/ATLASRECTS-3097
+# - https://its.cern.ch/jira/browse/ATLASVPONE-184
+
+
+# Generate resource files automatically:
+set( CMAKE_AUTORCC TRUE )
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+
+# Component(s) in the package:
+atlas_add_library( VP1TriggerSystems VP1TriggerSystems/*.h src/*.h src/*.cxx src/*.qrc
+                   PUBLIC_HEADERS VP1TriggerSystems
+                   INCLUDE_DIRS ${QT4_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+                   LINK_LIBRARIES AnalysisTriggerEvent TrigMuonEvent TrigSteeringEvent VP1Base ${QT4_LIBRARIES} GL StoreGateLib SGtests TrigDecisionToolLib TrigObjectMatchingLib
+                   PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel TrkParameters TrkTrack 
+                 )
+
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
index c0f6cee21d3d4888fc1db3b27d1e5aa5f7335c02..cd4e968883da5544b3c1ecdb1a33b7053344aade 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
@@ -2,6 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+
 #ifndef VP1TRIGGERUISYSTEM_H
 #define VP1TRIGGERUISYSTEM_H
 
@@ -44,3 +45,4 @@ public:
   VP1Trig::VP1TriggerTool * m_triggertool;
 };
 #endif
+
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
index 4bba8e094bcc83fd37dcdda356d0405b79b7c3f0..a091e22323d016d9c2c0e1407eeddddee6df18d6 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
@@ -2,6 +2,7 @@ package VP1TriggerSystems
 
 author Manuel Proissl <mproissl@cern.ch>
 manager Manuel Proissl <mproissl@cern.ch>
+manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
 
 public
 use  AtlasPolicy                AtlasPolicy-*                   
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
index 2e87b9b9797ab1572518a6b040cd420a3e5d36a9..ab448ba8f26dec18f2d2d3f11a1700c878d31027 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
@@ -17,7 +17,7 @@
 #include "ui_tracksystemcontrollerform.h"
 
 //Track includes
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "TrkTrack/Track.h"
 #include "TrkTrack/TrackCollection.h"
 #include "TrkParameters/TrackParameters.h"
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
index d3ce2572eb231cd088aa08ecd0b31ed636e108d8..33e501e8e99241e9ce118fcf904a86002e925727 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
@@ -154,7 +154,7 @@ bool VP1Trig::VP1TriggerHandleEF::loadTrackContainer()
   count_mg=0;
   
   if(m_containerEF->hasTrack()) { //Muon in RoI
-    TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI
+    const TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI
     TrigMuonEFInfoTrackContainer::const_iterator TrackItr;
     
     for(TrackItr = tc->begin(); TrackItr!=tc->end(); TrackItr++) {
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
index 7812d1bacddb641f163258f43ba6427a7ee9ee58..16adb03233c71586edd39aab7eda36ed30bdd50e 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
@@ -11,6 +11,7 @@
  * @author  : Manuel Proissl  <mproissl@cern.ch> - University of Edinburgh
  ***********************************************************************************/
 
+
 //Local includes
 #include "VP1TriggerSystems/VP1TriggerUISystem.h"
 #include "VP1TriggerSystems/VP1TriggerTool.h"