diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
index 7283eff42addf9affd9e1d4d4dc1fe6fd275e8b7..95f998da367e2d89df59f5a80995bdb3d0d5915c 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AthenaDBTestRec/TestCoolRecRead.h"
#include "AthenaDBTestRec/DetStoreDump.h"
DECLARE_ALGORITHM_FACTORY( TestCoolRecRead )
DECLARE_ALGORITHM_FACTORY( DetStoreDump )
-DECLARE_FACTORY_ENTRIES( AthenaDBTestRec )
-{
- DECLARE_ALGORITHM( TestCoolRecRead )
- DECLARE_ALGORITHM( DetStoreDump )
-}
-
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
deleted file mode 100644
index f9c746beb1eda23bddcde7146f43ebcf02551923..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaDBTestRec )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
old mode 100755
new mode 100644
index ff3540db7af16a7d08991b02da39cb1c5aac52b5..2ed3f375b2c5314a1813f5d9071252628a055b00
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
@@ -1,8 +1,3 @@
-/**
- * @file AthenaPoolMultiTest_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../StoreDump.h"
#include "../PassAllFilter.h"
#include "../PassNoneFilter.h"
@@ -14,7 +9,6 @@
#include "../RunEventTagWriter.h"
#include "../RunEventMetaWriter.h"
#include "../DummyLumirangeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(StoreDump)
DECLARE_ALGORITHM_FACTORY(PassAllFilter)
@@ -28,16 +22,3 @@ DECLARE_ALGORITHM_FACTORY(RunEventTagWriter)
DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter)
DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool)
-DECLARE_FACTORY_ENTRIES(AthenaPoolMultiTest) {
- DECLARE_ALGORITHM(StoreDump)
- DECLARE_ALGORITHM(PassAllFilter)
- DECLARE_ALGORITHM(PassNoneFilter)
- DECLARE_ALGORITHM(AddTrigMap)
- DECLARE_ALGORITHM(EventSplit)
- DECLARE_ALGORITHM(EventTagReader)
- DECLARE_ALGORITHM(EventTagWriter)
- DECLARE_ALGORITHM(TagEventTagWriter)
- DECLARE_ALGORITHM(RunEventTagWriter)
- DECLARE_ALGORITHM(RunEventMetaWriter)
- DECLARE_ALGORITHM(DummyLumirangeTool)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
deleted file mode 100755
index b8a9a7543b8173601ec0e51b54dd8b32e61e785f..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolMultiTest_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolMultiTest)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
old mode 100755
new mode 100644
index c141052555e4d89cffdb68d3345ac899454fc3d8..bbe912f5a338163ded6149c153122018b5650d38
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
@@ -1,15 +1,3 @@
-/**
- * @file AthenaPoolTest_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_entries.cxx,v 1.25 2007-12-05 15:47:15 emoyse Exp $
- *
- */
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../InDetRawDataFakeWriter.h"
#include "../InDetRawDataFakeReader.h"
#include "../TrkTrackFakeWriter.h"
@@ -44,21 +32,3 @@ DECLARE_ALGORITHM_FACTORY(EventInfoReader)
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter)
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader)
-DECLARE_FACTORY_ENTRIES(AthenaPoolTest) {
- DECLARE_ALGORITHM(AthenaPoolTestDataWriter)
- DECLARE_ALGORITHM(AthenaPoolTestDataReader)
- DECLARE_ALGORITHM(AthenaPoolTestAttrWriter)
- DECLARE_ALGORITHM(AthenaPoolTestAttrReader)
- // DECLARE_ALGORITHM(CaloClusterFakeWriter)
- // DECLARE_ALGORITHM(CaloClusterFakeReader)
- DECLARE_ALGORITHM(InDetRawDataFakeWriter)
- DECLARE_ALGORITHM(InDetRawDataFakeReader)
- DECLARE_ALGORITHM(LArCellContFakeWriter)
- DECLARE_ALGORITHM(LArCellContFakeReader)
- DECLARE_ALGORITHM(TrkTrackFakeWriter)
- DECLARE_ALGORITHM(TrkTrackFakeReader)
- DECLARE_ALGORITHM(EventInfoWriter)
- DECLARE_ALGORITHM(EventInfoReader)
- DECLARE_ALGORITHM(PileUpEventInfoWriter)
- DECLARE_ALGORITHM(PileUpEventInfoReader)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
deleted file mode 100755
index 1a1fbfa8708f8e2bc7588332cd912c310299e758..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file AthenaPoolTest_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_load.cxx,v 1.2 2005-01-10 18:05:52 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaPoolTest )
-
-
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
old mode 100755
new mode 100644
index ba1fa047e93cb8843a32b835f9065a76e7fe0132..276c8e9956043d0cb950e9ce27996fa7576418d2
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg)
DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS)
-DECLARE_FACTORY_ENTRIES(IOVDbTestAlg) {
- DECLARE_ALGORITHM( IOVDbTestAlg );
- DECLARE_ALGORITHM( IOVDbTestCoolDCS );
-}
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
deleted file mode 100755
index a372dda99f67dc6de7f52089b5ac0a54e99d7203..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbTestAlg)
diff --git a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
old mode 100755
new mode 100644
index d40f63541969194c323d8574d9c6602ac6ac0e63..81fe3179ba5d86490a67815bddec444275d9aa12
--- a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
+++ b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CommissionRec/ComTimeRec.h"
DECLARE_ALGORITHM_FACTORY( ComTimeRec )
-DECLARE_FACTORY_ENTRIES( CommissionRec ) {
- DECLARE_ALGORITHM( ComTimeRec )
-}
+
diff --git a/Commission/CommissionRec/src/components/CommissionRec_load.cxx b/Commission/CommissionRec/src/components/CommissionRec_load.cxx
deleted file mode 100755
index fdd38cd8473d49c4da538f39d48a485342b16946..0000000000000000000000000000000000000000
--- a/Commission/CommissionRec/src/components/CommissionRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CommissionRec)
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
index 5d9f6c906c2c42afa58970ae8fecd6adbe47bc03..487c86e60698ea720391491962da65972d8ab3e0 100644
--- a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
+++ b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
@@ -1,9 +1,5 @@
#include "CommissionUtils/CosmicTriggerTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool )
-DECLARE_FACTORY_ENTRIES( CommissionUtils ) {
- DECLARE_TOOL( CosmicTriggerTimeTool )
-}
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
deleted file mode 100644
index 52de3df7519b4a607d3bc9bf71b94a6e7a700438..0000000000000000000000000000000000000000
--- a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(CommissionUtils)
-
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
index 08c8caf585d560d21bac1a487fd31b6045dd4ce0..f27315aa7cfeee4ccd07d3be026c0638952f5a01 100644
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
+++ b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
@@ -11,7 +11,6 @@
#include "DataQualityTools/DQTDataFlowMonTool.h"
//#include "DataQualityTools/DQTTopLeptonJetsFinderTool.h"
//#include "DataQualityTools/DQTGlobalTopDilFinderTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DataQualityTools/DQTGlobalWZFinderTool.h"
#include "DataQualityTools/DQTLumiMonTool.h"
@@ -31,20 +30,3 @@ DECLARE_TOOL_FACTORY(DQTDataFlowMonTool)
DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool)
DECLARE_TOOL_FACTORY(DQTLumiMonTool)
-DECLARE_FACTORY_ENTRIES(DataQualityTools) {
- DECLARE_ALGTOOL(DataQualityFatherMonTool);
-// DECLARE_ALGTOOL(DQTMuTrkEff);
- DECLARE_ALGTOOL(DQTDetSynchMonTool);
-// DECLARE_ALGTOOL(DQTCaloClusterTool);
- DECLARE_ALGTOOL(DQTMuonIDTrackTool);
-// DECLARE_ALGTOOL(DQTElectronQualityTool);
-// DECLARE_ALGTOOL(DQTGlobalWFinderTool);
-// DECLARE_ALGTOOL(DQTRateMonTool);
- // DECLARE_ALGTOOL(DQTNonCollBkg_ZDC);
- DECLARE_ALGTOOL(DQTBackgroundMon);
- DECLARE_ALGTOOL(DQTDataFlowMonTool);
-// DECLARE_ALGTOOL(DQTGlobalTopDilFinderTool);
-// DECLARE_ALGTOOL(DQTTopLeptonJetsFinderTool);
- DECLARE_ALGTOOL(DQTGlobalWZFinderTool);
- DECLARE_ALGTOOL(DQTLumiMonTool);
-}
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
deleted file mode 100644
index 5cc618237985b313d917a05b54872092a2a91980..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DataQualityTools)
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
index 1f47e66d5bc718f83eec49cdff93d4ee462a8d3e..d1cb525abc81323c8f356cf710229bc80ea29bbe 100644
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
+++ b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
@@ -1,6 +1,5 @@
#include "GoodRunsLists/GoodRunsListSelectorTool.h"
#include "GoodRunsLists/TriggerRegistryTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool )
@@ -11,11 +10,3 @@ DECLARE_TOOL_FACTORY( TriggerRegistryTool )
#include "../GRLSelectorAlg.h"
DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg )
-DECLARE_FACTORY_ENTRIES( GoodRunsLists ) {
- DECLARE_ALGORITHM( GRLSelectorAlg );
- //DECLARE_ALGTOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectionTool )
- DECLARE_ALGTOOL( TriggerRegistryTool )
-}
-
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
deleted file mode 100644
index 262e455eaef998c8f18a6f26e02bc7612fab45d6..0000000000000000000000000000000000000000
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsLists)
-
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
index 4eae3c17e5b6bd2c7a15538fe950c23a19af5b8a..d5cb1991e9e9c14cc1f18705d70ffbf559236aab 100644
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
+++ b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
@@ -2,17 +2,9 @@
#include "GoodRunsListsUser/TriggerSelectorAlg.h"
#include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
#include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( DummyDumperAlg )
DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg )
-DECLARE_FACTORY_ENTRIES( GoodRunsListsUser ) {
- DECLARE_ALGORITHM( DummyDumperAlg )
- DECLARE_ALGORITHM( TriggerSelectorAlg )
- DECLARE_ALGORITHM( GoodRunsListSelectorAlg )
- DECLARE_ALGORITHM( GRLTriggerSelectorAlg )
-}
-
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
deleted file mode 100644
index 9b9d393fcfae209be299e45b3901f1771efc3499..0000000000000000000000000000000000000000
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsListsUser)
-
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
index f5f46df77847dce5f5bd20de9137c4265f6a2439..9f9ca68a431903be1734c22c6ba62ebdd77625b3 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
@@ -1,11 +1,3 @@
-/** @file AthenaPoolCnvSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_entries.cxx,v 1.14 2006-10-20 14:18:13 hawkings Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaPoolCnvSvc.h"
#include "../AthenaRootSerializeSvc.h"
#include "../AthenaAttributeListCnv.h"
@@ -18,10 +10,3 @@ DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv)
DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv)
DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv)
-DECLARE_FACTORY_ENTRIES(AthenaPoolCnvSvc) {
- DECLARE_SERVICE(AthenaPoolCnvSvc);
- DECLARE_SERVICE(AthenaRootSerializeSvc);
- DECLARE_CONVERTER(AthenaAttributeListCnv);
- DECLARE_CONVERTER(CondAttrListCollCnv);
- DECLARE_CONVERTER(CondAttrListVecCnv);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
deleted file mode 100644
index 13f284587bc6e3f481983d441138927e75ff2a4e..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolCnvSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_load.cxx,v 1.5 2005-01-10 18:11:16 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolCnvSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
old mode 100755
new mode 100644
index 44643cd207b0404aad94134ed2140fef0b3ee52a..105b23b442e7a6cdda2390b8d7f043eafec74b9c
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
@@ -1,9 +1,3 @@
-/** @file AthenaPoolExampleAlgorithms_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: AthenaPoolExampleAlgorithms_entries.cxx,v 1.16 2008-12-10 21:28:12 gemmeren Exp $
- **/
-
#include "../WriteData.h"
#include "../ReWriteData.h"
#include "../ReadData.h"
@@ -14,7 +8,6 @@
#include "../WriteTag.h"
#include "../QueryTag.h"
#include "../PassNoneFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData)
@@ -27,15 +20,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter)
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta)
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag)
-DECLARE_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms) {
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReWriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadBs);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteTag);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, PassNoneFilter);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, ReadMeta);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, QueryTag);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
deleted file mode 100755
index bfbc5258f8974760f63b3df7952792795ad2b4bd..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolExampleAlgorithms_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolExampleAlgorithms_load.cxx,v 1.3 2005-01-10 22:50:31 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms)
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
old mode 100755
new mode 100644
index 960ec5fba4314e1f0410e38645d04ef5763ee971..dd6a8edb698ac66635404e26fbc8f50ac911c4b6
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
@@ -1,17 +1,4 @@
-/** @file AthenaPoolServices_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaRootStreamerSvc.h"
DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc)
-DECLARE_FACTORY_ENTRIES(AthenaRootStreamerSvc) {
- DECLARE_SERVICE(AthenaRootStreamerSvc)
-}
-
-
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
deleted file mode 100755
index e93b68220f94995103e6ea7dc49ca21cb1c413d6..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolServices_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaRootStreamerSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
old mode 100755
new mode 100644
index 7f36b76a6ef1234d8808946aa2dcfe4cc928a420..6cbdf8f898079180b568f8a83e733245d5a7a60d
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
@@ -1,19 +1,8 @@
-/**
- * @file AthenaPoolTools_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../EventCount.h"
#include "../MetadataTest.h"
#include "../RequireUniqueEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(EventCount)
DECLARE_ALGORITHM_FACTORY(MetadataTest)
DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent)
-DECLARE_FACTORY_ENTRIES(AthenaPoolTools) {
- DECLARE_ALGORITHM(EventCount)
- DECLARE_ALGORITHM(MetadataTest)
- DECLARE_ALGORITHM(RequireUniqueEvent)
-}
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
deleted file mode 100755
index b892f59a2e873d89cc11ce9abf813543f0ec7204..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolTools_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolTools)
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
index d22892e11de0930f6cd0a1a00065418cdd6f16c1..8003f67b45469ab62f5b60e42c2d04d343f86dea 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
@@ -1,14 +1,2 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_entries.cxx
- * @brief Declares component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries.cxx,v 1.3 2005-01-12 20:46:47 kkarr Exp $
- */
-
#include "${package}Cnv_entries.h"
-DECLARE_FACTORY_ENTRIES(${package}PoolCnv) {
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
deleted file mode 100644
index 5a1106217b5a410ad12d417ba9937ae612fa2bb4..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_load.cxx
- * @brief Loads component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_load.cxx,v 1.3 2005-01-12 20:47:08 kkarr Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(${package}PoolCnv)
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
old mode 100755
new mode 100644
index d9990bf9cef34ec9aad960d7a235b54eccdd6304..6d267acc6ca19ee189682babd21c4bd5a4672af2
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
@@ -1,10 +1,3 @@
-/** @file EventSelectorAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_entries.cxx,v 1.6 2007-07-25 07:14:28 schaffer Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolAddressProviderSvc.h"
#include "../EventSelectorAthenaPool.h"
#include "../CondProxyProvider.h"
@@ -13,8 +6,3 @@ DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc)
DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool)
DECLARE_SERVICE_FACTORY(CondProxyProvider)
-DECLARE_FACTORY_ENTRIES(EventSelectorAthenaPool) {
- DECLARE_SERVICE(AthenaPoolAddressProviderSvc)
- DECLARE_SERVICE(EventSelectorAthenaPool)
- DECLARE_SERVICE(CondProxyProvider)
-}
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
deleted file mode 100755
index eb4da766cd2fe25385fb1ec03b308d8febdde7da..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file EventSelectorAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_load.cxx,v 1.3 2005-01-11 20:59:08 malond Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventSelectorAthenaPool)
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
index abac224e77fd3ee10420bb2b7a2ba05eb2781b12..b06cc814393ae87d983ebe34ff17e5b93bb4593d 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
@@ -1,9 +1,3 @@
-/** @file OutputStreamAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolOutputStreamTool.h"
#include "../MakeInputDataHeader.h"
#include "../MakeEventStreamInfo.h"
@@ -18,11 +12,3 @@ DECLARE_TOOL_FACTORY(EventInfoAttListTool)
DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader)
DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder)
-DECLARE_FACTORY_ENTRIES(OutputStreamAthenaPool) {
- DECLARE_TOOL(AthenaPoolOutputStreamTool)
- DECLARE_TOOL(MakeEventStreamInfo)
- DECLARE_TOOL(CopyEventStreamInfo)
- DECLARE_TOOL(EventInfoAttListTool)
- DECLARE_ALGORITHM(MakeInputDataHeader)
- DECLARE_ALGORITHM(EventInfoTagBuilder)
-}
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
deleted file mode 100644
index c4741910c1bf89d2820722687722be0382bc3472..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file OutputStreamAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: OutputStreamAthenaPool_load.cxx,v 1.1.1.1 2006-08-16 20:59:21 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OutputStreamAthenaPool)
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
index afccf7708fe50e3c213bdf95675ee3be1985de72..f369ec522454108ce8b96811455646487959a16d 100644
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
@@ -1,13 +1,4 @@
-/** @file PoolSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_entries.cxx,v 1.8 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PoolSvc.h"
DECLARE_SERVICE_FACTORY(PoolSvc)
-DECLARE_FACTORY_ENTRIES(PoolSvc) {
- DECLARE_SERVICE(PoolSvc);
-}
+
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
deleted file mode 100644
index 92ae8b29adb744bbcdaaf9158c26724d18468d64..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file PoolSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_load.cxx,v 1.6 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PoolSvc)
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
old mode 100755
new mode 100644
index f89f4ce48e16d4c24d040afdbf115ac201173acb..25f8b31451196d5dd80195c62f9436ab7215738f
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
@@ -1,22 +1,6 @@
-/**
- * @file RDBAccessSvc_entries.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_entries.cxx,v 1.4 2005-07-22 15:56:45 obreshko Exp $
- */
-
#include "../RDBAccessSvc.h"
#include "../SourceCompAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(RDBAccessSvc)
DECLARE_ALGORITHM_FACTORY(SourceCompAlg)
-DECLARE_FACTORY_ENTRIES(RDBAccessSvc) {
- DECLARE_SERVICE ( RDBAccessSvc );
- DECLARE_ALGORITHM ( SourceCompAlg );
-}
-
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
deleted file mode 100755
index 8ddc8264f051a5b75c57adc933a5d8528fd29ece..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file RDBAccessSvc_load.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_load.cxx,v 1.2 2005-01-14 10:41:42 tsulaia Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RDBAccessSvc)
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
index e35332e8af0e8427c67671fa85b3aac320eb3d09..e134dbb2639b42e711d1ff34b93c52bd1514b526 100644
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
+++ b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
@@ -1,8 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RootFileTransformationsTool.h"
-DECLARE_FACTORY_ENTRIES(RootFileTransformations) {
- DECLARE_TOOL(RootFileTransformationsTool)
-}
DECLARE_TOOL_FACTORY(RootFileTransformationsTool)
+
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
deleted file mode 100644
index 128cccc39bb43db86a7f9f96fcae6a6593defcc8..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RootFileTransformationsTool)
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
index 088d2609450c30919cd856ccd91be230105227bf..b94fed8000c7e37888002f3dc9dbd519c03fad92 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../NtupleCnvSvc.h"
//#include "../LeafCnv.h"
#include "../RootOutputStreamTool.h"
@@ -42,25 +41,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlgHandle )
DECLARE_SERVICE_FACTORY( IoSvc )
-DECLARE_FACTORY_ENTRIES( AthenaRootComps ) {
- DECLARE_NAMESPACE_SERVICE(Athena, NtupleCnvSvc)
- DECLARE_NAMESPACE_CONVERTER(Athena, LeafCnv)
- DECLARE_NAMESPACE_CONVERTER(Athena, xAODCnv)
-
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, RootCnvSvc )
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, xAODCnvSvc )
- DECLARE_NAMESPACE_TOOL(Athena, RootOutputStreamTool)
-
- DECLARE_NAMESPACE_SERVICE(Athena, RootNtupleEventSelector)
- DECLARE_NAMESPACE_SERVICE(Athena, xAODEventSelector)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootNtupleOutputStream)
- DECLARE_NAMESPACE_TOOL(Athena, RootNtupleOutputMetadataTool)
-
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlg)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlgHandle)
-
-
- DECLARE_SERVICE( IoSvc )
-}
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
deleted file mode 100644
index 4410a0acf9cc754054d883a342c70b4fdd3c6359..0000000000000000000000000000000000000000
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaRootComps )
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
old mode 100755
new mode 100644
index f95eeb0b2c0cbb417b1164925f6b77266590ece4..e783176a34d921772df2365bbf185cfac4caf825
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DBReplicaSvc.h"
DECLARE_SERVICE_FACTORY( DBReplicaSvc )
-DECLARE_FACTORY_ENTRIES( DBReplicaSvc ) {
- DECLARE_SERVICE( DBReplicaSvc )
-}
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
deleted file mode 100755
index 9eb365d9a612ba3b9654664f5b4d8d6b5e201270..0000000000000000000000000000000000000000
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DBReplicaSvc )
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
index 43bfb2e129964c13eefa04b3f0c6435e12448e26..56f2dbf59ff51d880b9e3341e91dfcd7e094e01e 100644
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
+++ b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CoolLumiUtilities/FillParamsTool.h"
#include "CoolLumiUtilities/BunchGroupTool.h"
#include "CoolLumiUtilities/BunchLumisTool.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( BunchGroupTool )
DECLARE_TOOL_FACTORY( BunchLumisTool )
DECLARE_TOOL_FACTORY( OnlineLumiCalibrationTool )
-DECLARE_FACTORY_ENTRIES( CoolLumiUtilities ) {
- DECLARE_ALGTOOL( FillParamsTool )
- DECLARE_ALGTOOL( BunchGroupTool )
- DECLARE_ALGTOOL( BunchLumisTool )
- DECLARE_ALGTOOL( OnlineLumiCalibrationTool )
-}
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
deleted file mode 100644
index e0a2173aedf847c8cd4e28ec61a103fae6be1ad5..0000000000000000000000000000000000000000
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CoolLumiUtilities)
diff --git a/Database/FileStager/src/components/FileStager_entries.cxx b/Database/FileStager/src/components/FileStager_entries.cxx
index d273f237c4416c55bf61ebb54627a40e78c533e4..b784249f8b7e149db28057df0484320659d36c3b 100644
--- a/Database/FileStager/src/components/FileStager_entries.cxx
+++ b/Database/FileStager/src/components/FileStager_entries.cxx
@@ -1,10 +1,5 @@
#include "FileStager/FileStagerAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( FileStagerAlg )
-DECLARE_FACTORY_ENTRIES(FileStager) {
- DECLARE_ALGORITHM( FileStagerAlg )
-}
-
diff --git a/Database/FileStager/src/components/FileStager_load.cxx b/Database/FileStager/src/components/FileStager_load.cxx
deleted file mode 100644
index 3cb8371756f18c2a1f70b98e064a8a532b572e33..0000000000000000000000000000000000000000
--- a/Database/FileStager/src/components/FileStager_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(FileStager)
-
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
old mode 100755
new mode 100644
index 3ac2a7778dab8701cea5f9ba9146f01f5956da09..11168740737fa185b24450faf35e477ebd83896b
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
+++ b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
@@ -1,19 +1,4 @@
-/**
- * @file IOVDbMetaDataTool_entries.cxx
- *
- * @brief Declaration of entry points for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../IOVDbMetaDataTool.h"
DECLARE_TOOL_FACTORY( IOVDbMetaDataTool )
-DECLARE_FACTORY_ENTRIES(IOVDbMetaDataTool) {
- DECLARE_TOOL( IOVDbMetaDataTool )
-}
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
deleted file mode 100755
index 6bc0e49409bbc4d953235ee6299ac0d752168e04..0000000000000000000000000000000000000000
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file IOVDbTool_load.cxx
- *
- * @brief Declaration of factory for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbMetaDataTool)
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
index 22ac418d75c34b10675d65b681229942573b719f..b7305b8b218061b76c2358d6baac07d4124b2713 100644
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
+++ b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
@@ -1,7 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../IOVDbSvc.h"
DECLARE_SERVICE_FACTORY(IOVDbSvc)
-DECLARE_FACTORY_ENTRIES(IOVDbSvc) {
- DECLARE_SERVICE( IOVDbSvc );
-}
+
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
deleted file mode 100644
index 68d93359bdda12e481b834aaa185af8f893a5dde..0000000000000000000000000000000000000000
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbSvc)
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
old mode 100755
new mode 100644
index 170dc5f485c9d3cb9e26e28abe12a61608e8344a..d579ef1d5107d2338a747df0de8dc6365d731a7a
--- a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
+++ b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
@@ -1,17 +1,4 @@
-/**
- * @file RegistrationServices_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_entries.cxx,v 1.16 2009-04-28 19:04:07 cranshaw Exp $
- *
- */
-
#include <stdint.h>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../OutputConditionsAlg.h"
#include "../InputCollectionMetadataCopy.h"
#include "../RegistrationStream.h"
@@ -26,10 +13,3 @@ DECLARE_TOOL_FACTORY(InputCollectionMetadataCopy)
DECLARE_TOOL_FACTORY(RegistrationStreamLCGTool)
DECLARE_TOOL_FACTORY(RegistrationStreamTagTool)
-DECLARE_FACTORY_ENTRIES(RegistrationServices) {
- DECLARE_ALGORITHM(RegistrationStream)
- DECLARE_ALGORITHM(RegistrationStreamDefMeta)
- DECLARE_ALGORITHM(OutputConditionsAlg)
- DECLARE_TOOL(RegistrationStreamLCGTool)
- DECLARE_TOOL(RegistrationStreamTagTool)
-}
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx b/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
deleted file mode 100755
index 940adb9bc24397195b77373ab6502e32bd53ed0f..0000000000000000000000000000000000000000
--- a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file RegistrationServices_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_load.cxx,v 1.2 2005-01-07 10:44:07 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RegistrationServices )
-
-
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
index def27b6fb481f273c69af08a65f68cb68dda5502..4d659704f562d5b0538fd7e24d030bd4fe92b233 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "AGDD2GeoSvc/AGDD2GeoSvc.h"
#include "AGDD2GeoSvc/DefaultAGDDTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(AGDDtoGeoSvc)
DECLARE_TOOL_FACTORY(DefaultAGDDTool)
-DECLARE_FACTORY_ENTRIES(AGDDtoGeoSvc) {
- DECLARE_SERVICE ( AGDDtoGeoSvc )
- DECLARE_ALGTOOL ( DefaultAGDDTool )
-}
-
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
deleted file mode 100644
index 191abb6d2773dafea8889f3b105f36f2e74f0644..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AGDDtoGeoSvc)
-
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
old mode 100755
new mode 100644
index e234f514134eecfecb310503f0d18d309f02531e..88e534944bbddf0d52ec097c4ca50c9c625ea563
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCnvSvc/DetDescrCnvSvc.h"
DECLARE_SERVICE_FACTORY( DetDescrCnvSvc )
-DECLARE_FACTORY_ENTRIES ( DetDescrCnvSvc ) {
- DECLARE_SERVICE ( DetDescrCnvSvc )
-}
-
-
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
deleted file mode 100755
index c919d44cb438224abd0b7d6efa504f53d7137ba9..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCnvSvc )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
old mode 100755
new mode 100644
index d4f3d22997c74fd71bbf080040df6973e254798a..745646995a9b710d0244865d4a2cbe9231945e76
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCondExample/ReadAlignTrans.h"
#include "DetDescrCondExample/ReadTopTrans.h"
#include "DetDescrCondExample/ReadWriteCoolStrFile.h"
@@ -9,10 +8,3 @@ DECLARE_ALGORITHM_FACTORY( ReadTopTrans )
DECLARE_ALGORITHM_FACTORY( ReadWriteCoolStrFile )
DECLARE_ALGORITHM_FACTORY( CoolHistExample )
-DECLARE_FACTORY_ENTRIES( DetDescrCondExample )
-{
- DECLARE_ALGORITHM( ReadAlignTrans )
- DECLARE_ALGORITHM( ReadTopTrans )
- DECLARE_ALGORITHM( ReadWriteCoolStrFile )
- DECLARE_ALGORITHM( CoolHistExample )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
deleted file mode 100755
index 962a743d35b7ec6a438374fe7109ae5cf2e72d95..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCondExample )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
old mode 100755
new mode 100644
index b1224faf5d506cffd0aad762f39ecdc9cfe794d4..e8f449519b24d7061f6a38492357ca916f024105
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
@@ -1,14 +1,8 @@
#include "DetDescrCondTools/AlignTransTool.h"
#include "../CoolStrFileSvc.h"
#include "../CoolHistSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( AlignTransTool )
DECLARE_SERVICE_FACTORY( CoolStrFileSvc )
DECLARE_SERVICE_FACTORY( CoolHistSvc )
-DECLARE_FACTORY_ENTRIES(DetDescrCondTools) {
- DECLARE_TOOL( AlignTransTool )
- DECLARE_SERVICE( CoolStrFileSvc )
- DECLARE_SERVICE( CoolHistSvc )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
deleted file mode 100755
index c865c1aeaadce3b92ae2f0a4fce5db2733892302..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetDescrCondTools)
-
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
old mode 100755
new mode 100644
index eef308e1dd366ad3e4ed6b1d1f59d452d814a688..a5f3487bc5f6358db22bf4b9cb266d2690d31da5
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DetStatusSvc.h"
#include "DetectorStatus/DetStatusAlg.h"
DECLARE_SERVICE_FACTORY(DetStatusSvc)
DECLARE_ALGORITHM_FACTORY(DetStatusAlg)
-DECLARE_FACTORY_ENTRIES(DetectorStatus) {
- DECLARE_SERVICE( DetStatusSvc );
- DECLARE_ALGORITHM( DetStatusAlg );
-}
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
deleted file mode 100755
index 4c70a1099377520571a86c6a9787b95b97411893..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetectorStatus)
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
old mode 100755
new mode 100644
index 80e2e029331f5a3d90a932cb844d3d77200426ab..1070c344bfc80b664b7f2818fe2d2c049d6231e6
--- a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
@@ -1,3 +1,4 @@
#include "..//ToyDetectorTool.h"
DECLARE_TOOL_FACTORY(ToyDetectorTool)
+
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
old mode 100755
new mode 100644
index aba3755acb717994b32ed34b519a03badaf75bf3..962f94839b2730662dd6f82eb50840d3595f103c
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "../GeoModelSvc.h"
#include "../GeoDbTagSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(GeoModelSvc)
DECLARE_SERVICE_FACTORY(GeoDbTagSvc)
-DECLARE_FACTORY_ENTRIES(GeoModelSvc) {
- DECLARE_SERVICE ( GeoModelSvc )
- DECLARE_SERVICE ( GeoDbTagSvc )
-}
-
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
deleted file mode 100755
index 55e69c557a9e5b68261fb2bc7a83d8bf38c84e26..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeoModelSvc)
-
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
index fd77c5ed2e305dc71b465938d9f3b653e0b937b8..17d72309c07289d85144462cde53c6517c24dec1 100644
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
+++ b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../GeometryDBSvc.h"
DECLARE_SERVICE_FACTORY(GeometryDBSvc)
-DECLARE_FACTORY_ENTRIES(GeometryDBSvc) {
- DECLARE_SERVICE(GeometryDBSvc)
-}
-
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
deleted file mode 100644
index cd3880632cd6e9383e70fc1240c30ae2e5837637..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryDBSvc)
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 621fb397f78fbdf398a039ae9bfb321ee4bb32ab..e76f1c33b8026054011eb0d2e77f003df610bba9
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -1,10 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "IdDictDetDescrCnv.h"
#include "AtlasIDDetDescrCnv.h"
#include "IdDictCnvTest.h"
@@ -13,10 +6,3 @@ DECLARE_CONVERTER_FACTORY( AtlasIDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( IdDictDetDescrCnv )
DECLARE_ALGORITHM_FACTORY( IdDictCnvTest )
-DECLARE_FACTORY_ENTRIES ( IdDictDetDescrCnv ) {
- DECLARE_CONVERTER ( IdDictDetDescrCnv )
- DECLARE_CONVERTER ( AtlasIDDetDescrCnv )
- DECLARE_ALGORITHM ( IdDictCnvTest )
-}
-
-
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
deleted file mode 100755
index 2dbc2d196b5cd029ec8cbea5420581b99c1ac836..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( IdDictDetDescrCnv )
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
old mode 100755
new mode 100644
index 3c0e961d04951caa37665d17547ca82e9a61835b..83c73996683a6e053df3ef89e54cad6e3eb96da1
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
+++ b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
// #include "RegionSelector/RegSelSvc.h"
#include "../RegSelSvc.h"
// #include "../NewRegSelSvc.h"
@@ -6,7 +5,3 @@
DECLARE_SERVICE_FACTORY( RegSelSvc )
// DECLARE_SERVICE_FACTORY( NewRegSelSvc )
-DECLARE_FACTORY_ENTRIES(RegionSelector) {
- DECLARE_SERVICE( RegSelSvc )
- // DECLARE_SERVICE( NewRegSelSvc )
-}
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
deleted file mode 100755
index 97e1e64cd19c87c63d936b3de20933e178a83263..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RegionSelector)
-
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
index a8b45aea656c5809a5ddeecca48441fda9f33dd0..856ff7d745b0689d5f6a05f325a387b628928db3 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "AFP_ByteStream2RawCnv/RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( RawDataProvider )
@@ -17,10 +14,3 @@ DECLARE_TOOL_FACTORY( AFP_RawDataProviderTool )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( AFP_RawDataProvider )
-DECLARE_FACTORY_ENTRIES( AFP_ByteStream2RawCnv )
-{
- DECLARE_ALGORITHM( AFP_RawDataProvider );
- DECLARE_TOOL( AFP_RawDataProviderTool );
- DECLARE_TOOL( AFP_ByteStream2RawCnv );
- DECLARE_ALGORITHM( RawDataProvider );
-}
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
deleted file mode 100644
index 125337d5cc6353bae852f7e61dd24a4cba36dddf..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_ByteStream2RawCnv)
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
index 575fc986dc92a266fd0baf419e85de20c9fa7e6e..c9d4eca02fcd705dd7589778c62e1ff51e7f6e40 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Digitization/AFP_DigiTop.h"
#include "AFP_Digitization/AFP_PileUpTool.h"
@@ -6,9 +5,3 @@ DECLARE_ALGORITHM_FACTORY(AFP_DigiTop)
DECLARE_TOOL_FACTORY( AFP_PileUpTool )
-DECLARE_FACTORY_ENTRIES (AFP_Digitization)
-{
- DECLARE_ALGORITHM(AFP_DigiTop)
- DECLARE_TOOL( AFP_PileUpTool )
-}
-
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
deleted file mode 100644
index fc0ce4471af35c7e10ca4213fa4b10b74fe77aae..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Digitization)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
index 5ebe500891dc16663dc791e995a529b7ecdfb4ca..a35d1ed844c33a9990dbfa08de983a32381ecde9 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
@@ -15,13 +15,5 @@ DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv )
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
deleted file mode 100644
index f033e1200e6f14717b22a72413587940640b31d8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
index d1f56ba0863534275bbcee64606d28fd04ae9f54..6e448fd44fc2779a870b5f9c3fc2046fa9c5524a 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
@@ -6,9 +6,3 @@ DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_TDSimDigiCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index 48d322a4456194323f32f4bbeee55e745fb034c8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
index 293b9ae6a71a394bfe4e041eece7e26b76f57e5c..b0205cc929fe53dd4b93151f7bc9d988f161875c 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
@@ -38,7 +38,6 @@
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollection_p1.h"
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AFP_TDSimHit_p1 )
DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCnv_p1 )
@@ -79,43 +78,11 @@ DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollection_p1 )
DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv_p1 )
-DECLARE_FACTORY_ENTRIES(AFP_EventTPCnv) {
- DECLARE_ALGORITHM( AFP_TDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDDigi_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawData_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollection_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainer_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainerCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_SiDigi_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv_p1 )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
deleted file mode 100644
index d2b461b6de973283f009039a80c27e9d7e164d8c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventTPCnv)
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
index 03452ff73c11b0b51e93da34d506ff92277830a7..6a7e0de75d307ebe9a13ad521bccd2d4eab98802 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
@@ -1,14 +1,8 @@
#include "../AFP_SensitiveDetectorTool.h" //TODO remove once separate versions tested
#include "../AFP_SiDSensitiveDetectorTool.h"
#include "../AFP_TDSensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(AFP_SensitiveDetectorTool) //TODO remove once separate versions tested
DECLARE_TOOL_FACTORY(AFP_SiDSensitiveDetectorTool)
DECLARE_TOOL_FACTORY(AFP_TDSensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(AFP_G4_SD) {
- DECLARE_TOOL(AFP_SensitiveDetectorTool); //TODO remove once separate versions tested
- DECLARE_TOOL(AFP_SiDSensitiveDetectorTool);
- DECLARE_TOOL(AFP_TDSensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
deleted file mode 100644
index ef16ed74aac0adb986e4d148199b858b3512e4da..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_G4_SD)
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
old mode 100755
new mode 100644
index ba820e084fafb1a00381b12b49d11c7b7ed70eee..c974462d74faa2b7ede395509c0660239f29583f
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../AFP_GeoModelTool.h"
DECLARE_TOOL_FACTORY(AFP_GeoModelTool)
+
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
index 5627aa47f989e7c61bc707a9705e48854387ca99..4950c86fc9ea126799773070349f66d389663bcd 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "AFP_Geometry/AFP_Geometry.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(AFP_Geometry)
-DECLARE_FACTORY_ENTRIES(AFP_Geometry) {
- DECLARE_ALGORITHM(AFP_Geometry)
-}
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
deleted file mode 100644
index b41680a6b238ed0ab2e1d34f891a67123d4c8685..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Geometry)
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
index bb80b2b500ed637d6021f7e42ce88fe542b93652..914dd313d514a613d0142cf8c0a56f3d8d992349 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Monitoring/AFPHitsMonitorTool.h"
#include "AFP_Monitoring/AFPTechnicalMonitorTool.h"
DECLARE_TOOL_FACTORY(AFPHitsMonitorTool)
DECLARE_TOOL_FACTORY(AFPTechnicalMonitorTool)
-DECLARE_FACTORY_ENTRIES(AFP_Monitoring) {
- DECLARE_ALGTOOL(AFPHitsMonitorTool)
- DECLARE_ALGTOOL(AFPTechnicalMonitorTool)
-}
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
deleted file mode 100644
index 2a70da3e08ade2b3295334803f32165d1e578158..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Monitoring)
-
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
index 63e4326359f64bbf8dad4a9e24fdb5ce916a1aeb..96caea07ca0a6d6dc3eb56a63a092545ea8a4786 100644
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include <AFP_Raw2Digi/AFP_Raw2Digi.h>
#include "../AFP_Raw2DigiTool.h"
DECLARE_ALGORITHM_FACTORY( AFP_Raw2Digi )
DECLARE_TOOL_FACTORY( AFP_Raw2DigiTool )
-DECLARE_FACTORY_ENTRIES( AFP_Raw2Digi )
-{
- DECLARE_ALGORITHM( AFP_Raw2Digi );
-}
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
deleted file mode 100644
index c9da80496922415152297d56ae604a1e5622ac22..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Raw2Digi)
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
index 28bb55fe5ab26f758395ad13092f2e0457bb6a68..95a545690130572281db6ba024c88b2bc6e852ac 100644
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvent.h"
#include "AFP_LocRecoEv/AFP_TDLocRecoEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_SIDLocRecoEvent)
DECLARE_ALGORITHM_FACTORY(AFP_TDLocRecoEvent)
-DECLARE_FACTORY_ENTRIES(AFP_LocRecoEv) {
-DECLARE_ALGORITHM(AFP_SIDLocRecoEvent)
-DECLARE_ALGORITHM(AFP_TDLocRecoEvent)
-}
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
deleted file mode 100644
index 77f9815568626480c3feb4d675e85705bb0e2a73..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocRecoEv)
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
index fd35ccf81e6cd7542feae97abf37b6791050c583..d50a52695e433aea1f6ce9535d13ddd2df500756 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocReco/AFP_TDLocReco.h"
#include "AFP_LocReco/AFP_SIDLocReco.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_TDLocReco)
DECLARE_ALGORITHM_FACTORY(AFP_SIDLocReco)
-DECLARE_FACTORY_ENTRIES(AFP_LocReco) {
- DECLARE_ALGORITHM (AFP_TDLocReco)
- DECLARE_ALGORITHM (AFP_SIDLocReco)
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
deleted file mode 100644
index a6bf7959e183121bf2d22c7b01d3031ad70787df..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocReco)
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
index 9f66a5151d97def0ed835021b6f35815ed9e9a32..c0c503545288ed08d36c02c4f944d64855e387a7 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
@@ -1,8 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AFPSiClusterTool.h"
#include "../AFPSiClusterSingleHitTool.h"
#include "../AFPSiRowColToLocalCSTool.h"
@@ -13,5 +8,3 @@ DECLARE_TOOL_FACTORY(AFPSiClusterSingleHitTool)
DECLARE_TOOL_FACTORY(AFPSiRowColToLocalCSTool)
DECLARE_TOOL_FACTORY(AFPSiClusterBasicNearestNeighbour)
-DECLARE_FACTORY_ENTRIES(AFP_SiClusterTools) {
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
deleted file mode 100644
index 4b08aade0332f039e0216687f627c6d8fb297bc4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_SiClusterTools)
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
index 2c4386e08172ffaea0d5c0dd2a6ea02f91974c4f..4b7f8c4af6a379f24065d51bab4ae811a2b7b275 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
@@ -2,15 +2,9 @@
#include "AFP_SimEv/AFP_TDSimHit.h"
#include "AFP_SimEv/AFP_SIDSimHitCollection.h"
#include "AFP_SimEv/AFP_SIDSimHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_TDSimHit)
DECLARE_ALGORITHM_FACTORY(AFP_TDSimHitCollection)
DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHit)
DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHitCollection)
-DECLARE_FACTORY_ENTRIES(AFP_SimEv) {
- DECLARE_ALGORITHM(AFP_SIDSimHit)
- DECLARE_ALGORITHM(AFP_SIDSimHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
deleted file mode 100644
index 6d7f76fb429f151f426304faea721f8d57d4ede7..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_SimEv)
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
index 04ad492f1a3efe0d8a716a10167739bc7cd01d4c..0aefecdbc52a0d8fa285887c63827c56a1b636e7 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
@@ -1,22 +1,6 @@
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
#include "ALFA_BeamTransport/ALFA_BeamTransport.h"
DECLARE_ALGORITHM_FACTORY( ALFA_BeamTransport )
-DECLARE_FACTORY_ENTRIES( ALFA_BeamTransport ) {
- DECLARE_ALGORITHM( ALFA_BeamTransport )
-}
//DECLARE_ALGORITHM_FACTORY( THistSvc )
+
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
deleted file mode 100644
index 55c83023c471a76125285d4f392326de7d6b6bec..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-//Notes:
-//
-//1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
-// component library (libXXX.so).
-//
-// See Athena User Guide for more information
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
-LOAD_FACTORY_ENTRIES( ALFA_BeamTransport )
-
- //LOAD_FACTORY_ENTRIES( THistSvc )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
index 7a15b6af95c509db6c7681ff4cca5c0923b6c4ea..0979b76dc91942d1f786210fa84edb87280dc521 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkAlg/ALFA_CLinkAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_CLinkAlg)
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkAlg) {
- DECLARE_ALGORITHM (ALFA_CLinkAlg)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
deleted file mode 100644
index acf4fe98c84e4579b24e2785f2cfd6475b9c649b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkAlg)
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
index 3df686209d78686dc1a4828bc79e2eeb2213a6ac..d0ecf2c9a1926bbbb23d5ce24e9d171ae22dea9e 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkEv/ALFA_CLinkEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_CLinkEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkEv) {
- DECLARE_ALGORITHM(ALFA_CLinkEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
deleted file mode 100644
index 8c8c268d5f6b4b6c5d522913178703d65285c4f5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
old mode 100755
new mode 100644
index f5ea6e646766809879620e93b4c9906ad1b56e68..69060ffbc072fb86aa4bc793df7967f7d1064e73
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ALFA_Digitization/ALFA_DigiAlg.h"
#include "ALFA_Digitization/ALFA_PileUpTool.h"
@@ -6,8 +5,3 @@
DECLARE_ALGORITHM_FACTORY(ALFA_DigiAlg)
DECLARE_TOOL_FACTORY(ALFA_PileUpTool)
-DECLARE_FACTORY_ENTRIES(ALFA_Digitization)
-{
- DECLARE_ALGORITHM(ALFA_DigiAlg)
- DECLARE_TOOL(ALFA_PileUpTool)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
deleted file mode 100755
index 1629dfcbc85c4ceebb5fdaa21ea69a0d7bcec691..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Digitization)
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
index 4ed8e5907603b58db2e1101b00676549239c0dbd..6376da7e76dfbcf96dc0855da02047b1dd031ae5 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
@@ -20,18 +20,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_GloRecEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_CLinkEventCnv )
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_GloRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_CLinkEventCnv )
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
deleted file mode 100644
index fdc94c2adb57409c7bb2c67938adfdddfd9537ee..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
index 3d240cc0117e4c8ccb513d705fe226c2344d3d1d..236c96135e992dbc5eb7a25d0dd2329efc7e2cc7 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
@@ -6,11 +6,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index f9af3d78cf4a2e1a4aa0fc9fb557a25ef1f00088..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
index 40cba7e8e6e9ff78f6f81d87378823b548e1de18..d263b8d1e14cf3405a68f70eaec5e8be6c58bb45 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
@@ -54,7 +54,6 @@
#include "ALFA_EventTPCnv/ALFA_LocRecCorrODEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ALFA_Hit_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_HitCnv_p1 )
@@ -110,64 +109,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEventCnv_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollection_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-DECLARE_FACTORY_ENTRIES(ALFA_EventTPCnv) {
-
-DECLARE_ALGORITHM( ALFA_Hit_p1 )
-DECLARE_ALGORITHM( ALFA_HitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_Digit_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODHit_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODDigit_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
deleted file mode 100644
index 0ff21e2e9377d0349b90236458dadd78553e8480..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventTPCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
index dce43fadc3cc22369c158d3ae6cf811da6440cf9..5ac67e6da18149fca8e31c795c7bbe3d3fc6329f 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider)
@@ -18,13 +16,3 @@ DECLARE_TOOL_FACTORY( ALFA_Decoder )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h"
DECLARE_TOOL_FACTORY( ALFA_Decoder_charge )
-DECLARE_FACTORY_ENTRIES( ALFA_RawDataByteStreamCnv ) {
-DECLARE_ALGORITHM ( ALFA_RawDataProvider )
-DECLARE_ALGORITHM ( ALFA_RawDataProvider_charge )
-DECLARE_TOOL ( ALFA_RawDataProviderTool )
-DECLARE_TOOL ( ALFA_RawDataProviderTool_charge )
-DECLARE_TOOL ( ALFA_Decoder )
-DECLARE_TOOL ( ALFA_Decoder_charge )
-}
-
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index fa54d7913b2004889555a0617f941c7b3c7b4d71..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_RawDataByteStreamCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
index 43477b1253241fd18080fbdaef2115de6cf5c12b..3addc70f77fdb04ce02856e080307986b047c7db 100644
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
#include "../ALFA_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ALFA_SensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(ALFA_G4_SD) {
- DECLARE_TOOL(ALFA_SensitiveDetectorTool);
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
deleted file mode 100644
index 7046e6766e2d5756f4c235639c1e868073934f8b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_G4_SD)
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 103c3d42fcc34008d32630b54e83fd7227c47d7b..b00ecacc9883049c7b242a9358f4adddbe7d699a
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ALFA_DetectorTool.h"
DECLARE_TOOL_FACTORY(ALFA_DetectorTool)
+
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
index 5f763a8a3c1819791ab9ece03d0074576ff077cf..701c7300ddd748d7d4bd1ef80df69d86b6085be5 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Geometry/ALFA_GeometryReader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ALFA_GeometryReader)
-DECLARE_FACTORY_ENTRIES(ALFA_Geometry) {
- DECLARE_ALGORITHM(ALFA_GeometryReader)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
deleted file mode 100644
index 1309eca148e78c8f94e31a2ed841d1bd735829e4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Geometry)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
index 9c5819c5316907843c0f38843b005f083048ac89..9e30925a2d5995f01221789b32029d0357f17a33 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
@@ -1,10 +1,5 @@
#include "ALFA_Ntuple/ALFA_Ntuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ALFA_Ntuple )
-DECLARE_FACTORY_ENTRIES( ALFA_Ntuple ) {
- DECLARE_ALGORITHM( ALFA_Ntuple )
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
deleted file mode 100644
index 55ecb3c7c48f75307e228bea907b4964f47b6771..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_Ntuple)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
old mode 100755
new mode 100644
index 1765499771369a9a757aa9f192360784bda96a29..e53e081db745a86d49619c12405a78cd4afa76e6
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Raw2Digit/ALFA_Raw2Digit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_Raw2Digit)
-DECLARE_FACTORY_ENTRIES(ALFA_Raw2Digit) {
-DECLARE_ALGORITHM(ALFA_Raw2Digit)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
deleted file mode 100755
index 2dd027214073555712a75b182cf5b9f31e0f96c6..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Raw2Digit)
-
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
index 078b0b60548c2cfc17b7318ea4bb26f07e7b893c..2c78f1d7ec86c02e0440599fe0d159b63561f65f 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_GloRecEv/ALFA_GloRecEvent.h"
#include "ALFA_GloRecEv/ALFA_GloRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_GloRecEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_GloRecODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_GloRecEv) {
-DECLARE_ALGORITHM(ALFA_GloRecEvent)
-DECLARE_ALGORITHM(ALFA_GloRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
deleted file mode 100644
index 1a3ad1820cfeb9b737df07d2668300837744de16..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
index 7ba7b3edbc691735c3334f6881dea243419d9ed7..ffc7e4c208d90b13cc8ba658b74a548426e4322b 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrEvent.h"
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorrEv) {
-DECLARE_ALGORITHM(ALFA_LocRecCorrEvent)
-DECLARE_ALGORITHM(ALFA_LocRecCorrODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
deleted file mode 100644
index 6aceb3a4446a1c2170c9a2b98d93ffeeb57af13a..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorrEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
index 18b74f10d5af217cd449a503e2126febba7aa4ea..6e5b11330ceef987dc703798fa0b10597956c05c 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecEv/ALFA_LocRecEvent.h"
#include "ALFA_LocRecEv/ALFA_LocRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecEv) {
-DECLARE_ALGORITHM(ALFA_LocRecEvent)
-DECLARE_ALGORITHM(ALFA_LocRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
deleted file mode 100644
index 5210dcdfc552605956f4deb7ba956ac44c40a408..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
index d1730066dbd52c51002163af0fae899c63a9f7ae..31bc4ee6962b066eea805f422b9f901e42de110c 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_GloRec/ALFA_GloRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_GloRec)
-DECLARE_FACTORY_ENTRIES(ALFA_GloRec) {
- DECLARE_ALGORITHM (ALFA_GloRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
deleted file mode 100644
index 5042e5e63e30d0265c39f605709dae1b1c9cb10e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRec)
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
index fe8453e3e7bc0e69d0ee5310a1501b562311b8a0..ddbbb0a951c191449f2185159eefa6b43b49256e 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRec/ALFA_LocRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRec)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRec) {
- DECLARE_ALGORITHM (ALFA_LocRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
deleted file mode 100644
index 78ea028d649cf469387f74dc88c7fad6aaee5e76..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRec)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
index fa0ed74b61df1d130f541ec00d71a57df911fb7d..41031b248c423ebae12f06d2807ca98570b1fa8d 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRecCorr/ALFA_LocRecCorr.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorr)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorr) {
- DECLARE_ALGORITHM (ALFA_LocRecCorr)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
deleted file mode 100644
index 141f6ff370a121be95c8d2df12ee160060c4cc44..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorr)
-
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
index b72851e6917dfc3d3b91ae0f4029b9d59358d4a6..da0ca27bad63a0c698b95452d17e4781b5fd0ed1 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
@@ -2,17 +2,9 @@
#include "ALFA_SimEv/ALFA_Hit.h"
#include "ALFA_SimEv/ALFA_ODHitCollection.h"
#include "ALFA_SimEv/ALFA_ODHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_Hit)
DECLARE_ALGORITHM_FACTORY(ALFA_HitCollection)
DECLARE_ALGORITHM_FACTORY(ALFA_ODHit)
DECLARE_ALGORITHM_FACTORY(ALFA_ODHitCollection)
-DECLARE_FACTORY_ENTRIES(ALFA_SimEv) {
-DECLARE_ALGORITHM(ALFA_Hit)
-DECLARE_ALGORITHM(ALFA_HitCollection)
-DECLARE_ALGORITHM(ALFA_ODHit)
-DECLARE_ALGORITHM(ALFA_ODHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
deleted file mode 100644
index 8c459bcba726320cba4d24b6e0ec3d3ba7ae9e2a..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_SimEv)
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 56a1277d683ab27a42438c799938cec3957af5a9..891ab838adf77648c1f137f8c7957dcd8368388b 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcIDDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(ZdcIDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( ForwardIdCnv ) {
- DECLARE_CONVERTER ( ZdcIDDetDescrCnv );
-}
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
deleted file mode 100644
index 5d5b203351fa91a9b7e06c676bb819a0b738e6aa..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ForwardIdCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
old mode 100755
new mode 100644
index 800a8383cc3045208143b0dc4ac493dcae03bfbc..1f597ddd1c34e498471f64deb202a1b163dbf88d
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ForwardRegionGeoModelTool.h"
DECLARE_TOOL_FACTORY(ForwardRegionGeoModelTool)
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
index 3ddf0598b7020f99431b85f6b6924d22c695cded..5bbd79dc61b1f43481e75309000b78f6ab6bcb6a 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
@@ -1,5 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardRegionFieldSvc.h"
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField, ForwardRegionFieldSvc )
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
index 28d734a21fd64c80d98c4feae8f51109786f8136..56d1d2046cb144fee38eceafebef8043c32fd0fe 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
@@ -1,8 +1,4 @@
#include "ForwardRegionProperties/ForwardRegionProperties.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ForwardRegionProperties)
-DECLARE_FACTORY_ENTRIES(ForwardRegionProperties) {
- DECLARE_TOOL (ForwardRegionProperties)
-}
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
deleted file mode 100644
index 72b310a56bad8b75ad619efde734898f60312139..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegionProperties)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
index 88a6bc2e7a7b4cbe4a729d0151d5db560a6daaa1..16f6435edb4c345537a4f76d52fcc105e83b51e1 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
@@ -2,7 +2,3 @@
DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
deleted file mode 100644
index 96701a706909cb0152e685d0237424de854c325b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
index 88a6bc2e7a7b4cbe4a729d0151d5db560a6daaa1..16f6435edb4c345537a4f76d52fcc105e83b51e1 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
@@ -2,7 +2,3 @@
DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
deleted file mode 100644
index c9d5f712bf8ea46d5455148427ab38f0612514aa..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitCollectionAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
index 7a38ce6151cc8b68b6f9cf2e78e80dc269f367c7..010cba068ee5b352b8af4484647d1521c30c4232 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
@@ -3,18 +3,9 @@
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollection_p1.h"
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SimulationHit_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCnv_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollection_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollectionCnv_p1 )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventTPCnv) {
-
- DECLARE_ALGORITHM( SimulationHit_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCnv_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollection_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollectionCnv_p1 )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
deleted file mode 100644
index 1c975e468a7032fca079b95a2e579c8d7e6ba132..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ForwardRegion_EventTPCnv)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
index 493189cb760193d7f721c680a70df8319af90063..e6abdc58d0679016fd2685ceafcb7798f6d05aa8 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
@@ -1,12 +1,6 @@
#include "ForwardRegion_SimEv/SimulationHitCollection.h"
#include "ForwardRegion_SimEv/SimulationHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(SimulationHit)
DECLARE_ALGORITHM_FACTORY(SimulationHitCollection)
-DECLARE_FACTORY_ENTRIES(ForwardRegion_SimEv) {
- DECLARE_ALGORITHM(SimulationHit)
- DECLARE_ALGORITHM(SimulationHitCollection)
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
deleted file mode 100644
index 35f50691f0a496de160fc981cbdea35c2bd7e8b4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegion_SimEv)
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
index d2bb6f27606bb48e7b4ad21a8d8386c28d70cc6a..affd320a0cfb9cf1868278455dc8673771cba35a 100644
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
+++ b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardTransportModelTool.h"
DECLARE_TOOL_FACTORY( ForwardTransportModelTool )
-DECLARE_FACTORY_ENTRIES( ForwardTransport ) {
- DECLARE_TOOL( ForwardTransportModelTool )
-}
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
deleted file mode 100644
index b65f64dee1b6de62e3a83013fea16961ac589f78..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( ForwardTransport )
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
index 7116f2271764508094ceef2dc3435343632c63f6..d8e79953d4e6fd1670da008d6397c693bf070389 100644
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
+++ b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ForwardTransportFast/ForwardTransportFast.h"
DECLARE_ALGORITHM_FACTORY( ForwardTransportFast )
-DECLARE_FACTORY_ENTRIES( ForwardTransportFast ) {
- DECLARE_ALGORITHM( ForwardTransportFast )
-}
-
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
deleted file mode 100644
index 85b5acb7cfa45093c45f1cd35494babe2fbb2a05..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ForwardTransportFast )
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
old mode 100755
new mode 100644
index edcd20d31c0f8e29050dabb24a9c33fd667d4584..deec131c08c265d97fcb650b5fb4f71fc9a91e0e
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
+++ b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
@@ -1,9 +1,4 @@
#include "../ForwardTransportSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(ForwardTransportSvc)
-DECLARE_FACTORY_ENTRIES(ForwardTransportSvc) {
- DECLARE_SERVICE ( ForwardTransportSvc )
-}
-
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
deleted file mode 100755
index 06c6bf686fac96fd49ad20bb5573798a167b7007..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardTransportSvc)
-
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
index 0abda3d71f967e634dfab127847dd1c26b27b49f..15f50575e9e18a245187e3efb8364649f5296b38 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_RawDataByteStreamCnv/LUCID_ByteStreamRawDataCnv.h"
DECLARE_ALGORITHM_FACTORY ( LUCID_ByteStreamRawDataCnv )
@@ -9,8 +7,3 @@ DECLARE_ALGORITHM_FACTORY ( LUCID_DigitRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY ( LUCID_DigitByteStreamCnv )
-DECLARE_FACTORY_ENTRIES( LUCID_RawDataByteStreamCnv ) {
- DECLARE_ALGORITHM ( LUCID_ByteStreamRawDataCnv )
- DECLARE_ALGORITHM ( LUCID_DigitRawDataCnv )
- DECLARE_CONVERTER ( LUCID_DigitByteStreamCnv )
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 19522f12a3a6abb98af93c37a8fd4b4d35094489..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES ( LUCID_RawDataByteStreamCnv )
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
index 570952a908ec7c393f8996a387022d11b2beaa2c..8f82570f7d21df0c983aa2a5c78069d006261849 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../LUCID_Digitization.h"
#include "../LUCID_PileUpTool.h"
@@ -6,9 +5,4 @@
DECLARE_ALGORITHM_FACTORY( LUCID_DigiTop )
DECLARE_TOOL_FACTORY( LUCID_PileUpTool )
-DECLARE_FACTORY_ENTRIES(LUCID_Digitization) {
- DECLARE_ALGORITHM(LUCID_DigiTop)
- DECLARE_ALGTOOL(LUCID_PileUpTool)
-
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
deleted file mode 100644
index f5a77b63552b13ed1598631859df65a896567440..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Digitization)
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
index a0caf13f3be1819a1fc98cee18eeac396cfb6d42..42524996f88b97a6a47200dbccfa0357bf92e561 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
@@ -1,8 +1,4 @@
#include "../LUCID_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(LUCID_SensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(LUCID_G4_SD) {
- DECLARE_TOOL(LUCID_SensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
deleted file mode 100644
index e384ef3e7acbe2b3307964aeb29bd7920ccb7fe5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(LUCID_G4_SD)
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 77cfd83493d26ea3de17f089fbdc6af488c5763d..70751bacfa9df5d111317571315854474956c240
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../LUCID_DetectorTool.h"
DECLARE_TOOL_FACTORY(LUCID_DetectorTool)
+
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
old mode 100755
new mode 100644
index 632c254592764d943ac3068ebb2d781b3084f825..6ed27c9c003ab3c90edb7db2bebcd761dba1e240
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
@@ -1,9 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_Monitoring/LUCID_HitsMoniTool.h"
DECLARE_TOOL_FACTORY(LUCID_HitsMoniTool)
-DECLARE_FACTORY_ENTRIES(LUCID_Monitoring) {
- DECLARE_ALGTOOL(LUCID_HitsMoniTool);
-}
-
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
deleted file mode 100755
index 4128a7603854fd55151c6487c428272e10cd0b94..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Monitoring)
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
index 214a43812d3bde0b64e7e47c7f78983c52bab899..20fc7ae00ffbe528dfe2020c3e9e16385b77f8be 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LucidPhysicsTool.h"
DECLARE_TOOL_FACTORY( LucidPhysicsTool )
-DECLARE_FACTORY_ENTRIES( LUCID_OpProcess ) {
- DECLARE_TOOL( LucidPhysicsTool )
-
-}
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
deleted file mode 100644
index 2753400e6b49bc91f3fd3f4a4ee83d58113e1728..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LUCID_OpProcess )
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
index 9351a1fddd08cb80e5a6ba4bae83f97d28154bc5..bcc6aec7d96213dca597cfd33c2749a658cc222e 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
@@ -1,3 +1,4 @@
#include "../ZDC_DetTool.h"
DECLARE_TOOL_FACTORY(ZDC_DetTool)
+
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
index 0a80f51dfcc0f58fbc8ee3453d8858da7bb8b9ae..dabf8912e7eb6ec63dca685aa45cef3bc4109692 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ZDC_PixelSDTool.h"
#include "../ZDC_StripSDTool.h"
DECLARE_TOOL_FACTORY( ZDC_PixelSDTool )
DECLARE_TOOL_FACTORY( ZDC_StripSDTool )
-DECLARE_FACTORY_ENTRIES( ZDC_SD ){
- DECLARE_TOOL( ZDC_PixelSDTool );
- DECLARE_TOOL( ZDC_StripSDTool );
-}
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
deleted file mode 100644
index 1c865a97f78463de2368104fcf3aad55d3b1f943..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SD)
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
index ec2e7c4ec2af530fe73ad4ed96937ea339feb2c3..6d8873ed6de045968ca4c0357cb17b5f62277441 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZDC_SimuDigitization/ZDC_DigiTop.h"
#include "ZDC_SimuDigitization/ZDC_PileUpTool.h"
@@ -6,9 +5,3 @@ DECLARE_ALGORITHM_FACTORY(ZDC_DigiTop)
DECLARE_TOOL_FACTORY( ZDC_PileUpTool )
-DECLARE_FACTORY_ENTRIES (ZDC_SimuDigitization)
-{
- DECLARE_ALGORITHM(ZDC_DigiTop)
- DECLARE_TOOL( ZDC_PileUpTool )
-}
-
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
deleted file mode 100644
index 0263473c4db932bd04fa833742879bd98175bdf0..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SimuDigitization)
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
index ff4c36e6867dd3a5e7f81a0cb2c72a5cd3820e3a..aadd419870397983739a3fb5ccf124ba19069c06 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
@@ -1,16 +1,9 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#ifndef XAOD_STANDALONE
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcAnalysis/ZdcAnalysisTool.h"
DECLARE_TOOL_FACTORY (ZDC::ZdcAnalysisTool)
-DECLARE_FACTORY_ENTRIES (ZdcAnalysis) {
- DECLARE_TOOL (ZDC::ZdcAnalysisTool)
-}
#endif
+
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
index 8136e4b66f1821746ee7a83383f7274ae5202707..10a0c8ad477c59326e17df4c17ed44cca422e24a 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcByteStream/ZdcByteStreamCnv.h"
#include "ZdcByteStream/ZdcByteStreamTool.h"
#include "ZdcByteStream/ZdcDataAccessV2.h"
@@ -25,14 +23,3 @@ DECLARE_ALGORITHM_FACTORY (ZdcByteStreamTester)
DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawData)
DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawDataV2)
-DECLARE_FACTORY_ENTRIES (ZdcByteStream) {
- DECLARE_CONVERTER (ZdcByteStreamCnv)
- DECLARE_TOOL (ZdcByteStreamTool)
- DECLARE_TOOL (ZdcByteStreamReadV1V2Tool)
- DECLARE_TOOL (ZdcL1CaloErrorByteStreamTool)
- DECLARE_TOOL (ZdcDataAccessV2)
- DECLARE_ALGORITHM (ZdcByteStreamTester)
- DECLARE_ALGORITHM (ZdcByteStreamRawData)
- DECLARE_ALGORITHM (ZdcByteStreamRawDataV2)
-}
-
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
deleted file mode 100644
index d56f4874854fa181af8423de39bcac09f3bdd4e8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcByteStream)
-
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
index 8498383ce6dd81c1f898fd57a6daaf0feade3440..a016c68e141162e519fbce99a6d6913699814e75 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcRec/ZdcRec.h"
#include "ZdcRec/ZdcRecV2.h"
#include "ZdcRec/ZdcRecV3.h"
@@ -15,12 +13,3 @@ DECLARE_TOOL_FACTORY (ZdcRecChannelTool)
DECLARE_TOOL_FACTORY (ZdcRecChannelToolV2)
DECLARE_TOOL_FACTORY (ZdcRecNoiseTool)
-DECLARE_FACTORY_ENTRIES (ZdcRec) {
- DECLARE_TOOL (ZdcRecChannelTool)
- DECLARE_TOOL (ZdcRecChannelToolV2)
- DECLARE_TOOL (ZdcRecNoiseTool)
- DECLARE_ALGORITHM (ZdcRec)
- DECLARE_ALGORITHM (ZdcRecV2)
- DECLARE_ALGORITHM (ZdcRecV3)
-}
-
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
deleted file mode 100644
index ba0976fe9b45fa8b1741535300bf8e3273df76bb..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcRec)
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
index fa0f327bb63251f6dc3cc9d054d41bf6d64ff3f8..3125915a1fbcb5113695b5415d28680298aa0f20 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
@@ -1,11 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
DECLARE_SERVICE_FACTORY( ByteStreamEmonInputSvc )
-DECLARE_FACTORY_ENTRIES( ByteStreamEmonSvc ) {
- DECLARE_SERVICE ( ByteStreamEmonInputSvc )
-}
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
deleted file mode 100644
index e9c746b820581ae9142784a538aeb50c8588fc08..0000000000000000000000000000000000000000
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ByteStreamEmonSvc )
-
-
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
old mode 100755
new mode 100644
index b4011fd41ea6a3acdd5709ed306478330a711b35..5d3673d0a98b2f6f9a020e1ee1399438d6273612
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
@@ -1,11 +1,6 @@
#include "TrigExL2muCalibTest/L2muCalibTest.h"
#include "TrigExL2muCalibTest/TrigPartialEBFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( L2muCalibTest )
DECLARE_ALGORITHM_FACTORY( TrigPartialEBFilter )
-DECLARE_FACTORY_ENTRIES(TrigExL2muCalibTest) {
- DECLARE_ALGORITHM( L2muCalibTest );
- DECLARE_ALGORITHM( TrigPartialEBFilter );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
deleted file mode 100755
index bf06fa07714af59e66cd5365ebf284fccca80987..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExL2muCalibTest)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 5d34ad59de639e41c93c281f3ddd9678d94908bf..d640228f125331803e0500417e83be5efc59ae69
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorld/MTHelloWorld.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHelloWorld )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorld) {
- DECLARE_ALGORITHM( MTHelloWorld );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
deleted file mode 100755
index ac59b3791827570c7a5ef068804ae1945961724a..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorld)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
old mode 100755
new mode 100644
index 8ee95c20f06cd683b3ed260bd685b4186af110c8..56f6895d0d83f16c3444a28bf70cb3af81638164
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorldLvl1/MTHelloWorldLvl1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHelloWorldLvl1 )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1) {
- DECLARE_ALGORITHM( MTHelloWorldLvl1 );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
deleted file mode 100755
index 2050e7fbde0ef77b9af99f38f3bdec32847ea1da..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
old mode 100755
new mode 100644
index 9895055aa01f103790eaaf157dfdc6239ac94925..fdc36b7183145b5f2a4f0e45a81e69767873b5b8
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
@@ -1,14 +1,8 @@
#include "TrigExMTHistNtup/MTHist.h"
#include "TrigExMTHistNtup/MTNtup.h"
#include "TrigExMTHistNtup/MTTHist.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHist )
DECLARE_ALGORITHM_FACTORY( MTNtup )
DECLARE_ALGORITHM_FACTORY( MTTHist )
-DECLARE_FACTORY_ENTRIES(TrigExMTHistNtup) {
- DECLARE_ALGORITHM( MTHist );
- DECLARE_ALGORITHM( MTNtup );
- DECLARE_ALGORITHM( MTTHist );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
deleted file mode 100755
index 014527fcb7f8c43ed24424fd8e3d1777ec65e0eb..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHistNtup)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
old mode 100755
new mode 100644
index 7455949fcf5f06817603c68dbd56111ed9970112..5f5c3b201021cc61fb9d8ac4cdf3a11bdae7e956
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigExPartialEB/MTCalibPeb.h"
DECLARE_ALGORITHM_FACTORY( MTCalibPeb )
-DECLARE_FACTORY_ENTRIES(TrigExPartialEB) {
- DECLARE_ALGORITHM( MTCalibPeb )
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
deleted file mode 100755
index 2b23ed31f0529c2a5bffdddec98f73853f12d696..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExPartialEB)
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
index cde6e20dfa01b4fc2977e3933611f30aa7703339..a20b96713c6686188161a33a6fd499a009ccf52c 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigServices/TrigMessageSvc.h"
#include "../TrigMonTHistSvc.h"
#include "TrigServices/HltEventLoopMgr.h"
@@ -17,14 +16,3 @@ DECLARE_TOOL_FACTORY( TrigISHelper )
DECLARE_TOOL_FACTORY( TrigPreFlightCheck )
DECLARE_TOOL_FACTORY( TrigCOOLUpdateHelper )
-
-DECLARE_FACTORY_ENTRIES( TrigServices ) {
- DECLARE_SERVICE( TrigMessageSvc );
- DECLARE_SERVICE( TrigMonTHistSvc );
- DECLARE_SERVICE( TrigIS );
- DECLARE_SERVICE( HltEventLoopMgr );
- DECLARE_SERVICE( HltROBDataProviderSvc );
- DECLARE_TOOL( TrigISHelper );
- DECLARE_TOOL( TrigPreFlightCheck );
- DECLARE_TOOL( TrigCOOLUpdateHelper );
-}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
deleted file mode 100644
index 0e7b58ee4de342f6381f709065d8155ae555f1b3..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrigServices )
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
index f9201f2fd9d83f2db1668c172898128861463222..97ce6fab731857fac3b41b9fad85d681083e6783 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigOnlineMonitor/TrigROBMonitor.h"
#include "TrigOnlineMonitor/TrigMuCTPiROBMonitor.h"
#include "src/TrigALFAROBMonitor.h"
@@ -9,9 +8,3 @@ DECLARE_ALGORITHM_FACTORY( TrigMuCTPiROBMonitor )
DECLARE_ALGORITHM_FACTORY( TrigALFAROBMonitor )
DECLARE_ALGORITHM_FACTORY( TrigL1TopoROBMonitor )
-DECLARE_FACTORY_ENTRIES(TrigOnlineMonitor) {
- DECLARE_ALGORITHM( TrigROBMonitor )
- DECLARE_ALGORITHM( TrigMuCTPiROBMonitor )
- DECLARE_ALGORITHM( TrigALFAROBMonitor )
- DECLARE_ALGORITHM( TrigL1TopoROBMonitor )
-}
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
deleted file mode 100644
index 1ba3f653356808e0ce14c9332a092b86c2604b8c..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigOnlineMonitor)
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
index 0f9873e8865436402e3e9fa775c53b6787c4f729..984ab30cb5c1bffe13e4fa43dbe6d8d7f18475ba 100644
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
+++ b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LumiBlockComps/CreateLumiBlockCollectionFromFile.h"
//#include "LumiBlockComps/CreateAANTFromLumiBlockCollection.h"
#include "LumiBlockComps/LumiBlockMetaDataTool.h"
@@ -28,19 +27,3 @@ DECLARE_TOOL_FACTORY( LumiBlockMetaDataTool )
#include "../xAOD2NtupLumiSvc.h"
DECLARE_SERVICE_FACTORY( xAOD2NtupLumiSvc )
-DECLARE_FACTORY_ENTRIES(LumiBlockComps) {
- DECLARE_ALGORITHM( CreateLumiBlockCollectionFromFile );
- // DECLARE_ALGORITHM( CreateAANTFromLumiBlockCollection );
- DECLARE_ALGTOOL( LumiBlockMetaDataTool);
- DECLARE_SERVICE( xAOD2NtupLumiSvc );
-
-#ifndef XAOD_ANALYSIS
- DECLARE_ALGORITHM( LumiBlockMuWriter );
- DECLARE_ALGORITHM( LumiBlockTester );
- DECLARE_ALGTOOL( LumiBlockMuTool);
- DECLARE_ALGTOOL( LuminosityTool);
- DECLARE_ALGTOOL( TrigLivefractionTool);
- DECLARE_SERVICE( LumiCalcSvc );
-#endif
-}
-
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
deleted file mode 100644
index d63dc04f581b65f99466e5e48d1eab12fb4a4af3..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LumiBlockComps)
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
index 0df26cdfe474da034eeb719fad77a8ef91c7445f..f60805156971144c01de8af1b6d36728b2c867aa 100644
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
+++ b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldServices/AtlasFieldSvc.h"
#include "MagFieldServices/H8FieldSvc.h"
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , AtlasFieldSvc )
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , H8FieldSvc )
-DECLARE_FACTORY_ENTRIES( MagFieldServices ) {
- DECLARE_NAMESPACE_SERVICE( MagField , AtlasFieldSvc )
- DECLARE_NAMESPACE_SERVICE( MagField , H8FieldSvc )
-}
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
deleted file mode 100644
index 014766ae5231cfd939efd8c8057d233e5bcb569c..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldServices )
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
index a7386487a70b91a56c8d529c8cfc9cc92148ff8e..7423a4f612a7048502b4dbb22e1f6fcccc6b6f7a 100644
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
+++ b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldUtils/MagFieldTestbedAlg.h"
#include "MagFieldUtils/SolenoidTest.h"
#include "MagFieldUtils/IdentityManipulator.h"
@@ -7,8 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , MagFieldTestbedAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , SolenoidTest )
DECLARE_NAMESPACE_TOOL_FACTORY( MagField , IdentityManipulator )
-DECLARE_FACTORY_ENTRIES( MagFieldUtils ) {
- DECLARE_NAMESPACE_ALGORITHM( MagField , MagFieldTestbedAlg )
- DECLARE_NAMESPACE_ALGORITHM( MagField , SolenoidTest )
- DECLARE_NAMESPACE_TOOL( MagField , IdentityManipulator )
-}
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
deleted file mode 100644
index 5b3493ffa1cfac4b9b10dfbd413afd12d6c2f305..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldUtils )
-
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
index 06c86f4e0bdd314546730a50be5374a849798620..d5d368981b18ba73541018ef17a1b05e376c3f8c 100644
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
+++ b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
@@ -1,9 +1,5 @@
#include "OffloadSvc/OffloadSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( OffloadSvc )
-DECLARE_FACTORY_ENTRIES( OffloadSvc ) {
- DECLARE_SERVICE( OffloadSvc )
-}
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
deleted file mode 100644
index 623ff1d7aefe486ea5596f25d28c64698db5df7e..0000000000000000000000000000000000000000
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OffloadSvc)
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
old mode 100755
new mode 100644
index 996a047990727a5a7240077c609bae01410616da..89a53c727c7b9d5825e0e47bdcd3b49df7eecb55
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
+++ b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCaloGeometry/TBCaloCoordinate.h"
DECLARE_TOOL_FACTORY( TBCaloCoordinate )
-DECLARE_FACTORY_ENTRIES ( TBCaloGeometry ) {
- DECLARE_TOOL( TBCaloCoordinate )
-}
-
-
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
deleted file mode 100755
index 7178221997ce525457c07d2f512e5a05e4d9bb23..0000000000000000000000000000000000000000
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCaloGeometry )
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
index 0d4e523f8a20d3a950dc833175182b3916b5fc46..1b685183bee4eb8d9d38aa52a4996a102c3557c1 100644
--- a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
+++ b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBCnv/TBDataCnv.h"
#include "TBCnv/TBByteStreamCnvTool.h"
#include "TBCnv/ReadTBLArDigits.h"
@@ -45,19 +43,3 @@ DECLARE_ALGORITHM_FACTORY( ReadTBLArCalibDigits )
DECLARE_ALGORITHM_FACTORY( TBCheckBCIDs )
-DECLARE_FACTORY_ENTRIES( TBCnv ) {
- DECLARE_TOOL( TBByteStreamCnvTool )
- DECLARE_CONVERTER( TBTDCCnv )
- DECLARE_CONVERTER( TBTDCRawContCnv )
- DECLARE_CONVERTER( TBLArDigitContainerCnv )
- DECLARE_CONVERTER( TBLArCalibDigitContainerCnv )
- DECLARE_CONVERTER( TBADCRawContCnv )
- DECLARE_CONVERTER( TBBPCRawContCnv )
- DECLARE_CONVERTER( TBScintillatorRawContCnv )
- DECLARE_CONVERTER( TBTriggerPatternUnitCnv )
- DECLARE_CONVERTER( TBTailCatcherRawCnv )
- DECLARE_CONVERTER( TBEventInfoCnv )
- DECLARE_ALGORITHM( ReadTBLArDigits )
- DECLARE_ALGORITHM( ReadTBLArCalibDigits )
- DECLARE_ALGORITHM( TBCheckBCIDs )
-}
diff --git a/TestBeam/TBCnv/src/components/TBCnv_load.cxx b/TestBeam/TBCnv/src/components/TBCnv_load.cxx
deleted file mode 100644
index 9ed0e0b3c326542f381a0f373013f76f2738ea58..0000000000000000000000000000000000000000
--- a/TestBeam/TBCnv/src/components/TBCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCnv)
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
old mode 100755
new mode 100644
index 24a9975504d0bd2986a05e01e015ba0bc6861ef5..edd669498cd775643cfe2429e7e49ddcc2fea7a4
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
@@ -1,13 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Tool
#include "../TBCaloPosTool.h"
#include "../TBCaloCoolPosTool.h"
DECLARE_TOOL_FACTORY( TBCaloPosTool )
DECLARE_TOOL_FACTORY( TBCaloCoolPosTool )
-DECLARE_FACTORY_ENTRIES(TBCaloConditions) {
- DECLARE_TOOL ( TBCaloPosTool )
- DECLARE_TOOL ( TBCaloCoolPosTool )
-}
-
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
deleted file mode 100755
index 7df8173324f9b3a464c4fb5f54037a3e525a360e..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCaloConditions)
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
old mode 100755
new mode 100644
index e07e8e0c92d958624057bb8108685a7ca5c99ae1..ee72e1c097a0247d07c1a6a47f0eb80db10d33da
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
+++ b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCondRunPar/TBCondRunParTool.h"
DECLARE_TOOL_FACTORY( TBCondRunParTool )
-DECLARE_FACTORY_ENTRIES( TBCondRunPar )
-{
- DECLARE_TOOL( TBCondRunParTool )
-}
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
deleted file mode 100755
index f6e529a4058711b7f0a27bcd92d612d0b12c5f76..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCondRunPar )
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
old mode 100755
new mode 100644
index 32c854e0617218d5bdb6bd55d67b8aaf779b0ecb..fa95bc5dec38a5846ba78df256833693695adee1
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
+++ b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
@@ -1,9 +1,5 @@
#include "TBDetDescrAlg/TBDetDescrLoader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TBDetDescrLoader )
-DECLARE_FACTORY_ENTRIES(TBDetDescrAlg) {
- DECLARE_ALGORITHM( TBDetDescrLoader )
-}
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
deleted file mode 100755
index 9a1357b73f0671aef0e87dce136636416c33f74f..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBDetDescrAlg)
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 202160b08f2056e212bbd1c4bf1beb8cd9bdaef6..76f0282c5b0871739781aeb0deade6e3d456d92b
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBDetDescrCnv/TBDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(TBDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( TBDetDescrCnv ) {
- DECLARE_CONVERTER ( TBDetDescrCnv );
-}
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
deleted file mode 100755
index c581626d7325816a0c9ea30adf5cdeed551ca395..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBDetDescrCnv )
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
old mode 100755
new mode 100644
index f28646be713934a0470ccc01d82eee14808a3c1f..dc42f8393ddb96266cb0741865022fb1a4b6f3c2
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
+++ b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
@@ -1,5 +1,3 @@
-
-
#include "TBMonitoring/TBBPCMonTool.h"
#include "TBMonitoring/TBMWPCMonTool.h"
#include "TBMonitoring/TBPhaseMonTool.h"
@@ -11,7 +9,6 @@
#include "TBMonitoring/TBCaloResponseMonTool.h"
#include "TBMonitoring/TBBeamQualityDoubleHitsMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(TBBPCMonTool)
@@ -25,15 +22,3 @@ DECLARE_TOOL_FACTORY(TBADCRawMonTool)
DECLARE_TOOL_FACTORY(TBCaloResponseMonTool)
DECLARE_TOOL_FACTORY(TBBeamQualityDoubleHitsMonTool)
-DECLARE_FACTORY_ENTRIES(TBMonitoring) {
- DECLARE_ALGTOOL(TBBPCMonTool)
- DECLARE_ALGTOOL(TBMWPCMonTool)
- DECLARE_ALGTOOL(TBPhaseMonTool)
- DECLARE_ALGTOOL(TBScintillatorMonTool)
- DECLARE_ALGTOOL(TBTailCatcherRawMonTool)
- DECLARE_ALGTOOL(TBTriggerPatternUnitMonTool)
- DECLARE_ALGTOOL(TBTDCRawMonTool)
- DECLARE_ALGTOOL(TBADCRawMonTool)
- DECLARE_ALGTOOL(TBCaloResponseMonTool)
- DECLARE_ALGTOOL(TBBeamQualityDoubleHitsMonTool)
-}
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
deleted file mode 100755
index 623ee234bfb468860153b5b3b68e08840c112c56..0000000000000000000000000000000000000000
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBMonitoring)
diff --git a/TestBeam/TBRec/src/components/TBRec_entries.cxx b/TestBeam/TBRec/src/components/TBRec_entries.cxx
old mode 100755
new mode 100644
index 1cc3aa758fd71dec1366cb6a36ed2693ddab7979..1c368c9837c955c42e3641262eccd873ce331f59
--- a/TestBeam/TBRec/src/components/TBRec_entries.cxx
+++ b/TestBeam/TBRec/src/components/TBRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBRec/TBAlgoSequencer.h"
#include "TBRec/TBXMLWriter.h"
@@ -104,52 +102,3 @@ DECLARE_TOOL_FACTORY( TBEMECXTalkToyModel )
DECLARE_TOOL_FACTORY( TBExtrapolTrackToCaloTool )
-DECLARE_FACTORY_ENTRIES( TBRec ) {
- DECLARE_ALGORITHM( TBXMLWriter )
- DECLARE_ALGORITHM( TBAlgoSequencer )
- DECLARE_ALGORITHM( TBBPCRec )
- DECLARE_ALGORITHM( TBMWPCRec )
- DECLARE_ALGORITHM( TBScintillatorRec )
- DECLARE_ALGORITHM( TBTailCatcherRec )
- DECLARE_ALGORITHM( TBPlaneTrackingAlgo )
- DECLARE_ALGORITHM( TBPhaseRec )
- DECLARE_ALGORITHM( TBLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBECLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBEventStreamer )
- DECLARE_ALGORITHM( CBNTAA_BeamInstrumentation )
- DECLARE_ALGORITHM( CBNTAA_TBADCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBTDCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBInfo )
- DECLARE_ALGORITHM( CBNTAA_TBTrack )
- DECLARE_ALGORITHM( CBNTAA_TBScint )
- DECLARE_ALGORITHM( CBNT_Timing )
- DECLARE_ALGORITHM( CBNT_CaloH6 )
- DECLARE_ALGORITHM( CBNT_UpstreamMat )
- DECLARE_ALGORITHM( TBPartIDCherenkovMuTag )
- DECLARE_ALGORITHM( TBBeamQuality )
- DECLARE_ALGORITHM( TBTree_CaloClusterH6 )
- DECLARE_ALGORITHM( TBNoiseWrite )
- DECLARE_ALGORITHM( TBBeamQualityMC )
- DECLARE_ALGORITHM( TBXCryYTableRead )
- DECLARE_ALGORITHM( TBDMContainerSplitter )
- DECLARE_ALGORITHM( CBNTAA_TBTPValidation )
- DECLARE_ALGORITHM( TBTrackInfoFromTag )
- DECLARE_ALGORITHM( TBTrackToCaloAlg )
- DECLARE_TOOL( TBXMLEventWriterTool )
- DECLARE_TOOL( TBXMLCaloCellWriterTool )
- DECLARE_TOOL( TBPatternUnitStreamerTool )
- DECLARE_TOOL( TBPatternUnitStreamerToolH8 )
- DECLARE_TOOL( TBEventInfoStreamerTool )
- DECLARE_TOOL( TBPreScalerStreamerTool )
- DECLARE_TOOL( TBBeamQualityDoubleHitsTool )
- DECLARE_TOOL( TBBeamQualityMuonToolH6 )
- DECLARE_TOOL( TBBeamQualityEMFractionTool )
- DECLARE_TOOL( TBBeamQualityTrackingTool )
- DECLARE_TOOL( TBPhaseStreamerTool )
- DECLARE_TOOL( TBEMECCellEtaCorrection )
- DECLARE_TOOL( TBClusterMaker )
- DECLARE_TOOL( TBCellNoiseCorrection )
- DECLARE_TOOL( TBCellContainerFillerTool )
- DECLARE_TOOL( TBEMECXTalkToyModel )
- DECLARE_TOOL( TBExtrapolTrackToCaloTool )
-}
diff --git a/TestBeam/TBRec/src/components/TBRec_load.cxx b/TestBeam/TBRec/src/components/TBRec_load.cxx
deleted file mode 100755
index a017f5d2d436df2a929f2e4a91e0b2e3694cc1d7..0000000000000000000000000000000000000000
--- a/TestBeam/TBRec/src/components/TBRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBRec)
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 69b515ac8c509b3ffee96247f71cbe38a7f5bcb9..78973664d58c734b174678bbaf676f2335d391c0
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
+++ b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
@@ -1,12 +1,7 @@
#include "../HelloAlg.h"
#include "../HelloTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( HelloAlg )
DECLARE_TOOL_FACTORY( HelloTool )
-DECLARE_FACTORY_ENTRIES(AthExHelloWorld) {
- DECLARE_ALGORITHM( HelloAlg )
- DECLARE_TOOL( HelloTool )
-}
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
deleted file mode 100755
index b4329e73aea5902970b0077a7e657691e665db47..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthExHelloWorld)
-
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
index 29de337628d0a0d9077d0e6a61a301e9773c5a72..73b1c60846f415d9060a4727c4acf9b07aaaf972 100644
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
+++ b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
@@ -1,9 +1,5 @@
#include "../ValgrindHelperAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ValgrindHelperAlg )
-DECLARE_FACTORY_ENTRIES( ValgrindRTTJobs ) {
- DECLARE_ALGORITHM( ValgrindHelperAlg ) ;
-}
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
deleted file mode 100644
index 47092cf57541556e4b74337d3eb5b73aad424a47..0000000000000000000000000000000000000000
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ValgrindRTTJobs)
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
index 8bb72a9eee1ae4e1e80720e76aa18f5ff73f20d9..ea62ba2b71f25181afbab5ee8a3ad6e46d372333 100644
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
+++ b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "EventDisplayFilters/FilterUsingMBTS.h"
#include "EventDisplayFilters/FilterUsingMBTSTiming.h"
#include "EventDisplayFilters/FilterUsingSpacePoints.h"
DECLARE_ALGORITHM_FACTORY( FilterUsingMBTS )
DECLARE_ALGORITHM_FACTORY( FilterUsingMBTSTiming )
DECLARE_ALGORITHM_FACTORY( FilterUsingSpacePoints )
-DECLARE_FACTORY_ENTRIES( EventDisplayFilters ) {
- DECLARE_ALGORITHM( FilterUsingMBTSTiming )
- DECLARE_ALGORITHM( FilterUsingSpacePoints )
-}
+
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
deleted file mode 100644
index c83aa3a0c56678ae8b3726be0479f7510a17e310..0000000000000000000000000000000000000000
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(EventDisplayFilters)
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
old mode 100755
new mode 100644
index 47a2075ad8d121dab1372bc3401ec8b9d402cd6c..6e8448a951df1e6e78a8515a2bdfb435dda21989
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
+++ b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
@@ -1,13 +1,8 @@
#include "GeometryJiveXML/GeometryWriter.h"
#include "GeometryJiveXML/MuonGeometryWriter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
DECLARE_TOOL_FACTORY(GeometryWriter)
DECLARE_TOOL_FACTORY(MuonGeometryWriter)
-DECLARE_FACTORY_ENTRIES(GeometryJiveXML) {
- DECLARE_ALGTOOL(GeometryWriter)
- DECLARE_ALGTOOL(MuonGeometryWriter)
-}
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
deleted file mode 100755
index 0552edae8871d36840bf2200f1d5b54cf0edf1e4..0000000000000000000000000000000000000000
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryJiveXML)
diff --git a/graphics/JiveXML/src/components/JiveXML_entries.cxx b/graphics/JiveXML/src/components/JiveXML_entries.cxx
old mode 100755
new mode 100644
index 9eb325bf0acfdf5b0452393bbaafa481b1890de5..2ff8b52f1a6f6c98510901c36a9ebf2362e9687c
--- a/graphics/JiveXML/src/components/JiveXML_entries.cxx
+++ b/graphics/JiveXML/src/components/JiveXML_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JiveXML/AlgoJiveXML.h"
#include "JiveXML/StreamToFileTool.h"
#include "JiveXML/StreamToServerTool.h"
@@ -17,14 +16,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToServerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , XMLFormatTool )
#endif
-DECLARE_FACTORY_ENTRIES( JiveXML ) {
- DECLARE_NAMESPACE_ALGORITHM( JiveXML , AlgoJiveXML)
- DECLARE_NAMESPACE_SERVICE( JiveXML, ONCRPCServerSvc )
- DECLARE_NAMESPACE_SERVICE( JiveXML, ExternalONCRPCServerSvc )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToFileTool )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToServerTool )
-#ifndef __APPLE__
- DECLARE_NAMESPACE_TOOL ( JiveXML , XMLFormatTool )
-#endif
-}
-
diff --git a/graphics/JiveXML/src/components/JiveXML_load.cxx b/graphics/JiveXML/src/components/JiveXML_load.cxx
deleted file mode 100755
index 15d999fc278da09b97f157af52f4fe110560c48f..0000000000000000000000000000000000000000
--- a/graphics/JiveXML/src/components/JiveXML_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JiveXML)
-
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
old mode 100755
new mode 100644
index 87fc0ce11e3106ccc6f7623b95b242817fb6dc69..1812e53189f0ec344454df4f726db991b85e5f67
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
+++ b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
@@ -4,7 +4,6 @@
// 22 May Riccardo-Maria BIANCHI <rbianchi@cern.ch>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1Algs/VP1Alg.h"
//#include "VP1Algs/VP1EventProd.h"
@@ -12,7 +11,3 @@
DECLARE_ALGORITHM_FACTORY(VP1Alg)
//DECLARE_ALGORITHM_FACTORY(VP1EventProd)
-DECLARE_FACTORY_ENTRIES(VP1Algs) {
- DECLARE_ALGORITHM( VP1Alg );
- //DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
deleted file mode 100755
index b0d1e5e22862e05f7658d848f5ec35f9656aa439..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1Algs)
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
old mode 100755
new mode 100644
index 11cd0e7cf0ef3205e69eb2df2188a0d7feb1f464..103f01a86c362914f44b45dcaa403f5ddc238e18
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
@@ -1,9 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1AlgsBatch/VP1BatchOnLatestEvent.h"
DECLARE_ALGORITHM_FACTORY(VP1BatchOnLatestEvent)
-DECLARE_FACTORY_ENTRIES(VP1AlgsBatch) {
- DECLARE_ALGORITHM( VP1BatchOnLatestEvent );
-}
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
deleted file mode 100755
index 3eb732217bac3780377bfa7e9736d6badd69d6e1..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsBatch)
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
old mode 100755
new mode 100644
index 94e1d6f529418522a3da7d0aa87c1cc74b54176c..6ce98bcc93b53097ce998c2863ea2ee30b607b30
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1AlgsEventProd/VP1EventProd.h"
DECLARE_ALGORITHM_FACTORY(VP1EventProd)
-DECLARE_FACTORY_ENTRIES(VP1AlgsEventProd) {
- DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
deleted file mode 100755
index 4a56002be0f710b55b6c61a2f9e8001d5a7701ba..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsEventProd)
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
index f3d5b9e559f3e13aea1906dfb7914dcb0ba0104c..8ffcc394fa1e691b03ad5eb47922a78cc3d8ff33 100644
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
+++ b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1TrkAuxAlgs/VP1TrkInitializer.h"
DECLARE_ALGORITHM_FACTORY(VP1TrkInitializer)
-DECLARE_FACTORY_ENTRIES(VP1TrkAuxAlgs) {
- DECLARE_ALGORITHM( VP1TrkInitializer );
-}
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
deleted file mode 100644
index 7fd141963a3bd5cf751b02c6fa099f94fae17743..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1TrkAuxAlgs)