diff --git a/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_entries.cxx b/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_entries.cxx
index d46b4baabeead3c01b59b4fafae734d434871d1f..e25fbbfb49e5a44764efcaa09e4f233f04523d89 100644
--- a/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_entries.cxx
+++ b/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_entries.cxx
@@ -1,13 +1,7 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthROOTErrorHandlerSvc.h"
DECLARE_SERVICE_FACTORY(AthROOTErrorHandlerSvc)
-DECLARE_FACTORY_ENTRIES(AthAnalysisBaseComps) {
- DECLARE_SERVICE(AthROOTErrorHandlerSvc)
-}
diff --git a/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_load.cxx b/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_load.cxx
deleted file mode 100644
index 59c500ee30c2fcbaa576b80c479a22a1e5407ec9..0000000000000000000000000000000000000000
--- a/Control/AthAnalysisBaseComps/src/components/AthAnalysisBaseComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthAnalysisBaseComps)
diff --git a/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_entries.cxx b/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_entries.cxx
index f5770a573b6696fc66a7f9f090ec053be7ffec93..c9ff15bd73bfafea70b1d6982c5b3de741f7df9c 100644
--- a/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_entries.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_entries.cxx
@@ -2,7 +2,6 @@
#include "../AsgExampleAlgorithm.h"
#include "AsgExampleTools/AsgHelloTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include <AsgExampleTools/UnitTestTool1.h>
#include <AsgExampleTools/UnitTestTool1A.h>
@@ -18,12 +17,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( asg, UnitTestTool1A )
DECLARE_NAMESPACE_TOOL_FACTORY( asg, UnitTestTool2 )
DECLARE_NAMESPACE_TOOL_FACTORY( asg, UnitTestTool3 )
-DECLARE_FACTORY_ENTRIES(AsgExampleTools) {
- DECLARE_TOOL(AsgHelloTool)
- DECLARE_ALGORITHM(AsgExampleAlgorithm)
- DECLARE_NAMESPACE_TOOL( asg, UnitTestTool1 );
- DECLARE_NAMESPACE_TOOL( asg, UnitTestTool1A );
- DECLARE_NAMESPACE_TOOL( asg, UnitTestTool2 );
- DECLARE_NAMESPACE_TOOL( asg, UnitTestTool3 );
-}
-
diff --git a/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_load.cxx b/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_load.cxx
deleted file mode 100644
index 9bdce1b22e16fb69ab77435eceb20b138459e930..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgExampleTools/src/components/AsgExampleTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// AsgExampleTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AsgExampleTools)
diff --git a/Control/AthViews/src_dflow/components/AthViewsDFlow_entries.cxx b/Control/AthViews/src_dflow/components/AthViewsDFlow_entries.cxx
old mode 100755
new mode 100644
index a03fc731b69348f64dcaff6805beaf01b81a82b3..12762e9636cb6d647e4112c0b81543940af7859f
--- a/Control/AthViews/src_dflow/components/AthViewsDFlow_entries.cxx
+++ b/Control/AthViews/src_dflow/components/AthViewsDFlow_entries.cxx
@@ -6,7 +6,6 @@
#include "../ViewSubgraphAlg.h"
#include "../RoiCollectionToViews.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthViews, DFlowAlg1 )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthViews, DFlowAlg2 )
@@ -16,14 +15,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthViews, ViewMergeAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthViews, ViewSubgraphAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthViews, RoiCollectionToViews )
-DECLARE_FACTORY_ENTRIES( AthViewsDFlow )
-{
- DECLARE_NAMESPACE_ALGORITHM( AthViews, DFlowAlg1 )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, DFlowAlg2 )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, DFlowAlg3 )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, ViewTestAlg )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, ViewMergeAlg )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, ViewSubgraphAlg )
- DECLARE_NAMESPACE_ALGORITHM( AthViews, RoiCollectionToViews )
-}
-
diff --git a/Control/AthViews/src_dflow/components/AthViewsDFlow_load.cxx b/Control/AthViews/src_dflow/components/AthViewsDFlow_load.cxx
deleted file mode 100755
index 033805a720ab17eee0ca98c5a29948f74f888374..0000000000000000000000000000000000000000
--- a/Control/AthViews/src_dflow/components/AthViewsDFlow_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthViewsDFlow )
diff --git a/Control/AthenaAuditors/src/components/AthenaAuditors_entries.cxx b/Control/AthenaAuditors/src/components/AthenaAuditors_entries.cxx
index e2dd8d1c9ed0a71b1b27963fe429fbf2d390d233..ee7c74f1743a3fba435852e907c75ce9583b9e1b 100644
--- a/Control/AthenaAuditors/src/components/AthenaAuditors_entries.cxx
+++ b/Control/AthenaAuditors/src/components/AthenaAuditors_entries.cxx
@@ -1,14 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../FPEAuditor.h"
#include "../CoWAuditor.h"
#include "../AthMemoryAuditor.h"
-DECLARE_FACTORY_ENTRIES(AthenaAuditors) {
- DECLARE_AUDITOR(FPEAuditor)
- DECLARE_AUDITOR(CoWAuditor)
- DECLARE_AUDITOR(AthMemoryAuditor)
-}
DECLARE_AUDITOR_FACTORY(FPEAuditor)
DECLARE_AUDITOR_FACTORY(CoWAuditor)
DECLARE_AUDITOR_FACTORY(AthMemoryAuditor)
+
diff --git a/Control/AthenaAuditors/src/components/AthenaAuditors_load.cxx b/Control/AthenaAuditors/src/components/AthenaAuditors_load.cxx
deleted file mode 100644
index 6f1249ffb1ca954bfbe331ee877f152653d28a39..0000000000000000000000000000000000000000
--- a/Control/AthenaAuditors/src/components/AthenaAuditors_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaAuditors)
-
diff --git a/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx b/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
index 3f849a7d6eb70dab7778a516e8923a2c205be36b..5332952102a08f54fa4e971e4fd6db1b4f418cc8 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
@@ -1,5 +1,3 @@
-
-
#include "../MyPackageAlg.h"
DECLARE_ALGORITHM_FACTORY( MyPackageAlg )
diff --git a/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt b/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
index 2efdef26bac25837327324fbf2818d3b670e0601..4bc94569a13bd7a369987e931c49155fd1278927 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
@@ -35,7 +35,6 @@ atlas_add_library( SGTutorialLib
atlas_add_library( SGTutorial
Tutorial/SGTutorial_entries.cxx
- Tutorial/SGTutorial_load.cxx
PUBLIC_HEADERS AthExStoreGateExample
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel SGTools PileUpToolsLib StoreGateLib SGtests SGTutorialLib
diff --git a/Control/AthenaExamples/AthExUnittest/src/components/AthExUnittest_entries.cxx b/Control/AthenaExamples/AthExUnittest/src/components/AthExUnittest_entries.cxx
index 802ce078f7c71f3f178fde1b44ec030c90704bff..ed788ae68715d1e8556f1631426eaa70e16318d5 100644
--- a/Control/AthenaExamples/AthExUnittest/src/components/AthExUnittest_entries.cxx
+++ b/Control/AthenaExamples/AthExUnittest/src/components/AthExUnittest_entries.cxx
@@ -1,4 +1,3 @@
-
#include "../AthExUnittestAlg.h"
DECLARE_ALGORITHM_FACTORY( AthExUnittestAlg )
diff --git a/Control/AthenaIPCTools/src/components/AthenaIPCTools_entries.cxx b/Control/AthenaIPCTools/src/components/AthenaIPCTools_entries.cxx
index 17f19f4c72c9e460ddfdc1221165523f78653dc2..06216fa636d97668dd961b1a512e325b54dd03b3 100644
--- a/Control/AthenaIPCTools/src/components/AthenaIPCTools_entries.cxx
+++ b/Control/AthenaIPCTools/src/components/AthenaIPCTools_entries.cxx
@@ -1,7 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaSharedMemoryTool.h"
#include "../AthenaYamplTool.h"
DECLARE_TOOL_FACTORY( AthenaSharedMemoryTool )
DECLARE_TOOL_FACTORY( AthenaYamplTool )
+
diff --git a/Control/AthenaIPCTools/src/components/AthenaIPCTools_load.cxx b/Control/AthenaIPCTools/src/components/AthenaIPCTools_load.cxx
deleted file mode 100644
index ab658ae03f1faafc45bc81365cfacdd3ea5f0901..0000000000000000000000000000000000000000
--- a/Control/AthenaIPCTools/src/components/AthenaIPCTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaIPCTools)
-
diff --git a/Control/AthenaMP/src/components/AthenaMP_entries.cxx b/Control/AthenaMP/src/components/AthenaMP_entries.cxx
index 2a1e00bedb5b9214b8496cc4a645b056c6e93fac..67108465cfeb2c25c0bb08dffa84a37eb8764b76 100644
--- a/Control/AthenaMP/src/components/AthenaMP_entries.cxx
+++ b/Control/AthenaMP/src/components/AthenaMP_entries.cxx
@@ -1,9 +1,5 @@
#include "../AthMpEvtLoopMgr.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY (AthMpEvtLoopMgr)
-DECLARE_FACTORY_ENTRIES( AthenaMP ) {
- DECLARE_SERVICE (AthMpEvtLoopMgr)
-}
diff --git a/Control/AthenaMP/src/components/AthenaMP_load.cxx b/Control/AthenaMP/src/components/AthenaMP_load.cxx
deleted file mode 100644
index af9639c4a8d6bd0860078aac34396c1df9aff0d2..0000000000000000000000000000000000000000
--- a/Control/AthenaMP/src/components/AthenaMP_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaMP)
-
diff --git a/Control/AthenaMPTools/src/components/AthenaMPTools_entries.cxx b/Control/AthenaMPTools/src/components/AthenaMPTools_entries.cxx
index cf078f5f484b9c4e18167928ae1eb812f4181fd8..2124ccce9e9762248d64036263c9d1eb6e1b78c0 100644
--- a/Control/AthenaMPTools/src/components/AthenaMPTools_entries.cxx
+++ b/Control/AthenaMPTools/src/components/AthenaMPTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SharedEvtQueueProvider.h"
#include "../SharedEvtQueueConsumer.h"
#include "../SharedWriterTool.h"
@@ -15,14 +14,3 @@ DECLARE_TOOL_FACTORY( EvtRangeScatterer )
DECLARE_TOOL_FACTORY( EvtRangeProcessor )
DECLARE_TOOL_FACTORY( SharedHiveEvtQueueConsumer )
-DECLARE_FACTORY_ENTRIES ( AthenaMPTools ) {
- DECLARE_TOOL( SharedEvtQueueProvider );
- DECLARE_TOOL( SharedEvtQueueConsumer );
- DECLARE_TOOL( SharedHiveEvtQueueConsumer );
- DECLARE_TOOL( SharedWriterTool );
- DECLARE_TOOL( FileSchedulingTool );
- DECLARE_TOOL( EvtRangeScatterer );
- DECLARE_TOOL( EvtRangeProcessor );
-}
-
-
diff --git a/Control/AthenaMPTools/src/components/AthenaMPTools_load.cxx b/Control/AthenaMPTools/src/components/AthenaMPTools_load.cxx
deleted file mode 100644
index 3bbd93ea42414e1b5ccdfcea925cde6782913a87..0000000000000000000000000000000000000000
--- a/Control/AthenaMPTools/src/components/AthenaMPTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaMPTools )
diff --git a/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx b/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
old mode 100755
new mode 100644
index b3162e0ca5a21e3cd94c6d30dd6717d7f6e8e208..1f8f93ce094b44ba57b5bf21f9f3aca548e80006
--- a/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
+++ b/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
@@ -8,7 +8,6 @@
#include "AthenaMonitoring/TriggerTranslatorSimple.h"
#include "AthenaMonitoring/GenericMonitoringTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AthenaMon)
DECLARE_ALGORITHM_FACTORY(AthenaMonManager)
@@ -20,14 +19,3 @@ DECLARE_TOOL_FACTORY(DQBadLBFilterTool)
DECLARE_TOOL_FACTORY(TriggerTranslatorToolSimple)
DECLARE_TOOL_FACTORY(GenericMonitoringTool)
-DECLARE_FACTORY_ENTRIES(AthenaMonitoring) {
- DECLARE_ALGORITHM(AthenaMon)
- DECLARE_ALGORITHM(AthenaMonManager)
- DECLARE_ALGTOOL(ManagedMonitorToolTest)
- DECLARE_ALGTOOL(DQAtlasReadyFilterTool)
- DECLARE_ALGTOOL(DQFilledBunchFilterTool)
- DECLARE_ALGTOOL(DQDummyFilterTool)
- DECLARE_ALGTOOL(DQBadLBFilterTool)
- DECLARE_ALGTOOL(TriggerTranslatorToolSimple)
- DECLARE_ALGTOOL(GenericMonitoringTool)
-}
diff --git a/Control/AthenaMonitoring/src/components/AthenaMonitoring_load.cxx b/Control/AthenaMonitoring/src/components/AthenaMonitoring_load.cxx
deleted file mode 100755
index 2d14ca78631b344a22590ce0e2fdf55e1ae6bc6b..0000000000000000000000000000000000000000
--- a/Control/AthenaMonitoring/src/components/AthenaMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaMonitoring)
-
diff --git a/Control/AthenaPython/src/components/AthenaPython_entries.cxx b/Control/AthenaPython/src/components/AthenaPython_entries.cxx
index 1d3d6a2d628be2a34678f29ed0506c97577e9c7f..c11ac6232d7064816782df68eb6cc3842c696a4a 100644
--- a/Control/AthenaPython/src/components/AthenaPython_entries.cxx
+++ b/Control/AthenaPython/src/components/AthenaPython_entries.cxx
@@ -5,7 +5,6 @@
#include "../PyComponentMgr.h"
#include "../PyJobOptionsSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY ( PyAthena, Tool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PyAthena, Alg )
@@ -14,13 +13,3 @@ DECLARE_NAMESPACE_SERVICE_FACTORY ( PyAthena, Svc )
DECLARE_NAMESPACE_SERVICE_FACTORY ( PyAthena, PyComponentMgr )
DECLARE_SERVICE_FACTORY ( PyJobOptionsSvc )
-DECLARE_FACTORY_ENTRIES( AthenaPython ) {
-
- DECLARE_NAMESPACE_TOOL ( PyAthena, Tool )
- DECLARE_NAMESPACE_ALGORITHM( PyAthena, Alg )
- DECLARE_NAMESPACE_AUDITOR ( PyAthena, Aud )
- DECLARE_NAMESPACE_SERVICE ( PyAthena, Svc )
- DECLARE_NAMESPACE_SERVICE ( PyAthena, PyComponentMgr )
- DECLARE_SERVICE ( PyJobOptionsSvc )
-
-}
diff --git a/Control/AthenaPython/src/components/AthenaPython_load.cxx b/Control/AthenaPython/src/components/AthenaPython_load.cxx
deleted file mode 100644
index 9d3b842b2e08faa8d71397adde1908fc47f9bf54..0000000000000000000000000000000000000000
--- a/Control/AthenaPython/src/components/AthenaPython_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaPython )
diff --git a/Control/AthenaServices/src/components/AthenaServices_entries.cxx b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
index fbcbd40f363ab013a5b480eee2231b3358f222ff..ffd02b647878bb043fe92839b5c7c34f5772820b 100644
--- a/Control/AthenaServices/src/components/AthenaServices_entries.cxx
+++ b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaEventLoopMgr.h"
#include "../PyAthenaEventLoopMgr.h"
#include "../AthenaOutputStream.h"
@@ -67,3 +65,4 @@ DECLARE_TOOL_FACTORY( AthenaOutputStreamTool )
DECLARE_TOOL_FACTORY( ThinningOutputTool )
DECLARE_ALGORITHM_FACTORY( AthenaStopperAlg )
DECLARE_ALGORITHM_FACTORY( AthIncFirerAlg )
+
diff --git a/Control/AthenaServices/src/components/AthenaServices_load.cxx b/Control/AthenaServices/src/components/AthenaServices_load.cxx
deleted file mode 100644
index f8d4f6bdcd4c7b9ce3ad943067461cd112337358..0000000000000000000000000000000000000000
--- a/Control/AthenaServices/src/components/AthenaServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaServices)
-
diff --git a/Control/CLIDComps/src/components/CLIDComps_entries.cxx b/Control/CLIDComps/src/components/CLIDComps_entries.cxx
index 6d8915ae0b9f53d8bc368c28528740e1108f3e67..de63ba172ab87a4039dadb8c5c56029b0319ad62 100644
--- a/Control/CLIDComps/src/components/CLIDComps_entries.cxx
+++ b/Control/CLIDComps/src/components/CLIDComps_entries.cxx
@@ -1,8 +1,4 @@
#include "../ClassIDSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( ClassIDSvc )
-DECLARE_FACTORY_ENTRIES(CLIDComps) {
- DECLARE_SERVICE( ClassIDSvc )
-}
diff --git a/Control/CLIDComps/src/components/CLIDComps_load.cxx b/Control/CLIDComps/src/components/CLIDComps_load.cxx
deleted file mode 100644
index 7e7ea2420e220d2487cf21d96af0cad4f853f5aa..0000000000000000000000000000000000000000
--- a/Control/CLIDComps/src/components/CLIDComps_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CLIDComps)
-
diff --git a/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_entries.cxx b/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_entries.cxx
old mode 100755
new mode 100644
index 3d82bac998f1c2922d028a0f4540ccc2c00cd10b..185dcbc91939bcf81307d1eb5fb2267047a24e37
--- a/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_entries.cxx
+++ b/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_entries.cxx
@@ -6,11 +6,7 @@
* @brief Gaudi algorithm factory declarations.
*/
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DataModelAthenaPool/DataModelCompatSvc.h"
DECLARE_SERVICE_FACTORY(DataModelCompatSvc)
-DECLARE_FACTORY_ENTRIES(DataModelAthenaPool) {
- DECLARE_SERVICE(DataModelCompatSvc)
-}
diff --git a/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_load.cxx b/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_load.cxx
deleted file mode 100755
index f66a4f2e3feac9820d97762157c051b006ecc5a8..0000000000000000000000000000000000000000
--- a/Control/DataModelAthenaPool/src/components/DataModelAthenaPool_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id: DataModelAthenaPool_load.cxx,v 1.1 2005-12-01 17:23:33 ssnyder Exp $
-/**
- * @file src/components/DataModelAthenaPool_load.cxx
- * @author scott snyder
- * @date Nov 2005
- * @brief Gaudi shared lib loading declaration.
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DataModelAthenaPool )
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_entries.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_entries.cxx
index be5f9178bf30b5689314011acb96105108aaca59..2ae1f9ca06b8ad5896a8044145c0f0cba37bbb9f 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_entries.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_entries.cxx
@@ -10,7 +10,6 @@
* @brief Gaudi algorithm factory declarations.
*/
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../xAODTestReadSymlink.h"
#include "../xAODTestReadDecor.h"
@@ -32,3 +31,4 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, CondReaderAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, CondAlg1)
DECLARE_NAMESPACE_TOOL_FACTORY(DMTest, xAODTestReadSymlinkTool)
+
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_load.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_load.cxx
deleted file mode 100644
index ae5ccddd06a8e9423b17b9861741ecf32a6ba472..0000000000000000000000000000000000000000
--- a/Control/DataModelTest/DataModelTestDataCommon/src/components/DataModelTestDataCommon_load.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration.
- */
-
-// $Id$
-/**
- * @file/src/components/DataModelTestDataCommon_load.cxx
- * @author snyder@bnl.gov
- * @date Apr, 2017
- * @brief Gaudi shared lib loading declaration.
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DataModelTestDataCommon )
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_entries.cxx b/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_entries.cxx
index 876ea1918e17ce89307c6eed133ef96b3b4e3f11..7207b8e0dfc25a163e7c3a338bb679dd95907d71 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_entries.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_entries.cxx
@@ -6,7 +6,6 @@
* @brief Gaudi algorithm factory declarations.
*/
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DMTestRead.h"
#include "../AuxDataTestRead.h"
#include "../AuxDataTestDecor.h"
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_load.cxx b/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_load.cxx
deleted file mode 100644
index e91c3b81190e26fd1a7acade5c85b217ec1b858c..0000000000000000000000000000000000000000
--- a/Control/DataModelTest/DataModelTestDataRead/src/components/DataModelTestDataRead_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id: DataModelTestDataRead_load.cxx,v 1.1 2005-12-01 19:11:58 ssnyder Exp $
-/**
- * @file src/components/DataModelTestDataRead_load.cxx
- * @author snyder@bnl.gov
- * @date Nov 2005
- * @brief Gaudi shared lib loading declaration.
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DataModelTestDataRead )
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_entries.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_entries.cxx
index 2b135e0a8e7ec50645cd5af17582a9a169bc4a54..a491534d765cb937593341ba2f95378dc7c73e7f 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_entries.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_entries.cxx
@@ -6,7 +6,6 @@
* @brief Gaudi algorithm factory declarations.
*/
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DMTestWrite.h"
#include "../AuxDataTestWrite.h"
#include "../xAODTestWrite.h"
@@ -29,3 +28,4 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, xAODTestWriteSymlinks)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(DMTest, HLTResultWriter)
DECLARE_NAMESPACE_TOOL_FACTORY(DMTest, xAODTestWriteCInfoTool)
+
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_load.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_load.cxx
deleted file mode 100644
index d3bff91117724e5a96e175ca3d67946ef86f1ef7..0000000000000000000000000000000000000000
--- a/Control/DataModelTest/DataModelTestDataWrite/src/components/DataModelTestDataWrite_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id: DataModelTestDataWrite_load.cxx,v 1.1 2005-12-01 20:34:08 ssnyder Exp $
-/**
- * @file src/components/DataModelTestDataWrite_load.cxx
- * @author snyder@bnl.gov
- * @date Nov 2005
- * @brief Gaudi shared lib loading declaration.
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DataModelTestDataWrite )
diff --git a/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx b/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
old mode 100755
new mode 100644
index a4f5eb07cc380f67d0308f23b06ac48cde68b751..6bfaee738486c22aa5d395962d51bbee3e2dc65a
--- a/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
+++ b/Control/GaudiSequencer/src/components/GaudiSequencer_entries.cxx
@@ -4,7 +4,6 @@
#include "../AthEventCounter.h"
#include "../AthPrescaler.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AthRetrySequencer )
DECLARE_ALGORITHM_FACTORY( AthSequencer )
@@ -12,13 +11,3 @@ DECLARE_ALGORITHM_FACTORY( AthAnalysisSequencer )
DECLARE_ALGORITHM_FACTORY( AthEventCounter )
DECLARE_ALGORITHM_FACTORY( AthPrescaler )
-
-DECLARE_FACTORY_ENTRIES(GaudiSequencer) {
- DECLARE_ALGORITHM( AthRetrySequencer )
- DECLARE_ALGORITHM( AthSequencer )
- DECLARE_ALGORITHM( AthAnalysisSequencer )
- DECLARE_ALGORITHM( AthEventCounter )
- DECLARE_ALGORITHM( AthPrescaler )
-}
-
-
diff --git a/Control/GaudiSequencer/src/components/GaudiSequencer_load.cxx b/Control/GaudiSequencer/src/components/GaudiSequencer_load.cxx
deleted file mode 100755
index d09311bf5979a56fb3a526cff67a0f9091db25cb..0000000000000000000000000000000000000000
--- a/Control/GaudiSequencer/src/components/GaudiSequencer_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(GaudiSequencer)
-
-
diff --git a/Control/IOVSvc/src/components/IOVSvc_entries.cxx b/Control/IOVSvc/src/components/IOVSvc_entries.cxx
old mode 100755
new mode 100644
index 887f4c2f011dfbaf078f1dbd16240934a37ffa98..43283cfac282ca7f9ffe76530b0a7fa0320fbe48
--- a/Control/IOVSvc/src/components/IOVSvc_entries.cxx
+++ b/Control/IOVSvc/src/components/IOVSvc_entries.cxx
@@ -3,7 +3,6 @@
#include "IOVSvc/IOVSvcTool.h"
#include "../CondInputLoader.h"
#include "../MetaInputLoader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(IOVSvc)
DECLARE_TOOL_FACTORY( IOVSvcTool )
@@ -13,9 +12,3 @@ DECLARE_SERVICE_FACTORY(CondSvc)
DECLARE_ALGORITHM_FACTORY( CondInputLoader )
DECLARE_ALGORITHM_FACTORY( MetaInputLoader )
-//DECLARE_FACTORY_ENTRIES(IOVSvc) {
-// DECLARE_ALGORITHM( MetaInputLoader )
-// DECLARE_SERVICE( IOVSvc );
-// DECLARE_TOOL( IOVSvcTool );
-//}
-
diff --git a/Control/IOVSvc/src/components/IOVSvc_load.cxx b/Control/IOVSvc/src/components/IOVSvc_load.cxx
deleted file mode 100755
index aeb17f8eba26d4d6ca9bb7d8df52652b63bb7a5f..0000000000000000000000000000000000000000
--- a/Control/IOVSvc/src/components/IOVSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVSvc)
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_entries.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_entries.cxx
index f0c1aba43441d065f6cac145d227e6457d242ecf..050453b9c45ec241072c82e7ebe4796627f0f912 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_entries.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_entries.cxx
@@ -5,7 +5,6 @@
#include "../PerfMonAuditor.h"
#include "../PerfMonStorePayloadMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( PerfMonSvc )
DECLARE_NAMESPACE_AUDITOR_FACTORY( Athena, PerfMonAuditor )
@@ -15,13 +14,3 @@ DECLARE_NAMESPACE_SERVICE_FACTORY( PerfMon, CallGraphBuilderSvc )
DECLARE_NAMESPACE_AUDITOR_FACTORY( PerfMon, CallGraphAuditor )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMon, StorePayloadMon )
-DECLARE_FACTORY_ENTRIES( PerfMonComps ) {
- DECLARE_SERVICE( PerfMonSvc )
- DECLARE_NAMESPACE_AUDITOR( Athena, PerfMonAuditor )
-// DECLARE_NAMESPACE_TOOL( PerfMon, LdTool )
-
- DECLARE_NAMESPACE_SERVICE( PerfMon, CallGraphBuilderSvc )
- DECLARE_NAMESPACE_AUDITOR( PerfMon, CallGraphAuditor )
- DECLARE_NAMESPACE_ALGORITHM( PerfMon, StorePayloadMon )
-
-}
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_load.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_load.cxx
deleted file mode 100644
index 4f02f80907d3424cfc38d863383435919c519dee..0000000000000000000000000000000000000000
--- a/Control/PerformanceMonitoring/PerfMonComps/src/components/PerfMonComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PerfMonComps )
diff --git a/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_entries.cxx b/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_entries.cxx
index 17b48c20148a768484276cc0b361e33f51ef4588..6aa26bd2f70c9e84d80d3539d7e46ec3008975d5 100644
--- a/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_entries.cxx
+++ b/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_entries.cxx
@@ -1,15 +1,4 @@
-// $Id: PerfMonGPerfTools_entries.cxx 496380 2012-04-18 12:28:09Z ritsch $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../ProfilerService.h"
DECLARE_NAMESPACE_SERVICE_FACTORY( GPT, ProfilerService )
-DECLARE_FACTORY_ENTRIES( PerfMonGPerfTools ) {
-
- DECLARE_NAMESPACE_SERVICE( GPT, ProfilerService )
-
-}
diff --git a/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_load.cxx b/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_load.cxx
deleted file mode 100644
index 884b30c89f4dae3419e7eef0433a5151a0e0bf73..0000000000000000000000000000000000000000
--- a/Control/PerformanceMonitoring/PerfMonGPerfTools/src/components/PerfMonGPerfTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: PerfMonGPerfTools_load.cxx 496380 2012-04-18 12:28:09Z ritsch $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the framework:
-LOAD_FACTORY_ENTRIES( PerfMonGPerfTools )
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_entries.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_entries.cxx
old mode 100755
new mode 100644
index 4dcf72e790f58056884cf2dd2f3426db2306f05a..5cd0dd04eb76805aa505dbc51aac5fedc504a860
--- a/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_entries.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_entries.cxx
@@ -9,7 +9,6 @@
#include "../PerfMonTestPolyVectorAlg.h"
#include "../PerfMonTestPolyVectorAlgWithArenas.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMonTest, NoopAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMonTest, LeakyAlg )
@@ -22,15 +21,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMonTest, VectorAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMonTest, PolyVectorAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( PerfMonTest, PolyVectorAlgWithArenas )
-DECLARE_FACTORY_ENTRIES( PerfMonTests ) {
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, NoopAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, LeakyAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, BasicAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, CpuCruncherAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, MallocAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, ErroneousAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, ErroneousAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, VectorAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, PolyVectorAlg )
- DECLARE_NAMESPACE_ALGORITHM( PerfMonTest, PolyVectorAlgWithArenas )
-}
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_load.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_load.cxx
deleted file mode 100755
index ff2af5e57a0dde3a50fb2a6e8e2b449bc62fdbfe..0000000000000000000000000000000000000000
--- a/Control/PerformanceMonitoring/PerfMonTests/src/components/PerfMonTests_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PerfMonTests )
diff --git a/Control/PileUpComps/src/components/PileUpComps_entries.cxx b/Control/PileUpComps/src/components/PileUpComps_entries.cxx
index fb7dacb98d593f40aa890caa95267dd4e88dc367..e9962d9c3705fce7d57f9b34eef39de855390731 100644
--- a/Control/PileUpComps/src/components/PileUpComps_entries.cxx
+++ b/Control/PileUpComps/src/components/PileUpComps_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../BkgStreamsCache.h"
#include "../BkgStreamsConcentricCache.h"
#include "../BkgStreamsStepCache.h"
@@ -31,3 +29,4 @@ DECLARE_TOOL_FACTORY( PileUpXingFolder )
DECLARE_TOOL_FACTORY( TestPileUpTool )
DECLARE_ALGORITHM_FACTORY( PileUpToolsAlg )
DECLARE_ALGORITHM_FACTORY( DigitizationAlg )
+
diff --git a/Control/PileUpComps/src/components/PileUpComps_load.cxx b/Control/PileUpComps/src/components/PileUpComps_load.cxx
deleted file mode 100644
index c30491ec122a56adb80419c46b2d35c99613a7ad..0000000000000000000000000000000000000000
--- a/Control/PileUpComps/src/components/PileUpComps_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PileUpComps)
diff --git a/Control/PileUpTools/src/components/PileUpTools_entries.cxx b/Control/PileUpTools/src/components/PileUpTools_entries.cxx
old mode 100755
new mode 100644
index 8e09c34abdf8fcea793a34090d0b9e06282dd542..386bd115a80e2610b456e8235e623376d6811246
--- a/Control/PileUpTools/src/components/PileUpTools_entries.cxx
+++ b/Control/PileUpTools/src/components/PileUpTools_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "PileUpTools/PileUpMergeSvc.h"
-DECLARE_FACTORY_ENTRIES(PileUpTools) {
- DECLARE_SERVICE( PileUpMergeSvc )
-}
DECLARE_SERVICE_FACTORY(PileUpMergeSvc)
+
diff --git a/Control/PileUpTools/src/components/PileUpTools_load.cxx b/Control/PileUpTools/src/components/PileUpTools_load.cxx
deleted file mode 100755
index 08fbb62fcb4fd1aa454c7164d9ce279ee6531fab..0000000000000000000000000000000000000000
--- a/Control/PileUpTools/src/components/PileUpTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PileUpTools)
diff --git a/Control/RngComps/src/components/RngComps_entries.cxx b/Control/RngComps/src/components/RngComps_entries.cxx
index 500d86ffddca1002ab63e6ec5b8c45f54904f1f8..51dbaf5cd967073944d94a4fbd0848f40d35ad74 100644
--- a/Control/RngComps/src/components/RngComps_entries.cxx
+++ b/Control/RngComps/src/components/RngComps_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AtDSFMTGenSvc.h"
#include "../AtRndmGenSvc.h"
#include "../AtRanluxGenSvc.h"
@@ -10,11 +8,3 @@ DECLARE_SERVICE_FACTORY( AtRanluxGenSvc )
DECLARE_SERVICE_FACTORY( AtRndmGenSvc )
DECLARE_SERVICE_FACTORY( AthRNGSvc )
-DECLARE_FACTORY_ENTRIES(RngComps) {
- DECLARE_SERVICE( AtDSFMTGenSvc )
- DECLARE_SERVICE( AtRanluxGenSvc )
- DECLARE_SERVICE( AtRndmGenSvc )
- DECLARE_SERVICE( AthRNGSvc )
-}
-
-
diff --git a/Control/RngComps/src/components/RngComps_load.cxx b/Control/RngComps/src/components/RngComps_load.cxx
deleted file mode 100644
index f8d4f6bdcd4c7b9ce3ad943067461cd112337358..0000000000000000000000000000000000000000
--- a/Control/RngComps/src/components/RngComps_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaServices)
-
diff --git a/Control/SGComps/src/components/SGComps_entries.cxx b/Control/SGComps/src/components/SGComps_entries.cxx
index 254a4ccd3a18966a371956988f0ef33d0a5cb0ed..e458e1d3e4b4c5f7dd0de26d41fc628cbbf0c699 100644
--- a/Control/SGComps/src/components/SGComps_entries.cxx
+++ b/Control/SGComps/src/components/SGComps_entries.cxx
@@ -5,7 +5,6 @@
#include "../AddressRemappingSvc.h"
#include "../SGCommitAuditor.h"
#include "../SGInputLoader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SGDeleteAlg )
DECLARE_ALGORITHM_FACTORY( SGAccessAlg )
@@ -16,12 +15,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY(SG, Folder )
DECLARE_ALGORITHM_FACTORY(SGInputLoader)
-DECLARE_FACTORY_ENTRIES(SGComps) {
- DECLARE_ALGORITHM( SGDeleteAlg )
- DECLARE_ALGORITHM( SGProxyAlg )
- DECLARE_SERVICE( ProxyProviderSvc )
- DECLARE_SERVICE( AddressRemappingSvc )
- DECLARE_NAMESPACE_TOOL( SG, Folder )
- DECLARE_AUDITOR( SGCommitAuditor )
- DECLARE_ALGORITHM(SGInputLoader)
-}
diff --git a/Control/SGComps/src/components/SGComps_load.cxx b/Control/SGComps/src/components/SGComps_load.cxx
deleted file mode 100644
index f635dca8317ae78d6728e15b94ba055944d6d226..0000000000000000000000000000000000000000
--- a/Control/SGComps/src/components/SGComps_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SGComps)
-
diff --git a/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx b/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
index 719c6b7d6b39793760226428e3d54a05cf7bdcf9..4968c9b1430418284a7a596830b268093a7b3c32 100644
--- a/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
+++ b/Control/SGMon/SGAudSvc/src/components/SGAudSvc_entries.cxx
@@ -1,13 +1,7 @@
#include "SGAudSvc/SGAudSvc.h"
//#include "../PerfMonAuditor.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( SGAudSvc )
//DECLARE_AUDITOR_FACTORY( PerfMonAuditor )
-DECLARE_FACTORY_ENTRIES( SGAudSvc ) {
- DECLARE_SERVICE( SGAudSvc )
-// DECLARE_AUDITOR( PerfMonAuditor )
-
-}
diff --git a/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx b/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx
deleted file mode 100644
index 7412b1c6c75fa7f65130fed74ea6f3cff5e4a7e9..0000000000000000000000000000000000000000
--- a/Control/SGMon/SGAudSvc/src/components/SGAudSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SGAudSvc )
diff --git a/Control/StoreGate/src/components/StoreGateSvc_entries.cxx b/Control/StoreGate/src/components/StoreGateSvc_entries.cxx
index 9ebf1ede24d4dbfdf027fcf2933374dc53ea7a68..fe4d85ad8b52803ab585fd2b4be86157ca6aa6b6 100644
--- a/Control/StoreGate/src/components/StoreGateSvc_entries.cxx
+++ b/Control/StoreGate/src/components/StoreGateSvc_entries.cxx
@@ -3,7 +3,6 @@
#include "StoreGate/tools/SGImplSvc.h"
#include "StoreGate/SegMemSvc.h"
#include "../SGHiveMgrSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( ActiveStoreSvc )
DECLARE_SERVICE_FACTORY( StoreGateSvc )
diff --git a/Control/StoreGate/src/components/StoreGateSvc_load.cxx b/Control/StoreGate/src/components/StoreGateSvc_load.cxx
deleted file mode 100644
index 4af836ccc8bfc2f3ee5e7a452e329f2bc036a367..0000000000000000000000000000000000000000
--- a/Control/StoreGate/src/components/StoreGateSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(StoreGate)
-
diff --git a/Control/StoreGateTests/src/components/StoreGateTests_entries.cxx b/Control/StoreGateTests/src/components/StoreGateTests_entries.cxx
old mode 100755
new mode 100644
index 2e625b4aedabea7a99adf1c6db42e3bf651b79e8..dcf5d6a716bd15765aff22c8235d166bf021562e
--- a/Control/StoreGateTests/src/components/StoreGateTests_entries.cxx
+++ b/Control/StoreGateTests/src/components/StoreGateTests_entries.cxx
@@ -1,13 +1,7 @@
#include "../SgStressProducer.h"
#include "../SgStressConsumer.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SgStressProducer )
DECLARE_ALGORITHM_FACTORY( SgStressConsumer )
-DECLARE_FACTORY_ENTRIES( StoreGateTests ) {
-
- DECLARE_ALGORITHM( SgStressProducer )
- DECLARE_ALGORITHM( SgStressConsumer )
-}
diff --git a/Control/StoreGateTests/src/components/StoreGateTests_load.cxx b/Control/StoreGateTests/src/components/StoreGateTests_load.cxx
deleted file mode 100755
index 828a7bc49aebf67d3f19be9d5349be001a6b22de..0000000000000000000000000000000000000000
--- a/Control/StoreGateTests/src/components/StoreGateTests_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( StoreGateTests )
diff --git a/Control/Valkyrie/src/components/Valkyrie_entries.cxx b/Control/Valkyrie/src/components/Valkyrie_entries.cxx
old mode 100755
new mode 100644
index d84624d7b3b6b88e0547c5c12c020eb373f2be15..8ed756bf2fcb9cfcc732c13cce82a433ff766371
--- a/Control/Valkyrie/src/components/Valkyrie_entries.cxx
+++ b/Control/Valkyrie/src/components/Valkyrie_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ValgrindSvc.h"
#include "../ValgrindAuditor.h"
DECLARE_SERVICE_FACTORY( ValgrindSvc )
DECLARE_AUDITOR_FACTORY( ValgrindAuditor )
-
-DECLARE_FACTORY_ENTRIES(Valkyrie) {
- DECLARE_SERVICE( ValgrindSvc )
- DECLARE_AUDITOR( ValgrindAuditor )
-}
+
diff --git a/Control/Valkyrie/src/components/Valkyrie_load.cxx b/Control/Valkyrie/src/components/Valkyrie_load.cxx
deleted file mode 100755
index 14d14955fa9f8b3f88add1115613a4d1352587a4..0000000000000000000000000000000000000000
--- a/Control/Valkyrie/src/components/Valkyrie_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(Valkyrie)