diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
index 570ff9469819e5d5deab880092067999fa5b4af6..af995feda4ac6a4f84a7f9f643567a785d0a9dd2 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
@@ -16,6 +16,7 @@
 #include "TrigInterfaces/AllTEAlgo.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/Property.h"
 
 #include <string>
 #include <vector>
@@ -40,12 +41,6 @@
 
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
 
-/// for muon tests
-class Property;
-
-
-
-
 class DetectorTimingAlgo : public HLT::AllTEAlgo {
 public:
 
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
index 8c437df7c32cb7f0266b91184b78f15098ab4b5c..4f0bc2b4939f30ffdb4453d8971f4152fa274772 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
@@ -16,6 +16,7 @@
 #include "TrigInterfaces/AllTEAlgo.h"
 
 #include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/Property.h"
 
 #include <string>
 #include <vector>
@@ -31,7 +32,6 @@
 #include "xAODTrigger/TrigCompositeContainer.h"
 
 class IROBDataProviderSvc;
-class Property;
 
 typedef std::vector<uint32_t> ROBList;
 
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
index 019b1ce8f49728088b8f11691138cbbed2b2d43f..0d3c4318a2345530f8653bea0d20f41e9affad4c 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
@@ -16,6 +16,7 @@
 #include "TrigInterfaces/AllTEAlgo.h"
 
 #include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/Property.h"
 
 #include <string>
 #include <vector>
@@ -23,7 +24,6 @@
 #include <stdint.h>
 
 class IROBDataProviderSvc;
-class Property;
 
 typedef std::vector<uint32_t> ROBList;
 
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
index 23647c828f75fd27e778994d8b149db620bcc955..bbbac4d8640e249011809758018901e661ae0ec4 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
@@ -66,7 +66,8 @@ namespace PESA
       int priority = 100;
       pIncsvc->addListener( this, "BeginEvent", priority);
     } else {
-      msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup" << endreq;
+      msg(MSG::ERROR) << "No connection to incidentSvc used for cleanup" 
+                      << endmsg;
       return StatusCode::FAILURE;
     }