DPL: refactor include statements to ensure atomicity

This refactors a few include statements orders to improve chances
our headers are fully self contained.

Author: ktf

Framework/Core/include/Framework/ChannelConfigurationPolicy.h

@@ -10,11 +10,12 @@
 #ifndef FRAMEWORK_CHANNELCONFIGURATIONPOLICY_H
 #define FRAMEWORK_CHANNELCONFIGURATIONPOLICY_H
 
-#include <functional>
 #include "Framework/ChannelConfigurationPolicyHelpers.h"
 #include "Framework/ChannelSpec.h"
 #include "Framework/DeviceSpec.h"
 
+#include <functional>
+
 namespace o2
 {
 namespace framework

Framework/Core/include/Framework/ConfigParamSpec.h

@@ -10,9 +10,10 @@
 #ifndef FRAMEWORK_CONFIGPARAMSPEC_H
 #define FRAMEWORK_CONFIGPARAMSPEC_H
 
-#include <string>
 #include "Framework/Variant.h"
 
+#include <string>
+
 namespace o2
 {
 namespace framework

Framework/Core/include/Framework/DataAllocator.h

@@ -10,7 +10,6 @@
 #ifndef FRAMEWORK_DATAALLOCATOR_H
 #define FRAMEWORK_DATAALLOCATOR_H
 
-#include "Headers/DataHeader.h"
 #include "Framework/ContextRegistry.h"
 #include "Framework/MessageContext.h"
 #include "Framework/RootObjectContext.h"
@@ -27,16 +26,17 @@
 #include "Framework/SerializationMethods.h"
 #include "Framework/TableBuilder.h"
 
+#include "Headers/DataHeader.h"
+#include <TClass.h>
+#include <gsl/span>
+
 #include <vector>
 #include <map>
 #include <string>
 #include <utility>
 #include <type_traits>
-#include <gsl/span>
 #include <utility>
 
-#include <TClass.h>
-
 // Do not change this for a full inclusion of FairMQDevice.
 class FairMQDevice;
 class FairMQMessage;

Framework/Core/include/Framework/DataProcessingDevice.h

@@ -10,9 +10,6 @@
 #ifndef FRAMEWORK_DATAPROCESSING_DEVICE_H
 #define FRAMEWORK_DATAPROCESSING_DEVICE_H
 
-#include <fairmq/FairMQDevice.h>
-#include <fairmq/FairMQParts.h>
-
 #include "Framework/AlgorithmSpec.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/ContextRegistry.h"
@@ -29,6 +26,9 @@
 #include "Framework/ForwardRoute.h"
 #include "Framework/TimingInfo.h"
 
+#include <fairmq/FairMQDevice.h>
+#include <fairmq/FairMQParts.h>
+
 #include <memory>
 
 namespace o2

Framework/Core/include/Framework/DataRefUtils.h

@@ -11,15 +11,18 @@
 #define FRAMEWORK_DATAREFUTILS_H
 
 #include "Framework/DataRef.h"
-#include "Headers/DataHeader.h"
 #include "Framework/TMessageSerializer.h"
 #include "Framework/SerializationMethods.h"
 #include "Framework/TypeTraits.h"
+
+#include "Headers/DataHeader.h"
+
 #include <TClass.h>
+#include <gsl/gsl>
+
 #include <stdexcept>
 #include <sstream>
 #include <type_traits>
-#include <gsl/gsl>
 
 namespace o2
 {

Framework/Core/include/Framework/DataSamplingConfig.h

@@ -16,13 +16,14 @@
 ///
 /// \author Piotr Konopka, piotr.jan.konopka@cern.ch
 
-#include <vector>
-#include <string>
-
 #include "Framework/InputSpec.h"
 #include "Framework/OutputSpec.h"
+
 #include "Headers/DataHeader.h"
 
+#include <vector>
+#include <string>
+
 namespace o2
 {
 namespace framework

Framework/Core/include/Framework/InputSpec.h

@@ -10,11 +10,12 @@
 #ifndef FRAMEWORK_INPUTSPEC_H
 #define FRAMEWORK_INPUTSPEC_H
 
-#include <string>
-#include <ostream>
 #include "Framework/Lifetime.h"
 #include "Headers/DataHeader.h"
 
+#include <string>
+#include <ostream>
+
 namespace o2
 {
 namespace framework

Framework/Core/include/Framework/LifetimeHelpers.h

@@ -10,11 +10,12 @@
 #ifndef FRAMEWORK_LIFETIMEHELPERS_H
 #define FRAMEWORK_LIFETIMEHELPERS_H
 
-#include <functional>
-#include <chrono>
 #include "Framework/ExpirationHandler.h"
 #include "Framework/PartRef.h"
 
+#include <functional>
+#include <chrono>
+
 namespace o2
 {
 namespace framework

Framework/Core/include/Framework/MessageContext.h

@@ -10,9 +10,11 @@
 #ifndef FRAMEWORK_MESSAGECONTEXT_H
 #define FRAMEWORK_MESSAGECONTEXT_H
 
-#include <fairmq/FairMQParts.h>
 #include "Framework/ContextRegistry.h"
 #include "Framework/FairMQDeviceProxy.h"
+
+#include <fairmq/FairMQParts.h>
+
 #include <vector>
 #include <cassert>
 #include <string>

Framework/Core/include/Framework/runDataProcessing.h

@@ -10,9 +10,6 @@
 #ifndef FRAMEWORK_RUN_DATA_PROCESSING_H
 #define FRAMEWORK_RUN_DATA_PROCESSING_H
 
-#include <unistd.h>
-#include <vector>
-#include <cstring>
 #include "Framework/ChannelConfigurationPolicy.h"
 #include "Framework/CompletionPolicy.h"
 #include "Framework/ConfigParamsHelper.h"
@@ -24,6 +21,10 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
+#include <unistd.h>
+#include <vector>
+#include <cstring>
+
 namespace o2
 {
 namespace framework