diff --git a/src/modules/AlignmentDUTResidual/AlignmentDUTResidual.h b/src/modules/AlignmentDUTResidual/AlignmentDUTResidual.h
index 2fd3bb3c47b290c532bb372d0d697874b8ed3f0d..92284bb5a9ff01e16fe8e58e2e95212a9eb5b9b6 100644
--- a/src/modules/AlignmentDUTResidual/AlignmentDUTResidual.h
+++ b/src/modules/AlignmentDUTResidual/AlignmentDUTResidual.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/AlignmentMillepede/AlignmentMillepede.h b/src/modules/AlignmentMillepede/AlignmentMillepede.h
index f598f223bc8c3733f719ef4bac44b1ec254ecefe..c6a18dc0bc9bd75c138de698fede4a6b74a211d8 100644
--- a/src/modules/AlignmentMillepede/AlignmentMillepede.h
+++ b/src/modules/AlignmentMillepede/AlignmentMillepede.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef AlignmentMillepede_H
diff --git a/src/modules/AlignmentTrackChi2/AlignmentTrackChi2.h b/src/modules/AlignmentTrackChi2/AlignmentTrackChi2.h
index b1bf612f38ef95810ff962f9b1e04ac76bb8867a..c3bbdbdde89ed381c0d7e3e1352028c4998237b3 100644
--- a/src/modules/AlignmentTrackChi2/AlignmentTrackChi2.h
+++ b/src/modules/AlignmentTrackChi2/AlignmentTrackChi2.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef AlignmentTrackChi2_H
diff --git a/src/modules/AnalysisDUT/AnalysisDUT.h b/src/modules/AnalysisDUT/AnalysisDUT.h
index b7a32db17e6449dbc93ce8e2b9ced67e3c2b781d..83a0f6080a1cf42bf5ab023b77c1c03fa644774b 100644
--- a/src/modules/AnalysisDUT/AnalysisDUT.h
+++ b/src/modules/AnalysisDUT/AnalysisDUT.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CORRYVRECKAN_DUT_ANALYSIS_H
diff --git a/src/modules/AnalysisEfficiency/AnalysisEfficiency.h b/src/modules/AnalysisEfficiency/AnalysisEfficiency.h
index db039ea94f798eb21d83a59c9b672a5c0f62fa6d..cb6283dc89fb7c1c5ea4bbc655f6b44fad483ab4 100644
--- a/src/modules/AnalysisEfficiency/AnalysisEfficiency.h
+++ b/src/modules/AnalysisEfficiency/AnalysisEfficiency.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  *
  * Contains minimal dummy module to use as a start for the development of your own module
  *
