Move to subpackage specific imports

Framework/API/inc/MantidAPI/NexusFileLoader.h

@@ -7,12 +7,12 @@
 #pragma once
 
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/DllConfig.h"
 #include "MantidKernel/NexusHDF5Descriptor.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::API {
 
-class DLLExport NexusFileLoader
+class MANTID_API_DLL NexusFileLoader
     : public API::IFileLoader<Mantid::Kernel::NexusHDF5Descriptor> {
 public:
   void

Framework/API/src/FileLoaderRegistry.cpp

@@ -57,7 +57,6 @@ searchForLoader(const std::string &filename,
   const auto &factory = AlgorithmFactory::Instance();
   IAlgorithm_sptr bestLoader;
   int maxConfidence(0);
-  // Mantid::Kernel::NexusHDF5Descriptor>(filename);
   auto descriptor = std::make_shared<DescriptorType>(filename);
   DescriptorCallback<DescriptorType> callback;
   DescriptorSetter<DescriptorType> setdescriptor;

Framework/Kernel/CMakeLists.txt

@@ -527,7 +527,7 @@ target_link_libraries(Kernel
                       ${MANTIDLIBS}
                       ${NETWORK_LIBRARIES}
                       span
-		      ${HDF5_LIBRARIES}
+                      ${HDF5_LIBRARIES}
                       )
 if(WIN32)
   target_link_libraries(Kernel LINK_PRIVATE Psapi.lib) # For memory usage

Framework/Kernel/inc/MantidKernel/NexusHDF5Descriptor.h

@@ -6,7 +6,7 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
-#include "MantidKernel/System.h"
+#include "MantidKernel/DllConfig.h"
 
 #include <map>
 #include <set>
@@ -14,7 +14,7 @@
 
 namespace Mantid::Kernel {
 
-class DLLExport NexusHDF5Descriptor {
+class MANTID_KERNEL_DLL NexusHDF5Descriptor {
 
 public:
   /**