diff --git a/Bcm/BcmDigi/src/BcmDigitization.cpp b/Bcm/BcmDigi/src/BcmDigitization.cpp
index 6dfda085dd4ebba3eac712c7028e4b4e574bca1a..d669231afc1ca172d6b71a5831733d60d50db131 100755
--- a/Bcm/BcmDigi/src/BcmDigitization.cpp
+++ b/Bcm/BcmDigi/src/BcmDigitization.cpp
@@ -8,11 +8,30 @@
 * granted to it by virtue of its status as an Intergovernmental Organization  *
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
+#include <string>
 #include <vector>
 
-#include "BcmDigitization.h"
 #include "Event/BcmDigit.h"
 #include "Event/MCBcmDigit.h"
+#include "Event/MCHit.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
+
+class BcmDigitization : public GaudiAlgorithm {
+public:
+  // Constructor: A constructor of this form must be provided.
+  using GaudiAlgorithm::GaudiAlgorithm;
+
+  // StatusCode initialize() override;
+  StatusCode execute() override;
+
+private:
+  Gaudi::Property<std::string> m_bcmHitsLocation{this, "BcmHitsLocation", "MC/Bcm/Hits", "BcmHitsLocation"};
+  Gaudi::Property<std::string> m_bcmDigitLocation{this, "BcmDigitLocation", LHCb::BcmDigitLocation::Default,
+                                                  "BcmDigitLocation"};
+  Gaudi::Property<std::string> m_bcmMCDigitLocation{this, "BcmMCDigitLocation", LHCb::MCBcmDigitLocation::Default,
+                                                    "BcmMCDigitLocation"};
+  Gaudi::Property<bool>        m_bcmMCDigits{this, "MakeMCBcmDigits", true, "MakeMCBcmDigits"};
+};
 
 DECLARE_COMPONENT( BcmDigitization )
 
diff --git a/Bcm/BcmDigi/src/BcmDigitization.h b/Bcm/BcmDigi/src/BcmDigitization.h
deleted file mode 100755
index 948011d6849a8143a5a3b25f8f91e412de5d981d..0000000000000000000000000000000000000000
--- a/Bcm/BcmDigi/src/BcmDigitization.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************\
-* (c) Copyright 2000-2021 CERN for the benefit of the LHCb Collaboration      *
-*                                                                             *
-* This software is distributed under the terms of the GNU General Public      *
-* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
-*                                                                             *
-* In applying this licence, CERN does not waive the privileges and immunities *
-* granted to it by virtue of its status as an Intergovernmental Organization  *
-* or submit itself to any jurisdiction.                                       *
-\*****************************************************************************/
-#ifndef BCMDIGI_BCMDIGITIZATION_H
-#define BCMDIGI_BCMDIGITIZATION_H 1
-
-#include <string>
-
-// From Gaudi
-#include "Event/BcmDigit.h"
-#include "Event/MCBcmDigit.h"
-#include "Event/MCHit.h"
-#include "GaudiAlg/GaudiAlgorithm.h"
-
-class BcmDigitization : public GaudiAlgorithm {
-public:
-  // Constructor: A constructor of this form must be provided.
-  using GaudiAlgorithm::GaudiAlgorithm;
-
-  StatusCode execute() override;
-
-private:
-  Gaudi::Property<std::string> m_bcmHitsLocation{this, "BcmHitsLocation", "MC/Bcm/Hits", "BcmHitsLocation"};
-  Gaudi::Property<std::string> m_bcmDigitLocation{this, "BcmDigitLocation", LHCb::BcmDigitLocation::Default,
-                                                  "BcmDigitLocation"};
-  Gaudi::Property<std::string> m_bcmMCDigitLocation{this, "BcmMCDigitLocation", LHCb::MCBcmDigitLocation::Default,
-                                                    "BcmMCDigitLocation"};
-  Gaudi::Property<bool>        m_bcmMCDigits{this, "MakeMCBcmDigits", true, "MakeMCBcmDigits"};
-};
-
-#endif