diff --git a/src/modules/AnalysisFASTPIX/AnalysisFASTPIX.h b/src/modules/AnalysisFASTPIX/AnalysisFASTPIX.h
index 91eaff492675794da87eadef39b3347ebcc46bdc..66abf2032fe2171ba00bc82c81c4bff62e58acf5 100644
--- a/src/modules/AnalysisFASTPIX/AnalysisFASTPIX.h
+++ b/src/modules/AnalysisFASTPIX/AnalysisFASTPIX.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/AnalysisMaterialBudget/AnalysisMaterialBudget.h b/src/modules/AnalysisMaterialBudget/AnalysisMaterialBudget.h
index 531a7f2043e45461737f6a9f87218c750491c4f8..66091b1a75a0c18c4b5e728d88cfedf39c420605 100644
--- a/src/modules/AnalysisMaterialBudget/AnalysisMaterialBudget.h
+++ b/src/modules/AnalysisMaterialBudget/AnalysisMaterialBudget.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/AnalysisParticleFlux/AnalysisParticleFlux.h b/src/modules/AnalysisParticleFlux/AnalysisParticleFlux.h
index 56998bcd64cc49a6a4a49e37d8b9ba0a7fb8220e..c978df718ac3f6e525496d5e43e758d27e38aa9f 100644
--- a/src/modules/AnalysisParticleFlux/AnalysisParticleFlux.h
+++ b/src/modules/AnalysisParticleFlux/AnalysisParticleFlux.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef AnalysisParticleFlux_H
diff --git a/src/modules/AnalysisPowerPulsing/AnalysisPowerPulsing.h b/src/modules/AnalysisPowerPulsing/AnalysisPowerPulsing.h
index 492fcd8b0775c07d174569895edb8ccbcd47e946..e54b69caa0b782f0f24ce9733fbf7c0f0a141cad 100644
--- a/src/modules/AnalysisPowerPulsing/AnalysisPowerPulsing.h
+++ b/src/modules/AnalysisPowerPulsing/AnalysisPowerPulsing.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef AnalysisPowerPulsing_H
diff --git a/src/modules/AnalysisSensorEdge/AnalysisSensorEdge.h b/src/modules/AnalysisSensorEdge/AnalysisSensorEdge.h
index b96f8cfd8131636e4d553c0d8804199c6dac9f69..6394ead475972b462260441852771838c78b5005 100644
--- a/src/modules/AnalysisSensorEdge/AnalysisSensorEdge.h
+++ b/src/modules/AnalysisSensorEdge/AnalysisSensorEdge.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TH2D.h>
diff --git a/src/modules/AnalysisTelescope/AnalysisTelescope.h b/src/modules/AnalysisTelescope/AnalysisTelescope.h
index 30e52fa456edb3980dbe500137509cac5205708b..87940268e52dda644fec9d8e8dac7e23b8b35b0a 100644
--- a/src/modules/AnalysisTelescope/AnalysisTelescope.h
+++ b/src/modules/AnalysisTelescope/AnalysisTelescope.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef AnalysisTelescope_H
diff --git a/src/modules/AnalysisTimingATLASpix/AnalysisTimingATLASpix.h b/src/modules/AnalysisTimingATLASpix/AnalysisTimingATLASpix.h
index 6148164a631f2f75db256bcd9dcb1651f888bd97..b4c388cdb64c729d031701e84ff3fe7ed248f723 100644
--- a/src/modules/AnalysisTimingATLASpix/AnalysisTimingATLASpix.h
+++ b/src/modules/AnalysisTimingATLASpix/AnalysisTimingATLASpix.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  * *
  * Refer to the User's Manual for more details.
  */
diff --git a/src/modules/AnalysisTimingFASTPIX/AnalysisTimingFASTPIX.h b/src/modules/AnalysisTimingFASTPIX/AnalysisTimingFASTPIX.h
index 4fdbd4895bffaa92702d0e2a66c513ce91c06409..c6327ea8605f5ded24f598e914424b90df08be38 100644
--- a/src/modules/AnalysisTimingFASTPIX/AnalysisTimingFASTPIX.h
+++ b/src/modules/AnalysisTimingFASTPIX/AnalysisTimingFASTPIX.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/AnalysisTrackIntercept/AnalysisTrackIntercept.h b/src/modules/AnalysisTrackIntercept/AnalysisTrackIntercept.h
index 32a4eb4ab02b56687b05ccb0381917042a23ce6d..fafbb514e5588bd4d072cf0a088d2311ff7064cc 100644
--- a/src/modules/AnalysisTrackIntercept/AnalysisTrackIntercept.h
+++ b/src/modules/AnalysisTrackIntercept/AnalysisTrackIntercept.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CORRYVRECKAN_TRACKINTERCEPT_ANALYSIS_H
diff --git a/src/modules/AnalysisTracks/AnalysisTracks.h b/src/modules/AnalysisTracks/AnalysisTracks.h
index 780471c4d14edeeb3becdc2b18f2c480fbdaa4c4..6aa29d1ad176e88f1c9918055f03de0516fed202 100644
--- a/src/modules/AnalysisTracks/AnalysisTracks.h
+++ b/src/modules/AnalysisTracks/AnalysisTracks.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 #ifndef ANALYSISTRACKS_H
 #define ANALYSISTRACKS_H 1
