diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h
index c6d786a6..fa9c5912 100644
--- a/fairmq/FairMQDevice.h
+++ b/fairmq/FairMQDevice.h
@@ -9,17 +9,17 @@
 #ifndef FAIRMQDEVICE_H_
 #define FAIRMQDEVICE_H_
 
-#include <StateMachine.h>
-#include <FairMQTransportFactory.h>
-#include <fairmq/Transports.h>
-#include <fairmq/StateQueue.h>
-
 #include <FairMQChannel.h>
+#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQParts.h>
+#include <FairMQTransportFactory.h>
 #include <FairMQUnmanagedRegion.h>
-#include <FairMQLogger.h>
 #include <fairmq/ProgOptions.h>
+#include <fairmq/StateMachine.h>
+#include <fairmq/StateQueue.h>
+#include <fairmq/Transports.h>
+#include <fairmq/tools/Version.h>
 
 #include <vector>
 #include <memory> // unique_ptr
@@ -34,8 +34,6 @@
 #include <cstddef>
 #include <utility> // pair
 
-#include <fairmq/tools/Version.h>
-
 using FairMQChannelMap = std::unordered_map<std::string, std::vector<FairMQChannel>>;
 
 using InputMsgCallback = std::function<bool(FairMQMessagePtr&, int)>;
diff --git a/fairmq/MemoryResources.h b/fairmq/MemoryResources.h
index fe02d346..2c894666 100644
--- a/fairmq/MemoryResources.h
+++ b/fairmq/MemoryResources.h
@@ -15,7 +15,7 @@
 #ifndef FAIR_MQ_MEMORY_RESOURCES_H
 #define FAIR_MQ_MEMORY_RESOURCES_H
 
-#include <fairmq/FairMQMessage.h>
+#include <FairMQMessage.h>
 class FairMQTransportFactory;
 
 #include <boost/container/container_fwd.hpp>
diff --git a/fairmq/devices/FairMQBenchmarkSampler.h b/fairmq/devices/FairMQBenchmarkSampler.h
index c2408e2b..a5d1cbe8 100644
--- a/fairmq/devices/FairMQBenchmarkSampler.h
+++ b/fairmq/devices/FairMQBenchmarkSampler.h
@@ -9,9 +9,9 @@
 #ifndef FAIRMQBENCHMARKSAMPLER_H_
 #define FAIRMQBENCHMARKSAMPLER_H_
 
-#include "../FairMQLogger.h"
+#include "FairMQLogger.h"
 #include "FairMQDevice.h"
-#include "tools/RateLimit.h"
+#include "fairmq/tools/RateLimit.h"
 
 #include <chrono>
 #include <cstddef>   // size_t
diff --git a/fairmq/devices/FairMQMerger.h b/fairmq/devices/FairMQMerger.h
index c3e097ba..3d13a138 100644
--- a/fairmq/devices/FairMQMerger.h
+++ b/fairmq/devices/FairMQMerger.h
@@ -16,8 +16,8 @@
 #define FAIRMQMERGER_H_
 
 #include "FairMQDevice.h"
-#include "../FairMQPoller.h"
-#include "../FairMQLogger.h"
+#include "FairMQPoller.h"
+#include "FairMQLogger.h"
 
 #include <string>
 #include <vector>
diff --git a/fairmq/devices/FairMQSink.h b/fairmq/devices/FairMQSink.h
index 8308d66f..5721cf02 100644
--- a/fairmq/devices/FairMQSink.h
+++ b/fairmq/devices/FairMQSink.h
@@ -15,8 +15,8 @@
 #ifndef FAIRMQSINK_H_
 #define FAIRMQSINK_H_
 
-#include "../FairMQDevice.h"
-#include "../FairMQLogger.h"
+#include "FairMQDevice.h"
+#include "FairMQLogger.h"
 #include <fairmq/tools/Strings.h>
 
 #include <chrono>
diff --git a/fairmq/run/runBenchmarkSampler.cxx b/fairmq/run/runBenchmarkSampler.cxx
index d4a2a991..db2d06b2 100644
--- a/fairmq/run/runBenchmarkSampler.cxx
+++ b/fairmq/run/runBenchmarkSampler.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQBenchmarkSampler.h>
+#include <fairmq/devices/FairMQBenchmarkSampler.h>
 
 namespace bpo = boost::program_options;
 
diff --git a/fairmq/run/runMerger.cxx b/fairmq/run/runMerger.cxx
index c6d8cd1f..c3e4eac7 100644
--- a/fairmq/run/runMerger.cxx
+++ b/fairmq/run/runMerger.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQMerger.h>
+#include <fairmq/devices/FairMQMerger.h>
 
 namespace bpo = boost::program_options;
 
diff --git a/fairmq/run/runMultiplier.cxx b/fairmq/run/runMultiplier.cxx
index d1f17559..e14e4c85 100644
--- a/fairmq/run/runMultiplier.cxx
+++ b/fairmq/run/runMultiplier.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQMultiplier.h>
+#include <fairmq/devices/FairMQMultiplier.h>
 
 namespace bpo = boost::program_options;
 
diff --git a/fairmq/run/runProxy.cxx b/fairmq/run/runProxy.cxx
index 1a1d25b0..d8bf5918 100644
--- a/fairmq/run/runProxy.cxx
+++ b/fairmq/run/runProxy.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQProxy.h>
+#include <fairmq/devices/FairMQProxy.h>
 
 namespace bpo = boost::program_options;
 
diff --git a/fairmq/run/runSink.cxx b/fairmq/run/runSink.cxx
index 194eb3d7..55dabcf2 100644
--- a/fairmq/run/runSink.cxx
+++ b/fairmq/run/runSink.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQSink.h>
+#include <fairmq/devices/FairMQSink.h>
 
 namespace bpo = boost::program_options;
 
diff --git a/fairmq/run/runSplitter.cxx b/fairmq/run/runSplitter.cxx
index 6b0af4e5..241207c7 100644
--- a/fairmq/run/runSplitter.cxx
+++ b/fairmq/run/runSplitter.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <runFairMQDevice.h>
-#include <devices/FairMQSplitter.h>
+#include <fairmq/devices/FairMQSplitter.h>
 
 namespace bpo = boost::program_options;