diff --git a/DataFormats/Headers/include/Headers/DataHeader.h b/DataFormats/Headers/include/Headers/DataHeader.h
index e4ddaded20aba..2dbfbd67d8d6c 100644
--- a/DataFormats/Headers/include/Headers/DataHeader.h
+++ b/DataFormats/Headers/include/Headers/DataHeader.h
@@ -372,9 +372,9 @@ struct BaseHeader {
   union {
     uint32_t flags;
     struct {
-      uint32_t flagsNextHeader : 1,        // do we have a next header after this one?
-               flagsReserved : 15,         // reserved for future use
-               flagsDerivedHeader : 16;    // reserved for usage by the derived header
+      uint32_t flagsNextHeader : 1, // do we have a next header after this one?
+        flagsReserved : 15,         // reserved for future use
+        flagsDerivedHeader : 16;    // reserved for usage by the derived header
     };
   };
 
diff --git a/Framework/Core/include/Framework/DeviceContext.h b/Framework/Core/include/Framework/DeviceContext.h
index 04cf663d5e276..f0c3021d86dc8 100644
--- a/Framework/Core/include/Framework/DeviceContext.h
+++ b/Framework/Core/include/Framework/DeviceContext.h
@@ -33,12 +33,12 @@ struct DeviceContext {
   int expectedRegionCallbacks = 0;
   // The timeout for the data processing to stop on this device.
   // After this is reached, incoming data not marked to be kept will
-  // be dropped and the data processing will be stopped. However the 
+  // be dropped and the data processing will be stopped. However the
   // calibrations will still be done and objects resulting from calibrations
   // will be marked to be kept.
   int dataProcessingTimeout = 0;
   // The timeout for the whole processing to stop on this device.
-  // This includes the grace period for processing and the time 
+  // This includes the grace period for processing and the time
   // for the calibrations to be done.
   int exitTransitionTimeout = 0;
 };