diff --git a/src/modules/Clustering4D/Clustering4D.h b/src/modules/Clustering4D/Clustering4D.h
index 2bd0007afdccd67b5302e43f1c27b2c4c35bae7c..d2da540b466c706e30cdfd271491263d8682abd9 100644
--- a/src/modules/Clustering4D/Clustering4D.h
+++ b/src/modules/Clustering4D/Clustering4D.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CLUSTERING4D_H
diff --git a/src/modules/ClusteringAnalog/ClusteringAnalog.h b/src/modules/ClusteringAnalog/ClusteringAnalog.h
index d94bb097d7ba8d861dc90ac38b5cc85d901e21c1..5bcb9e1ad4448a4f1cd7abb5975df67ccfbc2b55 100644
--- a/src/modules/ClusteringAnalog/ClusteringAnalog.h
+++ b/src/modules/ClusteringAnalog/ClusteringAnalog.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef ClusteringAnalog_H
diff --git a/src/modules/ClusteringSpatial/ClusteringSpatial.h b/src/modules/ClusteringSpatial/ClusteringSpatial.h
index aa0f0a8d2a2b638f6b33b4f31e506617efcc6541..0e4825e0296956815fb346d7669545f891ef5715 100644
--- a/src/modules/ClusteringSpatial/ClusteringSpatial.h
+++ b/src/modules/ClusteringSpatial/ClusteringSpatial.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef ClusteringSpatial_H
diff --git a/src/modules/Correlations/Correlations.h b/src/modules/Correlations/Correlations.h
index c71872b8e84af92c08e468cd8e0d1be188489ae9..47f33d39004a8ac9e2dfd7dc7ce1044e7692660d 100644
--- a/src/modules/Correlations/Correlations.h
+++ b/src/modules/Correlations/Correlations.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CORRELATIONS_H
diff --git a/src/modules/DUTAssociation/DUTAssociation.h b/src/modules/DUTAssociation/DUTAssociation.h
index 4a77a5f9a482084bf7260895e2f27f9ed9c59121..e5fcd2c4d3908df6036bfb59b149b24e2d91af0a 100644
--- a/src/modules/DUTAssociation/DUTAssociation.h
+++ b/src/modules/DUTAssociation/DUTAssociation.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef DUTAssociation_H
diff --git a/src/modules/Dummy/Dummy.h b/src/modules/Dummy/Dummy.h
index 2e1262f170555001a2214f44ec503e27c5117238..e51b30d292bdffced25461e7b3a8f29d770b403b 100644
--- a/src/modules/Dummy/Dummy.h
+++ b/src/modules/Dummy/Dummy.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/EtaCalculation/EtaCalculation.h b/src/modules/EtaCalculation/EtaCalculation.h
index 43f833394de6915d0597d33626324ccc65203865..8c07f978e93fdd8e0c888ecf1f79ca3d757cdfb1 100644
--- a/src/modules/EtaCalculation/EtaCalculation.h
+++ b/src/modules/EtaCalculation/EtaCalculation.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EtaCalculation_H
diff --git a/src/modules/EtaCorrection/EtaCorrection.h b/src/modules/EtaCorrection/EtaCorrection.h
index 44fa3dd8e0d5a1e7e8907614058828178245ac6a..882f395026352ed9dc3da29e2675b00d18ea371d 100644
--- a/src/modules/EtaCorrection/EtaCorrection.h
+++ b/src/modules/EtaCorrection/EtaCorrection.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EtaCorrection_H
diff --git a/src/modules/EventDefinitionM26/EventDefinitionM26.h b/src/modules/EventDefinitionM26/EventDefinitionM26.h
index 463dbb41883d17fdb3ebd001f7e5c8201a9db00c..e3ae1d3c5aa7e9e3cd57ed164541eec07d1d0403 100644
--- a/src/modules/EventDefinitionM26/EventDefinitionM26.h
+++ b/src/modules/EventDefinitionM26/EventDefinitionM26.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/EventLoaderALiBaVa/EventLoaderALiBaVa.h b/src/modules/EventLoaderALiBaVa/EventLoaderALiBaVa.h
index 22495f202fd23f4433728b9aca9c54a24c141cbf..e26e394615dfc8f2d61737773f04fa74f24a37ea 100644
--- a/src/modules/EventLoaderALiBaVa/EventLoaderALiBaVa.h
+++ b/src/modules/EventLoaderALiBaVa/EventLoaderALiBaVa.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderALiBaVa_H
diff --git a/src/modules/EventLoaderATLASpix/EventLoaderATLASpix.h b/src/modules/EventLoaderATLASpix/EventLoaderATLASpix.h
index 34d1ff78872edb72707d7cad16bcd11389990a96..01d610738379fe108e9f4eb05cbb17b19ff52d8f 100644
--- a/src/modules/EventLoaderATLASpix/EventLoaderATLASpix.h
+++ b/src/modules/EventLoaderATLASpix/EventLoaderATLASpix.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderATLASpix_H
diff --git a/src/modules/EventLoaderCLICpix/EventLoaderCLICpix.h b/src/modules/EventLoaderCLICpix/EventLoaderCLICpix.h
index ac6d28ed21608a6a214ca448bf365f4e8dfd60fa..bf99b69383062b1a617447a313cde70e12fb3d3d 100644
--- a/src/modules/EventLoaderCLICpix/EventLoaderCLICpix.h
+++ b/src/modules/EventLoaderCLICpix/EventLoaderCLICpix.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderCLICpix_H
diff --git a/src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.h b/src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.h
index 218e269d0d92b645c5ee34212701adb16862ba2f..560f3029b3556cdeb85625e49a6c98a771ecae4a 100644
--- a/src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.h
+++ b/src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderCLICpix2_H
diff --git a/src/modules/EventLoaderEUDAQ/EventLoaderEUDAQ.h b/src/modules/EventLoaderEUDAQ/EventLoaderEUDAQ.h
index d7811cd378faf64fae55a9765ea64977db54eda1..cab16565e1eb5db7b54af26453612b5572a000a8 100644
--- a/src/modules/EventLoaderEUDAQ/EventLoaderEUDAQ.h
+++ b/src/modules/EventLoaderEUDAQ/EventLoaderEUDAQ.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderEUDAQ_H
diff --git a/src/modules/EventLoaderEUDAQ/SequentialReader.h b/src/modules/EventLoaderEUDAQ/SequentialReader.h
index f70bb6eb39a7cec7e2fce1182a8ca156190adef9..549b75aa0f72d9a6ca9607f1b91adbda71983220 100644
--- a/src/modules/EventLoaderEUDAQ/SequentialReader.h
+++ b/src/modules/EventLoaderEUDAQ/SequentialReader.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef SequentialREADER_H__
diff --git a/src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.h b/src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.h
index 3df7ed13de3d2f17365fcc14fe3ccfe090205107..86d71a807969d98c0a9f26e000100a37de7ec94c 100644
--- a/src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.h
+++ b/src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  *
  * Contains minimal dummy module to use as a start for the development of your own module
  *
