diff --git a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
index 12da877f9d143dcd246f86ac2902333c08abb14b..d8c09abd4dce652ba1fef48ec1e1cce1a76974ff 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx
@@ -33,8 +33,6 @@
 // local headers
 #include "THistSvcHLT.h"
 
-DECLARE_COMPONENT( THistSvcHLT )
-
 namespace
 {
   template <typename InputIterator, typename OutputIterator, typename UnaryOperation, typename UnaryPredicate>
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
index 9ff4a578f276ff5c752ba50195169f4282c7b4b7..8c976be132e6ede7cfaf45f637cfdb4a70db9b53 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.h
@@ -28,9 +28,11 @@
 #include "TObject.h"
 #include "TTree.h"
 
+#include "AthenaBaseComps/AthService.h"
+
 class IIncidentSvc;
 
-class THistSvcHLT : public extends<Service, ITHistSvc, IIncidentListener, IIoComponent>
+class THistSvcHLT : public extends<AthService, ITHistSvc, IIncidentListener, IIoComponent>
 {
 public:
   THistSvcHLT( const std::string& name, ISvcLocator* svc );
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
index 5569c1725e4324319f3afec84c8fd4a7274ed7ff..85a1766f21a13aea199ffccd7a64a2cb56eb65de 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
@@ -29,7 +29,6 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 TrigMonTHistSvc::TrigMonTHistSvc( const std::string& name, ISvcLocator* svc ) 
     : THistSvcHLT(name, svc),
-      AthMessaging(msgSvc(), name),
       m_excludeType("()"), 
       m_includeType(".+"),
       m_excludeName(".*\\..*"),                                            
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
index 099f338b98004483252dc615b511b518c0a2a862..c5c52d19f5db35f1aec5d567a42100057a657c63 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
@@ -33,17 +33,13 @@ class TTree;
 
 #include <boost/regex.hpp>
 
-class TrigMonTHistSvc: virtual public THistSvcHLT,
-                       public AthMessaging
+class TrigMonTHistSvc: public THistSvcHLT
 { 
 public:
   
   TrigMonTHistSvc(const std::string& name, ISvcLocator *svc );
   virtual ~TrigMonTHistSvc();
 
-  TrigMonTHistSvc(const std::string& name, ISvcLocator *svc );
-  virtual ~TrigMonTHistSvc();
-
   virtual StatusCode queryInterface( const InterfaceID& riid, 
                                      void** ppvInterface );
   
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
index 539ef212b09de8af3fd8e0b0c7d44d26701e9c4c..898cf7b342fafec0cdcd8cbb02b73fa2248ebca1 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
@@ -13,3 +13,4 @@ DECLARE_COMPONENT( HltEventLoopMgr )
 DECLARE_COMPONENT( HltROBDataProviderSvc )
 DECLARE_COMPONENT( TrigISHelper )
 DECLARE_COMPONENT( TrigCOOLUpdateHelper )
+DECLARE_COMPONENT( THistSvcHLT )