diff --git a/components/core/src/clp/clo/CommandLineArguments.cpp b/components/core/src/clp/clo/CommandLineArguments.cpp
index 4e187f985..f0a7f7ecc 100644
--- a/components/core/src/clp/clo/CommandLineArguments.cpp
+++ b/components/core/src/clp/clo/CommandLineArguments.cpp
@@ -8,8 +8,8 @@
 
 #include <boost/program_options.hpp>
 
+#include "../../reducer/types.hpp"
 #include "../cli_utils.hpp"
-#include "../reducer/types.hpp"
 #include "../spdlog_with_specializations.hpp"
 #include "../version.hpp"
 
diff --git a/components/core/src/clp/clp/FileDecompressor.hpp b/components/core/src/clp/clp/FileDecompressor.hpp
index b08a21eb4..17a8b8e43 100644
--- a/components/core/src/clp/clp/FileDecompressor.hpp
+++ b/components/core/src/clp/clp/FileDecompressor.hpp
@@ -6,17 +6,17 @@
 #include <filesystem>
 #include <string>
 
+#include "../ErrorCode.hpp"
 #include "../FileWriter.hpp"
 #include "../ir/constants.hpp"
 #include "../ir/LogEventSerializer.hpp"
+#include "../ir/types.hpp"
 #include "../spdlog_with_specializations.hpp"
 #include "../streaming_archive/MetadataDB.hpp"
 #include "../streaming_archive/reader/Archive.hpp"
 #include "../streaming_archive/reader/File.hpp"
 #include "../streaming_archive/reader/Message.hpp"
-#include "ErrorCode.hpp"
-#include "ir/types.hpp"
-#include "Utils.hpp"
+#include "../Utils.hpp"
 
 namespace clp::clp {
 /**
diff --git a/components/core/src/clp/clp/decompression.cpp b/components/core/src/clp/clp/decompression.cpp
index c42357334..ce7cbd5c7 100644
--- a/components/core/src/clp/clp/decompression.cpp
+++ b/components/core/src/clp/clp/decompression.cpp
@@ -7,12 +7,12 @@
 #include "../FileWriter.hpp"
 #include "../GlobalMySQLMetadataDB.hpp"
 #include "../GlobalSQLiteMetadataDB.hpp"
+#include "../ir/constants.hpp"
 #include "../spdlog_with_specializations.hpp"
 #include "../streaming_archive/reader/Archive.hpp"
 #include "../TraceableException.hpp"
 #include "../Utils.hpp"
 #include "FileDecompressor.hpp"
-#include "ir/constants.hpp"
 #include "utils.hpp"
 
 using std::cerr;
diff --git a/components/core/src/clp/clp/utils.cpp b/components/core/src/clp/clp/utils.cpp
index 0f05d75ac..123f9a836 100644
--- a/components/core/src/clp/clp/utils.cpp
+++ b/components/core/src/clp/clp/utils.cpp
@@ -9,9 +9,9 @@
 #include "../GlobalMySQLMetadataDB.hpp"
 #include "../GlobalSQLiteMetadataDB.hpp"
 #include "../spdlog_with_specializations.hpp"
+#include "../streaming_archive/Constants.hpp"
+#include "../TraceableException.hpp"
 #include "../Utils.hpp"
-#include "streaming_archive/Constants.hpp"
-#include "TraceableException.hpp"
 
 using std::string;
 using std::vector;
diff --git a/components/core/src/clp/clp/utils.hpp b/components/core/src/clp/clp/utils.hpp
index 0a6918445..47adc50f2 100644
--- a/components/core/src/clp/clp/utils.hpp
+++ b/components/core/src/clp/clp/utils.hpp
@@ -7,11 +7,11 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include "../ErrorCode.hpp"
 #include "../GlobalMetadataDB.hpp"
 #include "../GlobalMetadataDBConfig.hpp"
-#include "ErrorCode.hpp"
+#include "../TraceableException.hpp"
 #include "FileToCompress.hpp"
-#include "TraceableException.hpp"
 
 namespace clp::clp {
 // Types
diff --git a/components/core/src/clp/ir/EncodedTextAst.cpp b/components/core/src/clp/ir/EncodedTextAst.cpp
index f0ee4d493..72a8f2729 100644
--- a/components/core/src/clp/ir/EncodedTextAst.cpp
+++ b/components/core/src/clp/ir/EncodedTextAst.cpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "../ffi/encoding_methods.hpp"
-#include "ffi/ir_stream/decoding_methods.hpp"
+#include "../ffi/ir_stream/decoding_methods.hpp"
 
 using clp::ffi::decode_float_var;
 using clp::ffi::decode_integer_var;
diff --git a/components/core/src/clp/ir/LogEvent.hpp b/components/core/src/clp/ir/LogEvent.hpp
index 4a3ef7567..e2d4b310e 100644
--- a/components/core/src/clp/ir/LogEvent.hpp
+++ b/components/core/src/clp/ir/LogEvent.hpp
@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
+#include "../time_types.hpp"
 #include "EncodedTextAst.hpp"
-#include "time_types.hpp"
 #include "types.hpp"
 
 namespace clp::ir {
diff --git a/components/core/src/clp_s/CommandLineArguments.cpp b/components/core/src/clp_s/CommandLineArguments.cpp
index c7fb9487e..fc7427f11 100644
--- a/components/core/src/clp_s/CommandLineArguments.cpp
+++ b/components/core/src/clp_s/CommandLineArguments.cpp
@@ -6,9 +6,9 @@
 #include <spdlog/spdlog.h>
 
 #include "../clp/cli_utils.hpp"
+#include "../clp/type_utils.hpp"
 #include "../reducer/types.hpp"
 #include "FileReader.hpp"
-#include "type_utils.hpp"
 
 namespace po = boost::program_options;