diff --git a/core/base/CbmDigiManager.h b/core/base/CbmDigiManager.h
index 438f719a2a6768f12c254808c126e44000d4fa6b..ab676d6cce488437b1017d44a7fd338230aed206 100644
--- a/core/base/CbmDigiManager.h
+++ b/core/base/CbmDigiManager.h
@@ -23,13 +23,12 @@
 #include <boost/any.hpp>                  // for any_cast, bad_any_cast (ptr...
 #include <boost/exception/exception.hpp>  // for clone_impl, error_info_inje...
 
+#include <cassert>  // for assert
 #include <gsl/span>
 #include <iosfwd>  // for string
 #include <map>     // for map, map<>::mapped_type
 #include <vector>  // for vector
 
-#include <assert.h>  // for assert
-
 class CbmMatch;
 
 /** @brief CbmDigiManager
diff --git a/core/data/mvd/CbmMvdHit.h b/core/data/mvd/CbmMvdHit.h
index 78aad9d551ec9b912ce701435beaa1404f7dc841..6e99b9fe1de0784b446103299316b764e6d0329f 100644
--- a/core/data/mvd/CbmMvdHit.h
+++ b/core/data/mvd/CbmMvdHit.h
@@ -53,7 +53,7 @@ public:
 
 
   /** Output to screen **/
-  virtual void Print(const Option_t* opt = 0) const;
+  virtual void Print(const Option_t* opt = nullptr) const;
 
 
   /** Accessors **/
diff --git a/reco/detectors/sts/CbmStsFindTracks.h b/reco/detectors/sts/CbmStsFindTracks.h
index f2478527e36c7bfc7c661a0faf28947f588b9d01..41f22c7ff39eb22be1c03603324376bc5af50e84 100644
--- a/reco/detectors/sts/CbmStsFindTracks.h
+++ b/reco/detectors/sts/CbmStsFindTracks.h
@@ -48,7 +48,7 @@ public:
    *@param finder   Pointer to STS track finder concrete class
    *@param useMvd   Include MVD hits in track finding
    **/
-  CbmStsFindTracks(Int_t iVerbose, CbmStsTrackFinder* finder = NULL, Bool_t useMvd = kTRUE,
+  CbmStsFindTracks(Int_t iVerbose, CbmStsTrackFinder* finder = nullptr, Bool_t useMvd = kTRUE,
                    const char* name = "STSFindTracks");