diff --git a/PWGEM/Dilepton/Core/PWGEMDileptonCoreLinkDef.h b/PWGEM/Dilepton/Core/PWGEMDileptonCoreLinkDef.h
index fe78534478e..a0ba6d2b630 100644
--- a/PWGEM/Dilepton/Core/PWGEMDileptonCoreLinkDef.h
+++ b/PWGEM/Dilepton/Core/PWGEMDileptonCoreLinkDef.h
@@ -9,8 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef PWGEM_DILEPTON_CORE_PWGEMDILEPTONCORELINKDEF_H_
-#define PWGEM_DILEPTON_CORE_PWGEMDILEPTONCORELINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -20,5 +19,3 @@
 #pragma link C++ class DielectronCut + ;
 #pragma link C++ class DimuonCut + ;
 #pragma link C++ class EMTrackCut + ;
-
-#endif // PWGEM_DILEPTON_CORE_PWGEMDILEPTONCORELINKDEF_H_
diff --git a/PWGEM/Dilepton/DataModel/EvSelFlags.h b/PWGEM/Dilepton/DataModel/EvSelFlags.h
index 0b05ff288eb..ae4d65a548b 100644
--- a/PWGEM/Dilepton/DataModel/EvSelFlags.h
+++ b/PWGEM/Dilepton/DataModel/EvSelFlags.h
@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef PWGEM_DILEPTON_CORE_EVSELFLAGS_H
-#define PWGEM_DILEPTON_CORE_EVSELFLAGS_H
+#ifndef PWGEM_DILEPTON_DATAMODEL_EVSELFLAGS_H_
+#define PWGEM_DILEPTON_DATAMODEL_EVSELFLAGS_H_
 
 namespace o2::aod::emevsel
 {
@@ -37,4 +37,4 @@ enum EventSelectionFlags {
 };
 } // namespace o2::aod::emevsel
 
-#endif // PWGEM_DILEPTON_CORE_EVSELFLAGS_H
+#endif // PWGEM_DILEPTON_DATAMODEL_EVSELFLAGS_H_
diff --git a/PWGEM/Tasks/phosCalibration.cxx b/PWGEM/Tasks/phosCalibration.cxx
index 5e62addf7dc..0f244127a0e 100644
--- a/PWGEM/Tasks/phosCalibration.cxx
+++ b/PWGEM/Tasks/phosCalibration.cxx
@@ -44,6 +44,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <memory>
+#include <string>
 #include <vector>
 
 using namespace o2;