diff --git a/src/modules/EventLoaderFASTPIX/EventLoaderFASTPIX.h b/src/modules/EventLoaderFASTPIX/EventLoaderFASTPIX.h
index beb698f74aeede5edb44c61181ef5ac965e1f36f..44de50e1a2f34e28aa313ada4698cc8af63ec34e 100644
--- a/src/modules/EventLoaderFASTPIX/EventLoaderFASTPIX.h
+++ b/src/modules/EventLoaderFASTPIX/EventLoaderFASTPIX.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/EventLoaderMuPixTelescope/EventLoaderMuPixTelescope.h b/src/modules/EventLoaderMuPixTelescope/EventLoaderMuPixTelescope.h
index c16c72cb1cd1807e5e2de52e56386db4b7aebeb4..0138d8a97d5ea272995db43e322cd8282c019b03 100644
--- a/src/modules/EventLoaderMuPixTelescope/EventLoaderMuPixTelescope.h
+++ b/src/modules/EventLoaderMuPixTelescope/EventLoaderMuPixTelescope.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EVENTLOADERMUPIXTELESCOPE_H
diff --git a/src/modules/EventLoaderTimepix1/EventLoaderTimepix1.h b/src/modules/EventLoaderTimepix1/EventLoaderTimepix1.h
index 934a24904f449f559c7523b5a90eaab851c47b47..a1bcdc478780ac2917e933f1589906091e8414ec 100644
--- a/src/modules/EventLoaderTimepix1/EventLoaderTimepix1.h
+++ b/src/modules/EventLoaderTimepix1/EventLoaderTimepix1.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef EventLoaderTimepix1_H
diff --git a/src/modules/EventLoaderTimepix3/EventLoaderTimepix3.h b/src/modules/EventLoaderTimepix3/EventLoaderTimepix3.h
index 4bce827b97fa5a120b874452a32d697da7645fbd..6d3620f1a3a5d4617145aa84fd49578c41e5483d 100644
--- a/src/modules/EventLoaderTimepix3/EventLoaderTimepix3.h
+++ b/src/modules/EventLoaderTimepix3/EventLoaderTimepix3.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TIMEPIX3EVENTLOADER_H
diff --git a/src/modules/EventLoaderTimestamp/EventLoaderTimestamp.h b/src/modules/EventLoaderTimestamp/EventLoaderTimestamp.h
index 3c6e563c9995b0553fa7cab664272e3f90a76837..bd6e3ec49c58b6c1865a5cb58b8d6c4e2d320f98 100644
--- a/src/modules/EventLoaderTimestamp/EventLoaderTimestamp.h
+++ b/src/modules/EventLoaderTimestamp/EventLoaderTimestamp.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/EventLoaderWaveform/DirectoryLoader.hpp b/src/modules/EventLoaderWaveform/DirectoryLoader.hpp
index d5207a9aa07865eb735f9023ea6cd4d6f8d0439a..14d1d17710dc9fd4e02bdd2d31bf418028e9385e 100644
--- a/src/modules/EventLoaderWaveform/DirectoryLoader.hpp
+++ b/src/modules/EventLoaderWaveform/DirectoryLoader.hpp
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef __DIRECTORYLOADER_HPP
diff --git a/src/modules/EventLoaderWaveform/EventLoaderWaveform.h b/src/modules/EventLoaderWaveform/EventLoaderWaveform.h
index 8622b520688afedd27a320755c5fd0e7201bd8cf..cb089b07b82c04d87e2ae8b213365cc6c8bef960 100644
--- a/src/modules/EventLoaderWaveform/EventLoaderWaveform.h
+++ b/src/modules/EventLoaderWaveform/EventLoaderWaveform.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <TCanvas.h>
diff --git a/src/modules/FileReader/FileReader.h b/src/modules/FileReader/FileReader.h
index 5e2e31f6fd9cfa79928c6076b80080dcf1c5f37a..7dfa92e650cf9dbafdefea0daf72fc98b05df612 100644
--- a/src/modules/FileReader/FileReader.h
+++ b/src/modules/FileReader/FileReader.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <functional>
diff --git a/src/modules/FileWriter/FileWriter.h b/src/modules/FileWriter/FileWriter.h
index 39fb9f72ff0a7ca482ec0a0b7da837315613b512..9328a33747e2d169cca0ca6c14a10d3954dec642 100644
--- a/src/modules/FileWriter/FileWriter.h
+++ b/src/modules/FileWriter/FileWriter.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <map>
diff --git a/src/modules/FilterEvents/FilterEvents.h b/src/modules/FilterEvents/FilterEvents.h
index 4aa2195d9ec6e57db5355d43936274ce44a981f5..994e00ce6ab43b9a5c8b494accd7e1af14375ca9 100644
--- a/src/modules/FilterEvents/FilterEvents.h
+++ b/src/modules/FilterEvents/FilterEvents.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 #ifndef FILTEREVENTS_H
 #define FILTEREVENTS_H
