diff --git a/algo/detectors/rich/ReadoutConfig.h b/algo/detectors/rich/ReadoutConfig.h
index 2b1e210ea8e9479738c56ff44d33d875b14def33..103ebf0809b1254229a11539ca5261e3df474b93 100644
--- a/algo/detectors/rich/ReadoutConfig.h
+++ b/algo/detectors/rich/ReadoutConfig.h
@@ -5,6 +5,7 @@
 #ifndef ALGO_DETECTORS_RICH_READOUTCONFIG_H
 #define ALGO_DETECTORS_RICH_READOUTCONFIG_H
 
+#include <cstdint>
 #include <map>
 #include <sstream>
 #include <utility>
diff --git a/algo/detectors/tof/ClusterizerPars.h b/algo/detectors/tof/ClusterizerPars.h
index f212df3aaa31776a25e989b32ffdd40a7df3ee75..16538c0772a451da6ad6a4aa181b982be4074d1c 100644
--- a/algo/detectors/tof/ClusterizerPars.h
+++ b/algo/detectors/tof/ClusterizerPars.h
@@ -6,9 +6,9 @@
 #include "Math/Rotation3D.h"
 #include "Math/Vector3Dfwd.h"
 
+#include <cstdint>
 #include <vector>
 
-
 namespace cbm::algo::tof
 {
   struct TofCell {
diff --git a/core/base/utils/flestools/CbmFlesCanvasTools.h b/core/base/utils/flestools/CbmFlesCanvasTools.h
index 7e0cb5a7eef1d58019b840071e883f53fae7ca30..237fb989eb7774afb83dcdda04553ee5ddf4cab2 100644
--- a/core/base/utils/flestools/CbmFlesCanvasTools.h
+++ b/core/base/utils/flestools/CbmFlesCanvasTools.h
@@ -12,6 +12,7 @@
 #ifndef CbmFlesCanvasTools_H
 #define CbmFlesCanvasTools_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -19,7 +20,7 @@ class TPad;
 class TCanvas;
 
 class CanvasConfig {
-public:
+ public:
   CanvasConfig();
   CanvasConfig(std::string sName, std::string sTitle, uint32_t uNbPadsX, uint32_t uNbPadsY);
 
@@ -47,7 +48,7 @@ public:
   bool SetConfig(uint32_t uPadIdx, bool bGridx, bool bGridy, bool bLogx, bool bLogy, bool bLogz,
                  std::vector<std::string> vsObjName, std::vector<std::string> vsOptions);
 
-private:
+ private:
   std::string fsName;
   std::string fsTitle;
   uint32_t fuNbPads;
diff --git a/core/base/utils/flestools/CbmFormatDecHexPrintout.h b/core/base/utils/flestools/CbmFormatDecHexPrintout.h
index 040c1a121bdd39284f14dc64a99a8dad297fd265..17c9c1659f6c0b5c77057552441bd61c0413ddaa 100644
--- a/core/base/utils/flestools/CbmFormatDecHexPrintout.h
+++ b/core/base/utils/flestools/CbmFormatDecHexPrintout.h
@@ -12,6 +12,7 @@
 #ifndef CbmFormatDecHexPrintout_H
 #define CbmFormatDecHexPrintout_H
 
+#include <cstdint>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
diff --git a/core/detectors/trd/CbmTrdParSpadic.h b/core/detectors/trd/CbmTrdParSpadic.h
index fd11ae6e892b33afe196ce067f9b9d2b9d47db93..6e9343ff0d723c1fe35e0eca9daec2948a6cec54 100644
--- a/core/detectors/trd/CbmTrdParSpadic.h
+++ b/core/detectors/trd/CbmTrdParSpadic.h
@@ -12,16 +12,15 @@
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Int_t, Double_t, UInt_t
 
-#include <map>     // fMapAsicChannelToElink
-#include <vector>  // fVecSpadicChannels
-
-#include <stdint.h>  // for size_t, uint8_t, uint16_t
+#include <cstdint>  // for size_t, uint8_t, uint16_t
+#include <map>      // fMapAsicChannelToElink
+#include <vector>   // fVecSpadicChannels
 
 class FairParamList;
 
 /** \brief Definition of SPADIC parameters **/
 class CbmTrdParSpadic : public CbmTrdParAsic {
-public:
+ public:
   CbmTrdParSpadic(Int_t address = 0, Int_t FebGrouping = -1, Double_t x = 0, Double_t y = 0, Double_t z = 0,
                   size_t compId = 0);
   virtual ~CbmTrdParSpadic() { ; }
@@ -75,7 +74,7 @@ public:
   ///< Returns the nth asic Channel in asic coordinates in single asic padplane coordinates. Spadic channels are not mapped from 00 to 31 in padplane coordinates, this function returns the padplane channelnumber in the system of one asic(not in the channel map of a full module !)
 
 
-private:
+ private:
   static Double_t fgSizeX;  ///< SPADIC half size in x [cm]
   static Double_t fgSizeY;  ///< SPADIC half size in y [cm]
   static Double_t fgSizeZ;  ///< SPADIC half size in z [cm]
diff --git a/services/histserv/app/ProgramOptions.h b/services/histserv/app/ProgramOptions.h
index 18a3fde0f64c1c89f538d4c43263661eeb8db398..8247c7513f0c2e33957dc2bbbc96d50947da6c50 100644
--- a/services/histserv/app/ProgramOptions.h
+++ b/services/histserv/app/ProgramOptions.h
@@ -5,6 +5,7 @@
 #ifndef CBM_SERVICES_HISTSERV_APP_PROGRAMOPTIONS_H
 #define CBM_SERVICES_HISTSERV_APP_PROGRAMOPTIONS_H 1
 
+#include <cstdint>
 #include <string>
 
 namespace cbm::services::histserv
@@ -17,7 +18,7 @@ namespace cbm::services::histserv
    ** Program option class for the application histserv_nofairmq
    **/
   class ProgramOptions {
-  public:
+   public:
     /** @brief Standard constructor with command line arguments **/
     ProgramOptions(int argc, char* argv[]) { ParseOptions(argc, argv); }
 
@@ -54,12 +55,12 @@ namespace cbm::services::histserv
     // /** @brief Get configuration file name (YAML format) **/
     // [[nodiscard]] const std::string& ConfigFile() const { return fConfig; }
 
-  private:
+   private:
     /** @brief Parse command line arguments using boost program_options **/
     void ParseOptions(int argc, char* argv[]);
 
 
-  private:  // members
+   private:  // members
     std::string fsChanHistosIn   = "tcp://127.0.0.1:56800";
     int32_t fiHistosInZmqHwm     = 1;                   ///< High-Water Mark, default keep only 1 update in buffer
     int32_t fiHistosInZmqRcvToMs = 10;                  ///< Timeout in ms: -1 = block, 0 = instant, val = nb ms