diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
index 3898513df5ec..31fa4c19f137 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
@@ -12,11 +12,11 @@
 #include <string>
 
 #include "ADARA.h"
-#include "MantidKernel/System.h"
+#include "MantidLiveData/DllConfig.h"
 
 namespace ADARA {
 
-class DLLExport PacketHeader {
+class MANTID_LIVEDATA_DLL PacketHeader {
 public:
   PacketHeader(const uint8_t *data) {
     const uint32_t *field = reinterpret_cast<const uint32_t *>(data);
@@ -67,7 +67,7 @@ class DLLExport PacketHeader {
   PacketHeader();
 };
 
-class DLLExport Packet : public PacketHeader {
+class MANTID_LIVEDATA_DLL Packet : public PacketHeader {
 public:
   Packet(const uint8_t *data, uint32_t len);
   Packet(const Packet &pkt);
@@ -88,7 +88,7 @@ class DLLExport Packet : public PacketHeader {
   Packet &operator=(const Packet &pkt);
 };
 
-class DLLExport RawDataPkt : public Packet {
+class MANTID_LIVEDATA_DLL RawDataPkt : public Packet {
 public:
   RawDataPkt(const RawDataPkt &pkt);
 
@@ -120,7 +120,7 @@ class DLLExport RawDataPkt : public Packet {
   friend class MappedDataPkt;
 };
 
-class DLLExport MappedDataPkt : public RawDataPkt {
+class MANTID_LIVEDATA_DLL MappedDataPkt : public RawDataPkt {
 public:
 private:
   MappedDataPkt(const uint8_t *data, uint32_t len);
@@ -128,7 +128,7 @@ class DLLExport MappedDataPkt : public RawDataPkt {
   friend class Parser;
 };
 
-class DLLExport RTDLPkt : public Packet {
+class MANTID_LIVEDATA_DLL RTDLPkt : public Packet {
 public:
   RTDLPkt(const RTDLPkt &pkt);
 
@@ -184,7 +184,7 @@ class DLLExport RTDLPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport SourceListPkt : public Packet {
+class MANTID_LIVEDATA_DLL SourceListPkt : public Packet {
 public:
   const uint32_t *ids() const { return reinterpret_cast<const uint32_t *>(payload()); }
   uint32_t num_ids() const { return (uint32_t)payload_length() / (uint32_t)sizeof(uint32_t); }
@@ -195,7 +195,7 @@ class DLLExport SourceListPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport BankedEventPkt : public Packet {
+class MANTID_LIVEDATA_DLL BankedEventPkt : public Packet {
 public:
   BankedEventPkt(const BankedEventPkt &pkt);
 
@@ -261,7 +261,7 @@ class DLLExport BankedEventPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport BeamMonitorPkt : public Packet {
+class MANTID_LIVEDATA_DLL BeamMonitorPkt : public Packet {
 public:
   BeamMonitorPkt(const BeamMonitorPkt &pkt);
 
@@ -299,7 +299,7 @@ class DLLExport BeamMonitorPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport PixelMappingPkt : public Packet {
+class MANTID_LIVEDATA_DLL PixelMappingPkt : public Packet {
 public:
   // TODO implement accessors for fields
 private:
@@ -308,7 +308,7 @@ class DLLExport PixelMappingPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport RunStatusPkt : public Packet {
+class MANTID_LIVEDATA_DLL RunStatusPkt : public Packet {
 public:
   RunStatusPkt(const RunStatusPkt &pkt);
 
@@ -325,7 +325,7 @@ class DLLExport RunStatusPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport RunInfoPkt : public Packet {
+class MANTID_LIVEDATA_DLL RunInfoPkt : public Packet {
 public:
   const std::string &info() const { return m_xml; }
 
@@ -337,7 +337,7 @@ class DLLExport RunInfoPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport TransCompletePkt : public Packet {
+class MANTID_LIVEDATA_DLL TransCompletePkt : public Packet {
 public:
   TransCompletePkt(const TransCompletePkt &pkt);
 
@@ -353,7 +353,7 @@ class DLLExport TransCompletePkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport ClientHelloPkt : public Packet {
+class MANTID_LIVEDATA_DLL ClientHelloPkt : public Packet {
 public:
   enum Flags {
     PAUSE_AGNOSTIC = 0x0000,
@@ -373,7 +373,7 @@ class DLLExport ClientHelloPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport AnnotationPkt : public Packet {
+class MANTID_LIVEDATA_DLL AnnotationPkt : public Packet {
 public:
   AnnotationPkt(const AnnotationPkt &pkt);
 
@@ -400,7 +400,7 @@ class DLLExport AnnotationPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport SyncPkt : public Packet {
+class MANTID_LIVEDATA_DLL SyncPkt : public Packet {
 public:
   // TODO implement accessors for fields
 private:
@@ -409,7 +409,7 @@ class DLLExport SyncPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport HeartbeatPkt : public Packet {
+class MANTID_LIVEDATA_DLL HeartbeatPkt : public Packet {
 public:
 private:
   HeartbeatPkt(const uint8_t *data, uint32_t len);
@@ -417,7 +417,7 @@ class DLLExport HeartbeatPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport GeometryPkt : public Packet {
+class MANTID_LIVEDATA_DLL GeometryPkt : public Packet {
 public:
   const std::string &info() const { return m_xml; }
 
@@ -429,7 +429,7 @@ class DLLExport GeometryPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport BeamlineInfoPkt : public Packet {
+class MANTID_LIVEDATA_DLL BeamlineInfoPkt : public Packet {
 public:
   const uint32_t &targetStationNumber() const { return m_targetStationNumber; }
 
@@ -449,7 +449,7 @@ class DLLExport BeamlineInfoPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport BeamMonitorConfigPkt : public Packet {
+class MANTID_LIVEDATA_DLL BeamMonitorConfigPkt : public Packet {
 public:
   BeamMonitorConfigPkt(const BeamMonitorConfigPkt &pkt);
 
@@ -498,7 +498,7 @@ class DLLExport BeamMonitorConfigPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport DetectorBankSetsPkt : public Packet {
+class MANTID_LIVEDATA_DLL DetectorBankSetsPkt : public Packet {
 public:
   DetectorBankSetsPkt(const DetectorBankSetsPkt &pkt) = delete;
   DetectorBankSetsPkt &operator=(DetectorBankSetsPkt) = delete;
@@ -617,7 +617,7 @@ class DLLExport DetectorBankSetsPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport DataDonePkt : public Packet {
+class MANTID_LIVEDATA_DLL DataDonePkt : public Packet {
 public:
 private:
   DataDonePkt(const uint8_t *data, uint32_t len);
@@ -625,7 +625,7 @@ class DLLExport DataDonePkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport DeviceDescriptorPkt : public Packet {
+class MANTID_LIVEDATA_DLL DeviceDescriptorPkt : public Packet {
 public:
   uint32_t devId() const { return m_devId; }
   const std::string &description() const { return m_desc; }
@@ -645,7 +645,7 @@ class DLLExport DeviceDescriptorPkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport VariableU32Pkt : public Packet {
+class MANTID_LIVEDATA_DLL VariableU32Pkt : public Packet {
 public:
   VariableU32Pkt(const VariableU32Pkt &pkt);
 
@@ -668,7 +668,7 @@ class DLLExport VariableU32Pkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport VariableDoublePkt : public Packet {
+class MANTID_LIVEDATA_DLL VariableDoublePkt : public Packet {
 public:
   VariableDoublePkt(const VariableDoublePkt &pkt);
 
@@ -691,7 +691,7 @@ class DLLExport VariableDoublePkt : public Packet {
   friend class Parser;
 };
 
-class DLLExport VariableStringPkt : public Packet {
+class MANTID_LIVEDATA_DLL VariableStringPkt : public Packet {
 public:
   VariableStringPkt(const VariableStringPkt &pkt);
 
diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
index 1cf3053176f2..505d565562ac 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
@@ -7,6 +7,7 @@
 
 #include "ADARA.h"
 #include "ADARAPackets.h"
+#include "MantidLiveData/DllConfig.h"
 
 namespace ADARA {
 
@@ -19,7 +20,7 @@ namespace ADARA {
 
     Copyright &copy; 2012 Oak Ridge National Laboratory
  **/
-class DLLExport Parser {
+class MANTID_LIVEDATA_DLL Parser {
 public:
   /// Constructor
   Parser(uint32_t initial_buffer_size = 1024 * 1024, uint32_t max_pkt_size = 8 * 1024 * 1024);
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
index 38e7c56b1c83..0498f2068848 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
@@ -10,6 +10,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/Algorithm.h"
+#include "MantidLiveData/DllConfig.h"
 
 namespace Mantid {
 namespace LiveData {
@@ -24,7 +25,7 @@ namespace LiveData {
     different time regime (they have different binning to the rest of the
     spectra).
 */
-class DLLExport FakeISISHistoDAE final : public API::Algorithm {
+class MANTID_LIVEDATA_DLL FakeISISHistoDAE final : public API::Algorithm {
 public:
   /// Algorithm's name for identification overriding a virtual method
   const std::string name() const override { return "FakeISISHistoDAE"; }
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
index 4818891af460..6b344ad40c22 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
@@ -17,7 +17,7 @@ namespace LiveData {
   Defines the interface used to communicate with a Kafka broker such as
   subscribing to topics.
 */
-class DLLExport IKafkaBroker {
+class MANTID_LIVEDATA_DLL IKafkaBroker {
 public:
   virtual ~IKafkaBroker() = default;
 
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
index 3087a27fdbde..15b3977071e9 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
@@ -8,6 +8,7 @@
 
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidDataObjects/EventWorkspace.h"
+#include "MantidLiveData/DllConfig.h"
 #include "MantidLiveData/Kafka/IKafkaBroker.h"
 #include "MantidLiveData/Kafka/IKafkaStreamSubscriber.h"
 
@@ -24,7 +25,7 @@ namespace LiveData {
 Kafka stream decoder interface. Handles (implements) all thread synchronization
 functionality for accessing the data stream and processing data.
 */
-class DLLExport IKafkaStreamDecoder {
+class MANTID_LIVEDATA_DLL IKafkaStreamDecoder {
 public:
   /**
    * Defines a thread-safe callback. A mutex is held
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
index 511a84c7ce74..6274bed78de9 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
@@ -6,7 +6,8 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
+#include "MantidLiveData/DllConfig.h"
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -27,7 +28,7 @@ enum class SubscribeAtOption {
 /**
   Interface for classes that subscribe to Kafka streams.
 */
-class DLLExport IKafkaStreamSubscriber {
+class MANTID_LIVEDATA_DLL IKafkaStreamSubscriber {
 public:
   virtual ~IKafkaStreamSubscriber() = default;
   virtual void subscribe() = 0;
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
index a092ea2a7aad..73c37984828d 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
@@ -14,7 +14,7 @@ namespace LiveData {
 /**
   Wraps communication with a Kafka broker at a given address.
 */
-class DLLExport KafkaBroker : public IKafkaBroker {
+class MANTID_LIVEDATA_DLL KafkaBroker : public IKafkaBroker {
 public:
   explicit KafkaBroker(std::string address);
 
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
index dd6d748f749a..1dd034d4397b 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
@@ -9,6 +9,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/LiveListener.h"
+#include "MantidLiveData/DllConfig.h"
 
 //----------------------------------------------------------------------
 // Forward declarations
@@ -31,7 +32,7 @@ class KafkaEventStreamDecoder;
   need updating if the schema changes.
   Some further documentation is in docs/source/concepts/KafkaLiveStreams.rst
  */
-class DLLExport KafkaEventListener : public API::LiveListener {
+class MANTID_LIVEDATA_DLL KafkaEventListener : public API::LiveListener {
 public:
   KafkaEventListener();
   ~KafkaEventListener() override = default;
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
index c57b1fe04d75..139c263010d0 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
@@ -8,6 +8,7 @@
 
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidDataObjects/EventWorkspace.h"
+#include "MantidLiveData/DllConfig.h"
 #include "MantidLiveData/Kafka/IKafkaBroker.h"
 #include "MantidLiveData/Kafka/IKafkaStreamDecoder.h"
 #include "MantidLiveData/Kafka/IKafkaStreamSubscriber.h"
@@ -23,7 +24,7 @@ namespace LiveData {
   A call to capture() starts the process of capturing the stream on a separate
   thread.
 */
-class DLLExport KafkaEventStreamDecoder : public IKafkaStreamDecoder {
+class MANTID_LIVEDATA_DLL KafkaEventStreamDecoder : public IKafkaStreamDecoder {
 public:
   struct BufferedPulse {
     Types::Core::DateAndTime pulseTime;
@@ -82,7 +83,7 @@ class DLLExport KafkaEventStreamDecoder : public IKafkaStreamDecoder {
   const std::size_t m_intermediateBufferFlushThreshold;
 };
 
-DLLExport std::vector<size_t>
+MANTID_LIVEDATA_DLL std::vector<size_t>
 computeGroupBoundaries(const std::vector<KafkaEventStreamDecoder::BufferedEvent> &eventBuffer,
                        const size_t numberOfGroups);
 
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
index 57e0ae7d5989..1f3e345aa425 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
@@ -9,6 +9,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/LiveListener.h"
+#include "MantidLiveData/DllConfig.h"
 
 //----------------------------------------------------------------------
 // Forward declarations
@@ -23,7 +24,7 @@ class KafkaHistoStreamDecoder;
   format from the Kafka system at ISIS. It currently parses the histogram data
   directly using flatbuffers so will need updating if the schema changes.
  */
-class DLLExport KafkaHistoListener : public API::LiveListener {
+class MANTID_LIVEDATA_DLL KafkaHistoListener : public API::LiveListener {
 public:
   KafkaHistoListener();
   ~KafkaHistoListener() override = default;
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
index dce4bf24e054..11306af11078 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
@@ -22,7 +22,7 @@ namespace LiveData {
 
   Some further documentation is in docs/source/concepts/KafkaLiveStreams.rst
 */
-class DLLExport KafkaHistoStreamDecoder : public IKafkaStreamDecoder {
+class MANTID_LIVEDATA_DLL KafkaHistoStreamDecoder : public IKafkaStreamDecoder {
 public:
   KafkaHistoStreamDecoder(std::shared_ptr<IKafkaBroker> broker, const std::string &histoTopic,
                           const std::string &runInfoTopic, const std::string &sampleEnvTopic,
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
index 57ebc24f5fe4..a77811115753 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
@@ -23,7 +23,7 @@ namespace LiveData {
 /**
   Interface to a named Kafka topic on a broker at a given address.
 */
-class DLLExport KafkaTopicSubscriber final : public IKafkaStreamSubscriber {
+class MANTID_LIVEDATA_DLL KafkaTopicSubscriber final : public IKafkaStreamSubscriber {
 public:
   KafkaTopicSubscriber(std::string broker, std::vector<std::string> topics, SubscribeAtOption subscribeOption);
   ~KafkaTopicSubscriber() override;
diff --git a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
index 4a36e6565f16..e85f2849fa58 100644
--- a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
+++ b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
@@ -9,7 +9,6 @@
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ILiveListener.h"
 #include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/System.h"
 #include "MantidLiveData/DllConfig.h"
 
 namespace Mantid {
diff --git a/Framework/Nexus/src/H5Util.cpp b/Framework/Nexus/src/H5Util.cpp
index 1af177c6a42d..db02fe4cd9e7 100644
--- a/Framework/Nexus/src/H5Util.cpp
+++ b/Framework/Nexus/src/H5Util.cpp
@@ -8,6 +8,7 @@
 #include "MantidAPI/LogManager.h"
 
 #include <H5Cpp.h>
+
 #include <algorithm>
 #include <array>
 #include <boost/numeric/conversion/cast.hpp>
diff --git a/Framework/Nexus/src/MuonNexusReader.cpp b/Framework/Nexus/src/MuonNexusReader.cpp
index d0a79047a17e..0966d384766b 100644
--- a/Framework/Nexus/src/MuonNexusReader.cpp
+++ b/Framework/Nexus/src/MuonNexusReader.cpp
@@ -6,6 +6,7 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidNexus/MuonNexusReader.h"
 #include "MantidKernel/Logger.h"
+
 #include <boost/scoped_array.hpp>
 #include <nexus/NeXusException.hpp>
 #include <sstream>
diff --git a/Framework/Parallel/inc/MantidParallel/IO/NXEventDataLoader.h b/Framework/Parallel/inc/MantidParallel/IO/NXEventDataLoader.h
index a8acdf8c8cda..dbc2f5b65dde 100644
--- a/Framework/Parallel/inc/MantidParallel/IO/NXEventDataLoader.h
+++ b/Framework/Parallel/inc/MantidParallel/IO/NXEventDataLoader.h
@@ -6,8 +6,8 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include <H5Cpp.h>
+
 #include <vector>
 
 #include "MantidParallel/DllConfig.h"
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CArrayToNDArray.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CArrayToNDArray.h
index 066d22b9b630..a885fe4af9b8 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CArrayToNDArray.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CArrayToNDArray.h
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include "MantidPythonInterface/core/Converters/WrapWithNumpy.h"
 
 namespace Mantid {
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CloneToNDArray.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CloneToNDArray.h
index cc9c39b71635..66fc115b35e8 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CloneToNDArray.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/CloneToNDArray.h
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include <boost/python/detail/prefix.hpp>
 #include <vector>
 
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/NDArrayToVector.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/NDArrayToVector.h
index 036e8ccce1b1..feb9e8d206a8 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/NDArrayToVector.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/NDArrayToVector.h
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include "MantidPythonInterface/core/NDArray.h"
 #include <vector>
 
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/VectorToNDArray.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/VectorToNDArray.h
index 04e55892f5e6..e15b27da5964 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/VectorToNDArray.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/VectorToNDArray.h
@@ -6,8 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
-
 #include <boost/python/detail/prefix.hpp>
 #include <vector>
 
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/WrapWithNDArray.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/WrapWithNDArray.h
index 284d1fef396d..19a9b603234a 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/WrapWithNDArray.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Converters/WrapWithNDArray.h
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include <boost/python/detail/prefix.hpp>
 #include <vector>
 
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/MatrixToNumpy.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/MatrixToNumpy.h
index 6cfbdbd91300..f5c2b53a248a 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/MatrixToNumpy.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/MatrixToNumpy.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include "MantidPythonInterface/core/Converters/CloneToNDArray.h"
 #include "MantidPythonInterface/core/Converters/MatrixToNDArray.h"
 #include "MantidPythonInterface/core/NDArray.h"
diff --git a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/VectorToNumpy.h b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/VectorToNumpy.h
index c5873d1ef6cd..401a175f4aa5 100644
--- a/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/VectorToNumpy.h
+++ b/Framework/PythonInterface/core/inc/MantidPythonInterface/core/Policies/VectorToNumpy.h
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
 #include "MantidPythonInterface/core/Converters/CloneToNDArray.h"
 #include "MantidPythonInterface/core/Converters/VectorToNDArray.h"
 #include "MantidPythonInterface/core/NDArray.h"
diff --git a/Framework/PythonInterface/mantid/kernel/inc/MantidPythonInterface/kernel/kernel.h b/Framework/PythonInterface/mantid/kernel/inc/MantidPythonInterface/kernel/kernel.h
index a66f911baafd..60819870561f 100644
--- a/Framework/PythonInterface/mantid/kernel/inc/MantidPythonInterface/kernel/kernel.h
+++ b/Framework/PythonInterface/mantid/kernel/inc/MantidPythonInterface/kernel/kernel.h
@@ -28,7 +28,7 @@
  */
 #ifdef _WIN32
 
-#include "MantidKernel/System.h"
+#include "MantidPythonInterface/kernel/DllConfig.h"
 
-DLLExport void kernel_dll_import_numpy_capi_for_unittest();
+PYTHON_KERNEL_DLL void kernel_dll_import_numpy_capi_for_unittest();
 #endif
diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
index d0d5b8b85b64..ce16ec282c97 100644
--- a/buildconfig/CMake/CppCheck_Suppressions.txt.in
+++ b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -809,7 +809,7 @@ knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ADARA/ADARAPa
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ADARA/ADARAPackets.cpp:182
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ADARA/ADARAPackets.cpp:184
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ADARA/ADARAPackets.cpp:192
-missingOverride:${CMAKE_SOURCE_DIR}/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h:39
+missingOverride:${CMAKE_SOURCE_DIR}/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h:38
 missingOverride:${CMAKE_SOURCE_DIR}/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h:24
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ISIS/FakeISISHistoDAE.cpp:268
 unusedStructMember:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ISIS/FakeISISHistoDAE.cpp:27
@@ -838,7 +838,7 @@ constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/Instr
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp:2677
 constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp:3059
 unreadVariable:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp:1552
-returnByReference:${CMAKE_SOURCE_DIR}/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h:81
+returnByReference:${CMAKE_SOURCE_DIR}/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h:82
 missingOverride:${CMAKE_SOURCE_DIR}/Framework/Muon/inc/MantidMuon/AsymmetryCalc.h:39
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp:527
 missingOverride:${CMAKE_SOURCE_DIR}/Framework/Muon/inc/MantidMuon/ApplyMuonDetectorGroupPairing.h:28