diff --git a/src/modules/ImproveReferenceTimestamp/ImproveReferenceTimestamp.h b/src/modules/ImproveReferenceTimestamp/ImproveReferenceTimestamp.h
index 5c303f719aa08e0fe9fe0c92ab0a5296f32ca62a..4854b52313eeed812fcaea850b81ed4a43dd08e8 100644
--- a/src/modules/ImproveReferenceTimestamp/ImproveReferenceTimestamp.h
+++ b/src/modules/ImproveReferenceTimestamp/ImproveReferenceTimestamp.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef ImproveReferenceTimestamp_H
diff --git a/src/modules/JSONWriter/JSONWriter.h b/src/modules/JSONWriter/JSONWriter.h
index 4f94854abe71946cd053cfbd3c9f57e295206db0..2ed0afc8c89a8513999d9b834f3de4efa5ec5176 100644
--- a/src/modules/JSONWriter/JSONWriter.h
+++ b/src/modules/JSONWriter/JSONWriter.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  *
  * This module writes specific objects into a user specified text file
  *
diff --git a/src/modules/MaskCreator/MaskCreator.h b/src/modules/MaskCreator/MaskCreator.h
index d4ac4a3669085e8d3c599ba9f7eb33618dffefd1..3aba9ff7f0681b8fc248a164a939c3f66e14e88c 100644
--- a/src/modules/MaskCreator/MaskCreator.h
+++ b/src/modules/MaskCreator/MaskCreator.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef MASKCREATOR_H
diff --git a/src/modules/MaskCreatorTimepix3/MaskCreatorTimepix3.h b/src/modules/MaskCreatorTimepix3/MaskCreatorTimepix3.h
index 4b6c8078808b608c32339704127d2b97a1e3c5b1..f980b4604f8f2ea3f32784ff7ddc64d6d5276a62 100644
--- a/src/modules/MaskCreatorTimepix3/MaskCreatorTimepix3.h
+++ b/src/modules/MaskCreatorTimepix3/MaskCreatorTimepix3.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TIMEPIX3MASKCREATOR_H
diff --git a/src/modules/Metronome/Metronome.h b/src/modules/Metronome/Metronome.h
index 6fd19ca11ffc3dab142002492142b6c90d898f66..6439a8134e4192e2a272ccbc1aa993fc4fca67a6 100644
--- a/src/modules/Metronome/Metronome.h
+++ b/src/modules/Metronome/Metronome.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef Metronome_H
diff --git a/src/modules/OnlineMonitor/GuiDisplay.hpp b/src/modules/OnlineMonitor/GuiDisplay.hpp
index 8833b27c08050a588c70174229d8544f2be83405..30e5a5e7a7df4d5e1c42dce3038a108dc5ee523b 100644
--- a/src/modules/OnlineMonitor/GuiDisplay.hpp
+++ b/src/modules/OnlineMonitor/GuiDisplay.hpp
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CORRYVRECKAN_GUIDISPLAY_H
diff --git a/src/modules/OnlineMonitor/Linkdef.h b/src/modules/OnlineMonitor/Linkdef.h
index 02f70110e0d58670b42cead3be03ba111cb861fe..fc47bee113d830725e034affd6496e3923fe563e 100644
--- a/src/modules/OnlineMonitor/Linkdef.h
+++ b/src/modules/OnlineMonitor/Linkdef.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #pragma link off all globals;
diff --git a/src/modules/OnlineMonitor/OnlineMonitor.h b/src/modules/OnlineMonitor/OnlineMonitor.h
index ec03254aa0bb5001a5dd55cddfffb2ca5a34a570..606f75e2000fc734e7060e7e21ff4c5064cb1324 100644
--- a/src/modules/OnlineMonitor/OnlineMonitor.h
+++ b/src/modules/OnlineMonitor/OnlineMonitor.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef OnlineMonitor_H
diff --git a/src/modules/Prealignment/Prealignment.h b/src/modules/Prealignment/Prealignment.h
index b8be47724997d1133f18e5c31059543da9521434..c57ca449d6014549cf46407b7f5cee2313dc9f44 100644
--- a/src/modules/Prealignment/Prealignment.h
+++ b/src/modules/Prealignment/Prealignment.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef PREALIGNMENT_H
diff --git a/src/modules/TextWriter/TextWriter.h b/src/modules/TextWriter/TextWriter.h
index 0ec4aebbb280def252ad67112a142671b3589d46..b01f2c8608ae1fe1e7b2a53d87fd33b1ad631e5e 100644
--- a/src/modules/TextWriter/TextWriter.h
+++ b/src/modules/TextWriter/TextWriter.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  *
  * This module writes specific objects into a user specified text file
  *
diff --git a/src/modules/Tracking4D/Tracking4D.h b/src/modules/Tracking4D/Tracking4D.h
index 68994b158754673b91d951fe9702dd489af28c0c..1e4e31c2c434cacb8dcac93b45377e24535b5b1a 100644
--- a/src/modules/Tracking4D/Tracking4D.h
+++ b/src/modules/Tracking4D/Tracking4D.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TRACKING4D_H
diff --git a/src/modules/TrackingMultiplet/TrackingMultiplet.h b/src/modules/TrackingMultiplet/TrackingMultiplet.h
index 523689dcc3caf98c2fad963f36fc585e963d400f..1b09d6ddb8225b98e673eefbffe251d906a7f6cc 100644
--- a/src/modules/TrackingMultiplet/TrackingMultiplet.h
+++ b/src/modules/TrackingMultiplet/TrackingMultiplet.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef CORRYVRECKAN_TRACKINGMULTIPLET_H
diff --git a/src/modules/TreeWriterDUT/TreeWriterDUT.h b/src/modules/TreeWriterDUT/TreeWriterDUT.h
index adde00d177d6d91ca45e8dda6d900a62a7ae56d2..bdb2ed4dda03a07a13f3b1a0f9b54270fe0c6934 100644
--- a/src/modules/TreeWriterDUT/TreeWriterDUT.h
+++ b/src/modules/TreeWriterDUT/TreeWriterDUT.h
@@ -6,6 +6,7 @@
  * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
  * In applying this license, 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef TreeWriterDUT_H